This patch should be applied to an un-modified XFree86 version 4.5.0 source tree. It is patch 1 of 4 patches that will will convert the source tree to XFree86 version 4.6.0. To apply this patch, run the following from the directory containing your 'xc' directory: patch -p0 -E < XFree86-4.5.0-4.6.0.diff1 patch -p0 -E < XFree86-4.5.0-4.6.0.diff2 patch -p0 -E < XFree86-4.5.0-4.6.0.diff3 patch -p0 -E < XFree86-4.5.0-4.6.0.diff4 sh XFree86-4.5.0-4.6.0-cleanup.sh gzip -d < XFree86-4.5.0-4.6.0-diff0.tgz | tar vxf - ------------------------------------------------------------------------------- Prereq: 4.5.0 Index: xc/programs/Xserver/hw/xfree86/CHANGELOG diff -u xc/programs/Xserver/hw/xfree86/CHANGELOG:3.3471 xc/programs/Xserver/hw/xfree86/CHANGELOG:3.3730 --- xc/programs/Xserver/hw/xfree86/CHANGELOG:3.3471 Wed Mar 16 20:11:52 2005 +++ xc/programs/Xserver/hw/xfree86/CHANGELOG Tue May 9 20:25:37 2006 @@ -1,3 +1,681 @@ +XFree86 4.6.0 (10 May 2006) + 281. Xterm patch #213 (Thomas Dickey). + 280. Build fix for static server on sparc (David Dawes). + 279. Fix segv in stack trace on sparc (David Dawes). + 278. Fix some errors in change #231 that prevent + '#define InstallManPageSource NO' from working (Bernd Ernesti). + 277. Various bindist fixes/updates (David Dawes). + 276. Previous xgc change requires increase in lex output table size on some + platforms (David Dawes). + +XFree86 4.5.99.904 (23 April 2006) + 275. Fix an array overrun that resulted in a server crash on exit on some + platforms (David Dawes, reported by Takaaki Nomura). + 274. Avoid isprint(3) when generating atimisc debugging output or mmapr's + prettyprints (Marc La France). + 273. Fix xgc's parsing of font names (Marc La France). + 272. Rename the "ast" driver to "aspeed" (Bugzilla #1664, requested by + Y. C. Chen). + 271. Resync with pci.ids file, and add entries for AST. + 270. Xterm patch #212 (Thomas Dickey). + +XFree86 4.5.99.903 (8 April 2006) + 269. Add a config switch for building xdm (Bugzilla #1662. Frank Giessler). + 268. Build fixes for OS/2 (Bugzilla #1663, Frank Giessler). + 267. Add preliminary generic stack trace support using gcc's + __builtin_frame_address() function (David Dawes). + 266. Fix exectable loading on FreeBSD/a.out (David Dawes). + 265. Fix some stack trace problems for a.out executables (David Dawes). + 264. Fix some problems with the a.out header macros used by the loader. + 263. Fix dladdr test for a.out FreeBSD and OpenBSD platforms (David Dawes). + 262. Stop at the first successful probe on each autoconfig retry, minimising + unnecessary probes (David Dawes). + 261. Integrate xterm's setgid feature into imake definitions (Thomas Dickey). + 260. Fix Solaris/sparc 64-bit library build for libGL (David Dawes). + 259. Fix a double-free problem in fontconfig (David Dawes). + 258. Workaround for finding moduleData with dlopen modules (David Dawes). + 257. Yet another attempt at dealing with xterm's setgid issue + (Marc La France). + 256. Add a stack trace function, callable from modules and elsewhere, which + can be useful for development/debugging (David Dawes). + 255. Make sure that DGAShutdown() is always called before HW state is + restored on exit and reset, and make sure that it is not called after + the HW state is restored (David Dawes). + 254. Trap re-entry into AbortServer() (David Dawes). + +XFree86 4.5.99.902 (19 March 2006) + 253. Xterm patch #211 (Thomas Dickey). + 252. More work on the ast driver (derived from Bugzilla #1628, Y. C. Chen). + 251. Xterm may overwrite the field adjacent to lastlog.ll_time on some 64-bit + Linux platforms. + 250. Fix a bug in fontconfig's pattern matching that can cause FcFontMatch() + to fail when it shouldn't (David Dawes). + 249. Fix client-side framebuffer mapping for DGA on NetBSD (David Dawes). + 248. Fix typos in XErrorDB (David Dawes). + 247. The new loader eliminates the need to defer unloading drivers when using + autoconfig (David Dawes). + 246. Don't make xterm setgid on FreeBSD prior to 5.x (Bugzilla #1655, + Alexander Pohoyda). + 245. Fix Xaw viewport scrollbar flickering problem (Bugzilla #1660, + Alexander Pohoyda). + 244. Prevent SIGINT from causing the XFree86 to re-enter the CloseScreen + phase once it has begun (David Dawes). + 243. Fix the int10 module's interception of PCI config1 i/o to handle 8-bit + and 16-bit accesses. This fixes problems that show up with the vesa + driver and vbe module with some video cards (David Dawes). + 242. Loader updates: + - Improve the stack trace information. + - Improve the handling of instance-specific req/ref symbols. + - Use stronger typing for the module-visible instance-specific module + descriptor. + - No longer disable xf86UnloadSubModule(), since the loader now handles + unloads and re-loads cleanly. + - Update all modules to make use of the above, and fix some bugs + that this exposed. + - Some loader message cleanups. + (X-Oz Technologies, David Dawes). + 241. Xterm patch #210 (Thomas Dickey). + 240. Enable gamma for hw cursor when ARGB cursor in use (Lukas Hejtmanek). + 239. Add ACPI Hotkey switching support to the i810 driver (Alan Hourihane). + 238. Add 945GM support to the i810 driver (Alan Hourihane). + 237. Support 1920x1088 for HDTV movies in the i810 driver using a new option + called LinearAlloc to add more memory for video overlay (Alan Hourihane). + 236. Merge in support for SiliconMotion's SM501 controller (Adapted from + Bugzilla #1001, Terry Chang). + 235. Make the fbdev driver's required/referenced symbols instance-specific, + fixing a problem that shows up with -autoconfig (David Dawes, reported + by Tom Williams). + +XFree86 4.5.99.901 (6 March 2006) + 234. Fix an error in the handling of PRIVS_ELEVATED (David Dawes, reported + by Takaaki Nomura). + 233. Check in xterm for NULL return from XftFontMatch(), and check for + NULL pattern in XftFontOpenPattern() (David Dawes). + 232. Avoid having xinit kill a slow exiting X server with SIGKILL. Instead + use SIGINT for slowly exiting X servers, and modify the X server + to use a faster, but still hardware-clean, exit path when it + receives an interrupt signal (David Dawes). + 231. Install the manual page source as well as the formatted manual pages + on NetBSD (David Dawes). + 230. Fix a problem on NetBSD where a build will continue after an error + (David Dawes). + 229. XFree86 loader enhancments: + - Per-module export symbol lists. + - Improved symbol hash. + - A mechanism for specifying the scope of symbols. + - Keep track of relocations, and undo them when they become unresolved + on module unload, and recalculate them when they change on module + load. + - Check relocations on each module load/unload, ensuring that function + references that are unresolved at any time are always mapped to the + catch-all function preventing calls into nowhere. + - Efficient handling of invariant relocations. + - Cleanup/update the memleak stack trace code, and print a stack + trace when an unresolved function is called or when XFree86 aborts. + - Update the catch-all function to identify the unresolved function. + - Read the XFree86 executable's symbol table in order to get the + most useful stack traces, and use dladdr(), where available, + for shared library references. + - Cleanup and unify debug messages for the loader components. + - Allow for module-instance-specific referenced and required + symbols lists, so that a module's requirements can be removed + when it is unloaded. + - Update the ati driver to make use of some of the new loader + functionality. + - General loader cleanups, including removing some redundancies. + - Don't build the coff loader on platforms that it doesn't support. + (X-Oz Technologies, David Dawes). + 228. Remove unused beta/expiry code from the XFree86 server (David Dawes). + 227. Add user_data field to Xaw's simpleWidgetClass (Bugzilla #1659, + Alexander Pohoyda) + 226. Fix some X server man page typos (Bugzilla #1658, Nicolas Joly). + 225. Fix some build/warnings on NetBSD (David Dawes). + 224. TinyX build fixes, including one for Linux systems that don't provide + , e.g. libc5 among others (Marc La France). + 223. Improve accuracy of atimisc's calculations that are based on a 29.5 MHz + reference clock (Marc La France). + 222. A setuid xterm doesn't also need to be setgid (Marc La France). + +XFree86 4.5.99.22 (23 February 2006) + 221. cfb24 is no longer needed; don't link it into servers but still produce + a loadable module for it. Also, fix server make dependencies on Xserver/ + subdirectories (Marc La France). + 220. Fix incorrect bitsPerPixel for depth 12 in pixmap formats advertised by + Xsun24 server (Marc La France). + 219. In linux/int10, produce messages when the mappings used to build up the + BIOS's address space do not match expectations (Marc La France). + 218. Platforms-specific build/warning fixes (David Dawes). + 217. A rework of the way extension support is built into servers to allow for + servers with different sets of extensions in the same build. This starts + with an idea introduced in David Dawes's TinyX work, and extends it to + also apply to the Xprt, Xnest, Xvfb, Xdmx and Xsun* servers. The changes + include: + - Add, as a comment, a definition for what makes an extension pervasive. + - TOGCUP is not a pervasive extension, but XSYNC, BIGREQS and XRES are. + - Consolidate #define's for the Xv, XvMC and XRES extensions. + - Flip, in favour of the majority case, MITSHM's default decision WRT + whether or not a framebuffer stores pixmap data in the server's virtual + address space. MI is now independent of MITSHM and MITSHM is no longer + a pervasive extension. + - Add a DIX helper to determine whether Xinerama is active and use it + instead of #ifdef'ed code in all loadable modules. Re-implement, as + a screen wrapper, Xinerama's PaintWindow*() hacks. Move down to DIX + Xinerama's only MI hook. Both MI and loadable module objects are now + independent of Xinerama. + - Add more XCSECURITY-related DIX helpers. Loadable module objects that + provide their own extensions (e.g. apm) are now independent of the core + binary's support for XCSECURITY. + - Extend DBE to allow for front and back buffer revalidations (to be used + in future changes to restore the only existing example of DBE hardware + acceleration after converting the sunffb driver to fb, XAA & Render). + This is the change that chronologically started all this. + - Separate Xv and XvMC extensions more cleanly. + - Move Xserver/*/tiny directories under Xserver/hw/tinyx. + - Fix !PrintOnlyServer builds. + - Clean up Xserver/Imakefile. + - Remove remaining traces of Xdec* servers. + - Fix parallel make bug in Xserver/Imakefile caused by unintentional + symbol re-use. + - Accomodate XWin more cleanly by not "skipping" over Xserver/hw. + - Remove all extension stub code (no longer needed). + `make World` is required to correctly build these changes. In fact, I + recommend starting with a fresh checkout. These changes are bundled as + one commit due to module versioning considerations. (Marc La France) + 216. Linux/alpha, Linux/amd64, Linux/ppc, Solaris/sparc build/warning fixes + (David Dawes). + 215. Allow building with devel-specific system headers (David Dawes). + 214. Allow the privileged XFree86 server options to be used by a normal + user when the server is not setuid/setgid (David Dawes). + 213. Add UseBuildTree config switch for development/debugging (David Dawes) + 212. Add getArgc and getArgv functions (David Dawes). + 211. Some Linux/alpha and Linux/ppc build/warning fixes (David Dawes). + 210. Build/config fixes (David Dawes). + 209. Change i740 to save & restore more of the mode on server entry + (Marc La France). + 208. atimisc changes: another DSP calculation tweak; work-around for + screen-to-screen copy corruption on second-generation integrated + controllers; make memory range prints faster (Marc La France). + 207. Xterm patch #209 (Thomas Dickey). + +XFree86 4.5.99.21 (8 February 2006) + 206. Fix warnings in dmx/glxProxy (David Dawes). + 205. Cleanup the ast driver's name space, and fix some warnings (David Dawes). + 204. Bump the minor rev of libXaw and libXt. + 203. Some Xaw fixes and cleanups (Bugzilla #1654, Alexander Pohoyda). + 202. Don't highlight f.nop menu items in twm menus (Bugzilla #1653, + Alexander Pohoyda). + 201. Whitespace cleanup in Xlib.h (Bugzilla #1652, Alexander Pohoyda). + 200. Fix the cursor in Xaw textWidget when the input field has focus + (Bugzilla #1651, Alexander Pohoyda). + 199. Another update to ast driver (Bugzilla #1628, Y. C. Chen). + 198. Fix the size of the dac registers storage for pm2v & pm3 chipsets. + (Alan Hourihane) + 197. Update the Serbian locale naming to reflect the country's name change + from "Yugoslavia" to "Serbia and Montenegro" (Bugzilla #1643, + Milos Komarcevic). + 196. Fix lbxproxy compile glitch that caused it to misrecognise BIGREQS + extension requests (Marc La France). + 195. Beef up the loader server's emulation of shmctl() calls (Marc La France). + 194. Remove compile-time ability to exclude Xv support in the i830 driver + (Marc La France). + 193. Fix one cause of video memory corruption when using XAA with + second-generation integrated Mach64 controllers. (I'm still chasing + another one.) (Marc La France). + 192. Chrontel 8398 related changes to the Mach64 support, including a bug fix + in clock selection (Marc La France). + 191. Resurrect dbedizzy, a DBE extension test utility (Marc La France). + 190. Rework printf format specifiers used in XLFD code to make them more + portable (and avoid infinite loops in some glibc versions) + (Marc La France). + 189. Add XGI (Trident) Volari XP5 support to the trident driver + (Alan Hourihane). + 188. Add a Khmer XKB keyboard layout (Bugzilla #1649, Jens Herden). + 187. Add two new functions that can be used to scroll the content of an + Xaw viewport from outside the viewportWidgetClass (Bugzilla #1648, + Alexander Pohoyda). + 186. Fix i18n for Xaw's tip widget (Bugzilla #1647, Alexander Pohoyda). + 185. Fix a performance issue with Xaw's Tree widget caused by useless + relayouts (Bugzilla #1645, Alexander Pohoyda). + 184. Add some XChar2b string manipulation functions to Xt (Bugzilla #1646, + Alexander Pohoyda). + +XFree86 4.5.99.20 (23 January 2006) + 183. Modify post-4.5.0 sunos_init changes to make KDGRAPHICS failure + non-fatal (David Dawes). + 182. Add suport to Xt's string to float converter to read resources in + fractional notation (Bugzilla #1642, Alexander Pohoyda). + 181. Add mouse wheel support for Scrollbars in the Xaw's Viewport widget + (Bugzilla #1641, Alexander Pohoyda). + 180. Change the recently introduced Xaw Layout resource fo the treeWidgetClass + to connectionType (Bugzilla #1639, Alexander Pohoyda). + 179. Add Xasprintf to dummylib (David Dawes). + +XFree86 4.5.99.19 (8 January 2006) + 178. Xterm patch #208 (Thomas Dickey). + 177. Fix odd crash in ATI driver probe (David Dawes). + +XFree86 4.5.99.18 (23 December 2005) + 176. Some cleanups and typo fixes in libXaw (Alexander Pohoyda, Bugzilla + #1637, Marc La France). + 175. Modify hardware cursor handling in ast driver + (Y. C. Chen, Bugzilla #1628). + 174. Make Xaw Form widgets inherit dimensions from their parent at + widget initialisation time. (Bugzilla #1623, Alexander Pohoyda). + 173. Add a dvorak_intl xkb map (Bugzilla #1624, Conrad Schuler). + 172. Add Eszett (ssharp) to the us_intl xkb map (Bugzilla #1624, + Conrad Schuler). + 171. Fix an unresolved symbol warning with the i810 driver on some platforms + (Bugzilla #1627, Nicolas Joly). + 170. Increase xclock's tooltip time string buffer size (Bugzilla #1635, + Alexander Pohoyda). + 169. Convert block macros in the trident driver to forms that can be + used as statements, fixing a problem exposed by change #168 + (David Dawes, Bugzilla #1636 reported by Jeff Chua and Pierre). + +XFree86 4.5.99.17 (8 December 2005) + 168. Fix an offset problem in Xv for the trident driver and later + generation chipsets after and including the Cyber9397 (Alan Hourihane). + +XFree86 4.5.99.16 (23 November 2005) + 167. Xterm patch #207 (Thomas Dickey). + 166. Add a driver for ASPEED Technologies's AST2000 graphics chips (derived + from Y. C. Chen at ASPEED Technologies, Bugzilla #1628). + 165. Fix TinyX build issue under !XserverStaticFontLib (Marc La France, + Bugzilla #1632). + +XFree86 4.5.99.15 (8 November 2005) + 164. Xterm patch #206 (Thomas Dickey). + 163. Update location of pkgconfig files for FreeBSD (David Dawes). + 162. Fix typo in xsm man page (Tobias Stoeckmann). + +XFree86 4.5.99.14 (23 October 2005) + 161. Implement a major #include rework throughout the tree. Also enforce it + for all non-external builds (i.e. in-tree & SDK) (Marc La France). + 160. Rework the building of hw/xfree86/parser to be more in line with the + building of other server subdirectories (such as common/) + (Marc La France). + 159. ANSIfy /xc/lib/font/builtins/, and fix warnings, whitespace & formatting + (Marc La France). + 158. Change the cpconfig utility to use the same default XF86Config search + path as the X server (Marc La France). + 157. Fix up error case when rotation fails and framebuffer needs to be + re-enabled (Alan Hourihane). + 156. Add a new function xf86GetRotation() to allow third party modules to + obtain the current rotation (Alan Hourihane). + +XFree86 4.5.99.13 (8 October 2005) + 155. Use xf86SetViewport as well as SetCursorPosition during RandR rotation, + as xf86SetViewport will call AdjustFrame to reposition the window if + necessary and avoid the cursor ending up offscreen (Alan Hourihane). + 154. Refactor Xaw Tree widget code to aid future extension (Bugzilla #1619, + Alexander Pohoyda). + 153. Fix typos in the XrmUniqueQuark(3) man page (Bugzilla #1621, + Nicolas Joly). + 152. Rewrite shadowUpdateRotatePacked() to reduce cache misses + (Staffan Ulfberg). + 151. Fix lockup when suspend and resume when playing video on the i830. + So we shutdown the overlay on LeaveVT (Alan Hourihane). + 150. Fix a graphics acceleration hang that occurred on some NVIDIA + GeForce 6xxx cards (Aaron Plattner). + 149. Put back the print code to display the DDC information, and + remove some bogus DDC messages in the i830 driver (Alan Hourihane). + 148. Fix bug that occurs when using cfb to tile 32-bit rectangles on SPARC + (Marc La France, Michael Lorenz). + +XFree86 4.5.99.12 (23 September 2005) + 147. Various changes from NetBSD: + - In SPARC-specific Mesa assembler code, increase stack usage and + always declare global register usage (Martin Husemann). + - Map more of a Sun CG6's video memory for use by the pixmap cache + (Marc La France, adapted from Michael Lorenz). + - On NetBSD, prevent the sunffb from turning off the FPU + (Michael Lorenz). + - Declare global register usage in sunffb assembler code + (Martin Husemann). + - Increase stack usage in sunffb assembler code (Andrey Petrov). + - Workaround for VRAM corruption when unblanking FFB1 adapters + (Marc La France, adapted from Martin Husemann). + - Add DDC2 support for tdfx driver (Michael Lorenz). + - Ignore KEY_UNUSED scancode in loadable keyboard driver + (Michael Lorenz). + - Add loader support for R_SPARC_OLO10 relocations (Valeriy E. Ushakov). + - Make error message for unsupported relocations more useful + (Martin Husemann). + - Fix loader support on NetBSD/arm (Chris Gilbert). + - Make loader use mprotect on NetBSD (James Chacon). + - Fix unaligned access in RenderCompositeGlyphs request (Michael Lorenz). + 146. Add xf86DeallocateGARTMemory() function. + 145. Xterm patch #205 (Thomas Dickey). + 144. Fix `xvidtune -timeout ` (#8295, Evil Mr Henry). + 143. Make Viewport widgets inherit screen dimensions from their parent at + widget initialisation time, in addition to widget realisation + (Bugzilla #1614, Alexander Pohoyda). + 142. Fix for CERT Vulnerability Note VU#102441 (Marc La France). + 141. Avoid /tmp files in NetBSD.cf's man page creation (Jeremy C. Reed). + 140. Add a new layout property to Xaw's tree widget (Bugzilla #1609, + Alexander Pohoyda). + 139. Fix some man page typos (Bugzilla #1610, Alexander Pohoyda). + +XFree86 4.5.99.11 (8 September 2005) + 138. Fix DirectColor visual colormap issues at 16bpp in the i830 driver. + (Alan Hourihane). + 137. Sync the accelerator before calling AdjustFrame to avoid lockups in + the i830 driver (Alan Hourihane). + 136. Add a Compose keycode to fix build problem introduced by change #123 + (#8240, Bang Jun-Young). + 135. Implement a workaround in generic int10 to allow unaligned I/O access + specific to VMWare's second-generation emulated adapter (Marc La France). + 134. Add a tooltip to xbiff that shows the number of messages in a mail + folder (Bugzilla #1607, Alexander Pohoyda). + 133. Fix problems with Xaw's Label widget when using XChar2b strings + (Bugzilla #1606, Alexander Pohoyda). + 132. Fix SEGV that can occur under certain builds of glibc 2.3.4 and up, when + linux/int10 attempts to determine kernel support for the vm86() system + call. This completes the implementation of change #316 in 4.4.99.901 + (Marc La France). + 131. Fix generic int10 memory accesses on little-endian systems + (Marc La France). + 130. Add loader infrastructure to implement inter-module version checks and + use it as part of a rework of VBE information blocks (Marc La France). + 129. The xf8_32wid module is only used by the sunffb driver, so don't include + it in non-SPARC static server builds (Marc La France). + 128. The xf24_32bpp module is now no longer used by any XFree86-provided + driver, so don't include it in static server builds (Marc La France). + 127. Clean up INCLUDES in various drivers' Imakefile's (Marc La France). + 126. Remove cfb from the i740, nsc, s3virge, siliconmotion and via drivers + (Marc La France). + 125. Remove cruft in siliconmotion and via drivers that only partially allowed + them to be compiled with other XFree86 versions (Marc La France). + +XFree86 4.5.99.10 (23 August 2005) + 124. Add basic ACPI Linux support so that events can be passed to the driver. + (Alan Hourihane). + 123. Merge in NetBSD version of os-support/bsd/bsd_KeyMap.c (Michael Lorenz, + Marc La France). + 122. In the vesa driver, do not call VBE to save/restore adapter state if the + mode on server entry is not one reported by VBE (i.e. is a VGA or OEM + mode). This prevents hangs under certain video BIOS'es (Marc La France). + 121. Change the vesa and vgahw modules' saving and restoring of video memory + for the mode on server entry to be less prone to bus lockouts + (Marc La France). + 120. Change the vesa driver to save and restore more video memory contents + for the mode on server entry (Marc La France). + 119. Fix vesa driver's mapping of video memory apertures (Marc La France). + 118. Experimental change to cause the vesa driver to ignore sync tolerances in + XF86Config monitor sections when the monitor is detected through DDC to + be a digital panel, relying instead on any BIOS ability to reject or + adjust mode timings to accomodate the panel (Marc La France). + 117. Endianness changes to the vesa driver (Marc La France). + 116. Fix VBE's reporting of video memory size, and zero out return area before + calling VBE to retrieve video mode information (Marc La France). + 115. Change a message to indicate whether or not a monitor's sync tolerance(s) + is/are derived from DDC information (Marc La France). + 114. Revert to the use of /dev/console, rather than /dev/fb, as the console + device on all SunOS variants (Marc La France). + 113. Endianness fix in VBESetVBEMode() (Marc La France). + 112. Remove obsolete VBE functions that have not been compiled in for quite + some time (Marc La France). + 111. Endianness fix for colour expansion in siliconmotion driver + (Mark Vojkovich, Bob Peterson). + +XFree86 4.5.99.9 (8 August 2005) + 110. VBE-related cleanups in sis and xgi drivers (Marc La France). + 109. s3 driver changes: remove its unused interface to vbe and cleanup its + use of int10 (Marc La France). + 108. Fix memory leak in vesa driver (Marc La France). + 107. Fix endianness in savage driver's VBE support and remove this driver's + private definition of VBE structures (Marc La France). + 106. Xterm patch #204 (Thomas Dickey). + 105. More endianness fixes for the vbe module (Marc La France). + 104. Add a "ConnectedDevice" option to the via driver to force selection of + output devices (Damian Janusz Gruszka). + 103. Fix XAA's support for TRIPLE_BITS_24BPP on big-endian systems + (Marc La France). + 102. Fix unaligned access in XAA's handling of 24bpp (Marc La France). + 101. Fix atimisc's support of 24bpp on big-endian systems (Marc La France). + 100. Insulate various common layer functions against out-of-bounds entity + indices (Marc La France). + 99. Prevent the sharing of a PCI entity by more than one driver + (Marc La France). + 98. Change autoconfiguration to include PCI and SBUS BusIDs in generated + device sections (Marc La France). + +XFree86 4.5.99.8 (23 July 2005) + 97. Fix setxkbmap segfault (Miguel González Cuadrado). + 96. Fix textmode restore on x86/Solaris 8 and later; and a number of other + SunOS cleanups (Marc La France, adapted from Alan Coopersmith). + 95. Add a '-noinput' option to Xnest, allowing it to be run in a view-only + mode (Bugzilla #87, James Ascroft-Leigh). + 94. Add a new "f.totalzoom" function to twm that zooms windows to cover the + whole area of a screen with no window decoration visible (Bugzilla #1602, + Alexander Pohoyda). + 93. Fix an xfd bug that prevents it from properly paging through xft fonts + beyond 0xFFFF (Bugzilla #1603, James Cloos). + 92. Mesa build fixes for NetBSD/sparc64 (Bugzilla #1604, Luke Mewburn). + 91. Preliminary port of SBUS drivers to SunOS variants. This also allows for + multihead using a mix of SBUS and PCI devices (Marc La France). + 90. Change OS-specific module subdirectory name for all SunOS variants from + "solaris" to "sunos" (Marc La France). + +XFree86 4.5.99.7 (8 July 2005) + 89. Xterm patch #203 (Thomas Dickey). + 88. Remove most remaining references to PEX and XIE (Marc La France). + 87. Fix Xvideo when operating in one line mode and video is pushed off + the top of the screen. Also some fixes for Xvideo skew in certain + resolutions in the i830 driver (Alan Hourihane). + 86. Make mga 8+24 honour the default visual (Bugzilla #1600, + Andrew Aitchison). + 85. Make the AMD64/x86_64 platform tests consistent throughout the source + tree (David Dawes, Bugzilla #1599, reported by Dejan Lesjak). + 84. Add support to check the in-built VESA mode list in the i830 driver + (Alan Hourihane). + 83. Fix an xfs bug introduced when the syslog support was added that prevents + exit on fatal errors (David Dawes). + 82. Modify the font server transport messages to go through xfs's logging + mechanisms (Bugzilla #1598, David Dawes, reported by Newsh). + +XFree86 4.5.99.6 (23 June 2005) + 81. Updates to the handling of the X server RGB database: + - Ignore space, '-' and '_' characters as well as case when + matching colour names, and remove the unnecessary duplicates in + rgb.txt. + - Allow a built-in copy of the RGB database to be included in the + X servers as a fallback for when the rgb.txt file cannot be found. + - Remove support for DBM-compiled RGB database files. + (David Dawes). + 80. Fix a problem where VT switching back to TinyX servers was failing due to + blocking on keyboard read (David Dawes). + 79. Add imake parameters to select which font renders get linked into the + TinyX servers (David Dawes). + 78. Several fixes for XKB: + - Off-by-one errors in XKBMAlloc.c. + - Shrink tables instead of only growing them. + - Fix various vmodmap vs modmap cut and paste bugs. + - Improve synthesized core X events for reporting XKB changes to + XKB-unaware clients. + (Michal Maruska). + 77. Make I/O error handling more reliable on SPARC (Marc La France) + 76. Port of the magictouch driver for XFree86 4.x (Bruno Schwander). + 75. Add multimedia keysyms for the Inspiron 6000 laptop to the "inspiron" + set (Bugzilla #1592, Aaron Solochek). + 74. Fix potential infinite loop in xdm when the "willing" command fails + to produce any output (Bugzilla #1595, David Dawes, reported by + Olaf Seibert). + 73. Remove a bogus check for DRM 1.2 for resume functionality as it's + been present since 1.1 in the i830 driver (Alan Hourihane). + 72. Fix the mode validation such that using function 5f05 to set + the refresh rate works again in the i830 driver (Alan Hourihane). + +XFree86 4.5.99.5 (8 June 2005) + 71. Fix for GENENA register handling in ATIProbe() (Marc La France). + 70. Fix text restoration when display switching has been activated + and we could be potentially on a different display than the + initial one in the i830 driver (Alan Hourihane). + 69. Change atimisc driver on big-endian systems to allow depth 24 even if + a big-endian aperture is not available, by swapping RGB masks + (Marc La France). + 68. Fix long-standing off-by-one bug in the setting of RGB offsets when the + driver supplies RGB masks (Marc La France). + 67. Improve the support for selecting which library components get built + (David Dawes). + 66. Fix some offset, pitch and overlay scaler size problems with + the video overlay. Solves various spontaneous lockups in the i830 + driver (Alan Hourihane). + 65. Restore accuracy of atimisc's clock probe despite certain I/O errors + (Marc La France). + 64. ATIProbe() and atimisc changes: + - Port to common layer's domain scheme; + - Replace AVOID_CPIO and AVOID_NON_PCI architecture-specific #define's + with run-time checks and implement new common layer infrastructure to + allow this to happen; + - Replace endianness compile-time checks with run-time ones; + - Deal with certain spurious I/O errors; + - No longer consider IOBase when matching adapters to device sections + This re-instates support for all ATI adapters on all architectures + supported by the common layer (Marc La France). + 63. Make sparse I/O masks more portable throughout the server + (Marc La France). + 62. int10 changes: + - Intercept "raw" requests for PCI configuration space from video BIOS'es + on all architectures; + - Fix typo that produced an incorrect message for int 15h emulation; + - Handle unaligned I/O requests gracefully; + - Be more tolerant of spurious I/O errors + (Marc La France). + 61. Tweak xf86InterceptSignals()'s interface (Marc La France). + 60. Add option to the mmapr & mmapw utilities to allow unaligned accesses for + testing purposes (Marc La France). + 59. Ensure signals are trapped during -configure or -probe (Marc La France). + 58. Re-implement Alpha kludge in x86emu's ops.c to be more portable + (Marc La France). + 57. Fix for auto-detection of Sun mice on Linux/SPARC (Marc La France). + 56. Fix (some of) the vbe module's endianness bugs (Marc La France). + 55. Fix endianness bug in xf4bpp; This is actually faster on all + architectures (Marc La France). + 54. Add Intel(R) i945G support to the i830 driver (Tungsten Graphics). + 53. Change the sequence on how refresh rates are set in the i830 driver. + This works much better with custom modelines (Alan Hourihane). + 52. Update 'X -configure' to detect when wscons support should be used + for the keyboard on NetBSD, and improve the handling of Sun-specific + keys (Michael Lorenz). + 51. Fix a bug in xmessage's handling of escapes in button labels + (Bugzilla #1591, Timothy Musson). + +XFree86 4.5.99.4 (23 May 2005) + 50. Add rotation to the i830 driver (Helmar Spangenberg). + 49. Changes for the i830 driver. + - Much better display switching support for mobile chipsets using + the Fn+F? combination keys. + - Add DirectColor support. + - Add gamma correction support. + (Alan Hourihane). + 48. Support the Intel E7221 server chipset in the i830 driver. + (Alan Hourihane). + 47. Allow environment variables to be used in twm menu names (Bugzilla #1590, + Alexander Pohoyda). + 46. Add a new function to twm to allow the window text title to be changed + interactively (Bugzilla #1078, Alexander Pohoyda). + 45. Use the Xaw tooltip to display the date in xclock (Bugzilla #1589, + Alexander Pohoyda). + 44. Cleanup the build for some extension modules (David Dawes). + +XFree86 4.5.99.3 (11 May 2005) + 43. Extend the tip resource for Xaw's simpleWidgetClass to allow + a function to be called before the tip is created. This allows + the tip label to be modified each time a tip is displayed + (Bugzilla #1586, Alexander Pohoyda). + 42. Modify the fontconfig library to use getpwnam/getpwuid to find the + home directory when $HOME is not set (Bugzilla #1582, David Dawes, + reported by Denis Vlasenko). + 41. Xterm patch #202 (Thomas Dickey). + 40. Some XGI driver cleanups and build/warning fixes (David Dawes). + 39. Initial version of XGI driver for Volari V5, V8, Z7 (Bugzilla #1550, + Jong Lin, XGI). + 38. Fix minor formatting glitch in generated XF86Config files + (Marc La France). + 37. Add a definition for EFI PCI ROM images (Marc La France). + 36. Further refinements to the emulation of VGA routing through Simba bridges + (Marc La France). + 35. Change trident driver to not wait for vertical retrace on PC98 systems + (Satoshi Kimura). + 34. Add screen-to-screen copy, solid fill and CPU-to-screen colour expansion + acceleration to the suncg6 driver (Michael Lorenz). + 33. Cause GCC to warn about format string problems even in modules, and fix + the warnings that result (Marc La France). + 32. Fix buglet in the decoding of I/O forwarding by Cardbus bridges + (Marc La France). + 31. Fix buglet relating to the forwarding of 64-bit memory addresses by + PCI-to-PCI bridges on 32-bit systems (Marc La France). + 30. Don't call a screen's PointerMoved entry if a DGA mode is active on that + screen (Marc La France). + 29. Allow a static server's -configure to generate an XF86Config for the + loader server (Marc La France). + 28. Replace lib/font/fontfile/decompress.c with a version derived from + the BSD src/usr.bin/compress/zopen.c (Thorsten Glaser). + 27. Revert the MGA HALlib MGASetDisplayStart interface back to + HALSetDisplayStart (#7577, Peter Breitenlohner). + 26. Updates to mkfontscale's handling of font weights (#7596, + James Richard Tyrer). + 25. Experimental DPMS support for GeForce4 and newer laptops in the nv + driver (Mark Vojkovich). + +XFree86 4.5.99.2 (23 April 2005) + 24. Xterm patch #201 (Thomas Dickey). + 23. Fix an uninitialised pointer dereference in Xt/Initialize.c on WIN32 + platforms that happens if $HOME is set in the environment + (Bugzilla #1580, Dave Williss). + 22. Fix a bug in XKB group adjustment (Ivan Pascal, reported Bugzilla #1566). + 21. Replace the macintosh/fr map with the "fr_new" map, release 4 + (Bugzilla #1574, Étienne Bersac). + 20. Fix some cases in the Darwin build where a variable is declared static + and later as extern (Bugzilla #1576, Jordan Frank). + 19. Reduce the Mystique's SYSCLK from 197MHz to 166MHz, allowing the + higher clock to be used when the "OverclockMem" option is activated. + This fixes instability seen on some Mystique cards, and removes the + need for the 4.4.0 workaround in MGAStormSync() (based on + Bugzilla #1575, #1577, Khong Jye Liew). + +XFree86 4.5.99.1 (8 April 2005) + 18. Check the VESA BIOS scanline requirements and adjust the + displayWidth accordingly. Fixes an assumption that the screen width + was always used as the displayWidth in the i830 driver (Alan Hourihane). + 17. Refine VGA routing emulation through Sun's Simba P2P bridges + (Marc La France). + 16. Tentative fix for loader server on Linux/SPARC 2.6 kernels + (Marc La France). + 15. Extend mmapr & mmapw utilities on Linux to allow specification of which + PCI address space (I/O or memory) to mmap (Marc La France). + 14. Given Xinerama must be explicitly requested, allow it to initialise even + when there's only one screen to combine (Marc La France). + 13. Cause the server to FatalError() when Xinerama attempts to create a + screen whose root depth has no visuals, causing Xlib to segfault + (Marc La France). + 12. Clean up XFree86 server links (Marc La France). + 11. Start reworking build under xc/doc (Marc La France). + 10. Move test suite documentation from xc/doc to test/xsuite/doc + (Marc La France). + 9. Modify the handling of preferred EDID modes to allow user-specified + modes that are larger than the preferred mode (David Dawes). + 8. Build and warning cleanups and fixes (David Dawes). + 7. Fix some bad alignment problems when allocating memory from + the end of AGP space in the i830 driver (Alan Hourihane). + 6. Document pswrap's -f option (David Dawes, Bugzilla #1570, reported by + Luke Mewburn). + 5. Fix a problem where pswrap generates a bogus .c file when the -h + option is not used (Bugzilla #1569, Christos Zoulas, + reported by Luke Mewburn). + 4. Add support for relocation type 10 for Alpha to the ELF loader + (FreeBSD PR 73257, Ken Stailey, Bugzilla #1568, reported by Will L G). + 3. Some changes to the default behaviour of BSD's xf86OpenConsole: + - Don't detach the controlling tty when it isn't a console device. + - Enable the initial switch to VT 1 workaround only when it is known + to be needed. + (David Dawes). + 2. Improve the default setting for BuildModuleInSubdir to handle more + cases that need it set (David Dawes). + 1. Fix i830 bug where the DDC-probed parameters are not applied before + modes are selected (David Dawes). + XFree86 4.5.0 (16 March 2005) 363. Readability updates for the BUILD and RELNOTES docs (Georgina O. Economou). @@ -19455,7 +20133,7 @@ XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3471 2005/03/17 01:11:52 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3730 2006/05/10 00:25:37 dawes Exp $ Index: xc/BUILD.txt diff -u xc/BUILD.txt:1.2 xc/BUILD.txt:1.3 --- xc/BUILD.txt:1.2 Wed Mar 16 20:11:51 2005 +++ xc/BUILD.txt Tue Apr 11 21:50:31 2006 @@ -17,70 +17,69 @@ We recommend using gcc to build XFree86, but XFree86 generally builds with the native compiler for each OS platform. -1. How to get the XFree86 4.5.0 source +1. How to get the XFree86 4.6.0 source -The recommended way of getting the XFree86 4.5.0 source is to obtain it +The recommended way of getting the XFree86 4.6.0 source is to obtain it directly from the XFree86 CVS repository. There are several ways of doing that, and they are described at our CVS web page . -The CVS tag for this release is "xf-4_5_0". The tag for the maintenance -branch for this release is "xf-4_5-branch". +The CVS tag for this release is "xf-4_6_0". The tag for the maintenance +branch for this release is "xf-4_6-branch". -Another method of getting the XFree86 4.5.0 source is to either download the -4.5.0 source tarballs from the XFree86 ftp site. The procedure for this is +Another method of getting the XFree86 4.6.0 source is to either download the +4.6.0 source tarballs from the XFree86 ftp site. The procedure for this is as follows: - o The XFree86 4.5.0 source is contained in the files: + o The XFree86 4.6.0 source is contained in the files: - XFree86-4.5.0-src-1.tgz + XFree86-4.6.0-src-1.tgz - XFree86-4.5.0-src-2.tgz + XFree86-4.6.0-src-2.tgz - XFree86-4.5.0-src-3.tgz + XFree86-4.6.0-src-3.tgz - XFree86-4.5.0-src-4.tgz + XFree86-4.6.0-src-4.tgz - XFree86-4.5.0-src-5.tgz + XFree86-4.6.0-src-5.tgz - XFree86-4.5.0-src-6.tgz + XFree86-4.6.0-src-6.tgz - XFree86-4.5.0-src-7.tgz + XFree86-4.6.0-src-7.tgz - These can be found at ftp://ftp.xfree86.org/pub/XFree86/4.5.0/source/ - and similar locations on XFree86 mirror sites. XFree86-4.5.0-src-4.tgz - and XFree86-4.5.0-src-5.tgz contains the fonts. XFree86-4.5.0-src-6.tgz - contains the documentation source. XFree86-4.5.0-src-7.tgz contains the - hardcopy documentation. XFree86-4.5.0-src-1.tgz, - XFree86-4.5.0-src-2.tgz and XFree86-4.5.0-src-3.tgz contains everything - else. + These can be found at ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/. + XFree86-4.6.0-src-4.tgz and XFree86-4.6.0-src-5.tgz contains the fonts. + XFree86-4.6.0-src-6.tgz contains the documentation source. + XFree86-4.6.0-src-7.tgz contains the hardcopy documentation. + XFree86-4.6.0-src-1.tgz, XFree86-4.6.0-src-2.tgz and + XFree86-4.6.0-src-3.tgz contains everything else. If you do not need either the documentation or the fonts, then you need - only XFree86-4.5.0-src-1.tgz, XFree86-4.5.0-src-2.tgz and - XFree86-4.5.0-src-3.tgz. + only XFree86-4.6.0-src-1.tgz, XFree86-4.6.0-src-2.tgz and + XFree86-4.6.0-src-3.tgz. o Extract each of these files by running the following from a directory on a filesystem containing enough space (the full source requires around 270MB, with a similar amount being required for the compiled binaries): - gzip -d < XFree86-4.5.0-src-1.tgz | tar vxf - + gzip -d < XFree86-4.6.0-src-1.tgz | tar vxf - - gzip -d < XFree86-4.5.0-src-2.tgz | tar vxf - + gzip -d < XFree86-4.6.0-src-2.tgz | tar vxf - - gzip -d < XFree86-4.5.0-src-3.tgz | tar vxf - + gzip -d < XFree86-4.6.0-src-3.tgz | tar vxf - - gzip -d < XFree86-4.5.0-src-4.tgz | tar vxf - + gzip -d < XFree86-4.6.0-src-4.tgz | tar vxf - - gzip -d < XFree86-4.5.0-src-5.tgz | tar vxf - + gzip -d < XFree86-4.6.0-src-5.tgz | tar vxf - - gzip -d < XFree86-4.5.0-src-6.tgz | tar vxf - + gzip -d < XFree86-4.6.0-src-6.tgz | tar vxf - - gzip -d < XFree86-4.5.0-src-7.tgz | tar vxf - + gzip -d < XFree86-4.6.0-src-7.tgz | tar vxf - -Alternatively, if you already have a pristine copy of the XFree86 4.4.0 +Alternatively, if you already have a pristine copy of the XFree86 4.5.0 source, you can download patches from -ftp://ftp.xfree86.org/pub/XFree86/4.5.0/patches/ that will allow you to con- -vert it to 4.5.0. Information about which patch files to download and how to +ftp://ftp.xfree86.org/pub/XFree86/4.6.0/patches/ that will allow you to con- +vert it to 4.6.0. Information about which patch files to download and how to apply them can be found in the "How to get XFree86" section of the README for this release. @@ -103,8 +102,8 @@ sarily. Before making too many modifications, check the configuration param- eters specified in the xc/config/cf/README file. -If you are using just the XFree86-4.5.0-src-1.tgz, XFree86-4.5.0-src-2.tgz -and XFree86-4.5.0-src-3.tgz parts of the source dist, you will need to define +If you are using just the XFree86-4.6.0-src-1.tgz, XFree86-4.6.0-src-2.tgz +and XFree86-4.6.0-src-3.tgz parts of the source dist, you will need to define BuildFonts to NO. 3. Using a shadow directory of symbolic links for the build @@ -282,7 +281,7 @@ them manually in host.def and report the problem to . - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml,v 3.19 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/BUILD.sgml,v 3.20 dawes Exp $ -$XFree86: xc/BUILD.txt,v 1.2 2005/03/17 01:11:51 dawes Exp $ +$XFree86: xc/BUILD.txt,v 1.3 2006/04/12 01:50:31 dawes Exp $ Index: xc/Imakefile diff -u xc/Imakefile:3.32 xc/Imakefile:3.34 --- xc/Imakefile:3.32 Wed Jun 23 13:04:13 2004 +++ xc/Imakefile Wed Mar 1 22:00:34 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/Imakefile,v 3.32 2004/06/23 17:04:13 dawes Exp $ +XCOMM $XFree86: xc/Imakefile,v 3.34 2006/03/02 03:00:34 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" @@ -16,7 +11,6 @@ #define OSName Unknown Operating System! #endif -#if !BuildServersOnly #if BuildFonts FONTSDIR = fonts #endif @@ -24,11 +18,16 @@ #if BuildDocs DOCSDIR = doc #endif +#if BuildNLS NLSSUBDIR = nls #endif #endif - SUBDIRS = include config lib $(NLSSUBDIR) \ +#if UseMemLeak || UseStackTrace + MEMLEAKDIR = util/memleak +#endif + + SUBDIRS = include config lib $(NLSSUBDIR) $(MEMLEAKDIR) \ programs $(FONTSDIR) $(DOCSDIR) LNINSTALLDIRS = lib Index: xc/Install.txt diff -u xc/Install.txt:1.2 xc/Install.txt:1.3 --- xc/Install.txt:1.2 Wed Mar 16 20:11:51 2005 +++ xc/Install.txt Tue Apr 11 21:50:31 2006 @@ -1,4 +1,4 @@ - Installation Details for XFree86® 4.5.0 + Installation Details for XFree86® 4.6.0 The XFree86 Project, Inc @@ -22,11 +22,11 @@ XFree86 CVS repository's "utils" module, and from our ftp site .) -2. Downloading the XFree86 4.5.0 binaries +2. Downloading the XFree86 4.6.0 binaries -We provide XFree86 4.5.0 binaries for a range of operating systems at our ftp -site and our web site -. Often during +We provide XFree86 4.6.0 binaries for a range of operating systems at our ftp +site and our web site +. Often during releases our site is heavily loaded. Instead of downloading directly from us we recommend that instead you use one of our mirror sites. @@ -71,9 +71,9 @@ that your target will not be be available for this release. This is likeliest possibility if you are looking more than about two weeks after the release date. Check here - for information about + for information about updates to our binary distributions, and here - for errata related to + for errata related to this release. Assuming that you have run the Xinstall.sh script and found the binary dis- @@ -138,9 +138,9 @@ 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.5.0 using the Xinstall.sh script +3. Installing XFree86 4.6.0 using the Xinstall.sh script -We strongly recommend that our XFree86 4.5.0 binaries be installed using the +We strongly recommend that our XFree86 4.6.0 binaries be installed using the Xinstall.sh script 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 @@ -284,9 +284,9 @@ 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.5.0 manually +4. Installing XFree86 4.6.0 manually -This section contains information about manually installing the XFree86 4.5.0 +This section contains information about manually installing the XFree86 4.6.0 binary distributions. 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. It also may not be complete or up to date. Use at your own @@ -396,4 +396,4 @@ Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.22 dawes Exp $ -$XFree86: xc/Install.txt,v 1.2 2005/03/17 01:11:51 dawes Exp $ +$XFree86: xc/Install.txt,v 1.3 2006/04/12 01:50:31 dawes Exp $ Index: xc/LICENSE.txt diff -u xc/LICENSE.txt:1.3 xc/LICENSE.txt:1.6 --- xc/LICENSE.txt:1.3 Wed Mar 16 20:11:51 2005 +++ xc/LICENSE.txt Tue Apr 18 13:16:36 2006 @@ -2,7 +2,7 @@ Compiled by The XFree86 Project - 9 March 2005 + April 2006 1. Introduction @@ -49,14 +49,14 @@ 3.1 Open Source -We believe that all of the code in this release (4.5.0) of XFree86 meet the +We believe that all of the code in this release (4.6.0) of XFree86 meet the requirements of the Open Source Definition , as maintained by the Open Source Initiative (OSI) . 3.2 Free Software -We believe that most of the code in this release (4.5.0) of XFree86 meets the +We believe that most of the code in this release (4.6.0) of XFree86 meets the requirements of the Free Software definition as defined by the Free Software Foundation (FSF) . @@ -70,7 +70,7 @@ licence can be found at the XFree86 web site -Copyright (C) 1994-2005 The XFree86 Project, Inc. +Copyright (C) 1994-2006 The XFree86 Project, Inc. All rights reserved. @@ -131,6 +131,8 @@ Copyright (C) 2002 Apple Computer, Inc. All Rights Reserved. +Copyright (C) 2005 ASPEED Technology Inc. + Copyright (C) 1988 AT&T. All Rights Reserved. Copyright (C) 1992 by Robert Baron @@ -186,7 +188,7 @@ Copyright (C) 1999-2003 by Peter Kunzmann, Citron GmbH, Germany. -Copyright (C) 1994 through 2005 by Marc Aurele La France (TSI @ UQV), +Copyright (C) 1994 through 2006 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org Copyright (C) 1996 by Steven Lang @@ -802,9 +804,9 @@ 6.7 X-Oz Technologies -Copyright 2003, 2004, 2005 by David H. Dawes. +Copyright 2003-2006 by David H. Dawes. -Copyright 2003, 2004, 2005 by X-Oz Technologies. +Copyright 2003-2006 by X-Oz Technologies. All rights reserved. @@ -1636,7 +1638,7 @@ authorization from the Gnome Foundation or Bitstream Inc., respectively. For further information, contact: fonts at gnome dot org. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.41 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/LICENSE.sgml,v 1.43 dawes Exp $ -$XFree86: xc/LICENSE.txt,v 1.3 2005/03/17 01:11:51 dawes Exp $ +$XFree86: xc/LICENSE.txt,v 1.6 2006/04/18 17:16:36 dawes Exp $ Index: xc/Makefile diff -u xc/Makefile:3.29 xc/Makefile:3.30 --- xc/Makefile:3.29 Tue Oct 21 13:41:43 2003 +++ xc/Makefile Fri Jun 10 15:43:59 2005 @@ -1,13 +1,8 @@ -# $Xorg: Makefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ - - - -# $XFree86: xc/Makefile,v 3.29 2003/10/21 17:41:43 tsi Exp $ +# $XFree86: xc/Makefile,v 3.30 2005/06/10 19:43:59 dawes Exp $ # Luna users will need to either run make as "make MAKE=make" # or add "MAKE = make" to this file. -RELEASE = "Release 6.6" SHELL = /bin/sh RM = rm -f MV = mv Index: xc/README.txt diff -u xc/README.txt:1.4 xc/README.txt:1.5 --- xc/README.txt:1.4 Wed Mar 16 20:11:52 2005 +++ xc/README.txt Tue Apr 11 21:50:31 2006 @@ -1,8 +1,8 @@ - README for XFree86® 4.5.0 + README for XFree86® 4.6.0 The XFree86 Project, Inc - 16 March 2005 + April 2006 Abstract @@ -11,20 +11,20 @@ Linux, FreeBSD, NetBSD, OpenBSD and Solaris) on Intel and other platforms. This version is compatible with X11R6.6. -1. What is XFree86 4.5.0? +1. What is XFree86 4.6.0? -XFree86 4.5.0 is the eighth full release in the XFree86 4.x series. +XFree86 4.6.0 is the ninth full release in the XFree86 4.x series. XFree86 4.x is the current XFree86 release series. The first release in this series was in early 2000. The core of XFree86 4.x is a modular X server. -The 4.5.0 version is a new release that includes additional hardware support, +The 4.6.0 version is a new release that includes additional hardware support, functional enhancements and bug fixes. Specific release enhancements can be viewed in the Release Notes. -Most modern PC video hardware is supported in XFree86 4.5.0, and most PC +Most modern PC video hardware is supported in XFree86 4.6.0, and most PC video hardware that isn't supported explicitly can be used with the "vesa" driver. The Release Notes has a table showing the drivers provided with -XFree86 4.5.0, and links to related documentation. +XFree86 4.6.0, and links to related documentation. XFree86® is produced by The XFree86 Project, Inc through the work of a group of volunteer independent developers. The XFree86 Project is a non-commercial @@ -61,7 +61,7 @@ 3. Pointers to additional information The documentation for this release can be found online at the XFree86 web -site . Documentation for the latest +site . Documentation for the latest release version can always be found here , and documentation for the latest pre-release snapshot can be found here . @@ -116,23 +116,23 @@ Current information about the XFree86 development process can be found at our web site . -6. How to get XFree86 4.5.0 +6. How to get XFree86 4.6.0 -XFree86 4.5.0 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.5.0 is split into seven tarballs: - - XFree86-4.5.0-src-1.tgz - XFree86-4.5.0-src-2.tgz - XFree86-4.5.0-src-3.tgz - XFree86-4.5.0-src-4.tgz - XFree86-4.5.0-src-5.tgz - XFree86-4.5.0-src-6.tgz - XFree86-4.5.0-src-7.tgz +XFree86 4.6.0 can be found at the XFree86 ftp 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.6.0 is split into seven tarballs: + + XFree86-4.6.0-src-1.tgz + XFree86-4.6.0-src-2.tgz + XFree86-4.6.0-src-3.tgz + XFree86-4.6.0-src-4.tgz + XFree86-4.6.0-src-5.tgz + XFree86-4.6.0-src-6.tgz + XFree86-4.6.0-src-7.tgz The first three contain everything except the fonts and general X11 documen- tation. Those three are sufficient for building XFree86 if you already have @@ -140,36 +140,36 @@ the source for the general X11 documentation. The seventh contains the gen- eral X11 documentation in hardcopy format. -A source patch relative to version 4.4.0 is also available. Because of its +A source patch relative to version 4.5.0 is also available. Because of its size, it is split into four parts. The patch files are: - XFree86-4.4.0-4.5.0.diff1.gz - XFree86-4.4.0-4.5.0.diff2.gz - XFree86-4.4.0-4.5.0.diff3.gz - XFree86-4.4.0-4.5.0.diff4.gz + XFree86-4.5.0-4.6.0.diff1.gz + XFree86-4.5.0-4.6.0.diff2.gz + XFree86-4.5.0-4.6.0.diff3.gz + XFree86-4.5.0-4.6.0.diff4.gz There is also a tarball and a cleanup script that handle files that have com- ponents that can't be included in a diff. These are: - XFree86-4.4.0-4.5.0-diff0.tgz - XFree86-4.4.0-4.5.0-cleanup.sh + XFree86-4.5.0-4.6.0-diff0.tgz + XFree86-4.5.0-4.6.0-cleanup.sh -These patches should be applied to a clean 4.4.0 source tree, working from +These patches should be applied to a clean 4.5.0 source tree, working from the directory containing the xc/ directory. The patches should be applied by running: - gzip -d < XFree86-4.4.0-4.5.0.diff1.gz | patch -p0 -E - gzip -d < XFree86-4.4.0-4.5.0.diff2.gz | patch -p0 -E - gzip -d < XFree86-4.4.0-4.5.0.diff3.gz | patch -p0 -E - gzip -d < XFree86-4.4.0-4.5.0.diff4.gz | patch -p0 -E + gzip -d < XFree86-4.5.0-4.6.0.diff1.gz | patch -p0 -E + gzip -d < XFree86-4.5.0-4.6.0.diff2.gz | patch -p0 -E + gzip -d < XFree86-4.5.0-4.6.0.diff3.gz | patch -p0 -E + gzip -d < XFree86-4.5.0-4.6.0.diff4.gz | patch -p0 -E - sh XFree86-4.4.0-4.5.0-cleanup.sh - gzip -d < XFree86-4.4.0-4.5.0-diff0.tgz | tar vxf - + sh XFree86-4.5.0-4.6.0-cleanup.sh + gzip -d < XFree86-4.5.0-4.6.0-diff0.tgz | tar vxf - To format the XFree86 documentation use the latest version of our doctools package available from the XFree86 CVS repository's "doctools" module, and from our ftp site . +tools-1.3.4.tgz>. The XFree86 source code for this and all releases/snapshots as well as devel- opment versions can also be accessed via the XFree86 CVS repository. Infor- @@ -177,8 +177,8 @@ on our web site. It's also possible to browse the XFree86 CVS repository at our CVSWeb server . The CVS tag for this version is -"xf-4_5_0". The CVS tag for the stable branch for this release is -"xf-4_5-branch". To check out the latest development version, don't specify +"xf-4_6_0". The CVS tag for the stable branch for this release is +"xf-4_6-branch". To check out the latest development version, don't specify any tag. 7. Reporting Bugs @@ -190,7 +190,17 @@ 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.148 dawes Exp $ +8. Supporting XFree86 +The XFree86 Project, Inc is a nonprofit that oversees the development of +XFree86. As with the XFree86 software, the nonprofit is run and operated +entirely by unpaid volunteers. Donations to The XFree86 Project go towards +maintaining our online presence and related infrastructure and modest operat- +ing expenses. If you find XFree86 useful, and would like to help us continue +in our work, please consider a small donation +. -$XFree86: xc/README.txt,v 1.4 2005/03/17 01:11:52 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/README.sgml,v 3.149 dawes Exp $ + + +$XFree86: xc/README.txt,v 1.5 2006/04/12 01:50:31 dawes Exp $ Index: xc/RELNOTES.txt diff -u xc/RELNOTES.txt:1.4 xc/RELNOTES.txt:1.7 --- xc/RELNOTES.txt:1.4 Wed Mar 16 20:11:52 2005 +++ xc/RELNOTES.txt Fri Apr 28 23:38:00 2006 @@ -1,34 +1,36 @@ - Release Notes for XFree86® 4.5.0 + Release Notes for XFree86® 4.6.0 The XFree86 Project, Inc - 16 March 2005 + April 2006 Abstract This document contains information about the various features and - their current status in the XFree86 4.5.0 release. + their current status in the XFree86 4.6.0 release. 1. Introduction to the 4.x Release Series XFree86 4.0 was the first official release of the XFree86 4 series. The cur- -rent release (4.5.0) is the latest in that series. The XFree86 4.x series +rent release (4.6.0) is the latest in that series. The XFree86 4.x series represents a significant redesign of the XFree86 X server, with a strong focus on modularity and configurability. 2. Configuration: a Quick Synopsis Automatic configuration was introduced with XFree86 4.4.0 which makes it pos- -sible to start XFree86 without first creating a configuration file. This was -further improved in XFree86 4.5.0. +sible to start XFree86 without first creating a configuration file. This has +been further improved in XFree86 4.5.0 and 4.6.0. If you experienced any +problems with automatic configuration in a previous release, it is worth try- +ing it again with this release. While the initial automatic configuration support was originally targeted ust -for Linux and the FreeBSD variants, in 4.5.0 it now includes Solaris, NetBSD -and OpenBSD support, and it is planned that automatic configuration will be -supported on other platforms in future releases. +for Linux and the FreeBSD variants, as of 4.5.0 it also includes Solaris, +NetBSD and OpenBSD support. Full support for automatic configuration is +planned for other platforms in future releases. -If you are running either Linux, FreeBSD, NetBSD, OpenBSD, or Solaris, try -Auto Configuration by running: +If you are running Linux, FreeBSD, NetBSD, OpenBSD, or Solaris, try Auto Con- +figuration by running: XFree86 -autoconfig @@ -70,13 +72,13 @@ through the Installation Document as it can point out which particular binary you should download. -The next section describes what is new in the latest version (4.5.0) compared -with the previous full release (4.4.0). There are many new features in this +The next section describes what is new in the latest version (4.6.0) compared +with the previous full release (4.5.0). There are many new features in this release and we unfortunately do not have enough space to cover them all here. -3. Summary of new features in 4.5.0. +3. Summary of new features in 4.6.0. -This is a sampling of the new features in XFree86 4.5.0. A more complete +This is a sampling of the new features in XFree86 4.6.0. A more complete list of changes can be found in the CHANGELOG that is part of the XFree86 source tree. It can also be viewed online at our CVSweb server ). - - o Integer overflow in libICE/libSM. - - o libXpm stack and integer overflow and other issues (CAN-2004-0687 - , - CAN-2004-0688 , CAN-2004-0914 - , - CAN-2005-0605 ). - - o Potential security issues related to wrap-around of memory allocation - requests in font handling and other areas. + o X server pixmap allocation flaw (CERT Vulnerability Note VU#102441 + , CAN-2005-2495 + ). 3.2 Video Driver Enhancements -3.2.1 General + o Remove cfb support from the i740, nsc, s3virge, siliconmotion and via + drivers. + +3.2.1 aspeed - o In most drivers, fix a long-standing off-by-one error in the programming - of sync pulse start and end for video modes based on VGA or its exten- - sions. + o A new driver for ASPEED Technologies' AST2000 graphics chips. 3.2.2 ati - o Fix various bugs in the Mach64-based panel support. + o Reinstate support for all ATI adapters on all architectures supported by + the XFree86 common layer. + + o Restore accuracy of atimisc's clock probe despite certain I/O errors. + + o Change the atimisc driver on big-endian systems to allow depth 24 even + if the big-endian aperture is not available, by swapping RGB masks. + + o Fix an ATI driver probe crash. + + o Workaround for screen-to-screen copy corruption in second-generation + integrated controllers. - o Re-instate atimisc's support for DGA on UltraSPARC platforms. + o Improve accuracy of atmisc's calculations that are based on a 29.5 MHz + reference clock. -3.2.3 chips + o Chrontel 8398 related changes to the Mach64 support. - o Fix the stretching option and centering. + o Fix one cause of video memory corruption when using XAA with second gen- + eration integrated Mach64 controllers. -3.2.4 cirrus +3.2.3 glint - o Add support for the NEC PC-9821 with CLGD755x. + o Fix the size of the DAC registers storage for pm2v and pm3 chipsets. + +3.2.4 i740 + + o Save and restore more of the mode on server entry. 3.2.5 i810 - o Add support for memory size tweaking in the BIOS for 845G. + o Make sure the DDC-probed parameters are applied before modes are + selected. + + o Fix some bad alignment problems when allocating memory from the end of + AGP space. - o Fix Xv flickering on the 830GM and later. + o Adjust the display width according to the VESA BIOS scanline require- + ments. - o Add support for the 915G/915GM chipsets. + o Add support for the Intel E7221 server chipset. - o Add dual-head and clone support for the 915G, 855GM, 830GM chipsets. + o Improve display switching support for mobile chipsets using the Fn+F? + combination keys. - o Add ARGB cursor support for all chipsets. This requires an updated agp- - gart kernel driver. + o Add DirectColor support for the i830 and later. - o Add module lid status checking. + o Add gamma correction support for the i830 and later. - o Fix XVideo when high resolutions are used on local flat panels. + o Add rotation support for the i830 and later. - o Add PanelID identification. + o Improve refresh rate selection for custom modelines. - o Detect monitor changes on VT switch (830GM and up). + o Add support for the 945G and 945GM. o Support custom video modes in the video BIOS, when available. - o Fix some Xv bugs. + o Fix some offset, pitch, and overlay scaler size problems with the video + overlay. This solves various spontaneous lockups. - o Set the default monitor parameters to match the display size for the - 830GM and up when they are not available from another source, improving - the default video mode selection in these cases. + o Fix text restoration when display switching has been activated. -3.2.6 mga + o Add support to check the built-in VESA mode list. + + o Fix XVideo when operating in one line mode and video is pushed off the + top of the screen, and fix some XVideo skew problems at certain resolu- + tions. - o Make the Mystique lockup workaround more selective, avoiding different - problems on cards that do not require the workaround. + o Sync the accelerator before calling AdjustFrame to avoid lockups. - o Fix segfaults that occur when the XaaNoSolidFillRect and/or - XaaNoMono8x8PatternFillRect options are used. + o Fix a lockup when spend and resume when playing video (shutdown the + overlay on LeaveVT). - o Fix for Xv resolution loss problem. + o Support 1920x1088 for HDTV movies using a new option (LinearAlloc) to + add more memory for the video overlay. - o Add i2c and Maven support, providing DDC and DPMS support for the second - head on dual-head cards. + o Add ACPI hotkey switching support. + +3.2.6 mga + + o Reduce the Mystique's SYSCLK from 197 MHz to 166 MHz, allowing the + higher clock to still be used when the "OverclockMem" option is acti- + vated. This fixes the instability seen on some Mystique cards, and + removes the need for the workaround in previous releases. + + o Revert the HALlib MGASetDisplayStart interface back to HALSetDis- + playStart. + + o Make 8+24 mode honour the default visual. 3.2.7 nv - o PCI-Xpress support added. + o Some of the panel DPMS support in 4.5.0 only works for TMDS, and caused + some panel blooming on some LVDS panels, so skip the DPMS panel code + when the panel is LVDS. - o Add support for newer hardware. + o Add DPMS support for GeForce4 and newer laptops. - o Workaround for Toshiba M30 laptop issue. + o Fix some console restore code for the NV11. - o Reject modes larger than the flat panel. + o Workaround for 512MB video cards (can only map 256MB of it). - o DPMS support for DVI added. + o Fix a graphics acceleration hang that occurred on some NVIDIA GeForce + 6xxx cards. - o Cursor update for NV11 so that alpha blended cursors will work in con- - junction with dithering (laptop panels). + o Fix a potential problem with pixmap cache corruption on GeForce 6xxx and + 7xxx parts. -3.2.8 r128 + o Add support for new hardware. - o Improve the handling of timeouts in R128CCEWaitForIdle() +3.2.8 siliconmotion -3.2.9 radeon + o Merge in support for SiliconMotion's SM501 controller. - o The DAC is turned off for DPMS modes, fixing a problem that can badly - affect some monitors. +3.2.9 suncg6 - o Add an option for avoid flickering and blank screen problems with - iBooks. + o Add screen-to-screen copy, solid fill, and CPU-to-screen colour expan- + sion acceleration. -3.2.10 rendition + o Map more of a Sun CG6's video memory for use by the pixmap cache. - o Fix bad free() calls in the probe function. +3.2.10 sunffb -3.2.11 s3 + o Prevent turning off the FPU on NetBSD. - o Add support for interlaced video modes. + o Fix build problems on NetBSD (global register usage declaration, and + increase stack usage). - o Remove cfb support. + o Workaround for VRAM corruption when unblanking FFB1 adapters. - o Correct the depth checking (32 is not a supported depth). +3.2.11 tdfx - o Fix DAC probing. + o Add DDC2 support. - o Add IBM RGB525 support. +3.2.12 trident - o Fix a ScreenToScreenCopy bug that shows up with xtest. + o Do not wait for vertical retrace on PC98 systems. -3.2.12 s3virge + o Fix an offset problem in Xv for the Cyber9397 and later chipsets. - o Fix a bug that shows up when mode restoration results in a switch - between colour and mono operation. + o Add XGI (Trident) Volari XP5 support to the trident driver. -3.2.13 savage +3.2.13 via - o Fix HW cursor state on VT switching. + o Add a "ConnectedDevice" option to the via driver to force selection of + output devices. - o Disable the RANDR extension when using rotation. +3.2.14 vmware - o Turn off the back light on panels when DPMS "off" mode is activated. + o Implement a workaround in the generic int10 module to allow unaligned + I/O access specific to VMWare's second generation emulated adapter. - o Allow black as an Xv colour key. +3.2.15 xgi -3.2.14 sis + o A new driver for the Volari V3XT, V5, V8, Z7 chipsets. - o Fix some modes for 1400x1050 and 1600x1200 panels. +3.3 Input Driver Enhancements - o BIOS data layout-related fixes for 661/741/760. +3.3.1 keyboard - o Xv fixes. + o Ignore KEY_UNUSED scancodes. - o Fix LCD support for ECS A90x and ECS A907. +3.3.2 mouse - o Add video blitter as a second Xv adaptor for the M650/651 and later. + o Fix auto-detection of Sun mice on Linux/SPARC. - o Add (display?) hot plug support. +3.3.3 magictouch - o Add preliminary support for the SiS340. + o Port of the magictouch driver to XFree86 4.x. - o Fix bad external symbols in this driver module. +3.4 XKB updates -3.2.15 sunffb + o Replace the macintosh/fr map with the "fr_new" map, release 4. - o Fix a segfault when acceleration is disabled. + o Fix a bug in XKB group adjustment. -3.2.16 vesa + o Fix off-by-one errors in XKBMalloc.c. - o Do not attempt to set the palette format for depths greater than 8. - This fixes a problem on some platforms. + o Shrink tables instead of only growing them. - o Fix a substantial memory leak on server regeneration. + o Fix various vmodmap vs modmap cut and paste bugs. - o Fix screen blanking for non-VGA compatible modes. + o Improve synthesized core X events for reporting XKB changes to XKB- + unaware clients. - o Blank the screen at startup, so that the contents of the previous ses- - sion are not initially visible. + o Fix a setxkbmap segfault. -3.2.17 via + o Add Eszett (ssharp) to the us_intl map. - o Restructuring and acceleration cleanups. + o Add dvorak_intl map. - o Fix some DRM-related problems. + o Add a Khmer layout. - o Cleanup the DDC/EDID retrieval. + o Add multimedia keysyms for the Inspiron 6000 laptop to the "inspiron" + set. -3.2.18 vmware +3.5 X Server and Extension Updates - o Various register state save/restore fixes. + o Updates to the handling of the X server RGB database: - o Fix host-cursor mode. + o Ignore white space, dash, and underscore characters, as well as + case when matching colour names, and remove the unnecessary dupli- + cates in rgb.txt. - o Allow any reasonable depth if 8BIT_EMULATION is set, supporting non-host - depths. + o Allow a copy of the RGB database to be included into the X servers + as a fallback for when the rgb.txt file cannot be found. - o Set the "monitor" parameters to allow the default resolution to be a - little smaller than the host resolution rather than simply 640x480. + o Remove the (unused) support for DBM-compiled RGB database files. -3.3 Input Driver Enhancements + o Make the AMD64/x86_64 platform tests consistent throughout. -3.3.1 keyboard + o Rework the way that extension support is built into the servers to allow + for servers with different sets of extensions in the same build. This + includes minimising the number of pervasive extensions, and adding DIX + helpers for extensions such as Xinerama and XCSECURITY. - o A bug in the application of the Linux KDKBDREP ioctl has been fixed, - preventing unnecessary use of a fallback that directly programs the key- - board hardware and produces warning message with recent Linux kernels. + o Modify the X server handling of SIGINT to provide a faster exit path + than SIGTERM, while ensuring that all hardware state gets restored. + This change is used by xinit as a cleaner alternative to using SIGKILL + for a slowly exiting server. - o Differentiate between Alt+Ctrl+SPECIAL and Alt+Ctrl+Shift+SPECIAL key - sequences. +3.5.1 Loader - o Avoid various keycode conversions on NEC PC-98 platforms. + o Add support for relocation type 10 for Alpha to the ELF loader. - o Fix off-by-one problem for keys on FreeBSD/sparc64. + o Fix issues with Linux/SPARC 2.6 kernels. -3.3.2 mouse + o Add loader infrastructure to implement inter-module version checks. - o Add a serial PNP entry for the Genius NetScroll+ mouse. + o Use mprotect on NetBSD. - o Fix a problem with the wsmouse driver losing events on 64-bit architec- - tures. + o Fix support for NetBSD/arm. - o Add/improve protocol and device auto-detection for FreeBSD, Linux, - NetBSD, OpenBSD, and SunOS/Solaris, eliminating the need to provide any - of this information in the config file in the majority of situations. + o Add support for R_SPARC_OLO10 relocations. - o Increase the maximum number of buttons supported from 12 to 24. + o Make error messages for unsupported relocations more useful. - o Fix a multiple-free bug, that could lead to a crash. + o Improve the loader server's emulation of shmctl() calls. -3.3.3 elographics + o Fix some problems with the a.out header macros used by the loader, which + was causing incorrect header interpretation for some a.out object types. - o Fix problems where the driver gets out of sync under heavy loads. + o Major loader enhancements, including: - o Add an "AllowNoCntl" option, which allows the driver to be used with - some other protocols, like the SmartSet 2500s, which share the same - default protocol. + o Per-module export symbol lists. - o Fix a problem with the cursor not correctly following the touch in a - dual-head configuration. This fix has also been applied to other rele- - vant input drivers. + o Improved symbol hash. -3.3.4 eloinput + o A mechanism for specifying the scope of symbols. - o A new driver for ELO Graphics 2500U USB touch screens. + o Keep track of relocations, and undo them when they become unre- + solved on module unload, and recalculate them when they change on + module load. -3.3.5 fpit + o Check relocations on each module load/unload, ensuring that func- + tion references that are unresolved at any time are always mapped + to the catch-all function, preventing calls into nowhere. - o Add support for the passive pen of the Stylistic 2400. + o Efficient handling of invariant relocations. - o Fix some driver bugs. + o Cleanup/update the memleak stack trace code, and print a stack + trace when an unresolved function is called or when XFree86 aborts. -3.4 XKB updates + o Update the catch-all function to identify the unresolved function + that was called. - o Update the Hindi/Devanagari map. + o Read the XFree86 executable's symbol table in order to get the most + useful stack traces, and use dladdr() where available for identify- + ing shared library references. - o Add Sorbian map. + o Cleanup and unify debug messages for the loader components. - o Add German Dvorak map. + o Use module-instance-specific referenced and required symbol lists. - o Fix wrong brokenbar keysym in the de_CH map. + o Update drivers to make use of some of the new loader functionality, + including the instance-specific ref/req lists, and some unloading + of modules when they are no longer needed. - o Rename the microsoftprose keyboard model to microsoftprousb because it - is not Swedish-specific but a common USB variant. + o Don't build the coff loader on platforms that it doesn't support. - o Add nodeadkeys variant to the gb map. + o Use stronger typing of the module-visible instance-specific module + descriptor. - o Replace the comma keysym on the KPDL key in the Brazilian map with - KP_Separator. + o No longer disable xf86UnloadSubModule() since the loader now han- + dles unloads and reloads cleanly. - o Add multi-layout compatible Hungarian, Azerbaijani, Canadian, Mongolian, - and Vietnamese maps. + o Do not defer unloading drivers when using autoconfig, since that is + not necessary with the loader updates. - o Update Serbian map with new variant. +3.5.2 XFree86 core server and modules - o Add Genius KB-12e model to the inet map. + o Modify the handling of preferred EDID modes to allow user-specified + modes that are larger than the preferred mode. - o Update ABNT2 geometry (including two variants) and change the Brazilian - map to avoid ABNT2 specific keycodes section. + o Refine VGA routing emulation through Sun's Simba P2P bridges. - o Add Classical Latin map. + o Allow a static server's -configure to generate an XF86Config for the + loader server. - o Replace the Latvian map with a new one. + o Fix a bug relating to the forwarding of 64-bit memory addresses by PCI- + to-PCI bridges on 32-bit systems. - o Fix some errors in the Dzongka/Tibetan map. + o Fix a bug in the decoding of I/O forwarding by Cardbus bridges. - o Add ur_PK (Urdu) map. + o Update -configure to detect when wscons support should be used for the + keyboard on NetBSD. - o Fixes for the Bengali map. + o Fix an endianness bug in the xf4bpp module. - o Add Sinhala (Sri Lanka) map. + o Fix some of the endianness bugs in the vbe module. - o Add missing keycode to the "xfree86" keycodes files. + o Remove obsolete VBE functions that have not been compiled-in for some + time. - o Update the mapping for the Microsoft Natural Multimedia keyboard. + o Fix VBE's reporting of video memory size. - o Fixes for the Croatian map. + o Re-implement Alpha kludge in x86emu's ops.c to be more portable. - o Add a Polish variant to the French keyboard layout. + o Intercept "raw" requests for PCI configuration space from video BIOSes + on all architectures. - o Add a standard Kyrgyz map. + o Handle unaligned I/O requests more gracefully and be more tolerant of + spurious I/O errors in the int10 module. -3.5 X Server and Extension Updates + o Make sparse I/O masks more portable throughout the server. - o Mesa as used in the XFree86 "GLcore" module for indirect GLX rendering - has been updated to version 6.2.1. + o Fix a long-standing off-by-one bug in the setting of RGB offsets when + the driver supplies RGB masks. - o Fixed bugs in the Screen Saver extension that could cause an X server - crash. + o Make I/O error handling more reliable on SPARC. - o Fixed a bug in the X-Resource extension that could cause an X server - crash when the client host and server host have different endianness. + o Change the OS-specific module subdirectory name for all SunOS variants + from "solaris" to "sunos". - o Added support to the Xvfb server for specifying the screen origins when - Xinerama is enabled. + o Port of SBUS drivers to SunOS variants. This also allows for multihead + using a mix of SBUS and PCI devices. - o Ensure that the Xvfb's root window depth and visuals are set correctly. + o Fix text mode restore on x86/Solaris 8 and later. - o Work around bug in Mac OS X 10.1's AppKit that causes rootless XDarwin - to lock up when creating windows + o Change autoconfiguration to include PCI and SBUS BusIDs in generated + device sections. This fixes some problems when fbdev is active. - o Fix XDarwin's launch of X clients by double clicking in the Finder when - there is a space in the path. + o Prevent the sharing of a PCI entity by more than one driver. - o Allow XDarwin to interpret scroll wheel mouse events correctly when the - shift key is held down. + o Insulate various common layer functions against out-of-bounds entity + indices. - o Add initial XInput support for XDarwin. + o Fix XAA's support for TRIPLE_BITS_24BPP on big-endian systems. - o Add an option for XDarwin to always use Mac command key equivalents. + o Fix unaligned access in XAA's handling of 24bpp. - o Make XDarwin not default to StaticColor on ix86. + o The xf24_32bpp module is no longer used by any of our drivers, so don't + include it in static builds. - o Fix a bug that caused restacks to be optimized away in rootless mode. + o The xf8_32wid module is only used by the sunffb driver, so don't include + it in non-SPARC static builds. - o Add support for dynamic screen configuration changes in rootless XDar- - win. + o Fix generic int10 memory accesses on little-endian systems. - o Fix a problem with multiple glyphs in the RENDER extension's RenderAddG- - lyphs that caused malloc corruption. + o Fix a SEGV that can occur under certain builds of glibc 2.3.4 and up, + when linux/int10 attempts to determine kernel support for the vm86() + system call. - o Fix a segfault when XAA's overlay acceleration is invoked with the - XaaNoSolidFillRect option. + o Add an xf86DeallocateGARTMemory() function. - o Fix the disabling of individual DPMS states. + o Make autoconfig stop at the first successful probe on each retry, min- + imising unnecessary probes. - o Rework the XFree86 server's SBUS code so that SBUS adapters are properly - detected on SunOS. +3.5.3 TinyX - o Auto-detect DPMS support based on EDID data. + o Allow build-time selection of which font renderers get built in to the + TinyX servers. - o Fix DPMS enable/disable logic. + o Fix a problem where VT switching back to TinyX servers was failing due + to blocking on keyboard read. - o Allow multiple probe phases when using automatic configuration, which - allows the driver search to continue after failures at the PreInit - stage. + o Fix a TinyX build issue under !XserverStaticFontLib. - o Update the static XFree86 driver list to allow automatic configuration - to work with statically linked XFree86 servers. + o Move Xserver/*/tiny directories under Xserver/hw/tinyx. - o Add a '-autoconfig' command line option to the XFree86 server to enable - automatic configuration even when a configuration file is present. + o TinyX build fixes. - o Integrate the TinyX servers into the standard XFree86 build. +3.5.4 Xnest - o Fix a problem where a big request length of zero does not generate a - BadLength error. + o Add a "-noinput" option that allows Xnest to be run in a view-only mode. - o Add a Distributed Multihead X server (DMX) and related extension. +3.5.5 Xsun - o Fix a segfault in the cfb module. + o Fix incorrect bitsPerPixel for depth 12 in pixmap formats advertised by + the Xsun24 server. - o Fixes for the MIT-SHM extension's Xineramafication. +3.5.6 cfb - o Fix detection of phantom PCI devices. + o Fix a bug that occurs when using cfb to tile 32-bit rectangles on SPARC. - o Fix x86emu's handling of the 0xe8 and 0xe9 opcodes. + o cfb24 is no longer needed. Keep the loadable module, but no longer + statically link it into servers. - o Modify x86emu's handling of SHLD/SHRD instructions to allow shifts - greater than 15 for 16-bit operands. This undocumented behaviour is - expected by the BIOS in an SM722 controller. +3.5.7 shadow - o Avoid some references to unloaded data in the XFree86 server, which can - cause crashes in some situations. + o Rewrite shadowUpdateRotatePacked() to reduce cache misses. - o Change the DDC/EDID root window property data from signed to unsigned. +3.5.8 Xinerama - o Fix the XFree86-Misc extension's PassMessage function. + o Cause the server to FatalError() when Xinerama attempts to create a + screen whose root depth has no visuals, causing Xlib to segfault. - o Fix XFree86-DGA for multi-domain architectures. + o Allow Xinerama to initialise even when there is only one screen to com- + bine. - o Extend the XF86Config format and parser/config to allow multiple Monitor - sections to be referenced from a Screen section. + o Make loadable modules and MI independent of Xinerama: - o Allow multiple XFree86 configuration sources to be combined, and add a - -appendauto" command line option to allow automatic configuration data - to be appended to a partial static configuration. + o Add a DIX helper to determine whether Xinerama is active and use it + instead of #ifdef's code in all loadable modules. - o Extend the XF86Config format and parser/config to allow multiple Server- - Flags, Files, and Module sections in a config file. + o Re-implement, as a screen wrapper, Xinerama's PaintWindow*() hacks. - o Use a more complete set of the probed EDID data in determining the - default monitor parameters. + o Move down to DIX Xinerama's only MI hook. - o Add a "preferred" video mode type, which can be obtained from the probed - EDID information, or from the static configuration. This allows the - native video mode to be used by default for digital panels. +3.5.9 XFree86-DGA - o Add tentative support for newer iterations of HP's zx1 chipsets. + o Do not call a screen's PointerMoved entry if a DGA mode is active on + that screen. - o Fix xf86fbman's largest linear area offscreen computation. + o Fix client-side framebuffer mapping on NetBSD. - o Print the XFree86 server's command line in the log file. + o Make sure that DGAShutdown() is always called before HW state is + restored on exit and reset, and make sure that it is not called after + the HW state has been restored. - o Update getconfig to work with older versions of Perl, and to detect when - the version of Perl is too old and when Perl is not available. +3.5.10 Render - o Extend automatic configuration and getconfig to work with SBUS video - devices in SPARC platforms. + o Fix unaligned access in RenderCompositeGlyphs request. - o Update the ValidMode functions in most video drivers to return more spe- - cific status values when a mode is rejected. +3.5.11 RandR -3.6 Client and Library Updates + o Use xf86SetViewport as well as SetCursorPosition during RandR rotation, + as xf86SetViewport will call AdjustFrame to reposition the window if + necessary and avoid the cursor ending up off screen. -3.6.1 Xlib and related libraries + o Add a new function xf86GetRotation() to allow third party modules to + obtain the current rotation. - o Fix an Xlib segfault that may occur when IPv6 XDM-AUTHORIZATION-1 data - is present in the .Xauthority file. + o Fix up error case when rotation fails and the framebuffer needs to be + re-enabled. - o Add WrapHelp.c and enable XdmAuth by default. +3.6 Library, Client and Utility Updates - o Fix a null dereference in libSM when given a bad previous session ID. +3.6.1 Xlib -3.6.2 Xterm + o Fix typos in XErrorDB that were preventing descriptive messages for some + extension errors. -The changes to xterm since XFree86 4.4 are: +3.6.2 Xt -Improved behavior + o Fix an uninitialised pointer dereference in Xt/Initialize.c on WIN32 + platforms that happens if $HOME is set in the environment. - o Change resource settings for color4 and color12, add some discussion in - XTerm-col.ad. + o Add support to Xt's string to float converter to read resources in frac- + tional notation. - o Modify the criteria for disowning primary selection. Previously, this - happened anytime the cursor was moved before the end of the selection. - That would ensure that any insert/delete of char or line, as well as - scrolling, would disown the selection. The new criteria change this to - checking if the operations would modify the data which is highlighted. + o Add some XChar2b string manipulation functions to Xt. - o Change default translations so a BtnDown which is not recognized is sim- - ply ignored rather than emitting a bell. That makes it less obtrusive - when the user tries to use a mouse which provides more capabilities than - the X mouse driver supports, e.g., one with a horizontal scroll wheel. + o Bump the minor revision of the Xt shared library to reflect the fact + that some new interfaces have been added. - o Modify to allow turning UTF-8 mode via escape sequence even if -wc - option was not given at startup. +3.6.3 Xaw - o Add menu items and corresponding actions for switching on/off the UTF-8 - mode and Xft (TrueType) support. + o Extend the tool tip resource for Xaw's simpleWidgetClass to allow a + function to be called - o Modify FreeType support to allow resizing the font, in the same ways the - window can be resized if fixed fonts are used. The relative font sizes - are derived from the fixed font sizes. + o Fix problems with Xaw's label widget when using XChar2b strings. - o Implement blinking text, using the timer for blinking cursor. + o Add a new connectionType property to Xaw's tree widget. - o Add translation to ASCII of commonly-used characters that groff trans- - lates to Unicode, when the font in use does not provide the correspond- - ing glyphs. + o Make Xaw Form widgets inherit dimensions from their parent at widget + initialisation time. - o Modify constraints in form used to layout toolbar, to work with newer - Xaw in XFree86 4.x. + o Add mouse wheel support for Scrollbars in Xaw's Viewport widget. - o Make active-icon work properly when TrueType fonts are used, as well as - when UTF-8 mode is used. + o Fix a performance issue with Xaw's Tree widget caused by useless relay- + outs. - o Improve rendering for Xft, allow it to draw non-linedrawing characters - such as "pi", which were drawn from internal tables with patch #180. + o Fix i18n for Xaw's tooltip widget. - o Modify initialization of 256- and 88-colors so that colors beyond 16 are - normally not X resources. This works around a hard-coded limit in Xt - which breaks xterm when 256-colors and luit are both configured (report - by Noah Friedman). + o Add two new functions that can be used to scroll the content of an Xaw + viewport from outside the viewportWidgetClass. - o Fix problem responding to session management events, e.g., which would - make logging out very slow. + o Fix the cursor in Xaw textWidget when the input field has focus. -Modified behavior + o Bump the minor revision of the Xaw shared library to reflect the fact + that some new interfaces have been added. - o Enable utmpx support for NetBSD 1.6C and newer. + o Add user_data field to Xaw's simpleWidgetClass. - o Modify Help() to make "xterm -h" write to standard output rather than - standard error. + o Fix Xaw viewport scrollbar flickering problem. - o Improve error-reporting for root user by checking if $DISPLAY is set - rather than using the useless message from X11 library. +3.6.4 pswrap - o Improve $WINDOWID for configuration with toolbar by making it refer to - the top-level shell rather than the parent of the current window. For - that case, the parent is a form widget, which does not have a name, - which made the $WINDOWID not very useful as a parameter for xwininfo. + o Fix a problem where pswrap generates a bogus .c file when the -h option + is not used. - o Improve pattern used in uxterm to check for UTF-8 locale, e.g., for - HPUX. + o Document pswrap's -f option. - o Modify uxterm script to use locale program to verify if the derived - locale is installed. +3.6.5 mmapr, mmapw - o Add case to uxterm to accommodate locales ending with "@euro", e.g., - fr_FR.UTF-8@euro. + o Extend mmapr and mmapw on Linux to allow specification of which PCI + address space (I/O or memory) to mmap. - o For Linux, if IUTF8 is defined, e.g., on recent 2.6.x kernels, set the - corresponding flag for the slave pty, to enable UTF-8 interpretation of - backspace in cooked mode. + o Add options to mmapr and mmapw to allow unaligned accesses for testing + purposes - o Modify faceSize resource to use a floating-point internal value. +3.6.6 cpconfig - o Modify XTerm.ad to set saveLines default to 1024. + o Use the same default XF86Config search path as the XFree86 server. - o Change xterm version string to use __vendorversion__ where that is - available, and "XTerm" otherwise. Rather than reporting the version of - X that was current when xterm was modified, it reports the version - against which it was built. +3.6.7 xterm -New resource settings +These changes correspond to xterm patches #200 through #212. - o Add scoFunctionKeys resource, to match manpage. + o Improved behavior - o Add -fd option and resource faceNameDoublesize to specify double-wide - fonts with Xft. + o add a new selection feature: regular expressions, and new + resources which specify what happens on multiple mouse clicks: + on2Clicks, on3Clicks, on4Clicks and on5Clicks. - o Add resource showMissingGlyphs to outline places on the screen where a - font lacks the corresponding glyph. + o improve initialization of toolbar so that individual pulldown menus + are initialized on demand, as they are in the scenario where they + are invoked as popup menus. - o Add resource showBlinkAsBold to control whether blinking text should be - shown as bold or actual blinking text. + o improve error-reporting when chown/chmod of the pseudo-terminal + fails, e.g., if a copy of xterm which was designed to work with + old-style pseudo-terminals is not installed setuid or setgid. - o Add utmpDisplayId resource to allow users to control whether the display - identifier (display number and screen number) are retained in the con- - nection information recorded in utmp. + o add support for interpreting the underline attribute as an italic + font in Xft mode. - o Add bellOnReset resource to allow users to disable bell which sounds on - hard reset since patch #183 changes to DECSCL. + o modify configure script --disable-imake to use the script's defini- + tions anyway if it cannot detect imake. -New configure script options + o improve resource files to show how the menubar and popup menus can + be colored. - o Add --disable-setuid option to configure script. + o modify initialization of allowSendEvents and allowWindowOps to pre- + vent modification with the editres protocol. - o Add --disable-full-tgetent option to configure script, allowing one to - ignore a termcap library in favor of ncurses/curses. + o improved some of the built-in line-drawing glyphs. -Other new features + o set the _NET_WM_PID property. - o Add mini-luit feature, which supports Latin9 directly rather than via - luit, provided that Unicode fonts are used. + o update table for mk_width() from UnicodeData 4.1.0. - o Add dynamic abbreviation support like Emacs. + o implement the remaining pieces to make xterm allocate cells for + wide-characters when the "UTF-8" menu entry is selected. Also, + load the UTF-8 font when that menu entry is selected, or the escape + sequence for UTF-8 mode is received : - o Add "erase2" and "eol2" keywords to ttyModes resource, for recent/cur- - rent FreeBSD. + o improve behavior when switching to UTF-8 mode after startup so + xterm will check if the current fonts are already wide + (ISO-10646-1). If they are not, xterm will use the utf8Fonts sub- + resource to load appropriate fonts. -Bug-fixes (see http://invisible-island.net/xterm/xterm.log.html for a more -complete list): + o modify initialization for wide-bold fontname, to search for one if + none is given. - o Modify initialization and cleanup of utmp data to also compare the - ut_line member. + o modify interaction between +u8 and locale resource to allow the + command-line option to override the resource. - o Correct table entry for DEL in the ground state, which marked it as a - printable character from patch #171. + o modify initialization to decide whether to default to built-in + wcwidth() versus system's version based on the starting locale and + whether the system's version is poor quality. - o Correct change from patch #157 which uses getlogin() to check for an - alias; the storage used for the related getpwuid() call was overwritten - by the data used for comparison. + o make paste of UTF-8 faster for Western character sets by checking + range of incoming data. - o Correct case of SCS for character set 0 (line-drawing) to allow it to be - selected into GR. + o improve initialization due to utf8 resource by loading the + utf8Fonts resource in the case where locale resource is false. + Also in this case, do not disable switching UTF-8 mode on/off. - o Modify creat_as() to only fork if xterm is actually running as setuid - and/or setgid. This works around a Cygwin bug which hangs when logging - is enabled and makes xterm a little faster for systems using interfaces - such as utempter. + o Modified behavior - o Modify Cleanup() to avoid operations such as X calls that might use - unsafe functions when it is called by a signal handler. + o modify parsing of OSC (and SOS, etc), strings so their contents are + not interpreted as UTF-8. This allows non-ASCII title strings to + be set, provided that the window manager complies. - o Check for type of failure in xim_real_init() to avoid looping when the - problem is an unsupported input method rather than a failure to connect - to the XIM server. Problem was introduced in patch #175. + o modify parsing of control sequence CSI T to allow scroll-down to be + sent while mouse tracking is enabled. - o Add missing #undef OPT_SESSION_MGT to xtermcfg.hin to make the configure - script's --disable-session-mgt option work. + o modify command-processing to accept an optional parameter that + tells xterm which shell program to use. - o Correct options parsing for -into option so it can be combined with -e. + o change xterm manpage to show the actual color resource names XtDe- + faultForeground and XtDefaultBackground rather than black and + white. - o Make escape sequence reporting dynamic colors consistent with the logic - that sets it; choosing the opposite color when reverse video is set. + o modify xterm-new terminfo entry to use capabilities for shifted + scroll forward/reverse as shifted cursor up/down. - o Fix a repainting bug introduced in patch #180: when using a font lack- - ing line-drawing characters, a repaint of the screen could skip horizon- - tally an extra amount after filling in the missing character. + o remove menu entry for "Enable Curses Emulation" (to make room for + "Select To Clipboard"). - o Modify terminfo to accommodate luit, which relies on G1 being used via - an ISO-2022 escape sequence. Note that this relies in turn on bug fixes - in ncurses after the 5.4 release. + o modify resource files to make the font-resources a little more spe- + cific, e.g., changing "*VT100*" to "*VT100.", to make the distinc- + tion between VT100.font and VT100.utf8Fonts.font sharper, in case a + packager modifies one of those. -3.6.3 Luit + o allow cursor to have the same color as foreground (text), since it + is rendered as reverse. - o Fix a synchronization problem with luit's handling of tty settings. + o modify Imakefile to use setgid mode for installing with Linux, + OpenBSD and FreeBSD. - o Extract information from the pty before forking rather than after, to - avoid conflicting with the child process's modifications to the line. + o New resource settings -3.6.4 GLX/DRI + o add utf8Title resource and menu entry, allowing the user to control + whether title strings are interpreted as ISO-8859-1 or UTF-8 encod- + ing. - o Mesa and its DRI drivers have been updated to version 6.2.1, plus some - bug fixes. + o add scrollBarBorder resource. - o Add a 915G DRI driver. + o add resource selectToClipboard, action set-select and a menu entry + to allow users to switch between PRIMARY and CLIPBOARD for + select/paste. - o Fix a GLX multi-thread bug. + o add resource mkWidth and command-line option -mk_width to control + whether xterm uses the built-in version of wcwidth(). -3.6.5 twm + o add resource settings for minimum/maximum input buffer size, and + call to sched_yield to improve performance with newer Linux kernels - o Add support for XPM icons. + o add simpler resource keyboardType which, when set, overrides the + individual keyboard-type resources and eliminates the possibility + of conflict between them. - o Add IconMaxWidth and TitleIndent configuration parameters. + o New configure script options -3.6.6 xdm + o the --with-utmp-setgid allows the packager to configure xterm to + use setgid permissions for utmp. - o Improve the operation of IPv6-enabled xdm when the platforms's IPv6 sup- - port is disabled. + o add configure option --enable-readline-mouse, which turns on the + experimental OPT_READLINE code. - o Make use of Xlib's _XGetHostname rather than attempting to duplicate it. + o add --enable-narrowproto configure option to accommodate X.org + "modular" build. - o Fix sessreg for NetBSD. + o add configure --with-app-defaults option to allow app-defaults + directory for install-rules to be customized. - o Update docs and config to handle authDir being in a non-default loca- - tion. + o add configure option --with-tty-group to help work around deficien- + cies in packager's build environment. -3.6.7 xfs + o add configure --with-setuid and --with-reference options to allow + packagers more flexibility in customizing install permissions. - o Fix log file opening with the '-user nobody' option. + o add configure --with-symlink option to make it simpler to install + successive versions of xterm renamed using the --program-prefix, + etc., options with a symbolic link pointing to the most recent. -3.7 I18n and Fonts + o add a configure check for the actual path of luit, to work around + broken imake configurations. - o FreeType has been updated to version 2.1.8. + o add a configure check for pkg-config. - o The FreeType-1.x based X-TrueType XFree86 server font backend has been - retired. The functionality it provides is now available in the - "FreeType" font backend. The old "xtt" module is now a wrapper that - loads the "freetype" module. + o modify install rule for uxterm to account for the --program-prefix, + etc., options by invoking the transformed name of xterm rather than + simply "xterm". - o A bug that prevented the VeraIt.ttf font from being installed has been - fixed. + o modify configure --with-app-defaults option to allow --without-app- + defaults. - o Fix a problem that could cause apps using the zh_CN.UTF-8 locale to - crash. + o add configure option --disable-leaks. - o Fix freetype module segfault with some Type1 fonts. + o add experimental option to allow applications to get or set the + selection data as a BASE64 string. - o Replace unicode keysyms in the en_US.UTF-8 Compose file with "tradi- - tional" ones where such keysyms exist. + o Other new features - o Fix the ct_encoding sequence in the zh_CN.gbk locale. + o add select-cursor-extend() action. - o Update the 8859-7 unicode conversion data file to the current version. + o add environment variables $XTERM_SHELL and $XTERM_VERSION. - o Update the gb3212.1980-0 encoding to handle fonts that do not have a - unicode table. + o add menu entry (alt-esc) and corresponding action (alt-sends-esc) + to toggle the eightBitInput resource setting. - o Add encoding files for cns11643-1, cns11643-2, cns11643-3, and - suneu_greek. + o add command-line options (-tb, +tb) and resource toolBar to allow + menu/toolbar to disabled or enabled at startup. - o Add support for the si_LK.UTF-8 locale. + o add extended shift- and control-modifier cursor keys to + "xterm+pcfkeys" terminfo entry to correspond to ncurses 20050430 + patch. - o Reinstate the original mkfontdir program, because its mkfontscale equiv- - alent does not handle creating encodings.dir files as well as is neces- - sary. + o enable lastlogx support for NetBSD (was added, but not enabled in + patch #186). - o Fix for fstobdf generating corrupted BDF files. + o Bug-fixes (see http://invisible-island.net/xterm/xterm.log.html for a + more complete list): - o Update locale info for Kinyarwanda, the language of Rwanda. + o correct typo in configure script's --enable-dec-locator option - o Add nine missing South African locales. + o correct a typo in CF_FUNC_TGETENT introduced in patch #198 fix - o Add extra fontset records into XLC_LOCALE, fixing problems with text - output by Xuft8 functions under non-Unicode locales. + o fix an off-by-one error parsing -S/nn option. - o Add a Kyrgyz locale. + o add a check in Bell to ensure that the VT100 widget is realized, + since it may be called by xtermLoadFont given an incorrect font + resource. -3.8 OS Support Updates + o correct treatment of iconBorderWidth for resizing an active-icon, + and its description in manpage. + + o add a limit check for scrolling margins in a one-line screen, over- + looked in fixes for patch #198. + + o correct computation of width for wide characters with the invisible + attribute. + + o improve fix from patch #198 for Cleanup() by ensuring it is not + called from the SIGCHLD handler. + + o fixes to make -geom option work properly with the toolbar configu- + ration. + + o fix logic in find_utmp, which did not reset result in getutid(), + causing an infinite loop in some conditions. + + o fix a rare case where text would be written with the wrong colors + because output of scrolled text would reset the colors and the new + text would be written with the same colors. + + o implement logic in termcap query to process multiple parameters as + documented in ctlseqs.ms + + o fix buffer size used for termcap query, which was not long enough + for the terminfo "colors" name. + + o initialize the saved-cursor data so a restore-cursor operation + without a preceding save-cursor operation will not modify the fore- + ground color. + + o modify Imakefile to work around old problems in imake configuration + to allow test-builds using xmkmf on Linux. (This was not noticed + since several releases had broken definitions relating to Xft which + were harder to work around). + + o remove default translations for dabbrev-expand() due to conflicts + with existing keyboard arrangements. + + o set icon border width explicitly to work around fvwm problem with + active icon resizing. + + o eliminate a retry for a better-matching bold font, to work around + recent font server changes. + + o modify prefix/suffix transformation in makefile to make uxterm + install properly on Cygwin. + + o correct termcap "me" (mode-end) string so it does not modify the + alternate character set. + + o modify computation of rows/columns on resize to avoid extending + beyond the given limits, e.g., if resizing in response to a "maxi- + mize" in Gnome or KDE which do not use the window manager hints for + this case. - o Numerous fixes and enhancements for the Solaris/SPARC platform support, - including the ability to build 64-bit shared libraries. + o make a special case of resizing work like vt100: a hard reset also + resets the 132/80 mode. The code to support this was present since + X11R5, but not used because the corresponding initial state of the + -132 option was not saved. - o Support added for OpenBSD/amd64. +3.6.8 GLX/DRI - o Differentiate left and right modifier keys on Mac OS X 10.3. + o Mesa build fixes for NetBSD/sparc64. - o Fix some path-related issues on OS/2 with xman and xf86cfg. + o Solaris/SPARC 64-bit libGL fixes. - o Update the transport layer to allow LOCAL SCO connection types to be - used for more than just X protocol connections. +3.6.9 dbedizzy - o Cleanups for the SCO port. + o Resurrect this DBE extension test utility. - o Fixes for FreeBSD/amd64 support. +3.6.10 xclock - o Add support for newer UltraSPARC variants to the SunOS/Solaris and Linux - ports. + o Use the Xaw tooltip to display the date in xclock. - o Understand the PCI bus naming scheme found in Linux 2.6 kernels. +3.6.11 twm + + o Add a new function to allow the window text title to be changed interac- + tively. + + o Allow environment variables to be used in menu names. + + o Add a new "f.totalzoom" function that zooms windows to cover the whole + area of a screen with no window decoration visible. + + o Don't highlight "f.nop" menu items in menus. + +3.6.12 xbiff + + o Add a tooltip to xbiff that shows the number of messages in a mail + folder. + +3.6.13 xdm + + o Fix a potential infinite loop when the "willing" command fails to pro- + duce any output. + +3.6.14 xfd + + o Fix a bug that prevents properly paging through xft fonts beyond 0xFFFF. + +3.6.15 xfs + + o Modify the font server transport messages to go through xfs's logging + mechanism. + + o Fix a bug introduced when syslog support was added that prevents exit on + fatal errors. + +3.6.16 xinit + + o Send SIGINT to slowing exiting X servers instead of SIGKILL. This works + together with the new SIGINT handling in the X servers, and results in a + clean exit. Sending SIGKILL only results in the hardware state not + being restored, often requiring a reboot to recover from. + +3.6.17 xmessage + + o Fix a bug in the handling of escapes in button labels. + +3.6.18 xvidtune + + o Fix the -timeout option. + +3.7 I18n and Fonts + + o Update mkfontscale's handling of font weights. + + o Replace lib/font/fontfile/decompress.c with a version derived from BSD's + src/usr.bin/compress/zopen.c. + + o Modify the fontconfig library to use getpwnam/getpwuid to find the home + directory when $HOME is not set. + + o Fix a bug in fontconfig's pattern matching that can cause FcFontMatch() + to fail when it shouldn't. + + o Fix a double-free problem in fontconfig. + + o Rework printf format specifiers used in XLFD code to make them more por- + table and avoid infinite loops in some glibc versions. + + o Update the Serbian locale naming to reflect the country's name change + from "Yugoslavia" to "Serbia and Montenegro". + +3.8 OS Support Updates + + o Fix some cases in the Darwin build where a variable is declared static + and later as extern. + + o Avoid /tmp files in NetBSD.cf's man page creation. + + o Install man page source as well as formatted man pages on NetBSD. + + o Fix a problem where builds would continue past errors on NetBSD. 4. Drivers 4.1 Video Drivers -XFree86 4.5.0 includes the following video drivers: +XFree86 4.6.0 includes the following video drivers: +--------------+--------------------------+--------------------------------+ |Driver Name | Description | Further Information | +--------------+--------------------------+--------------------------------+ |apm | Alliance Pro Motion | README.apm | |ark | Ark Logic | | + |aspeed | ASPEED Technology | | |ati | ATI | README.ati, README.r128, | | | | r128(4), radeon(4) | |chips | Chips & Technologies | README.chips, chips(4) | @@ -839,10 +1013,11 @@ |tga | DEC TGA | README.DECtga | |trident | Trident | trident(4) | |tseng | Tseng Labs | | - |via | VIA | via(4) | |vesa | VESA | vesa(4) | |vga | Generic VGA | vga(4) | + |via | VIA | via(4) | |vmware | VMWare guest OS | vmware(4) | + |xgi | Xabre Graphics Inc | xgi(4) | +--------------+--------------------------+--------------------------------+ Drivers marked with (*) are present in a preliminary form in this release, @@ -857,7 +1032,7 @@ 4.2 Input Drivers -XFree86 4.5.0 includes the following input drivers: +XFree86 4.6.0 includes the following input drivers: +------------+----------------------------------+---------------------+ |Driver Name | Description | Further Information | @@ -875,6 +1050,7 @@ |js_x | JamStudio pentablet | js_x(4) | |kbd | generic keyboards (alternate) | kbd(4) | |keyboard | generic keyboards | keyboard(4) | + |magictouch | MagicTouch ProE-X | magictouch(4) | |microtouch | MicroTouch | | |mouse | most mouse devices | mouse(4) | |mutouch | MicroTouch | | @@ -901,7 +1077,7 @@ usually, dynamically, and in that manner load the video drivers, input driv- ers, and other modules that are needed. -XFree86 4.5.0 has X server support for most UNIX® and UNIX-like operating +XFree86 4.6.0 has X server support for most UNIX® and UNIX-like operating systems on Intel/x86 platforms, plus support for Linux and some BSD OSs on Alpha, PowerPC, IA-64, AMD64, SPARC, and Mips platforms, and for Darwin on PowerPC. Support for additional architectures and operating systems is in @@ -997,7 +1173,7 @@ 6.7 DGA version 2 -DGA 2.0 is included in 4.5.0. Documentation for the client libraries can be +DGA 2.0 is included in 4.6.0. Documentation for the client libraries can be found in the XDGA(3) man page. A good degree of backwards compatibility with version 1.0 is provided. @@ -1052,7 +1228,7 @@ overlays and other image operations not possible with the core X rendering system. -XFree86 4.5.0 provides a partial implementation of Render sufficient for +XFree86 4.6.0 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. @@ -1087,12 +1263,12 @@ 6.11.2 FreeType support in Xft -XFree86 4.5.0 includes sources for FreeType version 2.1.8, and, by default, -they are built and installed automatically. +XFree86 4.6.0 includes sources for FreeType version 2.1.8, and, by default, +it is built and installed automatically. 6.11.3 Application Support For Anti-Aliased Text -Only three applications have been modified in XFree86 4.5.0 to work with the +Only three applications have been modified in this release 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. @@ -1251,7 +1427,7 @@ 6.21 Luxi fonts from Bigelow and Holmes -XFree86 now includes the ``Luxi'' family of Type 1 fonts and TrueType fonts. +XFree86 includes the ``Luxi'' family of Type 1 fonts and TrueType fonts. This family consists of the fonts ``Luxi Serif'', ``Luxi Sans'' and ``Luxi Mono'' in Roman, oblique, bold and bold oblique variants. The True- Type version have glyphs covering the basic ASCII Unicode range, the Latin 1 @@ -1276,7 +1452,7 @@ 7. Credits -This section lists the credits for the XFree86 4.5.0 release. For a more +This section lists the credits for the XFree86 4.6.0 release. For a more detailed breakdown, refer to the CHANGELOG file in the XFree86 source tree, the cvs-commit archives , or the 'cvs log' information for individual @@ -1284,77 +1460,61 @@ New Features, Enhancements and Updates: - Xterm enhancements and updates: - Thomas Dickey + Security Updates: + Marc La France. + + ASPEED Technologies driver: + Y. C. Chen, ASPEED Technologies. - Integrate TinyX into the mainline XFree86 build: - X-Oz Technologies + Xabre Graphics driver: + Jong Lin, XGI. - Intel i915GM support, dual head i830/i855/i915 support: - Tungsten Graphics, Alan Hourihane, Keith Whitwell + X server extension rework: + Marc La France. - Automatic configuration enhancements: - X-Oz Technologies, David Dawes + Loader Enhancements: + David H. Dawes, X-Oz Technologies. - Distributed Multihead X: - Kevin Martin, Rik Faith + Intel i945G/i945GM support and other driver enhancements: + Alan Hourihane, Tungsten Graphics. - Preliminary work on SunOS/SPARC and IRIX ports: - Marc La France + NVIDIA driver updates and new hardware support: + Mark Vojkovich + + Improved SunOS/SPARC and SBUS support: + Marc La France. + + Xterm enhancements and updates: + Thomas Dickey. + + Xaw enhancements: + Alexander Pohoyda. Integration: General Integration of Submissions: - David H. Dawes, Marc La France, Alan Hourihane, Ivan - Pascal. - - DRI Integration: - Alan Hourihane, David H. Dawes. + Marc La France, David H. Dawes. Release Engineering: David H. Dawes. Patches and other submissions (in alphabetical order): - Szilveszter Adam, Tim Adye, Taneem Ahmed, Andrew Aitchison, Raoul - Arranz, Zaeem Arshad, Dwayne Bailey, Ilyas Bakirov, Denis Bar- - bier, Kyle Bateman, J. Scott Berg, Thomas Biege, Dmitry - Bolkhovityanov, H Merijn Brand, Peter Breitenlohner, Benjamin - Burke, Dale L Busacker, busmanus, Julian Cable, Mike Castle, - David M. Clay, Philip Clayton, Alan Coopersmith, Ricardo Cruz, - Michel Dänzer, J. D. Darling, David Dawes, Michael Dawes, Rafael - Ávila de Espíndola, Rick De Laet, Josip Deanovic, Angelus Dei, - Laurent Deniel, Thomas Dickey, Stefan Dirsch, Charles Dobson, DRI - Project, Emmanuel Dreyfus, Boris Dusek, Georgina O. Economou, - Egbert Eich, Bernd Ernesti, Chris Evans, Rik Faith, Adrian - Fiechter, Matthew Fischer, FreeType Team, Terry R. Frienrichsen, - Christopher Fynn, Hubert Gburzynski, Nicolas George, Frank - Giessler, Fred Gleason, Dmitry Golubev, Alexander Gottwald, Her- - bert Graeber, Miroslav Halas, John Harper, Harshula, John - Heasley, Matthieu Herrb, David Holl, Alex Holland, Peng Hongbo, - Alan Hourihane, Harold L Hunt II, Alan Iwi, Timur Jamakeev, Paul - Jarc, Kean Johnston, Nicolas Joly, Mark Kandianis, Kaleb Keith- - ley, Chamath Keppitiyagama, Jung-uk Kim, Satoshi Kimura, Michael - Knudsen, Vlatko Kosturjak, Alexei Kosut, Anton Kovalenko, Joachim - Kuebart, Marc La France, David Laight, Zarick Lau, Pierre Lalet, - Michael Lampe, Lanka Linux User Group, Nolan Leake, Werner Lem- - berg, Dejan Lesjak, Noah Levitt, Greg Lewis, Bernhard R Link, - Jonas Lund, S. Lussos, Torrey T. Lyons, Roland Mainz, N Marci, - Kevin Martin, Stephen McCamant, Mesa Developers, Luke Mewburn, - Petr Mladek, Bram Moolenaar, Steve Murphy, Ishikawa MUTSUMI, Radu - Octavian, Lee Olsen, Greg Parker, Ivan Pascal, Alexander E. - Patrakov, Mike Pechkin, Soós Péter, Zvezdan Petkovic, Alexander - Pohoyda, Xie Qian, Bill Randle, Adam J. Richter, Tim Roberts, - Bernhard Rosenkraenzer, Andreas Rüden, Steve Rumble, Oleg Safi- - ullin, Ty Sarna, Leo Savernik, Barry Scott, Shantonu Sen, Yu - Shao, Andreas Schwab, Matthias Scheler, Dan Shearer, Michael - Shell, Paul Shupak, Alexander Stohr, Marius Strobl, Mikko Markus - Torni, Jess Thrysoee, Izumi Tsutsui, Tungsten Graphics, Ryan - Underwood, Tristan Van Berkom, Michael van Elst, Phillip Vandry, - Roman Vasylyev, Luc Verhaegen, Rodion Vshevtsov, Mark Vojkovich, - Edi Werner, Keith Whitwell, Scot Wilcoxon, Dave Williss, Thomas - Winischhofer, Kuang-che Wu, X-Oz Technologies, Chisato Yamauchi, - Michael Yaroslavtsev, David Yerger, Su Yong, Hui Yu, Sagi Zeevi, - Christian Zietz + ASPEED Technologies, Andrew Aitchison, James Ascroft-Leigh, + Étienne Bersac, Peter Breitenlohner, Terry Chang, Y. C. Chen, + Jeff Chua, James Cloos, Alan Coopersmith, Miguel González + Cuadrado, David Dawes, Thomas Dickey, Stefan Dirsch, Bernd + Ernesti, Jordan Frank, Will L G, Frank Giessler, Thorsten Glaser, + Damian Janusz Gruszka, Lukas Hejtmanek, Evil Mr Henry, Jens Her- + den, Alan Hourihane, Nicolas Joly, Bang Jun-Young, Alexander + Kabaev, Satoshi Kimura, Milos Komarcevic, Marc La France, Dejan + Lesjak, Khong Jye Liew, Jong Lin, Michael Lorenz, Michael + Macallan, Michal Maruska, Luke Mewburn, Timothy Musson, Newsh, + Takaaki Nomura, Ivan Pascal, Bob Peterson, Pierre, Aaron Plat- + tner, Alexander Pohoyda, Jeremy C. Reed, Conrad Schuler, Bruno + Schwander, Olaf Seibert, Aaron Solochek, Helmar Spangenberg, Ken + Stailey, Tobias Stoeckmann, Tungsten Graphics, James Richard + Tyrer, Staffan Ulfberg, Denis Vlasenko, Mark Vojkovich, Tom + Williams, Dave Williss, X-Oz Technologies, XGI, Christos Zoulas. Webmaster: Georgina O. Economou @@ -1381,7 +1541,7 @@ This product includes software developed by X-Oz Technologies (http://www.x- oz.com/). - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.135 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.142 dawes Exp $ -$XFree86: xc/RELNOTES.txt,v 1.4 2005/03/17 01:11:52 dawes Exp $ +$XFree86: xc/RELNOTES.txt,v 1.7 2006/04/29 03:38:00 dawes Exp $ Index: xc/registry diff -u xc/registry:1.8 xc/registry:1.9 --- xc/registry:1.8 Wed Jul 9 11:27:23 2003 +++ xc/registry Mon Jan 9 09:56:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: registry,v 1.7 2001/06/01 18:55:58 coskrey Exp $ */ X Registry @@ -1688,4 +1687,4 @@ property type and selection target. The ICCCM spec will be updated in a future release to fully specify UTF8_STRING. -/* $XFree86: xc/registry,v 1.8 2003/07/09 15:27:23 tsi Exp $ */ +/* $XFree86: xc/registry,v 1.9 2006/01/09 14:56:12 dawes Exp $ */ Index: xc/config/Imakefile diff -u xc/config/Imakefile:1.5 xc/config/Imakefile:1.6 --- xc/config/Imakefile:1.5 Sun Feb 6 20:38:22 2005 +++ xc/config/Imakefile Tue Jun 7 04:02:13 2005 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ -XCOMM $XFree86: xc/config/Imakefile,v 1.5 2005/02/07 01:38:22 tsi Exp $ +XCOMM $XFree86: xc/config/Imakefile,v 1.6 2005/06/07 08:02:13 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" @@ -7,7 +6,7 @@ #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" BOOTSTRAPSUBDIRS = imake makedepend -#if BuildDPSLibrary +#if BuildDPSLibrary || BuildDPSTkLibrary PSWRAPDIR = pswrap #endif SUBDIRS = cf util $(BOOTSTRAPSUBDIRS) $(PSWRAPDIR) Index: xc/config/cf/Amoeba.cf diff -u xc/config/cf/Amoeba.cf:3.12 xc/config/cf/Amoeba.cf:3.14 --- xc/config/cf/Amoeba.cf:3.12 Wed Mar 24 22:36:20 2004 +++ xc/config/cf/Amoeba.cf Tue Jul 5 12:43:54 2005 @@ -1,5 +1,4 @@ -XCOMM platform: $Xorg: Amoeba.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.12 2004/03/25 03:36:20 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.14 2005/07/05 16:43:54 tsi Exp $ /* The presence of this configuration file in the X distribution * does not imply full support for the system it describes. @@ -59,14 +58,11 @@ #define BuildFonts NO #define BuildFontServer NO -#define BuildPexExt NO -#define BuildXIE NO #define YaccCmd byacc #define TermcapLibrary /* in libajax */ #define LexLib /* not needed */ -#define PexCCOptions DefaultCCOptions #define ServerOSDefines XFree86ServerOSDefines #define UsrLibDir $(DESTDIR)/profile/module/x11/lib @@ -95,9 +91,6 @@ #define FontDefines -DFONT_SNF #define ConnectionFlags -DAMTCPCONN -DAMRPCCONN #define ServerXdmcpDefines /* no -DXDMCP */ -#define UseRgbTxt YES -#define NdbmDefines -DSDBM -DNDBM -I$(XINCLUDESRC) -#define DBMLibrary /* $(LIBSRC)/sdbm/libsdbm.a */ #if defined(i386Architecture) #ifndef AckToolset Index: xc/config/cf/FreeBSD.cf diff -u xc/config/cf/FreeBSD.cf:3.155 xc/config/cf/FreeBSD.cf:3.159 --- xc/config/cf/FreeBSD.cf:3.155 Wed Mar 2 22:32:17 2005 +++ xc/config/cf/FreeBSD.cf Tue Oct 25 12:58:48 2005 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.155 2005/03/03 03:32:17 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.159 2005/10/25 16:58:48 dawes Exp $ /* * Copyright (c) 1994-2005 by The XFree86 Project, Inc. @@ -162,10 +162,9 @@ # if HasLibPthread # define ThreadsLibraries -lpthread # else -# define BuildThreadStubLibrary YES +# define NeedThreadStubLibrary YES # if OSRelVersion >= 500043 # define NeedUIThrStubs NO -# define ThrStubsForCompat YES # else # define NeedUIThrStubs YES # endif @@ -233,7 +232,7 @@ * * ld: warning: libXThrStub.so.6, needed by libX11.so, not found */ -#if BuildThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) +#if NeedThreadStubLibrary && (!defined(UseInstalledX11) || !UseInstalledX11) # define CcCmd $(CLIENTENVSETUP) cc # define CplusplusCmd $(CLIENTENVSETUP) c++ #else @@ -249,7 +248,7 @@ #if defined(UseInstalled) #define DefaultCCOptions /**/ #else -#if defined(HasGcc3) && HasGcc3 +#if (defined(HasGcc3) && HasGcc3) || (defined(HasGcc4) && HasGcc4) #define NoSystemWarn -Wno-system-headers #else #define NoSystemWarn @@ -522,6 +521,10 @@ #define SystemManDirectory /usr/share/man #endif +#ifndef PkgConfigDirectory +#define PkgConfigDirectory $(LIBDATADIR)/pkgconfig +#endif + #define InstKmemFlags -g kmem -m 2755 /* Index: xc/config/cf/Imake.cf diff -u xc/config/cf/Imake.cf:3.91 xc/config/cf/Imake.cf:3.92 --- xc/config/cf/Imake.cf:3.91 Sat Apr 3 17:26:20 2004 +++ xc/config/cf/Imake.cf Mon Jan 9 09:56:12 2006 @@ -1,4 +1,3 @@ -XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ /* * To add support for another platform: * @@ -17,7 +16,7 @@ * * 4. Create a .cf file with the name given by MacroFile. */ -XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.91 2004/04/03 22:26:20 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.92 2006/01/09 14:56:12 dawes Exp $ #if defined(__APPLE__) # undef __APPLE__ Index: xc/config/cf/Imake.rules diff -u xc/config/cf/Imake.rules:3.142 xc/config/cf/Imake.rules:3.149 --- xc/config/cf/Imake.rules:3.142 Sun Jan 23 12:05:23 2005 +++ xc/config/cf/Imake.rules Mon Apr 3 11:59:08 2006 @@ -1,8 +1,8 @@ XCOMM --------------------------------------------------------------------- XCOMM Imake rules for building libraries, programs, scripts, and data files -XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.142 2005/01/23 17:05:23 tsi Exp $ +XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.149 2006/04/03 15:59:08 dawes Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -382,7 +382,7 @@ #endif /* RemoveFiles */ #if RemoveObsoleteFiles -#define RemoveOldFile(new,old,dir) @@\ +#define RemoveOldFile(new,old,dir) \ @if [ -f new ]; then set -x; \ @@\ RemoveFile($(DESTDIR)dir/old); \ @@\ fi @@ -1303,6 +1303,9 @@ InstallTarget(install.ln,Concat(llib-l,libname.ln),$(INSTLIBFLAGS),dest) #endif /* InstallLintLibrary */ +#ifndef OsInstallManPageLongBase +#define OsInstallManPageLongBase(file,destdir,dest,suffix) /**/ +#endif #if !CompressManPages /* @@ -1318,9 +1321,14 @@ @@\ CppManTarget(file,$(EXTRAMANDEFS)) @@\ @@\ -InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX)) +InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX)) @@\ + @@\ +OsInstallManPageLongBase(file,destdir,dest,$(MANSUFFIX)) #endif /* InstallManPageLong */ +#ifndef OsInstallManPageAliasesBase +#define OsInstallManPageAliasesBase(file,destdir,suffix,aliases) /**/ +#endif /* * InstallManPageAliases - generate rules to install manual page aliases. @@ -1336,7 +1344,9 @@ for i in aliases; do (set -x; \ @@\ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.$(MANSUFFIX)); \ @@\ done; \ @@\ - RemoveFile($${TMP})) + RemoveFile($${TMP})) @@\ + @@\ +OsInstallManPageAliasesBase(file,destdir,$(MANSUFFIX),aliases) #endif /* InstallManPageAliases */ @@ -1353,7 +1363,9 @@ install.man:: @@\ MakeDir($(DESTDIR)destdir) @@\ $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ - $(DESTDIR)destdir/dest.suffix + $(DESTDIR)destdir/dest.suffix @@\ + @@\ +OsInstallManPageLongBase(file,destdir,dest,suffix) #endif /* InstallGenManPageLong */ @@ -1371,7 +1383,10 @@ for i in aliases; do (set -x; \ @@\ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $${TMP} $(DESTDIR)destdir/$$i.suffix); \ @@\ done; \ @@\ - RemoveFile($${TMP})) + RemoveFile($${TMP})) @@\ + @@\ +OsInstallManPageAliasesBase(file,destdir,suffix,aliases) + #endif /* InstallGenManPageAliases */ #else /* CompressManPages */ @@ -1704,8 +1719,9 @@ */ #ifndef MakeNamedTargetSubdir #define MakeNamedTargetSubdir(dir,flags,subname)\ + if [ -z "$$_fail" ]; then _fail="exit 1"; fi; \ @@\ (cd dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) \ @@\ - flags subname) + flags subname) || $$_fail #endif /* @@ -1880,15 +1896,25 @@ #endif /* InstallMultipleFlags */ +#ifndef OsInstallMultipleMan +#define OsInstallMultipleMan(list,dest) /**/ +#endif + /* * InstallMultipleMan - generate rules to install a variety of manual pages * during the install.man step of the build. */ #ifndef InstallMultipleMan #define InstallMultipleMan(list,dest) @@\ -InstallMultipleDestFlags(install.man,list,dest,$(INSTMANFLAGS)) +InstallMultipleDestFlags(install.man,list,dest,$(INSTMANFLAGS)) @@\ + @@\ +OsInstallMultipleMan(list,dest) #endif /* InstallMultipleMan */ +#ifndef OsInstallMultipleManSuffix +#define OsInstallMultipleManSuffix(list,dest,suffix) /**/ +#endif + /* * InstallMultipleManSuffix - generate rules to install multiple manual * pages dufing the install.man step of the build, where @@ -1901,7 +1927,9 @@ @MakeFlagsToShellFlags(i,set +e); \ @@\ for i in list; do \ @@\ (set -x; $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) $$i.suffix $(DESTDIR)dest/$$i.$(MANSUFFIX)); \ @@\ - done + done @@\ + @@\ +OsInstallMultipleManSuffix(list,dest,suffix) #endif /* InstallMultipleManSuffix */ @@ -2232,7 +2260,7 @@ */ #ifndef ObjectAsm #define ObjectAsm(options) RemoveFiles($@ $*.i) @@\ - $(CPP) CPPAsmOptions AsmDefines $(DEFINES) $(INCLUDES) options $*.S | \ @@\ + $(CPP) CPPAsmOptions AsmDefines $(ALLDEFINES) options $*.S | \ @@\ grep -v '^\#' > $*.i @@\ $(AS) $(ASMOPTS) -o $*.o $*.i @@\ RemoveFile($*.i) @@ -2296,7 +2324,7 @@ * LibObjCompile - compile fragment for unshared/profiled/debugged objects */ #ifndef LibObjCompile -#if HasGcc || HasGcc2 +#if HasGcc || HasGcc2 || HasGcc3 || HasGcc4 #define LibObjCompile(dir,options) RemoveFiles($@ dir/$@) @@\ ClearmakeOSName \ $(CC) -c $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) \ @@ -2314,15 +2342,15 @@ * LibObjAsm - assemble fragment for unshared/profiled/debugged objects */ #ifndef LibObjAsm -#define LibObjAsm(dir,options,asmopt) RemoveFiles($@ dir/$@ $*.i) @@\ - $(CPP) CPPAsmOptions AsmDefines $(DEFINES) $(INCLUDES) options $*.S | \ @@\ - grep -v '^\#' > $*.i @@\ - $(AS) asmopt -o dir/$@ $*.i @@\ - RemoveFile($*.i) +#define LibObjAsm(dir,options,asmopt) RemoveFiles(dir/$@ dir/$*.i) @@\ + $(CPP) CPPAsmOptions AsmDefines $(ALLDEFINES) options $*.S | \ @@\ + grep -v '^\#' > dir/$*.i @@\ + $(AS) asmopt -o dir/$@ dir/$*.i @@\ + RemoveFile(dir/$*.i) #endif #ifndef LibObjCplusplusCompile -#if HasGcc || HasGcc2 +#if HasGcc || HasGcc2 || HasGcc3 || HasGcc4 #define LibObjCplusplusCompile(dir,options) RemoveFiles($@ dir/$@) @@\ ClearmakeOSName \ $(CXX) -c $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) \ @@ -2458,7 +2486,7 @@ #ifndef CPPOnlyAsm #define CPPOnlyAsm(basename,options) RemoveFile(basename.i) @@\ - $(CPP) CPPAsmOptions AsmDefines $(DEFINES) $(INCLUDES) options basename.S | \ @@\ + $(CPP) CPPAsmOptions AsmDefines $(ALLDEFINES) options basename.S | \ @@\ grep -v '^\#' > basename.i #endif @@ -3065,7 +3093,7 @@ #ifndef NamedTargetSubdirs #define NamedTargetSubdirs(name,dirs,verb,flags,subname) @@\ name:: @@\ - @MakeFlagsToShellFlags(ik,set +e); \ @@\ + @MakeFlagsToShellFlags(ik,set +e; _fail=:); \ @@\ for i in dirs ;\ @@\ do \ @@\ echo verb "in $(CURRENT_DIR)/$$i..."; \ @@\ Index: xc/config/cf/Imake.tmpl diff -u xc/config/cf/Imake.tmpl:3.169 xc/config/cf/Imake.tmpl:3.175 --- xc/config/cf/Imake.tmpl:3.169 Thu Feb 10 22:02:53 2005 +++ xc/config/cf/Imake.tmpl Sun Apr 2 19:12:46 2006 @@ -1,9 +1,9 @@ XCOMM ---------------------------------------------------------------------- XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE -XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.169 2005/02/11 03:02:53 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.175 2006/04/02 23:12:46 dickey Exp $ XCOMM ---------------------------------------------------------------------- /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2005 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -77,6 +77,9 @@ #undef clean #define clean cleandir +#include +#include + #include XCOMM ----------------------------------------------------------------------- @@ -86,6 +89,9 @@ #include #undef BeforeVendorCF +#if defined(HasGcc4) && !defined(HasGcc3) +# define HasGcc3 HasGcc4 +#endif #if defined(HasGcc3) && !defined(HasGcc2) # define HasGcc2 HasGcc3 #endif @@ -992,6 +998,10 @@ #endif #endif +#ifndef PkgConfigDirectory +#define PkgConfigDirectory $(USRLIBDIR)/pkgconfig +#endif + #ifndef ConfigSrc #define ConfigSrc $(TOP)/config #endif @@ -1053,6 +1063,9 @@ #ifndef InstUidFlags #define InstUidFlags -m 4711 #endif +#ifndef InstGidFlags +#define InstGidFlags -m 2755 -g utmp +#endif #ifndef InstLibFlags #define InstLibFlags -m 0644 #endif @@ -1098,8 +1111,11 @@ #ifndef BootstrapCFlags #define BootstrapCFlags /**/ #endif +#ifndef HasGcc4 +#define HasGcc4 NO +#endif #ifndef HasGcc3 -#define HasGcc3 NO +#define HasGcc3 HasGcc4 #endif #ifndef HasGcc2 #define HasGcc2 HasGcc3 @@ -1111,7 +1127,7 @@ #define HasBrokenCCForLink NO #endif #ifndef CcCmd -#if HasGcc2 +#if HasGcc2 || HasGcc3 || HasGcc4 #define CcCmd gcc -fpcc-struct-return #else #if HasGcc @@ -1769,6 +1785,8 @@ #ifdef VarDbDirectory VARDBDIR = VarDbDirectory /* OS location of db/state files */ #endif + PKGCONFIGDIR = PkgConfigDirectory + #ifdef CrossCompileDir AR = CrossArCmd #else @@ -2039,14 +2057,10 @@ #ifdef ProjectRoot PROJECTROOT = ProjectRoot #endif -#ifdef UseInstalled -# if AlternateIncRoot -# define TopInclude -I$(INCROOT) -# else -# define TopInclude /**/ -# endif +#if defined(UseInstalled) && AlternateIncRoot +# define TopInclude -I$(INCROOT) #else -# define TopInclude -I$(TOP) +# define TopInclude /**/ #endif CDEBUGFLAGS = DefaultCDebugFlags @@ -2057,8 +2071,16 @@ * EXTRA_INCLUDES contains project-specific includes set in project incfiles * INCLUDES contains client-specific includes set in Imakefile * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile + * DEVEL_INCLUDES contains sanitised copies of system headers. */ - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + +#ifdef DevelIncludeDir +DEVEL_INCLUDEDIR = DevelIncludeDir +DEVEL_INCLUDES = -I$(DEVEL_INCLUDEDIR) +#endif + + LOCAL_INCLUDES = -I. + ALLINCLUDES = $(LOCAL_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(DEVEL_INCLUDES) $(STD_INCLUDES) ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) Index: xc/config/cf/Imakefile diff -u xc/config/cf/Imakefile:3.31 xc/config/cf/Imakefile:3.32 --- xc/config/cf/Imakefile:3.31 Sat Apr 3 16:45:53 2004 +++ xc/config/cf/Imakefile Mon Jan 9 09:56:12 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/Imakefile,v 3.31 2004/04/03 21:45:53 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Imakefile,v 3.32 2006/01/09 14:56:12 dawes Exp $ XCOMM Some compilers generate fatal errors if an -L directory does XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. Index: xc/config/cf/Library.tmpl diff -u xc/config/cf/Library.tmpl:3.25 xc/config/cf/Library.tmpl:3.27 --- xc/config/cf/Library.tmpl:3.25 Sun Apr 4 22:33:07 2004 +++ xc/config/cf/Library.tmpl Fri Feb 17 13:01:14 2006 @@ -14,12 +14,7 @@ * Define LargePICTable YES if large (32-bit) PIC tables are needed. */ -XCOMM $Xorg: Library.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.25 2004/04/05 02:33:07 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.27 2006/02/17 18:01:14 dawes Exp $ #ifndef DoNormalLib #define DoNormalLib NO @@ -515,6 +510,10 @@ # define LibCreate NO # endif +# if defined(LibCreate) && !LibCreate && !defined(LibBuild) +# define LibBuild NO +# endif + # if !defined(LibCreate) || LibCreate # if DoSharedLib # if HugeLibrary && defined(SharedLibraryTarget3) Index: xc/config/cf/Mips.cf diff -u xc/config/cf/Mips.cf:1.1.1.5 xc/config/cf/Mips.cf:1.2 --- xc/config/cf/Mips.cf:1.1.1.5 Tue Jan 16 16:52:46 2001 +++ xc/config/cf/Mips.cf Mon Jan 9 09:56:12 2006 @@ -15,7 +15,7 @@ #define OSMinorVersion 50 #endif -XCOMM platform: $Xorg: Mips.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/Mips.cf,v 1.2 2006/01/09 14:56:12 dawes Exp $ XCOMM operating system: OSName /*************************************************************************** Index: xc/config/cf/Motif.rules diff -u xc/config/cf/Motif.rules:1.4 xc/config/cf/Motif.rules:1.5 --- xc/config/cf/Motif.rules:1.4 Wed Jan 17 11:22:30 2001 +++ xc/config/cf/Motif.rules Mon Jan 9 09:56:12 2006 @@ -13,7 +13,7 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ -XCOMM $Xorg: Motif.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/Motif.rules,v 1.5 2006/01/09 14:56:12 dawes Exp $ /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject Index: xc/config/cf/Motif.tmpl diff -u xc/config/cf/Motif.tmpl:1.1.1.3 xc/config/cf/Motif.tmpl:1.2 --- xc/config/cf/Motif.tmpl:1.1.1.3 Tue Jan 16 16:52:49 2001 +++ xc/config/cf/Motif.tmpl Mon Jan 9 09:56:12 2006 @@ -13,7 +13,7 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ -XCOMM $Xorg: Motif.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/Motif.tmpl,v 1.2 2006/01/09 14:56:12 dawes Exp $ /* Include the X11 project template file. */ #include Index: xc/config/cf/NetBSD.cf diff -u xc/config/cf/NetBSD.cf:3.127 xc/config/cf/NetBSD.cf:3.131 --- xc/config/cf/NetBSD.cf:3.127 Thu Feb 3 21:58:27 2005 +++ xc/config/cf/NetBSD.cf Mon Apr 24 22:50:27 2006 @@ -1,7 +1,7 @@ -XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.127 2005/02/04 02:58:27 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.131 2006/04/25 02:50:27 dawes Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -507,47 +507,29 @@ */ #define ManSuffix 1 #define FileManSuffix 5 -#define ManSourcePath $(MANPATH)/cat -#define InstallManPageLongBase(file,destdir,dest) @@\ +#define OsInstallManPageLongBase(file,destdir,dest,suffix) @@\ @@\ all:: file.0 @@\ @@\ file.0:: file.$(MANNEWSUFFIX) @@\ - @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\ - then \ @@\ - cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ - cp /tmp/$$$$.man file.0; \ @@\ - $(RM) /tmp/$$$$.man; \ @@\ - fi @@\ + cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > file.0 @@\ @@\ install.man:: @@\ - MakeDir($(DESTDIR)destdir) @@\ - -@if [ -f file.0 ]; \ @@\ + @catdir=`echo destdir | sed -e s,man/man,man/cat,`; \ @@\ + MakeDirInline($(DESTDIR)$$catdir); \ @@\ + if [ -f file.0 ]; \ @@\ then \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\ + (set -x; $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)$$catdir/dest.0); \@@\ fi @@\ @@\ clean:: @@\ RemoveFile(file.0) -#define InstallManPageLong(file,destdir,dest) @@\ -BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ - @@\ -CppManTarget(file, $(EXTRAMANDEFS)) @@\ - @@\ -InstallManPageLongBase(file,destdir,dest) - -#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ -BuildInstallHtmlManPage(file,dest,suffix) @@\ - @@\ -CppManTarget(file, $(EXTRAMANDEFS)) @@\ - @@\ -InstallManPageLongBase(file,destdir,dest) - -#define InstallMultipleMan(list,dest) @@\ +#define OsInstallMultipleMan(list,dest) @@\ install.man:: @@\ - MakeDir($(DESTDIR)dest) @@\ + @catdir=`echo destdir | sed -e s,man/man,man/cat,`; \ @@\ + MakeDirInline($(DESTDIR)$$catdir); \ @@\ case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ for i in list; do \ @@\ (MNAME=`echo $$i | cut -f1 -d.`; \ @@\ @@ -555,42 +537,74 @@ cat $$i | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\ | $(COL) > $${MNAME}.0; \ @@\ $(INSTALL) -c $(INSTMANFLAGS) $${MNAME}.0 \ @@\ - $(DESTDIR)dest/$${MNAME}.0; \ @@\ + $(DESTDIR)$$catdir/$${MNAME}.0; \ @@\ $(RM) $${MNAME}.0); \ @@\ done -#define InstallMultipleManSuffix(list,dest,suff) @@\ +#define OsInstallMultipleManSuffix(list,dest,suff) @@\ install.man:: @@\ - MakeDir($(DESTDIR)dest) @@\ + @catdir=`echo destdir | sed -e s,man/man,man/cat,`; \ @@\ + MakeDirInline($(DESTDIR)$$catdir); \ @@\ case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ for i in list; do \ @@\ (set -x; \ @@\ cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\ | $(COL) > $$i.0; \ @@\ $(INSTALL) -c $(INSTMANFLAGS) $$i.0 \ @@\ - $(DESTDIR)dest/$$i.0; \ @@\ + $(DESTDIR)$$catdir/$$i.0; \ @@\ $(RM) $$i.0 ); \ @@\ done -#define InstallManPageAliasesBase(file,destdir,aliases) @@\ +#define OsInstallManPageAliasesBase(file,destdir,suffix,aliases) @@\ install.man:: @@\ - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + @catdir=`echo destdir | sed -e s,man/man,man/cat,`; \ @@\ + case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ for i in aliases; do \ @@\ (set -x; \ @@\ - $(RM) $(DESTDIR)destdir/$$i.0;\ @@\ - (cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ @@\ + $(RM) $(DESTDIR)$$catdir/$$i.0;\ @@\ + (cd $(DESTDIR)/$$catdir; $(LN) file.0 $$i.0);\ @@\ ); \ @@\ done +#ifndef InstallManPageSource +#define InstallManPageSource YES +#endif + +#if !InstallManPageSource + +/* Install only the formatted man pages */ + +#define InstallManPageLong(file,destdir,dest) @@\ +BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ + @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +OsInstallManPageLongBase(file,destdir,dest,$(MANSUFFIX)) + +#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ +BuildInstallHtmlManPage(file,dest,suffix) @@\ + @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +OsInstallManPageLongBase(file,destdir,dest,suffix) + #define InstallManPageAliases(file,destdir,aliases) @@\ InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ @@\ -InstallManPageAliasesBase(file,destdir,aliases) +OsInstallManPageAliasesBase(file,destdir,$(MANSUFFIX),aliases) #define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ InstallHtmlManPageAliases(file,aliases,suffix) @@\ @@\ -InstallManPageAliasesBase(file,destdir,aliases) +OsInstallManPageAliasesBase(file,destdir,suffix,aliases) + +#define InstallMultipleMan(list,dest) @@\ +OsInstallMultipleMan(list,dest) + +#define InstallMultipleManSuffix(list,dest,suff) @@\ +OsInstallMultipleManSuffix(list,dest,suff) + +#endif /* * Shared libraries supported starting in 1.0 on a.out platforms, @@ -657,15 +671,6 @@ #define BuildScreenSaverLibrary YES #endif -/* - * XFree86 uses its own (more portable) database routines to speed up - * the RGB database lookups - * However, if you want to use ndbm anyway, you can set that to NO in - * site.def - */ -#ifndef UseRgbTxt -#define UseRgbTxt YES -#endif #define BuildXF86VidModeExt NO #define BuildXF86DGA NO #define BuildXInputExt NO Index: xc/config/cf/Oki.cf diff -u xc/config/cf/Oki.cf:3.4 xc/config/cf/Oki.cf:3.5 --- xc/config/cf/Oki.cf:3.4 Wed Jan 17 11:22:30 2001 +++ xc/config/cf/Oki.cf Mon Jan 9 09:56:12 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: Oki.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/Oki.cf,v 3.5 2006/01/09 14:56:12 dawes Exp $ #ifndef OSName #define OSName Unix System V/860 Release 4.0 Version 3 Index: xc/config/cf/OpenBSD.cf diff -u xc/config/cf/OpenBSD.cf:3.112 xc/config/cf/OpenBSD.cf:3.118 --- xc/config/cf/OpenBSD.cf:3.112 Thu Feb 3 21:58:27 2005 +++ xc/config/cf/OpenBSD.cf Tue Apr 18 11:57:25 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.112 2005/02/04 02:58:27 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.118 2006/04/18 15:57:25 tsi Exp $ XCOMM /* * Copyright (c) 1994-2005 by The XFree86 Project, Inc. @@ -76,7 +76,6 @@ #define XpmIncDir /usr/X11R6/include #define ConfigDir /usr/X11R6/lib/X11/config #define IncRoot /usr/local/include -#define TopXInclude -I/usr/X11R6/include #define ImakeCmd imake -DPorts #define DocDir /usr/local/share/doc #define BuildHtmlManPages NO @@ -96,6 +95,7 @@ #endif #define HasBSD44Sockets YES #define Malloc0ReturnsNull NO +#define InstallXtermSetGID YES /* xterm will be set gid */ #define SetTtyGroup YES #define DBMLibrary /**/ #define HasLibCrypt NO @@ -214,7 +214,9 @@ #define StandardCppOptions -traditional #define StandardCppDefines /**/ #define PreProcessCmd CppCmd +#ifndef PreIncDir #define PreIncDir DefaultGccIncludeDir +#endif #ifndef CcCmd #define CcCmd cc @@ -277,7 +279,6 @@ #define HasBsdMake YES -#define BuildCyrillicFonts YES #define GzipFontCompression YES #define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR) #define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) @@ -656,8 +657,6 @@ /* For the X11R5 server */ # define CompressAllFonts NO # define InstallFontAliases InstallFontAliasesNoComment -# define UseRgbTxt NO -# define UseRgb YES # define ServerExtraDefines -DXFree86Server @@ -770,7 +769,6 @@ /* For the X11R5 server */ # define CompressAllFonts NO # define InstallFontAliases InstallFontAliasesNoComment -# define UseRgbTxt NO #endif /* PmaxArchitecture */ @@ -929,8 +927,6 @@ /* For the X11R5 server */ # define CompressAllFonts NO # define InstallFontAliases InstallFontAliasesNoComment -# define UseRgbTxt NO -# define UseRgb YES # define ServerExtraDefines -DXFree86Server # define UnalignedReferencesAllowed YES @@ -974,7 +970,7 @@ # define HasPosixThreads YES # define ThreadedX YES # define SystemMTDefines /**/ -# define BuildThreadStubLibrary YES +# define NeedThreadStubLibrary YES # define NeedUIThrStubs YES # define ThreadsCompileFlag -pthread # define ThreadsLibraries -pthread @@ -1021,16 +1017,6 @@ # define SharedLibXdmGreet NO #endif -/* - * XFree86 uses its own (more portable) database routines to speed up - * the RGB database lookups - * However, if you want to use ndbm anyway, you can set that to NO in - * host.def - */ -#ifndef UseRgbTxt -# define UseRgbTxt YES -#endif - #ifndef OSBinaryType # if UseElfFormat # define OSBinaryType [ELF] Index: xc/config/cf/OpenBSDLib.rules diff -u xc/config/cf/OpenBSDLib.rules:1.17 xc/config/cf/OpenBSDLib.rules:1.18 --- xc/config/cf/OpenBSDLib.rules:1.17 Mon May 31 20:16:53 2004 +++ xc/config/cf/OpenBSDLib.rules Mon Jan 9 09:56:12 2006 @@ -1,13 +1,9 @@ -XCOMM $OpenBSD: OpenBSDLib.rules,v 1.1 2000/10/09 20:43:58 matthieu Exp $ - - - +XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.18 2006/01/09 14:56:12 dawes Exp $ /* * OpenBSD shared library rules */ -XCOMM $XFree86: xc/config/cf/OpenBSDLib.rules,v 1.17 2004/06/01 00:16:53 dawes Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. Index: xc/config/cf/OpenBSDLib.tmpl diff -u xc/config/cf/OpenBSDLib.tmpl:1.11 xc/config/cf/OpenBSDLib.tmpl:1.13 --- xc/config/cf/OpenBSDLib.tmpl:1.11 Fri Dec 31 09:55:35 2004 +++ xc/config/cf/OpenBSDLib.tmpl Tue Feb 7 17:06:20 2006 @@ -1,5 +1,4 @@ -XCOMM platform: $OpenBSD: OpenBSDLib.tmpl,v 1.6 2003/04/04 19:48:58 matthieu Exp $ -XCOMM platform: $XFree86: xc/config/cf/OpenBSDLib.tmpl,v 1.11 2004/12/31 14:55:35 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/OpenBSDLib.tmpl,v 1.13 2006/02/07 22:06:20 dawes Exp $ XCOMM /* Shared libraries dependencies */ @@ -99,13 +98,13 @@ # define SharedXpRev 7.0 # endif # ifndef SharedXtRev -# define SharedXtRev 7.0 +# define SharedXtRev 7.1 # endif # ifndef SharedXaRev # define SharedXaRev 2.0 # endif # ifndef SharedXawRev -# define SharedXawRev 8.0 +# define SharedXawRev 8.1 # endif # ifndef SharedXaw6Rev # define SharedXaw6Rev 7.1 Index: xc/config/cf/QNX4.cf diff -u xc/config/cf/QNX4.cf:1.5 xc/config/cf/QNX4.cf:1.6 --- xc/config/cf/QNX4.cf:1.5 Wed Jun 2 18:42:53 2004 +++ xc/config/cf/QNX4.cf Sat Jan 28 19:52:45 2006 @@ -1,9 +1,10 @@ -XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.5 2004/06/02 22:42:53 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/QNX4.cf,v 1.6 2006/01/29 00:52:45 tsi Exp $ #define StripInstalledPrograms NO #define BuildServer YES #define DoLoadableServer NO /* sorry, are u listenning QSSL? */ #define BuildLBX YES /* For now */ +#define BuildGlxExt NO /* from miinitext.c */ #define ExpandManNames YES #define ByteOrder X_LITTLE_ENDIAN Index: xc/config/cf/README diff -u xc/config/cf/README:1.24 xc/config/cf/README:1.27 --- xc/config/cf/README:1.24 Mon Sep 20 11:24:57 2004 +++ xc/config/cf/README Sun Apr 2 19:12:46 2006 @@ -1,9 +1,4 @@ -$Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $ - - - - -$XFree86: xc/config/cf/README,v 1.24 2004/09/20 15:24:57 tsi Exp $ +$XFree86: xc/config/cf/README,v 1.27 2006/04/02 23:12:46 dickey Exp $ The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! @@ -64,6 +59,8 @@ HasFortran boolean for system has Fortran compiler HasGcc boolean for system has GNU gcc compiler HasGcc2 boolean for system has GNU gcc 2.x compiler + HasGcc3 boolean for system has GNU gcc 3.x compiler + HasGcc4 boolean for system has GNU gcc 4.x compiler HasGcc2ForCplusplus use gcc 2 for C++ programs? HasGnuMake use the GNU make program? HasKrbIV system has Kerberos version IV support? @@ -101,6 +98,7 @@ InstManFlags install flags for manual pages InstPgmFlags install flags for normal programs InstUidFlags install flags for xterm to chown /dev/ptys + InstGidFlags install flags for xterm to open utmp InstallCmd command to install files KrbIVIncludes where to include KerberosIV header files from KrbIVLibraries where to load KerberosIV libraries from @@ -234,6 +232,10 @@ InstallFSConfig install fs config file over old? InstallLibManPages boolean for installing library man pages InstallSecurityConfig install server security policy file over old? + InstallXtermSetUID install xterm setuid, e.g., to open pty, utmp + InstallXtermSetGID install xterm setgid, e.g., to open utmp + Defining UseUtempter overrides xterm set uid/gid + InstallXloadSetGID install xload setgid to access kmem InstallXdmConfig install xdm config files over old? InstallXinitConfig install xinit config files over old? KrbIVDefines defines for use with KerberosIV @@ -305,7 +307,6 @@ ShmDefines MIT-SHM define TwmDir directory in which to install twm config files UseCCMakeDepend boolean for using alternate makedepend script - UseRgbTxt use rgb.txt file as is instead of DBM-compiled VarDirectory directory in /var for logs, etc., and config VendorHasX11R6_3libXext don't need Security & AppGroup in xrx plug-in XAppLoadDir directory in which to install app defaults @@ -634,6 +635,9 @@ NormalProgramTarget Build a program. Can be used multiple times with different arguments in the same Imakefile. +SetUidProgramTarget Build a setuid program. Normally not needed, since + install-flags provide the necessary functionality. + Lower level rules, often used with NormalProgramTarget InstallProgram install a program. Index: xc/config/cf/Server.tmpl diff -u xc/config/cf/Server.tmpl:3.21 xc/config/cf/Server.tmpl:3.22 --- xc/config/cf/Server.tmpl:3.21 Mon Apr 14 23:59:03 2003 +++ xc/config/cf/Server.tmpl Mon Jan 9 09:56:12 2006 @@ -1,11 +1,9 @@ -XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.21 2003/04/15 03:59:03 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.22 2006/01/09 14:56:12 dawes Exp $ /* * Server imakefile info - this contains any special redefinitions, etc. * that Imakefiles in the server subtree will need. */ -XCOMM $Xorg: Server.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ - #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" LDSTRIPFLAGS="$(LDSTRIPFLAGS)" #ifndef ServerCcCmd Index: xc/config/cf/Threads.tmpl diff -u xc/config/cf/Threads.tmpl:3.4 xc/config/cf/Threads.tmpl:3.5 --- xc/config/cf/Threads.tmpl:3.4 Thu Nov 14 16:01:14 2002 +++ xc/config/cf/Threads.tmpl Mon Jan 9 09:56:12 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Threads.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.4 2002/11/14 21:01:14 tsi Exp $ +XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.5 2006/01/09 14:56:12 dawes Exp $ /* * For a multi-threaded application or library, Index: xc/config/cf/TinyX.cf diff -u xc/config/cf/TinyX.cf:1.2 xc/config/cf/TinyX.cf:removed --- xc/config/cf/TinyX.cf:1.2 Wed Jun 2 18:42:53 2004 +++ xc/config/cf/TinyX.cf Tue May 9 21:51:34 2006 @@ -1,68 +0,0 @@ -/* $XFree86: xc/config/cf/TinyX.cf,v 1.2 2004/06/02 22:42:53 dawes Exp $ */ -/* - * This configuration file contains additional configuration needed - * to compile a (nearly) minimal X server using the TinyX infrastructure. - * To use this, add the following to host.def: - #define TinyXServer YES - */ - -/* - * Copyright (c) 1994-2004 by 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 in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution, and in the same place and form as other copyright, - * license and disclaimer information. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: "This product - * includes software developed by The XFree86 Project, Inc - * (http://www.xfree86.org/) and its contributors", in the same - * place and form as other third-party acknowledgments. Alternately, - * this acknowledgment may appear in the software itself, in the - * same form and location as other such third-party acknowledgments. - * - * 4. Except as contained in this notice, the name of The XFree86 - * Project, Inc shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from The XFree86 Project, Inc. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#define BuildLBX NO -#define BuildFonts NO -#define BuildAppgroup NO -#define BuildDBE NO -#define BuildXCSecurity NO -#undef BuildXF86RushExt -#define BuildXF86RushExt NO -#undef BuildRender -#define BuildRender YES -#define UseRgbTxt YES -#define BuildFontServer NO -#define OmitSnfSupport YES - Index: xc/config/cf/Win32.cf diff -u xc/config/cf/Win32.cf:1.5 xc/config/cf/Win32.cf:1.6 --- xc/config/cf/Win32.cf:1.5 Wed Jan 17 11:22:31 2001 +++ xc/config/cf/Win32.cf Tue Jun 21 23:28:49 2005 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: Win32.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/Win32.cf,v 1.6 2005/06/22 03:28:49 dawes Exp $ #ifndef OSName #define OSName DefaultOSName @@ -120,7 +120,6 @@ #define XFileSearchPathBase Concat4($(LIBDIR)/;L/;T/;N;C,;S:$(LIBDIR)/;l/;T/;N;C,;S:$(LIBDIR)/;T/;N;C,;S:$(LIBDIR)/;L/;T/;N;S:$(LIBDIR)/;l/;T/;N;S:$(LIBDIR)/;T/;N;S) #define XawI18nDefines -DHAS_WCHAR_H -#define UseRgbTxt YES #define HasCbrt NO #define HasFfs NO #define HasXdmAuth NO Index: xc/config/cf/Win32.rules diff -u xc/config/cf/Win32.rules:1.6 xc/config/cf/Win32.rules:1.7 --- xc/config/cf/Win32.rules:1.6 Wed Mar 24 22:36:21 2004 +++ xc/config/cf/Win32.rules Mon Jan 9 09:56:12 2006 @@ -1,9 +1,4 @@ -XCOMM platform: $Xorg: Win32.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/config/cf/Win32.rules,v 1.6 2004/03/25 03:36:21 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Win32.rules,v 1.7 2006/01/09 14:56:12 dawes Exp $ #define HasSharedLibraries YES #define NeedLibInsideFlag YES Index: xc/config/cf/WinLib.tmpl diff -u xc/config/cf/WinLib.tmpl:1.5 xc/config/cf/WinLib.tmpl:1.6 --- xc/config/cf/WinLib.tmpl:1.5 Fri Jul 11 18:17:41 2003 +++ xc/config/cf/WinLib.tmpl Tue Jul 5 12:43:54 2005 @@ -1,8 +1,4 @@ -XCOMM $Xorg: WinLib.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/WinLib.tmpl,v 1.5 2003/07/11 22:17:41 tsi Exp $ +XCOMM $XFree86: xc/config/cf/WinLib.tmpl,v 1.6 2005/07/05 16:43:54 tsi Exp $ #define SharedOldXReqs $(LDPRELIBS) $(XONLYLIB) #define SharedXtReqs $(LDPRELIBS) $(XONLYLIB) @@ -10,9 +6,7 @@ #define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIBS) $(XONLYLIB) #define SharedXiReqs $(LDPRELIBS) $(XLIB) -#define SharedPexReqs $(LDPRELIBS) $(XONLYLIB) MathLibrary #define SharedXtstReqs $(LDPRELIBS) $(XLIB) -#define SharedXieReqs $(LDPRELIBS) $(XONLYLIB) #define SharedSMReqs $(LDPRELIBS) $(ICELIB) #define SharedXpReqs $(LDPRELIBS) $(XAUTHLIB) $(XLIB) #define SharedXpmReqs $(LDPRELIBS) $(XLIB) Index: xc/config/cf/X11.rules diff -u xc/config/cf/X11.rules:1.7 xc/config/cf/X11.rules:1.8 --- xc/config/cf/X11.rules:1.7 Wed Nov 5 13:15:51 2003 +++ xc/config/cf/X11.rules Fri Oct 14 11:15:52 2005 @@ -1,7 +1,4 @@ -XCOMM $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ - - -XCOMM $XFree86: xc/config/cf/X11.rules,v 1.7 2003/11/05 18:15:51 dawes Exp $ +XCOMM $XFree86: xc/config/cf/X11.rules,v 1.8 2005/10/14 15:15:52 tsi Exp $ /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject @@ -15,13 +12,13 @@ * If no clues are given assume X11 is in the tree, otherwise * UseInstalled overrides UseImports. Do not do both. */ -#ifndef UseInstalledX11 -# define UseInstalledX11 NO -#endif #ifdef UseInstalled # undef UseInstalledX11 # define UseInstalledX11 YES #endif +#ifndef UseInstalledX11 +# define UseInstalledX11 NO +#endif #ifndef ImportX11 # ifdef UseImports @@ -76,17 +73,20 @@ # define TopXInclude -I$(TOP)/imports/x11/include # elif !UseInstalledX11 # define TopXInclude -I$(TOP)/exports/include -#else +# else # ifdef X11ProjectRoot -# define TopXInclude -I$(XPROJECTROOT)/include +# define TopXInclude -I$(XPROJECTROOT)/include \ + -I$(XPROJECTROOT)/include/X11 \ + -I$(XPROJECTROOT)/include/X11/extensions \ + -I$(XPROJECTROOT)/include/X11/fonts \ + -I$(XPROJECTROOT)/include/GL # else # define TopXInclude /**/ # endif # endif #endif -#ifdef TopIncludes -# undef TopIncludes -#endif + +#undef TopIncludes #define TopIncludes TopInclude $(TOP_X_INCLUDES) #if UseInstalledX11 && defined(X11ProjectRoot) Index: xc/config/cf/X11.tmpl diff -u xc/config/cf/X11.tmpl:1.277 xc/config/cf/X11.tmpl:1.295 --- xc/config/cf/X11.tmpl:1.277 Mon Feb 28 22:48:45 2005 +++ xc/config/cf/X11.tmpl Tue Apr 18 11:57:25 2006 @@ -1,6 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.277 2005/03/01 03:48:45 dawes Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.295 2006/04/18 15:57:25 tsi Exp $ /* * Copyright (c) 1994-2005 by The XFree86 Project, Inc. * All rights reserved. @@ -85,11 +85,25 @@ #endif #ifndef XVendorRelease -# define XVendorRelease 40400000 +# ifdef XF86_VERSION_CURRENT +# define XVendorRelease XF86_VERSION_CURRENT +# else /* Must be defined for bootstrapping purposes. */ +# define XVendorRelease 0 +# endif +#endif + +#if !defined(XVendorManVersionString) && \ + defined(XF86_VERSION_MAJOR) && defined(XF86_VERSION_MINOR) && \ + defined(XF86_VERSION_PATCH) && defined(XF86_VERSION_SNAP) +# if XF86_VERSION_SNAP == 0 +#define XVendorManVersionString `echo XF86_VERSION_MAJOR XF86_VERSION_MINOR XF86_VERSION_PATCH | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +#else +#define XVendorManVersionString `echo XF86_VERSION_MAJOR XF86_VERSION_MINOR XF86_VERSION_PATCH XF86_VERSION_SNAP | sed -e 's/ /./g' -e 's/^/Version\\\ /'` +# endif #endif #ifndef XVendorManVersionString -#define XVendorManVersionString 4.x +# define XVendorManVersionString 4.x #endif #ifndef XVendorManNameString @@ -135,12 +149,14 @@ #ifndef XdmxServer #define XdmxServer BuildDmx && BuildServer #endif +#ifndef BuildXdm +#define BuildXdm YES +#endif #ifndef BuildLibrariesForDmx #define BuildLibrariesForDmx XdmxServer #endif #ifndef BuildLibraries -#define BuildLibraries (!BuildServersOnly || BuildClients || \ - BuildLibrariesForDmx) +#define BuildLibraries (!BuildServersOnly || BuildClients) #endif #ifndef BuildLibrariesForXServers #define BuildLibrariesForXServers BuildServer @@ -173,7 +189,8 @@ #define BuildBuiltinFonts NO #endif #ifndef BuildFonts -#define BuildFonts (BuildServer | BuildFontServer) +#define BuildFonts ((BuildServer && !BuildServersOnly) \ + || BuildClients) #endif #ifndef Build75DpiFonts #define Build75DpiFonts YES @@ -216,7 +233,7 @@ #ifndef BuildUCSFonts #define BuildUCSFonts YES #endif -/* Setting BuildISO8859_1Fonts to NO may result in problems. */ +/* Setting BuildISO8859_1Fonts to NO might result in problems. */ #ifndef BuildISO8859_1Fonts #define BuildISO8859_1Fonts YES #endif @@ -295,6 +312,9 @@ #ifndef BuildX11Lib #define BuildX11Lib BuildLibraries #endif +#ifndef BuildNLS +#define BuildNLS BuildX11Lib +#endif #ifndef BuildLoadableXlibI18n #define BuildLoadableXlibI18n (HasDlopen && SharedLibX11) @@ -321,6 +341,33 @@ #define BuildXauLib (BuildLibraries || BuildLibrariesForXServers) #endif #define UseInstalledXauLib (defined(UseInstalled) || !BuildXauLib) +#ifndef BuildXawLib +#define BuildXawLib BuildLibraries +#endif +#ifndef BuildOldXLib +#define BuildOldXLib BuildLibraries +#endif +#ifndef BuildICELib +#define BuildICELib BuildLibraries +#endif +#ifndef BuildSMLib +#define BuildSMLib BuildLibraries +#endif +#ifndef BuildXmuLib +#define BuildXmuLib BuildLibraries +#endif +#ifndef BuildXmuuLib +#define BuildXmuuLib BuildLibraries +#endif +#ifndef BuildXpmLib +#define BuildXpmLib BuildLibraries +#endif +#ifndef BuildXtstLib +#define BuildXtstLib BuildLibraries +#endif +#ifndef BuildFSLib +#define BuildFSLib BuildLibraries +#endif #ifndef BuildXdmcpLib #define BuildXdmcpLib (BuildLibraries || BuildLibrariesForXServers) #endif @@ -344,13 +391,23 @@ #define BuildBigReqsExt YES #endif #ifndef BuildXInputExt -#define BuildXInputExt NO +#define BuildXInputExt YES #endif #ifndef BuildXInputLib -#define BuildXInputLib (BuildXInputExt && \ - BuildLibraries && \ - (!BuildServersOnly || BuildLibrariesForDmx)) +#define BuildXInputLib ((BuildXInputExt && BuildLibraries) \ + || BuildLibrariesForDmx) #endif + +#ifndef NeedXTrans +#define NeedXTrans (BuildServer || BuildX11Lib || BuildFontLib || \ + BuildICELib || BuildSMLib || BuildFSLib || \ + (BuildFontServer && BuildClients)) +#endif + +#ifndef NeedBerklib +#define NeedBerklib NO +#endif + #ifndef BuildEVI #define BuildEVI YES #endif @@ -358,10 +415,7 @@ #define BuildDBE YES #endif #ifndef BuildDBElib -#define BuildDBElib BuildDBE -#endif -#ifndef BuildDIS -#define BuildDIS NO +#define BuildDBElib (BuildDBE && BuildLibraries) #endif #ifndef BuildDPMS #define BuildDPMS YES @@ -381,8 +435,7 @@ #define BuildFontCache YES #endif #ifndef BuildFontCacheLib -#define BuildFontCacheLib (BuildFontCache && !BuildServersOnly && \ - BuildLibraries) +#define BuildFontCacheLib (BuildFontCache && BuildLibraries) #endif #ifndef BuildFontEncLib #define BuildFontEncLib BuildLibraries @@ -404,68 +457,68 @@ #define BuildLowMem NO #endif -#ifndef BuildTinyDIX -#if (defined(TinyXServer) && TinyXServer) && \ - !(defined(XF86Server) && XF86Server) -#define BuildTinyDIX YES -#else -#define BuildTinyDIX NO +#ifndef TinyXFontDefines +#define TinyXFontDefines /**/ #endif +#ifndef TinyXSpeedo +#define TinyXSpeedo NO #endif -#ifndef BuildSeparateTinyDIX -#if (defined(TinyXServer) && TinyXServer) && !BuildTinyDIX -#define BuildSeparateTinyDIX YES -#else -#define BuildSeparateTinyDIX NO +#ifndef TinyXType1 +#define TinyXType1 NO #endif +#ifndef TinyXCID +#define TinyXCID NO #endif -#ifndef TinyXExcludedExtensions -#define TinyXExcludedExtensions -UXKB -UXINPUT -ULBX -UXAPPGROUP -UXCSECURITY \ - -UDPMSExtension -UPANORAMIX -UGLXEXT \ - -UXF86VIDMODE -UXF86MISC -UXFreeXDGA \ - -UXF86DRI -UEVI -UXRECORD -USCREENSAVER \ - -URES -UXV -UXPRINT -UDBE -UXTRAP -UFONTCACHE \ - -UXF86BIGFONT -UXSYNC -UTOGCUP -#endif -#ifndef TinyXFontDefines -#define TinyXFontDefines /**/ +#ifndef TinyXFreeType +#define TinyXFreeType NO #endif #ifndef TinyXFontServerAccess #define TinyXFontServerAccess NO #endif -#if !TinyXFontServerAccess +#if !TinyXFontServerAccess && XserverStaticFontLib #define TinyXFontServerDefines -DNOFONTSERVERACCESS #else #define TinyXFontServerDefines /**/ #endif -#ifndef TinyDIXDefines -#define TinyDIXDefines TinyXExcludedExtensions TinyXFontServerDefines -#endif #ifndef BuildLBX #define BuildLBX YES #endif +#ifndef BuildLbxUtilLibrary +#define BuildLbxUtilLibrary (BuildLBX && (BuildServer || BuildClients)) +#endif +#ifndef NeedZlib +#define NeedZlib (BuildLBX || \ + (GzipFontCompression && \ + (BuildServer || BuildClients))) +#endif +#ifndef BuildZlib +#define BuildZlib (NeedZlib && !HasZlib) +#endif +#ifndef BuildRegexLib +#define BuildRegexLib (defined(XF86Server) && XF86Server && \ + !HasPosixRegex) +#endif #ifndef BuildXKB #define BuildXKB YES #endif #ifndef BuildXKBlib -#define BuildXKBlib (BuildXKB && !BuildServersOnly && \ - BuildLibraries) +#define BuildXKBlib (BuildXKB && BuildLibraries) #endif #ifndef BuildXKBuilib -#define BuildXKBuilib (BuildXKB && !BuildServersOnly && \ - BuildLibraries) +#define BuildXKBuilib (BuildXKB && BuildLibraries) #endif #ifndef BuildXKBfilelib -#define BuildXKBfilelib (BuildXKB && !BuildServersOnly && \ - BuildLibraries) +#define BuildXKBfilelib (BuildXKB && BuildLibraries) #endif #ifndef BuildXTrap #define BuildXTrap YES #endif #ifndef BuildXTrapLibrary -#define BuildXTrapLibrary (BuildXTrap && !BuildServersOnly && \ - BuildLibraries) +#define BuildXTrapLibrary (BuildXTrap && BuildLibraries) +#endif +#ifndef BuildXtLib +#define BuildXtLib (BuildLibraries || BuildXTrapLibrary) #endif /* @@ -483,22 +536,20 @@ #define BuildRECORD YES #endif #ifndef BuildRECORDlib -#define BuildRECORDlib BuildRECORD +#define BuildRECORDlib (BuildRECORD && BuildLibraries) #endif #ifndef BuildXinerama -#define BuildXinerama NO +#define BuildXinerama YES #endif #ifndef BuildXineramaLibrary -#define BuildXineramaLibrary (BuildXinerama && !BuildServersOnly && \ - BuildLibraries) +#define BuildXineramaLibrary (BuildXinerama && BuildLibraries) #endif #ifndef BuildDmxDevelTools #define BuildDmxDevelTools NO #endif #ifndef BuildDmxLibrary #define BuildDmxLibrary (BuildDmx && \ - (BuildDmxDevelTools || \ - (!BuildServersOnly && BuildLibraries))) + (BuildDmxDevelTools || BuildLibraries)) #endif #ifndef BuildXCSecurity #define BuildXCSecurity YES @@ -540,29 +591,25 @@ #endif #endif #ifndef BuildXprintLib -#define BuildXprintLib (BuildXprint && !BuildServersOnly && \ - BuildLibraries) +#define BuildXprintLib (BuildXprint && BuildLibraries) #endif #ifndef BuildScreenSaverExt -#define BuildScreenSaverExt NO +#define BuildScreenSaverExt YES #endif #ifndef BuildScreenSaverLibrary -#define BuildScreenSaverLibrary (BuildScreenSaverExt && !BuildServersOnly && \ - BuildLibraries) +#define BuildScreenSaverLibrary (BuildScreenSaverExt && BuildLibraries) #endif #ifndef BuildXF86VidModeExt #define BuildXF86VidModeExt NO #endif #ifndef BuildXF86VidModeLibrary -#define BuildXF86VidModeLibrary (BuildXF86VidModeExt && !BuildServersOnly && \ - BuildLibraries) +#define BuildXF86VidModeLibrary (BuildXF86VidModeExt && BuildLibraries) #endif #ifndef BuildXF86MiscExt #define BuildXF86MiscExt NO #endif #ifndef BuildXF86MiscLibrary -#define BuildXF86MiscLibrary (BuildXF86MiscExt && !BuildServersOnly && \ - BuildLibraries) +#define BuildXF86MiscLibrary (BuildXF86MiscExt && BuildLibraries) #endif #ifndef BuildXF86BigfontExt #define BuildXF86BigfontExt NO @@ -571,30 +618,26 @@ #define BuildXF86DGA NO #endif #ifndef BuildXF86DGALibrary -#define BuildXF86DGALibrary (BuildXF86DGA && !BuildServersOnly && \ - BuildLibraries) +#define BuildXF86DGALibrary (BuildXF86DGA && BuildLibraries) #endif #ifndef BuildXResExt #define BuildXResExt NO #endif #ifndef BuildXResLibrary #define BuildXResLibrary (BuildXResExt && \ - (BuildDmxDevelTools || \ - (!BuildServersOnly && BuildLibraries))) + (BuildDmxDevelTools || BuildLibraries)) #endif #ifndef BuildXvExt #define BuildXvExt NO #endif #ifndef BuildXvLibrary -#define BuildXvLibrary (BuildXvExt && !BuildServersOnly && \ - BuildLibraries) +#define BuildXvLibrary (BuildXvExt && BuildLibraries) #endif #ifndef BuildXvMCExt #define BuildXvMCExt NO #endif #ifndef BuildXvMCLibrary -#define BuildXvMCLibrary (BuildXvMCExt && !BuildServersOnly && \ - BuildLibraries) +#define BuildXvMCLibrary (BuildXvMCExt && BuildLibraries) #endif #ifndef BuildGlxExt #define BuildGlxExt NO @@ -607,8 +650,7 @@ #endif #endif #ifndef BuildGLXLibrary -#define BuildGLXLibrary (BuildGlxExt && !BuildServersOnly && \ - BuildLibraries) +#define BuildGLXLibrary (BuildGlxExt && BuildLibraries) #endif #ifndef BuildGlxInDmx #define BuildGlxInDmx (XdmxServer && BuildGlxExt) @@ -627,11 +669,10 @@ #define BuildXF86RushExt NO #endif #ifndef BuildXF86RushLibrary -#define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly && \ - BuildLibraries) +#define BuildXF86RushLibrary (BuildXF86RushExt && BuildLibraries) #endif #ifndef BuildDPSLibraries -#define BuildDPSLibraries (!BuildServersOnly && BuildLibraries) +#define BuildDPSLibraries BuildLibraries #endif #ifndef BuildDPSLibrary #define BuildDPSLibrary BuildDPSLibraries @@ -649,8 +690,7 @@ #define BuildRender YES #endif #ifndef BuildRenderLibrary -#define BuildRenderLibrary (XdmxServer || \ - (!BuildServersOnly && BuildLibraries)) +#define BuildRenderLibrary (XdmxServer || (BuildRender && BuildLibraries)) #endif #ifndef BuildXftLibrary #define BuildXftLibrary BuildRenderLibrary @@ -666,7 +706,8 @@ #endif #ifndef UseFreetype2 #define UseFreetype2 (BuildXftLibrary || BuildXft1Library || \ - UseFontconfig || BuildFreeType) + UseFontconfig || BuildFontconfigLibrary || \ + BuildFreeType || TinyXFreeType) #endif #ifndef HasExpat #define HasExpat NO @@ -692,7 +733,7 @@ #define BuildRandR YES #endif #ifndef BuildRandRLibrary -#define BuildRandRLibrary (!BuildServersOnly && BuildLibraries) +#define BuildRandRLibrary (BuildRandR && BuildLibraries) #endif #ifndef BuildXcursorLibrary @@ -708,16 +749,13 @@ #endif #ifndef BuildAppleWMLibrary -#define BuildAppleWMLibrary NO +#define BuildAppleWMLibrary BuildLibraries #endif #ifndef BuildWindowsWMLibrary #define BuildWindowsWMLibrary NO #endif -#ifndef BuildMiscDocs -#define BuildMiscDocs NO -#endif #ifndef BuildSpecsDocs #define BuildSpecsDocs NO #endif @@ -741,7 +779,10 @@ #define InstallLibManPages YES #endif #ifndef InstallXtermSetUID -#define InstallXtermSetUID YES /* xterm needs to be set uid */ +#define InstallXtermSetUID YES /* xterm may need to be set uid */ +#endif +#ifndef InstallXtermSetGID +#define InstallXtermSetGID NO /* xterm may need to be set gid */ #endif #ifndef InstallXloadSetGID #define InstallXloadSetGID YES /* xload often needs set gid kmem */ @@ -784,12 +825,15 @@ #ifndef ThreadedProject #define ThreadedProject ThreadedX #endif -#ifndef BuildThreadStubLibrary -#define BuildThreadStubLibrary NO +#ifndef NeedThreadStubLibrary +#define NeedThreadStubLibrary NO #endif #ifndef NeedUIThrStubs #define NeedUIThrStubs NO #endif +#ifndef BuildThreadStubLibrary +#define BuildThreadStubLibrary (NeedThreadStubLibrary && BuildLibraries) +#endif #ifndef HasWChar32 #define HasWChar32 SystemV4 #endif @@ -832,12 +876,15 @@ #ifndef DefaultRGBDatabase #define DefaultRGBDatabase $(LIBDIR)/rgb #endif -#ifndef UseRgbTxt -#define UseRgbTxt NO /* default is to compile with dbm */ +#ifndef BuiltinRGB +#define BuiltinRGB YES #endif #ifndef UseMemLeak #define UseMemLeak NO #endif +#ifndef UseStackTrace +#define UseStackTrace NO +#endif #ifndef SpecialMalloc #define SpecialMalloc NO #endif @@ -858,7 +905,7 @@ * ExtraConnectionDefs. Here, we choose the later in order to * maximise exposure of the IPv6 code (a number of .def files * contain ConnectionFlags overrides). Mind you, this might not - * the right thing to do when HasStreams is asserted. + * be the right thing to do when HasStreams is asserted. */ #ifndef BuildIPv6 /* If the OS also #define's AF_INET6 */ #define BuildIPv6 YES @@ -925,321 +972,537 @@ #define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC #endif #endif + #ifndef ExtensionOSDefines #define ExtensionOSDefines /**/ #endif -#ifndef ExtensionDefines -#ifndef MITMiscDefines +/* Do not allow overrides of extension #define's */ + +#undef MITMiscDefines #if BuildMITMiscExt -#define MITMiscDefines -DMITMISC +# define MITMiscDefines -DMITMISC #else -#define MITMiscDefines /**/ -#endif +# define MITMiscDefines /**/ #endif -#ifndef XTestDefines +#undef MITMiscUndefines +#define MITMiscUndefines -UMITMISC + +#undef XTestDefines +#undef XTestUndefines +#undef XTest1Undefines +#define XTest1Undefines -UXTESTEXT1 +#define XTestUndefines -UXTEST XTest1Undefines #if BuildTestExt -#define XTestDefines -DXTEST +# define XTestDefines -DXTEST #else -#define XTestDefines /**/ +# define XTestDefines XTestUndefines /* Insurance */ #endif -#endif -#ifndef XTrapDefines + +#undef XTrapDefines #if BuildXTrap -#define XTrapDefines -DXTRAP +# define XTrapDefines -DXTRAP #else -#define XTrapDefines /**/ -#endif +# define XTrapDefines /**/ #endif -#ifndef XSyncDefines +#undef XTrapUndefines +#define XTrapUndefines -UXTRAP + +#undef XSyncDefines #if BuildSyncExt -#define XSyncDefines -DXSYNC +# define XSyncDefines -DXSYNC #else -#define XSyncDefines /**/ -#endif +# define XSyncDefines /**/ #endif -#ifndef XCMiscDefines +#undef XSyncUndefines +#define XSyncUndefines -UXSYNC + +#undef XCMiscDefines #if BuildXCMiscExt -#define XCMiscDefines -DXCMISC +# define XCMiscDefines -DXCMISC #else -#define XCMiscDefines /**/ +# define XCMiscDefines /**/ #endif -#endif -#ifndef ShapeDefines +#undef XCMiscUndefines +#define XCMiscUndefines -UXCMISC + +#undef ShapeDefines #if BuildShapeExt -#define ShapeDefines -DSHAPE +# define ShapeDefines -DSHAPE #else -#define ShapeDefines /**/ +# define ShapeDefines /**/ #endif -#endif -#ifndef GlxDefines +#undef ShapeUndefines +#define ShapeUndefines -USHAPE + +#undef GlxDefines #if BuildGlxExt -#ifdef GlxExtraDefines -#define GlxDefines -DGLXEXT GlxExtraDefines -#else -#define GlxDefines -DGLXEXT -#endif +# ifdef GlxExtraDefines +# define GlxDefines -DGLXEXT GlxExtraDefines +# else +# define GlxDefines -DGLXEXT +# endif #else -#define GlxDefines /**/ -#endif +# define GlxDefines /**/ #endif -#ifndef DRMIncludesDir -#define DRMIncludesDir $(XF86OSSRC)/shared/drm/kernel +#undef GlxUndefines +#define GlxUndefines -UGLXEXT +#undef DRIUndefines +#define DRIUndefines -UXF86DRI + +#ifndef DRMIncludesDir +# define DRMIncludesDir $(XF86OSSRC)/shared/drm/kernel #endif -#ifndef MesaSrcDir -#define MesaSrcDir $(TOP)/extras/Mesa + +#ifndef MesaSrcDir +# define MesaSrcDir $(TOP)/extras/Mesa #endif -#ifndef OglSampleSrcDir -#define OglSampleSrcDir $(TOP)/extras/ogl-sample + +#ifndef OglSampleSrcDir +# define OglSampleSrcDir $(TOP)/extras/ogl-sample #endif -#ifndef ShmDefines + +#undef ShmDefines #if HasShm -#define ShmDefines -DMITSHM +# define ShmDefines -DMITSHM #else -#define ShmDefines /**/ -#endif +# define ShmDefines /**/ #endif -#ifndef XInputDefines +#undef ShmUndefines +#define ShmUndefines -UMITSHM + +#undef XInputDefines #if BuildXInputExt -#define XInputDefines -DXINPUT +# define XInputDefines -DXINPUT #else -#define XInputDefines /**/ +# define XInputDefines /**/ #endif -#endif -#ifndef XineramaDefines +#undef XInoutUndefines +#define XInputUndefines -UXINPUT + +#undef XineramaDefines #if BuildXinerama -#define XineramaDefines -DPANORAMIX +# define XineramaDefines -DPANORAMIX #else -#define XineramaDefines /**/ -#endif +# define XineramaDefines /**/ #endif -#ifndef PrintOnlyServer -#define PrintOnlyServer YES +#undef XineramaUndefines +#define XineramaUndefines -UPANORAMIX + +#ifndef PrintOnlyServer +# define PrintOnlyServer YES #endif -#ifndef XprintDefines + +#undef XprintDefines #if BuildXprint -#if PrintOnlyServer -#define XprintDefines -DPIXPRIV -#else -#define XprintDefines -DXPRINT -DPIXPRIV -#endif +# if PrintOnlyServer +# define XprintDefines -DPIXPRIV +# else +# define XprintDefines -DXPRINT -DPIXPRIV +# endif #else -#define XprintDefines /**/ -#endif +# define XprintDefines /**/ #endif -#ifndef XkbDefines +#undef XprintUndefines +#define XprintUndefines -UXPRINT + +#undef XkbDefines #if BuildXKB -#define XkbDefines -DXKB -#else -#define XkbDefines /**/ -#endif -#endif -#ifndef XkbClientDefines -#if UseXKBInClients -#define XkbClientDefines -DXKB +# define XkbDefines -DXKB #else -#define XkbClientDefines /**/ +# define XkbDefines /**/ #endif +#undef XkbUndefines +#define XkbUndefines -UXKB + +#ifndef XkbClientDefines +# if UseXKBInClients +# define XkbClientDefines -DXKB +# else +# define XkbClientDefines /**/ +# endif #endif -#ifndef XkbServerDefines -#define XkbServerDefines /**/ + +#ifndef XkbServerDefines +# define XkbServerDefines /**/ #endif -#ifndef LbxDefines + +#undef LbxDefines #if BuildLBX -#define LbxDefines -DLBX +# define LbxDefines -DLBX #else -#define LbxDefines /**/ -#endif +# define LbxDefines /**/ #endif -#ifndef BigReqDefines +#undef LbxUndefines +#define LbxUndefines -ULBX + +#undef BigReqDefines #if BuildBigReqsExt -#define BigReqDefines -DBIGREQS +# define BigReqDefines -DBIGREQS #else -#define BigReqDefines /**/ -#endif +# define BigReqDefines /**/ #endif +#undef BigReqUndefines +#define BigReqUndefines -UBIGREQS -#ifndef EVIDefines +#undef EVIDefines #if BuildEVI -#define EVIDefines -DEVI +# define EVIDefines -DEVI #else -#define EVIDefines /**/ +# define EVIDefines /**/ #endif +#undef EVIUndefines +#define EVIUndefines -UEVI + +#if !BuildDBE || !defined(NeedDBERevalidateBuffer) +# undef NeedDBERevalidateBuffer +# define NeedDBERevalidateBuffer NO #endif -#ifndef DBEDefines -#if BuildDBE -#define DBEDefines -DDBE -#else -#define DBEDefines /**/ +#if !BuildDBE || NeedDBERevalidateBuffer || !defined(NeedDBEValidateBuffer) +# undef NeedDBEValidateBuffer +# define NeedDBEValidateBuffer NeedDBERevalidateBuffer #endif + +#if !BuildDBE || NeedDBEValidateBuffer || !defined(NeedDBEBufferBits) +# undef NeedDBEBufferBits +# define NeedDBEBufferBits NeedDBEValidateBuffer #endif -#ifndef PervasiveDBEDefines -#define PervasiveDBEDefines /* -DNEED_DBE_BUF_BITS -DNEED_DBE_BUF_VALIDATE */ +#undef DBEDefines +#if BuildDBE && !NeedDBEBufferBits +# define DBEDefines -DDBE +#else +# define DBEDefines /**/ #endif -#ifndef MultibufferDefines -#if BuildMultibuffer -#define MultibufferDefines -DMULTIBUFFER +#undef PervasiveDBEDefines +#if NeedDBERevalidateBuffer +# define PervasiveDBEDefines -DDBE -DNEED_DBE_BUF_BITS \ + -DNEED_DBE_BUF_VALIDATE \ + -DNEED_DBE_BUF_REVALIDATE #else -#define MultibufferDefines /**/ +# if NeedDBEValidateBuffer +# define PervasiveDBEDefines -DDBE -DNEED_DBE_BUF_BITS \ + -DNEED_DBE_BUF_VALIDATE +# else +# if NeedDBEBufferBits +# define PervasiveDBEDefines -DDBE -DNEED_DBE_BUF_BITS +# else +# define PervasiveDBEDefines /**/ +# endif +# endif #endif +#undef DBEUndefines +#define DBEUndefines -UDBE -UNEED_DBE_BUF_BITS \ + -UNEED_DBE_BUF_VALIDATE \ + -UNEED_DBE_BUF_REVALIDATE + +#undef MultibufferDefines +#if BuildMultibuffer +# define MultibufferDefines -DMULTIBUFFER +#else +# define MultibufferDefines /**/ #endif +#undef MultibufferUndefines +#define MultibufferUndefines -UMULTIBUFFER -#ifndef ScreenSaverExtensionDefines +#undef ScreenSaverExtensionDefines #if BuildScreenSaverExt -#define ScreenSaverExtensionDefines -DSCREENSAVER +# define ScreenSaverExtensionDefines -DSCREENSAVER #else -#define ScreenSaverExtensionDefines /**/ -#endif +# define ScreenSaverExtensionDefines /**/ #endif -#ifndef VidModeExtensionDefines +#undef ScreenSaverExtensionUndefines +#define ScreenSaverExtensionUndefines -USCREENSAVER + +#undef VidModeExtensionDefines #if BuildXF86VidModeExt -#define VidModeExtensionDefines -DXF86VIDMODE +# define VidModeExtensionDefines -DXF86VIDMODE #else -#define VidModeExtensionDefines /**/ -#endif +# define VidModeExtensionDefines /**/ #endif -#ifndef XF86MiscExtensionDefines +#undef VidModeExtensionUndefines +#define VidModeExtensionUndefines -UXF86VIDMODE + +#undef XF86MiscExtensionDefines #if BuildXF86MiscExt -#define XF86MiscExtensionDefines -DXF86MISC +# define XF86MiscExtensionDefines -DXF86MISC #else -#define XF86MiscExtensionDefines /**/ -#endif +# define XF86MiscExtensionDefines /**/ #endif +#undef XF86MiscExtensionUndefines +#define XF86MiscExtensionUndefines -UXF86MISC -#ifndef XF86BigfontExtensionDefines +#undef XF86BigfontExtensionDefines #if BuildXF86BigfontExt -#define XF86BigfontExtensionDefines -DXF86BIGFONT +# define XF86BigfontExtensionDefines -DXF86BIGFONT #else -#define XF86BigfontExtensionDefines /**/ +# define XF86BigfontExtensionDefines /**/ #endif +#undef XF86BigfontExtensionUndefines +#define XF86BigfontExtensionUndefines -UXF86BIGFONT + +#undef XFree86DGADefines +#if BuildXF86DGA +# define XFree86DGADefines -DXFreeXDGA +#else +# define XFree86DGADefines /**/ #endif +#undef XFree86DGAUndefines +#define XFree86DGAUndefines -UXFreeXDGA -#ifndef XvExtensionDefines +#undef XvExtensionDefines #if BuildXvExt -#define XvExtensionDefines -DXV +# define XvExtensionDefines -DXV #else -#define XvExtensionDefines /**/ -#endif +# define XvExtensionDefines /**/ #endif +#undef XvExtensionUndefines +#define XvExtensionUndefines -UXV -#ifndef XvMCExtensionDefines +#undef XvMCExtensionDefines #if BuildXvMCExt -#define XvMCExtensionDefines -DXVMC +# define XvMCExtensionDefines -DXVMC #else -#define XvMCExtensionDefines /**/ -#endif +# define XvMCExtensionDefines /**/ #endif +#undef XvMCExtensionUndefines +#define XvMCExtensionUndefines -UXVMC -#ifndef XResExtensionDefines +#undef XResExtensionDefines #if BuildXResExt -#define XResExtensionDefines -DRES +# define XResExtensionDefines -DRES #else -#define XResExtensionDefines /**/ -#endif +# define XResExtensionDefines /**/ #endif +#undef XResExtensionUndefines +#define XResExtensionUndefines -URES -#ifndef RECORDDefines +#undef RECORDDefines #if BuildRECORD -#define RECORDDefines -DXRECORD +# define RECORDDefines -DXRECORD #else -#define RECORDDefines /**/ -#endif +# define RECORDDefines /**/ #endif +#undef RECORDUndefines +#define RECORDUndefines -UXRECORD -#ifndef AppgroupDefines +#undef AppgroupDefines #if BuildAppgroup -#define AppgroupDefines -DXAPPGROUP +# define AppgroupDefines -DXAPPGROUP #else -#define AppgroupDefines /**/ -#endif +# define AppgroupDefines /**/ #endif +#undef AppgroupUndefines +#define AppgroupUndefines -UXAPPGROUP -#ifndef XCSecurityDefines +#undef XCSecurityDefines #if BuildXCSecurity -#define XCSecurityDefines -DXCSECURITY +# define XCSecurityDefines -DXCSECURITY #else -#define XCSecurityDefines /**/ -#endif +# define XCSecurityDefines /**/ #endif +#undef XCSecurityUndefines +#define XCSecurityUndefines -UXCSECURITY -#ifndef CupDefines +#undef CupDefines #if BuildCup -#define CupDefines -DTOGCUP +# define CupDefines -DTOGCUP #else -#define CupDefines /**/ -#endif +# define CupDefines /**/ #endif +#undef CupUndefines +#define CupUndefines -UTOGCUP -#ifndef LowMemDefines -#if BuildLowMem -#define LowMemDefines -DLOWMEMFTPT -#else -#define LowMemDefines /**/ -#endif +#ifndef LowMemDefines +# if BuildLowMem +# define LowMemDefines -DLOWMEMFTPT +# else +# define LowMemDefines /**/ +# endif #endif -#ifndef DPMSDefines +#undef DPMSDefines #if BuildDPMS -#define DPMSDefines -DDPMSExtension +# define DPMSDefines -DDPMSExtension #else -#define DPMSDefines /**/ -#endif +# define DPMSDefines /**/ #endif +#undef DPMSUndefines +#define DPMSUndefines -UDPMSExtension -#ifndef RenderDefines +#undef RenderDefines #if BuildRender -#define RenderDefines -DRENDER +# define RenderDefines -DRENDER #else -#define RenderDefines /**/ -#endif +# define RenderDefines /**/ #endif +#undef RenderUndefines +#define RenderUndefines -URENDER -#ifndef RandRDefines +#undef RandRDefines #if BuildRandR -#define RandRDefines -DRANDR +# define RandRDefines -DRANDR #else -#define RandRDefines /**/ -#endif +# define RandRDefines /**/ #endif +#undef RandRUndefines +#define RandRUndefines -URANDR -#ifndef FontCacheExtentionDefines +#undef FontCacheExtentionDefines #if BuildFontCache -#define FontCacheExtensionDefines -DFONTCACHE +# define FontCacheExtensionDefines -DFONTCACHE #else -#define FontCacheExtensionDefines /**/ -#endif +# define FontCacheExtensionDefines /**/ #endif +#undef FontCacheExtensionUndefines +#define FontCacheExtensionUndefines -UFONTCACHE + +/* + * (miinitext.c does not exist for the purposes of this comment block.) + * + * Pervasive extensions are those whose server-side functionality is, partially + * or entirely, implemented in #ifdef's of Xserver/dix, Xserver/os and/or some + * other extension's code. (The last of these cases is debatable.) Should + * different servers in the same build require different subsets of these + * extensions, each server will likely need to be linked against its own build + * of the following subdirectories of xc/programs/Xserver: dix, os, mi, Xext, + * lbx, xkb, fb, XTrap, dbe, cfb*, record, render and randr. Which ones are + * needed will depend on which pervasive extensions are to be included in the + * particular server to be linked and which pervasive extensions differ amongst + * all servers in the same build. + * + * (XXX I'd put in an extension vs. Xserver subdir table here, where it not for + * the fact that it would be highly subject to change. The ideal solution + * here is to make all extensions non-pervasive, but this'll take a while...) + * + * DBE presents a special case. It is pervasive if, and only if, Xserver/ is + * also compiled with -DNEED_DBE_BUF_BITS. + * + * Note that an extension's pervasiveness is independent of its loadability. + * + * #define's for pervasive extensions are inserted into an X server's base + * CFLAGS to ensure all pieces of these extensions are linked in. + */ #ifndef SitePervasiveExtensionDefines #define SitePervasiveExtensionDefines /**/ #endif + #ifndef PervasiveExtensionDefines #define PervasiveExtensionDefines \ ShapeDefines XInputDefines XkbDefines LbxDefines AppgroupDefines \ - XCSecurityDefines CupDefines PervasiveDBEDefines \ - XF86BigfontExtensionDefines DPMSDefines \ - LowMemDefines XprintDefines XineramaDefines \ - SitePervasiveExtensionDefines RenderDefines RandRDefines + XCSecurityDefines XSyncDefines XF86BigfontExtensionDefines \ + DPMSDefines BigReqDefines XineramaDefines RenderDefines RandRDefines \ + XResExtensionDefines PervasiveDBEDefines XprintDefines \ + SitePervasiveExtensionDefines LowMemDefines #endif + #ifndef SiteExtensionDefines #define SiteExtensionDefines /**/ #endif + #ifndef BaseExtensionDefines #define BaseExtensionDefines \ - MultibufferDefines MITMiscDefines XTestDefines XTrapDefines \ - XSyncDefines XCMiscDefines RECORDDefines \ - ShmDefines BigReqDefines VidModeExtensionDefines \ - XF86MiscExtensionDefines DBEDefines DPMSDefines EVIDefines \ - ScreenSaverExtensionDefines XvExtensionDefines XvMCExtensionDefines \ - GlxDefines FontCacheExtensionDefines SiteExtensionDefines \ - XResExtensionDefines + MultibufferDefines ShmDefines MITMiscDefines XTestDefines \ + XTrapDefines XCMiscDefines RECORDDefines CupDefines \ + VidModeExtensionDefines XF86MiscExtensionDefines XFree86DGADefines \ + DBEDefines EVIDefines ScreenSaverExtensionDefines XvExtensionDefines \ + XvMCExtensionDefines GlxDefines FontCacheExtensionDefines \ + SiteExtensionDefines #endif -#define ExtensionDefines BaseExtensionDefines ExtensionOSDefines + +#ifndef ExtensionDefines +#define ExtensionDefines ExtensionOSDefines BaseExtensionDefines #endif /* ExtensionDefines */ +/* + * The above specifies the set of extensions that are to be included in _any_ + * server to be built. It also specifies that to be included in the "primary" + * server, i.e. XFree86, XWin or XDarwin, whatever the case might be. + * + * Server-specific extension exclusions follow. Changes to, or overrides of, + * these are likely to cause build failures that can be fixed by linking + * against more server-specific builds of the Xserver/ subdirectories + * mentionned above. + */ + +#ifndef TinyXExcludedExtensions +#define TinyXExcludedExtensions \ + XkbUndefines XInputUndefines LbxUndefines AppgroupUndefines \ + XCSecurityUndefines DPMSUndefines XineramaUndefines GlxUndefines \ + DRIUndefines VidModeExtensionUndefines XF86MiscExtensionUndefines \ + XFree86DGAUndefines EVIUndefines RECORDUndefines XTest1Undefines \ + ScreenSaverExtensionUndefines XResExtensionUndefines \ + XvExtensionUndefines XvMCExtensionUndefines XTrapUndefines \ + FontCacheExtensionUndefines DBEUndefines XprintUndefines \ + XF86BigfontExtensionUndefines XSyncUndefines CupUndefines \ + -UXFree86LOADER +#endif + +#ifndef XdmxExcludedExtensions +/* MITSHM -- works but doesn't quite do what people think it should */ +/* DPMSExtension -- compiled in but is non-functional */ +/* MITMISC -- provides legacy support for X11R1,2 applications. Disable. */ +#if BuildGlxInDmx +#define XdmxExcludedExtensions \ + DBEUndefines ShmUndefines RandRUndefines XprintUndefines \ + MultibufferUndefines XvExtensionUndefines XvMCExtensionUndefines \ + XTest1Undefines VidModeExtensionUndefines XF86MiscExtensionUndefines \ + XFree86DGAUndefines -DGLXPROXY DRIUndefines CupUndefines \ + MITMiscUndefines ScreenSaverExtensionUndefines \ + FontCacheExtensionUndefines -UXFree86LOADER +#else +#define XdmxExcludedExtensions \ + DBEUndefines ShmUndefines RandRUndefines XprintUndefines \ + MultibufferUndefines XvExtensionUndefines XvMCExtensionUndefines \ + XTest1Undefines VidModeExtensionUndefines XF86MiscExtensionUndefines \ + XFree86DGAUndefines GlxUndefines DRIUndefines CupUndefines \ + MITMiscUndefines ScreenSaverExtensionUndefines \ + FontCacheExtensionUndefines -UXFree86LOADER +#endif +#endif + +#ifndef XvfbExcludedExtensions +#define XvfbExcludedExtensions \ + XInputUndefines XkbUndefines DPMSUndefines XineramaUndefines \ + XprintUndefines XTest1Undefines VidModeExtensionUndefines \ + XF86MiscExtensionUndefines XFree86DGAUndefines DRIUndefines \ + ScreenSaverExtensionUndefines XvExtensionUndefines \ + XvMCExtensionUndefines -UXFree86LOADER +#endif + +#ifndef XnestExcludedExtensions +#define XnestExcludedExtensions \ + XInputUndefines DPMSUndefines XineramaUndefines XprintUndefines \ + XTest1Undefines VidModeExtensionUndefines XF86MiscExtensionUndefines \ + XFree86DGAUndefines DRIUndefines ScreenSaverExtensionUndefines \ + XvExtensionUndefines XvMCExtensionUndefines ShmUndefines \ + -UXFree86LOADER +#endif + +#ifndef XprtExcludedExtensions +#define XprtExcludedExtensions \ + XInputUndefines XkbUndefines DPMSUndefines XineramaUndefines \ + GlxUndefines DRIUndefines VidModeExtensionUndefines \ + XF86MiscExtensionUndefines XFree86DGAUndefines XTest1Undefines \ + ScreenSaverExtensionUndefines XvExtensionUndefines \ + XvMCExtensionUndefines -UXFree86LOADER -D_XP_PRINT_SERVER_ +#endif + +#ifndef XsunExcludedExtensions +#define XsunExcludedExtensions \ + XInputUndefines DPMSUndefines DRIUndefines VidModeExtensionUndefines \ + XF86MiscExtensionUndefines XFree86DGAUndefines XTest1Undefines \ + ScreenSaverExtensionUndefines XvExtensionUndefines \ + XvMCExtensionUndefines -UXFree86LOADER +#endif + +#ifndef XsunLynxExcludedExtensions +#define XsunLynxExcludedExtensions XsunExcludedExtensions +#endif + #ifndef HasStrcasecmp #define HasStrcasecmp YES #endif @@ -1332,12 +1595,18 @@ #endif #endif #ifndef ServerDefines -#define ServerDefines StandardDefines PervasiveExtensionDefines ServerExtraDefines ServerAssertDefines ServerSnprintfDefines ServerStrlcatDefines +#define ServerDefines StandardDefines PervasiveExtensionDefines \ + ServerAssertDefines ServerSnprintfDefines \ + ServerStrlcatDefines ServerExtraDefines +#endif + +#ifndef TinyDIXDefines +#define TinyDIXDefines TinyXExcludedExtensions TinyXFontServerDefines #endif #ifndef MesaUseX86Asm /* The current Mesa X86 ASM code doesn't work well with SVR4 shared libs. */ -# if HasX86Support && !SystemV4 +# if defined(i386Architecture) && HasX86Support && !SystemV4 # define MesaUseX86Asm YES # else # define MesaUseX86Asm NO @@ -1480,6 +1749,9 @@ #ifndef BuildModuleTop #define BuildModuleTop $(BUILDLIBTOP)/.. #endif +#ifndef UseBuildTree +#define UseBuildTree NO +#endif #ifndef LibDir # ifdef ProjectRoot # define LibDir Concat(ProjectRoot,/lib/X11) @@ -1500,6 +1772,13 @@ #define LibexecDir /usr/X11/libexec #endif #endif +#ifndef LibdataDir +#ifdef ProjectRoot +#define LibdataDir Concat(ProjectRoot,/libdata) +#else +#define LibdataDir /usr/X11/libdata +#endif +#endif #ifndef ConfigDir #define ConfigDir $(LIBDIR)/config #endif @@ -1616,7 +1895,7 @@ #endif #ifndef ForceNormalLib -#define ForceNormalLib (HasGcc && !HasGcc2) +#define ForceNormalLib (HasGcc && !HasGcc2 && !HasGcc3 && !HasGcc4) #endif #ifndef XkbComp @@ -1661,6 +1940,7 @@ ADMDIR = AdmDir /* server log files */ LIBDIR = LibDir /* rgb, XErrorDB, etc. */ LIBEXECDIR = LibexecDir + LIBDATADIR = LibdataDir MODULEDIR = ModuleDir TOP_X_INCLUDES = TopXInclude @@ -2452,6 +2732,8 @@ #define DebugLibGlx NO #undef ProfileLibGlx #define ProfileLibGlx NO +#undef LinkGLToUsrInclude +#define LinkGLToUsrInclude NO #endif /* * Only make a shared GLw library on systems with Weak symbols @@ -2966,7 +3248,7 @@ TOOLKITSRC = $(LIBSRC)/Xt #if SharedLibXt #ifndef SharedXtRev -#define SharedXtRev 6.0 +#define SharedXtRev 6.1 #endif SharedDSLibReferences(XTOOLONLY,Xt,$(TOOLKITSRC),SOXTREV,SharedXtRev) #else @@ -2994,7 +3276,7 @@ AWIDGETSRC = $(LIBSRC)/Xaw #if SharedLibXaw #ifndef SharedXawRev -#define SharedXawRev 7.0 +#define SharedXawRev 7.1 #endif SharedDSLibReferences(XAW,Xaw,$(AWIDGETSRC),SOXAWREV,SharedXawRev) #else @@ -3002,7 +3284,7 @@ #endif #ifndef BuildXaw6 -#define BuildXaw6 HasSharedLibraries +#define BuildXaw6 (BuildXawLib && HasSharedLibraries) #endif #if BuildXaw6 @@ -3267,8 +3549,6 @@ ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) #endif -#if UseFreetype2 - #if BuildFreetype2Library #ifndef SharedLibFreetype2 @@ -3326,9 +3606,10 @@ FREETYPE2INCDIR=$(BUILDINCDIR) #endif -#else /* BuildFreetype2Library */ +#endif /* BuildFreetype2Library */ -#if HasFreetype2 +#if UseFreetype2 +#if !BuildFreetype2Library && HasFreetype2 #ifndef Freetype2Dir #define Freetype2Dir /usr @@ -3366,9 +3647,7 @@ FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype #endif -#endif /* HasFreetype2 */ - -#endif /* else BuildFreetype2Library */ +#endif /* HasFreetype2 && !BuildFreetype2Library */ #ifndef Freetype2IncDirStandard # define Freetype2IncDirStandard NO @@ -3565,10 +3844,7 @@ #define XftClientLibs $(XFTLIB) FontconfigClientLibs $(XRENDERLIB) #endif -#if UseFontconfig - #if BuildFontconfigLibrary - #ifndef SharedLibFontconfig #define SharedLibFontconfig HasSharedLibraries #endif @@ -3585,6 +3861,7 @@ #define ProfileLibFontconfig NO #endif FONTCONFIGLIBSRC = $(LIBSRC)/fontconfig + #if SharedLibFontconfig #ifndef SharedFontconfigRev #define SharedFontconfigRev 1.0 @@ -3608,9 +3885,12 @@ FCCACHE = set -x; $(CLIENTENVSETUP) $(PRELOADXFTSETUP) FONTCONFIG_PATH=$(FONTCONFIGLIBSRC) $(XBUILDBINDIR)/fc-cache #endif -#else /* BuildFontconfigLibrary */ +#endif /* BuildFontconfigLibrary */ + +FCCACHEOPTS = -f -v -#if HasFontconfig +#if UseFontconfig +#if HasFontconfig && !BuildFontconfigLibrary #ifndef FontconfigDir # define FontconfigDir /usr @@ -3666,9 +3946,7 @@ FCCACHE = $(FONTCONFIGBINDIR)/fc-cache -#endif /* HasFontconfig */ - -#endif /* else BuildFontconfigLibrary */ +#endif /* HasFontconfig && !BuildFontconfigLibrary */ #if BuildFontconfigLibrary || HasFontconfig FONTCONFIGDEFINES = -DFONTCONFIG @@ -3685,7 +3963,7 @@ XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -#ifdef HasLibpng +#if defined(HasLibpng) && HasLibpng /* * Libpng controls: @@ -3782,6 +4060,9 @@ # ifndef SharedLibxkbfile # define SharedLibxkbfile NO # endif +# ifndef ExtraLibxkbfile +# define ExtraLibxkbfile NO +# endif # ifndef NormalLibxkbfile # define NormalLibxkbfile NO # endif @@ -3979,7 +4260,7 @@ * MakeFcCache - generate rules to build fontconfig cache database */ -#if defined UseFreetype2 && !CrossCompiling +#if BuildFontconfigLibrary || HasFontconfig && !CrossCompiling # ifndef MakeFcCache # define MakeFcCache(deplist) @@\ @@ -4577,7 +4858,7 @@ #ifndef InstallDoc #define InstallDoc(name,deps) @@\ -install:: @@\ +install:: deps @@\ MakeDir($(DESTDIR)$(DOCPSDIR)) @@\ @if [ -f name.ps -a X$(NOPS) = X ]; then set -x; \ @@\ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) name.ps \ @@\ Index: xc/config/cf/apollo.cf diff -u xc/config/cf/apollo.cf:1.3 xc/config/cf/apollo.cf:1.4 --- xc/config/cf/apollo.cf:1.3 Thu Apr 22 10:15:05 2004 +++ xc/config/cf/apollo.cf Mon Jan 9 09:56:13 2006 @@ -1,5 +1,4 @@ -XCOMM platform: $Xorg: apollo.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/apollo.cf,v 1.3 2004/04/22 14:15:05 tsi Exp $ +XCOMM $XFree86: xc/config/cf/apollo.cf,v 1.4 2006/01/09 14:56:13 dawes Exp $ /* * Minimally tested, and only in the bsd4.3 environment. X_NOT_POSIX is not Index: xc/config/cf/bsd.cf diff -u xc/config/cf/bsd.cf:1.3 xc/config/cf/bsd.cf:1.4 --- xc/config/cf/bsd.cf:1.3 Wed Jan 17 11:22:31 2001 +++ xc/config/cf/bsd.cf Mon Jan 9 09:56:13 2006 @@ -1,8 +1,4 @@ -XCOMM platform: $Xorg: bsd.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/bsd.cf,v 1.3 2001/01/17 16:22:31 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsd.cf,v 1.4 2006/01/09 14:56:13 dawes Exp $ #ifndef OSName #define OSName 4.3bsd Index: xc/config/cf/bsdLib.tmpl diff -u xc/config/cf/bsdLib.tmpl:3.24 xc/config/cf/bsdLib.tmpl:3.25 --- xc/config/cf/bsdLib.tmpl:3.24 Thu Nov 20 11:18:19 2003 +++ xc/config/cf/bsdLib.tmpl Mon Jan 9 09:56:13 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: bsdLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.24 2003/11/20 16:18:19 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.25 2006/01/09 14:56:13 dawes Exp $ /* * NetBSD/FreeBSD/OpenBSD shared library template Index: xc/config/cf/bsdi.cf diff -u xc/config/cf/bsdi.cf:3.40 xc/config/cf/bsdi.cf:3.41 --- xc/config/cf/bsdi.cf:3.40 Fri Jun 25 11:33:21 2004 +++ xc/config/cf/bsdi.cf Tue Jul 5 12:43:54 2005 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.40 2004/06/25 15:33:21 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.41 2005/07/05 16:43:54 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -388,10 +388,6 @@ olor */ #endif -#ifndef BuildPexExt -#define BuildPexExt (XsunServer || Xsun24Server) -#endif - #ifndef NeedConstPrototypes #define NeedConstPrototypes YES #endif @@ -402,8 +398,6 @@ #define NeedVarargsPrototypes YES #endif -#define PexCCOptions DefaultCCOptions - #ifndef BuildXKB #define BuildXKB YES #endif Index: xc/config/cf/bsdiLib.tmpl diff -u xc/config/cf/bsdiLib.tmpl:3.4 xc/config/cf/bsdiLib.tmpl:3.5 --- xc/config/cf/bsdiLib.tmpl:3.4 Mon Nov 3 20:59:31 2003 +++ xc/config/cf/bsdiLib.tmpl Tue Jul 5 12:43:54 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/bsdiLib.tmpl,v 3.4 2003/11/04 01:59:31 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdiLib.tmpl,v 3.5 2005/07/05 16:43:54 tsi Exp $ /* * BSDI shared library template (converted from Linux template) @@ -30,12 +30,8 @@ #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) #define SharedXiReqs $(LDPRELIB) $(XLIB) -#define SharedPexReqs $(LDPRELIB) $(XONLYLIB) MathLibrary #define SharedXtstReqs $(LDPRELIB) $(XLIB) -#define SharedXieReqs $(LDPRELIB) $(XONLYLIB) #define SharedSMReqs $(LDPRELIB) $(ICELIB) -#define SharedFrescoReqs $(LDPRELIB) $(XONLYLIB) FrescoSysLibs -#define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs /* Motif lib requirements */ #define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) Index: xc/config/cf/cde.rules diff -u xc/config/cf/cde.rules:1.4 xc/config/cf/cde.rules:1.5 --- xc/config/cf/cde.rules:1.4 Wed Jan 17 11:22:31 2001 +++ xc/config/cf/cde.rules Mon Jan 9 09:56:13 2006 @@ -13,7 +13,7 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ -XCOMM $Xorg: cde.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/cde.rules,v 1.5 2006/01/09 14:56:13 dawes Exp $ /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject Index: xc/config/cf/cde.tmpl diff -u xc/config/cf/cde.tmpl:1.1.1.2 xc/config/cf/cde.tmpl:1.2 --- xc/config/cf/cde.tmpl:1.1.1.2 Tue Jan 16 16:53:23 2001 +++ xc/config/cf/cde.tmpl Mon Jan 9 09:56:13 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: cde.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/cde.tmpl,v 1.2 2006/01/09 14:56:13 dawes Exp $ /* Include the Motif project template file. */ #include Index: xc/config/cf/convex.cf diff -u xc/config/cf/convex.cf:1.1.1.5 xc/config/cf/convex.cf:1.2 --- xc/config/cf/convex.cf:1.1.1.5 Tue Jan 16 16:53:26 2001 +++ xc/config/cf/convex.cf Mon Jan 9 09:56:13 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: convex.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/convex.cf,v 1.2 2006/01/09 14:56:13 dawes Exp $ #ifndef OSName #define OSName ConvexOS V9.0 Index: xc/config/cf/cray.cf diff -u xc/config/cf/cray.cf:1.1.1.4 xc/config/cf/cray.cf:1.2 --- xc/config/cf/cray.cf:1.1.1.4 Tue Jan 16 16:53:28 2001 +++ xc/config/cf/cray.cf Tue Jul 5 12:43:54 2005 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: cray.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/cray.cf,v 1.2 2005/07/05 16:43:54 tsi Exp $ #ifndef OSName #define OSName UNICOS 8.0 @@ -21,7 +21,6 @@ #define HasXServer NO #define ConnectionFlags -DTCPCONN #define HasShm NO -#define PexNativeFPFormat PEXCRAY_Floating #define NativeFPFormat CRAY_Float #ifdef UseInstalled #define InstallCmd install Index: xc/config/cf/cross.rules diff -u xc/config/cf/cross.rules:1.8 xc/config/cf/cross.rules:1.9 --- xc/config/cf/cross.rules:1.8 Sun Jul 14 13:08:15 2002 +++ xc/config/cf/cross.rules Fri Oct 14 11:15:52 2005 @@ -1,10 +1,11 @@ -XCOMM $XFree86: xc/config/cf/cross.rules,v 1.8 2002/07/14 17:08:15 alanh Exp $ +XCOMM $XFree86: xc/config/cf/cross.rules,v 1.9 2005/10/14 15:15:52 tsi Exp $ #ifndef HostCcCmd #define HostCcCmd cc #endif -#define HostLinkRule(target,flags,objs,libs) HostCcCmd -I$(BUILDINCDIR) -o target flags objs libs +#define HostLinkRule(target,flags,objs,libs) \ + HostCcCmd -o target flags objs libs /* ComplexHostProgramTarget - Compile a program such that we can run * it on this host, i.e., don't use the default cross compiler. Index: xc/config/cf/cygwin.cf diff -u xc/config/cf/cygwin.cf:3.59 xc/config/cf/cygwin.cf:3.63 --- xc/config/cf/cygwin.cf:3.59 Sat Jan 15 19:09:45 2005 +++ xc/config/cf/cygwin.cf Sun Feb 19 10:51:12 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.59 2005/01/16 00:09:45 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.63 2006/02/19 15:51:12 tsi Exp $ #ifndef OSName # define OSName Cygwin @@ -229,12 +229,9 @@ * define for experimental development purposes. */ #define XWinServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \ - XFree86DGADefines XFree86XvDefines \ XFree86LoaderDefines -DXFree86Server \ - VidModeExtensionDefines \ - XFree86XvMCDefines \ SmartScheduleDefines \ - DebugDefines XFree86XResDefines \ + DebugDefines \ -DX_BYTE_ORDER=$(X_BYTE_ORDER) #define ServerOSDefines XWinServerDefines \ -DDDXTIME -DFD_SETSIZE=256 -DDDXOSINIT \ @@ -245,7 +242,6 @@ #define ConnectionFlags -DTCPCONN -DUNIXCONN #define ExtraLibraries #define InstUidFlags -m 4711 -#define UseRgbTxt YES #define ExtraFilesToClean *.obj *.orig *.rej junk.c *.exe *.dll *.lib *~ /* IPv6 not yet supported */ @@ -266,17 +262,6 @@ #define BuildXinerama NO /* - * PEX and XIE were deprecated on 2001-05-29, as Keith Packard says, - * "they are so broken as to be unusable in real applications," furthermore, - * "neither PEX nor XIE have seen any development for almost a decade". - * - * XIE is the X Image Extension Protocol, not to be confused with - * XInputExt, which is the X Input Extension. - */ -#define BuildPexExt NO -#define BuildXIE NO - -/* * Rush is a non standard extension for cooperation between the glide * library and the X server. Cygwin/XFree86 will never need Rush, * as all graphics requests are processed through GDI or DirectDraw. @@ -289,7 +274,6 @@ * for Cygwin/XFree86 to try to provide power management. */ #define BuildDPMS NO -#define BuildDPMSExt NO #define DPMSDefines /**/ #define BuildGlxExt YES Index: xc/config/cf/cygwin.rules diff -u xc/config/cf/cygwin.rules:3.28 xc/config/cf/cygwin.rules:3.29 --- xc/config/cf/cygwin.rules:3.28 Wed Dec 24 13:58:41 2003 +++ xc/config/cf/cygwin.rules Tue Jul 5 12:43:54 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.28 2003/12/24 18:58:41 dickey Exp $ +XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.29 2005/07/05 16:43:54 tsi Exp $ /* * Cygwin shared library rules (DLL versions) @@ -15,9 +15,7 @@ #define SharedLibSM YES #define SharedLibICE YES #define SharedLibXext YES -#define SharedLibXie YES #define SharedLibXi YES -#define SharedLibPex YES #define SharedLibXtst YES #define SharedOldX YES #define SharedLibXp YES Index: xc/config/cf/cygwin.tmpl diff -u xc/config/cf/cygwin.tmpl:3.19 xc/config/cf/cygwin.tmpl:3.20 --- xc/config/cf/cygwin.tmpl:3.19 Wed Dec 24 13:58:41 2003 +++ xc/config/cf/cygwin.tmpl Tue Jul 5 12:43:54 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.19 2003/12/24 18:58:41 dickey Exp $ +XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.20 2005/07/05 16:43:54 tsi Exp $ #if UseCygIPC # define SharedX11Reqs -lcygipc @@ -14,9 +14,7 @@ #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) #define SharedXiReqs $(LDPRELIB) $(XLIB) -#define SharedPexReqs $(LDPRELIB) $(XONLYLIB) #define SharedXtstReqs $(LDPRELIB) $(XLIB) -#define SharedXieReqs $(LDPRELIB) $(XONLYLIB) #define SharedSMReqs $(LDPRELIB) $(ICELIB) #define SharedXpReqs $(LDPRELIB) $(XAUTHLIB) $(XLIB) #define SharedXvReqs $(LDPRELIB) $(XLIB) Index: xc/config/cf/darwin.cf diff -u xc/config/cf/darwin.cf:1.53 xc/config/cf/darwin.cf:1.54 --- xc/config/cf/darwin.cf:1.53 Mon Feb 14 19:57:23 2005 +++ xc/config/cf/darwin.cf Wed Sep 14 10:23:13 2005 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.53 2005/02/15 00:57:23 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/darwin.cf,v 1.54 2005/09/14 14:23:13 tsi Exp $ /* Darwin / Mac OS X configuration by John Carmack */ @@ -50,6 +50,9 @@ #ifndef HasGcc3 # define HasGcc3 NO #endif +#ifndef HasGcc4 +# define HasGcc4 NO +#endif /* Older versions don't really support IPv6, but #define AF_INET6. */ #if OSMajorVersion < 6 Index: xc/config/cf/dmx.cf diff -u xc/config/cf/dmx.cf:1.1 xc/config/cf/dmx.cf:1.4 --- xc/config/cf/dmx.cf:1.1 Wed Jun 30 16:21:35 2004 +++ xc/config/cf/dmx.cf Sun Feb 19 10:51:12 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/config/cf/dmx.cf,v 1.1 2004/06/30 20:21:35 martin Exp $ */ +XCOMM $XFree86: xc/config/cf/dmx.cf,v 1.4 2006/02/19 15:51:12 tsi Exp $ /* * This file contains DMX server specific defines @@ -33,34 +33,8 @@ ((month) * 100) + \ ((day) * 1) #undef XVendorRelease -#define XVendorRelease DMX_VENDOR_RELEASE(1,2,2004,6,30) +#define XVendorRelease DMX_VENDOR_RELEASE(1,3,2006,2,20) -EXTENSIONS_NOT_SUPPORTED = \ - -UBEZIER \ - -UPEXEXT \ - -UMULTIBUFFER \ - -UXV \ - -UXIE \ - -UDBE \ - -UXF86VIDMODE \ - -UXF86MISC \ - -UXFreeXDGA \ - -UXF86DRI \ - -UMITSHM \ - -UTOGCUP \ - -UDPSEXT \ - -UMITMISC \ - -USCREENSAVER \ - -URANDR - -EXT_TEMP_NOT_SUPPORTED = \ - -UFONTCACHE - -DMX_DEFINES = \ - $(EXTENSIONS_NOT_SUPPORTED) \ - $(EXT_TEMP_NOT_SUPPORTED) \ - -UXFree86LOADER - -XCOMM MITSHM -- works but doesn't quite do what people think it should -XCOMM DPMSExtension -- compiled in but is non-functional -XCOMM MITMISC provides legacy support for X11R1,2 applications. Disable. +#ifdef XdmxExcludedExtensions +DMX_DEFINES = XdmxExcludedExtensions +#endif Index: xc/config/cf/fujitsu.cf diff -u xc/config/cf/fujitsu.cf:3.4 xc/config/cf/fujitsu.cf:3.5 --- xc/config/cf/fujitsu.cf:3.4 Wed Jan 17 11:22:31 2001 +++ xc/config/cf/fujitsu.cf Mon Jan 9 09:56:13 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: fujitsu.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/fujitsu.cf,v 3.5 2006/01/09 14:56:13 dawes Exp $ #ifndef OSName # define OSName DefaultOSName Index: xc/config/cf/generic.cf diff -u xc/config/cf/generic.cf:1.1.1.4 xc/config/cf/generic.cf:1.2 --- xc/config/cf/generic.cf:1.1.1.4 Tue Jan 16 16:53:32 2001 +++ xc/config/cf/generic.cf Mon Jan 9 09:56:13 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: generic.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/generic.cf,v 1.2 2006/01/09 14:56:13 dawes Exp $ #ifndef OSName #define OSName Unknown Operating System Index: xc/config/cf/gnuLib.tmpl diff -u xc/config/cf/gnuLib.tmpl:1.6 xc/config/cf/gnuLib.tmpl:1.7 --- xc/config/cf/gnuLib.tmpl:1.6 Mon Nov 3 20:59:31 2003 +++ xc/config/cf/gnuLib.tmpl Tue Jul 5 12:43:54 2005 @@ -1,7 +1,7 @@ XCOMM XCOMM GNU Hurd shared library template XCOMM -XCOMM $XFree86: xc/config/cf/gnuLib.tmpl,v 1.6 2003/11/04 01:59:31 dawes Exp $ +XCOMM $XFree86: xc/config/cf/gnuLib.tmpl,v 1.7 2005/07/05 16:43:54 tsi Exp $ XCOMM #ifndef FixupLibReferences @@ -23,7 +23,5 @@ #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) #define SharedXiReqs $(LDPRELIB) $(XLIB) -#define SharedPexReqs $(LDPRELIB) $(XONLYLIB) MathLibrary #define SharedXtstReqs $(LDPRELIB) $(XLIB) -#define SharedXieReqs $(LDPRELIB) $(XONLYLIB) #define SharedSMReqs $(LDPRELIB) $(ICELIB) Index: xc/config/cf/hp.cf diff -u xc/config/cf/hp.cf:3.7 xc/config/cf/hp.cf:3.8 --- xc/config/cf/hp.cf:3.7 Wed Jan 17 11:22:31 2001 +++ xc/config/cf/hp.cf Tue Jul 5 12:43:54 2005 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: hp.cf,v 1.5 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/hp.cf,v 3.8 2005/07/05 16:43:54 tsi Exp $ #ifndef OSName # define OSName DefaultOSName @@ -104,12 +104,9 @@ # define StandardDefines -Dhpux -DSYSV # if OSMajorVersion < 8 # define DefaultCCOptions -Wc,-Nd4000,-Ns4100,-Ne700,-Np200,-Nw300 -# define PexCCOptions -Wp,-H150000 -Wc,-Nd4000,-Ns8100,-Ne700,-Np200 # else # define OptimizedCDebugFlags +O1 -# define PexCCOptions -Wp,-H250000 # endif -# define PexShmIPC NO # define LintOpts -ax -Nd4000 -Ns8000 -Ne700 -Np200 -Na25000 #endif #define MvCmd mv -f Index: xc/config/cf/hpLib.rules diff -u xc/config/cf/hpLib.rules:3.5 xc/config/cf/hpLib.rules:3.6 --- xc/config/cf/hpLib.rules:3.5 Wed Mar 24 22:36:21 2004 +++ xc/config/cf/hpLib.rules Mon Jan 9 09:56:13 2006 @@ -1,10 +1,8 @@ -XCOMM $Xorg: hpLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ - /* * HP shared library rules */ -XCOMM $XFree86: xc/config/cf/hpLib.rules,v 3.5 2004/03/25 03:36:21 dawes Exp $ +XCOMM $XFree86: xc/config/cf/hpLib.rules,v 3.6 2006/01/09 14:56:13 dawes Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES Index: xc/config/cf/hpLib.tmpl diff -u xc/config/cf/hpLib.tmpl:1.2 xc/config/cf/hpLib.tmpl:1.3 --- xc/config/cf/hpLib.tmpl:1.2 Tue May 27 17:56:40 2003 +++ xc/config/cf/hpLib.tmpl Tue Jul 5 12:43:54 2005 @@ -1,8 +1,4 @@ -XCOMM $Xorg: hpLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/hpLib.tmpl,v 1.2 2003/05/27 21:56:40 tsi Exp $ +XCOMM $XFree86: xc/config/cf/hpLib.tmpl,v 1.3 2005/07/05 16:43:54 tsi Exp $ /* * HP shared library template @@ -16,9 +12,7 @@ #define SharedXmuReqs $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(XONLYLIB) #define SharedXiReqs $(XLIB) -#define SharedPexReqs $(XONLYLIB) MathLibrary #define SharedXtstReqs $(XLIB) -#define SharedXieReqs $(XONLYLIB) #define SharedSMReqs $(ICELIB) #define SharedXpReqs $(XLIB) Index: xc/config/cf/ibm.cf diff -u xc/config/cf/ibm.cf:3.8 xc/config/cf/ibm.cf:3.9 --- xc/config/cf/ibm.cf:3.8 Wed Jan 17 11:22:31 2001 +++ xc/config/cf/ibm.cf Mon Jan 9 09:56:13 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: ibm.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/ibm.cf,v 3.9 2006/01/09 14:56:13 dawes Exp $ #ifndef OSName # define OSName DefaultOSName Index: xc/config/cf/ibmLib.rules diff -u xc/config/cf/ibmLib.rules:3.6 xc/config/cf/ibmLib.rules:3.7 --- xc/config/cf/ibmLib.rules:3.6 Wed Jan 17 11:22:31 2001 +++ xc/config/cf/ibmLib.rules Mon Jan 9 09:56:13 2006 @@ -1,10 +1,8 @@ -XCOMM $Xorg: ibmLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ - /* * AIX shared library rules */ -XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.6 2001/01/17 16:22:31 dawes Exp $ +XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.7 2006/01/09 14:56:13 dawes Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES Index: xc/config/cf/ibmLib.tmpl diff -u xc/config/cf/ibmLib.tmpl:1.4 xc/config/cf/ibmLib.tmpl:1.5 --- xc/config/cf/ibmLib.tmpl:1.4 Tue May 27 17:56:40 2003 +++ xc/config/cf/ibmLib.tmpl Tue Jul 5 12:43:54 2005 @@ -1,10 +1,8 @@ -XCOMM $Xorg: ibmLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ - /* * AIX shared library template */ -XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.4 2003/05/27 21:56:40 tsi Exp $ +XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.5 2005/07/05 16:43:54 tsi Exp $ /* * IBM used an unusual shared object file name in some libraries. @@ -36,8 +34,6 @@ #define SharedXawReqs $(XMULIB) $(XTOOLLIB) $(XLIB) #define SharedXiReqs $(XLIB) #define SharedXtstReqs $(XLIB) -#define SharedPexReqs $(XONLYLIB) -#define SharedXieReqs $(XONLYLIB) #define SharedSMReqs $(ICELIB) #define SharedXpReqs $(XLIB) #define SharedXpmReqs $(XLIB) Index: xc/config/cf/isc.cf diff -u xc/config/cf/isc.cf:3.16 xc/config/cf/isc.cf:3.17 --- xc/config/cf/isc.cf:3.16 Wed Jan 17 11:22:32 2001 +++ xc/config/cf/isc.cf Mon Jan 9 09:56:13 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: isc.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ - - - -XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.16 2001/01/17 16:22:32 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.17 2006/01/09 14:56:13 dawes Exp $ #ifndef HasGcc2 #define HasGcc2 YES Index: xc/config/cf/linux.cf diff -u xc/config/cf/linux.cf:3.235 xc/config/cf/linux.cf:3.241 --- xc/config/cf/linux.cf:3.235 Wed Feb 9 14:49:09 2005 +++ xc/config/cf/linux.cf Sun Apr 2 19:12:46 2006 @@ -1,7 +1,7 @@ -XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.235 2005/02/09 19:49:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.241 2006/04/02 23:12:46 dickey Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -207,6 +207,7 @@ # ifndef HasLibCrypt # define HasLibCrypt YES # endif +# define InstallXtermSetGID YES /* netscape wraps select but not poll as of communicator 4.72 */ # ifndef HasPoll # define HasPoll NO @@ -413,10 +414,16 @@ * Defaults for the TinyX servers on Linux. */ #ifndef HaveTinyXSupport -# if defined(i386Architecture) -# define HaveTinyXSupport YES +/* XXX This is provisional */ +# define HaveTinyXSupport YES +#endif +#ifndef HaveTinyXIOPortSupport +# if defined(i386Architecture) || defined(AlphaArchitecture) || \ + defined(AMD64Architecture) || defined(SuperHArchitecture) || \ + defined(ia64Architecture) +# define HaveTinyXIOPortSupport YES # else -# define HaveTinyXSupport NO +# define HaveTinyXIOPortSupport NO # endif #endif #ifndef HaveTinyXVBESupport @@ -727,7 +734,9 @@ #define YaccCmd bison -y #define LexCmd flex -l #define HasFlex YES -#define LexLib -lfl +#ifndef LexLib +# define LexLib -lfl +#endif #define PreProcessCmd CcCmd -E #define PostIncDir DefaultGccIncludeDir #define LdCombineFlags -r @@ -911,7 +920,7 @@ # ifndef OptimizedCDebugFlags # define OptimizedCDebugFlags DefaultGcc2AMD64Opt # endif -# define LinuxMachineDefines -D__AMD64__ +# define LinuxMachineDefines -D__amd64__ # define ServerOSDefines XFree86ServerOSDefines # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* AMD64Architecture */ Index: xc/config/cf/lnxLib.tmpl diff -u xc/config/cf/lnxLib.tmpl:3.20 xc/config/cf/lnxLib.tmpl:3.21 --- xc/config/cf/lnxLib.tmpl:3.20 Mon Nov 3 20:59:31 2003 +++ xc/config/cf/lnxLib.tmpl Mon Jan 9 09:56:13 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.20 2003/11/04 01:59:31 dawes Exp $ +XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.21 2006/01/09 14:56:13 dawes Exp $ /* * Linux shared library template Index: xc/config/cf/lnxdoc.tmpl diff -u xc/config/cf/lnxdoc.tmpl:3.13 xc/config/cf/lnxdoc.tmpl:3.14 --- xc/config/cf/lnxdoc.tmpl:3.13 Mon Mar 7 11:39:16 2005 +++ xc/config/cf/lnxdoc.tmpl Mon Feb 20 11:08:31 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.13 2005/03/07 16:39:16 tsi Exp $ +XCOMM $XFree86: xc/config/cf/lnxdoc.tmpl,v 3.14 2006/02/20 16:08:31 tsi Exp $ XCOMM #ifndef HasSgmlFmt @@ -64,10 +64,7 @@ DVIPSOPTIONS = DvipsOptions SGMLFMTCMD = SgmlFmtCmd -XCOMM Some extra things to clean - -#ifdef DocFilesToClean -#undef DocFilesToClean -#endif +/* Some extra things to clean */ +#undef DocFilesToClean #define DocFilesToClean *.aux *.dvi *.log *.tex *.toc *.html *.ps *.latin1 Index: xc/config/cf/luna.cf diff -u xc/config/cf/luna.cf:1.1.1.5 xc/config/cf/luna.cf:1.2 --- xc/config/cf/luna.cf:1.1.1.5 Tue Jan 16 16:53:51 2001 +++ xc/config/cf/luna.cf Tue Jul 5 12:43:54 2005 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: luna.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/luna.cf,v 1.2 2005/07/05 16:43:54 tsi Exp $ /* * Please set the values for OSMajorVerion and OSMinorVersion * before making makefiles. @@ -103,12 +103,10 @@ #ifdef Mc68000Architecture #define UnalignedReferencesAllowed YES /* if arbitrary deref is okay */ -#define BuildPexExt NO #define XlunaServer YES #endif #ifdef Mc88000Architecture -#define BuildPexExt NO #define XlunaServer YES #endif Index: xc/config/cf/lynx.cf diff -u xc/config/cf/lynx.cf:3.53 xc/config/cf/lynx.cf:3.55 --- xc/config/cf/lynx.cf:3.53 Sat Jan 15 19:09:45 2005 +++ xc/config/cf/lynx.cf Tue Jul 5 12:43:54 2005 @@ -1,6 +1,6 @@ -XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.53 2005/01/16 00:09:45 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.55 2005/07/05 16:43:54 tsi Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2005 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -417,8 +417,6 @@ #ifdef SparcArchitecture # define XsunLynxServer YES # define XsunLynxMonoServer NO -# define BuildPexExt YES -# define BuildXIE YES # ifndef BuildScreenSaverLibrary # define BuildScreenSaverLibrary YES # endif @@ -428,15 +426,6 @@ # define BuildXInputExt NO # define BuildXF86MiscExt NO # define BuildXF86VidModeExt NO -/* - * XFree86 uses its own (more portable) database routines to speed up - * the RGB database lookups - * However, if you want to use ndbm anyway, you can set that to NO in - * site.def - */ -# ifndef UseRgbTxt -# define UseRgbTxt YES -# endif #endif #if !defined(i386Architecture) && !defined(PpcArchitecture) Index: xc/config/cf/macII.cf diff -u xc/config/cf/macII.cf:1.1.1.6 xc/config/cf/macII.cf:1.2 --- xc/config/cf/macII.cf:1.1.1.6 Tue Jan 16 16:53:58 2001 +++ xc/config/cf/macII.cf Tue Jul 5 12:43:54 2005 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: macII.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/macII.cf,v 1.2 2005/07/05 16:43:54 tsi Exp $ #ifndef OSName #define OSName A/UX 3.0.1 @@ -26,7 +26,6 @@ #define ExecableScripts NO #define RemoveTargetProgramByMoving YES #define ExpandManNames YES -#define PexShmIPC NO #define XmacIIServer YES #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #if MacHasc89 @@ -42,7 +41,6 @@ #if !HasGcc #define DefaultCCOptions -A 3 -#define PexCCOptions -A 4 #endif /* Index: xc/config/cf/minix.cf diff -u xc/config/cf/minix.cf:3.7 xc/config/cf/minix.cf:3.8 --- xc/config/cf/minix.cf:3.7 Fri Apr 23 16:48:06 2004 +++ xc/config/cf/minix.cf Fri Oct 14 11:15:52 2005 @@ -1,8 +1,4 @@ -XCOMM $Xorg: minix.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/minix.cf,v 3.7 2004/04/23 20:48:06 tsi Exp $ +XCOMM $XFree86: xc/config/cf/minix.cf,v 3.8 2005/10/14 15:15:52 tsi Exp $ /* @@ -55,7 +51,7 @@ #ifndef AssembleObject #define AssembleObject(flags) $(RM) $@ $*.i.s @@\ - $(CPP) CPPAsmOptions AsmDefines $(DEFINES) $(INCLUDES) flags $*.S | \ @@\ + $(CPP) CPPAsmOptions AsmDefines $(ALLDEFINES) flags $*.S | \ @@\ grep -v '^\#' > $*.i.s @@\ $(AS) -o $*.o $*.i.s @@\ $(RM) $*.i.s Index: xc/config/cf/moto.cf diff -u xc/config/cf/moto.cf:1.1.1.4 xc/config/cf/moto.cf:1.2 --- xc/config/cf/moto.cf:1.1.1.4 Tue Jan 16 16:54:04 2001 +++ xc/config/cf/moto.cf Mon Jan 9 09:56:13 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: moto.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/moto.cf,v 1.2 2006/01/09 14:56:13 dawes Exp $ #if defined(MotoR3Architecture) Index: xc/config/cf/nec.cf diff -u xc/config/cf/nec.cf:1.1.1.4 xc/config/cf/nec.cf:1.2 --- xc/config/cf/nec.cf:1.1.1.4 Tue Jan 16 16:54:06 2001 +++ xc/config/cf/nec.cf Mon Jan 9 09:56:13 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: nec.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/nec.cf,v 1.2 2006/01/09 14:56:13 dawes Exp $ #ifdef nec_ews_svr2 # define NecCISCArchitecture Index: xc/config/cf/necLib.rules diff -u xc/config/cf/necLib.rules:1.5 xc/config/cf/necLib.rules:1.6 --- xc/config/cf/necLib.rules:1.5 Wed Mar 24 22:36:21 2004 +++ xc/config/cf/necLib.rules Mon Jan 9 09:56:13 2006 @@ -1,10 +1,8 @@ -XCOMM $Xorg: necLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - /* * NECOS shared library rules */ -XCOMM $XFree86: xc/config/cf/necLib.rules,v 1.5 2004/03/25 03:36:21 dawes Exp $ +XCOMM $XFree86: xc/config/cf/necLib.rules,v 1.6 2006/01/09 14:56:13 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES Index: xc/config/cf/necLib.tmpl diff -u xc/config/cf/necLib.tmpl:1.1.1.2 xc/config/cf/necLib.tmpl:1.2 --- xc/config/cf/necLib.tmpl:1.1.1.2 Tue Jan 16 16:54:08 2001 +++ xc/config/cf/necLib.tmpl Mon Jan 9 09:56:13 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: necLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/necLib.tmpl,v 1.2 2006/01/09 14:56:13 dawes Exp $ /* * NEC shared library template Index: xc/config/cf/oldlib.rules diff -u xc/config/cf/oldlib.rules:1.1.1.2 xc/config/cf/oldlib.rules:1.2 --- xc/config/cf/oldlib.rules:1.1.1.2 Tue Jan 16 16:54:10 2001 +++ xc/config/cf/oldlib.rules Mon Jan 9 09:56:13 2006 @@ -1,6 +1,6 @@ /* You should not use these any more, use new Library.tmpl insead */ -XCOMM $Xorg: oldlib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/oldlib.rules,v 1.2 2006/01/09 14:56:13 dawes Exp $ /* * ProfiledLibraryObjectRule - generate make rules to build both profiled Index: xc/config/cf/os2.cf diff -u xc/config/cf/os2.cf:3.46 xc/config/cf/os2.cf:3.48 --- xc/config/cf/os2.cf:3.46 Mon Mar 7 11:39:16 2005 +++ xc/config/cf/os2.cf Sat Apr 8 14:30:23 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.46 2005/03/07 16:39:16 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.48 2006/04/08 18:30:23 dawes Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -112,6 +112,7 @@ #define HasVarRun NO #define HasLibPthread NO #define HasPosixThreads NO +/* #define ThreadsLibraries -lpthreads */ #define HasVarDb NO #define HasDlopen NO #define HasBsearch NO @@ -137,9 +138,12 @@ #define StdIncDir /usr/include #define HasStickyDirBit NO #define HasMkstemp NO -#define BuildThreadStubLibrary NO #define HasBasename NO /* C-function, not shell utility!! */ - +/* + * There is a newer version of fontconfig for OS/2 available, + * which is needed by GTK+-2.0 anyway + */ +#define HasFontconfig YES /* * Compiler Features @@ -168,9 +172,9 @@ #define PreProcessCmd CppCmd #define CcCmd gcc -D__UNIXOS2__ -#define DefaultCCOptions -D__ST_MT_ERRNO -Zmtd -Zsysv-signals -#define LibraryCCOptions -D__ST_MT_ERRNO -Zmtd -Zsysv-signals -#define ServerCCOptions -D__ST_MT_ERRNO -Zmtd -Zsysv-signals +#define DefaultCCOptions -D__ST_MT_ERRNO__ -Zmtd -Zsysv-signals +#define LibraryCCOptions -D__ST_MT_ERRNO__ -Zmtd -Zsysv-signals +#define ServerCCOptions -D__ST_MT_ERRNO__ -Zmtd -Zsysv-signals #define ModuleCcCmd gcc_elf #define ModuleCppCmd cpp_elf Index: xc/config/cf/os2.rules diff -u xc/config/cf/os2.rules:3.24 xc/config/cf/os2.rules:3.25 --- xc/config/cf/os2.rules:3.24 Tue Oct 21 13:41:44 2003 +++ xc/config/cf/os2.rules Mon Jan 9 09:56:13 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: os2.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - - - -XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.24 2003/10/21 17:41:44 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.25 2006/01/09 14:56:13 dawes Exp $ .SUFFIXES: .Osuf .c .CCsuf Index: xc/config/cf/os2Lib.rules diff -u xc/config/cf/os2Lib.rules:3.23 xc/config/cf/os2Lib.rules:3.24 --- xc/config/cf/os2Lib.rules:3.23 Mon May 31 20:16:53 2004 +++ xc/config/cf/os2Lib.rules Sat Apr 8 14:30:23 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.23 2004/06/01 00:16:53 dawes Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.24 2006/04/08 18:30:23 dawes Exp $ /* * OS2/EMX shared library rules (DLL version) @@ -78,7 +78,7 @@ @@\ Concat3(libname,rev,.dll): solist Concat(libname,os2.def) @@\ RemoveFile($@) @@\ - $(SHLD) -o $(DLLNAME) solist $(REQUIREDLIBS) $(SHADDLIBS) Concat(libname,o_os2.def) @@\ + $(SHLD) -o $(DLLNAME) solist $(REQUIREDLIBS) $(SHADDLIBS) $(LDLIBS) Concat(libname,o_os2.def) @@\ touch $@ @@\ BuildDllSupportLibs3(libname,rev) @@\ LinkBuildLibrary5(libname,rev,.dll) @@\ Index: xc/config/cf/os2Lib.tmpl diff -u xc/config/cf/os2Lib.tmpl:3.20 xc/config/cf/os2Lib.tmpl:3.21 --- xc/config/cf/os2Lib.tmpl:3.20 Sun Feb 6 20:38:23 2005 +++ xc/config/cf/os2Lib.tmpl Mon Jan 9 09:56:13 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: os2Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.20 2005/02/07 01:38:23 tsi Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.21 2006/01/09 14:56:13 dawes Exp $ /* * OS2/EMX shared library template Index: xc/config/cf/os2def.db diff -u xc/config/cf/os2def.db:1.10 xc/config/cf/os2def.db:1.12 --- xc/config/cf/os2def.db:1.10 Sun Feb 6 20:38:23 2005 +++ xc/config/cf/os2def.db Sat Apr 8 14:30:23 2006 @@ -9,430 +9,8 @@ ; be TAB, not a nice looking number of spaces! Don't try to beautify this ; file!!!! ; -; $XFree86: xc/config/cf/os2def.db,v 1.10 2005/02/07 01:38:23 tsi Exp $ +; $XFree86: xc/config/cf/os2def.db,v 1.12 2006/04/08 18:30:23 dawes Exp $ ; -LIBRARY PEX5 PEX5 -PEX5 PEXAccumulateState 1 -PEX5 PEXAddToNameSet 2 -PEX5 PEXAnnotationText 3 -PEX5 PEXAnnotationText2D 4 -PEX5 PEXApplicationData 5 -PEX5 PEXBeginPickAll 6 -PEX5 PEXBeginPickOne 7 -PEX5 PEXBeginRendering 8 -PEX5 PEXBeginStructure 9 -PEX5 PEXBuildTransform 10 -PEX5 PEXBuildTransform2D 11 -PEX5 PEXCellArray 12 -PEX5 PEXCellArray2D 13 -PEX5 PEXChangeNameSet 14 -PEX5 PEXChangePickDevice 15 -PEX5 PEXChangePipelineContext 16 -PEX5 PEXChangeRenderer 17 -PEX5 PEXChangeSearchContext 18 -PEX5 PEXChangeStructureRefs 19 -PEX5 PEXCopyBytesToOC 20 -PEX5 PEXCopyElements 21 -PEX5 PEXCopyLookupTable 22 -PEX5 PEXCopyNameSet 23 -PEX5 PEXCopyPipelineContext 24 -PEX5 PEXCopySearchContext 25 -PEX5 PEXCopyStructure 26 -PEX5 PEXCountOCs 27 -PEX5 PEXCreateLookupTable 28 -PEX5 PEXCreateNameSet 29 -PEX5 PEXCreatePickMeasure 30 -PEX5 PEXCreatePipelineContext 31 -PEX5 PEXCreateRenderer 32 -PEX5 PEXCreateSearchContext 33 -PEX5 PEXCreateStructure 34 -PEX5 PEXCreateWorkstation 35 -PEX5 PEXDecodeOCs 36 -PEX5 PEXDeleteBetweenLabels 37 -PEX5 PEXDeleteElements 38 -PEX5 PEXDeleteTableEntries 39 -PEX5 PEXDeleteToLabel 40 -PEX5 PEXDestroyStructures 41 -PEX5 PEXElementSearch 42 -PEX5 PEXEncodeOCs 43 -PEX5 PEXEncodedAnnoText 44 -PEX5 PEXEncodedAnnoText2D 45 -PEX5 PEXEncodedText 46 -PEX5 PEXEncodedText2D 47 -PEX5 PEXEndPickAll 48 -PEX5 PEXEndPickOne 49 -PEX5 PEXEndRendering 50 -PEX5 PEXEndStructure 51 -PEX5 PEXEscape 52 -PEX5 PEXEscapeWithReply 53 -PEX5 PEXExecuteDeferredActions 54 -PEX5 PEXExecuteStructure 55 -PEX5 PEXExtendedCellArray 56 -PEX5 PEXFetchElements 57 -PEX5 PEXFetchElementsAndSend 58 -PEX5 PEXFillArea 59 -PEX5 PEXFillArea2D 60 -PEX5 PEXFillAreaSet 61 -PEX5 PEXFillAreaSet2D 62 -PEX5 PEXFillAreaSetWithData 63 -PEX5 PEXFillAreaWithData 64 -PEX5 PEXFinishOCs 65 -PEX5 PEXFreeEnumInfo 66 -PEX5 PEXFreeFontInfo 67 -PEX5 PEXFreeFontNames 68 -PEX5 PEXFreeLookupTable 69 -PEX5 PEXFreeNameSet 70 -PEX5 PEXFreeOCData 71 -PEX5 PEXFreePCAttributes 72 -PEX5 PEXFreePDAttributes 73 -PEX5 PEXFreePMAttributes 74 -PEX5 PEXFreePickMeasure 75 -PEX5 PEXFreePickPaths 76 -PEX5 PEXFreePipelineContext 77 -PEX5 PEXFreeRenderer 78 -PEX5 PEXFreeRendererAttributes 79 -PEX5 PEXFreeSCAttributes 80 -PEX5 PEXFreeSearchContext 81 -PEX5 PEXFreeStructurePaths 82 -PEX5 PEXFreeTableEntries 83 -PEX5 PEXFreeWorkstation 84 -PEX5 PEXFreeWorkstationAttributes 85 -PEX5 PEXGDP 86 -PEX5 PEXGDP2D 87 -PEX5 PEXGSE 88 -PEX5 PEXGeoNormFillArea 89 -PEX5 PEXGeoNormFillAreaSet 90 -PEX5 PEXGeoNormQuadrilateralMesh 91 -PEX5 PEXGeoNormSetOfFillAreaSets 92 -PEX5 PEXGeoNormTriangleStrip 93 -PEX5 PEXGetAncestors 94 -PEX5 PEXGetDefinedIndices 95 -PEX5 PEXGetDescendants 96 -PEX5 PEXGetElementInfo 97 -PEX5 PEXGetEnumTypeInfo 98 -PEX5 PEXGetExtensionInfo 99 -PEX5 PEXGetImpDepConstants 100 -PEX5 PEXGetNameSet 101 -PEX5 PEXGetOCAddr 102 -PEX5 PEXGetPickDevice 103 -PEX5 PEXGetPickMeasure 104 -PEX5 PEXGetPipelineContext 105 -PEX5 PEXGetPredefinedEntries 106 -PEX5 PEXGetProtocolFloatFormat 107 -PEX5 PEXGetRendererAttributes 108 -PEX5 PEXGetRendererDynamics 109 -PEX5 PEXGetSearchContext 110 -PEX5 PEXGetSizeOCs 111 -PEX5 PEXGetStructureInfo 112 -PEX5 PEXGetStructuresInNetwork 113 -PEX5 PEXGetTableEntries 114 -PEX5 PEXGetTableEntry 115 -PEX5 PEXGetTableInfo 116 -PEX5 PEXGetWorkstationAttributes 117 -PEX5 PEXGetWorkstationDynamics 118 -PEX5 PEXGetWorkstationPostings 119 -PEX5 PEXGetWorkstationViewRep 120 -PEX5 PEXIdentityMatrix 121 -PEX5 PEXIdentityMatrix2D 122 -PEX5 PEXInitialize 123 -PEX5 PEXInvertMatrix 124 -PEX5 PEXInvertMatrix2D 125 -PEX5 PEXLabel 126 -PEX5 PEXListFonts 127 -PEX5 PEXListFontsWithInfo 128 -PEX5 PEXLoadFont 129 -PEX5 PEXLookAtViewMatrix 130 -PEX5 PEXMapDCToWC 131 -PEX5 PEXMapWCToDC 132 -PEX5 PEXMapXCToNPC 133 -PEX5 PEXMapXCToNPC2D 134 -PEX5 PEXMarkers 135 -PEX5 PEXMarkers2D 136 -PEX5 PEXMatchRenderingTargets 137 -PEX5 PEXMatrixMult 138 -PEX5 PEXMatrixMult2D 139 -PEX5 PEXNPCToXCTransform 140 -PEX5 PEXNPCToXCTransform2D 141 -PEX5 PEXNURBCurve 142 -PEX5 PEXNURBSurface 143 -PEX5 PEXNoop 144 -PEX5 PEXNormalizeVectors 145 -PEX5 PEXNormalizeVectors2D 146 -PEX5 PEXOrthoProjMatrix 147 -PEX5 PEXPerspProjMatrix 148 -PEX5 PEXPickAll 149 -PEX5 PEXPickOne 150 -PEX5 PEXPolarViewMatrix 151 -PEX5 PEXPolyline 152 -PEX5 PEXPolyline2D 153 -PEX5 PEXPolylineSetWithData 154 -PEX5 PEXPostStructure 155 -PEX5 PEXQuadrilateralMesh 156 -PEX5 PEXQueryEncodedTextExtents 157 -PEX5 PEXQueryFont 158 -PEX5 PEXQueryTextExtents 159 -PEX5 PEXRedrawAllStructures 160 -PEX5 PEXRedrawClipRegion 161 -PEX5 PEXRemoveFromNameSet 162 -PEX5 PEXRenderElements 163 -PEX5 PEXRenderNetwork 164 -PEX5 PEXRestoreModelClipVolume 165 -PEX5 PEXRotate 166 -PEX5 PEXRotate2D 167 -PEX5 PEXRotateGeneral 168 -PEX5 PEXScale 169 -PEX5 PEXScale2D 170 -PEX5 PEXSearchNetwork 171 -PEX5 PEXSendOCs 172 -PEX5 PEXSetATextAlignment 173 -PEX5 PEXSetATextHeight 174 -PEX5 PEXSetATextPath 175 -PEX5 PEXSetATextStyle 176 -PEX5 PEXSetATextUpVector 177 -PEX5 PEXSetBFInteriorStyle 178 -PEX5 PEXSetBFInteriorStyleIndex 179 -PEX5 PEXSetBFReflectionAttributes 180 -PEX5 PEXSetBFReflectionModel 181 -PEX5 PEXSetBFSurfaceColor 182 -PEX5 PEXSetBFSurfaceColorIndex 183 -PEX5 PEXSetBFSurfaceInterpMethod 184 -PEX5 PEXSetCharExpansion 185 -PEX5 PEXSetCharHeight 186 -PEX5 PEXSetCharSpacing 187 -PEX5 PEXSetCharUpVector 188 -PEX5 PEXSetColorApproxIndex 189 -PEX5 PEXSetCurveApprox 190 -PEX5 PEXSetDepthCueIndex 191 -PEX5 PEXSetEchoColor 192 -PEX5 PEXSetEdgeBundleIndex 193 -PEX5 PEXSetEditingMode 194 -PEX5 PEXSetElementPtr 195 -PEX5 PEXSetElementPtrAtLabel 196 -PEX5 PEXSetFacetCullingMode 197 -PEX5 PEXSetFacetDistinguishFlag 198 -PEX5 PEXSetGlobalTransform 199 -PEX5 PEXSetGlobalTransform2D 200 -PEX5 PEXSetHLHSRID 201 -PEX5 PEXSetIndividualASF 202 -PEX5 PEXSetInteriorBundleIndex 203 -PEX5 PEXSetInteriorStyle 204 -PEX5 PEXSetInteriorStyleIndex 205 -PEX5 PEXSetLightSourceState 206 -PEX5 PEXSetLineBundleIndex 207 -PEX5 PEXSetLineColor 208 -PEX5 PEXSetLineColorIndex 209 -PEX5 PEXSetLineType 210 -PEX5 PEXSetLineWidth 211 -PEX5 PEXSetLocalTransform 212 -PEX5 PEXSetLocalTransform2D 213 -PEX5 PEXSetMarkerBundleIndex 214 -PEX5 PEXSetMarkerColor 215 -PEX5 PEXSetMarkerColorIndex 216 -PEX5 PEXSetMarkerScale 217 -PEX5 PEXSetMarkerType 218 -PEX5 PEXSetModelClipFlag 219 -PEX5 PEXSetModelClipVolume 220 -PEX5 PEXSetModelClipVolume2D 221 -PEX5 PEXSetOfFillAreaSets 222 -PEX5 PEXSetParaSurfCharacteristics 223 -PEX5 PEXSetPatternAttributes 224 -PEX5 PEXSetPatternAttributes2D 225 -PEX5 PEXSetPatternSize 226 -PEX5 PEXSetPickID 227 -PEX5 PEXSetPolylineInterpMethod 228 -PEX5 PEXSetReflectionAttributes 229 -PEX5 PEXSetReflectionModel 230 -PEX5 PEXSetRenderingColorModel 231 -PEX5 PEXSetSurfaceApprox 232 -PEX5 PEXSetSurfaceColor 233 -PEX5 PEXSetSurfaceColorIndex 234 -PEX5 PEXSetSurfaceEdgeColor 235 -PEX5 PEXSetSurfaceEdgeColorIndex 236 -PEX5 PEXSetSurfaceEdgeFlag 237 -PEX5 PEXSetSurfaceEdgeType 238 -PEX5 PEXSetSurfaceEdgeWidth 239 -PEX5 PEXSetSurfaceInterpMethod 240 -PEX5 PEXSetTableEntries 241 -PEX5 PEXSetTextAlignment 242 -PEX5 PEXSetTextBundleIndex 243 -PEX5 PEXSetTextColor 244 -PEX5 PEXSetTextColorIndex 245 -PEX5 PEXSetTextFontIndex 246 -PEX5 PEXSetTextPath 247 -PEX5 PEXSetTextPrecision 248 -PEX5 PEXSetViewIndex 249 -PEX5 PEXSetWorkstationBufferMode 250 -PEX5 PEXSetWorkstationDisplayUpdateMode 251 -PEX5 PEXSetWorkstationHLHSRMode 252 -PEX5 PEXSetWorkstationViewPriority 253 -PEX5 PEXSetWorkstationViewRep 254 -PEX5 PEXSetWorkstationViewport 255 -PEX5 PEXSetWorkstationWindow 256 -PEX5 PEXStartOCs 257 -PEX5 PEXText 258 -PEX5 PEXText2D 259 -PEX5 PEXTransformPoints 260 -PEX5 PEXTransformPoints2D 261 -PEX5 PEXTransformPoints2DH 262 -PEX5 PEXTransformPoints4D 263 -PEX5 PEXTransformVectors 264 -PEX5 PEXTransformVectors2D 265 -PEX5 PEXTranslate 266 -PEX5 PEXTranslate2D 267 -PEX5 PEXTriangleStrip 268 -PEX5 PEXUnloadFont 269 -PEX5 PEXUnpostAllStructures 270 -PEX5 PEXUnpostStructure 271 -PEX5 PEXUpdatePickMeasure 272 -PEX5 PEXUpdateWorkstation 273 -PEX5 PEXViewMappingMatrix 274 -PEX5 PEXViewMappingMatrix2D 275 -PEX5 PEXViewOrientationMatrix 276 -PEX5 PEXViewOrientationMatrix2D 277 -PEX5 PEXXCToNPCTransform 278 -PEX5 PEXXCToNPCTransform2D 279 -PEX5 _PEXDecodeEnumType 280 -PEX5 _PEXDecodeTableIndex 281 -PEX5 _PEXDecodeColor 282 -PEX5 _PEXDecodeFloat 283 -PEX5 _PEXDecodeCARD16 284 -PEX5 _PEXDecodeVector2D 285 -PEX5 _PEXDecodeTextAlignment 286 -PEX5 _PEXDecodeCurveApprox 287 -PEX5 _PEXDecodeReflectionAttr 288 -PEX5 _PEXDecodeSurfaceApprox 289 -PEX5 _PEXDecodeCullMode 290 -PEX5 _PEXDecodeSwitch 291 -PEX5 _PEXDecodePatternSize 292 -PEX5 _PEXDecodePatternAttr2D 293 -PEX5 _PEXDecodePatternAttr 294 -PEX5 _PEXDecodeASF 295 -PEX5 _PEXDecodeLocalTransform 296 -PEX5 _PEXDecodeLocalTransform2D 297 -PEX5 _PEXDecodeGlobalTransform 298 -PEX5 _PEXDecodeGlobalTransform2D 299 -PEX5 _PEXDecodeModelClipVolume 300 -PEX5 _PEXDecodeModelClipVolume2D 301 -PEX5 _PEXDecodeRestoreModelClip 302 -PEX5 _PEXDecodeLightSourceState 303 -PEX5 _PEXDecodeID 304 -PEX5 _PEXDecodePSC 305 -PEX5 _PEXDecodeNameSet 306 -PEX5 _PEXDecodeExecuteStructure 307 -PEX5 _PEXDecodeLabel 308 -PEX5 _PEXDecodeApplicationData 309 -PEX5 _PEXDecodeGSE 310 -PEX5 _PEXDecodeMarkers 311 -PEX5 _PEXDecodeMarkers2D 312 -PEX5 _PEXDecodePolyline 313 -PEX5 _PEXDecodePolyline2D 314 -PEX5 _PEXDecodeText 315 -PEX5 _PEXDecodeText2D 316 -PEX5 _PEXDecodeAnnoText 317 -PEX5 _PEXDecodeAnnoText2D 318 -PEX5 _PEXDecodePolylineSet 319 -PEX5 _PEXDecodeNURBCurve 320 -PEX5 _PEXDecodeFillArea 321 -PEX5 _PEXDecodeFillArea2D 322 -PEX5 _PEXDecodeFillAreaWithData 323 -PEX5 _PEXDecodeFillAreaSet 324 -PEX5 _PEXDecodeFillAreaSet2D 325 -PEX5 _PEXDecodeFillAreaSetWithData 326 -PEX5 _PEXDecodeTriangleStrip 327 -PEX5 _PEXDecodeQuadMesh 328 -PEX5 _PEXDecodeSOFA 329 -PEX5 _PEXDecodeNURBSurface 330 -PEX5 _PEXDecodeCellArray 331 -PEX5 _PEXDecodeCellArray2D 332 -PEX5 _PEXDecodeExtendedCellArray 333 -PEX5 _PEXDecodeGDP 334 -PEX5 _PEXDecodeGDP2D 335 -PEX5 _PEXDecodeNoop 336 -PEX5 _PEXEncodeEnumType 337 -PEX5 _PEXEncodeTableIndex 338 -PEX5 _PEXEncodeColor 339 -PEX5 _PEXEncodeFloat 340 -PEX5 _PEXEncodeCARD16 341 -PEX5 _PEXEncodeVector2D 342 -PEX5 _PEXEncodeTextAlignment 343 -PEX5 _PEXEncodeCurveApprox 344 -PEX5 _PEXEncodeReflectionAttr 345 -PEX5 _PEXEncodeSurfaceApprox 346 -PEX5 _PEXEncodeCullMode 347 -PEX5 _PEXEncodeSwitch 348 -PEX5 _PEXEncodePatternSize 349 -PEX5 _PEXEncodePatternAttr2D 350 -PEX5 _PEXEncodePatternAttr 351 -PEX5 _PEXEncodeASF 352 -PEX5 _PEXEncodeLocalTransform 353 -PEX5 _PEXEncodeLocalTransform2D 354 -PEX5 _PEXEncodeGlobalTransform 355 -PEX5 _PEXEncodeGlobalTransform2D 356 -PEX5 _PEXEncodeModelClipVolume 357 -PEX5 _PEXEncodeModelClipVolume2D 358 -PEX5 _PEXEncodeRestoreModelClip 359 -PEX5 _PEXEncodeLightSourceState 360 -PEX5 _PEXEncodeID 361 -PEX5 _PEXEncodePSC 362 -PEX5 _PEXEncodeNameSet 363 -PEX5 _PEXEncodeExecuteStructure 364 -PEX5 _PEXEncodeLabel 365 -PEX5 _PEXEncodeApplicationData 366 -PEX5 _PEXEncodeGSE 367 -PEX5 _PEXEncodeMarkers 368 -PEX5 _PEXEncodePolyline 369 -PEX5 _PEXEncodeMarkers2D 370 -PEX5 _PEXEncodePolyline2D 371 -PEX5 _PEXEncodeText 372 -PEX5 _PEXEncodeText2D 373 -PEX5 _PEXEncodeAnnoText 374 -PEX5 _PEXEncodeAnnoText2D 375 -PEX5 _PEXEncodePolylineSet 376 -PEX5 _PEXEncodeNURBCurve 377 -PEX5 _PEXEncodeFillArea 378 -PEX5 _PEXEncodeFillArea2D 379 -PEX5 _PEXEncodeFillAreaWithData 380 -PEX5 _PEXEncodeFillAreaSet 381 -PEX5 _PEXEncodeFillAreaSet2D 382 -PEX5 _PEXEncodeFillAreaSetWithData 383 -PEX5 _PEXEncodeTriangleStrip 384 -PEX5 _PEXEncodeQuadMesh 385 -PEX5 _PEXEncodeSOFA 386 -PEX5 _PEXEncodeNURBSurface 387 -PEX5 _PEXEncodeCellArray 388 -PEX5 _PEXEncodeCellArray2D 389 -PEX5 _PEXEncodeExtendedCellArray 390 -PEX5 _PEXEncodeGDP 391 -PEX5 _PEXEncodeGDP2D 392 -PEX5 _PEXEncodeNoop 393 -PEX5 _PEXSendBytesToOC 394 -PEX5 _PEXCopyPaddedBytesToOC 395 -PEX5 _PEXGenOCBadLengthError 396 -PEX5 _PEXConvertMaxHitsEvent 397 -PEX5 _PEXConvertOCError 398 -PEX5 _PEXPrintOCError 399 -PEX5 _PEXCloseDisplay 400 -PEX5 _PEXIEEE32toDECF 401 -PEX5 _PEXDECFtoIEEE32 402 -PEX5 _PEXOCFacet 403 -PEX5 _PEXOCListOfFacet 404 -PEX5 _PEXOCListOfVertex 405 -PEX5 _PEXOCListOfColor 406 -PEX5 _PEXStoreFacet 407 -PEX5 _PEXStoreListOfFacet 408 -PEX5 _PEXStoreListOfVertex 409 -PEX5 _PEXStoreListOfColor 410 -PEX5 _PEXExtractFacet 411 -PEX5 _PEXExtractListOfFacet 412 -PEX5 _PEXExtractListOfVertex 413 -PEX5 _PEXExtractListOfColor 414 -PEX5 PEXDisplayInfoHeader 415 -PEX5 PEXPickCache 416 -PEX5 PEXPickCacheSize 417 -PEX5 PEXPickCacheInUse 418 -PEX5 PEX_encode_oc_funcs 419 -PEX5 PEX_decode_oc_funcs 420 -PEX5 PEX_fp_convert 421 LIBRARY X11 X11 X11 XSaveContext 1 X11 XFindContext 2 @@ -1623,206 +1201,6 @@ X11 Xutf8LookupString 1312 X11 Xutf8DrawString 1313 X11 Xutf8TextExtents 1314 -LIBRARY XIE XIE -XIE XieAbort 1 -XIE XieAllocatePhotofloGraph 2 -XIE XieAwait 3 -XIE XieCreateColorList 4 -XIE XieCreateLUT 5 -XIE XieCreatePhotoflo 6 -XIE XieCreatePhotomap 7 -XIE XieCreatePhotospace 8 -XIE XieCreateROI 9 -XIE XieDestroyColorList 10 -XIE XieDestroyLUT 11 -XIE XieDestroyPhotoflo 12 -XIE XieDestroyPhotomap 13 -XIE XieDestroyPhotospace 14 -XIE XieDestroyROI 15 -XIE XieExecuteImmediate 16 -XIE XieExecutePhotoflo 17 -XIE XieFloArithmetic 18 -XIE XieFloBandCombine 19 -XIE XieFloBandExtract 20 -XIE XieFloBandSelect 21 -XIE XieFloBlend 22 -XIE XieFloCompare 23 -XIE XieFloConstrain 24 -XIE XieFloConvertFromIndex 25 -XIE XieFloConvertFromRGB 26 -XIE XieFloConvertToIndex 27 -XIE XieFloConvertToRGB 28 -XIE XieFloConvolve 29 -XIE XieFloDither 30 -XIE XieFloExportClientHistogram 31 -XIE XieFloExportClientLUT 32 -XIE XieFloExportClientPhoto 33 -XIE XieFloExportClientROI 34 -XIE XieFloExportDrawable 35 -XIE XieFloExportDrawablePlane 36 -XIE XieFloExportLUT 37 -XIE XieFloExportPhotomap 38 -XIE XieFloExportROI 39 -XIE XieFloGeometry 40 -XIE XieFloImportClientLUT 41 -XIE XieFloImportClientPhoto 42 -XIE XieFloImportClientROI 43 -XIE XieFloImportDrawable 44 -XIE XieFloImportDrawablePlane 45 -XIE XieFloImportLUT 46 -XIE XieFloImportPhotomap 47 -XIE XieFloImportROI 48 -XIE XieFloLogical 49 -XIE XieFloMatchHistogram 50 -XIE XieFloMath 51 -XIE XieFloPasteUp 52 -XIE XieFloPoint 53 -XIE XieFloUnconstrain 54 -XIE XieFreeEncodeJPEGBaseline 55 -XIE XieFreeEncodeJPEGLossless 56 -XIE XieFreePasteUpTiles 57 -XIE XieFreePhotofloGraph 58 -XIE XieFreeTechniques 59 -XIE XieGetClientData 60 -XIE XieInitialize 61 -XIE XieModifyPhotoflo 62 -XIE XiePurgeColorList 63 -XIE XiePutClientData 64 -XIE XieQueryColorList 65 -XIE XieQueryPhotoflo 66 -XIE XieQueryPhotomap 67 -XIE XieQueryTechniques 68 -XIE XieRedefinePhotoflo 69 -XIE XieTecCIELabToRGB 70 -XIE XieTecCIEXYZToRGB 71 -XIE XieTecClipScale 72 -XIE XieTecColorAllocAll 73 -XIE XieTecColorAllocMatch 74 -XIE XieTecColorAllocRequantize 75 -XIE XieTecConvolveConstant 76 -XIE XieTecDecodeG31D 77 -XIE XieTecDecodeG32D 78 -XIE XieTecDecodeG42D 79 -XIE XieTecDecodeJPEGBaseline 80 -XIE XieTecDecodeJPEGLossless 81 -XIE XieTecDecodeTIFF2 82 -XIE XieTecDecodeTIFFPackBits 83 -XIE XieTecDecodeUncompressedSingle 84 -XIE XieTecDecodeUncompressedTriple 85 -XIE XieTecDitherOrderedParam 86 -XIE XieTecEncodeG31D 87 -XIE XieTecEncodeG32D 88 -XIE XieTecEncodeG42D 89 -XIE XieTecEncodeJPEGBaseline 90 -XIE XieTecEncodeJPEGLossless 91 -XIE XieTecEncodeServerChoice 92 -XIE XieTecEncodeTIFF2 93 -XIE XieTecEncodeTIFFPackBits 94 -XIE XieTecEncodeUncompressedSingle 95 -XIE XieTecEncodeUncompressedTriple 96 -XIE XieTecGeomAntialiasByArea 97 -XIE XieTecGeomAntialiasByLowpass 98 -XIE XieTecGeomGaussian 99 -XIE XieTecGeomNearestNeighbor 100 -XIE XieTecHistogramGaussian 101 -XIE XieTecHistogramHyperbolic 102 -XIE XieTecRGBToCIELab 103 -XIE XieTecRGBToCIEXYZ 104 -XIE XieTecRGBToYCC 105 -XIE XieTecRGBToYCbCr 106 -XIE XieTecWhiteAdjustCIELabShift 107 -XIE XieTecYCCToRGB 108 -XIE XieTecYCbCrToRGB 109 -XIE _XiePhotofloSize 110 -XIE _XieElemImportClientLUT 111 -XIE _XieElemImportClientPhoto 112 -XIE _XieElemImportClientROI 113 -XIE _XieElemImportDrawable 114 -XIE _XieElemImportDrawablePlane 115 -XIE _XieElemImportLUT 116 -XIE _XieElemImportPhotomap 117 -XIE _XieElemImportROI 118 -XIE _XieElemArithmetic 119 -XIE _XieElemBandCombine 120 -XIE _XieElemBandExtract 121 -XIE _XieElemBandSelect 122 -XIE _XieElemBlend 123 -XIE _XieElemCompare 124 -XIE _XieElemConstrain 125 -XIE _XieElemConvertFromIndex 126 -XIE _XieElemConvertFromRGB 127 -XIE _XieElemConvertToIndex 128 -XIE _XieElemConvertToRGB 129 -XIE _XieElemConvolve 130 -XIE _XieElemDither 131 -XIE _XieElemGeometry 132 -XIE _XieElemLogical 133 -XIE _XieElemMatchHistogram 134 -XIE _XieElemMath 135 -XIE _XieElemPasteUp 136 -XIE _XieElemPoint 137 -XIE _XieElemUnconstrain 138 -XIE _XieElemExportClientHistogram 139 -XIE _XieElemExportClientLUT 140 -XIE _XieElemExportClientPhoto 141 -XIE _XieElemExportClientROI 142 -XIE _XieElemExportDrawable 143 -XIE _XieElemExportDrawablePlane 144 -XIE _XieElemExportLUT 145 -XIE _XieElemExportPhotomap 146 -XIE _XieElemExportROI 147 -XIE _XieFloError 148 -XIE _XieColorAllocEvent 149 -XIE _XieDecodeNotifyEvent 150 -XIE _XieExportAvailableEvent 151 -XIE _XieImportObscuredEvent 152 -XIE _XiePhotofloDoneEvent 153 -XIE _XieConvertToIEEE 154 -XIE _XieCloseDisplay 155 -XIE _XiePrintError 156 -XIE _XieTechniqueLength 157 -XIE _XieEncodeTechnique 158 -XIE _XieColorAllocAllParam 159 -XIE _XieColorAllocMatchParam 160 -XIE _XieColorAllocRequantizeParam 161 -XIE _XieRGBToCIELabParam 162 -XIE _XieRGBToYCbCrParam 163 -XIE _XieRGBToYCCParam 164 -XIE _XieYCbCrToRGBParam 165 -XIE _XieYCCToRGBParam 166 -XIE _XieCIELabToRGBParam 167 -XIE _XieConvolveConstantParam 168 -XIE _XieClipScaleParam 169 -XIE _XieDecodeUncompressedSingleParam 170 -XIE _XieDecodeUncompressedTripleParam 171 -XIE _XieDecodeG31DParam 172 -XIE _XieDecodeTIFFPackBitsParam 173 -XIE _XieDecodeJPEGBaselineParam 174 -XIE _XieDitherOrderedParam 175 -XIE _XieEncodeUncompressedSingleParam 176 -XIE _XieEncodeUncompressedTripleParam 177 -XIE _XieEncodeG31DParam 178 -XIE _XieEncodeTIFFPackBitsParam 179 -XIE _XieEncodeServerChoiceParam 180 -XIE _XieEncodeG32DParam 181 -XIE _XieEncodeG42DParam 182 -XIE _XieEncodeJPEGBaselineParam 183 -XIE _XieEncodeJPEGLosslessParam 184 -XIE _XieEncodeTIFF2Param 185 -XIE _XieGeomAntialiasByAreaParam 186 -XIE _XieGeomAntialiasByLowpassParam 187 -XIE _XieGeomGaussianParam 188 -XIE _XieGeomNearestNeighborParam 189 -XIE _XieHistogramGaussianParam 190 -XIE _XieHistogramHyperbolicParam 191 -XIE _XieWhiteAdjustCIELabShiftParam 192 -XIE _XieInitTechFuncTable 193 -XIE _XieRegisterTechFunc 194 -XIE _XieLookupTechFunc 195 -XIE _XieExtInfoHeader 196 -XIE _XieElemFuncs 197 -XIE _XieTechFuncsInitialized 198 -XIE _XieTechFuncs 199 LIBRARY Xaw Xaw INITINSTANCE TERMINSTANCE Xaw XawAsciiSourceFreeString 1 Xaw XawAsciiSave 2 @@ -4548,6 +3926,8 @@ GL glXMakeContextCurrent 540 GL _glapi_get_proc_address 541 GL _glapi_set_warning_func 542 +GL _glapi_DispatchTSD 543 +GL _glapi_get_dispatch 544 LIBRARY ICE ICE ICE IceAcceptConnection 1 ICE IceAddConnectionWatch 2 @@ -4775,6 +4155,11 @@ Xft XftCharExists 41 Xft XftDrawCharSpec 42 Xft XftCharIndex 43 +Xft XftGlyphExtents 44 +Xft XftLockFace 45 +Xft XftUnlockFace 46 +Xft XftGlyphSpecRender 47 +Xft XftDrawGlyphSpec 48 LIBRARY Xmuu Xmuu Xmuu XmuClientWindow 1 Xmuu XmuCursorNameToIndex 2 @@ -5124,6 +4509,12 @@ freetype FT_Get_BDF_Charset_ID 160 freetype FT_Get_Postscript_Name 161 freetype FT_Stream_Seek 162 +freetype FT_Stream_EnterFrame 163 +freetype FT_Stream_ExitFrame 164 +freetype FT_Stream_GetShort 165 +freetype FT_Stream_GetLong 166 +freetype FT_Load_Sfnt_Table 167 +freetype FT_Library_Version 168 LIBRARY XTrap XTrap XTrap XEAddEventCB 1 XTrap XEAddEventCBs 2 @@ -5374,6 +4765,11 @@ fontconfig FcCharSetFirstPage 174 fontconfig FcCharSetNextPage 175 fontconfig FcUtf16ToUcs4 176 +fontconfig FcPatternEqual 177 +fontconfig FcPatternHash 178 +fontconfig FcPatternReference 179 +fontconfig FcFontSort 180 +fontconfig FcFontSetSortDestroy 181 LIBRARY expat expat expat XML_DefaultCurrent 1 expat XML_ErrorString 2 Index: xc/config/cf/osf1.cf diff -u xc/config/cf/osf1.cf:3.9 xc/config/cf/osf1.cf:3.10 --- xc/config/cf/osf1.cf:3.9 Thu Mar 1 21:45:33 2001 +++ xc/config/cf/osf1.cf Tue Jul 5 12:43:54 2005 @@ -1,9 +1,4 @@ -XCOMM platform: $Xorg: osf1.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -/* only tested with Digital OSF/1 */ - - - -XCOMM platform: $XFree86: xc/config/cf/osf1.cf,v 3.9 2001/03/02 02:45:33 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/osf1.cf,v 3.10 2005/07/05 16:43:54 tsi Exp $ #ifndef OSName # define OSName DefaultOSName @@ -37,7 +32,6 @@ #else #define ModernOSF1 NO #define ShLibDir /usr/shlib -#define SharedLibPex NO /* losing, no shared -lm */ #endif #define InstallXloadSetGID NO @@ -184,7 +178,6 @@ #define DefaultCCOptions -Xa #define XdecServer YES #define ServerOSDefines -DDDXTIME -#define PexCCOptions -Xa -Wf,-XNp15000,-XNd15000 #define NormalLibObjCompile(options) ClearmakeOSName \ $(RM) $@ $*.os \ @@\ && $(CC) -c options $(CFLAGS) $*.c \ @@\ Index: xc/config/cf/osfLib.tmpl diff -u xc/config/cf/osfLib.tmpl:1.4 xc/config/cf/osfLib.tmpl:1.5 --- xc/config/cf/osfLib.tmpl:1.4 Tue May 27 17:56:40 2003 +++ xc/config/cf/osfLib.tmpl Tue Jul 5 12:43:54 2005 @@ -1,10 +1,8 @@ -XCOMM $Xorg: osfLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - /* * OSF/1 shared library template */ -XCOMM $XFree86: xc/config/cf/osfLib.tmpl,v 1.4 2003/05/27 21:56:40 tsi Exp $ +XCOMM $XFree86: xc/config/cf/osfLib.tmpl,v 1.5 2005/07/05 16:43:54 tsi Exp $ #if ThreadedX && ModernOSF1 #if OSMajorVersion < 4 @@ -27,9 +25,7 @@ #define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) #define SharedXextReqs $(LDPRELIBS) $(XONLYLIB) #define SharedXiReqs $(LDPRELIBS) $(XLIB) -#define SharedPexReqs $(LDPRELIBS) $(XONLYLIB) MathLibrary #define SharedXtstReqs $(LDPRELIBS) $(XLIB) -#define SharedXieReqs $(LDPRELIBS) $(XONLYLIB) #define SharedSMReqs $(LDPRELIBS) $(ICELIB) #define SharedXpReqs $(LDPRELIBS) $(XLIB) #define SharedXpmReqs $(LDPRELIBS) $(XLIB) Index: xc/config/cf/pegasus.cf diff -u xc/config/cf/pegasus.cf:1.1.1.4 xc/config/cf/pegasus.cf:1.2 --- xc/config/cf/pegasus.cf:1.1.1.4 Tue Jan 16 16:54:19 2001 +++ xc/config/cf/pegasus.cf Mon Jan 9 09:56:13 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: pegasus.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/pegasus.cf,v 1.2 2006/01/09 14:56:13 dawes Exp $ #ifndef OSName #define OSName UTek 4.0 Index: xc/config/cf/sco5.cf diff -u xc/config/cf/sco5.cf:3.18 xc/config/cf/sco5.cf:3.20 --- xc/config/cf/sco5.cf:3.18 Wed Jun 2 18:42:53 2004 +++ xc/config/cf/sco5.cf Fri Oct 14 11:15:52 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.18 2004/06/02 22:42:53 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sco5.cf,v 3.20 2005/10/14 15:15:52 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -130,14 +130,6 @@ #define LogDirectory /var/adm -#ifndef PexDynamicModule -#define PexDynamicModule YES -#endif - -#ifndef XieDynamicModule -#define XieDynamicModule YES -#endif - #ifndef HasSymLinks # define HasSymLinks YES #endif @@ -268,7 +260,6 @@ #define SharedGLReqs $(LDPRELIB) $(XLIB) #define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) #define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -#define SharedPexReqs $(LDPRELIB) $(XONLYLIB) MathLibrary #define SharedSMReqs $(LDPRELIB) $(ICELIB) #define SharedX11Reqs $(LDPRELIB) -lsocket #define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) @@ -276,7 +267,6 @@ #define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB) #define SharedXextReqs $(LDPRELIB) $(XONLYLIB) #define SharedXiReqs $(LDPRELIB) $(XLIB) -#define SharedXieReqs $(LDPRELIB) $(XONLYLIB) #define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #define SharedXmuuReqs $(LDPRELIB) $(XONLYLIB) #define SharedXpReqs $(LDPRELIB) $(XLIB) @@ -308,7 +298,7 @@ @@\ src.o: src.S @@\ RemoveFile(src.o) @@\ - $(CC) -c AsmDefines $(DEFINES) $(INCLUDES) flags src.S + $(CC) -c AsmDefines $(ALLDEFINES) flags src.S #include /* minor changes to sv4Lib.rules */ #include Index: xc/config/cf/sequent.cf diff -u xc/config/cf/sequent.cf:1.2 xc/config/cf/sequent.cf:1.4 --- xc/config/cf/sequent.cf:1.2 Mon Sep 20 11:24:57 2004 +++ xc/config/cf/sequent.cf Tue Jul 5 12:43:54 2005 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: sequent.cf$ +XCOMM $XFree86: xc/config/cf/sequent.cf,v 1.4 2005/07/05 16:43:54 tsi Exp $ /* * SET VERSION NUMBERS BEFORE MAKING MAKEFILES; also, you'll need to install @@ -162,8 +162,6 @@ */ #define BuildDps YES -#define BuildPexClients NO -#define BuildPexExt YES /* needed for contrib xscope */ #define BuildServer YES #define BuildXF86DGA NO /* DGA has no meaning on Sequent HW */ #define BuildXF86MiscExt NO /* turn off the server portion */ @@ -330,8 +328,6 @@ #define DebugLibXaw DebugLibDefault /* debugged widget library */ #define DebugLibXi DebugLibDefault /* debugged Xi library */ #define DebugLibXtst DebugLibDefault /* debugged Xtst library */ -#define DebugLibPex DebugLibDefault /* debugged PEX5 library */ -#define DebugLibXie DebugLibDefault /* debugged XIE library */ #define DebugLibICE DebugLibDefault /* debugged ICE library */ #define DebugLibSM DebugLibDefault /* debugged SM library */ #define DebugLibXkey DebugLibDefault /* debugged Xkey library */ Index: xc/config/cf/sgi.cf diff -u xc/config/cf/sgi.cf:1.21 xc/config/cf/sgi.cf:1.26 --- xc/config/cf/sgi.cf:1.21 Sun Jan 30 12:48:43 2005 +++ xc/config/cf/sgi.cf Mon Feb 20 14:10:52 2006 @@ -1,5 +1,4 @@ -XCOMM platform: $Xorg: sgi.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.21 2005/01/30 17:48:43 tsi Exp $ +XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.26 2006/02/20 19:10:52 tsi Exp $ #ifndef OSName # define OSName DefaultOSName @@ -31,7 +30,7 @@ #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #else #define BootstrapCFlags -DSVR4 -#define StandardDefines -DSVR4 +#define StandardDefines -DSVR4 -DX_LOCALE #define SystemV4 YES #define HasWChar32 YES #define HasVFork NO @@ -68,17 +67,17 @@ #ifdef Mips64Architecture # define BuildLibPathVar _RLD_ROOT=/dev/null LD_LIBRARY64_PATH # define SystemBuildLibPath /usr/lib64:/lib64 -# define LdCmd ld -64 +# define LdCmd ld -64 -woff 47 # define AsCmd as -64 -mips3 #elif defined(MipsN32Architecture) # define BuildLibPathVar _RLD_ROOT=/dev/null LD_LIBRARYN32_PATH # define SystemBuildLibPath /usr/lib32:/lib32 -# define LdCmd ld -n32 +# define LdCmd ld -n32 -woff 47 # define AsCmd as -n32 -mips3 #else # define BuildLibPathVar _RLD_ROOT=/dev/null LD_LIBRARY_PATH # define SystemBuildLibPath /usr/lib:/lib -# define LdCmd ld -32 -allow_jump_at_eop +# define LdCmd ld -32 -woff 47 # define AsCmd as -32 #endif #define HasCplusplus YES @@ -104,11 +103,9 @@ #if OSMajorVersion < 5 #define SymbolTables -Wf,-XNp16000,-XNd16000,-XNh2000 -#define PexSymbolTables -Wf,-XNp15000,-XNd15000,-XNh2000 #define ServerSymbolTables -Wf,-XNp8000,-XNh2000,-XNd8000 #else #define SymbolTables -#define PexSymbolTables #define ServerSymbolTables #endif @@ -116,22 +113,23 @@ #if OSMajorVersion < 5 /* Extra libraries provide : yp, sysV malloc, shared libc, and widechar */ # define ExtraLibraries -lsun -lmalloc -lc_s -lw -# define sgiCCOptions -xansi -D__STDC__=1 -float +# define sgiCCOptions -xansi -D__STDC__=1 -float -D__mips__ -Wl,-woff,47 #else # if OSMajorVersion < 6 -# define sgiCCOptions -xansi +# define sgiCCOptions -xansi -D__mips__ -Wl,-woff,47 # else # define CppCmd cc -E -cckr +# define HasDlopen YES +# define DlLibrary /**/ # ifdef Mips64Architecture /* set Mips64Architecture in host.def. Usually don't need it but we * (the X Consortium) want a 64-bit big-endian machine to test on. */ -# define sgiCCOptions -xansi -mips3 -64 -# define DlLibrary /**/ +# define sgiCCOptions -xansi -mips3 -64 -D__mips__ -Wl,-woff,47 # elif defined(MipsN32Architecture) /* Set MipsN32Architecture to build "new" 32-bit objs with a 32-bit kernel. */ -# define sgiCCOptions -xansi -mips3 -n32 +# define sgiCCOptions -xansi -mips3 -n32 -D__mips__ -Wl,-woff,47 # else -# define sgiCCOptions -xansi -32 +# define sgiCCOptions -xansi -32 -D__mips__ -Wl,-woff,47 # endif # if OSMinorVersion == 2 /* if you haven't installed patch 1361, 1403, or 1645 on IRIX 6.2 then you @@ -182,9 +180,6 @@ #ifndef DefaultCCOptions #define DefaultCCOptions sgiCCOptions SymbolTables #endif -#ifndef PexCCOptions -#define PexCCOptions sgiCCOptions PexSymbolTables -#endif #ifndef ServerCCOptions #define ServerCCOptions sgiCCOptions ServerSymbolTables #endif Index: xc/config/cf/sgiLib.rules diff -u xc/config/cf/sgiLib.rules:1.7 xc/config/cf/sgiLib.rules:1.8 --- xc/config/cf/sgiLib.rules:1.7 Mon May 31 20:16:53 2004 +++ xc/config/cf/sgiLib.rules Tue Mar 29 13:17:00 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.7 2004/06/01 00:16:53 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.8 2005/03/29 18:17:00 tsi Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES @@ -204,4 +204,21 @@ #endif /* SharedDepLibraryTarget */ +#ifndef SharedDriModuleTarget +#define SharedDriModuleTarget(name,deps,solist) @@\ +AllTarget(name) @@\ + @@\ +name: deps @@\ + $(RM) $@~ @@\ + $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + LinkBuildModule($@,dri) @@\ + @@\ +clean:: @@\ + $(RM) name @@\ + $(RM) name.map + +#endif /* SharedDriModuleTarget */ + #endif /* OsMajorVersion < 5 else */ Index: xc/config/cf/sgiLib.tmpl diff -u xc/config/cf/sgiLib.tmpl:3.4 xc/config/cf/sgiLib.tmpl:3.6 --- xc/config/cf/sgiLib.tmpl:3.4 Tue May 27 18:26:20 2003 +++ xc/config/cf/sgiLib.tmpl Mon Jan 9 09:56:13 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: sgiLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/config/cf/sgiLib.tmpl,v 3.4 2003/05/27 22:26:20 tsi Exp $ +XCOMM $XFree86: xc/config/cf/sgiLib.tmpl,v 3.6 2006/01/09 14:56:13 dawes Exp $ /* * SGI shared library template @@ -16,3 +11,4 @@ #define SharedXmReqs $(LDPRELIBS) SharedXReqs #define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs #define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs +#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB) Index: xc/config/cf/site.def diff -u xc/config/cf/site.def:3.26 xc/config/cf/site.def:3.28 --- xc/config/cf/site.def:3.26 Wed Jun 9 14:30:56 2004 +++ xc/config/cf/site.def Mon Jan 9 09:56:13 2006 @@ -1,5 +1,3 @@ -XCOMM site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ - /*************************************************************************** * * * SITE-SPECIFIC DEFINITIONS * @@ -10,9 +8,6 @@ * after-half should be protected by #ifdef AfterVendorCF. * * * * The before-half should only set things that the .cf file depends on. * - * For the .cf files shipped in this release, the main variables in this * - * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion, * - * OSMinorVersion, and OSTeenyVersion. * * * * The after-half should contain all other definitions. For example, * * place your ProjectRoot definition here. * @@ -21,7 +16,7 @@ * .cf file, not overridden in site.def. * * * ***************************************************************************/ -XCOMM site: $XFree86: xc/config/cf/site.def,v 3.26 2004/06/09 18:30:56 dawes Exp $ +XCOMM site: $XFree86: xc/config/cf/site.def,v 3.28 2006/01/09 14:56:13 dawes Exp $ /* if you want host-specific customization, this is one way to do it */ /* @@ -61,12 +56,6 @@ # endif # endif -/* -#ifndef HasGcc2 -#define HasGcc2 YES -#endif -*/ - #endif /* BeforeVendorCF */ #ifdef AfterVendorCF Index: xc/config/cf/site.sample diff -u xc/config/cf/site.sample:1.4 xc/config/cf/site.sample:1.7 --- xc/config/cf/site.sample:1.4 Wed Jun 9 14:30:56 2004 +++ xc/config/cf/site.sample Mon Jan 9 09:56:13 2006 @@ -1,4 +1,4 @@ -XCOMM site: $Xorg: site.sample,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/site.sample,v 1.7 2006/01/09 14:56:13 dawes Exp $ /*************************************************************************** * * @@ -10,9 +10,6 @@ * after-half should be protected by #ifdef AfterVendorCF. * * * * The before-half should only set things that the .cf file depends on. * - * For the .cf files shipped in this release, the main variables in this * - * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion, * - * OSMinorVersion, and OSTeenyVersion. * * * * The after-half should contain all other definitions. For example, * * place your ProjectRoot definition here. * @@ -50,12 +47,6 @@ # endif # endif -/* -#ifndef HasGcc2 -#define HasGcc2 YES -#endif -*/ - #endif /* BeforeVendorCF */ #ifdef AfterVendorCF Index: xc/config/cf/sony.cf diff -u xc/config/cf/sony.cf:1.1.1.6 xc/config/cf/sony.cf:1.2 --- xc/config/cf/sony.cf:1.1.1.6 Tue Jan 16 16:54:26 2001 +++ xc/config/cf/sony.cf Tue Jul 5 12:43:54 2005 @@ -1,4 +1,4 @@ -XCOMM platform: $Xorg: sony.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/sony.cf,v 1.2 2005/07/05 16:43:54 tsi Exp $ #ifdef SonyBsdArchitecture @@ -26,7 +26,6 @@ #define LintOpts -ax #define LintLibFlag -o #define DefaultCCOptions -Wf,-XNh2000,-XNd6000,-XNp10000 -Olimit 2000 -#define PexCCOptions -Wf,-XNh2000,-XNd15000,-XNp15000 -Olimit 2000 #else #define HasFortran YES #endif @@ -68,7 +67,6 @@ #define LdCmd /usr/bin/ld #if OSMajorVersion >= 6 #define DefaultCCOptions -Xa -Wf,-XNp9000,-XNd6000 -#define PexCCOptions -Xa -Wf,-XNp15000,-XNd15000 #define SharedLibraryLoadFlags -G -rpath $(USRLIBDIRPATH) #define PositionIndependentCFlags -K PIC -Wx,-G 0 #define PositionIndependentCplusplusFlags -K PIC -Wx,-G 0 @@ -77,7 +75,6 @@ #include #else #define DefaultCCOptions -Wf,-XNp9000,-XNd6000 -#define PexCCOptions -Wf,-XNp15000,-XNd15000 #endif #endif Index: xc/config/cf/sun.cf diff -u xc/config/cf/sun.cf:3.79 xc/config/cf/sun.cf:3.83 --- xc/config/cf/sun.cf:3.79 Sun Feb 6 18:48:14 2005 +++ xc/config/cf/sun.cf Tue Feb 7 15:54:23 2006 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.79 2005/02/06 23:48:14 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.83 2006/02/07 20:54:23 dawes Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -71,7 +71,8 @@ * * For SunPro C, define HasSunC to YES in site.def. * For CenterLine C, define HasCenterLineC to YES in site.def - * For gcc, gcc2 or gcc3, define HasGcc, HasGcc2 or HasGcc3 to YES in site.def + * For gcc, gcc2, gcc3 or gcc4, define HasGcc, HasGcc2, HasGcc3 or HasGcc4 to + * YES in site.def * For other compilers, define HasSunC to NO in site.def, then * provide appropriate values for the various compiler related * configuration varibles used here. @@ -97,8 +98,11 @@ * */ +#ifndef HasGcc4 +#define HasGcc4 NO +#endif #ifndef HasGcc3 -#define HasGcc3 NO +#define HasGcc3 HasGcc4 #endif #ifndef HasGcc2 #define HasGcc2 HasGcc3 @@ -108,7 +112,8 @@ #endif #ifndef HasSunC -# if HasCenterLineC || HasGcc || HasGcc2 || HasGcc3 || (OSMajorVersion < 5) +# if HasCenterLineC || HasGcc || HasGcc2 || HasGcc3 || HasGcc4 || \ + (OSMajorVersion < 5) # define HasSunC NO # else # define HasSunC YES @@ -186,6 +191,11 @@ # endif #endif +/* This might need to key off of compiler and/or OS version */ +#ifndef UseElfFormat +#define UseElfFormat YES +#endif + #if OSMajorVersion < 4 || (OSMajorVersion == 4 && OSMinorVersion < 1) /* We do not guarantee this will work */ # define BootstrapCFlags -DNOSTDHDRS @@ -376,9 +386,6 @@ # ifndef XsunMonoServer # define XsunMonoServer NO /* monochrome only */ # endif -# ifndef BuildPexExt -# define BuildPexExt (XsunServer || Xsun24Server) -# endif # undef BuildXF86DRI # define BuildXF86DRI NO # if (OSMajorVersion > 4) @@ -435,6 +442,9 @@ # define OptimizedCDebugFlags DefaultGcc2i386Opt # endif # ifdef SparcArchitecture +# ifndef DefaultGcc2SparcOpt +# define DefaultGcc2SparcOpt -O2 GccAliasingArgs +# endif # define OptimizedCDebugFlags DefaultGcc2SparcOpt # endif # ifndef OptimizedCDebugFlags @@ -496,9 +506,6 @@ # endif # endif - -# define PexCCOptions DefaultCCOptions - # ifndef AsCmd # ifdef SparcArchitecture # define AsCmd as Index: xc/config/cf/sunLib.tmpl diff -u xc/config/cf/sunLib.tmpl:3.13 xc/config/cf/sunLib.tmpl:3.14 --- xc/config/cf/sunLib.tmpl:3.13 Fri Jul 11 18:17:41 2003 +++ xc/config/cf/sunLib.tmpl Tue Jul 5 12:43:55 2005 @@ -1,10 +1,4 @@ -XCOMM $Xorg: sunLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - - - - - -XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.13 2003/07/11 22:17:41 tsi Exp $ +XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.14 2005/07/05 16:43:55 tsi Exp $ /* * SunOS shared library template @@ -41,9 +35,6 @@ #ifndef SharedXtstRev #define SharedXtstRev 1.20 #endif -#ifndef SharedPexRev -#define SharedPexRev 1.10 -#endif #else /* else it's Solaris */ Index: xc/config/cf/sv3Lib.tmpl diff -u xc/config/cf/sv3Lib.tmpl:3.4 xc/config/cf/sv3Lib.tmpl:3.5 --- xc/config/cf/sv3Lib.tmpl:3.4 Sun Mar 14 17:35:11 2004 +++ xc/config/cf/sv3Lib.tmpl Mon Jan 9 09:56:13 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: sv3Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.4 2004/03/14 22:35:11 tsi Exp $ +XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.5 2006/01/09 14:56:13 dawes Exp $ /* * SVR3 shared library template * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany Index: xc/config/cf/sv4Lib.rules diff -u xc/config/cf/sv4Lib.rules:3.15 xc/config/cf/sv4Lib.rules:3.16 --- xc/config/cf/sv4Lib.rules:3.15 Sun Feb 6 18:48:15 2005 +++ xc/config/cf/sv4Lib.rules Tue Mar 28 20:35:42 2006 @@ -2,7 +2,7 @@ * SVR4 shared library rules */ -XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.15 2005/02/06 23:48:15 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.16 2006/03/29 01:35:42 dawes Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -380,7 +380,7 @@ #define Shared64LibObjCompile(options) LibObjCompile(Shared64Dir,Shared64CArchFlags Shared64CDebugFlags Shared64LibraryDef Shared64PositionIndependentCFlags options) -#define Shared64LibObjAsm(options) LibObjAsm(Shared64Dir,options,Shared64AsmOptions) +#define Shared64LibObjAsm(options) LibObjAsm(Shared64Dir,-D__sparc_v9__ options,Shared64AsmOptions) #define Shared64LibObjCplusplusCompile(options) LibObjCompile(Shared64Dir,Shared64CplusplusArchFlags Shared64CplusplusDebugFlags Shared64LibraryDef Shared64PositionIndependentCFlags options) #define ExtraSubdir Shared64Dir Index: xc/config/cf/sv4Lib.tmpl diff -u xc/config/cf/sv4Lib.tmpl:3.8 xc/config/cf/sv4Lib.tmpl:3.9 --- xc/config/cf/sv4Lib.tmpl:3.8 Mon Nov 3 20:25:31 2003 +++ xc/config/cf/sv4Lib.tmpl Mon Jan 9 09:56:13 2006 @@ -1,10 +1,8 @@ -XCOMM $Xorg: sv4Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - /* * SVR4 shared library template */ -XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.8 2003/11/04 01:25:31 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.9 2006/01/09 14:56:13 dawes Exp $ /* SVR4 shared libraries are deficient in link semantics */ XMULIBONLY = -lXmu Index: xc/config/cf/svr3.cf diff -u xc/config/cf/svr3.cf:3.19 xc/config/cf/svr3.cf:3.20 --- xc/config/cf/svr3.cf:3.19 Wed Jun 2 18:42:53 2004 +++ xc/config/cf/svr3.cf Wed Sep 14 10:23:13 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.19 2004/06/02 22:42:53 dawes Exp $ +XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.20 2005/09/14 14:23:13 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -55,6 +55,9 @@ #ifndef HasGcc3 #define HasGcc3 NO #endif +#ifndef HasGcc4 +#define HasGcc4 NO +#endif #ifndef GccUsesGas #define GccUsesGas NO #endif Index: xc/config/cf/svr4.cf diff -u xc/config/cf/svr4.cf:3.54 xc/config/cf/svr4.cf:3.55 --- xc/config/cf/svr4.cf:3.54 Sat Sep 11 17:01:38 2004 +++ xc/config/cf/svr4.cf Wed Sep 14 10:23:14 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.54 2004/09/11 21:01:38 tsi Exp $ +XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.55 2005/09/14 14:23:14 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -210,8 +210,11 @@ #endif #endif +#ifndef HasGcc4 +#define HasGcc4 NO +#endif #ifndef HasGcc3 -#define HasGcc3 NO +#define HasGcc3 HasGcc4 #endif #ifndef HasGcc2 #define HasGcc2 HasGcc3 @@ -220,6 +223,10 @@ #define HasGcc HasGcc2 #endif +#ifndef HasGcc2ForCplusplus +#define HasGcc2ForCplusplus HasGcc2 +#endif + #ifndef HasPerl #define HasPerl NO #endif Index: xc/config/cf/ultrix.cf diff -u xc/config/cf/ultrix.cf:1.2 xc/config/cf/ultrix.cf:1.3 --- xc/config/cf/ultrix.cf:1.2 Thu Nov 14 16:01:14 2002 +++ xc/config/cf/ultrix.cf Tue Jul 5 12:43:55 2005 @@ -1,8 +1,4 @@ -XCOMM platform: $Xorg: ultrix.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/ultrix.cf,v 1.2 2002/11/14 21:01:14 tsi Exp $ +XCOMM $XFree86: xc/config/cf/ultrix.cf,v 1.3 2005/07/05 16:43:55 tsi Exp $ #ifndef OSName # define OSName DefaultOSName @@ -37,7 +33,6 @@ #endif #ifdef VaxArchitecture -#define PexNativeFPFormat PEXDEC_F_Floating #define NativeFPFormat DEC_F_Float #define UnalignedReferencesAllowed YES /* if arbitrary deref is okay */ #define BuildServer NO @@ -55,7 +50,6 @@ #endif #if !HasGcc #define NeedFunctionPrototypes YES -#define PexCCOptions -Wf,-XNp15000,-XNd15000 /* * NormalLibObjCompile - compile fragment for a library object file * do ld -x to remove line number symbols for libraries Index: xc/config/cf/x386.cf diff -u xc/config/cf/x386.cf:3.7 xc/config/cf/x386.cf:3.8 --- xc/config/cf/x386.cf:3.7 Thu Apr 22 10:15:05 2004 +++ xc/config/cf/x386.cf Mon Jan 9 09:56:13 2006 @@ -1,5 +1,4 @@ -XCOMM platform: $Xorg: x386.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/x386.cf,v 3.7 2004/04/22 14:15:05 tsi Exp $ +XCOMM $XFree86: xc/config/cf/x386.cf,v 3.8 2006/01/09 14:56:13 dawes Exp $ /***************************************************************************** * Site-specfic parameters * Index: xc/config/cf/xf86.tmpl diff -u xc/config/cf/xf86.tmpl:3.37 xc/config/cf/xf86.tmpl:3.38 --- xc/config/cf/xf86.tmpl:3.37 Sun Feb 6 20:38:23 2005 +++ xc/config/cf/xf86.tmpl Fri Oct 14 11:15:52 2005 @@ -1,8 +1,4 @@ -XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.37 2005/02/07 01:38:23 tsi Exp $ +XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.38 2005/10/14 15:15:52 tsi Exp $ #ifdef BuilderEMailAddr BUILDERADDR = BuilderEMailAddr @@ -90,7 +86,7 @@ * rules file. */ #define ModCPPOnlyAsm(basename,options) RemoveFile(basename.i) @@\ - $(MODCPP) CPPAsmOptions AsmDefines $(DEFINES) $(INCLUDES) options basename.S | \ @@\ + $(MODCPP) CPPAsmOptions AsmDefines $(ALLDEFINES) options basename.S | \ @@\ grep -v '^\#' > basename.i #undef AssembleObject @@ -138,7 +134,7 @@ /* This overrides the ObjectAsm in Imake.rules */ #undef ObjectAsm #define ObjectAsm(options) RemoveFiles($@ $*.i) @@\ - $(MODCPP) CPPAsmOptions AsmDefines $(DEFINES) $(INCLUDES) options $*.S | \ @@\ + $(MODCPP) CPPAsmOptions AsmDefines $(ALLDEFINES) options $*.S | \ @@\ grep -v '^\#' > $*.i @@\ $(MODAS) $(ASMOPTS) -o $*.o $*.i @@\ RemoveFile($*.i) Index: xc/config/cf/xf86site.def diff -u xc/config/cf/xf86site.def:3.191 xc/config/cf/xf86site.def:3.193 --- xc/config/cf/xf86site.def:3.191 Tue Jul 6 23:46:21 2004 +++ xc/config/cf/xf86site.def Sat Apr 8 14:33:00 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.191 2004/07/07 03:46:21 martin Exp $ +XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.193 2006/04/08 18:33:00 dawes Exp $ /******************************************************************************/ /* * This file is to provide a quick method for most people to change the @@ -69,6 +69,12 @@ */ /* + * To disable building Xdm, uncomment this. + * +#define BuildXdm NO + */ + +/* * Set the default server (ie the one that gets the sym-link to "X") * #define ServerToInstall XFree86 @@ -95,13 +101,14 @@ * will be included in it. When building the loadable server each of these * modules will be built. * -#define XF86CardDrivers mga glint nv tga s3virge sis rendition \ +#define XF86CardDrivers mga glint nv tga s3 s3virge sis xgi rendition \ neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ + cirrus vmware tseng trident chips ast apm \ GlideDriver fbdev i128 \ - ati AgpGartDrivers DevelDrivers ark cyrix \ - siliconmotion \ - vesa vga XF86OSCardDrivers XF86ExtraCardDrivers + ati i810 AgpGartDrivers DevelDrivers ark cyrix \ + siliconmotion via \ + vesa vga \ + dummy XF86OSCardDrivers XF86ExtraCardDrivers */ /* Index: xc/config/cf/xfree86.cf diff -u xc/config/cf/xfree86.cf:3.492 xc/config/cf/xfree86.cf:3.511 --- xc/config/cf/xfree86.cf:3.492 Mon Feb 28 18:19:12 2005 +++ xc/config/cf/xfree86.cf Tue Apr 25 20:28:16 2006 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.492 2005/02/28 23:19:12 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.511 2006/04/26 00:28:16 dawes Exp $ /* - * Copyright (c) 1994-2005 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -53,30 +53,6 @@ * BeforeVendor part of the site.def file. */ - -/* Get and set version information. */ - -#include "version.def" -#include "date.def" -/* - * As of the development trunk after 4.0.2, XFree86 versions are - * M.m.P.s, and XFree86Version is: - * - * M * 10000000 + m * 100000 + P * 1000 + s - * - * See xc/programs/Xserver/hw/xfree86/doc/Versions for further details. - * - * From 3.9.15 to 4.0.x, XFree86 release versions are X.Y.Z, and - * XFree86Version is: - * - * X * 1000 + Y * 100 + Z - * - * For the 3.3.x branch, the versions are X.Y.Z.W, with XFree86Version - * calculated as: - * - * X * 1000 + Y * 100 + Z * 10 + W - * - */ #ifndef XFree86Version # ifdef XF86_VERSION_CURRENT # define XFree86Version XF86_VERSION_CURRENT @@ -178,6 +154,13 @@ #define XLogFile XFree86 #endif +#ifndef BuildServer +#define BuildServer YES +#endif +#ifndef BuildServersOnly +#define BuildServersOnly NO +#endif + /* * BuildXFree86ConfigTools: * @@ -187,10 +170,10 @@ * a full build. */ #ifndef BuildXFree86ConfigTools -#ifdef BuildServersOnly +#if BuildServer #define BuildXFree86ConfigTools !BuildServersOnly #else -#define BuildXFree86ConfigTools YES +#define BuildXFree86ConfigTools NO #endif #endif @@ -198,13 +181,35 @@ #define BuildLibrariesForConfigTools BuildXFree86ConfigTools #endif -#if !defined(BuildServer) || BuildServer #if BuildXFree86ConfigTools && BuildLibrariesForConfigTools -#define BuildLibraries YES +#ifndef BuildX11Lib +#define BuildX11Lib YES +#endif +#ifndef BuildXawLibrary +#define BuildXawLibrary YES +#endif +#ifndef BuildXtLibrary +#define BuildXtLibrary YES +#endif +#ifndef BuildXmuLibrary +#define BuildXmuLibrary YES +#endif +#ifndef BuildXpmLibrary +#define BuildXpmLibrary YES +#endif +#ifndef BuildXF86MiscLibrary #define BuildXF86MiscLibrary YES +#endif +#ifndef BuildXF86VidModeLibrary #define BuildXF86VidModeLibrary YES +#endif +#ifndef BuildXKBlib #define BuildXKBlib YES +#endif +#ifndef BuildXKBfilelib #define BuildXKBfilelib YES +#endif +#ifndef BuildXKBuilib #define BuildXKBuilib YES #endif #endif @@ -235,7 +240,7 @@ #define XInputDrivers mouse keyboard acecad calcomp citron \ digitaledge dmc dynapro elographics tek4957 \ microtouch mutouch penmount spaceorb summa \ - wacom void magellan /* magictouch */ hyperpen \ + wacom void magellan magictouch hyperpen \ jamstudio fpit \ palmax OSXInputDrivers ExtraXInputDrivers #endif @@ -260,6 +265,32 @@ #define HasAgpGart NO #endif +/* Support for stack traces. */ + +/* + * gcc's __builtin_frame_address() works for some, but not all, platforms. + * The platforms it is enabled for have been tested to work. + * Plaforms tested that do not work, or work less effectively than the + * native support are: Alpha, Sparc. + */ + +#ifndef UseGccBuiltinFrameAddress +# if defined(i386Architecture) || \ + defined(PpcArchitecture) +# define UseGccBuiltinFrameAddress YES +# else +# define UseGccBuiltinFrameAddress NO +# endif +#endif + +#if (HasGcc2 && UseGccBuiltinFrameAddress) || \ + defined(i386Architecture) || defined(SparcArchitecture) || \ + defined(MipsArchitecture) +# ifndef UseStackTrace +# define UseStackTrace YES +# endif +#endif + /* * For Intel platforms, the default is to build all modules which * are supported on this platform. @@ -359,9 +390,9 @@ # else # define NscDriver /**/ # endif -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ +# define XF86CardDrivers mga glint nv tga s3 s3virge sis xgi rendition \ neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ + cirrus vmware tseng trident chips aspeed apm \ GlideDriver i128 NscDriver \ ati i810 AgpGartDrivers DevelDrivers ark \ cyrix siliconmotion via \ @@ -462,10 +493,10 @@ /* Pure PCI drivers should go first */ # ifndef XF86CardDrivers -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ +# define XF86CardDrivers mga glint nv tga s3 s3virge sis xgi rendition \ neomagic tdfx savage cirrus tseng trident \ - chips apm i128 ati ark cyrix siliconmotion \ - vga dummy fbdev vesa + chips aspeed apm i128 ati ark cyrix \ + siliconmotion vga dummy fbdev vesa # endif /* DRI tdfx driver needs Glide, which is not available for AMD64 */ @@ -473,8 +504,10 @@ # define DevelDRIDrivers /**/ -# define DriDrivers gamma i810 mga r128 radeon r200 \ +# ifndef DriDrivers +# define DriDrivers gamma i810 mga r128 radeon r200 \ TdfxDriDriver DevelDRIDrivers +# endif #endif /*AMD64Arcitecture*/ /* SPARC and UltraSPARC drivers */ @@ -486,6 +519,10 @@ # ifndef XF86Server # define XF86Server YES # endif +/* Referenced by the vesa driver */ +# ifndef XF86AFB +# define XF86AFB YES +# endif /* 1bpp module */ # ifndef XF1Bpp # define XF1Bpp YES @@ -558,9 +595,9 @@ * require changes (or even removal) for things like endianness, etc. Move * those known to work into the main XF86CardDrivers #define. */ -# define DevelDrivers apm ark chips cirrus i128 i740 i810 imstt \ - neomagic newport nv rendition s3virge savage \ - siliconmotion tga trident vmware dummy +# define DevelDrivers apm ark aspeed chips cirrus i128 i740 i810 \ + imstt neomagic newport nv rendition s3virge \ + savage siliconmotion tga trident vmware dummy # else # define DevelDrivers /* */ # endif @@ -1238,14 +1275,6 @@ #if BuildXF86DRI -#ifndef BuildGLXLibrary -# if defined (BuildServersOnly) && BuildServersOnly -# define BuildGLXLibrary NO -# else -# define BuildGLXLibrary YES -# endif -#endif - /* * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES. * If more than one are defined, the compilation will fail with multiply @@ -1445,46 +1474,6 @@ # define XF86INT10_BUILD X86INT10_STUB # endif #endif -/* - * Build the Rush extension library (non standard extension for cooperation - * between glide library and X server). Enabled by default only for Linux. - */ -#ifndef BuildXF86RushExt -# define BuildXF86RushExt NO -#endif - -#ifndef BuildDBElib -# define BuildDBElib YES -#endif - -#ifndef BuildRECORDlib -# define BuildRECORDlib YES -#endif - -#ifndef BuildXKBlib -# define BuildXKBlib YES -#endif - -#ifndef BuildScreenSaverExt -# define BuildScreenSaverExt YES -#endif - -/* - * Build XInput support - */ -#ifndef BuildXInputExt -# define BuildXInputExt YES -#endif - -/* Build Xinerama (aka panoramiX) extension */ -#ifndef BuildXinerama -# define BuildXinerama YES -#endif - -/* Build Render extension */ -#ifndef BuildRender -# define BuildRender YES -#endif #if 0 #ifndef JoystickSupport @@ -1492,36 +1481,9 @@ #endif #endif -#if 0 /* - * Build the extra extension libs even when not including the extra extensions - * in the servers + * Enable some extensions that are disabled by default in X11.tmpl. */ -#ifndef BuildScreenSaverLibrary -# define BuildScreenSaverLibrary YES -#endif -#ifndef BuildXF86MiscLibrary -# define BuildXF86MiscLibrary YES -#endif -#ifndef BuildXF86DGALibrary -# define BuildXF86DGALibrary YES -#endif -#ifndef BuildXF86VidModeLibrary -# define BuildXF86VidModeLibrary YES -#endif -#ifndef BuildXvLibrary -# define BuildXvLibrary YES -#endif -#ifndef BuildXvMCLibrary -# define BuildXvMCLibrary YES -#endif -#ifndef BuildGLXLibrary -# define BuildGLXLibrary YES -#endif -#ifndef BuildXResLibrary -# define BuildXResLibrary YES -#endif -#endif /* * Build the XFree86-VidMode extension @@ -1530,7 +1492,6 @@ # define BuildXF86VidModeExt YES #endif -/* Don't build this now because the interface hasn't been done yet */ /* * Build the XFree86-Misc extension */ @@ -1553,13 +1514,6 @@ #endif /* - * Build the DPMS extension support - */ -#ifndef BuildDPMSExt -# define BuildDPMSExt YES -#endif - -/* * Build the X Video Extension */ #ifndef BuildXvExt @@ -1599,17 +1553,6 @@ #endif /* - * The expiry date for beta versions - * - * 853286400 is Wed Jan 15 00:00:00 1997 GMT - * 855964800 is Sat Feb 15 00:00:00 1997 GMT - * 866332800 is Sun Jun 15 00:00:00 1997 GMT - */ -#ifndef XF86ServerExpiry -# define XF86ServerExpiry 866332800 -#endif - -/* * Build the font server */ #ifndef BuildFontServer @@ -1703,40 +1646,8 @@ #define InstallJapaneseDocs NO #endif -#if BuildXF86DGA -# define XFree86DGADefines -DXFreeXDGA -#else -# define XFree86DGADefines /**/ -#endif - -#if BuildXvExt -# define XFree86XvDefines -DXvExtension -#else -# define XFree86XvDefines /**/ -#endif - -#if BuildXvMCExt -# define XFree86XvMCDefines -DXvMCExtension -#else -# define XFree86XvMCDefines /**/ -#endif - -#if BuildXResExt -# define XFree86XResDefines -DXResExtension -#else -# define XFree86XResDefines /**/ -#endif - -#ifndef DlopenHack -# define DlopenHack -DDLOPEN_HACK -#endif - #ifndef ExtraLoaderDefines -# if MakeDllModules -# define ExtraLoaderDefines DlopenHack -# else -# define ExtraLoaderDefines /**/ -# endif +# define ExtraLoaderDefines /**/ #endif #if DoLoadableServer @@ -1745,6 +1656,10 @@ # define XFree86LoaderDefines /**/ #endif +#ifndef LoaderBuildFlags +# define LoaderBuildFlags /**/ +#endif + #ifndef HasBsdMake #define HasBsdMake NO #endif @@ -1773,12 +1688,9 @@ /* Server defines required for all OSs */ #ifndef XFree86ServerDefines # define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \ - XFree86DGADefines XFree86XvDefines \ XFree86LoaderDefines -DXFree86Server \ - VidModeExtensionDefines \ - XFree86XvMCDefines \ SmartScheduleDefines \ - DebugDefines XFree86XResDefines \ + DebugDefines \ -DX_BYTE_ORDER=$(X_BYTE_ORDER) #endif @@ -1820,6 +1732,13 @@ # define XprtServer YES #endif +#ifndef BuildDmx +#define BuildDmx YES +#endif +#ifndef XdmxServer +#define XdmxServer BuildDmx && BuildServer +#endif + #ifndef ServerExtraDefines # define ServerExtraDefines XFree86ServerDefines #endif @@ -1873,10 +1792,6 @@ # define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules #endif -#ifndef UseRgbTxt -# define UseRgbTxt YES -#endif - #ifndef ManSuffix # define ManSuffix 1 #endif @@ -1884,8 +1799,11 @@ /* * GNU Compiler stuff */ +#ifndef HasGcc4 +# define HasGcc4 NO +#endif #ifndef HasGcc3 -# define HasGcc3 NO +# define HasGcc3 HasGcc4 #endif #ifndef HasGcc2 # define HasGcc2 HasGcc3 @@ -2064,6 +1982,9 @@ #ifndef HaveTinyXSupport #define HaveTinyXSupport NO #endif +#ifndef HaveTinyXIOPortSupport +#define HaveTinyXIOPortSupport NO +#endif #ifndef HaveTinyXVBESupport #define HaveTinyXVBESupport NO #endif @@ -2078,13 +1999,13 @@ #define XfbdevServer HaveTinyXFbdevSupport #endif #ifndef Xi810Server -#define Xi810Server HaveTinyXSupport +#define Xi810Server (HaveTinyXVBESupport && HaveTinyXFbdevSupport) #endif #ifndef XIgsServer -#define XIgsServer HaveTinyXSupport +#define XIgsServer HaveTinyXIOPortSupport #endif #ifndef XipaqServer -#define XipaqServer HaveTinyXSupport +#define XipaqServer HaveTinyXFbdevSupport #endif #ifndef XItsyServer #define XItsyServer NO @@ -2093,19 +2014,19 @@ #define Xmach64Server HaveTinyXVBESupport #endif #ifndef XSavageServer -#define XSavageServer HaveTinyXSupport +#define XSavageServer HaveTinyXIOPortSupport #endif #ifndef XSis530Server -#define XSis530Server HaveTinyXSupport +#define XSis530Server HaveTinyXIOPortSupport #endif #ifndef XTridentServer -#define XTridentServer HaveTinyXVBESupport +#define XTridentServer (HaveTinyXVBESupport && HaveTinyXFbdevSupport) #endif #ifndef XTrioServer #define XTrioServer HaveTinyXSupport #endif #ifndef XTS300Server -#define XTS300Server HaveTinyXSupport +#define XTS300Server HaveTinyXIOPortSupport #endif #ifndef XvesaServer #define XvesaServer HaveTinyXVBESupport @@ -2137,7 +2058,8 @@ * module and native object formats are different (e.g., OS/2). */ #ifndef BuildModuleInSubdir -#if TinyXServer || XVirtualFramebufferServer +#if TinyXServer || XVirtualFramebufferServer || XdmxServer || XnestServer || \ + XprtServer #define BuildModuleInSubdir YES #else #define BuildModuleInSubdir NO Index: xc/config/imake/Imakefile diff -u xc/config/imake/Imakefile:3.19 xc/config/imake/Imakefile:3.20 --- xc/config/imake/Imakefile:3.19 Fri Nov 28 20:31:19 2003 +++ xc/config/imake/Imakefile Fri Oct 14 11:15:53 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ -XCOMM -XCOMM -XCOMM -XCOMM -XCOMM $XFree86: xc/config/imake/Imakefile,v 3.19 2003/11/29 01:31:19 dawes Exp $ +XCOMM $XFree86: xc/config/imake/Imakefile,v 3.20 2005/10/14 15:15:53 tsi Exp $ XCOMM Some compilers generate fatal errors if an -L directory does XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. @@ -12,7 +7,7 @@ DEPLIBS = -INCLUDES = -I$(TOP)/include $(TOP_X_INCLUDES)/X11 +INCLUDES = -I$(TOP)/include CPP_PROGRAM = CppCmd CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\"" GCC_COMMAND = $(CC) -fmerge-constants -xc /dev/null -S -o /dev/null 2> /dev/null 1> /dev/null Index: xc/config/imake/Makefile.ini diff -u xc/config/imake/Makefile.ini:3.11 xc/config/imake/Makefile.ini:3.12 --- xc/config/imake/Makefile.ini:3.11 Thu Apr 4 09:05:34 2002 +++ xc/config/imake/Makefile.ini Fri Oct 14 11:15:53 2005 @@ -1,4 +1,4 @@ -# $Xorg: Makefile.ini,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ +# $XFree86: xc/config/imake/Makefile.ini,v 3.12 2005/10/14 15:15:53 tsi Exp $ # # WARNING WARNING WARNING WARNING WARNING WARNING WARNING # @@ -7,7 +7,6 @@ # may be given at the top of the build tree for systems that do not define # any machine-specific preprocessor symbols. # -# $XFree86: xc/config/imake/Makefile.ini,v 3.11 2002/04/04 14:05:34 eich Exp $ CROSSCOMPILEDIR = CROSSCOMPILEFLAGS = -DCROSSCOMPILEDIR=\"$(CROSSCOMPILEDIR)\" @@ -15,7 +14,7 @@ CC = cc PREPROCESS_CMD = cc -E CDEBUGFLAGS = -O -INCLUDES = -I../../include -I../../imports/x11/include/X11 +INCLUDES = -I../../include CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES) IMAKEMDEP_CROSSCOMPILE = -DCROSSCOMPILE_CPP SHELL = /bin/sh Index: xc/config/imake/ccimake.c diff -u xc/config/imake/ccimake.c:1.5 xc/config/imake/ccimake.c:1.6 --- xc/config/imake/ccimake.c:1.5 Thu Mar 4 23:02:09 2004 +++ xc/config/imake/ccimake.c Mon Jan 9 09:56:14 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ccimake.c,v 1.4 2001/02/09 02:03:15 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group . */ -/* $XFree86: xc/config/imake/ccimake.c,v 1.5 2004/03/05 04:02:09 dawes Exp $ */ +/* $XFree86: xc/config/imake/ccimake.c,v 1.6 2006/01/09 14:56:14 dawes Exp $ */ /* * Warning: This file must be kept as simple as possible so that it can Index: xc/config/imake/imake.c diff -u xc/config/imake/imake.c:3.66 xc/config/imake/imake.c:3.68 --- xc/config/imake/imake.c:3.66 Mon Apr 26 12:24:26 2004 +++ xc/config/imake/imake.c Mon Jan 9 09:56:14 2006 @@ -1261,10 +1261,10 @@ #endif { #if __GNUC__ > 1 - fprintf (inFile, "#define HasGcc2 1\n"); -# if __GNUC__ > 2 - fprintf (inFile, "#define HasGcc3 1\n"); -# endif + int v; + + for (v = 2; v <= __GNUC__; v++) + fprintf (inFile, "#define HasGcc%d 1\n", v); #endif fprintf (inFile, "#define GccMajorVersion %d\n", __GNUC__); fprintf (inFile, "#define GccMinorVersion %d\n", __GNUC_MINOR__); @@ -1290,7 +1290,8 @@ # endif "/usr/local/bin/gcc", "/opt/gnu/bin/gcc", - "/usr/pkg/bin/gcc" + "/usr/pkg/bin/gcc", + "/usr/bin/gcc" }; #ifdef CROSSCOMPILE @@ -1915,9 +1916,7 @@ initialized = TRUE; fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); fprintf (tmpfd, "# %s\n", - "$Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $"); - fprintf (tmpfd, "# %s\n", - "$XFree86: xc/config/imake/imake.c,v 3.66 2004/04/26 16:24:26 tsi Exp $"); + "$XFree86: xc/config/imake/imake.c,v 3.68 2006/01/09 14:56:14 dawes Exp $"); } for (p1 = pline; p1 < end; p1++) { Index: xc/config/imake/imake.man diff -u xc/config/imake/imake.man:1.11 xc/config/imake/imake.man:1.12 --- xc/config/imake/imake.man:1.11 Thu Feb 10 22:02:53 2005 +++ xc/config/imake/imake.man Mon Jan 9 09:56:14 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: imake.man,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/config/imake/imake.man,v 1.11 2005/02/11 03:02:53 dawes Exp $ +.\" $XFree86: xc/config/imake/imake.man,v 1.12 2006/01/09 14:56:14 dawes Exp $ .\" .TH IMAKE 1 __vendorversion__ .SH NAME Index: xc/config/imake/imakemdep.h diff -u xc/config/imake/imakemdep.h:3.80 xc/config/imake/imakemdep.h:3.82 --- xc/config/imake/imakemdep.h:3.80 Mon Jan 31 21:25:06 2005 +++ xc/config/imake/imakemdep.h Tue Jun 28 21:14:08 2005 @@ -23,9 +23,9 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/imake/imakemdep.h,v 3.80 2005/02/01 02:25:06 dawes Exp $ */ +/* $XFree86: xc/config/imake/imakemdep.h,v 3.82 2005/06/29 01:14:08 dawes Exp $ */ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2005 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -423,7 +423,7 @@ "-D__amd64__", # endif # ifdef __x86_64__ - "-D__AMD64__", + "-D__x86_64__", # endif # ifdef __s390__ "-D__s390__", @@ -1296,8 +1296,11 @@ #ifdef _MIPS_SZPTR {"_MIPS_SZPTR", DEF_STRINGIFY(_MIPS_SZPTR)}, #endif +#ifdef __linux__ + {"__linux__", "1"}, +#endif #ifdef __FreeBSD__ - {"__FreeBSD__", "1"}, + {"__FreeBSD__", DEF_STRINGIFY(__FreeBSD__)}, #endif #ifdef __OpenBSD__ {"__OpenBSD__", "1"}, Index: xc/config/makedepend/Imakefile diff -u xc/config/makedepend/Imakefile:3.14 xc/config/makedepend/Imakefile:3.15 --- xc/config/makedepend/Imakefile:3.14 Wed Mar 31 18:02:16 2004 +++ xc/config/makedepend/Imakefile Mon Jan 9 09:56:15 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ -XCOMM -XCOMM -XCOMM -XCOMM -XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.14 2004/03/31 23:02:16 tsi Exp $ +XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.15 2006/01/09 14:56:15 dawes Exp $ SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o Index: xc/config/makedepend/cpp.ed diff -u xc/config/makedepend/cpp.ed:1.1.1.2 xc/config/makedepend/cpp.ed:1.2 --- xc/config/makedepend/cpp.ed:1.1.1.2 Tue Jan 16 16:54:56 2001 +++ xc/config/makedepend/cpp.ed Mon Jan 9 09:56:15 2006 @@ -1,7 +1,5 @@ # -# $Xorg: cpp.ed,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ -# -# $Locker $ +# $XFree86: xc/config/makedepend/cpp.ed,v 1.2 2006/01/09 14:56:15 dawes Exp $ # /struct symtab stab/d /struct symtab \*defloc;/d Index: xc/config/makedepend/cppsetup.c diff -u xc/config/makedepend/cppsetup.c:3.12 xc/config/makedepend/cppsetup.c:3.13 --- xc/config/makedepend/cppsetup.c:3.12 Fri Mar 5 11:02:58 2004 +++ xc/config/makedepend/cppsetup.c Mon Jan 9 09:56:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: cppsetup.c,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.12 2004/03/05 16:02:58 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.13 2006/01/09 14:56:15 dawes Exp $ */ #include "def.h" Index: xc/config/makedepend/def.h diff -u xc/config/makedepend/def.h:3.16 xc/config/makedepend/def.h:3.17 --- xc/config/makedepend/def.h:3.16 Wed Jun 9 15:00:09 2004 +++ xc/config/makedepend/def.h Mon Jan 9 09:56:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: def.h,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group. @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/def.h,v 3.16 2004/06/09 19:00:09 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/def.h,v 3.17 2006/01/09 14:56:15 dawes Exp $ */ #include "Xos.h" #include "Xfuncproto.h" Index: xc/config/makedepend/ifparser.c diff -u xc/config/makedepend/ifparser.c:3.12 xc/config/makedepend/ifparser.c:3.13 --- xc/config/makedepend/ifparser.c:3.12 Fri Mar 5 11:02:58 2004 +++ xc/config/makedepend/ifparser.c Mon Jan 9 09:56:15 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: ifparser.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ - * * Copyright 1992 Network Computing Devices, Inc. * * Permission to use, copy, modify, and distribute this software and its @@ -60,7 +58,7 @@ * * ParseIfExpression parse a string for #if */ -/* $XFree86: xc/config/makedepend/ifparser.c,v 3.12 2004/03/05 16:02:58 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/ifparser.c,v 3.13 2006/01/09 14:56:15 dawes Exp $ */ #include "ifparser.h" #include Index: xc/config/makedepend/ifparser.h diff -u xc/config/makedepend/ifparser.h:3.6 xc/config/makedepend/ifparser.h:3.7 --- xc/config/makedepend/ifparser.h:3.6 Fri Mar 5 11:02:58 2004 +++ xc/config/makedepend/ifparser.h Mon Jan 9 09:56:15 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: ifparser.h,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ - * * Copyright 1992 Network Computing Devices, Inc. * * Permission to use, copy, modify, and distribute this software and its @@ -32,7 +30,7 @@ * ParseIfExpression parse a string for #if */ -/* $XFree86: xc/config/makedepend/ifparser.h,v 3.6 2004/03/05 16:02:58 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/ifparser.h,v 3.7 2006/01/09 14:56:15 dawes Exp $ */ #include Index: xc/config/makedepend/include.c diff -u xc/config/makedepend/include.c:3.8 xc/config/makedepend/include.c:3.9 --- xc/config/makedepend/include.c:3.8 Wed Jun 9 15:00:09 2004 +++ xc/config/makedepend/include.c Mon Jan 9 09:56:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: include.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/include.c,v 3.8 2004/06/09 19:00:09 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/include.c,v 3.9 2006/01/09 14:56:15 dawes Exp $ */ #include "def.h" Index: xc/config/makedepend/main.c diff -u xc/config/makedepend/main.c:3.34 xc/config/makedepend/main.c:3.35 --- xc/config/makedepend/main.c:3.34 Sat Mar 13 18:52:23 2004 +++ xc/config/makedepend/main.c Mon Jan 9 09:56:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: main.c,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/main.c,v 3.34 2004/03/13 23:52:23 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/main.c,v 3.35 2006/01/09 14:56:15 dawes Exp $ */ #include "def.h" #ifdef hpux Index: xc/config/makedepend/mkdepend.man diff -u xc/config/makedepend/mkdepend.man:1.8 xc/config/makedepend/mkdepend.man:1.9 --- xc/config/makedepend/mkdepend.man:1.8 Thu Feb 10 22:02:53 2005 +++ xc/config/makedepend/mkdepend.man Mon Jan 9 09:56:15 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: mkdepend.man,v 1.5 2001/02/09 02:03:16 xorgcvs Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" dealing in this Software without prior written authorization from The .\" Open Group. .\" -.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.8 2005/02/11 03:02:53 dawes Exp $ +.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.9 2006/01/09 14:56:15 dawes Exp $ .\" .TH MAKEDEPEND 1 __vendorversion__ .UC 4 Index: xc/config/makedepend/parse.c diff -u xc/config/makedepend/parse.c:1.16 xc/config/makedepend/parse.c:1.17 --- xc/config/makedepend/parse.c:1.16 Fri Jun 25 17:00:09 2004 +++ xc/config/makedepend/parse.c Mon Jan 9 09:56:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: parse.c,v 1.6 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/parse.c,v 1.16 2004/06/25 21:00:09 tsi Exp $ */ +/* $XFree86: xc/config/makedepend/parse.c,v 1.17 2006/01/09 14:56:15 dawes Exp $ */ #include "def.h" Index: xc/config/makedepend/pr.c diff -u xc/config/makedepend/pr.c:1.5 xc/config/makedepend/pr.c:1.6 --- xc/config/makedepend/pr.c:1.5 Fri Dec 14 14:53:21 2001 +++ xc/config/makedepend/pr.c Mon Jan 9 09:56:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: pr.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/pr.c,v 1.5 2001/12/14 19:53:21 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/pr.c,v 1.6 2006/01/09 14:56:15 dawes Exp $ */ #include "def.h" Index: xc/config/pswrap/pswfile.c diff -u xc/config/pswrap/pswfile.c:1.7 xc/config/pswrap/pswfile.c:1.8 --- xc/config/pswrap/pswfile.c:1.7 Sat Apr 3 17:38:51 2004 +++ xc/config/pswrap/pswfile.c Mon Mar 21 12:45:43 2005 @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/pswfile.c,v 1.7 2004/04/03 22:38:51 tsi Exp $ */ +/* $XFree86: xc/config/pswrap/pswfile.c,v 1.8 2005/03/21 17:45:43 dawes Exp $ */ #include #include "pswversion.h" @@ -77,7 +77,8 @@ #endif /* __MACH__ */ printf("#include %s\n", FRIENDSFILE); printf("#include \n"); - printf("#include \"%s\"\n", hfile); + if (hfile) + printf("#include \"%s\"\n", hfile); outlineno += 3; /* UPDATE this if you add more prolog */ if (special_h) { printf("#include \"%s\"\n", special_h); Index: xc/config/pswrap/pswpriv.h diff -u xc/config/pswrap/pswpriv.h:1.7 xc/config/pswrap/pswpriv.h:1.10 --- xc/config/pswrap/pswpriv.h:1.7 Fri Aug 17 22:47:10 2001 +++ xc/config/pswrap/pswpriv.h Sat Feb 25 21:40:58 2006 @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/pswpriv.h,v 1.7 2001/08/18 02:47:10 dawes Exp $ */ +/* $XFree86: xc/config/pswrap/pswpriv.h,v 1.10 2006/02/26 02:40:58 dawes Exp $ */ #ifndef PSWPRIV_H #define PSWPRIV_H @@ -147,7 +147,9 @@ extern int pad; /* -p flag */ extern int reentrant; extern int reportedPSWName; +#if !defined(YY_FLEX_LEX_COMPAT) extern int yylineno; /* current line number in pswrap source file */ +#endif /* lexer.l */ extern int yylex(void); @@ -165,7 +167,9 @@ extern void InitOFile(void); /* pswparser.y */ +#if !defined(YYBISON) && !(defined(YYBYACC) && defined(__NetBSD__)) extern int yyparse (void); +#endif /* systemnames.c */ extern void InitWellKnownPSNames(void); Index: xc/config/pswrap/pswrap.man diff -u xc/config/pswrap/pswrap.man:1.2 xc/config/pswrap/pswrap.man:1.4 --- xc/config/pswrap/pswrap.man:1.2 Wed Feb 23 15:28:07 2000 +++ xc/config/pswrap/pswrap.man Mon Jan 9 09:56:15 2006 @@ -1,4 +1,4 @@ -.\" Id: pswrap.man,v 6.1 1994/05/18 23:21:11 asente Exp $ +.\" $XFree86: xc/config/pswrap/pswrap.man,v 1.4 2006/01/09 14:56:15 dawes Exp $ .na .nh .TH PSWRAP 1 "4 Apr 1994" "Adobe Systems" @@ -84,6 +84,9 @@ option only in conjunction with a compiler that conforms to the ANSI C Standard. .RE .TP +.BI \-f " specialHFile" +Adds a #include to the generated source file for a special header file. +.TP .BI \-h " outputHFile" Generates a header file that contains extern declarations for non-static wraps. This file can be used in #include statements in modules that use Index: xc/config/util/Imakefile diff -u xc/config/util/Imakefile:3.50 xc/config/util/Imakefile:3.51 --- xc/config/util/Imakefile:3.50 Tue Nov 11 19:10:24 2003 +++ xc/config/util/Imakefile Mon Jan 9 09:56:16 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/util/Imakefile,v 3.50 2003/11/12 00:10:24 dawes Exp $ +XCOMM $XFree86: xc/config/util/Imakefile,v 3.51 2006/01/09 14:56:16 dawes Exp $ CCMDEP_PROG = ccmakedep Index: xc/config/util/Makefile.ini diff -u xc/config/util/Makefile.ini:1.1.1.2 xc/config/util/Makefile.ini:1.2 --- xc/config/util/Makefile.ini:1.1.1.2 Tue Jan 16 16:54:38 2001 +++ xc/config/util/Makefile.ini Mon Jan 9 09:56:16 2006 @@ -1,4 +1,4 @@ -# $Xorg: Makefile.ini,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ +# $XFree86: xc/config/util/Makefile.ini,v 1.2 2006/01/09 14:56:16 dawes Exp $ # # A way to get lndir built the first time, before you have imake up # and running. You may well have to specify OSFLAGS=-D to Index: xc/config/util/aminstall.sh diff -u xc/config/util/aminstall.sh:1.1.1.2 xc/config/util/aminstall.sh:1.2 --- xc/config/util/aminstall.sh:1.1.1.2 Tue Jan 16 16:54:38 2001 +++ xc/config/util/aminstall.sh Mon Jan 9 09:56:16 2006 @@ -1,5 +1,5 @@ #!/bin/sh -# $Xorg: aminstall.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ +# $XFree86: xc/config/util/aminstall.sh,v 1.2 2006/01/09 14:56:16 dawes Exp $ # aminstall - transfer cross-compiled files to system running Amoeba. # Usage: aminstall binary-directory [-s stksz] unix-source amoeba-dest Index: xc/config/util/bsdinst.sh diff -u xc/config/util/bsdinst.sh:3.4 xc/config/util/bsdinst.sh:3.5 --- xc/config/util/bsdinst.sh:3.4 Wed Jan 17 11:39:01 2001 +++ xc/config/util/bsdinst.sh Mon Jan 9 09:56:16 2006 @@ -1,10 +1,9 @@ #!/bin/sh -# $XFree86: xc/config/util/bsdinst.sh,v 3.4 2001/01/17 16:39:01 dawes Exp $ +# $XFree86: xc/config/util/bsdinst.sh,v 3.5 2006/01/09 14:56:16 dawes Exp $ # # This accepts bsd-style install arguments and makes the appropriate calls # to the System V install. -# $Xorg: bsdinst.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ flags="" dst="" Index: xc/config/util/ccmakedep.man diff -u xc/config/util/ccmakedep.man:1.2 xc/config/util/ccmakedep.man:1.3 --- xc/config/util/ccmakedep.man:1.2 Thu Feb 10 22:02:53 2005 +++ xc/config/util/ccmakedep.man Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +.\" $XFree86: xc/config/util/ccmakedep.man,v 1.3 2005/03/29 04:00:28 tsi Exp $ .TH ccmakedep 1 __vendorversion__ .SH NAME ccmakedep \- create dependencies in makefiles using a C compiler Index: xc/config/util/checktree.c diff -u xc/config/util/checktree.c:1.4 xc/config/util/checktree.c:1.5 --- xc/config/util/checktree.c:1.4 Fri Dec 14 14:53:22 2001 +++ xc/config/util/checktree.c Mon Jan 9 09:56:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: checktree.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */ - /* Copyright (c) 1993, 1998 The Open Group @@ -24,7 +22,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/config/util/checktree.c,v 1.4 2001/12/14 19:53:22 dawes Exp $ */ +/* $XFree86: xc/config/util/checktree.c,v 1.5 2006/01/09 14:56:16 dawes Exp $ */ #include #include Index: xc/config/util/chownxterm.c diff -u xc/config/util/chownxterm.c:1.2 xc/config/util/chownxterm.c:1.3 --- xc/config/util/chownxterm.c:1.2 Fri Dec 14 14:53:22 2001 +++ xc/config/util/chownxterm.c Mon Jan 9 09:56:16 2006 @@ -1,4 +1,4 @@ -/* $Xorg: chownxterm.c,v 1.4 2001/02/09 02:03:16 xorgcvs Exp $ */ +/* $XFree86: xc/config/util/chownxterm.c,v 1.3 2006/01/09 14:56:16 dawes Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group Index: xc/config/util/elistgen.hp diff -u xc/config/util/elistgen.hp:1.1.1.2 xc/config/util/elistgen.hp:1.2 --- xc/config/util/elistgen.hp:1.1.1.2 Tue Jan 16 16:54:41 2001 +++ xc/config/util/elistgen.hp Mon Jan 9 09:56:16 2006 @@ -1,5 +1,5 @@ XCOMM!/bin/sh -XCOMM $Xorg: elistgen.hp,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ +XCOMM $XFree86: xc/config/util/elistgen.hp,v 1.2 2006/01/09 14:56:16 dawes Exp $ XCOMM XCOMM ######################################################################### XCOMM Construct shared-library export lists for HP-UX based on standardized Index: xc/config/util/elistgen.ibm diff -u xc/config/util/elistgen.ibm:1.1.1.2 xc/config/util/elistgen.ibm:1.2 --- xc/config/util/elistgen.ibm:1.1.1.2 Tue Jan 16 16:54:41 2001 +++ xc/config/util/elistgen.ibm Mon Jan 9 09:56:16 2006 @@ -1,5 +1,5 @@ XCOMM!/bin/sh -XCOMM $Xorg: elistgen.ibm,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ +XCOMM $XFree86: xc/config/util/elistgen.ibm,v 1.2 2006/01/09 14:56:16 dawes Exp $ XCOMM XCOMM ######################################################################### XCOMM Construct shared-library export lists for IBM-AIX based on standardized Index: xc/config/util/elistgen.sun diff -u xc/config/util/elistgen.sun:1.8 xc/config/util/elistgen.sun:1.9 --- xc/config/util/elistgen.sun:1.8 Tue Oct 8 19:07:42 2002 +++ xc/config/util/elistgen.sun Mon Jan 9 09:56:16 2006 @@ -1,5 +1,4 @@ XCOMM!/bin/sh -f -XCOMM $Xorg: elistgen.sun,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM ######################################################################## XCOMM Construct shared-library scoping mapfile for Solaris based on standardized @@ -15,7 +14,7 @@ XCOMM XCOMM ######################################################################## XCOMM -XCOMM $XFree86: xc/config/util/elistgen.sun,v 1.8 2002/10/08 23:07:42 dawes Exp $ +XCOMM $XFree86: xc/config/util/elistgen.sun,v 1.9 2006/01/09 14:56:16 dawes Exp $ XCOMM Utility programs FILTER=CXXFILT # C++ symbol demangler Index: xc/config/util/elistgen.usl diff -u xc/config/util/elistgen.usl:1.2 xc/config/util/elistgen.usl:1.3 --- xc/config/util/elistgen.usl:1.2 Tue Oct 8 19:07:42 2002 +++ xc/config/util/elistgen.usl Mon Jan 9 09:56:16 2006 @@ -1,5 +1,4 @@ XCOMM!/bin/sh -XCOMM $Xorg: elistgen.usl,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM ######################################################################### XCOMM Construct shared-library export lists for Novell based on standardized @@ -23,7 +22,7 @@ XCOMM XCOMM ######################################################################### XCOMM -XCOMM $XFree86: xc/config/util/elistgen.usl,v 1.2 2002/10/08 23:07:42 dawes Exp $ +XCOMM $XFree86: xc/config/util/elistgen.usl,v 1.3 2006/01/09 14:56:16 dawes Exp $ XCOMM Utility programs FILTER=CXXFILT # C++ symbol demangler Index: xc/config/util/install.sh diff -u xc/config/util/install.sh:1.1.1.2 xc/config/util/install.sh:1.2 --- xc/config/util/install.sh:1.1.1.2 Tue Jan 16 16:54:42 2001 +++ xc/config/util/install.sh Mon Jan 9 09:56:16 2006 @@ -3,7 +3,7 @@ # # install - install a program, script, or datafile # -# $Xorg: install.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ +# $XFree86: xc/config/util/install.sh,v 1.2 2006/01/09 14:56:16 dawes Exp $ # # This script is compatible with the BSD install script, but was written # from scratch. Index: xc/config/util/lndir.c diff -u xc/config/util/lndir.c:3.19 xc/config/util/lndir.c:3.20 --- xc/config/util/lndir.c:3.19 Sat Jan 10 19:10:15 2004 +++ xc/config/util/lndir.c Fri Oct 14 11:15:53 2005 @@ -1,4 +1,4 @@ -/* $Xorg: lndir.c,v 1.5 2001/02/09 02:03:17 xorgcvs Exp $ */ +/* $XFree86: xc/config/util/lndir.c,v 3.20 2005/10/14 15:15:53 tsi Exp $ */ /* Create shadow link tree (after X11R4 script of the same name) Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */ @@ -26,7 +26,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/util/lndir.c,v 3.19 2004/01/11 00:10:15 herrb Exp $ */ /* From the original /bin/sh script: @@ -44,7 +43,6 @@ */ #include -#include #include #include #include Index: xc/config/util/lndir.man diff -u xc/config/util/lndir.man:1.6 xc/config/util/lndir.man:1.7 --- xc/config/util/lndir.man:1.6 Thu Feb 10 22:02:53 2005 +++ xc/config/util/lndir.man Mon Jan 9 09:56:16 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: lndir.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $ -.\" .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -25,7 +23,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/config/util/lndir.man,v 1.6 2005/02/11 03:02:53 dawes Exp $ +.\" $XFree86: xc/config/util/lndir.man,v 1.7 2006/01/09 14:56:16 dawes Exp $ .\" .TH LNDIR 1 __vendorversion__ .SH NAME Index: xc/config/util/makedef.cmd diff -u xc/config/util/makedef.cmd:1.7 xc/config/util/makedef.cmd:1.8 --- xc/config/util/makedef.cmd:1.7 Sun Feb 6 20:38:23 2005 +++ xc/config/util/makedef.cmd Sat Apr 8 14:30:24 2006 @@ -1,5 +1,5 @@ /* This is OS/2 REXX */ -/* $XFree86: xc/config/util/makedef.cmd,v 1.7 2005/02/07 01:38:23 tsi Exp $ +/* $XFree86: xc/config/util/makedef.cmd,v 1.8 2006/04/08 18:30:24 dawes Exp $ * * This file was taken from Odin32 project and modified to suit * XFree86 4.x build process @@ -22,13 +22,13 @@ sASDFeatureId = ''; sCountryCode = ''; sDateTime = left(' 'date()' 'time(), 26); -sDescription = 'XFree86 4.5'; +sDescription = 'XFree86 4.6'; sFixPakVer = ''; sHostname = strip(substr(VALUE('HOSTNAME',,'OS2ENVIRONMENT'), 1, 11)); sLanguageCode = ''; sMiniVer = ''; sVendor = 'XFree86'; -sVersion = '4.5.0'; +sVersion = '4.6.0'; /* Index: xc/config/util/makeg.man diff -u xc/config/util/makeg.man:1.4 xc/config/util/makeg.man:1.5 --- xc/config/util/makeg.man:1.4 Thu Feb 10 22:02:53 2005 +++ xc/config/util/makeg.man Mon Jan 9 09:56:16 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: makeg.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $ .\" Copyright (c) 1996, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -24,7 +23,7 @@ .\" from The Open Group. .\" .\" -.\" $XFree86: xc/config/util/makeg.man,v 1.4 2005/02/11 03:02:53 dawes Exp $ +.\" $XFree86: xc/config/util/makeg.man,v 1.5 2006/01/09 14:56:16 dawes Exp $ .\" .TH MAKEG 1 __vendorversion__ .SH NAME Index: xc/config/util/makeg.sh diff -u xc/config/util/makeg.sh:1.1.1.3 xc/config/util/makeg.sh:1.2 --- xc/config/util/makeg.sh:1.1.1.3 Tue Jan 16 16:54:44 2001 +++ xc/config/util/makeg.sh Mon Jan 9 09:56:16 2006 @@ -1,6 +1,6 @@ #! /bin/sh # makeg - run "make" with options necessary to make a debuggable executable -# $Xorg: makeg.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ +# $XFree86: xc/config/util/makeg.sh,v 1.2 2006/01/09 14:56:16 dawes Exp $ # set GDB=1 in your environment if using gdb on Solaris 2. Index: xc/config/util/makestrs.c diff -u xc/config/util/makestrs.c:3.7 xc/config/util/makestrs.c:3.8 --- xc/config/util/makestrs.c:3.7 Fri Dec 14 14:53:22 2001 +++ xc/config/util/makestrs.c Fri Oct 14 11:15:53 2005 @@ -1,5 +1,3 @@ -/* $Id */ - /* Copyright (c) 1991, 1998 The Open Group @@ -25,12 +23,11 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/util/makestrs.c,v 3.7 2001/12/14 19:53:22 dawes Exp $ */ /* Constructs string definitions */ -#include #include +#include #include #include #if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ @@ -233,7 +230,7 @@ (void) fprintf (f, "%s\n%s\n/* %s ABI version -- Do not edit */\n", - "/* $Xorg: makestrs.c,v 1.6 2001/02/09 02:03:17 xorgcvs Exp $ */", + "/* $XFree86: xc/config/util/makestrs.c,v 3.8 2005/10/14 15:15:53 tsi Exp $ */", "/* This file is automatically generated. */", abistring[abi]); @@ -404,7 +401,7 @@ (void) printf ("%s\n%s\n/* %s ABI version -- Do not edit */\n", - "/* $Xorg: makestrs.c,v 1.6 2001/02/09 02:03:17 xorgcvs Exp $ */", + "/* $XFree86: xc/config/util/makestrs.c,v 3.8 2005/10/14 15:15:53 tsi Exp $ */", "/* This file is automatically generated. */", abistring[abi]); Index: xc/config/util/makestrs.man diff -u xc/config/util/makestrs.man:3.10 xc/config/util/makestrs.man:3.11 --- xc/config/util/makestrs.man:3.10 Thu Feb 10 22:02:53 2005 +++ xc/config/util/makestrs.man Mon Jan 9 09:56:16 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: makestrs.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" dealing in this Software without prior written authorization from The .\" Open Group. .\" -.\" $XFree86: xc/config/util/makestrs.man,v 3.10 2005/02/11 03:02:53 dawes Exp $ +.\" $XFree86: xc/config/util/makestrs.man,v 3.11 2006/01/09 14:56:16 dawes Exp $ .\" .TH MAKESTRS 1 __vendorversion__ .SH NAME Index: xc/config/util/mdepend.cpp diff -u xc/config/util/mdepend.cpp:3.10 xc/config/util/mdepend.cpp:3.11 --- xc/config/util/mdepend.cpp:3.10 Fri Aug 17 09:27:50 2001 +++ xc/config/util/mdepend.cpp Mon Jan 9 09:56:16 2006 @@ -1,7 +1,5 @@ XCOMM!/bin/sh XCOMM -XCOMM $Xorg: mdepend.cpp,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ -XCOMM XCOMM Do the equivalent of the 'makedepend' program, but do it right. XCOMM XCOMM Usage: @@ -22,7 +20,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.10 2001/08/17 13:27:50 dawes Exp $ +XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.11 2006/01/09 14:56:16 dawes Exp $ XCOMM CC=PREPROC Index: xc/config/util/mergelib.cpp diff -u xc/config/util/mergelib.cpp:1.3 xc/config/util/mergelib.cpp:1.4 --- xc/config/util/mergelib.cpp:1.3 Mon Nov 25 09:04:48 2002 +++ xc/config/util/mergelib.cpp Mon Jan 9 09:56:16 2006 @@ -1,6 +1,6 @@ XCOMM!/bin/sh XCOMM -XCOMM $Xorg: mergelib.cpp,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $ +XCOMM $XFree86: xc/config/util/mergelib.cpp,v 1.4 2006/01/09 14:56:16 dawes Exp $ XCOMM XCOMM Copyright (c) 1989, 1998 The Open Group XCOMM Index: xc/config/util/mkdirhier.c diff -u xc/config/util/mkdirhier.c:1.7 xc/config/util/mkdirhier.c:1.8 --- xc/config/util/mkdirhier.c:1.7 Sun Jun 30 22:25:51 2002 +++ xc/config/util/mkdirhier.c Mon Jan 9 09:56:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mkdirhier.c,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $ */ /* Copyright (C) 1996, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/config/util/mkdirhier.c,v 1.7 2002/07/01 02:25:51 tsi Exp $ */ +/* $XFree86: xc/config/util/mkdirhier.c,v 1.8 2006/01/09 14:56:16 dawes Exp $ */ /* * Simple mkdirhier program for Windows NT Index: xc/config/util/mkdirhier.man diff -u xc/config/util/mkdirhier.man:1.4 xc/config/util/mkdirhier.man:1.5 --- xc/config/util/mkdirhier.man:1.4 Thu Feb 10 22:02:53 2005 +++ xc/config/util/mkdirhier.man Mon Jan 9 09:56:16 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: mkdirhier.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" dealing in this Software without prior written authorization from The .\" Open Group. .\" -.\" $XFree86: xc/config/util/mkdirhier.man,v 1.4 2005/02/11 03:02:53 dawes Exp $ +.\" $XFree86: xc/config/util/mkdirhier.man,v 1.5 2006/01/09 14:56:16 dawes Exp $ .\" .TH MKDIRHIER 1 __vendorversion__ .SH NAME Index: xc/config/util/mkdirhier.sh diff -u xc/config/util/mkdirhier.sh:1.2 xc/config/util/mkdirhier.sh:1.3 --- xc/config/util/mkdirhier.sh:1.2 Mon Nov 25 09:04:48 2002 +++ xc/config/util/mkdirhier.sh Mon Jan 9 09:56:16 2006 @@ -1,5 +1,5 @@ #!/bin/sh -# $Xorg: mkdirhier.sh,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ +# $XFree86: xc/config/util/mkdirhier.sh,v 1.3 2006/01/09 14:56:16 dawes Exp $ # Courtesy of Paul Eggert newline=' Index: xc/config/util/xmkmf.cpp diff -u xc/config/util/xmkmf.cpp:1.4 xc/config/util/xmkmf.cpp:1.5 --- xc/config/util/xmkmf.cpp:1.4 Wed Jan 17 11:39:02 2001 +++ xc/config/util/xmkmf.cpp Mon Jan 9 09:56:16 2006 @@ -1,10 +1,9 @@ XCOMM!/bin/sh -XCOMM $XFree86: xc/config/util/xmkmf.cpp,v 1.4 2001/01/17 16:39:02 dawes Exp $ +XCOMM $XFree86: xc/config/util/xmkmf.cpp,v 1.5 2006/01/09 14:56:16 dawes Exp $ XCOMM XCOMM make a Makefile from an Imakefile from inside or outside the sources XCOMM -XCOMM $Xorg: xmkmf.cpp,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]" Index: xc/config/util/xmkmf.man diff -u xc/config/util/xmkmf.man:1.4 xc/config/util/xmkmf.man:1.5 --- xc/config/util/xmkmf.man:1.4 Thu Feb 10 22:02:53 2005 +++ xc/config/util/xmkmf.man Mon Jan 9 09:56:16 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: xmkmf.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ .\" dealing in this Software without prior written authorization from The .\" Open Group. .\" -.\" $XFree86: xc/config/util/xmkmf.man,v 1.4 2005/02/11 03:02:53 dawes Exp $ +.\" $XFree86: xc/config/util/xmkmf.man,v 1.5 2006/01/09 14:56:16 dawes Exp $ .\" .TH XMKMF 1 __vendorversion__ .SH NAME Index: xc/config/util/mkshadow/Imakefile diff -u xc/config/util/mkshadow/Imakefile:1.1.1.2 xc/config/util/mkshadow/Imakefile:1.2 --- xc/config/util/mkshadow/Imakefile:1.1.1.2 Tue Jan 16 16:54:49 2001 +++ xc/config/util/mkshadow/Imakefile Mon Jan 9 09:56:17 2006 @@ -1,4 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ +XCOMM $XFree86: xc/config/util/mkshadow/Imakefile,v 1.2 2006/01/09 14:56:17 dawes Exp $ +p SRCS = mkshadow.c savedir.c wildmat.c OBJS = mkshadow.o savedir.o wildmat.o Index: xc/config/util/mkshadow/mkshadow.c diff -u xc/config/util/mkshadow/mkshadow.c:1.1.1.3 xc/config/util/mkshadow/mkshadow.c:1.2 --- xc/config/util/mkshadow/mkshadow.c:1.1.1.3 Tue Jan 16 16:54:50 2001 +++ xc/config/util/mkshadow/mkshadow.c Mon Jan 9 09:56:17 2006 @@ -1,4 +1,4 @@ -/* $Xorg: mkshadow.c,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ */ +/* $XFree86: xc/config/util/mkshadow/mkshadow.c,v 1.2 2006/01/09 14:56:17 dawes Exp $ */ /* mkshadow.c - make a "shadow copy" of a directory tree with symlinks. Copyright 1990, 1993 Free Software Foundation, Inc. Index: xc/config/util/mkshadow/savedir.c diff -u xc/config/util/mkshadow/savedir.c:1.2 xc/config/util/mkshadow/savedir.c:1.3 --- xc/config/util/mkshadow/savedir.c:1.2 Wed Jul 25 11:04:41 2001 +++ xc/config/util/mkshadow/savedir.c Mon Jan 9 09:56:17 2006 @@ -1,4 +1,3 @@ -/* $Xorg: savedir.c,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ */ /* savedir.c -- save the list of files in a directory in a string Copyright 1990, 1993 Free Software Foundation, Inc. @@ -14,7 +13,7 @@ (The FSF has modified its usual distribution terms, for this file, as a courtesy to the X project.) */ -/* $XFree86: xc/config/util/mkshadow/savedir.c,v 1.2 2001/07/25 15:04:41 dawes Exp $ */ +/* $XFree86: xc/config/util/mkshadow/savedir.c,v 1.3 2006/01/09 14:56:17 dawes Exp $ */ /* Written by David MacKenzie . Modified to use by default. Per Bothner . */ Index: xc/config/util/mkshadow/wildmat.c diff -u xc/config/util/mkshadow/wildmat.c:1.1.1.2 xc/config/util/mkshadow/wildmat.c:1.2 --- xc/config/util/mkshadow/wildmat.c:1.1.1.2 Tue Jan 16 16:54:51 2001 +++ xc/config/util/mkshadow/wildmat.c Mon Jan 9 09:56:17 2006 @@ -1,4 +1,4 @@ -/* $Xorg: wildmat.c,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ */ +/* $XFree86: xc/config/util/mkshadow/wildmat.c,v 1.2 2006/01/09 14:56:17 dawes Exp $ */ /* ** ** Do shell-style pattern matching for ?, \, [], and * characters. Index: xc/doc/Imakefile diff -u xc/doc/Imakefile:1.4 xc/doc/Imakefile:1.8 --- xc/doc/Imakefile:1.4 Wed Jan 17 11:57:38 2001 +++ xc/doc/Imakefile Mon Jan 9 09:56:17 2006 @@ -1,17 +1,8 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/doc/Imakefile,v 1.4 2001/01/17 16:57:38 dawes Exp $ +XCOMM $XFree86: xc/doc/Imakefile,v 1.8 2006/01/09 14:56:17 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags -#if BuildMiscDocs -MISCDIR = misc -#endif - #if BuildSpecsDocs SPECSDIR = specs #endif @@ -20,9 +11,9 @@ HARDCOPYDIR = hardcopy #endif -SUBDIRS = man $(MISCDIR) $(SPECSDIR) $(HARDCOPYDIR) +SUBDIRS = man $(SPECSDIR) $(HARDCOPYDIR) all:: +depend:: MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) Index: xc/doc/hardcopy/Imakefile diff -u xc/doc/hardcopy/Imakefile:1.1 xc/doc/hardcopy/Imakefile:1.2 --- xc/doc/hardcopy/Imakefile:1.1 Thu Dec 14 13:23:09 2000 +++ xc/doc/hardcopy/Imakefile Tue Mar 29 12:33:20 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/doc/hardcopy/Imakefile,v 1.1 2000/12/14 18:23:09 dawes Exp $ +XCOMM $XFree86: xc/doc/hardcopy/Imakefile,v 1.2 2005/03/29 17:33:20 tsi Exp $ #if defined(HardcopyDocDirs) @@ -10,6 +10,5 @@ all:: MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) #endif Index: xc/doc/hardcopy/BDF/Imakefile diff -u /dev/null xc/doc/hardcopy/BDF/Imakefile:1.1 --- /dev/null Tue May 9 21:51:37 2006 +++ xc/doc/hardcopy/BDF/Imakefile Tue Mar 29 12:33:20 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/BDF/Imakefile,v 1.1 2005/03/29 17:33:20 tsi Exp $ + +InstallHardcopyDoc(bdf,bdf.PS.gz) + Index: xc/doc/hardcopy/CTEXT/Imakefile diff -u /dev/null xc/doc/hardcopy/CTEXT/Imakefile:1.1 --- /dev/null Tue May 9 21:51:37 2006 +++ xc/doc/hardcopy/CTEXT/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/CTEXT/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(ctext,ctext.PS.gz) + Index: xc/doc/hardcopy/FSProtocol/Imakefile diff -u /dev/null xc/doc/hardcopy/FSProtocol/Imakefile:1.1 --- /dev/null Tue May 9 21:51:37 2006 +++ xc/doc/hardcopy/FSProtocol/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/FSProtocol/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(fsproto,fsproto.PS.gz) + Index: xc/doc/hardcopy/ICCCM/Imakefile diff -u /dev/null xc/doc/hardcopy/ICCCM/Imakefile:1.1 --- /dev/null Tue May 9 21:51:38 2006 +++ xc/doc/hardcopy/ICCCM/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,5 @@ +XCOMM $XFree86: xc/doc/hardcopy/ICCCM/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(icccm,icccm.PS.gz) +InstallHardcopyDoc(icccm.idx,icccm.idx.PS.gz) + Index: xc/doc/hardcopy/ICE/Imakefile diff -u /dev/null xc/doc/hardcopy/ICE/Imakefile:1.1 --- /dev/null Tue May 9 21:51:38 2006 +++ xc/doc/hardcopy/ICE/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,5 @@ +XCOMM $XFree86: xc/doc/hardcopy/ICE/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(ICElib,ICElib.PS.gz) +InstallHardcopyDoc(ice,ice.PS.gz) + Index: xc/doc/hardcopy/SM/Imakefile diff -u /dev/null xc/doc/hardcopy/SM/Imakefile:1.1 --- /dev/null Tue May 9 21:51:40 2006 +++ xc/doc/hardcopy/SM/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,5 @@ +XCOMM $XFree86: xc/doc/hardcopy/SM/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(SMlib,SMlib.PS.gz) +InstallHardcopyDoc(xsmp,xsmp.PS.gz) + Index: xc/doc/hardcopy/X11/Imakefile diff -u /dev/null xc/doc/hardcopy/X11/Imakefile:1.1 --- /dev/null Tue May 9 21:51:40 2006 +++ xc/doc/hardcopy/X11/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,5 @@ +XCOMM $XFree86: xc/doc/hardcopy/X11/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(xlib,xlib.PS.gz) +InstallHardcopyDoc(xlib.idx,xlib.idx.PS.gz) + Index: xc/doc/hardcopy/XDMCP/Imakefile diff -u /dev/null xc/doc/hardcopy/XDMCP/Imakefile:1.1 --- /dev/null Tue May 9 21:51:40 2006 +++ xc/doc/hardcopy/XDMCP/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/XDMCP/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(xdmcp,xdmcp.PS.gz) + Index: xc/doc/hardcopy/XIM/Imakefile diff -u /dev/null xc/doc/hardcopy/XIM/Imakefile:1.1 --- /dev/null Tue May 9 21:51:41 2006 +++ xc/doc/hardcopy/XIM/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/XIM/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(xim,xim.PS.gz) + Index: xc/doc/hardcopy/XLFD/Imakefile diff -u /dev/null xc/doc/hardcopy/XLFD/Imakefile:1.1 --- /dev/null Tue May 9 21:51:41 2006 +++ xc/doc/hardcopy/XLFD/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/XLFD/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(xlfd,xlfd.PS.gz) + Index: xc/doc/hardcopy/XProtocol/Imakefile diff -u /dev/null xc/doc/hardcopy/XProtocol/Imakefile:1.1 --- /dev/null Tue May 9 21:51:42 2006 +++ xc/doc/hardcopy/XProtocol/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,5 @@ +XCOMM $XFree86: xc/doc/hardcopy/XProtocol/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(proto,proto.PS.gz) +InstallHardcopyDoc(proto.idx,proto.idx.PS.gz) + Index: xc/doc/hardcopy/Xaw/Imakefile diff -u /dev/null xc/doc/hardcopy/Xaw/Imakefile:1.1 --- /dev/null Tue May 9 21:51:42 2006 +++ xc/doc/hardcopy/Xaw/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,5 @@ +XCOMM $XFree86: xc/doc/hardcopy/Xaw/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(widg.idx,widg.idx.PS.gz) +InstallHardcopyDoc(widgets,widgets.PS.gz) + Index: xc/doc/hardcopy/Xext/Imakefile diff -u /dev/null xc/doc/hardcopy/Xext/Imakefile:1.1 --- /dev/null Tue May 9 21:51:42 2006 +++ xc/doc/hardcopy/Xext/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,26 @@ +XCOMM $XFree86: xc/doc/hardcopy/Xext/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(AppGroup,AppGroup.PS.gz) +InstallHardcopyDoc(DPMS,DPMS.PS.gz) +InstallHardcopyDoc(DPMSLib,DPMSLib.PS.gz) +InstallHardcopyDoc(bigreq,bigreq.PS.gz) +InstallHardcopyDoc(buffer,buffer.PS.gz) +InstallHardcopyDoc(dbe,dbe.PS.gz) +InstallHardcopyDoc(dbelib,dbelib.PS.gz) +InstallHardcopyDoc(evi,evi.PS.gz) +InstallHardcopyDoc(lbx,lbx.PS.gz) +InstallHardcopyDoc(lbxalg,lbxalg.PS.gz) +InstallHardcopyDoc(mit-shm,mit-shm.PS.gz) +InstallHardcopyDoc(record,record.PS.gz) +InstallHardcopyDoc(recordlib,recordlib.PS.gz) +InstallHardcopyDoc(security,security.PS.gz) +InstallHardcopyDoc(shape,shape.PS.gz) +InstallHardcopyDoc(shapelib,shapelib.PS.gz) +InstallHardcopyDoc(sync,sync.PS.gz) +InstallHardcopyDoc(synclib,synclib.PS.gz) +InstallHardcopyDoc(tog-cup,tog-cup.PS.gz) +InstallHardcopyDoc(xc-misc,xc-misc.PS.gz) +InstallHardcopyDoc(xtest,xtest.PS.gz) +InstallHardcopyDoc(xtestlib,xtestlib.PS.gz) + +InstallDoc(lbxTOC,lbxTOC.html) Index: xc/doc/hardcopy/Xext/lbx.html diff -u xc/doc/hardcopy/Xext/lbx.html:1.1.1.2 xc/doc/hardcopy/Xext/lbx.html:1.2 --- xc/doc/hardcopy/Xext/lbx.html:1.1.1.2 Tue Jan 16 17:04:26 2001 +++ xc/doc/hardcopy/Xext/lbx.html Mon Jan 9 09:56:17 2006 @@ -9,7 +9,7 @@

D. Converse, J. Fulton, C. Kantarjiev, D. Lemke, R. Mor, K. Packard, R. Tice, D. Tonogai -

$Xorg: lbx.html,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ +

$XFree86: xc/doc/hardcopy/Xext/lbx.html,v 1.2 2006/01/09 14:56:17 dawes Exp $

Copyright (c) 1996 X Consortium

Index: xc/doc/hardcopy/Xi/Imakefile diff -u /dev/null xc/doc/hardcopy/Xi/Imakefile:1.1 --- /dev/null Tue May 9 21:51:43 2006 +++ xc/doc/hardcopy/Xi/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,10 @@ +XCOMM $XFree86: xc/doc/hardcopy/Xi/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(xilib,xilib.PS.gz) +InstallHardcopyDoc(xiport,xiport.PS.gz) +InstallHardcopyDoc(xiproto,xiproto.PS.gz) + +/* Prevent conflicts with XProtocol */ +LinkFile(xilib.PS.gz,lib.PS.gz) +LinkFile(xiport.PS.gz,port.PS.gz) +LinkFile(xiproto.PS.gz,proto.PS.gz) Index: xc/doc/hardcopy/Xmu/Imakefile diff -u /dev/null xc/doc/hardcopy/Xmu/Imakefile:1.1 --- /dev/null Tue May 9 21:51:43 2006 +++ xc/doc/hardcopy/Xmu/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/Xmu/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(xmu,xmu.PS.gz) + Index: xc/doc/hardcopy/Xserver/Imakefile diff -u /dev/null xc/doc/hardcopy/Xserver/Imakefile:1.1 --- /dev/null Tue May 9 21:51:43 2006 +++ xc/doc/hardcopy/Xserver/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,9 @@ +XCOMM $XFree86: xc/doc/hardcopy/Xserver/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(Xprt,Xprt.PS.gz) +InstallHardcopyDoc(analysis,analysis.PS.gz) +InstallHardcopyDoc(appgroup,appgroup.PS.gz) +InstallHardcopyDoc(ddx,ddx.PS.gz) +InstallHardcopyDoc(fontlib,fontlib.PS.gz) +InstallHardcopyDoc(secint,secint.PS.gz) + Index: xc/doc/hardcopy/Xt/Imakefile diff -u /dev/null xc/doc/hardcopy/Xt/Imakefile:1.1 --- /dev/null Tue May 9 21:51:44 2006 +++ xc/doc/hardcopy/Xt/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,5 @@ +XCOMM $XFree86: xc/doc/hardcopy/Xt/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(intr.idx,intr.idx.PS.gz) +InstallHardcopyDoc(intrinsics,intrinsics.PS.gz) + Index: xc/doc/hardcopy/Xv/Imakefile diff -u /dev/null xc/doc/hardcopy/Xv/Imakefile:1.1 --- /dev/null Tue May 9 21:51:44 2006 +++ xc/doc/hardcopy/Xv/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,6 @@ +XCOMM $XFree86: xc/doc/hardcopy/Xv/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(xv-protocol-v2,xv-protocol-v2.PS) + +InstallDoc(video,video.txt) +LinkFile(video.txt,video) Index: xc/doc/hardcopy/i18n/Imakefile diff -u /dev/null xc/doc/hardcopy/i18n/Imakefile:1.1 --- /dev/null Tue May 9 21:51:44 2006 +++ xc/doc/hardcopy/i18n/Imakefile Tue Mar 29 12:33:21 2005 @@ -0,0 +1,6 @@ +XCOMM $XFree86: xc/doc/hardcopy/i18n/Imakefile,v 1.1 2005/03/29 17:33:21 tsi Exp $ + +InstallHardcopyDoc(Framework,Framework.PS.gz) +InstallHardcopyDoc(LocaleDB,LocaleDB.PS.gz) +InstallHardcopyDoc(Trans,Trans.PS.gz) + Index: xc/doc/hardcopy/man/Imakefile diff -u /dev/null xc/doc/hardcopy/man/Imakefile:1.1 --- /dev/null Tue May 9 21:51:44 2006 +++ xc/doc/hardcopy/man/Imakefile Tue Mar 29 12:33:22 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/man/Imakefile,v 1.1 2005/03/29 17:33:22 tsi Exp $ + +InstallHardcopyDoc(man,man.PS.gz) + Index: xc/doc/hardcopy/rstart/Imakefile diff -u /dev/null xc/doc/hardcopy/rstart/Imakefile:1.1 --- /dev/null Tue May 9 21:51:44 2006 +++ xc/doc/hardcopy/rstart/Imakefile Tue Mar 29 12:33:22 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/rstart/Imakefile,v 1.1 2005/03/29 17:33:22 tsi Exp $ + +InstallHardcopyDoc(rstart,rstart.PS.gz) + Index: xc/doc/hardcopy/saver/Imakefile diff -u /dev/null xc/doc/hardcopy/saver/Imakefile:1.1 --- /dev/null Tue May 9 21:51:44 2006 +++ xc/doc/hardcopy/saver/Imakefile Tue Mar 29 12:33:22 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/saver/Imakefile,v 1.1 2005/03/29 17:33:22 tsi Exp $ + +InstallHardcopyDoc(saver,saver.PS.gz) + Index: xc/doc/hardcopy/xfs/Imakefile diff -u /dev/null xc/doc/hardcopy/xfs/Imakefile:1.1 --- /dev/null Tue May 9 21:51:45 2006 +++ xc/doc/hardcopy/xfs/Imakefile Tue Mar 29 12:33:22 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/xfs/Imakefile,v 1.1 2005/03/29 17:33:22 tsi Exp $ + +InstallHardcopyDoc(design,design.PS.gz) + Index: xc/doc/hardcopy/xterm/Imakefile diff -u /dev/null xc/doc/hardcopy/xterm/Imakefile:1.1 --- /dev/null Tue May 9 21:51:45 2006 +++ xc/doc/hardcopy/xterm/Imakefile Tue Mar 29 12:33:22 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/xterm/Imakefile,v 1.1 2005/03/29 17:33:22 tsi Exp $ + +InstallHardcopyDoc(ctlseqs,ctlseqs.PS.gz) + Index: xc/doc/hardcopy/xtrans/Imakefile diff -u /dev/null xc/doc/hardcopy/xtrans/Imakefile:1.1 --- /dev/null Tue May 9 21:51:45 2006 +++ xc/doc/hardcopy/xtrans/Imakefile Tue Mar 29 12:33:22 2005 @@ -0,0 +1,4 @@ +XCOMM $XFree86: xc/doc/hardcopy/xtrans/Imakefile,v 1.1 2005/03/29 17:33:22 tsi Exp $ + +InstallHardcopyDoc(Xtrans,Xtrans.PS.gz) + Index: xc/doc/man/Imakefile diff -u xc/doc/man/Imakefile:1.8 xc/doc/man/Imakefile:1.10 --- xc/doc/man/Imakefile:1.8 Wed Jun 30 16:21:36 2004 +++ xc/doc/man/Imakefile Mon Jan 9 09:56:17 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ - - - -XCOMM $XFree86: xc/doc/man/Imakefile,v 1.8 2004/06/30 20:21:36 martin Exp $ +XCOMM $XFree86: xc/doc/man/Imakefile,v 1.10 2006/01/09 14:56:17 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags @@ -33,4 +29,3 @@ all:: MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) Index: xc/doc/man/GL/Imakefile diff -u xc/doc/man/GL/Imakefile:1.3 xc/doc/man/GL/Imakefile:1.4 --- xc/doc/man/GL/Imakefile:1.3 Mon Jan 14 20:16:28 2002 +++ xc/doc/man/GL/Imakefile Tue Mar 29 12:33:22 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/doc/man/GL/Imakefile,v 1.3 2002/01/15 01:16:28 dawes Exp $ +XCOMM $XFree86: xc/doc/man/GL/Imakefile,v 1.4 2005/03/29 17:33:22 tsi Exp $ XCOMM The contents of this file are subject to the GLX Public License Version 1.0 XCOMM (the "License"). You may not use this file except in compliance with the XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc., @@ -23,4 +23,3 @@ MakeSubdirs($(SUBDIRS)) InstallManSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) Index: xc/doc/man/X11/XUQuark.man diff -u xc/doc/man/X11/XUQuark.man:1.6 xc/doc/man/X11/XUQuark.man:1.7 --- xc/doc/man/X11/XUQuark.man:1.6 Thu Feb 10 22:02:56 2005 +++ xc/doc/man/X11/XUQuark.man Tue Oct 4 20:30:07 2005 @@ -40,7 +40,7 @@ .\" of this documentation for any purpose. .\" It is provided ``as is'' without express or implied warranty. .\" -.\" $XFree86: xc/doc/man/X11/XUQuark.man,v 1.6 2005/02/11 03:02:56 dawes Exp $ +.\" $XFree86: xc/doc/man/X11/XUQuark.man,v 1.7 2005/10/05 00:30:07 dawes Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface @@ -153,7 +153,7 @@ .br \&#define XrmStringToRepresentation(string) XrmStringToQuark(string) .HP -int XrmQuark XrmStringToQuark\^(\^char *\fIstring\fP\^); +XrmQuark XrmStringToQuark\^(\^char *\fIstring\fP\^); .HP XrmQuark XrmPermStringToQuark\^(\^char *\fIstring\fP\^); .LP @@ -183,7 +183,7 @@ void XrmStringToQuarkList\^(\^char *\fIstring\fP\^, XrmQuarkList \fIquarks_return\fP\^); .HP -XrmStringToBindingQuarkList\^(\^char *\fIstring\fP\^, XrmBindingList +void XrmStringToBindingQuarkList\^(\^char *\fIstring\fP\^, XrmBindingList \fIbindings_return\fP\^, XrmQuarkList \fIquarks_return\fP\^); .SH ARGUMENTS .IP \fIbindings_return\fP 1i Index: xc/doc/man/Xau/Imakefile diff -u xc/doc/man/Xau/Imakefile:1.1.1.3 xc/doc/man/Xau/Imakefile:1.2 --- xc/doc/man/Xau/Imakefile:1.1.1.3 Tue Jan 16 16:57:08 2001 +++ xc/doc/man/Xau/Imakefile Mon Jan 9 09:56:18 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ +XCOMM $XFree86: xc/doc/man/Xau/Imakefile,v 1.2 2006/01/09 14:56:18 dawes Exp $ MANDIR = $(LIBMANDIR) MANSUFFIX = $(LIBMANSUFFIX) Index: xc/doc/man/Xau/Xau.man diff -u xc/doc/man/Xau/Xau.man:1.5 xc/doc/man/Xau/Xau.man:1.6 --- xc/doc/man/Xau/Xau.man:1.5 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xau/Xau.man Mon Jan 9 09:56:18 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: Xau.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ .\" Copyright (c) 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -24,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xau/Xau.man,v 1.5 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xau/Xau.man,v 1.6 2006/01/09 14:56:18 dawes Exp $ .\" .TH Xau 3 __vendorversion__ .SH NAME Index: xc/doc/man/Xext/Imakefile diff -u xc/doc/man/Xext/Imakefile:1.3 xc/doc/man/Xext/Imakefile:1.5 --- xc/doc/man/Xext/Imakefile:1.3 Wed Nov 7 21:11:03 2001 +++ xc/doc/man/Xext/Imakefile Mon Jan 9 09:56:18 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ - - - -XCOMM $XFree86: xc/doc/man/Xext/Imakefile,v 1.3 2001/11/08 02:11:03 tsi Exp $ +XCOMM $XFree86: xc/doc/man/Xext/Imakefile,v 1.5 2006/01/09 14:56:18 dawes Exp $ MANDIR = $(LIBMANDIR) MANSUFFIX = $(LIBMANSUFFIX) @@ -15,7 +11,6 @@ all:: MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) #if ExpandManNames InstallManPageLong(XShape,$(MANDIR),XShapeQueryExtension) Index: xc/doc/man/Xext/XShape.man diff -u xc/doc/man/Xext/XShape.man:1.5 xc/doc/man/Xext/XShape.man:1.6 --- xc/doc/man/Xext/XShape.man:1.5 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/XShape.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XShape.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ -.\" .\" Copyright (c) 1989, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xext/XShape.man,v 1.5 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/XShape.man,v 1.6 2006/01/09 14:56:18 dawes Exp $ .\" .de ZN .ie t \fB\^\\$1\^\fR\\$2 Index: xc/doc/man/Xext/Xevi.man diff -u xc/doc/man/Xext/Xevi.man:1.4 xc/doc/man/Xext/Xevi.man:1.5 --- xc/doc/man/Xext/Xevi.man:1.4 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/Xevi.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: Xevi.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ -.\" .\" Copyright (c) 1997 Silicon Graphics, Inc. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from .\" Silicon Graphics, Inc. .\" -.\" $XFree86: xc/doc/man/Xext/Xevi.man,v 1.4 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/Xevi.man,v 1.5 2006/01/09 14:56:18 dawes Exp $ .\" .TH XEVI 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xext/Xmbuf.man diff -u xc/doc/man/Xext/Xmbuf.man:1.5 xc/doc/man/Xext/Xmbuf.man:1.6 --- xc/doc/man/Xext/Xmbuf.man:1.5 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/Xmbuf.man Mon Jan 9 09:56:18 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: Xmbuf.man,v 1.3 2000/08/17 19:41:54 cpqbld Exp $ .\" Copyright (c) 1989, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -34,7 +33,7 @@ .\" without express or implied warranty. .\" .\" -.\" $XFree86: xc/doc/man/Xext/Xmbuf.man,v 1.5 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/Xmbuf.man,v 1.6 2006/01/09 14:56:18 dawes Exp $ .\" .de ZN .ie t \fB\^\\$1\^\fR\\$2 Index: xc/doc/man/Xext/dbe/DBE.man diff -u xc/doc/man/Xext/dbe/DBE.man:3.6 xc/doc/man/Xext/dbe/DBE.man:3.7 --- xc/doc/man/Xext/dbe/DBE.man:3.6 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/dbe/DBE.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: DBE.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ -.\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. .\" -.\" $XFree86: xc/doc/man/Xext/dbe/DBE.man,v 3.6 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/dbe/DBE.man,v 3.7 2006/01/09 14:56:18 dawes Exp $ .\" .TH DBE 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xext/dbe/Imakefile diff -u xc/doc/man/Xext/dbe/Imakefile:3.1 xc/doc/man/Xext/dbe/Imakefile:3.2 --- xc/doc/man/Xext/dbe/Imakefile:3.1 Wed Jan 17 11:57:38 2001 +++ xc/doc/man/Xext/dbe/Imakefile Mon Jan 9 09:56:18 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ +XCOMM $XFree86: xc/doc/man/Xext/dbe/Imakefile,v 3.2 2006/01/09 14:56:18 dawes Exp $ MANDIR = $(LIBMANDIR) MANSUFFIX = $(LIBMANSUFFIX) Index: xc/doc/man/Xext/dbe/XdbeAllo.man diff -u xc/doc/man/Xext/dbe/XdbeAllo.man:3.6 xc/doc/man/Xext/dbe/XdbeAllo.man:3.7 --- xc/doc/man/Xext/dbe/XdbeAllo.man:3.6 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/dbe/XdbeAllo.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XdbeAllo.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ -.\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. .\" -.\" $XFree86: xc/doc/man/Xext/dbe/XdbeAllo.man,v 3.6 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeAllo.man,v 3.7 2006/01/09 14:56:18 dawes Exp $ .\" .TH XdbeAllocateBackBufferName 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xext/dbe/XdbeBegi.man diff -u xc/doc/man/Xext/dbe/XdbeBegi.man:3.6 xc/doc/man/Xext/dbe/XdbeBegi.man:3.7 --- xc/doc/man/Xext/dbe/XdbeBegi.man:3.6 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/dbe/XdbeBegi.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XdbeBegi.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ -.\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. .\" -.\" $XFree86: xc/doc/man/Xext/dbe/XdbeBegi.man,v 3.6 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeBegi.man,v 3.7 2006/01/09 14:56:18 dawes Exp $ .\" .TH DBE 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xext/dbe/XdbeDeal.man diff -u xc/doc/man/Xext/dbe/XdbeDeal.man:3.6 xc/doc/man/Xext/dbe/XdbeDeal.man:3.7 --- xc/doc/man/Xext/dbe/XdbeDeal.man:3.6 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/dbe/XdbeDeal.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XdbeDeal.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ -.\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. .\" -.\" $XFree86: xc/doc/man/Xext/dbe/XdbeDeal.man,v 3.6 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeDeal.man,v 3.7 2006/01/09 14:56:18 dawes Exp $ .\" .TH XdbeDeallocateBackBufferName 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xext/dbe/XdbeEndI.man diff -u xc/doc/man/Xext/dbe/XdbeEndI.man:3.6 xc/doc/man/Xext/dbe/XdbeEndI.man:3.7 --- xc/doc/man/Xext/dbe/XdbeEndI.man:3.6 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/dbe/XdbeEndI.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XdbeEndI.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ -.\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. .\" -.\" $XFree86: xc/doc/man/Xext/dbe/XdbeEndI.man,v 3.6 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeEndI.man,v 3.7 2006/01/09 14:56:18 dawes Exp $ .\" .TH XdbeEndIdiom 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xext/dbe/XdbeFree.man diff -u xc/doc/man/Xext/dbe/XdbeFree.man:3.6 xc/doc/man/Xext/dbe/XdbeFree.man:3.7 --- xc/doc/man/Xext/dbe/XdbeFree.man:3.6 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/dbe/XdbeFree.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XdbeFree.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ -.\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. .\" -.\" $XFree86: xc/doc/man/Xext/dbe/XdbeFree.man,v 3.6 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeFree.man,v 3.7 2006/01/09 14:56:18 dawes Exp $ .\" .TH XdbeFreeVisualInfo 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xext/dbe/XdbeGetB.man diff -u xc/doc/man/Xext/dbe/XdbeGetB.man:3.6 xc/doc/man/Xext/dbe/XdbeGetB.man:3.7 --- xc/doc/man/Xext/dbe/XdbeGetB.man:3.6 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/dbe/XdbeGetB.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XdbeGetB.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ -.\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. .\" -.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetB.man,v 3.6 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetB.man,v 3.7 2006/01/09 14:56:18 dawes Exp $ .\" .TH XdbeGetBackBufferAttributes 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xext/dbe/XdbeGetV.man diff -u xc/doc/man/Xext/dbe/XdbeGetV.man:3.7 xc/doc/man/Xext/dbe/XdbeGetV.man:3.8 --- xc/doc/man/Xext/dbe/XdbeGetV.man:3.7 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/dbe/XdbeGetV.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XdbeGetV.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ -.\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. .\" -.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetV.man,v 3.7 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeGetV.man,v 3.8 2006/01/09 14:56:18 dawes Exp $ .\" .TH XdbeGetVisualInfo 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xext/dbe/XdbeQuer.man diff -u xc/doc/man/Xext/dbe/XdbeQuer.man:3.6 xc/doc/man/Xext/dbe/XdbeQuer.man:3.7 --- xc/doc/man/Xext/dbe/XdbeQuer.man:3.6 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/dbe/XdbeQuer.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XdbeQuer.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ -.\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. .\" -.\" $XFree86: xc/doc/man/Xext/dbe/XdbeQuer.man,v 3.6 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeQuer.man,v 3.7 2006/01/09 14:56:18 dawes Exp $ .\" .TH XdbeQueryExtension 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xext/dbe/XdbeSwap.man diff -u xc/doc/man/Xext/dbe/XdbeSwap.man:3.7 xc/doc/man/Xext/dbe/XdbeSwap.man:3.8 --- xc/doc/man/Xext/dbe/XdbeSwap.man:3.7 Thu Feb 10 22:03:02 2005 +++ xc/doc/man/Xext/dbe/XdbeSwap.man Mon Jan 9 09:56:18 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XdbeSwap.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ -.\" .\" Copyright (c) 1995 Hewlett-Packard Company .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" Hewlett-Packard Company. .\" -.\" $XFree86: xc/doc/man/Xext/dbe/XdbeSwap.man,v 3.7 2005/02/11 03:03:02 dawes Exp $ +.\" $XFree86: xc/doc/man/Xext/dbe/XdbeSwap.man,v 3.8 2006/01/09 14:56:18 dawes Exp $ .\" .TH XdbeSwapBuffers 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XAllDvEv.man diff -u xc/doc/man/Xi/XAllDvEv.man:1.4 xc/doc/man/Xi/XAllDvEv.man:1.5 --- xc/doc/man/Xi/XAllDvEv.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XAllDvEv.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XAllDvEv.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XAllDvEv.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XAllDvEv.man,v 1.3 2000/08/17 19:41:55 cpqbld Exp $ .ds xL Programming With Xlib .TH XAllowDeviceEvents 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XChDCtl.man diff -u xc/doc/man/Xi/XChDCtl.man:1.4 xc/doc/man/Xi/XChDCtl.man:1.5 --- xc/doc/man/Xi/XChDCtl.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XChDCtl.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XChDCtl.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XChDCtl.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XChDCtl.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming With Xlib .TH XGetDeviceControl 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XChFCtl.man diff -u xc/doc/man/Xi/XChFCtl.man:1.4 xc/doc/man/Xi/XChFCtl.man:1.5 --- xc/doc/man/Xi/XChFCtl.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XChFCtl.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XChFCtl.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XChFCtl.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XChFCtl.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming With Xlib .TH XGetFeedbackControl 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XChKMap.man diff -u xc/doc/man/Xi/XChKMap.man:1.4 xc/doc/man/Xi/XChKMap.man:1.5 --- xc/doc/man/Xi/XChKMap.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XChKMap.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XChKMap.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XChKMap.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XChKMap.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming with Xlib .TH XGetDeviceKeyMapping 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XChMMap.man diff -u xc/doc/man/Xi/XChMMap.man:1.4 xc/doc/man/Xi/XChMMap.man:1.5 --- xc/doc/man/Xi/XChMMap.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XChMMap.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XChMMap.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XChMMap.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XChMMap.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming With Xlib .TH XGetDeviceModifierMapping 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XChProp.man diff -u xc/doc/man/Xi/XChProp.man:1.4 xc/doc/man/Xi/XChProp.man:1.5 --- xc/doc/man/Xi/XChProp.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XChProp.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XChProp.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XChProp.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XChProp.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming With Xlib .TH XChangeDeviceDontPropagateList 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XChgKbd.man diff -u xc/doc/man/Xi/XChgKbd.man:1.4 xc/doc/man/Xi/XChgKbd.man:1.5 --- xc/doc/man/Xi/XChgKbd.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XChgKbd.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XChgKbd.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XChgKbd.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XChgKbd.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming With Xlib .TH XChangeKeyboardDevice 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XChgPtr.man diff -u xc/doc/man/Xi/XChgPtr.man:1.4 xc/doc/man/Xi/XChgPtr.man:1.5 --- xc/doc/man/Xi/XChgPtr.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XChgPtr.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XChgPtr.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XChgPtr.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XChgPtr.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming With Xlib .TH XChangePointerDevice 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XDevBell.man diff -u xc/doc/man/Xi/XDevBell.man:1.4 xc/doc/man/Xi/XDevBell.man:1.5 --- xc/doc/man/Xi/XDevBell.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XDevBell.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XDevBell.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XDevBell.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XDevBell.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming With Xlib .TH XDeviceBell 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XGetDvMo.man diff -u xc/doc/man/Xi/XGetDvMo.man:1.4 xc/doc/man/Xi/XGetDvMo.man:1.5 --- xc/doc/man/Xi/XGetDvMo.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XGetDvMo.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XGetDvMo.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XGetDvMo.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XGetDvMo.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming with Xlib .TH XGetDeviceMotionEvents 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XGetExtV.man diff -u xc/doc/man/Xi/XGetExtV.man:1.4 xc/doc/man/Xi/XGetExtV.man:1.5 --- xc/doc/man/Xi/XGetExtV.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XGetExtV.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XGetExtV.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XGetExtV.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XGetExtV.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming With Xlib .TH XGetExtensionVersion 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XGrDvBut.man diff -u xc/doc/man/Xi/XGrDvBut.man:1.4 xc/doc/man/Xi/XGrDvBut.man:1.5 --- xc/doc/man/Xi/XGrDvBut.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XGrDvBut.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XGrDvBut.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XGrDvBut.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XGrDvBut.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming With Xlib .TH XGrabDeviceButton 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XGrDvKey.man diff -u xc/doc/man/Xi/XGrDvKey.man:1.4 xc/doc/man/Xi/XGrDvKey.man:1.5 --- xc/doc/man/Xi/XGrDvKey.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XGrDvKey.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XGrDvKey.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XGrDvKey.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XGrDvKey.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming with Xlib .TH XGrabDeviceKey 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XGrabDev.man diff -u xc/doc/man/Xi/XGrabDev.man:1.4 xc/doc/man/Xi/XGrabDev.man:1.5 --- xc/doc/man/Xi/XGrabDev.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XGrabDev.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XGrabDev.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XGrabDev.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XGrabDev.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming With Xlib .TH XGrabDevice 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XListDev.man diff -u xc/doc/man/Xi/XListDev.man:1.4 xc/doc/man/Xi/XListDev.man:1.5 --- xc/doc/man/Xi/XListDev.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XListDev.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XListDev.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XListDev.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XListDev.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming with Xlib .TH XListInputDevices 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XOpenDev.man diff -u xc/doc/man/Xi/XOpenDev.man:1.4 xc/doc/man/Xi/XOpenDev.man:1.5 --- xc/doc/man/Xi/XOpenDev.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XOpenDev.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XOpenDev.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XOpenDev.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XOpenDev.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming with Xlib .TH XOpenDevice 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XQueryDv.man diff -u xc/doc/man/Xi/XQueryDv.man:1.4 xc/doc/man/Xi/XQueryDv.man:1.5 --- xc/doc/man/Xi/XQueryDv.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XQueryDv.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XQueryDv.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XQueryDv.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XQueryDv.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming with Xlib .TH XQueryDeviceState 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XSExEvnt.man diff -u xc/doc/man/Xi/XSExEvnt.man:1.5 xc/doc/man/Xi/XSExEvnt.man:1.6 --- xc/doc/man/Xi/XSExEvnt.man:1.5 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XSExEvnt.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XSExEvnt.man,v 1.5 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XSExEvnt.man,v 1.6 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XSExEvnt.man,v 1.3 2000/08/17 19:41:56 cpqbld Exp $ .ds xL Programming with Xlib .TH XSendExtensionEvent 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XSeBMap.man diff -u xc/doc/man/Xi/XSeBMap.man:1.4 xc/doc/man/Xi/XSeBMap.man:1.5 --- xc/doc/man/Xi/XSeBMap.man:1.4 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XSeBMap.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XSeBMap.man,v 1.4 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XSeBMap.man,v 1.5 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XSeBMap.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .ds xL Programming With Xlib .TH XSetDeviceButtonMapping 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XSeDvFoc.man diff -u xc/doc/man/Xi/XSeDvFoc.man:1.3 xc/doc/man/Xi/XSeDvFoc.man:1.4 --- xc/doc/man/Xi/XSeDvFoc.man:1.3 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XSeDvFoc.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XSeDvFoc.man,v 1.3 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XSeDvFoc.man,v 1.4 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XSeDvFoc.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .ds xL Programming with Xlib .TH XSetDeviceFocus 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XSelExtEv.man diff -u xc/doc/man/Xi/XSelExtEv.man:1.3 xc/doc/man/Xi/XSelExtEv.man:1.4 --- xc/doc/man/Xi/XSelExtEv.man:1.3 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XSelExtEv.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XSelExtEv.man,v 1.3 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XSelExtEv.man,v 1.4 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XSelExtEv.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .ds xL Programming with Xlib .TH XSelectExtensionEvent 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XSetDVal.man diff -u xc/doc/man/Xi/XSetDVal.man:1.3 xc/doc/man/Xi/XSetDVal.man:1.4 --- xc/doc/man/Xi/XSetDVal.man:1.3 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XSetDVal.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XSetDVal.man,v 1.3 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XSetDVal.man,v 1.4 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XSetDVal.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .ds xL Programming with Xlib .TH XSetDeviceValuators 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xi/XSetMode.man diff -u xc/doc/man/Xi/XSetMode.man:1.3 xc/doc/man/Xi/XSetMode.man:1.4 --- xc/doc/man/Xi/XSetMode.man:1.3 Thu Feb 10 22:03:03 2005 +++ xc/doc/man/Xi/XSetMode.man Mon Jan 9 09:56:19 2006 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/doc/man/Xi/XSetMode.man,v 1.3 2005/02/11 03:03:03 dawes Exp $ +.\" $XFree86: xc/doc/man/Xi/XSetMode.man,v 1.4 2006/01/09 14:56:19 dawes Exp $ .\" .\" .\" Copyright ([\d,\s]*) by Hewlett-Packard Company, Ardent Computer, @@ -11,7 +11,6 @@ .\" suitability for any purpose of the information in this document. It is .\" provided \`\`as is'' without express or implied warranty. .\" -.\" $Xorg: XSetMode.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ .ds xL Programming with Xlib .TH XSetDeviceMode 3X11 __vendorversion__ "X FUNCTIONS" .SH NAME Index: xc/doc/man/Xt/Imakefile diff -u xc/doc/man/Xt/Imakefile:3.6 xc/doc/man/Xt/Imakefile:3.7 --- xc/doc/man/Xt/Imakefile:3.6 Thu Nov 1 18:35:25 2001 +++ xc/doc/man/Xt/Imakefile Mon Jan 9 09:56:20 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ - - - -XCOMM $XFree86: xc/doc/man/Xt/Imakefile,v 3.6 2001/11/01 23:35:25 dawes Exp $ +XCOMM $XFree86: xc/doc/man/Xt/Imakefile,v 3.7 2006/01/09 14:56:20 dawes Exp $ MANDIR = $(LIBMANDIR) MANSUFFIX = $(LIBMANSUFFIX) Index: xc/doc/man/Xt/XtActHook.man diff -u xc/doc/man/Xt/XtActHook.man:1.5 xc/doc/man/Xt/XtActHook.man:1.6 --- xc/doc/man/Xt/XtActHook.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtActHook.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtActHook.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtActHook.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtActHook.man,v 1.6 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAddAct.man diff -u xc/doc/man/Xt/XtAddAct.man:1.4 xc/doc/man/Xt/XtAddAct.man:1.5 --- xc/doc/man/Xt/XtAddAct.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAddAct.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAddAct.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealing in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAddAct.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAddAct.man,v 1.5 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAddCbk.man diff -u xc/doc/man/Xt/XtAddCbk.man:1.5 xc/doc/man/Xt/XtAddCbk.man:1.6 --- xc/doc/man/Xt/XtAddCbk.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAddCbk.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAddCbk.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealing in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAddCbk.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAddCbk.man,v 1.6 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAddEHand.man diff -u xc/doc/man/Xt/XtAddEHand.man:1.5 xc/doc/man/Xt/XtAddEHand.man:1.6 --- xc/doc/man/Xt/XtAddEHand.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAddEHand.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAddEHand.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAddEHand.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAddEHand.man,v 1.6 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAddETReg.man diff -u xc/doc/man/Xt/XtAddETReg.man:1.4 xc/doc/man/Xt/XtAddETReg.man:1.5 --- xc/doc/man/Xt/XtAddETReg.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAddETReg.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAddETReg.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAddETReg.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAddETReg.man,v 1.5 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAddGrab.man diff -u xc/doc/man/Xt/XtAddGrab.man:1.4 xc/doc/man/Xt/XtAddGrab.man:1.5 --- xc/doc/man/Xt/XtAddGrab.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAddGrab.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAddGrab.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAddGrab.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAddGrab.man,v 1.5 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAddIn.man diff -u xc/doc/man/Xt/XtAddIn.man:1.5 xc/doc/man/Xt/XtAddIn.man:1.6 --- xc/doc/man/Xt/XtAddIn.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAddIn.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAddIn.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAddIn.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAddIn.man,v 1.6 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAllocGC.man diff -u xc/doc/man/Xt/XtAllocGC.man:1.5 xc/doc/man/Xt/XtAllocGC.man:1.6 --- xc/doc/man/Xt/XtAllocGC.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAllocGC.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAllocGC.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAllocGC.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAllocGC.man,v 1.6 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppAAct.man diff -u xc/doc/man/Xt/XtAppAAct.man:1.4 xc/doc/man/Xt/XtAppAAct.man:1.5 --- xc/doc/man/Xt/XtAppAAct.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppAAct.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppAAct.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppAAct.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppAAct.man,v 1.5 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppAC.man diff -u xc/doc/man/Xt/XtAppAC.man:1.5 xc/doc/man/Xt/XtAppAC.man:1.6 --- xc/doc/man/Xt/XtAppAC.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppAC.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppAC.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppAC.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppAC.man,v 1.6 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppAI.man diff -u xc/doc/man/Xt/XtAppAI.man:1.7 xc/doc/man/Xt/XtAppAI.man:1.8 --- xc/doc/man/Xt/XtAppAI.man:1.7 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppAI.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppAI.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,7 +23,7 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. -.\" $XFree86: xc/doc/man/Xt/XtAppAI.man,v 1.7 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppAI.man,v 1.8 2006/01/09 14:56:20 dawes Exp $ .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics Index: xc/doc/man/Xt/XtAppASig.man diff -u xc/doc/man/Xt/XtAppASig.man:1.4 xc/doc/man/Xt/XtAppASig.man:1.5 --- xc/doc/man/Xt/XtAppASig.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppASig.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppASig.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppASig.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppASig.man,v 1.5 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppATO.man diff -u xc/doc/man/Xt/XtAppATO.man:1.5 xc/doc/man/Xt/XtAppATO.man:1.6 --- xc/doc/man/Xt/XtAppATO.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppATO.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppATO.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppATO.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppATO.man,v 1.6 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppAWP.man diff -u xc/doc/man/Xt/XtAppAWP.man:1.4 xc/doc/man/Xt/XtAppAWP.man:1.5 --- xc/doc/man/Xt/XtAppAWP.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppAWP.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppAWP.man,v 1.3 2000/08/17 19:41:57 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppAWP.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppAWP.man,v 1.5 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppCSh.man diff -u xc/doc/man/Xt/XtAppCSh.man:1.5 xc/doc/man/Xt/XtAppCSh.man:1.6 --- xc/doc/man/Xt/XtAppCSh.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppCSh.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppCSh.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppCSh.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppCSh.man,v 1.6 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppE.man diff -u xc/doc/man/Xt/XtAppE.man:1.5 xc/doc/man/Xt/XtAppE.man:1.6 --- xc/doc/man/Xt/XtAppE.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppE.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppE.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppE.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppE.man,v 1.6 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppEM.man diff -u xc/doc/man/Xt/XtAppEM.man:1.5 xc/doc/man/Xt/XtAppEM.man:1.6 --- xc/doc/man/Xt/XtAppEM.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppEM.man Mon Jan 9 09:56:20 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppEM.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppEM.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppEM.man,v 1.6 2006/01/09 14:56:20 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppGEDB.man diff -u xc/doc/man/Xt/XtAppGEDB.man:1.4 xc/doc/man/Xt/XtAppGEDB.man:1.5 --- xc/doc/man/Xt/XtAppGEDB.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppGEDB.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppGEDB.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppGEDB.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppGEDB.man,v 1.5 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppGSTO.man diff -u xc/doc/man/Xt/XtAppGSTO.man:1.4 xc/doc/man/Xt/XtAppGSTO.man:1.5 --- xc/doc/man/Xt/XtAppGSTO.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppGSTO.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppGSTO.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppGSTO.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppGSTO.man,v 1.5 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppInit.man diff -u xc/doc/man/Xt/XtAppInit.man:1.7 xc/doc/man/Xt/XtAppInit.man:1.8 --- xc/doc/man/Xt/XtAppInit.man:1.7 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppInit.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppInit.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppInit.man,v 1.7 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppInit.man,v 1.8 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppLock.man diff -u xc/doc/man/Xt/XtAppLock.man:1.4 xc/doc/man/Xt/XtAppLock.man:1.5 --- xc/doc/man/Xt/XtAppLock.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppLock.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppLock.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppLock.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppLock.man,v 1.5 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppNEv.man diff -u xc/doc/man/Xt/XtAppNEv.man:1.7 xc/doc/man/Xt/XtAppNEv.man:1.8 --- xc/doc/man/Xt/XtAppNEv.man:1.7 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppNEv.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppNEv.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,7 +23,7 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from the X Consortium. -.\" $XFree86: xc/doc/man/Xt/XtAppNEv.man,v 1.7 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppNEv.man,v 1.8 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppRCR.man diff -u xc/doc/man/Xt/XtAppRCR.man:1.4 xc/doc/man/Xt/XtAppRCR.man:1.5 --- xc/doc/man/Xt/XtAppRCR.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppRCR.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppRCR.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppRCR.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppRCR.man,v 1.5 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppSEF.man diff -u xc/doc/man/Xt/XtAppSEF.man:1.4 xc/doc/man/Xt/XtAppSEF.man:1.5 --- xc/doc/man/Xt/XtAppSEF.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppSEF.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppSEF.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppSEF.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppSEF.man,v 1.5 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppSTC.man diff -u xc/doc/man/Xt/XtAppSTC.man:1.5 xc/doc/man/Xt/XtAppSTC.man:1.6 --- xc/doc/man/Xt/XtAppSTC.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppSTC.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppSTC.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppSTC.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppSTC.man,v 1.6 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtAppSetFR.man diff -u xc/doc/man/Xt/XtAppSetFR.man:1.8 xc/doc/man/Xt/XtAppSetFR.man:1.9 --- xc/doc/man/Xt/XtAppSetFR.man:1.8 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtAppSetFR.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtAppSetFR.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtAppSetFR.man,v 1.8 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtAppSetFR.man,v 1.9 2006/01/09 14:56:21 dawes Exp $ .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface .ds xI Intrinsics Index: xc/doc/man/Xt/XtBEMask.man diff -u xc/doc/man/Xt/XtBEMask.man:1.4 xc/doc/man/Xt/XtBEMask.man:1.5 --- xc/doc/man/Xt/XtBEMask.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtBEMask.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtBEMask.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtBEMask.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtBEMask.man,v 1.5 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtBlockH.man diff -u xc/doc/man/Xt/XtBlockH.man:1.5 xc/doc/man/Xt/XtBlockH.man:1.6 --- xc/doc/man/Xt/XtBlockH.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtBlockH.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtBlockH.man,v 1.3 2000/08/17 19:41:58 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtBlockH.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtBlockH.man,v 1.6 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtCallAFoc.man diff -u xc/doc/man/Xt/XtCallAFoc.man:1.4 xc/doc/man/Xt/XtCallAFoc.man:1.5 --- xc/doc/man/Xt/XtCallAFoc.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtCallAFoc.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtCallAFoc.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtCallAFoc.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtCallAFoc.man,v 1.5 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtCallActP.man diff -u xc/doc/man/Xt/XtCallActP.man:1.5 xc/doc/man/Xt/XtCallActP.man:1.6 --- xc/doc/man/Xt/XtCallActP.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtCallActP.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtCallActP.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtCallActP.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtCallActP.man,v 1.6 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtCallCbks.man diff -u xc/doc/man/Xt/XtCallCbks.man:1.5 xc/doc/man/Xt/XtCallCbks.man:1.6 --- xc/doc/man/Xt/XtCallCbks.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtCallCbks.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtCallCbks.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtCallCbks.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtCallCbks.man,v 1.6 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtClass.man diff -u xc/doc/man/Xt/XtClass.man:1.4 xc/doc/man/Xt/XtClass.man:1.5 --- xc/doc/man/Xt/XtClass.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtClass.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtClass.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtClass.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtClass.man,v 1.5 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtClickT.man diff -u xc/doc/man/Xt/XtClickT.man:1.4 xc/doc/man/Xt/XtClickT.man:1.5 --- xc/doc/man/Xt/XtClickT.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtClickT.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtClickT.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtClickT.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtClickT.man,v 1.5 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtConfWid.man diff -u xc/doc/man/Xt/XtConfWid.man:1.5 xc/doc/man/Xt/XtConfWid.man:1.6 --- xc/doc/man/Xt/XtConfWid.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtConfWid.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtConfWid.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtConfWid.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtConfWid.man,v 1.6 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtConvSt.man diff -u xc/doc/man/Xt/XtConvSt.man:1.6 xc/doc/man/Xt/XtConvSt.man:1.7 --- xc/doc/man/Xt/XtConvSt.man:1.6 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtConvSt.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtConvSt.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtConvSt.man,v 1.6 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtConvSt.man,v 1.7 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtConvert.man diff -u xc/doc/man/Xt/XtConvert.man:1.5 xc/doc/man/Xt/XtConvert.man:1.6 --- xc/doc/man/Xt/XtConvert.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtConvert.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtConvert.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtConvert.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtConvert.man,v 1.6 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtCreACon.man diff -u xc/doc/man/Xt/XtCreACon.man:1.5 xc/doc/man/Xt/XtCreACon.man:1.6 --- xc/doc/man/Xt/XtCreACon.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtCreACon.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtCreACon.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtCreACon.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtCreACon.man,v 1.6 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtCreASh.man diff -u xc/doc/man/Xt/XtCreASh.man:1.5 xc/doc/man/Xt/XtCreASh.man:1.6 --- xc/doc/man/Xt/XtCreASh.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtCreASh.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtCreASh.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtCreASh.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtCreASh.man,v 1.6 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtCrePSh.man diff -u xc/doc/man/Xt/XtCrePSh.man:1.5 xc/doc/man/Xt/XtCrePSh.man:1.6 --- xc/doc/man/Xt/XtCrePSh.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtCrePSh.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtCrePSh.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtCrePSh.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtCrePSh.man,v 1.6 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtCreWid.man diff -u xc/doc/man/Xt/XtCreWid.man:1.5 xc/doc/man/Xt/XtCreWid.man:1.6 --- xc/doc/man/Xt/XtCreWid.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtCreWid.man Mon Jan 9 09:56:21 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtCreWid.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtCreWid.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtCreWid.man,v 1.6 2006/01/09 14:56:21 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtCreWin.man diff -u xc/doc/man/Xt/XtCreWin.man:1.5 xc/doc/man/Xt/XtCreWin.man:1.6 --- xc/doc/man/Xt/XtCreWin.man:1.5 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtCreWin.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtCreWin.man,v 1.3 2000/08/17 19:41:59 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtCreWin.man,v 1.5 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtCreWin.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtCreateSR.man diff -u xc/doc/man/Xt/XtCreateSR.man:1.4 xc/doc/man/Xt/XtCreateSR.man:1.5 --- xc/doc/man/Xt/XtCreateSR.man:1.4 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtCreateSR.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtCreateSR.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtCreateSR.man,v 1.4 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtCreateSR.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtDStrCW.man diff -u xc/doc/man/Xt/XtDStrCW.man:1.6 xc/doc/man/Xt/XtDStrCW.man:1.7 --- xc/doc/man/Xt/XtDStrCW.man:1.6 Thu Feb 10 22:03:04 2005 +++ xc/doc/man/Xt/XtDStrCW.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtDStrCW.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealing in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtDStrCW.man,v 1.6 2005/02/11 03:03:04 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtDStrCW.man,v 1.7 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtDisACon.man diff -u xc/doc/man/Xt/XtDisACon.man:1.4 xc/doc/man/Xt/XtDisACon.man:1.5 --- xc/doc/man/Xt/XtDisACon.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtDisACon.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtDisACon.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtDisACon.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtDisACon.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtDisplay.man diff -u xc/doc/man/Xt/XtDisplay.man:1.4 xc/doc/man/Xt/XtDisplay.man:1.5 --- xc/doc/man/Xt/XtDisplay.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtDisplay.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtDisplay.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtDisplay.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtDisplay.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtDisplayI.man diff -u xc/doc/man/Xt/XtDisplayI.man:1.5 xc/doc/man/Xt/XtDisplayI.man:1.6 --- xc/doc/man/Xt/XtDisplayI.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtDisplayI.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtDisplayI.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtDisplayI.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtDisplayI.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtErr.man diff -u xc/doc/man/Xt/XtErr.man:1.5 xc/doc/man/Xt/XtErr.man:1.6 --- xc/doc/man/Xt/XtErr.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtErr.man Mon Sep 12 22:02:23 2005 @@ -1,4 +1,3 @@ -.\" $Xorg: XtErr.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994 X Consortium .\" @@ -25,7 +24,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtErr.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtErr.man,v 1.6 2005/09/13 02:02:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -165,7 +164,7 @@ .ZN XtAppSetWarningHandler . .LP The -.ZN XtAppWarning +.ZN XtWarning function has been superceded by .ZN XtAppWarning . .SH "SEE ALSO" Index: xc/doc/man/Xt/XtErrM.man diff -u xc/doc/man/Xt/XtErrM.man:1.5 xc/doc/man/Xt/XtErrM.man:1.6 --- xc/doc/man/Xt/XtErrM.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtErrM.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtErrM.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtErrM.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtErrM.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtExtEvDis.man diff -u xc/doc/man/Xt/XtExtEvDis.man:1.5 xc/doc/man/Xt/XtExtEvDis.man:1.6 --- xc/doc/man/Xt/XtExtEvDis.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtExtEvDis.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtExtEvDis.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtExtEvDis.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtExtEvDis.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtFindF.man diff -u xc/doc/man/Xt/XtFindF.man:1.6 xc/doc/man/Xt/XtFindF.man:1.7 --- xc/doc/man/Xt/XtFindF.man:1.6 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtFindF.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtFindF.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtFindF.man,v 1.6 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtFindF.man,v 1.7 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGEDB.man diff -u xc/doc/man/Xt/XtGEDB.man:1.5 xc/doc/man/Xt/XtGEDB.man:1.6 --- xc/doc/man/Xt/XtGEDB.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGEDB.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGEDB.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGEDB.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGEDB.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetANC.man diff -u xc/doc/man/Xt/XtGetANC.man:1.5 xc/doc/man/Xt/XtGetANC.man:1.6 --- xc/doc/man/Xt/XtGetANC.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetANC.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetANC.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetANC.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetANC.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetActK.man diff -u xc/doc/man/Xt/XtGetActK.man:1.4 xc/doc/man/Xt/XtGetActK.man:1.5 --- xc/doc/man/Xt/XtGetActK.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetActK.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetActK.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetActK.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetActK.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetActL.man diff -u xc/doc/man/Xt/XtGetActL.man:1.5 xc/doc/man/Xt/XtGetActL.man:1.6 --- xc/doc/man/Xt/XtGetActL.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetActL.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetActL.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetActL.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetActL.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetAres.man diff -u xc/doc/man/Xt/XtGetAres.man:1.5 xc/doc/man/Xt/XtGetAres.man:1.6 --- xc/doc/man/Xt/XtGetAres.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetAres.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetAres.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetAres.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetAres.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetClExt.man diff -u xc/doc/man/Xt/XtGetClExt.man:1.5 xc/doc/man/Xt/XtGetClExt.man:1.6 --- xc/doc/man/Xt/XtGetClExt.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetClExt.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetClExt.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetClExt.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetClExt.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetDisp.man diff -u xc/doc/man/Xt/XtGetDisp.man:1.4 xc/doc/man/Xt/XtGetDisp.man:1.5 --- xc/doc/man/Xt/XtGetDisp.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetDisp.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetDisp.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetDisp.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetDisp.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetGC.man diff -u xc/doc/man/Xt/XtGetGC.man:1.4 xc/doc/man/Xt/XtGetGC.man:1.5 --- xc/doc/man/Xt/XtGetGC.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetGC.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetGC.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetGC.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetGC.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetKFoc.man diff -u xc/doc/man/Xt/XtGetKFoc.man:1.4 xc/doc/man/Xt/XtGetKFoc.man:1.5 --- xc/doc/man/Xt/XtGetKFoc.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetKFoc.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetKFoc.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetKFoc.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetKFoc.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetRList.man diff -u xc/doc/man/Xt/XtGetRList.man:1.5 xc/doc/man/Xt/XtGetRList.man:1.6 --- xc/doc/man/Xt/XtGetRList.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetRList.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetRList.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetRList.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetRList.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetSP.man diff -u xc/doc/man/Xt/XtGetSP.man:1.6 xc/doc/man/Xt/XtGetSP.man:1.7 --- xc/doc/man/Xt/XtGetSP.man:1.6 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetSP.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetSP.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetSP.man,v 1.6 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetSP.man,v 1.7 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetSR.man diff -u xc/doc/man/Xt/XtGetSR.man:1.5 xc/doc/man/Xt/XtGetSR.man:1.6 --- xc/doc/man/Xt/XtGetSR.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetSR.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetSR.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetSR.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetSR.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetSTO.man diff -u xc/doc/man/Xt/XtGetSTO.man:1.4 xc/doc/man/Xt/XtGetSTO.man:1.5 --- xc/doc/man/Xt/XtGetSTO.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetSTO.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetSTO.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetSTO.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetSTO.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetSVal.man diff -u xc/doc/man/Xt/XtGetSVal.man:1.5 xc/doc/man/Xt/XtGetSVal.man:1.6 --- xc/doc/man/Xt/XtGetSVal.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetSVal.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetSVal.man,v 1.3 2000/08/17 19:42:00 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealing in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetSVal.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetSVal.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetSValI.man diff -u xc/doc/man/Xt/XtGetSValI.man:1.6 xc/doc/man/Xt/XtGetSValI.man:1.7 --- xc/doc/man/Xt/XtGetSValI.man:1.6 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetSValI.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetSValI.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetSValI.man,v 1.6 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetSValI.man,v 1.7 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGetSres.man diff -u xc/doc/man/Xt/XtGetSres.man:1.5 xc/doc/man/Xt/XtGetSres.man:1.6 --- xc/doc/man/Xt/XtGetSres.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGetSres.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGetSres.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGetSres.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGetSres.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtGrabKey.man diff -u xc/doc/man/Xt/XtGrabKey.man:1.5 xc/doc/man/Xt/XtGrabKey.man:1.6 --- xc/doc/man/Xt/XtGrabKey.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtGrabKey.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtGrabKey.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtGrabKey.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtGrabKey.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtHookOD.man diff -u xc/doc/man/Xt/XtHookOD.man:1.4 xc/doc/man/Xt/XtHookOD.man:1.5 --- xc/doc/man/Xt/XtHookOD.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtHookOD.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtHookOD.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtHookOD.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtHookOD.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtInit.man diff -u xc/doc/man/Xt/XtInit.man:1.5 xc/doc/man/Xt/XtInit.man:1.7 --- xc/doc/man/Xt/XtInit.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtInit.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtInit.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtInit.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtInit.man,v 1.7 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -161,7 +159,7 @@ with \fIdisplay_string\fP NULL and \fIapplication_name\fP NULL, and finally calls .ZN XtAppCreateShell -with \fIappcation_name\fP NULL, \fIwidget_class\fP +with \fIapplication_name\fP NULL, \fIwidget_class\fP .ZN applicationShellWidgetClass , and the specified \fIargs\fP and \fInum_args\fP and returns the created shell. The semantics of calling Index: xc/doc/man/Xt/XtInitWC.man diff -u xc/doc/man/Xt/XtInitWC.man:1.4 xc/doc/man/Xt/XtInitWC.man:1.5 --- xc/doc/man/Xt/XtInitWC.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtInitWC.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtInitWC.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtInitWC.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtInitWC.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtKeysym.man diff -u xc/doc/man/Xt/XtKeysym.man:1.5 xc/doc/man/Xt/XtKeysym.man:1.6 --- xc/doc/man/Xt/XtKeysym.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtKeysym.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtKeysym.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealing in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtKeysym.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtKeysym.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtLastProc.man diff -u xc/doc/man/Xt/XtLastProc.man:1.4 xc/doc/man/Xt/XtLastProc.man:1.5 --- xc/doc/man/Xt/XtLastProc.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtLastProc.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtLastProc.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtLastProc.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtLastProc.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtMakGReq.man diff -u xc/doc/man/Xt/XtMakGReq.man:1.5 xc/doc/man/Xt/XtMakGReq.man:1.6 --- xc/doc/man/Xt/XtMakGReq.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtMakGReq.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtMakGReq.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtMakGReq.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtMakGReq.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtMalloc.man diff -u xc/doc/man/Xt/XtMalloc.man:1.4 xc/doc/man/Xt/XtMalloc.man:1.5 --- xc/doc/man/Xt/XtMalloc.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtMalloc.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtMalloc.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtMalloc.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtMalloc.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtManChild.man diff -u xc/doc/man/Xt/XtManChild.man:1.5 xc/doc/man/Xt/XtManChild.man:1.6 --- xc/doc/man/Xt/XtManChild.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtManChild.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtManChild.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtManChild.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtManChild.man,v 1.6 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtMapWid.man diff -u xc/doc/man/Xt/XtMapWid.man:1.4 xc/doc/man/Xt/XtMapWid.man:1.5 --- xc/doc/man/Xt/XtMapWid.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtMapWid.man Mon Jan 9 09:56:22 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtMapWid.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtMapWid.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtMapWid.man,v 1.5 2006/01/09 14:56:22 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtName.man diff -u xc/doc/man/Xt/XtName.man:1.5 xc/doc/man/Xt/XtName.man:1.6 --- xc/doc/man/Xt/XtName.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtName.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtName.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtName.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtName.man,v 1.6 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtNameTWid.man diff -u xc/doc/man/Xt/XtNameTWid.man:1.4 xc/doc/man/Xt/XtNameTWid.man:1.5 --- xc/doc/man/Xt/XtNameTWid.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtNameTWid.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtNameTWid.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtNameTWid.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtNameTWid.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtNextEv.man diff -u xc/doc/man/Xt/XtNextEv.man:1.7 xc/doc/man/Xt/XtNextEv.man:1.8 --- xc/doc/man/Xt/XtNextEv.man:1.7 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtNextEv.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtNextEv.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealing in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtNextEv.man,v 1.7 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtNextEv.man,v 1.8 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtOffset.man diff -u xc/doc/man/Xt/XtOffset.man:1.4 xc/doc/man/Xt/XtOffset.man:1.5 --- xc/doc/man/Xt/XtOffset.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtOffset.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtOffset.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtOffset.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtOffset.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtOpenApp.man diff -u xc/doc/man/Xt/XtOpenApp.man:1.7 xc/doc/man/Xt/XtOpenApp.man:1.8 --- xc/doc/man/Xt/XtOpenApp.man:1.7 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtOpenApp.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtOpenApp.man,v 1.3 2000/08/17 19:42:01 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtOpenApp.man,v 1.7 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtOpenApp.man,v 1.8 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtOwnSel.man diff -u xc/doc/man/Xt/XtOwnSel.man:1.5 xc/doc/man/Xt/XtOwnSel.man:1.6 --- xc/doc/man/Xt/XtOwnSel.man:1.5 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtOwnSel.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtOwnSel.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtOwnSel.man,v 1.5 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtOwnSel.man,v 1.6 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtParATab.man diff -u xc/doc/man/Xt/XtParATab.man:1.4 xc/doc/man/Xt/XtParATab.man:1.5 --- xc/doc/man/Xt/XtParATab.man:1.4 Thu Feb 10 22:03:05 2005 +++ xc/doc/man/Xt/XtParATab.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtParATab.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtParATab.man,v 1.4 2005/02/11 03:03:05 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtParATab.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtParTTab.man diff -u xc/doc/man/Xt/XtParTTab.man:1.4 xc/doc/man/Xt/XtParTTab.man:1.5 --- xc/doc/man/Xt/XtParTTab.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtParTTab.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtParTTab.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtParTTab.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtParTTab.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtParent.man diff -u xc/doc/man/Xt/XtParent.man:1.4 xc/doc/man/Xt/XtParent.man:1.5 --- xc/doc/man/Xt/XtParent.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtParent.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtParent.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtParent.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtParent.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtPopdown.man diff -u xc/doc/man/Xt/XtPopdown.man:1.4 xc/doc/man/Xt/XtPopdown.man:1.5 --- xc/doc/man/Xt/XtPopdown.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtPopdown.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtPopdown.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtPopdown.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtPopdown.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtPopup.man diff -u xc/doc/man/Xt/XtPopup.man:1.4 xc/doc/man/Xt/XtPopup.man:1.5 --- xc/doc/man/Xt/XtPopup.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtPopup.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtPopup.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtPopup.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtPopup.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtProcLock.man diff -u xc/doc/man/Xt/XtProcLock.man:1.4 xc/doc/man/Xt/XtProcLock.man:1.5 --- xc/doc/man/Xt/XtProcLock.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtProcLock.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtProcLock.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtProcLock.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtProcLock.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtQueryGeo.man diff -u xc/doc/man/Xt/XtQueryGeo.man:1.5 xc/doc/man/Xt/XtQueryGeo.man:1.6 --- xc/doc/man/Xt/XtQueryGeo.man:1.5 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtQueryGeo.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtQueryGeo.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtQueryGeo.man,v 1.5 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtQueryGeo.man,v 1.6 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtRealize.man diff -u xc/doc/man/Xt/XtRealize.man:1.4 xc/doc/man/Xt/XtRealize.man:1.5 --- xc/doc/man/Xt/XtRealize.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtRealize.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtRealize.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtRealize.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtRealize.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtRegDraw.man diff -u xc/doc/man/Xt/XtRegDraw.man:1.4 xc/doc/man/Xt/XtRegDraw.man:1.5 --- xc/doc/man/Xt/XtRegDraw.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtRegDraw.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtRegDraw.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtRegDraw.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtRegDraw.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtRegGA.man diff -u xc/doc/man/Xt/XtRegGA.man:1.5 xc/doc/man/Xt/XtRegGA.man:1.6 --- xc/doc/man/Xt/XtRegGA.man:1.5 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtRegGA.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtRegGA.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtRegGA.man,v 1.5 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtRegGA.man,v 1.6 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtResPA.man diff -u xc/doc/man/Xt/XtResPA.man:1.4 xc/doc/man/Xt/XtResPA.man:1.5 --- xc/doc/man/Xt/XtResPA.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtResPA.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtResPA.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtResPA.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtResPA.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtResPath.man diff -u xc/doc/man/Xt/XtResPath.man:1.7 xc/doc/man/Xt/XtResPath.man:1.8 --- xc/doc/man/Xt/XtResPath.man:1.7 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtResPath.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtResPath.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtResPath.man,v 1.7 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtResPath.man,v 1.8 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtSession.man diff -u xc/doc/man/Xt/XtSession.man:1.4 xc/doc/man/Xt/XtSession.man:1.5 --- xc/doc/man/Xt/XtSession.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtSession.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtSession.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtSession.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtSession.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtSetArg.man diff -u xc/doc/man/Xt/XtSetArg.man:1.5 xc/doc/man/Xt/XtSetArg.man:1.6 --- xc/doc/man/Xt/XtSetArg.man:1.5 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtSetArg.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtSetArg.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtSetArg.man,v 1.5 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtSetArg.man,v 1.6 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtSetKFoc.man diff -u xc/doc/man/Xt/XtSetKFoc.man:1.5 xc/doc/man/Xt/XtSetKFoc.man:1.6 --- xc/doc/man/Xt/XtSetKFoc.man:1.5 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtSetKFoc.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtSetKFoc.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtSetKFoc.man,v 1.5 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtSetKFoc.man,v 1.6 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtSetKTr.man diff -u xc/doc/man/Xt/XtSetKTr.man:1.5 xc/doc/man/Xt/XtSetKTr.man:1.6 --- xc/doc/man/Xt/XtSetKTr.man:1.5 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtSetKTr.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtSetKTr.man,v 1.3 2000/08/17 19:42:02 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtSetKTr.man,v 1.5 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtSetKTr.man,v 1.6 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtSetLangP.man diff -u xc/doc/man/Xt/XtSetLangP.man:1.6 xc/doc/man/Xt/XtSetLangP.man:1.7 --- xc/doc/man/Xt/XtSetLangP.man:1.6 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtSetLangP.man Mon Sep 12 22:02:23 2005 @@ -1,4 +1,3 @@ -.\" $Xorg: XtSetLangP.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ .\" .\" Copyright 1993 X Consortium .\" @@ -26,7 +25,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtSetLangP.man,v 1.6 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtSetLangP.man,v 1.7 2005/09/13 02:02:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface @@ -183,7 +182,7 @@ .IP \(bu 5 Returns the value of the current locale. On ANSI C-based systems this is the return value from a final call to -.ZN setlocal ( +.ZN setlocale ( .ZN LC_ALL , NULL ). .LP Index: xc/doc/man/Xt/XtSetSP.man diff -u xc/doc/man/Xt/XtSetSP.man:1.6 xc/doc/man/Xt/XtSetSP.man:1.7 --- xc/doc/man/Xt/XtSetSP.man:1.6 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtSetSP.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtSetSP.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtSetSP.man,v 1.6 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtSetSP.man,v 1.7 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtSetSens.man diff -u xc/doc/man/Xt/XtSetSens.man:1.4 xc/doc/man/Xt/XtSetSens.man:1.5 --- xc/doc/man/Xt/XtSetSens.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtSetSens.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtSetSens.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtSetSens.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtSetSens.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtSetVal.man diff -u xc/doc/man/Xt/XtSetVal.man:1.5 xc/doc/man/Xt/XtSetVal.man:1.6 --- xc/doc/man/Xt/XtSetVal.man:1.5 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtSetVal.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtSetVal.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtSetVal.man,v 1.5 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtSetVal.man,v 1.6 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtSetWMC.man diff -u xc/doc/man/Xt/XtSetWMC.man:1.4 xc/doc/man/Xt/XtSetWMC.man:1.5 --- xc/doc/man/Xt/XtSetWMC.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtSetWMC.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtSetWMC.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtSetWMC.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtSetWMC.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtStrCW.man diff -u xc/doc/man/Xt/XtStrCW.man:1.4 xc/doc/man/Xt/XtStrCW.man:1.5 --- xc/doc/man/Xt/XtStrCW.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtStrCW.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtStrCW.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtStrCW.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtStrCW.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtThreadI.man diff -u xc/doc/man/Xt/XtThreadI.man:1.4 xc/doc/man/Xt/XtThreadI.man:1.5 --- xc/doc/man/Xt/XtThreadI.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtThreadI.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtThreadI.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ -.\" .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining a @@ -25,7 +23,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtThreadI.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtThreadI.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtTransC.man diff -u xc/doc/man/Xt/XtTransC.man:1.5 xc/doc/man/Xt/XtTransC.man:1.6 --- xc/doc/man/Xt/XtTransC.man:1.5 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtTransC.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtTransC.man,v 1.3 2000/08/17 19:42:03 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtTransC.man,v 1.5 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtTransC.man,v 1.6 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/Xt/XtVaCrArgL.man diff -u xc/doc/man/Xt/XtVaCrArgL.man:1.4 xc/doc/man/Xt/XtVaCrArgL.man:1.5 --- xc/doc/man/Xt/XtVaCrArgL.man:1.4 Thu Feb 10 22:03:06 2005 +++ xc/doc/man/Xt/XtVaCrArgL.man Mon Jan 9 09:56:23 2006 @@ -1,5 +1,3 @@ -.\" $Xorg: XtVaCrArgL.man,v 1.3 2000/08/17 19:42:04 cpqbld Exp $ -.\" .\" Copyright 1993 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -26,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/Xt/XtVaCrArgL.man,v 1.4 2005/02/11 03:03:06 dawes Exp $ +.\" $XFree86: xc/doc/man/Xt/XtVaCrArgL.man,v 1.5 2006/01/09 14:56:23 dawes Exp $ .\" .ds tk X Toolkit .ds xT X Toolkit Intrinsics \- C Language Interface Index: xc/doc/man/general/Imakefile diff -u xc/doc/man/general/Imakefile:1.9 xc/doc/man/general/Imakefile:1.10 --- xc/doc/man/general/Imakefile:1.9 Thu Feb 10 22:03:10 2005 +++ xc/doc/man/general/Imakefile Mon Jan 9 09:56:26 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:42:04 cpqbld Exp $ - - - -XCOMM $XFree86: xc/doc/man/general/Imakefile,v 1.9 2005/02/11 03:03:10 dawes Exp $ +XCOMM $XFree86: xc/doc/man/general/Imakefile,v 1.10 2006/01/09 14:56:26 dawes Exp $ MANDIR = $(MISCMANDIR) MANSUFFIX = $(MISCMANSUFFIX) Index: xc/doc/man/general/Standards.man diff -u xc/doc/man/general/Standards.man:1.5 xc/doc/man/general/Standards.man:1.6 --- xc/doc/man/general/Standards.man:1.5 Thu Feb 10 22:03:10 2005 +++ xc/doc/man/general/Standards.man Tue Jul 5 12:43:55 2005 @@ -1,4 +1,3 @@ -.\" $Xorg: Standards.cpp,v 1.3 2000/08/17 19:42:04 cpqbld Exp $ .\" Copyright (c) 1993, 1994, 1996 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/doc/man/general/Standards.man,v 1.5 2005/02/11 03:03:10 dawes Exp $ +.\" $XFree86: xc/doc/man/general/Standards.man,v 1.6 2005/07/05 16:43:55 tsi Exp $ .\" .\" .TH XSTANDARDS __miscmansuffix__ __vendorversion__ @@ -109,14 +108,6 @@ X Version 11, Release 6.4 Jim Fulton -PEX Protocol Specification -Version 5.1 -Cheryl Huntington (architect), Paula Womack (editor) - -PEXlib Specification and C Language Binding -Version 5.1 -Jeff Stevenson - Inter-Client Exchange (ICE) Protocol Version 1.0 X Version 11, Release 6.4 @@ -147,11 +138,6 @@ X Version 11, Release 6.4 Tim Glauert, Dave Carver, Jim Gettys, David P. Wiggins -X Image Extension, Protocol Reference Manual -Version 5.0 -X Version 11, Release 6.4 -Bob Shelley - XTEST Extension Version 2.2 Kieron Drake @@ -232,23 +218,6 @@ Version 1.0 Rob Lembree -.SH "DRAFT STANDARDS" -The following documents are currently draft standards of the X Consortium. -.nf - -X Image Extension Library -Public Review Draft -Gary Rogers - -PEX Protocol Specification -Version 5.2 -Jeff Stevenson (architect), Jane Sczechowski (editor) - -PEXlib Specification and C Language Binding -Version 5.2 -Karl Schultz -.fi - .SH "INCLUDE FILES" The following include files are part of the Xlib standard. .PP @@ -305,16 +274,6 @@ .fi .PP -The following include files are part of the PEXlib standard. -.PP -.nf - - - - - -.fi -.PP The following include files are part of the ICElib standard. .PP .nf @@ -340,15 +299,6 @@ .fi .PP -The following include files are part of the XIElib draft standard. -.PP -.nf - - - - -.fi -.PP The following include file is part of the XTEST standard. .PP .nf Index: xc/doc/man/general/X.man diff -u xc/doc/man/general/X.man:1.10 xc/doc/man/general/X.man:1.11 --- xc/doc/man/general/X.man:1.10 Thu Feb 10 22:03:10 2005 +++ xc/doc/man/general/X.man Tue Jul 5 12:43:55 2005 @@ -1,4 +1,3 @@ -.\" $Xorg: X.cpp,v 1.3 2000/08/17 19:42:04 cpqbld Exp $ .\" Copyright (c) 1994 X Consortium .\" Copyright \(co 2000 The XFree86 Project, Inc. .\" @@ -25,7 +24,7 @@ .\" dealing in this Software without prior written authorization from the .\" X Consortium. .\" -.\" $XFree86: xc/doc/man/general/X.man,v 1.10 2005/02/11 03:03:10 dawes Exp $ +.\" $XFree86: xc/doc/man/general/X.man,v 1.11 2005/07/05 16:43:55 tsi Exp $ .\" .TH X __miscmansuffix__ __vendorversion__ .SH NAME @@ -94,7 +93,6 @@ a performance measurement utility, \fIx11perf\fP; a font compiler, \fIbdftopcf\fP; a font server and related utilities, \fIxfs\fP, \fIfsinfo\fP, \fIfslsfonts\fP, \fIfstobdf\fP; -an X Image Extension exerciser, \fIxieperf\fP; a display server and related utilities, \fIXserver\fP, \fIrgb\fP, \fImkfontdir\fP; remote execution utilities, \fIrstart\fP and \fIxon\fP; a clipboard manager, \fIxclipboard\fP; @@ -1254,7 +1252,6 @@ .BR xfs (1), .BR xfwp (1), .BR xhost (1), -.BR xieperf (1), .BR xinit (1), .BR xkbbell (1), .BR xkbcomp (1), Index: xc/doc/man/general/security.man diff -u xc/doc/man/general/security.man:1.6 xc/doc/man/general/security.man:1.7 --- xc/doc/man/general/security.man:1.6 Thu Feb 10 22:03:10 2005 +++ xc/doc/man/general/security.man Mon Jan 9 09:56:26 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: security.cpp,v 1.3 2000/08/17 19:42:05 cpqbld Exp $ .\" Copyright (c) 1993, 1994 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining @@ -25,8 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" -.\" $XFree86: xc/doc/man/general/security.man,v 1.6 2005/02/11 03:03:10 dawes Exp $ +.\" $XFree86: xc/doc/man/general/security.man,v 1.7 2006/01/09 14:56:26 dawes Exp $ .\" .nr )S 12 .TH XSECURITY __miscmansuffix__ __vendorversion__ Index: xc/doc/man/misc/Imakefile diff -u xc/doc/man/misc/Imakefile:1.9 xc/doc/man/misc/Imakefile:1.10 --- xc/doc/man/misc/Imakefile:1.9 Sat Mar 12 18:36:27 2005 +++ xc/doc/man/misc/Imakefile Sun Apr 23 13:02:43 2006 @@ -1,7 +1,7 @@ -XCOMM $XFree86: xc/doc/man/misc/Imakefile,v 1.9 2005/03/12 23:36:27 dawes Exp $ +XCOMM $XFree86: xc/doc/man/misc/Imakefile,v 1.10 2006/04/23 17:02:43 dawes Exp $ /* - * Copyright (c) 1994-2005 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -86,6 +86,15 @@ #if !defined(XfbdevServer) || !XfbdevServer InstallGenManPage(Xfbdev,$(MANDIR),$(MANSUFFIX)) #endif +#if (!defined(XsunServer) || !XsunServer) && \ + (!defined(Xsun24Server) || !Xsun24Server) && \ + (!defined(XsunMonoServer) || !XsunMonoServer) +#define DoXsunManPage +#endif +#ifdef DoXsunManPage +InstallGenManPage(Xsun,$(MANDIR),$(MANSUFFIX)) +InstallGenManPageAliases(Xsun,$(MANDIR),$(MANSUFFIX),XsunMono Xsun24) +#endif LinkSourceFile(newport.man,$(XF86DRIVERSRC)/newport) LinkSourceFile(sunbw2.man,$(XF86DRIVERSRC)/sunbw2) @@ -111,4 +120,7 @@ #if !defined(XfbdevServer) || !XfbdevServer LinkSourceFile(Xfbdev.man,$(SERVERSRC)/hw/tinyx/fbdev) #endif +#ifdef DoXsunManPage +LinkSourceFile(Xsun.man,$(SERVERSRC)/hw/sun) +#endif Index: xc/doc/misc/INSTALL.ms diff -u xc/doc/misc/INSTALL.ms:1.8 xc/doc/misc/INSTALL.ms:removed --- xc/doc/misc/INSTALL.ms:1.8 Fri Dec 21 15:59:12 2001 +++ xc/doc/misc/INSTALL.ms Tue May 9 21:51:50 2006 @@ -1,904 +0,0 @@ -.\" $Xorg: INSTALL.ms,v 1.5 2001/04/04 17:37:27 coskrey Exp $ -.\" -.\" X11R6.6 Installation instructions. Use troff -ms macros -.\" -.\" -.\" $XFree86: xc/doc/misc/INSTALL.ms,v 1.8 2001/12/21 20:59:12 dawes Exp $ -.ds Ts April 4, 2001\" -.\" -.ie t \{ -.nr LL 6.5i -.\} -.el \{ -.nr LL 72n -.na -.if n .pl 9999v \" no page breaks in nroff -.\} -.nr FL \n(LLu -.nr LT \n(LLu -.ll \n(LLu -.nr PS 11 -.de nH -.NH \\$1 -\\$2 -.XS -\\*(SN \\$2 -.XE -.LP -.. -.de Ip -.IP "\fB\\$1\fP" \\$2 -.. -.\" -.ds CH \" empty center heading -.sp 8 -.TL -\s+2\fBBuilding and Installing X11R6.6\fP\s-2 -.AU -.sp 6 -.\".AI -.\" -.\"The X.Org Group -.sp 6 -\*(Ts -.LP -.if t \{\ -.bp -\& -.sp 3 -.\} -.sp 5 -.nf -Copyright \(co 1999,2000,2001 Compaq Computer Corporation -Copyright \(co 1999,2000,2001 Hewlett-Packard Company -Copyright \(co 1999,2000,2001 IBM Corporation -Copyright \(co 1999,2000,2001 Hummingbird Communications Ltd. -Copyright \(co 1999,2000,2001 Silicon Graphics, Inc. -Copyright \(co 1999,2000,2001 Sun Microsystems, Inc. -Copyright \(co 1998,1999,2000,2001 The Open Group -.fi -.nr PS 9 -.nr VS 11 -.LP -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, provided that the above -copyright notice(s) and this permission notice appear in all copies of -the Software and that both the above copyright notice(s) and this -permission notice appear in supporting documentation. -.LP -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.LP -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -of the copyright holder. -.LP -X Window System is a trademark of The Open Group. -.\" -.if t \{ -.OH 'X Version 11, Release 6.6''X Window System Installation' -.EH 'X Window System Installation Version 11, Release 6.6' -.bp 1 -.ds CF \\n(PN -.\} -.nr PS 11 -.nr VS 13 - -.nH 1 "Introduction" -.\" -This document is the installation notes that were provided with X.Org's -X11R6.6 release. If you're building XFree86, it can be used as -a rough guide. Be aware that most of the details are not targeted -specifically at the current XFree86 source tree. XFree86-specific -documentation can be found in the \fBxc/programs/Xserver/hw/xfree86/doc\fP -directory and on-line at http://www.xfree86.org/current/. Some of the -documentation there is out of date, so also be aware of that. There is -currently no up to date document specifically targeted at building -XFree86 from source. - -.nH 1 "Easy Build Instructions" -.\" -This quick summary is no substitute for reading the full build -instructions later in this document. -.LP -Edit \fBxc/config/cf/site.def\fP for local preferences. -If you want to install and use the installation from somewhere other than -\fB/usr\fP, -change \fBProjectRoot\fP. (Do \fInot\fP use \fBDESTDIR\fP.) -.LP -If you are cross compiling you will want to use \fBDESTDIR\fP to specify where -the installation should take place. Failure to do so will corrupt your -native installation of X. -.LP -If you want to build with \fIgcc\fP uncomment the \fBHasGcc2\fP line. -If you have \fIgcc\fP, but not \fIcc\fP, please read the full -build instructions. -.LP -If some time has elapsed since the initial release of R6.6, check -to see if any public patches have been released. The source tar -files may have been updated \(em check the patch-level line in the -bug-report template. If the source in the tar files has not been -updated then get all the patches and apply them, following the -instructions at the top of each patch. Ignore the rebuild steps -in the patch application instructions. -.LP -.\" (never say "vendor.cf", because people look for that literally) -Check the appropriate vendor-specific \fB.cf\fP file in -\fBxc/config/cf/\fP to -make sure that \fIOSMajorVersion\fP, \fIOSMinorVersion\fP, and -\fIOSTeenyVersion\fP are set correctly for your system. On most -systems imake will figure these out automatically; but you may -override them in your \fBxc/config/cf/site.def\fP if you want. -.LP -See if there is a \fIBootstrapCFlags\fP mentioned in the comments -in the vendor-specific \fB.cf\fP file. (Most systems don't have -or need one. The BootstrapCFlags in \fIsun.cf\fP is for SunOS -4.0.x, so if you're building on SunOS 4.1.x or SunOS 5/Solaris 2 -then BootstrapCFlags doesn't apply.) If there isn't one, \fIcd\fP -to the \fBxc\fP directory and type (in csh): -.ID -% make World >& world.log -.DE -.LP -If there is an applicable \fBBootstrapCFlags\fP, take its value -and type: -.ID -% make World BOOTSTRAPCFLAGS="\fIvalue\fP" >& world.log -.DE -.LP -Do not call the output file \*Qmake.log\*U when doing \*Qmake World\*U. -After a successful build, you can install with: -.ID -% make install >& install.log -.DE -.LP -You can install manual pages with: -.ID -% make install.man >& man.log -.DE -.LP -\fBWhile the system is building (or if things fail), read the rest of -these installation instructions.\fP - - -.nH 1 "Building and Installing R6.6" - -Historically the MIT X Consortium, The X Consortium, Inc., and X.Org -sample implementation releases have always been source-code-only -releases, and this release is no different. - -.nH 2 "Introduction" - -Every release of X has been progressively easier to configure, build, -and install than the preceding releases \(em and we believe this -release is the easiest release to build yet. That notwithstanding, -if things do go amiss during the build we assume that you have the -basic skills necessary, and the willingness, to debug any errors -that may occur in the build process. When you install, if you're -going to use \fIxdm\fP or replace your system's old X, we assume -you have a basic understanding of your system's initialization -process. For Remote Execution (RX, embedding) we assume that -you understand the fundamentals of HTTP, CGI, and HTML. If these -assumptions are not correct then you should consider finding someone -who has proficiency in these areas to do the build and install for you. -.LP -After the release has been out for a while more up to date information -about any newly-discovered problems may be found in the \fIFrequently -Asked Questions\fP posting, which appears monthly on the Usenet newsgroup -comp.windows.x and xpert mailing list. The FAQ is also available via -anonymous FTP from ftp://ftp.x.org/ in the file -ftp://ftp.x.org/contrib/faqs/FAQ.Z, or possibly on one of X -mirror sites. - -.nH 2 "Preparing Your Build System" - -The source is distributed in four gzip compressed UNIX \fBT\fPape -\fBAR\fPchive (tar) files. You will need about 230 Mb of disk space -in order to unpack and build the release. Installing requires an -additional 30-50 Mb assuming you have shared libraries (80-100 Mb -without). -.LP -On non-UNIX systems you'll need a utility that can extract gzip -compressed tar files to extract the sources. There are several to -chose from, we do not make recommendations about which one you should -use. -.LP -Release 6.6 sources are distributed among the tar files as follows: -.LP -.KS -.DS -.ta 1.5i -xorg-1.tar contains everything in xc/ that isn't in the other tar files -xorg-2.tar contains xc/fonts -xorg-3.tar contains xc/doc/specs, xc/util -xorg-4.tar contains xc/doc/hardcopy -.DE -.KE -.LP -If you define \fIBuildFonts\fP to NO in your \fBsite.def\fP file, then -you only need to unpack xorg-1.tar to build. If you build fonts, then you -will also need xorg-2.tar to build. If you already have the fonts from -prior releases you can use those instead of downloading them again. We -presume that you know how to copy or move them from your old source -tree to the R6.6 source tree. - -.nH 2 "Unpacking the Distribution" - -Create a directory to hold the sources and \fIcd\fP into it: -.ID -% mkdir \fIsourcedir\fP -% cd \fIsourcedir\fP -.DE -Then for each tar file \fBxorg\-*.tar.gz\fP, execute this: -.ID -% gunzip\0\-c\0\fIftp-dir\fP/xorg\-\fIN\fP.tar.gz | tar xf\0\- -.DE -.LP -or if you have GNU's tar (FreeBSD, NetBSD, OpenBSD, or Linux too) -.ID -% tar xzf\0\fIftp-dir\fP/xorg\-\fIN\fP.tar.gz -.DE - -.nH 2 "Applying Patches" - -If some time has elapsed since the initial release of R6.6, check -to see if any public patches have been released. The source tar -files may have been updated \(em check the patch-level line in the -bug-report template. If the source in the tar files has not been -updated then get all the patches and apply them, following the -instructions at the top of each patch. Ignore the rebuild steps -in the patch application instructions. -.LP -See the section \*QPublic Patches\*U later in this document. -.LP -Then continue here. - -.nH 2 "Configuration Parameters (Imake Variables)" - -This release, like all the releases before it, uses \fIimake\fP, -a utility for creating system-specific Makefiles from system-independent -Imakefiles. Almost every directory in the release contains an -\fBImakefile\fP. System-specific configuration information is -located in \fBxc/config/cf/\fP, which is used by the \fIimake\fP -program every time a \fBMakefile\fP is generated in the source tree. -.LP -Most of the configuration work prior to building the release is to -set parameters (imake variables) so that \fIimake\fP will generate -correct Makefiles. If you're building on one of the supported -systems almost no configuration work should be necessary. -.LP -You should define your configuration parameters in -\fBxc/config/cf/site.def\fP. We provide an empty \fBsite.def\fP -file and a \fBsite.sample\fP file. The \fBsite.sample\fP file -is a suggested \fBsite.def\fP file \(em use it at your own risk. -.LP -Any public patches we release will never patch \fBsite.def\fP, so -you can be assured that applying a public-patch will not corrupt -your site.def file. On rare occasion you may need to make the change -in your vendor-specific \fB.cf\fP file; but you should avoid doing -that if at all possible because any patch we might release could -conceivably patch your vendor-specific \fB.cf\fP file and your -change may be lost or garbled. You can override most of the things -in your vendor-specific \fB.cf\fP file in your \fBsite.def\fP file. -(If you can't, it's a bug \(em please file a bug-report.) -.LP -On the systems we use here, imake will automatically determine the -\fIOSMajorVersion\fP, \fIOSMinorVersion\fP, and \fIOSTeenyVersion\fP -for your system. If your system isn't one of the systems we build -on here, or you want to build for a different version of your operating -system, then you can override them in the appropriate entry in -your \fBsite.def\fP file. -.LP -The \fBsite.def\fP file has two parts, one protected with -\*Q#ifdef BeforeVendorCF\*U and one with \*Q#ifdef AfterVendorCF\*U. -The file is actually processed twice, once before the \fB.cf\fP file -and once after. About the only thing you need to set in the \*Qbefore\*U -section is \fBHasGcc2\fP; just about everything else can be set in the -\*Qafter\*U section. -.LP -The \fBsite.sample\fP also has commented out support to include another -file, \fBhost.def\fP. This scheme may be useful if you want to set most -parameters site-wide, but some parameters vary from machine to machine. -If you use a symbolic link tree, you can share \fBsite.def\fP across -all machines, and give each machine its own copy of \fBhost.def\fP. -.LP -The config parameters are listed in \fBxc/config/cf/README\fP, but -here are some of the new or more common parameters that you may wish -to set in your \fBxc/config/cf/site.def\fP. -.Ip "ProjectRoot" -The destination where X will be installed. This variable needs to be -set before you build, as some programs that read files at run-time -have the installation directory compiled in to them. -.Ip "HasVarDirectory" -Set to \fBNO\fP if your system doesn't have /var or you don't want -certain files to be installed in \fIVarDirectory\fP. -.Ip "VarDirectory" -The location of site editable configuration and run-time files. Many -sites prefer to install their X binaries on \fIread-only\fP media -\(em either a disk slice (partition) that's mounted \fIread-only\fP -for added security, an NFS volume mounted \fIread-only\fP for -security and/or improved VM paging characteristics, or from a -\fIlive filesystem\fP on a CD-ROM. In order to simplify things -like installing \fIapp-default\fP files for locally built software, -and allowing editing of miscellaneous configuration and policy -files, and to allow xdm to create its master Xauthority file, some -directories under \fI$ProjectRoot\fP\fB/lib/X11\fP are actually -installed in \fB/var/X11\fP, and \fI$ProjectRoot\fP\fB/lib/X11\fP -contains symlinks to the directories in \fB/var/X11\fP. -.Ip "HasGcc2" -Set to \fBYES\fP to build with \fIgcc\fP version 2.x instead of -your system's default compiler. -.Ip BuildXInputExt -Set to \fBYES\fP to build the X Input Extension. This extension -requires device-dependent support in the X server, which exists only -in \fIXhp\fP and \fIXF86_*\fP in the sample implementation. -.Ip "DefaultUsrBin" -This is a directory where programs will be found even if PATH is not -set in the environment. It is independent of ProjectRoot and defaults -to \fB/usr/bin\fP. It is used, for example, when connecting from a -remote system via \fIrsh\fP. The \fIrstart\fP program installs its -server in this directory. -.Ip "InstallServerSetUID" -Some systems require the X server to run as root to access the devices -it needs. If you are on such a system and will not be using \fIxdm\fP, -you may set this variable to \fBYES\fP to install the X server setuid -to root; however the X.Org Group strongly recommends that you not -install your server suid-root, but that you use xdm instead. Talk to -your system manager before setting this variable to \fBYES\fP. -.Ip InstallXdmConfig -By default set to NO, which suppresses installing xdm config files -over existing ones. Leave it set to NO if your site has customized -the files in \fI$ProjectRoot\fP\fB/lib/X11/xdm\fP, as many sites do. -If you don't install the new files, merge any changes present in the -new files. -.Ip "MotifBC" -Causes Xlib and Xt to work around some bugs in older versions of Motif. -Set to \fBYES\fP only if you will be linking with Motif version 1.1.1, -1.1.2, or 1.1.3. -.Ip "GetValuesBC" -Setting this variable to \fBYES\fP allows illegal XtGetValues requests -with NULL ArgVal to usually succeed, as R5 did. Some applications -erroneously rely on this behavior. Support for this will be removed -in a future release. -.LP -The following vendor-specific \fB.cf\fP files are in the release but have -not been tested recently and hence probably need changes to work: -\fBapollo.cf\fP, \fBbsd.cf\fP, -\fBconvex.cf\fP, -\fBDGUX.cf\fP, -\fBluna.cf\fP, -\fBmacII.cf\fP, -\fBMips.cf\fP, -\fBmoto.cf\fP, -\fBOki.cf\fP, -\fBpegasus.cf\fP, -\fBx386.cf\fP. -\fBAmoeba.cf\fP is known to require additional patches. -.LP -The file \fBxc/lib/Xdmcp/Wraphelp.c\fP, for XDM-AUTHORIZATION-1, is not -included in this release. See ftp://ftp.x.org/pub/R6.6/xdm-auth/README. - -.nH 2 "System Build Notes" - -This section contains hints on building X with specific compilers and -operating systems. -.LP -If the build isn't finding things right, make sure you are using a -compiler for your operating system. For example, a pre-compiled -\fIgcc\fP for a different OS (e.g. as a cross-compiler) will not -have right symbols defined, so \fIimake\fP will not work correctly. - -.nH 3 "gcc" -.\" -X will not compile on some systems with \fIgcc\fP version 2.5, 2.5.1, -or 2.5.2 because of an incorrect declaration of memmove() in a gcc -fixed include file. -.LP -If you are using a \fIgcc\fP version prior to 2.7 on Solaris x86, -you need to specify -.nh -\fBBOOTSTRAPCFLAGS="\-Dsun"\fP -.hy -in the \*Qmake World\*U command. -.LP -If you're building on a system that has an unbundled compiler, e.g. -Solaris 2.x, and you do not have the \fIcc\fP compiler, you need to -contrive to have \fIcc\fP in your path in order to bootstrap imake. -One way to do this is to create a symlink cc that points to \fIgcc\fP. -.ID -% cd /usr/local/bin; ln \-s \fIpath-to-gcc\fP cc -.DE -Once \fIimake\fP has been built all the Makefiles created with it will -explicitly use \fIgcc\fP and you can remove the symlink. Another way -around this is to edit \fBxc/config/imake/Makefile.ini\fP to specify -\fIgcc\fP instead of \fIcc\fP. - -.nH 3 "Other GNU tools" -.\" -Use of the GNU BinUtils assembler, \fIas\fP, and linker, \fIld\fP, is -not supported \(em period! If you have them installed on your system -you must rename or remove them for the duration of the R6.6 build. -(You can restore them afterwards.) -.LP -The system-supplied \fImake\fP works just fine for building R6.6 and -that's what we suggest you use. If you've replaced your system's -\fImake\fP with GNU \fImake\fP then we recommend that you restore -the system \fImake\fP for the duration of your R6.6 build. After -R6.6 is done building you can revert to GNU make. GNU make on most -systems (except Linux, where it is the default make) is not a supported -build configuration. GNU make may work for you, and if it does, great; -but if it doesn't we do not consider it a bug in R6.6. If, after this -admonition, you still use GNU make and your build fails, reread the -above, and retry the build with the system's \fImake\fP before you -file a bug-report. -.\" -.\"We broke clearmake between R6.1 and R6.3 and didn't get to fix it. -.\".nH 3 "clearmake" -.\" -.\"Atria's \fIclearmake\fP make program, part of their ClearCase product, -.\"was supported in R6.1. -.\"You will need patches to ClearCase version -.\"2.0.2 or 2.0.3. -.\"You need one of 2.0.3-61 through 2.0.3-69, as -.\"appropriate for your platform, or any later patch that fixes bug #7250. -.\"Even with these patches there is still a bug in clearmake that -.\"prevents it from correctly building the X server on HP-UX (the problem -.\"is building the HP ddx). -.\".LP -.\"To use clearmake, set the variable \fBHasClearmake\fP to \fBYES\fP. -.\"Once you make Makefiles with HasClearmake, you -.\"cannot go back and use regular make with the same Makefiles. -.\"You can use clearmake without setting HasClearmake, -.\"but you won't be able to take advantage of clearmake's -.\"file-sharing abilities. -.\" -.\".nH 3 "SparcWorks 2.0" -.\" -.\"If you have a non-threaded program and want to debug it with the old -.\"SparcWorks 2.0 dbx, you will need to use the thread stubs library in -.\"\fBxc/util/misc/thr_stubs.c\fP. Compile it as follows: -.\".ID -.\"cc -c thr_stubs.c -.\"ar cq libthr_stubs.a thr_stubs.o -.\"ranlib libthr_stubs.a -.\".DE -.\"Install libthr_stubs.a in the same directory with your X libraries -.\"(e.g., \fI$ProjectRoot\fP\fB/lib/libthr_stubs.a\fP). -.\"Add the following line to \fBsite.def\fP: -.\".ID -.\"#define ExtraLibraries\0\-lsocket\0\-lnsl $(CDEBUGFLAGS:\-g=\-lthr_stubs) -.\".DE -.\"This example uses a \fImake\fP macro substitution; not all \fImake\fP -.\"implementations support this feature. -.\" -.\".nH 3 "CenterLine C under Solaris 2" -.\" -.\"If you are using the CenterLine C compiler to compile the distribution -.\"under Solaris 2, -.\"place the following line in your \fBsite.def\fP: -.\".ID -.\"#define HasCenterLineC YES -.\".DE -.\"If clcc is not in your default search path, add this line to \fBsite.def\fP: -.\".ID -.\"#define CcCmd \fI/path/to/your/clcc\fP -.\".DE -.\".LP -.\"If you are using CodeCenter 4.0.4 or earlier, the following files -.\"trigger bugs in the \fIclcc\fP optimizer: -.\".ID -.\"xc/programs/Xserver/cfb16/cfbgetsp.c -.\"xc/programs/Xserver/cfb16/cfbfillsp.c -.\"xc/programs/Xserver/cfb/cfbgetsp.c -.\".DE -.\".LP -.\"Thus to build the server, you will have to compile these files by hand -.\"with the \fB\-g\fP flag: -.\".ID -.\"% cd xc/programs/Xserver/cfb16 -.\"% make CDEBUGFLAGS="\-g" cfbgetsp.o cfbfillsp.o -.\"% cd ../cfb -.\"% make CDEBUGFLAGS="\-g" cfbgetsp.o -.\".DE -.\"This optimizer bug appears to be fixed in CodeCenter 4.0.6. - -.nH 3 "IBM AIX 4.x" - -On AIX 4.x, the file \fBlib/font/Type1/objects.c\fP must be compiled -without optimization (\fB\-O\fP) or the X server and fontserver will -exit when Type 1 fonts are used. - -.nH 3 "SunOS 4.0.x" - -SunOS 4.0 and earlier need BOOTSTRAPCFLAGS=-DNOSTDHDRS because it does -not have unistd.h and stdlib.h. Do \fInot\fP supply a BOOTSTRAPCFLAGS -when building any SunOS 4.1 or 5.x (Solaris 2) version. - -.nH 3 "Linux" - -On Linux systems imake has preliminary support to automatically -determine which Linux distribution you're using. At this time it -only automatically detects S.u.S.E. Linux. On other Linux systems -you should set the LinuxDistribution parameter in your -\fBxc/config/cf/site.def\fP \(em see the \fBxc/config/cf/linux.cf\fP -file for the list of valid values. On Linux systems imake will -also automatically determine which version of libc and binutils your -system has. You may override these in your \fBxc/config/cf/site.def\fP -file. -.LP -Many distributions of Linux have poor or no support for ANSI/POSIX/ISO -C locale support. If your Linux distribution is one of these you should -make certain that the imake variable \fILinuxLocaleDefines\fP is set -to \fB-DX_LOCALE\fP so that compose processing and other -internationalization features will work correctly. To help decide if -you should use -DX_LOCALE, look in /usr/share/locale \(em if it's -empty, you should probably use the -DX_LOCALE define. - -.nH 3 "Microsoft Windows NT" - -All of the base libraries are supported, including multi-threading -in Xlib and Xt, but some of the more complicated applications, -specifically \fIxterm\fP and \fIxdm\fP, are not supported. -.LP -There are also some other rough edges in the implementation, such -as lack of support for non-socket file descriptors as Xt alternate -inputs and not using the registry for configurable parameters like -the system filenames and search paths. -.LP -The \fIXnest\fP server has been made to run on NT; although it still -requires a real X server for output still. A real X server can not -be built from these sources \(em in order to display X applications -on a MS-Windows host you will have to acquire a real X Server. -.LP -You have several choices for imake's \fIRmTreeCmd\fP. Look at the -possible definitions in the \fBxc/config/cf/Win32.cf\fP file, choose -one that's right for you, and add it to your \fBxc/config/cf/site.def\fP -file. - -.nH 2 "The Build" - -For all the supported UNIX and UNIX-like systems you can simply -type (in csh): -.ID -% make World >& world.log -.DE -You can call the output file something other than \*Qworld.log\*U; but -don't call it \*Qmake.log\*U because files with this name are -automatically deleted during the initial \*Qcleaning\*U stage of the -build. -.LP -The build can take several hours on older systems, and may take as -little as an hour on the faster systems that are available today. On -UNIX and UNIX-like systems you may want to run it in the background -and keep a watch on the output. For example: -.ID -% make World >& world.log & -% tail\0\-f\0world.log -.DE -.LP -If something goes wrong, the easiest thing is to correct the problem -and start over again, i.e. typing \*Qmake World\*U. - -.nH 3 "UNIX and UNIX-like systems" - -Check your vendor-specific \fB.cf\fP file; if it doesn't have -BootstrapCFlags that apply to your version of the operating system -then type (in csh): -.ID -% make World >& world.log -.DE -.LP -Otherwise type (in csh): -.ID -% make World BOOTSTRAPCFLAGS="value" >& world.log -.DE -.LP -None of the \fIsupported\fP operating systems need to use BOOTSTRAPCFLAGS. - -.nH 3 "Microsoft Windows NT" - -On NT, make certain your Path, Include, and Lib environment variables -are set accordingly. For example here we use the command line compiler -in VC++ 4.0 Standard Edition, which is installed in C:\\MSDEVSTD. To -setup the environment type: -.ID -> set Path=\fIold-path\fP;C:\\MSDEVSTD\\bin;C:\\\fIpath-to-RmTreeCmd\fP -> set Include=C:\\MSDEVSTD\\include -> set Lib=C:\\MSDEVSTD\\lib -.DE -Then to build, at the prompt, type: -.ID -C:\\> nmake World.Win32 > world.log -.DE - -.nH 2 "Installing X" - -After the build has successfully completed you can install the software -by typing the following as root: -.ID -% make install >& install.log -.DE -or on Microsoft Windows NT -.ID -C:\\> nmake install > install.log -.DE -.LP -Again, you might want to run this in the background and use \fItail\fP -to watch the progress. -.LP -You can install the manual pages by typing the following as root: -.ID -% make install.man >& man.log -.DE - -.nH 2 "Shared Libraries" - -The version number of some of the shared libraries has been changed. -On SunOS 4, which supports minor version numbers for shared libraries, -programs linked with the R6.6 libraries will use the new libraries with -no special action required. -.LP -On most other modern operating systems the version portion of the -library name, i.e. "6.1" portion of "libX11.so.6.1" is a string. Even -if it's only one character long, e.g. "1" (as in libX11.so.1) it's -still a string. This string uniquely identifies and distinguishes one -version of the library from another. Even though all the libraries in -this release are compatible with the libraries from previous releases, -and there's otherwise no reason to change the version string, we do -it to identify which source release the libraries were built from. -.LP -An old program that was linked with libXext.so.6.3 won't run if you -delete libXext.so.6.3 and install libXext.so.6.4 in its place. In -general on these systems you have the following choices: -.IP 1. -Keep the old versions of the libraries around. -.IP 2. -Relink all applications with the new libraries. -.IP 3. -Create a symlink using the old name which points to the new name. -.IP -For example, to have programs that were linked against libXext.so.6.3 -use libXext.so.6.4, make this symlink: -.ID -% cd \fI$ProjectRoot\fP/lib -% ln\0\-s libXext.so.6.4 libXext.so.6.3 -.DE -.LP -On some distributions of Linux the run-time loader is broken \(em -requiring that the library's internal SONAME match the \fIfilename\fP -\(em and the symlink solution won't work. We recommend that you get -a new run-time loader which is not broken or recompile your run-time -loader to not require that the SONAME match. - -.nH 2 "Setting Up xterm" - -If your \fB/etc/termcap\fP and \fB/usr/lib/terminfo\fP databases do -not have correct entries for \fIxterm\fP, use the sample entries -provided in the directory \fBxc/programs/xterm/\fP. System V users -may need to compile and install the \fBterminfo\fP entry with the -\fItic\fP utility. -.LP -Since each \fIxterm\fP will need a separate pseudoterminal, you need -a reasonable number of them for normal execution. You probably will -want at least 32 on a small, multiuser system. On most systems, each -pty has two devices, a master and a slave, which are usually named -/dev/tty[pqrstu][0-f] and /dev/pty[pqrstu][0-f]. If you don't have -at least the \*Qp\*U and \*Qq\*U sets configured (try typing \*Qls -/dev/?ty??\*U), you should have your system administrator add them. -This is commonly done by running the \fIMAKEDEV\fP script in the -\fB/dev\fP directory with appropriate arguments. - -.nH 2 "Starting Servers Automatically at System Boot" - -The \fIxfs\fP and \fIxdm\fP programs are designed to be run -automatically at system startup. Please read the manual pages for -details on setting up configuration files; reasonable sample files -are in \fBxc/programs/xdm/config/\fP and \fBxc/programs/xfs/\fP. -.LP -Since \fIxfs\fP can serve fonts over the network, you do not need -to run a font server on every machine with an X display. You should -start \fIxfs\fP before \fIxdm\fP, since \fIxdm\fP may start an X -server which is a client of (dependent on) the font server. - -.nH 3 "On BSD-based systems using /etc/rc or /etc/rc.local" - -If your system uses an \fB/etc/rc\fP or \fB/etc/rc.local\fP file -at boot time, you can usually enable these programs by placing the -following at or near the end of the file: -.ID -if [ \-f \fI$ProjectRoot\fP/bin/xfs ]; then - \fI$ProjectRoot\fP/bin/xfs & echo \-n ' xfs' -fi - -if [ \-f \fI$ProjectRoot\fP/bin/xdm ]; then - \fI$ProjectRoot\fP/bin/xdm; echo \-n ' xdm' -fi -.DE -.LP -On later versions of FreeBSD the preferred way of doing this is to -create the directory \fI$ProjectRoot\fP/etc/rc.d. Add this directory to -the \fIlocal_startup\fP variable defined in /etc/rc.conf, and then -create short scripts in this directory to start xfs and xdm. -.LP -If you are unsure about how system boot works, or if your system -does not use \fB/etc/rc\fP, consult your system administrator for -help. - -.nH 3 "On Linux systems" - -Most Linux distributions have an /etc/inittab entry specifically for -xdm. Depending on your distribution this may be \fIrun-level\fP three, -four, or five. To use xdm, edit \fB/etc/inittab\fP and find the line -which contains \fIinitdefault\fP and change it from 2 to the appropriate -run-level -.LP -You Linux distribution may already have a script to start xdm at a -particular run-level. For example on S.u.S.E. Linux 5.0 there is the -file /sbin/init.d/xdm, and the symlink /sbin/init.d/rc3.d/S30xdm -which points to /sbin/init.d/xdm. Change /sbin/init.d/xdm to use -\fI$ProjectRoot\fP\fI/bin/xdm\fP. You can use the xdm script as a -model write an xfs script. Depending on your Linux distribution you -may find these files in /etc/init.d instead of /sbin/init.d. - -.nH 3 "On Digital Unix, HPUX 10, and SVR4 systems" - -Most systems run xdm by default at some particular run-level of the -system. There is a master \fIinit.d\fP file and a run-level symlink -\fIrc?.d\fP that points to the master \fIinit.d\fP file: -.DS 1 -.ta 2i 3i 4.5i -Operating System rc?.d symlink init.d file -.sp 1 -Digital Unix 4.0 /sbin/rc3.d/S95xlogin /sbin/init.d/xlogin -HPUX 10.20 /sbin/rc3.d/S800xdm /sbin/init.d/xdm -Solaris 2.[0-4] -Solaris 2.5 /etc/rc3.d/S99xdm /etc/init.d/xdm.rc -Solaris 2.6 /etc/rc2.d/S99dtlogin /etc/init.d/dtlogin -IRIX 6.2 /etc/rc2.d/S98xdm /etc/init.d/xdm -Unixware /etc/rc2.d/S69xdm /etc/init.d/xdm -.DE -In general you can edit the \fIinit.d\fP file to use -\fI$ProjectRoot\fP\fB/bin/xdm\fP. You can use the xdm file as a model -to write an /etc/rc?.d/S??xfs file to start xfs. Some systems may -already have files to start xfs. Starting in Solaris 2.5 Sun uses -inetd to start xfs \(em you should remove the xfs entries from -/etc/inetd.conf and /etc/services before adding xfs to the run-level -files. - -.nH 3 "On Unix System V-based systems" - -On systems with a \fB/etc/inittab\fP file, you can edit this file to -add the lines -.ID -xfs:3:once:\fI$ProjectRoot\fP/bin/xfs -xdm:3:once:\fI$ProjectRoot\fP/bin/xdm -.DE -.LP - -.nH 2 "Using OPEN LOOK applications" - -You can use the X11R6.x Xsun server with OPEN LOOK applications; but -you must pass the \fB\-swapLkeys\fP flag to the server on startup, -or the OPEN LOOK Undo, Copy, Paste, Find, and Cut keys may not work -correctly. For example, to run Sun's OpenWindows 3.3 desktop environment -with an X11R6 server, use the command: -.ID -% openwin\0\-server\0\fI$ProjectRoot\fI/bin/Xsun\0\-swapLkeys -.DE -.LP -The keysyms reported by keys on the numeric keypad have also changed -since X11R5; if you find that OpenWindows applications do not respond -to keypad keys and cursor control keys when using an R6 server, you -can remap the keypad to generate R5 style keysyms using the following -\fIxmodmap\fP commands: -.ID -keysym Pause = F21 -keysym Print = F22 -keysym Break = F23 -keysym KP_Equal = F24 -keysym KP_Divide = F25 -keysym KP_Multiply = F26 -keysym KP_Home = F27 -keysym KP_Up = Up -keysym KP_Prior = F29 -keysym KP_Left = Left -keycode 100 = F31 -keysym KP_Right = Right -keysym KP_End = F33 -keysym KP_Down = Down -keysym KP_Next = F35 -keysym KP_Insert = Insert -keysym KP_Delete = Delete -.DE - -.nH 2 "Rebuilding after Patches" - -Eventually you are going to make changes to the sources, for example -by applying any public patches that may be released or to fix any -bugs you may have found. -.\"See the section \*QPublic Patches\*U later in this document. -.LP -If only source files are changed, rebuild by going to the base of -your source tree \fBxc\fP and typing: -.ID -% make >& make.log -.DE -.LP -If there are imake configuration file changes, the best thing to do -is type: -.ID -% make Everything >& every.log -.DE -.LP -\*QEverything\*U is similar to \*QWorld\*U in that it rebuilds every -\fBMakefile\fP, but unlike \*QWorld\*U it does not delete the -existing objects, libraries, and executables, and only rebuilds -what is out of date. - -.nH 2 "Formatting the Documentation" - -The PostScript files in \fBxc/doc/hardcopy\fP can be generated from the -sources in \fBxc/doc/specs\fP. Most of the documentation is in troff -using the \|\-ms macros. The easiest way to format it is to use the -Imakefiles provided. -.LP -Set the name of your local troff program by setting the variable -\fBTroffCmd\fP in \fBxc/config/cf/site.def\fP. Then build the Makefiles: -.ID -cd xc/doc -make SUBDIRS=specs Makefiles -.DE -.LP -Finally, go to the directory you are interested in and type \*Qmake\*U -there. This command will generate \fB.PS\fP files. You can also -generate text files by specifying the document name with a \fB.txt\fP -extension as a \fImake\fP target, e.g., \*Qmake icccm.txt\*U. - -.nH 1 "Public Patches" - -The X.Org Group may from time to time issue public patches for this -release to fix any serious problems that are discovered. Such fixes -are a subset of fixes available to X.Org members. Public patches are -available via anonymous FTP from ftp://ftp.x.org/pub/R6.6/fixes, -or from your local X mirror site. Check the site closest to you first. -.LP -You can determine which public patches have already been applied -to your source tree by examining the \*QVERSION\*U line of -\fBxc/bug-report\fP. The source in the tar files you have may -already have some patches applied; you only need to apply later -patches. If you try to apply patches out of order or apply patches -that are already in your tree, \fIpatch\fP will tell you that you -have the wrong version and not apply the patch. -.LP -Source for the \fIpatch\fP program is in \fBxc/util/patch/\fP. The -\fIpatch\fP program included on some systems may not support all the -options this version has. If you have problems applying patches, or -if you're otherwise in doubt, use this version. - -.ie t \{ -.\" -.\" print Table of Contents -.if o .bp \" blank page to make count even -.bp 1 -.af PN i -.PX -.\} -.el .pl \n(nlu+1v -.\" -.\" Local Variables: -.\" time-stamp-start: "^\\.ds Ts " -.\" time-stamp-end: "\\\\\"" -.\" time-stamp-format: "%b %d, %y" -.\" End: Index: xc/doc/misc/Imakefile diff -u xc/doc/misc/Imakefile:1.5 xc/doc/misc/Imakefile:removed --- xc/doc/misc/Imakefile:1.5 Mon Jun 4 17:12:16 2001 +++ xc/doc/misc/Imakefile Tue May 9 21:51:50 2006 @@ -1,46 +0,0 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:05 cpqbld Exp $ - -XCOMM Format the documentation about the release as a whole. -XCOMM The files generated here are shipped in the top-level -XCOMM xc/ directory. - -XCOMM $XFree86: xc/doc/misc/Imakefile,v 1.5 2001/06/04 21:12:16 dawes Exp $ - -MakeSimpleDoc(RELNOTES-X.org,RELNOTES.ms) - -MakeSimpleDoc(INSTALL-X.org,INSTALL.ms) - -/* the rules should be updated to generate .TXT extensions normally */ - -RELNOTES-X.org.TXT: RELNOTES-X.org.txt - RemoveFile(RELNOTES-X.org.TXT) - $(CP) RELNOTES-X.org.txt RELNOTES-X.org.TXT - -INSTALL-X.org.TXT: INSTALL-X.org.txt - RemoveFile(INSTALL-X.org.TXT) - $(CP) INSTALL-X.org.txt INSTALL-X.org.TXT - -clean:: - RemoveFiles(RELNOTES-X.org.TXT INSTALL-X.org.TXT) - - -TXTTARGETS = RELNOTES-X.org.TXT INSTALL-X.org.TXT - -AllTarget($(TXTTARGETS)) - -#ifndef UpdateDocsInSource -#define UpdateDocsInSource NO -#endif - -#if UpdateDocsInSource -SOURCETARGET = install -#else -SOURCETARGET = update -#endif - -$(SOURCETARGET):: $(TXTTARGETS) - $(CP) RELNOTES-X.org.TXT $(TOP)/RELNOTES-X.org - $(CP) INSTALL-X.org.TXT $(TOP)/INSTALL-X.org - -InstallRoffDoc(INSTALL-X.org) -InstallRoffDoc(RELNOTES-X.org) Index: xc/doc/misc/RELNOTES.ms diff -u xc/doc/misc/RELNOTES.ms:1.8 xc/doc/misc/RELNOTES.ms:removed --- xc/doc/misc/RELNOTES.ms:1.8 Fri Dec 21 15:59:12 2001 +++ xc/doc/misc/RELNOTES.ms Tue May 9 21:51:51 2006 @@ -1,593 +0,0 @@ -.\" $Xorg: RELNOTES.ms,v 1.7 2001/04/04 17:37:28 coskrey Exp $ -.\" -.\" X11R6.4 Release Notes. Use troff -ms macros -.\" -.\" -.\" $XFree86: xc/doc/misc/RELNOTES.ms,v 1.8 2001/12/21 20:59:12 dawes Exp $ -.ds Ts April 4, 2001\" -.\" -.ie t \{ -.nr LL 6.5i -.\} -.el \{ -.nr LL 72n -.na -.if n .pl 9999v \" no page breaks in nroff -.\} -.nr FL \n(LLu -.nr LT \n(LLu -.ll \n(LLu -.nr PS 11 -.de nH -.NH \\$1 -\\$2 -.XS -\\*(SN \\$2 -.XE -.LP -.. -.de Ip -.IP "\fB\\$1\fP" \\$2 -.. -.\" -.ds CH \" empty center heading -.sp 8 -.TL -\s+2\fBX Window System, Version 11 -.sp 1 -Release 6.6\fP\s-2 - -\s+1\fBRelease Notes\fP\s-1 -.AU -.sp 6 -.\"The Open Group X Project Team -.AI -.sp 6 -\*(Ts -.LP -.if t \{\ -.bp -\& -.sp 3 -.\} -.sp 5 -.nf -Copyright \(co 1999,2000,2001 Compaq Computer Corporation -Copyright \(co 1999,2000,2001 Hewlett-Packard Company -Copyright \(co 1999,2000,2001 IBM Corporation -Copyright \(co 1999,2000,2001 Hummingbird Communications Ltd. -Copyright \(co 1999,2000,2001 Silicon Graphics, Inc. -Copyright \(co 1999,2000,2001 Sun Microsystems, Inc. -Copyright \(co 1999,2000,2001 The Open Group -.fi -.LP -All rights reserved. -.nr PS 9 -.nr VS 11 -.LP -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, provided that the above -copyright notice(s) and this permission notice appear in all copies of -the Software and that both the above copyright notice(s) and this -permission notice appear in supporting documentation. -.LP -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.LP -Except as contained in this notice, the name of a copyright holder -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -of the copyright holder. -.LP -\fIX Window System\fP is a trademark of The Open Group. -.\" -.if t \{ -.OH 'X Version 11, Release 6.6''X Window System Release Notes' -.EH 'X Window System Release Notes''X Version 11, Release 6.6' -.bp 1 -.ds CF \\n(PN -.\} -.nr PS 11 -.nr VS 13 - - -.nH 1 "Introductory Note" -This document is the release notes that were provided with X.Org's -X11R6.6 release. The XFree86-specific information in this document is -out of date. The XFree86-specific documentation can be found -in the \fBxc/programs/Xserver/hw/xfree86/doc\fP directory, and on-line -at http://www.xfree86.org/current/. - -.nH 1 "What Is X11" - -X11, or X, is a vendor-neutral, system-architecture neutral -network-transparent window system and user interface standard. -In other words it's windows for UNIX. But X is not just for UNIX -\(em X runs on a wide range of computing and graphics machines -including Macintosh, OS/2, Microsoft's MS-Windows family of -operating systems, and almost all of the so-called Network -Computers. X can use your network \(em you may run CPU-intensive -programs on high powered workstations and display the user -interface (the windows) on inexpensive desktop machines. - -.nH 1 "What is Release 6.6" - -Release 6.6 (R6.6) is The X.Org Group's update to its Release 6.5.1 -patch 1 and all prior releases. -It is compatible with with all releases going back to R1 at both the -source and protocol levels. - -.LP -The X Consortium was an independent, not-for-profit membership -corporation formed in 1993 as the successor to the MIT X Consortium. -It was dissolved at the end of 1996 and all assets such as trademarks -and copyrights were transferred to The Open Group. The Open Group's -X Project Team was formed to continue maintenance and development of X. -The X Project Team was disbanded after Release 6.4 patch 3. -.LP -X.Org has employed the services of a third party contractor to -establish a CVS repository of the source and a web-based interface -for submitting/viewing bug reports. The CVS repository and -web-based interface are available to X.Org members. The contractor -has been chartered to provide quarterly update releases to the -X source. -.LP -Membership information for X.Org may be found at: - http://www.x.org/members.htm. -.LP -This X.Org release addresses a portion of the backlog of bug reports -since Release 6.4 patch 3, along with additional fixes from the Xfree86 -community. -.LP -Instructions for building and installing R6.6 can be found in the -file INSTALL.TXT (INSTALL-X.org), available separately and also contained -in the release. - -.nH 1 "Overview of the X.Org Release" - -Like all the releases that preceded it, R6.6 is a source code -release. In order to use the release it is necessary to first -unpack the distribution, compile it, and then install it. The -source contains the following items: -.LP -.KS -.ID -Documentation -Sample implementations -Fonts and bitmaps -Utility libraries -Programs -.DE -.KE - -.nH 1 "Supported Operating Systems" - -This release was built and tested on the following reference platforms: -.LP -.KS -.ID -Compaq Tru64 UNIX V5.0 -HPUX 10.20 -Solaris 7.0 -.DE -.KE -.LP - -.nH 1 "Supported Graphics Devices" - -This release includes the necessary device-dependent support to build -a native X server for the following platforms: -.LP -.KS -.ID -HP-UX: Xhp -Compaq Tru64 UNIX: Xdec on DECstation 3000/400 (Alpha) with PMAG-B -SunOS/Solaris: Xsun \(em see the Xsun man page for supported cards -XFree86: See the XF_* man pages for supported cards -.DE -.KE -In addition to the above, the Xvfb and Xnest servers can be built on -all platforms. -.LP -Native X servers are not built on AIX, Fujitsu UXP, IRIX, or -Microsoft Windows NT. - -.KS -.nH 1 "The Source Tree" - -The source is distributed in UNIX tar files. The source unpacks from -the tar files into a source tree, and the name of the base directory -of the source tree is \fBxc\fP. The name \fBxc\fP as the base of the -source tree has been retained from the X Consortium releases. - -The general layout under \fBxc/\fP is as follows: -.LP -.DS L -.ta 2i -config/ imake config files, \fIimake\fP, \fImakedepend\fP, etc. -doc/ all documentation other than per-program manual pages -fonts/ BDF, Speedo, Type1 fonts -include/ common include files -lib/ libraries -nls/ national language support files -programs/ all programs, including the X server and \fIrgb\fP, -util/ \fIpatch\fP, \fIcompress\fP, other utilities -bug-report bug reporting template -registry X Registry -.DE -.KE - -.nH 1 "X Registry" - -A registry of certain X-related items is maintained to -aid in avoiding conflicts and to aid in sharing of such items. The -registry is in the file \fBxc/registry\fP. - -.nH 1 "Extensions Supported" - -Release 6.6 includes source for the following extensions: -BIG-REQUESTS, -DOUBLE-BUFFER, -DPMS, -Extended-Visual-Information, -LBX, -MIT-SHM, -MIT-SUNDRY-NONSTANDARD, -Multi-Buffering, -RECORD, -SECURITY, -SHAPE, -SYNC, -TOG-CUP, -X3D-PEX, -XC-APPGROUP, -XC-MISC, -XFree86-VidModeExtension, -XIE (X Image Extension), -XINERAMA. -XInputExtension, -XKEYBOARD, -XpExtension (printing), -XTEST, and -XTestExtension1, -.LP -Not all of these extensions are standard; see the Standards manual -page. Some of these extensions may not be supported on every platform. - -.nH 1 "Implementation Dependent Parameters" - -Some of the specifications define some behavior as -implementation-dependent. Implementations must document how those -parameters are implemented. - -.LP -The default values in this release of the implementation dependent -parameters are: - -.IP "XFILESEARCHPATH default:" -This default can be set at build time by setting the \fIimake\fP -variables -.hw XAppLoadDir -XFileSearchPathDefault, XAppLoadDir, XFileSearchPathBase, and -ProjectRoot in \fBxc/config/cf/site.def\fP. See -\fBxc/config/cf/README\fP for instructions and -\fBxc/config/cf/X11.tmpl\fP for details of how these configuration -variables are used. -.IP -By default the imake variable ProjectRoot is \fB/usr/X11R6.6\fP -and XFILESEARCHPATH has these components: -.ID -\fI$ProjectRoot\fP/lib/X11/%L/%T/%N%C%S -\fI$ProjectRoot\fP/lib/X11/%l/%T/%N%C%S -\fI$ProjectRoot\fP/lib/X11/%T/%N%C%S -\fI$ProjectRoot\fP/lib/X11/%L/%T/%N%S -\fI$ProjectRoot\fP/lib/X11/%l/%T/%N%S -\fI$ProjectRoot\fP/lib/X11/%T/%N%S -.DE - -.IP "XUSERFILESEARCHPATH default:" -If the environment variable XAPPLRESDIR is defined, the default value -of XUSERFILESEARCHPATH has the following components: -.ID -$XAPPLRESDIR/%L/%N%C -$XAPPLRESDIR/%l/%N%C -$XAPPLRESDIR/%N%C -$HOME/%N%C -$XAPPLRESDIR/%L/%N -$XAPPLRESDIR/%l/%N -$XAPPLRESDIR/%N -$HOME/%N -.DE -Otherwise it has these components: -.KS -.ID -$HOME/%L/%N%C -$HOME/%l/%N%C -$HOME/%N%C -$HOME/%L/%N -$HOME/%l/%N -$HOME/%N -.DE -.KE - -.IP "XKEYSYMDB default:" -Defaults to \fI$ProjectRoot\fP\fB/lib/X11/XKeysymDB\fP. - -.IP "XCMSDB default:" -Defaults to \fI$ProjectRoot\fP\fB/lib/X11/Xcms.txt\fP. - -.IP "XLOCALEDIR default:" -Defaults to the directory \fI$ProjectRoot\fP\fB/lib/X11/locale\fP. -The XLOCALEDIR variable can contain multiple colon-separated pathnames. - -.IP "XErrorDB location" -The Xlib error database file is \fI$ProjectRoot\fP\fB/lib/X11/XErrorDB\fP. - -.IP "XtErrorDB location" -The Xt error database file is \fI$ProjectRoot\fP\fB/lib/X11/XtErrorDB\fP. - -.IP "Supported Locales" -Locales supported by this implementation are in \fBxc/nls/locale.dir\fP. -The mapping between various system locale names and X locale names is -in \fBxc/nls/locale.alias\fP. Both files are installed in the default -XLOCALEDIR directory, i.e. \fI$ProjectRoot\fP\fB/lib/X11/locale/\fP). - -.IP "Supported Input Methods" -This distribution does not include source for any input method servers; -however Xlib supplies a default built-in input method that supports -compose processing in 8-bit locales. Compose files are provided for -Latin-1 and Latin-2. The built-in input method can support other locales, -given suitable compose files. See \fBxc/nls/Compose/iso8859-*\fP -for the supported compositions. -.LP -The Input Method Server Development Kit (IMdkit) is at -ftp://ftp.x.org/pub/unsupported/lib/IMdkit/. - -.nH 1 "What is Unchanged in Release 6.6" - -As this is an update release, there is a great deal of stability in the -standards, libraries, and clients. No existing standards have changed -in a material way. All previous interfaces are unchanged. - -.nH 1 "New OS Support" - -The following table shows the versions of the operating systems -that were used to develop this and prior releases: -.LP -.KS -.DS 0 -.ta 1.5i 2.25i 3i 3.75i 4.5i 5.25i -System R6 R6.1 R6.[23] R6.4 R6.5 R6.6 -.sp -AIX 3.2.5 4.1.4 4.2 4.2 - - -A/UX 3.0.1 - - - - - -BSD/386 1.0 - - - - - -Compaq Tru64 UNIX 1.0/1.3 3.2C 4.0A4.0A 5.0 -FreeBSD - 2.1.0 2.1.6 2.2.2 - - -Fujitsu UXP - - - V20L10 - -HP-UX 9.1 10.01 10.01 10.20 10.20 10.20 -IRIX 5.2 5.3 6.2 6.2 - - -Linux (kernel) -Slackware 2.3 - 1.2.11 - - - -Slackware 3.1 - - 2.0 - - -S.u.S.E. 5.0 - - - 2.0.30 - -Mach 2.5 - - - - - -NEWS-OS 6.0 - - - - - -Solaris 2.3 2.4 2.5 2.5 7.0 7.0 -SunOS 4.1.3 4.1.3 4.1.4 4.1.4 - - -Ultrix-32 4.3 4.4 - - - - -UNICOS 8.0 - - - - - -Unixware SVR4.2 1.0 2.02 2.02 - - -Windows NT 3.1 3.5 4.0 3.51 - -.DE -.KE - -.nH 1 "Easy Resource Configuration" - -Setting and changing resources in X applications can be difficult for -both the application programmer and the end user. \fBResource -Configuration Management (RCM)\fP addresses this problem by changing -the \fBX Intrinsics\fP to immediately modify a resource for a -specified widget and each child widget in the hierarchy. -In this context, immediate means: no sourcing of a resource -file is required; the application does not need to be restarted for -the new resource values to take effect; and the change occurs -immediately. -.LP -The main difference between \fBRCM\fP and the \fBEditres\fP protocol -is that the \fBRCM\fP customizing hooks reside in the \fBIntrinsics\fP -and thus are linked with other toolkits such as Motif and the Athena -widgets. However, the \fBEditRes\fP protocol requires the application -to link with the \fBEditRes\fP routines in the Xmu library and Xmu is -not used by all applications that use Motif. -.LP -Easy Resource Configuration is not a standard part of the X Toolkit -Intrinsics (libXt). It is neither an X Consortium standard nor an -X Project Team specification. - -.nH 1 "ANSIfication" - -R6.1 was officially the last release that supported traditional K&R C. -Like all releases since R6.3, R6.6 assumes a Standard C compiler and -environment. We have not intentionally removed any K&R C support from -old code, and most of the release will continue to build on platforms -without an ANSI C compiler. - -.nH 1 "VSW5" - -We have tested this release with VSW5 version 5.1.1A. This release -passes all tests in VSW5 with the following exceptions: -.IP \(bu -tests for which a permanent waiver has been granted. -.IP \(bu -tests for which a temporary waiver have been granted. -.IP \(bu -tests where a defect in the test has been identified and reported. -.LP -VSW licensees may obtain a list of waivers granted from -http://www.rdg.opengroup.org/interpretations/database/. - -.nH 1 "XtAppPeekEvent() behavior - Environment variable no longer needed" - -XtAppPeekEvent() has been modified in R6.5.1 to behave as it is -documented in the Xt spec. Certain applications, including Netscape, -did not work properly with these modifications, so the routine was -changed so that users could set the XTAPPPEEKEVENT_SKIPTIMER environment -variable in order to make XtAppPeekEvent() behave as it did prior to -R6.5.1. -.LP -In R6.6, the routine has been changed so that there is no need to set -the environment variable. Timers are handled as specified by the spec, -but Netscape and other applications now work properly without the -environment variable. In R6.6, the XTAPPPEEKEVENT_SKIPTIMER variable -is ignored, and users may unset it if they were using it in R6.5.1. - -.nH 1 "Year 2000 (Y2K) Compliance" - -For a statement of compliance see -http://www.camb.opengroup.org/tech/desktop/faq/y2k.htm - -.nH 1 "Security Considerations" - -On UNIX and similar operating systems there are serious security -implications associated with running suid-root programs. -.LP -By default the xterm terminal emulation program is installed suid-root -in order to be able to update utmp or utmpx entries. All the known -(as of this writing) exploitable security holes in the X libraries have -been eliminated \(em making it theoretically safe for xterm to be -suid-root. For additional security you may install xterm without -suid-root; however if you do, xterm will not be able to make utmp or -utmpx entries. -.LP -On many Intel-based machines the X server must have root privileges -in order to access the graphics card and open other devices. The -easiest way to grant the requisite privileges is to use xdm to run -your X server. Some people, who prefer not to use xdm, often work -around the need for the X server to run with root privileges by -making their X server a suid-root program. While all the known (as -of this writing) exploitable security holes in the server have been -eliminated, it is still recommended that you \fBnot\fP -make your X server suid-root. There are \fIsafe\fP suid-root wrapper -programs available (but not in this release) that you can use to start -your server if you don't want to use xdm. - -.nH 1 "Filing Bug Reports" - -If you find a reproducible bug in software built from the source in -this distribution or find bugs in its documentation, please complete -a bug-report using the form in the file \fBxc/bug-report\fP and send it -to: -.ID -mailto:xbugs@x.org -.DE -.LP -Please try to provide all of the information requested on the form if -it is applicable; the little extra time you spend on the report will -make it much easier for someone to reproduce, find, and fix the bug. -.LP -Bugs in the contributed software that is available on the net are not -handled on any official basis. Consult the documentation for the -individual software to see where (if anywhere) to report the bug. - -.nH 1 "Acknowledgements" -.LP -The following individuals served as X.Org representatives for their -respective companies. These companies are Executive Members of X.Org. - -.LP -Paul Anderson of Hewlett-Packard. - -.LP -Heather Lanigan of Compaq. - -.LP -Danny Masci of Hummingbird. - -.LP -Dan McNichol of IBM. - -.LP -Richard Offer of SGI. - -.LP -Steve Swales of Sun Microsystems, Inc. - - -The following individuals contributed significantly to the development -of X11R6.6, in the form of code, testing, and support. - -.LP -Stuart Anderson of Metro Link, Inc. - -.LP -Robert W. Boone of Metro Link, Inc. - -.LP -Alan Coopersmith of Sun Microsystems, Inc. - -.LP -Glen Cornell of Metro Link, Inc. - -.LP -Ernie Coskrey of Metro Link, Inc. - -.LP -Gudrun Enger of Metro Link, Inc. - -.LP -Gemma Exton of Adacel Technologies Limited. - -.LP -Jay Hobson of Sun Microsystems, Inc. - -.LP -Steve McClure of Metro Link, Inc. - -.LP -Scott McDonald of Metro Link, Inc. - -.LP -Andrew Miller of Marconi Corporation. - -.LP -Quentin Neill of Metro Link, Inc. - -.LP -Keith Packard of The XFree86 Project. - -.LP -Simon Pickup of Adacel Technologies Limited. - -.LP -Paul Shearer of IBM. - -.LP -Hidetoshi Tajima of Sun Microsystems, Inc. - -.ie t \{ -.\" -.\" print Table of Contents -.if o .bp \" blank page to make count even -.bp 1 -.af PN i -.PX -.\} -.el .pl \n(nlu+1v -.\" -.\" Local Variables: -.\" time-stamp-start: "^\\.ds Ts " -.\" time-stamp-end: "\\\\\"" -.\" time-stamp-format: "%b %d, %y" -.\" End: Index: xc/doc/misc/xlogo.epsi diff -u xc/doc/misc/xlogo.epsi:1.1.1.2 xc/doc/misc/xlogo.epsi:removed --- xc/doc/misc/xlogo.epsi:1.1.1.2 Tue Jan 16 16:58:58 2001 +++ xc/doc/misc/xlogo.epsi Tue May 9 21:51:51 2006 @@ -1,100 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Title: X Logo -%%Creator: Stephen Gildea -%%BoundingBox: 0 0 44 44 -%%EndComments -% $Xorg: xlogo.epsi,v 1.3 2000/08/17 19:42:05 cpqbld Exp $ -%%BeginPreview: 44 44 1 44 -% fff0000000f0 -% 7ff8000001e0 -% 3ff8000003c0 -% 1ffc00000780 -% 1ffe00000780 -% 0fff00000f00 -% 07ff00001e00 -% 07ff80003c00 -% 03ffc0007800 -% 01ffc0007800 -% 00ffe000f000 -% 00fff001e000 -% 007ff803c000 -% 003ff8078000 -% 001ffc078000 -% 001ffe0f0000 -% 000fff1e0000 -% 0007ff3c0000 -% 0003ff3c0000 -% 0003fe780000 -% 0001fcf00000 -% 0000f9e00000 -% 000079f00000 -% 0000f3f80000 -% 0001e7fc0000 -% 0003cffc0000 -% 0003cffe0000 -% 00078fff0000 -% 000f07ff8000 -% 001e03ff8000 -% 001e01ffc000 -% 003c01ffe000 -% 007800fff000 -% 00f0007ff000 -% 01e0003ff800 -% 01e0003ffc00 -% 03c0001ffe00 -% 0780000ffe00 -% 0f00000fff00 -% 1e000007ff80 -% 1e000003ff80 -% 3c000001ffc0 -% 78000001ffe0 -% f0000000fff0 -%%EndPreview -% Draw the "official" X Window System Logo, designed by Danny Chong. -% Code translated from Xmu/DrawLogo.c by gildea, July 1994. -/size 44 def -/thin size 11 idiv def -/gap thin 3 add 4 idiv def -/d31 thin gap thin add add def -% Draw what will be the thin strokes. -newpath -size dup moveto -size d31 sub size lineto -0 0 lineto -d31 0 lineto -closepath -fill -% Erase area not needed for lower thin stroke. -1 setgray -newpath -d31 2 idiv 0 moveto -size 2 idiv dup lineto -size 2 idiv d31 d31 2 idiv sub add size 2 idiv lineto -d31 0 lineto -closepath -% Erase area not needed for upper thin stroke. -size d31 2 idiv sub size moveto -size 2 idiv dup lineto -size 2 idiv d31 dup 2 idiv sub sub size 2 idiv lineto -size d31 sub size lineto -closepath -fill -% Draw thick stroke. -0 setgray -newpath -0 size moveto -size 4 idiv size lineto -size 0 lineto -size dup 4 idiv sub 0 lineto -closepath -fill -% Erase to create gap. -1 setgray -newpath -size thin sub size moveto -size thin gap add sub size lineto -thin 0 lineto -thin gap add 0 lineto -closepath -fill -%%EOF Index: xc/doc/specs/Imakefile diff -u xc/doc/specs/Imakefile:1.13 xc/doc/specs/Imakefile:1.15 --- xc/doc/specs/Imakefile:1.13 Fri Jan 14 23:34:12 2005 +++ xc/doc/specs/Imakefile Tue Mar 29 12:33:22 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/doc/specs/Imakefile,v 1.13 2005/01/15 04:34:12 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/Imakefile,v 1.15 2005/03/29 17:33:22 tsi Exp $ #define IHaveSubdirs #define PassCDebugFlags @@ -8,13 +8,12 @@ #else SUBDIRS = BDF CTEXT FSProtocol GL ICCCM ICE PM Render SM X11 XDMCP \ XIM XLFD XProtocol Xaw Xext Xi Xmu Xserver Xt Xv XvMC \ - i18n programs rstart test xfs xterm xtrans + i18n programs rstart xfs xterm xtrans #endif AllTarget(specindex.html) MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) #if defined(AvoidGroffHtmlBug) && AvoidGroffHtmlBug SPECINDEXDEFS = -DICE_PDF_ONLY -DICCCM_PDF_ONLY Index: xc/doc/specs/BDF/Imakefile diff -u xc/doc/specs/BDF/Imakefile:1.2 xc/doc/specs/BDF/Imakefile:1.3 --- xc/doc/specs/BDF/Imakefile:1.2 Mon Apr 23 11:53:46 2001 +++ xc/doc/specs/BDF/Imakefile Mon Jan 9 09:56:26 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:06 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/BDF/Imakefile,v 1.2 2001/04/23 15:53:46 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/BDF/Imakefile,v 1.3 2006/01/09 14:56:26 dawes Exp $ MakeSimpleDoc(bdf,bdf.ms) Index: xc/doc/specs/BDF/bdf.ms diff -u xc/doc/specs/BDF/bdf.ms:1.1.1.6 xc/doc/specs/BDF/bdf.ms:1.2 --- xc/doc/specs/BDF/bdf.ms:1.1.1.6 Tue Jan 16 16:59:00 2001 +++ xc/doc/specs/BDF/bdf.ms Mon Jan 9 09:56:26 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: bdf.ms,v 1.3 2000/08/17 19:42:06 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/BDF/bdf.ms,v 1.2 2006/01/09 14:56:26 dawes Exp $ \& .sp 1 .ce 4 Index: xc/doc/specs/CTEXT/Imakefile diff -u xc/doc/specs/CTEXT/Imakefile:1.2 xc/doc/specs/CTEXT/Imakefile:1.3 --- xc/doc/specs/CTEXT/Imakefile:1.2 Mon Apr 23 11:53:47 2001 +++ xc/doc/specs/CTEXT/Imakefile Mon Jan 9 09:56:27 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:07 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/CTEXT/Imakefile,v 1.2 2001/04/23 15:53:47 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/CTEXT/Imakefile,v 1.3 2006/01/09 14:56:27 dawes Exp $ MakeTblDoc(ctext,ctext.tbl.ms) Index: xc/doc/specs/FSProtocol/Imakefile diff -u xc/doc/specs/FSProtocol/Imakefile:1.2 xc/doc/specs/FSProtocol/Imakefile:1.3 --- xc/doc/specs/FSProtocol/Imakefile:1.2 Mon Apr 23 11:53:48 2001 +++ xc/doc/specs/FSProtocol/Imakefile Mon Jan 9 09:56:27 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:07 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/FSProtocol/Imakefile,v 1.2 2001/04/23 15:53:48 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/FSProtocol/Imakefile,v 1.3 2006/01/09 14:56:27 dawes Exp $ MakeTblDoc(fsproto,protocol.ms) Index: xc/doc/specs/FSProtocol/protocol.ms diff -u xc/doc/specs/FSProtocol/protocol.ms:1.1.1.6 xc/doc/specs/FSProtocol/protocol.ms:1.2 --- xc/doc/specs/FSProtocol/protocol.ms:1.1.1.6 Tue Jan 16 16:59:03 2001 +++ xc/doc/specs/FSProtocol/protocol.ms Mon Jan 9 09:56:27 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: protocol.ms,v 1.3 2000/08/17 19:42:07 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/FSProtocol/protocol.ms,v 1.2 2006/01/09 14:56:27 dawes Exp $ .\" Use tbl, -ms, and macros.t .EH '''' .OH '''' Index: xc/doc/specs/ICCCM/icccm.ms diff -u xc/doc/specs/ICCCM/icccm.ms:1.3 xc/doc/specs/ICCCM/icccm.ms:1.4 --- xc/doc/specs/ICCCM/icccm.ms:1.3 Wed Jan 17 11:57:41 2001 +++ xc/doc/specs/ICCCM/icccm.ms Mon Jan 9 09:56:27 2006 @@ -1,9 +1,4 @@ -.\" $Xorg: icccm.ms,v 1.3 2000/08/17 19:42:08 cpqbld Exp $ -.\" -.\" -.\" -.\" -.\" $XFree86: xc/doc/specs/ICCCM/icccm.ms,v 1.3 2001/01/17 16:57:41 dawes Exp $ +.\" $XFree86: xc/doc/specs/ICCCM/icccm.ms,v 1.4 2006/01/09 14:56:27 dawes Exp $ .\" .\" Use tbl, eqn, -ms, and macros.t .\" @(#)icccm.ms 1.50 16 Apr 1994 14:13:55 Index: xc/doc/specs/ICE/ICElib.ms diff -u xc/doc/specs/ICE/ICElib.ms:1.1.1.5 xc/doc/specs/ICE/ICElib.ms:1.2 --- xc/doc/specs/ICE/ICElib.ms:1.1.1.5 Tue Jan 16 16:59:01 2001 +++ xc/doc/specs/ICE/ICElib.ms Mon Jan 9 09:56:27 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: ICElib.ms,v 1.3 2000/08/17 19:42:09 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/ICE/ICElib.ms,v 1.2 2006/01/09 14:56:27 dawes Exp $ .\" .\" Use tbl, -ms, and macros.t .\" Index: xc/doc/specs/SM/Imakefile diff -u xc/doc/specs/SM/Imakefile:1.2 xc/doc/specs/SM/Imakefile:1.3 --- xc/doc/specs/SM/Imakefile:1.2 Mon Apr 23 11:53:50 2001 +++ xc/doc/specs/SM/Imakefile Mon Jan 9 09:56:27 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:19 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/SM/Imakefile,v 1.2 2001/04/23 15:53:50 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/SM/Imakefile,v 1.3 2006/01/09 14:56:27 dawes Exp $ MakeEqnDoc(SMlib,SMlib.ms) Index: xc/doc/specs/SM/SMlib.ms diff -u xc/doc/specs/SM/SMlib.ms:1.1.1.5 xc/doc/specs/SM/SMlib.ms:1.2 --- xc/doc/specs/SM/SMlib.ms:1.1.1.5 Tue Jan 16 17:00:05 2001 +++ xc/doc/specs/SM/SMlib.ms Mon Jan 9 09:56:27 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: SMlib.ms,v 1.3 2000/08/17 19:42:19 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/SM/SMlib.ms,v 1.2 2006/01/09 14:56:27 dawes Exp $ .\" .\" Use tbl, -ms, and macros.t .\" edited for DP edits and code consistency w/ core protocol/xlib 4/18/96 Index: xc/doc/specs/SM/xsmp.ms diff -u xc/doc/specs/SM/xsmp.ms:1.2 xc/doc/specs/SM/xsmp.ms:1.3 --- xc/doc/specs/SM/xsmp.ms:1.2 Wed Jul 9 11:27:25 2003 +++ xc/doc/specs/SM/xsmp.ms Mon Jan 9 09:56:28 2006 @@ -1,6 +1,5 @@ .\" Use tbl, -ms, and macros.t -.\" $Xorg: xsmp.ms,v 1.3 2000/08/17 19:42:19 cpqbld Exp $ -.\" $XFree86: xc/doc/specs/SM/xsmp.ms,v 1.2 2003/07/09 15:27:25 tsi Exp $ +.\" $XFree86: xc/doc/specs/SM/xsmp.ms,v 1.3 2006/01/09 14:56:28 dawes Exp $ .EH '''' .OH '''' .EF '''' Index: xc/doc/specs/XDMCP/Imakefile diff -u xc/doc/specs/XDMCP/Imakefile:1.2 xc/doc/specs/XDMCP/Imakefile:1.3 --- xc/doc/specs/XDMCP/Imakefile:1.2 Mon Apr 23 11:53:51 2001 +++ xc/doc/specs/XDMCP/Imakefile Mon Jan 9 09:56:28 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:20 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/XDMCP/Imakefile,v 1.2 2001/04/23 15:53:51 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/XDMCP/Imakefile,v 1.3 2006/01/09 14:56:28 dawes Exp $ MakeEqnDoc(xdmcp,xdmcp.ms) Index: xc/doc/specs/XDMCP/xdmcp.ms diff -u xc/doc/specs/XDMCP/xdmcp.ms:1.3 xc/doc/specs/XDMCP/xdmcp.ms:1.4 --- xc/doc/specs/XDMCP/xdmcp.ms:1.3 Fri Nov 21 23:50:59 2003 +++ xc/doc/specs/XDMCP/xdmcp.ms Mon Jan 9 09:56:28 2006 @@ -1,6 +1,5 @@ .\" Use eqn, tbl, and -ms -.\" $Xorg: xdmcp.ms,v 1.3 2000/08/17 19:42:20 cpqbld Exp $ -.\" $XFree86: xc/doc/specs/XDMCP/xdmcp.ms,v 1.3 2003/11/22 04:50:59 dawes Exp $ +.\" $XFree86: xc/doc/specs/XDMCP/xdmcp.ms,v 1.4 2006/01/09 14:56:28 dawes Exp $ .EQ delim @@ define oc % "\\fR{\\fP" % Index: xc/doc/specs/XIM/Imakefile diff -u xc/doc/specs/XIM/Imakefile:1.2 xc/doc/specs/XIM/Imakefile:1.3 --- xc/doc/specs/XIM/Imakefile:1.2 Mon Apr 23 11:53:52 2001 +++ xc/doc/specs/XIM/Imakefile Mon Jan 9 09:56:28 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:21 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/XIM/Imakefile,v 1.2 2001/04/23 15:53:52 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/XIM/Imakefile,v 1.3 2006/01/09 14:56:28 dawes Exp $ MakeTblDoc(xim,xim.ms) Index: xc/doc/specs/XIM/xim.ms diff -u xc/doc/specs/XIM/xim.ms:1.3 xc/doc/specs/XIM/xim.ms:1.4 --- xc/doc/specs/XIM/xim.ms:1.3 Wed Jan 17 11:57:42 2001 +++ xc/doc/specs/XIM/xim.ms Mon Jan 9 09:56:28 2006 @@ -1,6 +1,5 @@ -.\" $Xorg: xim.ms,v 1.3 2000/08/17 19:42:21 cpqbld Exp $ .\" To print this out, type tbl macros.t ThisFile | troff -ms -.\" $XFree86: xc/doc/specs/XIM/xim.ms,v 1.3 2001/01/17 16:57:42 dawes Exp $ +.\" $XFree86: xc/doc/specs/XIM/xim.ms,v 1.4 2006/01/09 14:56:28 dawes Exp $ .EH '''' .OH '''' .EF '''' Index: xc/doc/specs/XLFD/Imakefile diff -u xc/doc/specs/XLFD/Imakefile:1.2 xc/doc/specs/XLFD/Imakefile:1.3 --- xc/doc/specs/XLFD/Imakefile:1.2 Mon Apr 23 11:53:52 2001 +++ xc/doc/specs/XLFD/Imakefile Mon Jan 9 09:56:28 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:22 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/XLFD/Imakefile,v 1.2 2001/04/23 15:53:52 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/XLFD/Imakefile,v 1.3 2006/01/09 14:56:28 dawes Exp $ MakeTblDoc(xlfd,xlfd.tbl.ms) Index: xc/doc/specs/XLFD/xlfd.tbl.ms diff -u xc/doc/specs/XLFD/xlfd.tbl.ms:1.1.1.5 xc/doc/specs/XLFD/xlfd.tbl.ms:1.2 --- xc/doc/specs/XLFD/xlfd.tbl.ms:1.1.1.5 Tue Jan 16 17:01:52 2001 +++ xc/doc/specs/XLFD/xlfd.tbl.ms Mon Jan 9 09:56:28 2006 @@ -1,5 +1,5 @@ .\" Use tbl and -ms and macros.t -*- Nroff -*- -.\" $Xorg: xlfd.tbl.ms,v 1.3 2000/08/17 19:42:22 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/XLFD/xlfd.tbl.ms,v 1.2 2006/01/09 14:56:28 dawes Exp $ .nr sM 4 \" section on Matrix Transformations .nr sS 5 \" section on Scalable fonts .nr sP 6 \" section on Polymorphic font support Index: xc/doc/specs/XProtocol/Imakefile diff -u xc/doc/specs/XProtocol/Imakefile:1.2 xc/doc/specs/XProtocol/Imakefile:1.3 --- xc/doc/specs/XProtocol/Imakefile:1.2 Mon Apr 23 11:53:53 2001 +++ xc/doc/specs/XProtocol/Imakefile Mon Jan 9 09:56:29 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:23 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/XProtocol/Imakefile,v 1.2 2001/04/23 15:53:53 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/XProtocol/Imakefile,v 1.3 2006/01/09 14:56:29 dawes Exp $ SRCS = X11.protocol X11.keysyms X11.encoding glossary postproc Index: xc/doc/specs/XProtocol/X11.encoding diff -u xc/doc/specs/XProtocol/X11.encoding:1.2 xc/doc/specs/XProtocol/X11.encoding:1.3 --- xc/doc/specs/XProtocol/X11.encoding:1.2 Wed Jul 9 11:27:26 2003 +++ xc/doc/specs/XProtocol/X11.encoding Mon Jan 9 09:56:29 2006 @@ -1,5 +1,4 @@ -.\" $Xorg: X11.encoding,v 1.3 2000/08/17 19:42:23 cpqbld Exp $ -.\" $XFree86: xc/doc/specs/XProtocol/X11.encoding,v 1.2 2003/07/09 15:27:26 tsi Exp $ +.\" $XFree86: xc/doc/specs/XProtocol/X11.encoding,v 1.3 2006/01/09 14:56:29 dawes Exp $ \& .sp 1 .ps 11 Index: xc/doc/specs/XProtocol/X11.keysyms diff -u xc/doc/specs/XProtocol/X11.keysyms:1.1.1.3 xc/doc/specs/XProtocol/X11.keysyms:1.2 --- xc/doc/specs/XProtocol/X11.keysyms:1.1.1.3 Tue Jan 16 17:02:39 2001 +++ xc/doc/specs/XProtocol/X11.keysyms Mon Jan 9 09:56:29 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: X11.keysyms,v 1.3 2000/08/17 19:42:23 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/XProtocol/X11.keysyms,v 1.2 2006/01/09 14:56:29 dawes Exp $ \& .sp 1 .ps 11 Index: xc/doc/specs/XProtocol/X11.protocol diff -u xc/doc/specs/XProtocol/X11.protocol:1.5 xc/doc/specs/XProtocol/X11.protocol:1.6 --- xc/doc/specs/XProtocol/X11.protocol:1.5 Thu Dec 11 16:24:37 2003 +++ xc/doc/specs/XProtocol/X11.protocol Mon Jan 9 09:56:29 2006 @@ -1,9 +1,4 @@ -.\" $Xorg: X11.protocol,v 1.4 $ -.\" -.\" -.\" -.\" -.\" $XFree86: xc/doc/specs/XProtocol/X11.protocol,v 1.5 2003/12/11 21:24:37 herrb Exp $ +.\" $XFree86: xc/doc/specs/XProtocol/X11.protocol,v 1.6 2006/01/09 14:56:29 dawes Exp $ .EH '''' .OH '''' .EF '''' Index: xc/doc/specs/XProtocol/glossary diff -u xc/doc/specs/XProtocol/glossary:1.1.1.2 xc/doc/specs/XProtocol/glossary:1.2 --- xc/doc/specs/XProtocol/glossary:1.1.1.2 Tue Jan 16 17:02:42 2001 +++ xc/doc/specs/XProtocol/glossary Mon Jan 9 09:56:29 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: glossary,v 1.3 2000/08/17 19:42:25 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/XProtocol/glossary,v 1.2 2006/01/09 14:56:29 dawes Exp $ .ps 11 .nr PS 11 \& Index: xc/doc/specs/Xaw/AsciiSink diff -u xc/doc/specs/Xaw/AsciiSink:1.1.1.3 xc/doc/specs/Xaw/AsciiSink:1.2 --- xc/doc/specs/Xaw/AsciiSink:1.1.1.3 Tue Jan 16 17:02:43 2001 +++ xc/doc/specs/Xaw/AsciiSink Mon Jan 9 09:56:29 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: AsciiSink,v 1.3 2000/08/17 19:42:25 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/AsciiSink,v 1.2 2006/01/09 14:56:29 dawes Exp $ .LP .NH 2 Ascii Sink Object and Multi Sink Object Index: xc/doc/specs/Xaw/AsciiSource diff -u xc/doc/specs/Xaw/AsciiSource:1.2 xc/doc/specs/Xaw/AsciiSource:1.3 --- xc/doc/specs/Xaw/AsciiSource:1.2 Wed Aug 14 17:52:34 2002 +++ xc/doc/specs/Xaw/AsciiSource Mon Jan 9 09:56:29 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: AsciiSource,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/AsciiSource,v 1.3 2006/01/09 14:56:29 dawes Exp $ .NH 2 Ascii Source Object and Multi Source Object .LP Index: xc/doc/specs/Xaw/AsciiText diff -u xc/doc/specs/Xaw/AsciiText:1.2 xc/doc/specs/Xaw/AsciiText:1.3 --- xc/doc/specs/Xaw/AsciiText:1.2 Wed Aug 14 17:52:34 2002 +++ xc/doc/specs/Xaw/AsciiText Mon Jan 9 09:56:29 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: AsciiText,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/AsciiText,v 1.3 2006/01/09 14:56:29 dawes Exp $ .NH 2 Ascii Text Widget .LP Index: xc/doc/specs/Xaw/Box diff -u xc/doc/specs/Xaw/Box:1.1.1.3 xc/doc/specs/Xaw/Box:1.2 --- xc/doc/specs/Xaw/Box:1.1.1.3 Tue Jan 16 17:02:43 2001 +++ xc/doc/specs/Xaw/Box Mon Jan 9 09:56:29 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Box,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Box,v 1.2 2006/01/09 14:56:29 dawes Exp $ .NH 2 Box Widget .LP Index: xc/doc/specs/Xaw/CH1 diff -u xc/doc/specs/Xaw/CH1:1.1.1.6 xc/doc/specs/Xaw/CH1:1.2 --- xc/doc/specs/Xaw/CH1:1.1.1.6 Tue Jan 16 17:02:44 2001 +++ xc/doc/specs/Xaw/CH1 Mon Jan 9 09:56:29 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH1,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/CH1,v 1.2 2006/01/09 14:56:29 dawes Exp $ .ps 11 .nr PS 11 .ds LH \fBAthena Widget Set\fP Index: xc/doc/specs/Xaw/CH2 diff -u xc/doc/specs/Xaw/CH2:1.1.1.3 xc/doc/specs/Xaw/CH2:1.2 --- xc/doc/specs/Xaw/CH2:1.1.1.3 Tue Jan 16 17:02:45 2001 +++ xc/doc/specs/Xaw/CH2 Mon Jan 9 09:56:29 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH2,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/CH2,v 1.2 2006/01/09 14:56:29 dawes Exp $ .bp \& .sp 1 Index: xc/doc/specs/Xaw/CH5.intro diff -u xc/doc/specs/Xaw/CH5.intro:1.1.1.3 xc/doc/specs/Xaw/CH5.intro:1.2 --- xc/doc/specs/Xaw/CH5.intro:1.1.1.3 Tue Jan 16 17:02:46 2001 +++ xc/doc/specs/Xaw/CH5.intro Mon Jan 9 09:56:29 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH5.intro,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/CH5.intro,v 1.2 2006/01/09 14:56:29 dawes Exp $ .LP .bp \& Index: xc/doc/specs/Xaw/Command diff -u xc/doc/specs/Xaw/Command:1.1.1.3 xc/doc/specs/Xaw/Command:1.2 --- xc/doc/specs/Xaw/Command:1.1.1.3 Tue Jan 16 17:02:47 2001 +++ xc/doc/specs/Xaw/Command Mon Jan 9 09:56:29 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Command,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Command,v 1.2 2006/01/09 14:56:29 dawes Exp $ .NH 2 Command Widget .XS Index: xc/doc/specs/Xaw/Dialog diff -u xc/doc/specs/Xaw/Dialog:1.1.1.3 xc/doc/specs/Xaw/Dialog:1.2 --- xc/doc/specs/Xaw/Dialog:1.1.1.3 Tue Jan 16 17:02:47 2001 +++ xc/doc/specs/Xaw/Dialog Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Dialog,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Dialog,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Dialog Widget .LP Index: xc/doc/specs/Xaw/Form diff -u xc/doc/specs/Xaw/Form:1.2 xc/doc/specs/Xaw/Form:1.3 --- xc/doc/specs/Xaw/Form:1.2 Wed Aug 14 17:52:34 2002 +++ xc/doc/specs/Xaw/Form Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Form,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Form,v 1.3 2006/01/09 14:56:30 dawes Exp $ .NH 2 Form Widget .LP Index: xc/doc/specs/Xaw/Grip diff -u xc/doc/specs/Xaw/Grip:1.1.1.3 xc/doc/specs/Xaw/Grip:1.2 --- xc/doc/specs/Xaw/Grip:1.1.1.3 Tue Jan 16 17:02:48 2001 +++ xc/doc/specs/Xaw/Grip Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Grip,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Grip,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Grip Widget .XS Index: xc/doc/specs/Xaw/Imakefile diff -u xc/doc/specs/Xaw/Imakefile:1.3 xc/doc/specs/Xaw/Imakefile:1.4 --- xc/doc/specs/Xaw/Imakefile:1.3 Fri Apr 27 08:58:27 2001 +++ xc/doc/specs/Xaw/Imakefile Mon Jan 9 09:56:30 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:26 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/Xaw/Imakefile,v 1.3 2001/04/27 12:58:27 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/Xaw/Imakefile,v 1.4 2006/01/09 14:56:30 dawes Exp $ EVERYWHERE=strings.mit strings.xaw CHAPTER1=CH1 Index: xc/doc/specs/Xaw/Label diff -u xc/doc/specs/Xaw/Label:1.1.1.3 xc/doc/specs/Xaw/Label:1.2 --- xc/doc/specs/Xaw/Label:1.1.1.3 Tue Jan 16 17:02:48 2001 +++ xc/doc/specs/Xaw/Label Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Label,v 1.3 2000/08/17 19:42:27 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Label,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Label Widget .XS Index: xc/doc/specs/Xaw/List diff -u xc/doc/specs/Xaw/List:1.1.1.3 xc/doc/specs/Xaw/List:1.2 --- xc/doc/specs/Xaw/List:1.1.1.3 Tue Jan 16 17:02:49 2001 +++ xc/doc/specs/Xaw/List Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: List,v 1.3 2000/08/17 19:42:27 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/List,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 List Widget .LP Index: xc/doc/specs/Xaw/MenuButton diff -u xc/doc/specs/Xaw/MenuButton:1.1.1.3 xc/doc/specs/Xaw/MenuButton:1.2 --- xc/doc/specs/Xaw/MenuButton:1.1.1.3 Tue Jan 16 17:02:49 2001 +++ xc/doc/specs/Xaw/MenuButton Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: MenuButton,v 1.3 2000/08/17 19:42:27 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/MenuButton,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 MenuButton Widget .XS Index: xc/doc/specs/Xaw/Paned diff -u xc/doc/specs/Xaw/Paned:1.1.1.3 xc/doc/specs/Xaw/Paned:1.2 --- xc/doc/specs/Xaw/Paned:1.1.1.3 Tue Jan 16 17:02:49 2001 +++ xc/doc/specs/Xaw/Paned Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Paned,v 1.3 2000/08/17 19:42:27 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Paned,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Paned Widget .LP Index: xc/doc/specs/Xaw/Panner diff -u xc/doc/specs/Xaw/Panner:1.1.1.3 xc/doc/specs/Xaw/Panner:1.2 --- xc/doc/specs/Xaw/Panner:1.1.1.3 Tue Jan 16 17:02:50 2001 +++ xc/doc/specs/Xaw/Panner Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Panner,v 1.3 2000/08/17 19:42:27 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Panner,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Panner Widget .LP Index: xc/doc/specs/Xaw/Porthole diff -u xc/doc/specs/Xaw/Porthole:1.1.1.3 xc/doc/specs/Xaw/Porthole:1.2 --- xc/doc/specs/Xaw/Porthole:1.1.1.3 Tue Jan 16 17:02:50 2001 +++ xc/doc/specs/Xaw/Porthole Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Porthole,v 1.3 2000/08/17 19:42:27 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Porthole,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Porthole Widget .LP Index: xc/doc/specs/Xaw/Repeater diff -u xc/doc/specs/Xaw/Repeater:1.1.1.3 xc/doc/specs/Xaw/Repeater:1.2 --- xc/doc/specs/Xaw/Repeater:1.1.1.3 Tue Jan 16 17:02:50 2001 +++ xc/doc/specs/Xaw/Repeater Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Repeater,v 1.3 2000/08/17 19:42:27 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Repeater,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Repeater Widget .XS Index: xc/doc/specs/Xaw/Scrollbar diff -u xc/doc/specs/Xaw/Scrollbar:1.1.1.3 xc/doc/specs/Xaw/Scrollbar:1.2 --- xc/doc/specs/Xaw/Scrollbar:1.1.1.3 Tue Jan 16 17:02:50 2001 +++ xc/doc/specs/Xaw/Scrollbar Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Scrollbar,v 1.3 2000/08/17 19:42:27 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Scrollbar,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Scrollbar Widget .LP Index: xc/doc/specs/Xaw/Simple diff -u xc/doc/specs/Xaw/Simple:1.1.1.3 xc/doc/specs/Xaw/Simple:1.2 --- xc/doc/specs/Xaw/Simple:1.1.1.3 Tue Jan 16 17:02:51 2001 +++ xc/doc/specs/Xaw/Simple Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Simple,v 1.3 2000/08/17 19:42:27 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Simple,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Simple Widget .XS Index: xc/doc/specs/Xaw/SimpleMenu diff -u xc/doc/specs/Xaw/SimpleMenu:1.1.1.3 xc/doc/specs/Xaw/SimpleMenu:1.2 --- xc/doc/specs/Xaw/SimpleMenu:1.1.1.3 Tue Jan 16 17:02:51 2001 +++ xc/doc/specs/Xaw/SimpleMenu Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: SimpleMenu,v 1.3 2000/08/17 19:42:27 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/SimpleMenu,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 SimpleMenu Widget .XS Index: xc/doc/specs/Xaw/Sme diff -u xc/doc/specs/Xaw/Sme:1.1.1.3 xc/doc/specs/Xaw/Sme:1.2 --- xc/doc/specs/Xaw/Sme:1.1.1.3 Tue Jan 16 17:02:52 2001 +++ xc/doc/specs/Xaw/Sme Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Sme,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Sme,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Sme Object .LP Index: xc/doc/specs/Xaw/SmeBSB diff -u xc/doc/specs/Xaw/SmeBSB:1.1.1.3 xc/doc/specs/Xaw/SmeBSB:1.2 --- xc/doc/specs/Xaw/SmeBSB:1.1.1.3 Tue Jan 16 17:02:52 2001 +++ xc/doc/specs/Xaw/SmeBSB Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: SmeBSB,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/SmeBSB,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 SmeBSB Object .LP Index: xc/doc/specs/Xaw/SmeLine diff -u xc/doc/specs/Xaw/SmeLine:1.1.1.3 xc/doc/specs/Xaw/SmeLine:1.2 --- xc/doc/specs/Xaw/SmeLine:1.1.1.3 Tue Jan 16 17:02:52 2001 +++ xc/doc/specs/Xaw/SmeLine Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: SmeLine,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/SmeLine,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 SmeLine Object .LP Index: xc/doc/specs/Xaw/StripChart diff -u xc/doc/specs/Xaw/StripChart:1.1.1.3 xc/doc/specs/Xaw/StripChart:1.2 --- xc/doc/specs/Xaw/StripChart:1.1.1.3 Tue Jan 16 17:02:53 2001 +++ xc/doc/specs/Xaw/StripChart Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: StripChart,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/StripChart,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 StripChart Widget .XS Index: xc/doc/specs/Xaw/TPage_Credits diff -u xc/doc/specs/Xaw/TPage_Credits:1.1.1.6 xc/doc/specs/Xaw/TPage_Credits:1.2 --- xc/doc/specs/Xaw/TPage_Credits:1.1.1.6 Tue Jan 16 17:02:53 2001 +++ xc/doc/specs/Xaw/TPage_Credits Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: TPage_Credits,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/TPage_Credits,v 1.2 2006/01/09 14:56:30 dawes Exp $ .ds CH .ds CF .ps 11 Index: xc/doc/specs/Xaw/Template diff -u xc/doc/specs/Xaw/Template:1.1.1.3 xc/doc/specs/Xaw/Template:1.3 --- xc/doc/specs/Xaw/Template:1.1.1.3 Tue Jan 16 17:02:53 2001 +++ xc/doc/specs/Xaw/Template Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Template,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Template,v 1.3 2006/01/09 14:56:30 dawes Exp $ All Athena widgets have three separate files associated with them: .LP .IP \(bu 3 @@ -58,12 +58,38 @@ .. .CB .\".so ../../lib/Xaw/Template.h -/* XConsortium: Template.h,v 1.2 88/10/25 17:22:09 swick Exp $ */ -/* Copyright (c) X Consortium 1987, 1988 */ +/* + +Copyright 1987, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ +/* $XFree86: xc/doc/specs/Xaw/Template,v 1.3 2006/01/09 14:56:30 dawes Exp $ */ #ifndef _Template_h #define _Template_h +#include + /**************************************************************** * * Template widget @@ -72,37 +98,35 @@ /* Resources: - Name Class RepType Default Value - ---- ----- ------- ------------- - background Background Pixel XtDefaultBackground - border BorderColor Pixel XtDefaultForeground - borderWidth BorderWidth Dimension 1 - destroyCallback Callback Pointer NULL - height Height Dimension 0 - mappedWhenManaged MappedWhenManaged Boolean True - sensitive Sensitive Boolean True - width Width Dimension 0 - x Position Position 0 - y Position Position 0 + Name Class RepType Default Value + ---- ----- ------- ------------- + background Background Pixel XtDefaultBackground + border BorderColor Pixel XtDefaultForeground + borderWidth BorderWidth Dimension 1 + destroyCallback Callback Pointer NULL + height Height Dimension 0 + mappedWhenManaged MappedWhenManaged Boolean True + sensitive Sensitive Boolean True + width Width Dimension 0 + x Position Position 0 + y Position Position 0 */ /* define any special resource names here that are not in */ - #define XtNtemplateResource "templateResource" #define XtCTemplateResource "TemplateResource" /* declare specific TemplateWidget class and instance datatypes */ - -typedef struct _TemplateClassRec* TemplateWidgetClass; -typedef struct _TemplateRec* TemplateWidget; +typedef struct _TemplateClassRec *TemplateWidgetClass; +typedef struct _TemplateRec *TemplateWidget; /* declare the class constant */ - extern WidgetClass templateWidgetClass; #endif /* _Template_h */ + .CE .LP .sp @@ -158,45 +182,74 @@ are: .CB .\".so ../../lib/Xaw/TemplateP.h -/* XConsortium: TemplateP.h,v 1.2 88/10/25 17:31:47 swick Exp $ */ -/* Copyright (c) X Consortium 1987, 1988 - */ +/* + +Copyright 1987, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ +/* $XFree86: xc/doc/specs/Xaw/Template,v 1.3 2006/01/09 14:56:30 dawes Exp $ */ #ifndef _TemplateP_h #define _TemplateP_h #include + /* include superclass private header file */ #include /* define unique representation types not found in */ - #define XtRTemplateResource "TemplateResource" typedef struct { - int empty; + XtPointer extension; } TemplateClassPart; typedef struct _TemplateClassRec { - CoreClassPart core_class; - TemplateClassPart template_class; + CoreClassPart core_class; + TemplateClassPart template_class; } TemplateClassRec; extern TemplateClassRec templateClassRec; typedef struct { - /* resources */ - char* resource; - /* private state */ + /* resources */ + char* resource; + /* private */ + char *private; } TemplatePart; typedef struct _TemplateRec { - CorePart core; - TemplatePart template; + CorePart core; +#if defined(__cplusplus) || defined(c_plusplus) + TemplatePart c_template; +#else + TemplatePart template; +#endif } TemplateRec; #endif /* _TemplateP_h */ + .CE .LP .sp @@ -234,72 +287,129 @@ are: .CB .\".so ../../lib/Xaw/Template.c -/* XConsortium: Template.c,v 1.2 88/10/25 17:40:25 swick Exp $ */ -/* Copyright (c) X Consortium 1987, 1988 - */ +/* + +Copyright 1987, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ +/* $XFree86: xc/doc/specs/Xaw/Template,v 1.3 2006/01/09 14:56:30 dawes Exp $ */ #include #include -#include "TemplateP.h" +#include -static XtResource resources[] = { +/* + * Class Methods + */ +static void TemplateInitialize(Widget, Widget, ArgList, Cardinal*); + +/* + * Prototypes + */ +static Bool TemplateFunction(TemplateWidget, int, int, Bool); + +/* + * Actions + */ +static void TemplateAction(Widget, XEvent*, String*, Cardinal*); + +/* + * Initialization + */ #define offset(field) XtOffsetOf(TemplateRec, template.field) - /* {name, class, type, size, offset, default_type, default_addr}, */ - { XtNtemplateResource, XtCTemplateResource, XtRTemplateResource, - sizeof(char*), offset(resource), XtRString, (XtPointer) "default" }, -#undef offset +static XtResource resources[] = { +/*{ + name, + class, + type, + size, + offset, + default_type, + default_addr + },*/ + { + XtNtemplateResource, + XtCTemplateResource, + XtRTemplateResource, + sizeof(char*), + offset(resource), + XtRString, + (XtPointer)"default" + }, }; - -static void TemplateAction(/* Widget, XEvent*, String*, Cardinal* */); +#undef offset static XtActionsRec actions[] = { - /* {name, procedure}, */ - {"template", TemplateAction}, + /*{name, procedure},*/ + {"template", TemplateAction}, }; static char translations[] = -" : template(\|) \\n\\ -"; +":" "template()\n" +; +#define Superclass (&widgetClassRec) TemplateClassRec templateClassRec = { - { /* core fields */ - /* superclass */ (WidgetClass) &widgetClassRec, - /* class_name */ "Template", - /* widget_size */ sizeof(TemplateRec), - /* class_initialize */ NULL, - /* class_part_initialize */ NULL, - /* class_inited */ FALSE, - /* initialize */ NULL, - /* initialize_hook */ NULL, - /* realize */ XtInheritRealize, - /* actions */ actions, - /* num_actions */ XtNumber(actions), - /* resources */ resources, - /* num_resources */ XtNumber(resources), - /* xrm_class */ NULLQUARK, - /* compress_motion */ TRUE, - /* compress_exposure */ TRUE, - /* compress_enterleave */ TRUE, - /* visible_interest */ FALSE, - /* destroy */ NULL, - /* resize */ NULL, - /* expose */ NULL, - /* set_values */ NULL, - /* set_values_hook */ NULL, - /* set_values_almost */ XtInheritSetValuesAlmost, - /* get_values_hook */ NULL, - /* accept_focus */ NULL, - /* version */ XtVersion, - /* callback_private */ NULL, - /* tm_table */ translations, - /* query_geometry */ XtInheritQueryGeometry, - /* display_accelerator */ XtInheritDisplayAccelerator, - /* extension */ NULL + /* core */ + { + (WidgetClass)Superclass, /* superclass */ + "Template", /* class_name */ + sizeof(TemplateRec), /* widget_size */ + NULL, /* class_initialize */ + NULL, /* class_part_initialize */ + False, /* class_inited */ + TemplateInitialize, /* initialize */ + NULL, /* initialize_hook */ + XtInheritRealize, /* realize */ + actions, /* actions */ + XtNumber(actions), /* num_actions */ + resources, /* resources */ + XtNumber(resources), /* num_resources */ + NULLQUARK, /* xrm_class */ + True, /* compress_motion */ + True, /* compress_exposure */ + True, /* compress_enterleave */ + False, /* visible_interest */ + NULL, /* destroy */ + NULL, /* resize */ + NULL, /* expose */ + NULL, /* set_values */ + NULL, /* set_values_hook */ + XtInheritSetValuesAlmost, /* set_values_almost */ + NULL, /* get_values_hook */ + NULL, /* accept_focus */ + XtVersion, /* version */ + NULL, /* callback_private */ + translations, /* tm_table */ + XtInheritQueryGeometry, /* query_geometry */ + XtInheritDisplayAccelerator, /* display_accelerator */ + NULL, /* extension */ }, - { /* template fields */ - /* empty */ 0 + /* template */ + { + NULL, /* extension */ } }; Index: xc/doc/specs/Xaw/Text diff -u xc/doc/specs/Xaw/Text:1.2 xc/doc/specs/Xaw/Text:1.3 --- xc/doc/specs/Xaw/Text:1.2 Wed Aug 14 17:52:34 2002 +++ xc/doc/specs/Xaw/Text Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Text,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Text,v 1.3 2006/01/09 14:56:30 dawes Exp $ .NH 2 Text Widget .LP Index: xc/doc/specs/Xaw/TextActions diff -u xc/doc/specs/Xaw/TextActions:1.1.1.3 xc/doc/specs/Xaw/TextActions:1.2 --- xc/doc/specs/Xaw/TextActions:1.1.1.3 Tue Jan 16 17:02:54 2001 +++ xc/doc/specs/Xaw/TextActions Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: TextActions,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/TextActions,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Text Widget Actions .LP Index: xc/doc/specs/Xaw/TextFuncs diff -u xc/doc/specs/Xaw/TextFuncs:1.1.1.3 xc/doc/specs/Xaw/TextFuncs:1.2 --- xc/doc/specs/Xaw/TextFuncs:1.1.1.3 Tue Jan 16 17:02:55 2001 +++ xc/doc/specs/Xaw/TextFuncs Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: TextFuncs,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/TextFuncs,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 Text Functions .XS Index: xc/doc/specs/Xaw/TextSink diff -u xc/doc/specs/Xaw/TextSink:1.1.1.3 xc/doc/specs/Xaw/TextSink:1.2 --- xc/doc/specs/Xaw/TextSink:1.1.1.3 Tue Jan 16 17:02:55 2001 +++ xc/doc/specs/Xaw/TextSink Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: TextSink,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/TextSink,v 1.2 2006/01/09 14:56:30 dawes Exp $ .NH 2 TextSink Object .LP Index: xc/doc/specs/Xaw/TextSource diff -u xc/doc/specs/Xaw/TextSource:1.2 xc/doc/specs/Xaw/TextSource:1.3 --- xc/doc/specs/Xaw/TextSource:1.2 Thu Jul 4 13:04:19 2002 +++ xc/doc/specs/Xaw/TextSource Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: TextSource,v 1.3 2000/08/17 19:42:28 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/TextSource,v 1.3 2006/01/09 14:56:30 dawes Exp $ .NH 2 TextSrc Object .LP Index: xc/doc/specs/Xaw/Toggle diff -u xc/doc/specs/Xaw/Toggle:1.2 xc/doc/specs/Xaw/Toggle:1.3 --- xc/doc/specs/Xaw/Toggle:1.2 Wed Aug 14 17:52:34 2002 +++ xc/doc/specs/Xaw/Toggle Mon Jan 9 09:56:30 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Toggle,v 1.3 2000/08/17 19:42:29 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Toggle,v 1.3 2006/01/09 14:56:30 dawes Exp $ .NH 2 Toggle Widget .XS Index: xc/doc/specs/Xaw/Tree diff -u xc/doc/specs/Xaw/Tree:1.1.1.3 xc/doc/specs/Xaw/Tree:1.2 --- xc/doc/specs/Xaw/Tree:1.1.1.3 Tue Jan 16 17:02:56 2001 +++ xc/doc/specs/Xaw/Tree Mon Jan 9 09:56:31 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Tree,v 1.3 2000/08/17 19:42:29 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Tree,v 1.2 2006/01/09 14:56:31 dawes Exp $ .NH 2 Tree Widget .LP Index: xc/doc/specs/Xaw/Viewport diff -u xc/doc/specs/Xaw/Viewport:1.1.1.3 xc/doc/specs/Xaw/Viewport:1.2 --- xc/doc/specs/Xaw/Viewport:1.1.1.3 Tue Jan 16 17:02:57 2001 +++ xc/doc/specs/Xaw/Viewport Mon Jan 9 09:56:31 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Viewport,v 1.3 2000/08/17 19:42:29 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/Viewport,v 1.2 2006/01/09 14:56:31 dawes Exp $ .NH 2 Viewport Widget .LP Index: xc/doc/specs/Xaw/Xtk.widgets diff -u xc/doc/specs/Xaw/Xtk.widgets:1.1.1.1 xc/doc/specs/Xaw/Xtk.widgets:1.3 --- xc/doc/specs/Xaw/Xtk.widgets:1.1.1.1 Wed Apr 27 03:23:50 1994 +++ xc/doc/specs/Xaw/Xtk.widgets Mon Jan 9 09:56:31 2006 @@ -1,3 +1,4 @@ +.\" $XFree86: xc/doc/specs/Xaw/Xtk.widgets,v 1.3 2006/01/09 14:56:31 dawes Exp $ \& .sp 1 .ce 3 @@ -5597,14 +5598,39 @@ .. .CB .\".so ../../lib/Xaw/Template.h -#include -/* XConsortium: Template.h,v 1.2 88/10/25 17:22:09 swick Exp $ */ -/* Copyright (c) X Consortium 1987, 1988 */ +/* + +Copyright 1987, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ +/* $XFree86: xc/doc/specs/Xaw/Xtk.widgets,v 1.3 2006/01/09 14:56:31 dawes Exp $ */ #ifndef _Template_h #define _Template_h +#include + /**************************************************************** * * Template widget @@ -5613,37 +5639,34 @@ /* Resources: - Name Class RepType Default Value - ---- ----- ------- ------------- - background Background Pixel XtDefaultBackground - border BorderColor Pixel XtDefaultForeground - borderWidth BorderWidth Dimension 1 - destroyCallback Callback Pointer NULL - height Height Dimension 0 - mappedWhenManaged MappedWhenManaged Boolean True - sensitive Sensitive Boolean True - width Width Dimension 0 - x Position Position 0 - y Position Position 0 + Name Class RepType Default Value + ---- ----- ------- ------------- + background Background Pixel XtDefaultBackground + border BorderColor Pixel XtDefaultForeground + borderWidth BorderWidth Dimension 1 + destroyCallback Callback Pointer NULL + height Height Dimension 0 + mappedWhenManaged MappedWhenManaged Boolean True + sensitive Sensitive Boolean True + width Width Dimension 0 + x Position Position 0 + y Position Position 0 */ /* define any special resource names here that are not in */ +#define XtNtemplateResource "templateResource" -#define XtNtemplateResource "templateResource" - -#define XtCTemplateResource "TemplateResource" +#define XtCTemplateResource "TemplateResource" /* declare specific TemplateWidget class and instance datatypes */ - -typedef struct _TemplateClassRec* TemplateWidgetClass; -typedef struct _TemplateRec* TemplateWidget; +typedef struct _TemplateClassRec *TemplateWidgetClass; +typedef struct _TemplateRec *TemplateWidget; /* declare the class constant */ - extern WidgetClass templateWidgetClass; -#endif _Template_h +#endif /* _Template_h */ .CE .LP @@ -5701,45 +5724,73 @@ are: .CB .\".so ../../lib/Xaw/TemplateP.h -#include -/* XConsortium: TemplateP.h,v 1.2 88/10/25 17:31:47 swick Exp $ */ -/* Copyright (c) X Consortium 1987, 1988 */ +/* + +Copyright 1987, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ +/* $XFree86: xc/doc/specs/Xaw/Xtk.widgets,v 1.3 2006/01/09 14:56:31 dawes Exp $ */ #ifndef _TemplateP_h #define _TemplateP_h -#include "Template.h" +#include + /* include superclass private header file */ #include /* define unique representation types not found in */ - -#define XtRTemplateResource "TemplateResource" +#define XtRTemplateResource "TemplateResource" typedef struct { - int empty; + XtPointer extension; } TemplateClassPart; typedef struct _TemplateClassRec { - CoreClassPart core_class; - TemplateClassPart template_class; + CoreClassPart core_class; + TemplateClassPart template_class; } TemplateClassRec; extern TemplateClassRec templateClassRec; typedef struct { - /* resources */ - char* resource; - /* private state */ + /* resources */ + char* resource; + /* private */ + char *private; } TemplatePart; typedef struct _TemplateRec { - CorePart core; - TemplatePart template; + CorePart core; +#if defined(__cplusplus) || defined(c_plusplus) + TemplatePart c_template; +#else + TemplatePart template; +#endif } TemplateRec; -#endif _TemplateP_h +#endif /* _TemplateP_h */ .CE .LP @@ -5778,72 +5829,129 @@ are: .CB .\".so ../../lib/Xaw/Template.c -#include -/* XConsortium: Template.c,v 1.2 88/10/25 17:40:25 swick Exp $ */ -/* Copyright (c) X Consortium 1987, 1988 */ +/* + +Copyright 1987, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +*/ +/* $XFree86: xc/doc/specs/Xaw/Xtk.widgets,v 1.3 2006/01/09 14:56:31 dawes Exp $ */ #include #include -#include "TemplateP.h" +#include + +/* + * Class Methods + */ +static void TemplateInitialize(Widget, Widget, ArgList, Cardinal*); + +/* + * Prototypes + */ +static Bool TemplateFunction(TemplateWidget, int, int, Bool); + +/* + * Actions + */ +static void TemplateAction(Widget, XEvent*, String*, Cardinal*); +/* + * Initialization + */ +#define offset(field) XtOffsetOf(TemplateRec, template.field) static XtResource resources[] = { -#define offset(field) XtOffset(TemplateWidget, template.field) - /* {name, class, type, size, offset, default_type, default_addr}, */ - { XtNtemplateResource, XtCTemplateResource, XtRTemplateResource, sizeof(char*), - offset(resource), XtRString, "default" }, -#undef offset +/*{ + name, + class, + type, + size, + offset, + default_type, + default_addr + },*/ + { + XtNtemplateResource, + XtCTemplateResource, + XtRTemplateResource, + sizeof(char*), + offset(resource), + XtRString, + (XtPointer)"default" + }, }; - -static void TemplateAction(/* Widget, XEvent*, String*, Cardinal* */); +#undef offset static XtActionsRec actions[] = { - /* {name, procedure}, */ - {"template", TemplateAction}, + /*{name, procedure},*/ + {"template", TemplateAction}, }; static char translations[] = -" : template(\|) \\n\\ -"; +":" "template()\n" +; +#define Superclass (&widgetClassRec) TemplateClassRec templateClassRec = { - { /* core fields */ - /* superclass */ (WidgetClass) &widgetClassRec, - /* class_name */ "Template", - /* widget_size */ sizeof(TemplateRec), - /* class_initialize */ NULL, - /* class_part_initialize */ NULL, - /* class_inited */ FALSE, - /* initialize */ NULL, - /* initialize_hook */ NULL, - /* realize */ XtInheritRealize, - /* actions */ actions, - /* num_actions */ XtNumber(actions), - /* resources */ resources, - /* num_resources */ XtNumber(resources), - /* xrm_class */ NULLQUARK, - /* compress_motion */ TRUE, - /* compress_exposure */ TRUE, - /* compress_enterleave */ TRUE, - /* visible_interest */ FALSE, - /* destroy */ NULL, - /* resize */ NULL, - /* expose */ NULL, - /* set_values */ NULL, - /* set_values_hook */ NULL, - /* set_values_almost */ XtInheritSetValuesAlmost, - /* get_values_hook */ NULL, - /* accept_focus */ NULL, - /* version */ XtVersion, - /* callback_private */ NULL, - /* tm_table */ translations, - /* query_geometry */ XtInheritQueryGeometry, - /* display_accelerator */ XtInheritDisplayAccelerator, - /* extension */ NULL + /* core */ + { + (WidgetClass)Superclass, /* superclass */ + "Template", /* class_name */ + sizeof(TemplateRec), /* widget_size */ + NULL, /* class_initialize */ + NULL, /* class_part_initialize */ + False, /* class_inited */ + TemplateInitialize, /* initialize */ + NULL, /* initialize_hook */ + XtInheritRealize, /* realize */ + actions, /* actions */ + XtNumber(actions), /* num_actions */ + resources, /* resources */ + XtNumber(resources), /* num_resources */ + NULLQUARK, /* xrm_class */ + True, /* compress_motion */ + True, /* compress_exposure */ + True, /* compress_enterleave */ + False, /* visible_interest */ + NULL, /* destroy */ + NULL, /* resize */ + NULL, /* expose */ + NULL, /* set_values */ + NULL, /* set_values_hook */ + XtInheritSetValuesAlmost, /* set_values_almost */ + NULL, /* get_values_hook */ + NULL, /* accept_focus */ + XtVersion, /* version */ + NULL, /* callback_private */ + translations, /* tm_table */ + XtInheritQueryGeometry, /* query_geometry */ + XtInheritDisplayAccelerator, /* display_accelerator */ + NULL, /* extension */ }, - { /* template fields */ - /* empty */ 0 + /* template */ + { + NULL, /* extension */ } }; Index: xc/doc/specs/Xaw/strings.mit diff -u xc/doc/specs/Xaw/strings.mit:1.1.1.2 xc/doc/specs/Xaw/strings.mit:1.2 --- xc/doc/specs/Xaw/strings.mit:1.1.1.2 Tue Jan 16 17:02:58 2001 +++ xc/doc/specs/Xaw/strings.mit Mon Jan 9 09:56:31 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: strings.mit,v 1.3 2000/08/17 19:42:29 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/strings.mit,v 1.2 2006/01/09 14:56:31 dawes Exp $ .ds tk X Toolkit .ds xT X Toolkit Intrinsics \(em C Language Interface .ds xI Intrinsics Index: xc/doc/specs/Xaw/strings.xaw diff -u xc/doc/specs/Xaw/strings.xaw:1.2 xc/doc/specs/Xaw/strings.xaw:1.3 --- xc/doc/specs/Xaw/strings.xaw:1.2 Wed Aug 14 17:52:34 2002 +++ xc/doc/specs/Xaw/strings.xaw Mon Jan 9 09:56:31 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: strings.xaw,v 1.3 2000/08/17 19:42:29 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xaw/strings.xaw,v 1.3 2006/01/09 14:56:31 dawes Exp $ \" These macros are not associated with any widget. .de Rs \" Resource Conversion message Index: xc/doc/specs/Xext/Imakefile diff -u xc/doc/specs/Xext/Imakefile:1.5 xc/doc/specs/Xext/Imakefile:1.6 --- xc/doc/specs/Xext/Imakefile:1.5 Mon Apr 23 11:53:54 2001 +++ xc/doc/specs/Xext/Imakefile Mon Jan 9 09:56:32 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:30 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/doc/specs/Xext/Imakefile,v 1.5 2001/04/23 15:53:54 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/Xext/Imakefile,v 1.6 2006/01/09 14:56:32 dawes Exp $ MakeSimpleDoc(shape,shape.ms) Index: xc/doc/specs/Xext/bigreq.ms diff -u xc/doc/specs/Xext/bigreq.ms:1.1.1.5 xc/doc/specs/Xext/bigreq.ms:1.2 --- xc/doc/specs/Xext/bigreq.ms:1.1.1.5 Tue Jan 16 17:03:02 2001 +++ xc/doc/specs/Xext/bigreq.ms Tue Jul 5 12:43:55 2005 @@ -1,5 +1,5 @@ .\" Use -ms and macros.t -.\" $Xorg: bigreq.ms,v 1.3 2000/08/17 19:42:30 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xext/bigreq.ms,v 1.2 2005/07/05 16:43:55 tsi Exp $ .EH '''' .OH '''' .EF '''' @@ -67,10 +67,9 @@ or arcs .Pn ( PolyArc ), since these requests cannot be broken up into smaller requests without -disturbing the rendering of the join points. It is also much more of -a problem for protocol extensions, such as the PEX extension -for 3D graphics and the XIE extension for imaging, that need to send -long data lists in output commands. +disturbing the rendering of the join points. It is also much more of a problem +for certain protocol extensions that need to send long data lists in output +commands. .LP This extension defines a mechanism for extending the length field beyond 16 bits. If the normal 16-bit length field of the protocol Index: xc/doc/specs/Xext/buffer.ms diff -u xc/doc/specs/Xext/buffer.ms:1.4 xc/doc/specs/Xext/buffer.ms:1.5 --- xc/doc/specs/Xext/buffer.ms:1.4 Wed Jan 17 11:57:43 2001 +++ xc/doc/specs/Xext/buffer.ms Mon Jan 9 09:56:32 2006 @@ -1,9 +1,4 @@ -.\" $Xorg: buffer.ms,v 1.3 2000/08/17 19:42:31 cpqbld Exp $ -.\" -.\" -.\" -.\" -.\" $XFree86: xc/doc/specs/Xext/buffer.ms,v 1.4 2001/01/17 16:57:43 dawes Exp $ +.\" $XFree86: xc/doc/specs/Xext/buffer.ms,v 1.5 2006/01/09 14:56:32 dawes Exp $ .TL Extending X for Double-Buffering, Multi-Buffering, and Stereo .AU Index: xc/doc/specs/Xext/dbe.tex diff -u xc/doc/specs/Xext/dbe.tex:3.4 xc/doc/specs/Xext/dbe.tex:3.5 --- xc/doc/specs/Xext/dbe.tex:3.4 Wed Jan 17 11:57:43 2001 +++ xc/doc/specs/Xext/dbe.tex Mon Jan 9 09:56:32 2006 @@ -1,4 +1,4 @@ -% $Xorg: dbe.tex,v 1.3 2000/08/17 19:42:31 cpqbld Exp $ +% $XFree86: xc/doc/specs/Xext/dbe.tex,v 3.5 2006/01/09 14:56:32 dawes Exp $ % edited for DP edits and code consistency w/ core protocol/xlib 3/30/96 % split into separate library and protocol documentos 4/15/96 \documentstyle{article} Index: xc/doc/specs/Xext/dbelib.tex diff -u xc/doc/specs/Xext/dbelib.tex:1.1.1.3 xc/doc/specs/Xext/dbelib.tex:1.2 --- xc/doc/specs/Xext/dbelib.tex:1.1.1.3 Tue Jan 16 17:03:07 2001 +++ xc/doc/specs/Xext/dbelib.tex Mon Jan 9 09:56:32 2006 @@ -1,4 +1,4 @@ -% $Xorg: dbelib.tex,v 1.3 2000/08/17 19:42:31 cpqbld Exp $ +% $XFree86: xc/doc/specs/Xext/dbelib.tex,v 1.2 2006/01/09 14:56:32 dawes Exp $ % edited for DP edits and code consistency w/ core protocol/xlib 3/30/96 % split into separate library and protocol documentos 4/15/96 \documentstyle{article} Index: xc/doc/specs/Xext/evi.ms diff -u xc/doc/specs/Xext/evi.ms:1.4 xc/doc/specs/Xext/evi.ms:1.5 --- xc/doc/specs/Xext/evi.ms:1.4 Wed Jan 17 11:57:44 2001 +++ xc/doc/specs/Xext/evi.ms Mon Jan 9 09:56:32 2006 @@ -1,10 +1,5 @@ .\" Use -ms and macros.t -.\" $Xorg: evi.ms,v 1.3 2000/08/17 19:42:31 cpqbld Exp $ -.\" -.\" -.\" -.\" -.\" $XFree86: xc/doc/specs/Xext/evi.ms,v 1.4 2001/01/17 16:57:44 dawes Exp $ +.\" $XFree86: xc/doc/specs/Xext/evi.ms,v 1.5 2006/01/09 14:56:32 dawes Exp $ .EH '''' .OH '''' .EF '''' Index: xc/doc/specs/Xext/lbx.mif diff -u xc/doc/specs/Xext/lbx.mif:1.1.1.2 xc/doc/specs/Xext/lbx.mif:1.2 --- xc/doc/specs/Xext/lbx.mif:1.1.1.2 Tue Jan 16 17:03:09 2001 +++ xc/doc/specs/Xext/lbx.mif Mon Jan 9 09:56:32 2006 @@ -10326,7 +10326,7 @@ > # end of Font - + > > # end of Para > # end of TextFlow @@ -10384,7 +10384,7 @@ > # end of Variable - + > > # end of Para > # end of TextFlow @@ -10695,7 +10695,7 @@ > # end of Conditional - + > > # end of Para # end of Pgf - + > > # end of Para > # end of TextFlow @@ -2255,7 +2255,7 @@ > # end of Pgf + > > # end of Para -#endif - -#ifndef _XI_H_ -#include "XI.h" -#endif +#include #define _deviceKeyPress 0 #define _deviceKeyRelease 1 @@ -5062,91 +5104,91 @@ #define _deviceMappingNotify 1 #define _changeDeviceNotify 2 -#define FindTypeAndClass(d, type, class, classid, offset) \ - { int i; XInputClassInfo *ip; \ - type = 0; class = 0; \ - for (i=0, ip= ((XDevice *) d)->classes; \ - i< ((XDevice *) d)->num_classes; \ - i++, ip++) \ - if (ip->input_class == classid) \ - {type = ip->event_type_base + offset; \ - class = ((XDevice *) d)->device_id << 8 | type;}} +#define FindTypeAndClass(d,type,_class,classid,offset) \ + { int _i; XInputClassInfo *_ip; \ + type = 0; _class = 0; \ + for (_i=0, _ip= ((XDevice *) d)->classes; \ + _i< ((XDevice *) d)->num_classes; \ + _i++, _ip++) \ + if (_ip->input_class == classid) \ + {type = _ip->event_type_base + offset; \ + _class = ((XDevice *) d)->device_id << 8 | type;}} -#define DeviceKeyPress(d, type, class) \ - FindTypeAndClass(d, type, class, KeyClass, _deviceKeyPress) +#define DeviceKeyPress(d,type,_class) \ + FindTypeAndClass(d, type, _class, KeyClass, _deviceKeyPress) -#define DeviceKeyRelease(d, type, class) \ - FindTypeAndClass(d, type, class, KeyClass, _deviceKeyRelease) +#define DeviceKeyRelease(d,type,_class) \ + FindTypeAndClass(d, type, _class, KeyClass, _deviceKeyRelease) -#define DeviceButtonPress(d, type, class) \ - FindTypeAndClass(d, type, class, ButtonClass, _deviceButtonPress) +#define DeviceButtonPress(d,type,_class) \ + FindTypeAndClass(d, type, _class, ButtonClass, _deviceButtonPress) -#define DeviceButtonRelease(d, type, class) \ - FindTypeAndClass(d, type, class, ButtonClass, _deviceButtonRelease) +#define DeviceButtonRelease(d,type,_class) \ + FindTypeAndClass(d, type, _class, ButtonClass, _deviceButtonRelease) -#define DeviceMotionNotify(d, type, class) \ - FindTypeAndClass(d, type, class, ValuatorClass, _deviceMotionNotify) +#define DeviceMotionNotify(d,type,_class) \ + FindTypeAndClass(d, type, _class, ValuatorClass, _deviceMotionNotify) -#define DeviceFocusIn(d, type, class) \ - FindTypeAndClass(d, type, class, FocusClass, _deviceFocusIn) +#define DeviceFocusIn(d,type,_class) \ + FindTypeAndClass(d, type, _class, FocusClass, _deviceFocusIn) -#define DeviceFocusOut(d, type, class) \ - FindTypeAndClass(d, type, class, FocusClass, _deviceFocusOut) +#define DeviceFocusOut(d,type,_class) \ + FindTypeAndClass(d, type, _class, FocusClass, _deviceFocusOut) -#define ProximityIn(d, type, class) \ - FindTypeAndClass(d, type, class, ProximityClass, _proximityIn) +#define ProximityIn(d,type,_class) \ + FindTypeAndClass(d, type, _class, ProximityClass, _proximityIn) -#define ProximityOut(d, type, class) \ - FindTypeAndClass(d, type, class, ProximityClass, _proximityOut) +#define ProximityOut(d,type,_class) \ + FindTypeAndClass(d, type, _class, ProximityClass, _proximityOut) -#define DeviceStateNotify(d, type, class) \ - FindTypeAndClass(d, type, class, OtherClass, _deviceStateNotify) +#define DeviceStateNotify(d,type,_class) \ + FindTypeAndClass(d, type, _class, OtherClass, _deviceStateNotify) -#define DeviceMappingNotify(d, type, class) \ - FindTypeAndClass(d, type, class, OtherClass, _deviceMappingNotify) +#define DeviceMappingNotify(d,type,_class) \ + FindTypeAndClass(d, type, _class, OtherClass, _deviceMappingNotify) -#define ChangeDeviceNotify(d, type, class) \ - FindTypeAndClass(d, type, class, OtherClass, _changeDeviceNotify) +#define ChangeDeviceNotify(d,type,_class) \ + FindTypeAndClass(d, type, _class, OtherClass, _changeDeviceNotify) -#define DevicePointerMotionHint(d, type, class) \ - { class = ((XDevice *) d)->device_id << 8 | _devicePointerMotionHint;} +#define DevicePointerMotionHint(d,type,_class) \ + { _class = ((XDevice *) d)->device_id << 8 | _devicePointerMotionHint;} -#define DeviceButton1Motion(d, type, class) \ - { class = ((XDevice *) d)->device_id << 8 | _deviceButton1Motion;} +#define DeviceButton1Motion(d,type,_class) \ + { _class = ((XDevice *) d)->device_id << 8 | _deviceButton1Motion;} -#define DeviceButton2Motion(d, type, class) \ - { class = ((XDevice *) d)->device_id << 8 | _deviceButton2Motion;} +#define DeviceButton2Motion(d,type,_class) \ + { _class = ((XDevice *) d)->device_id << 8 | _deviceButton2Motion;} -#define DeviceButton3Motion(d, type, class) \ - { class = ((XDevice *) d)->device_id << 8 | _deviceButton3Motion;} +#define DeviceButton3Motion(d,type,_class) \ + { _class = ((XDevice *) d)->device_id << 8 | _deviceButton3Motion;} -#define DeviceButton4Motion(d, type, class) \ - { class = ((XDevice *) d)->device_id << 8 | _deviceButton4Motion;} +#define DeviceButton4Motion(d,type, _class) \ + { _class = ((XDevice *) d)->device_id << 8 | _deviceButton4Motion;} -#define DeviceButton5Motion(d, type, class) \ - { class = ((XDevice *) d)->device_id << 8 | _deviceButton5Motion;} +#define DeviceButton5Motion(d,type,_class) \ + { _class = ((XDevice *) d)->device_id << 8 | _deviceButton5Motion;} -#define DeviceButtonMotion(d, type, class) \ - { class = ((XDevice *) d)->device_id << 8 | _deviceButtonMotion;} +#define DeviceButtonMotion(d,type, _class) \ + { _class = ((XDevice *) d)->device_id << 8 | _deviceButtonMotion;} -#define DeviceOwnerGrabButton(d, type, class) \ - { class = ((XDevice *) d)->device_id << 8 | _deviceOwnerGrabButton;} +#define DeviceOwnerGrabButton(d,type,_class) \ + { _class = ((XDevice *) d)->device_id << 8 | _deviceOwnerGrabButton;} -#define DeviceButtonPressGrab(d, type, class) \ - { class = ((XDevice *) d)->device_id << 8 | _deviceButtonGrab;} +#define DeviceButtonPressGrab(d,type,_class) \ + { _class = ((XDevice *) d)->device_id << 8 | _deviceButtonGrab;} -#define NoExtensionEvent(d, type, class) \ - { class = ((XDevice *) d)->device_id << 8 | _noExtensionEvent;} +#define NoExtensionEvent(d,type,_class) \ + { _class = ((XDevice *) d)->device_id << 8 | _noExtensionEvent;} -#define BadDevice(dpy, error) _xibaddevice(dpy, &error) +#define BadDevice(dpy,error) _xibaddevice(dpy, &error) -#define BadClass(dpy, error) _xibadclass(dpy, &error) +#define BadClass(dpy,error) _xibadclass(dpy, &error) -#define BadEvent(dpy, error) _xibadevent(dpy, &error) +#define BadEvent(dpy,error) _xibadevent(dpy, &error) -#define BadMode(dpy, error) _xibadmode(dpy, &error) +#define BadMode(dpy,error) _xibadmode(dpy, &error) -#define DeviceBusy(dpy, error) _xidevicebusy(dpy, &error) +#define DeviceBusy(dpy,error) _xidevicebusy(dpy, &error) /*************************************************************** * @@ -5312,7 +5354,11 @@ typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + unsigned char c_class; +#else unsigned char class; +#endif unsigned char length; } XInputClass; @@ -5329,7 +5375,11 @@ } XDeviceStateNotifyEvent; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + unsigned char c_class; +#else unsigned char class; +#endif unsigned char length; unsigned char num_valuators; unsigned char mode; @@ -5337,14 +5387,22 @@ } XValuatorStatus; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + unsigned char c_class; +#else unsigned char class; +#endif unsigned char length; short num_keys; char keys[32]; } XKeyStatus; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + unsigned char c_class; +#else unsigned char class; +#endif unsigned char length; short num_buttons; char buttons[32]; @@ -5398,13 +5456,21 @@ */ typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; } XFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int click; @@ -5417,7 +5483,11 @@ } XKbdFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int accelNum; @@ -5426,7 +5496,11 @@ } XPtrFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int resolution; @@ -5435,7 +5509,11 @@ } XIntegerFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int max_symbols; @@ -5444,7 +5522,11 @@ } XStringFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int percent; @@ -5453,7 +5535,11 @@ } XBellFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int led_values; @@ -5461,13 +5547,21 @@ } XLedFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; } XFeedbackControl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int accelNum; @@ -5476,7 +5570,11 @@ } XPtrFeedbackControl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int click; @@ -5490,7 +5588,11 @@ } XKbdFeedbackControl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int num_keysyms; @@ -5498,14 +5600,22 @@ } XStringFeedbackControl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int int_to_display; } XIntegerFeedbackControl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int percent; @@ -5514,7 +5624,11 @@ } XBellFeedbackControl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; XID id; int led_mask; @@ -5562,7 +5676,11 @@ typedef struct _XAnyClassinfo *XAnyClassPtr; typedef struct _XAnyClassinfo { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; } XAnyClassInfo; @@ -5582,7 +5700,11 @@ typedef struct _XKeyInfo { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; unsigned short min_keycode; unsigned short max_keycode; @@ -5592,7 +5714,11 @@ typedef struct _XButtonInfo *XButtonInfoPtr; typedef struct _XButtonInfo { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; short num_buttons; } XButtonInfo; @@ -5609,7 +5735,11 @@ typedef struct _XValuatorInfo { +#if defined(__cplusplus) || defined(c_plusplus) + XID c_class; +#else XID class; +#endif int length; unsigned char num_axes; unsigned char mode; @@ -5692,7 +5822,11 @@ */ typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + unsigned char c_class; +#else unsigned char class; +#endif unsigned char length; unsigned char num_valuators; unsigned char mode; @@ -5700,14 +5834,22 @@ } XValuatorState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + unsigned char c_class; +#else unsigned char class; +#endif unsigned char length; short num_keys; char keys[32]; } XKeyState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + unsigned char c_class; +#else unsigned char class; +#endif unsigned char length; short num_buttons; char buttons[32]; @@ -5722,23 +5864,18 @@ _XFUNCPROTOBEGIN extern int XChangeKeyboardDevice( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */ -#endif ); extern int XChangePointerDevice( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, int /* xaxis */, int /* yaxis */ -#endif ); extern int XGrabDevice( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, Window /* grab_window */, @@ -5748,19 +5885,15 @@ int /* this_device_mode */, int /* other_devices_mode */, Time /* time */ -#endif ); extern int XUngrabDevice( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, Time /* time */ -#endif ); extern int XGrabDeviceKey( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, unsigned int /* key */, @@ -5772,22 +5905,18 @@ XEventClass* /* event_list */, int /* this_device_mode */, int /* other_devices_mode */ -#endif ); extern int XUngrabDeviceKey( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, unsigned int /* key */, unsigned int /* modifiers */, XDevice* /* modifier_dev */, Window /* grab_window */ -#endif ); extern int XGrabDeviceButton( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, unsigned int /* button */, @@ -5799,84 +5928,66 @@ XEventClass* /* event_list */, int /* this_device_mode */, int /* other_devices_mode */ -#endif ); extern int XUngrabDeviceButton( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, unsigned int /* button */, unsigned int /* modifiers */, XDevice* /* modifier_dev */, Window /* grab_window */ -#endif ); extern int XAllowDeviceEvents( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, int /* event_mode */, Time /* time */ -#endif ); extern int XGetDeviceFocus( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, Window* /* focus */, int* /* revert_to */, Time* /* time */ -#endif ); extern int XSetDeviceFocus( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, Window /* focus */, int /* revert_to */, Time /* time */ -#endif ); extern XFeedbackState *XGetFeedbackControl( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, int* /* num_feedbacks */ -#endif ); -extern int XFreeFeedbackList( -#if NeedFunctionPrototypes +extern void XFreeFeedbackList( XFeedbackState* /* list */ -#endif ); extern int XChangeFeedbackControl( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, unsigned long /* mask */, XFeedbackControl* /* f */ -#endif ); extern int XDeviceBell( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, XID /* feedbackclass */, XID /* feedbackid */, int /* percent */ -#endif ); extern KeySym *XGetDeviceKeyMapping( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, #if NeedWidePrototypes @@ -5886,175 +5997,133 @@ #endif int /* keycount */, int* /* syms_per_code */ -#endif ); extern int XChangeDeviceKeyMapping( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, int /* first */, int /* syms_per_code */, KeySym* /* keysyms */, int /* count */ -#endif ); extern XModifierKeymap *XGetDeviceModifierMapping( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */ -#endif ); extern int XSetDeviceModifierMapping( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, XModifierKeymap* /* modmap */ -#endif ); extern int XSetDeviceButtonMapping( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, unsigned char* /* map[] */, int /* nmap */ -#endif ); extern int XGetDeviceButtonMapping( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, unsigned char* /* map[] */, unsigned int /* nmap */ -#endif ); extern XDeviceState *XQueryDeviceState( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */ -#endif ); -extern int XFreeDeviceState( -#if NeedFunctionPrototypes +extern void XFreeDeviceState( XDeviceState* /* list */ -#endif ); -extern XExtensionVersion *XGetExtensionVersion( -#if NeedFunctionPrototypes +extern XExtensionVersion *XGetExtensionVersion( Display* /* display */, _Xconst char* /* name */ -#endif ); extern XDeviceInfo *XListInputDevices( -#if NeedFunctionPrototypes Display* /* display */, int* /* ndevices */ -#endif ); -extern int XFreeDeviceList( -#if NeedFunctionPrototypes +extern void XFreeDeviceList( XDeviceInfo* /* list */ -#endif ); extern XDevice *XOpenDevice( -#if NeedFunctionPrototypes Display* /* display */, XID /* id */ -#endif ); extern int XCloseDevice( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */ -#endif ); extern int XSetDeviceMode( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, int /* mode */ -#endif ); extern int XSetDeviceValuators( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, int* /* valuators */, int /* first_valuator */, int /* num_valuators */ -#endif ); extern XDeviceControl *XGetDeviceControl( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, int /* control */ -#endif ); extern int XChangeDeviceControl( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, int /* control */, XDeviceControl* /* d */ -#endif ); extern int XSelectExtensionEvent( -#if NeedFunctionPrototypes Display* /* display */, Window /* w */, XEventClass* /* event_list */, int /* count */ -#endif ); -extern int XGetSelectedExtensionEvents( -#if NeedFunctionPrototypes +extern int XGetSelectedExtensionEvents( Display* /* display */, Window /* w */, int* /* this_client_count */, XEventClass** /* this_client_list */, int* /* all_clients_count */, XEventClass** /* all_clients_list */ -#endif ); extern int XChangeDeviceDontPropagateList( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */, int /* count */, XEventClass* /* events */, int /* mode */ -#endif ); extern XEventClass *XGetDeviceDontPropagateList( -#if NeedFunctionPrototypes Display* /* display */, Window /* window */, int* /* count */ -#endif ); extern Status XSendExtensionEvent( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, Window /* dest */, @@ -6062,11 +6131,9 @@ int /* count */, XEventClass* /* list */, XEvent* /* event */ -#endif ); extern XDeviceTimeCoord *XGetDeviceMotionEvents( -#if NeedFunctionPrototypes Display* /* display */, XDevice* /* device */, Time /* start */, @@ -6074,25 +6141,74 @@ int* /* nEvents */, int* /* mode */, int* /* axis_count */ -#endif ); -extern int XFreeDeviceMotionEvents( -#if NeedFunctionPrototypes +extern void XFreeDeviceMotionEvents( XDeviceTimeCoord* /* events */ -#endif ); -extern int XFreeDeviceControl( -#if NeedFunctionPrototypes +extern void XFreeDeviceControl( XDeviceControl* /* control */ -#endif ); +extern void _xibaddevice(Display *dpy, int *error); +extern void _xibadclass(Display *dpy, int *error); +extern void _xibadevent(Display *dpy, int *error); +extern void _xibadmode(Display *dpy, int *error); +extern void _xidevicebusy(Display *dpy, int *error); + + _XFUNCPROTOEND #endif /* _XINPUT_H_ */ +/************************************************************ + +Copyright 1989, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of The Open Group shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from The Open Group. + +Copyright 1989 by Hewlett-Packard Company, Palo Alto, California. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Hewlett-Packard not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + +********************************************************/ +/* $XFree86: xc/doc/specs/Xi/library.ms,v 1.3 2006/01/09 14:56:34 dawes Exp $ */ + /* Definitions used by the server, library and client */ #ifndef _XI_H_ @@ -6226,7 +6342,9 @@ #define SyncAll 5 #define FollowKeyboard 3 +#ifndef RevertToFollowKeyboard #define RevertToFollowKeyboard 3 +#endif #define DvAccelNum (1L << 0) #define DvAccelDenom (1L << 1) @@ -6248,6 +6366,12 @@ #define DeviceMode (1L << 0) #define Relative 0 #define Absolute 1 +/* Merged from Metrolink tree for XINPUT stuff */ +#define TS_Raw 57 +#define TS_Scaled 58 +#define SendCoreEvents 59 +#define DontSendCoreEvents 60 +/* End of merged section */ #define ProximityState (1L << 1) #define InProximity (0L << 1) @@ -6288,7 +6412,15 @@ #define XI_DeviceBusy 3 #define XI_BadClass 4 +/* Make XEventClass be a CARD32 for 64 bit servers. Don't affect client + * definition of XEventClass since that would be a library interface change. + * See the top of X.h for more _XSERVER64 magic. + */ +#ifdef _XSERVER64 +typedef CARD32 XEventClass; +#else typedef unsigned long XEventClass; +#endif /******************************************************************* * Index: xc/doc/specs/Xi/protocol.ms diff -u xc/doc/specs/Xi/protocol.ms:1.1.1.6 xc/doc/specs/Xi/protocol.ms:1.2 --- xc/doc/specs/Xi/protocol.ms:1.1.1.6 Tue Jan 16 17:03:20 2001 +++ xc/doc/specs/Xi/protocol.ms Mon Jan 9 09:56:34 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: protocol.ms,v 1.3 2000/08/17 19:42:40 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xi/protocol.ms,v 1.2 2006/01/09 14:56:34 dawes Exp $ .\" Input Extension .EH '''' .OH '''' Index: xc/doc/specs/Xmu/Imakefile diff -u xc/doc/specs/Xmu/Imakefile:1.2 xc/doc/specs/Xmu/Imakefile:1.3 --- xc/doc/specs/Xmu/Imakefile:1.2 Mon Apr 23 11:53:56 2001 +++ xc/doc/specs/Xmu/Imakefile Mon Jan 9 09:56:34 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:41 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/Xmu/Imakefile,v 1.2 2001/04/23 15:53:56 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/Xmu/Imakefile,v 1.3 2006/01/09 14:56:34 dawes Exp $ MakeSimpleDoc(xmu,Xmu.ms) Index: xc/doc/specs/Xserver/Imakefile diff -u xc/doc/specs/Xserver/Imakefile:1.2 xc/doc/specs/Xserver/Imakefile:1.3 --- xc/doc/specs/Xserver/Imakefile:1.2 Mon Apr 23 11:53:56 2001 +++ xc/doc/specs/Xserver/Imakefile Mon Jan 9 09:56:34 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:41 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/Xserver/Imakefile,v 1.2 2001/04/23 15:53:56 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/Xserver/Imakefile,v 1.3 2006/01/09 14:56:34 dawes Exp $ MakeTblDoc(ddx,ddx.tbl.ms) Index: xc/doc/specs/Xserver/appgroup.ms diff -u xc/doc/specs/Xserver/appgroup.ms:1.1.1.2 xc/doc/specs/Xserver/appgroup.ms:1.2 --- xc/doc/specs/Xserver/appgroup.ms:1.1.1.2 Tue Jan 16 17:03:31 2001 +++ xc/doc/specs/Xserver/appgroup.ms Mon Jan 9 09:56:34 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: appgroup.ms,v 1.3 2000/08/17 19:42:41 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xserver/appgroup.ms,v 1.2 2006/01/09 14:56:34 dawes Exp $ .EF 'AppGroup Extension Definition'- % -'October, 1996' .OF 'AppGroup Extension Definition'- % -'October, 1996' .EH ''' Index: xc/doc/specs/Xserver/ddx.tbl.ms diff -u xc/doc/specs/Xserver/ddx.tbl.ms:1.1.1.3 xc/doc/specs/Xserver/ddx.tbl.ms:1.2 --- xc/doc/specs/Xserver/ddx.tbl.ms:1.1.1.3 Tue Jan 16 17:03:32 2001 +++ xc/doc/specs/Xserver/ddx.tbl.ms Mon Jan 9 09:56:34 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: ddx.tbl.ms,v 1.3 2000/08/17 19:42:41 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xserver/ddx.tbl.ms,v 1.2 2006/01/09 14:56:34 dawes Exp $ .EF 'Porting Layer Definition'- % -'April 8, 1994' .OF 'Porting Layer Definition'- % -'April 8, 1994' .EH ''' Index: xc/doc/specs/Xserver/fontlib.ms diff -u xc/doc/specs/Xserver/fontlib.ms:1.3 xc/doc/specs/Xserver/fontlib.ms:1.4 --- xc/doc/specs/Xserver/fontlib.ms:1.3 Wed Jan 17 11:57:44 2001 +++ xc/doc/specs/Xserver/fontlib.ms Mon Jan 9 09:56:35 2006 @@ -48,7 +48,7 @@ .ft P .fi .. -.\" $Xorg: fontlib.ms,v 1.3 2000/08/17 19:42:42 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xserver/fontlib.ms,v 1.4 2006/01/09 14:56:35 dawes Exp $ .EF 'Font Library Interface'- % -'July 27, 1991' .OF 'Font Library Interface'- % -'July 27, 1991' .EH '''' Index: xc/doc/specs/Xt/CH01 diff -u xc/doc/specs/Xt/CH01:1.3 xc/doc/specs/Xt/CH01:1.4 --- xc/doc/specs/Xt/CH01:1.3 Wed Jan 17 11:57:44 2001 +++ xc/doc/specs/Xt/CH01 Mon Jan 9 09:56:35 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH01,v 1.3 2000/08/17 19:42:42 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH01,v 1.4 2006/01/09 14:56:35 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH02 diff -u xc/doc/specs/Xt/CH02:1.3 xc/doc/specs/Xt/CH02:1.4 --- xc/doc/specs/Xt/CH02:1.3 Wed Jan 17 11:57:44 2001 +++ xc/doc/specs/Xt/CH02 Mon Jan 9 09:56:35 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH02,v 1.3 2000/08/17 19:42:42 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH02,v 1.4 2006/01/09 14:56:35 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH03 diff -u xc/doc/specs/Xt/CH03:1.1.1.3 xc/doc/specs/Xt/CH03:1.2 --- xc/doc/specs/Xt/CH03:1.1.1.3 Tue Jan 16 17:03:37 2001 +++ xc/doc/specs/Xt/CH03 Mon Jan 9 09:56:35 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH03,v 1.3 2000/08/17 19:42:44 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH03,v 1.2 2006/01/09 14:56:35 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH04 diff -u xc/doc/specs/Xt/CH04:1.1.1.4 xc/doc/specs/Xt/CH04:1.2 --- xc/doc/specs/Xt/CH04:1.1.1.4 Tue Jan 16 17:03:38 2001 +++ xc/doc/specs/Xt/CH04 Mon Jan 9 09:56:35 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH04,v 1.3 2000/08/17 19:42:44 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH04,v 1.2 2006/01/09 14:56:35 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH05 diff -u xc/doc/specs/Xt/CH05:1.1.1.3 xc/doc/specs/Xt/CH05:1.2 --- xc/doc/specs/Xt/CH05:1.1.1.3 Tue Jan 16 17:03:38 2001 +++ xc/doc/specs/Xt/CH05 Mon Jan 9 09:56:35 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH05,v 1.3 2000/08/17 19:42:44 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH05,v 1.2 2006/01/09 14:56:35 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH06 diff -u xc/doc/specs/Xt/CH06:1.1.1.3 xc/doc/specs/Xt/CH06:1.2 --- xc/doc/specs/Xt/CH06:1.1.1.3 Tue Jan 16 17:03:38 2001 +++ xc/doc/specs/Xt/CH06 Mon Jan 9 09:56:35 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH06,v 1.3 2000/08/17 19:42:45 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH06,v 1.2 2006/01/09 14:56:35 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH07 diff -u xc/doc/specs/Xt/CH07:1.1.1.4 xc/doc/specs/Xt/CH07:1.2 --- xc/doc/specs/Xt/CH07:1.1.1.4 Tue Jan 16 17:03:39 2001 +++ xc/doc/specs/Xt/CH07 Mon Jan 9 09:56:35 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH07,v 1.4 2000/08/17 19:42:45 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH07,v 1.2 2006/01/09 14:56:35 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH08 diff -u xc/doc/specs/Xt/CH08:1.1.1.3 xc/doc/specs/Xt/CH08:1.2 --- xc/doc/specs/Xt/CH08:1.1.1.3 Tue Jan 16 17:03:39 2001 +++ xc/doc/specs/Xt/CH08 Mon Jan 9 09:56:35 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH08,v 1.3 2000/08/17 19:42:46 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH08,v 1.2 2006/01/09 14:56:35 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH09 diff -u xc/doc/specs/Xt/CH09:1.1.1.4 xc/doc/specs/Xt/CH09:1.2 --- xc/doc/specs/Xt/CH09:1.1.1.4 Tue Jan 16 17:03:40 2001 +++ xc/doc/specs/Xt/CH09 Mon Jan 9 09:56:35 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH09,v 1.3 2000/08/17 19:42:46 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH09,v 1.2 2006/01/09 14:56:35 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH10 diff -u xc/doc/specs/Xt/CH10:1.1.1.3 xc/doc/specs/Xt/CH10:1.2 --- xc/doc/specs/Xt/CH10:1.1.1.3 Tue Jan 16 17:03:41 2001 +++ xc/doc/specs/Xt/CH10 Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH10,v 1.3 2000/08/17 19:42:46 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH10,v 1.2 2006/01/09 14:56:36 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH11 diff -u xc/doc/specs/Xt/CH11:1.1.1.4 xc/doc/specs/Xt/CH11:1.2 --- xc/doc/specs/Xt/CH11:1.1.1.4 Tue Jan 16 17:03:41 2001 +++ xc/doc/specs/Xt/CH11 Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH11,v 1.3 2000/08/17 19:42:47 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH11,v 1.2 2006/01/09 14:56:36 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH12 diff -u xc/doc/specs/Xt/CH12:1.1.1.3 xc/doc/specs/Xt/CH12:1.2 --- xc/doc/specs/Xt/CH12:1.1.1.3 Tue Jan 16 17:03:42 2001 +++ xc/doc/specs/Xt/CH12 Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH12,v 1.3 2000/08/17 19:42:47 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH12,v 1.2 2006/01/09 14:56:36 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/CH13 diff -u xc/doc/specs/Xt/CH13:1.1.1.4 xc/doc/specs/Xt/CH13:1.2 --- xc/doc/specs/Xt/CH13:1.1.1.4 Tue Jan 16 17:03:43 2001 +++ xc/doc/specs/Xt/CH13 Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: CH13,v 1.3 2000/08/17 19:42:47 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/CH13,v 1.2 2006/01/09 14:56:36 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/Imakefile diff -u xc/doc/specs/Xt/Imakefile:1.4 xc/doc/specs/Xt/Imakefile:1.5 --- xc/doc/specs/Xt/Imakefile:1.4 Mon Apr 23 11:53:57 2001 +++ xc/doc/specs/Xt/Imakefile Mon Jan 9 09:56:36 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:48 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/Xt/Imakefile,v 1.4 2001/04/23 15:53:57 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/Xt/Imakefile,v 1.5 2006/01/09 14:56:36 dawes Exp $ SRCS = strings.mit \ Xtk.intr.front \ Index: xc/doc/specs/Xt/Xtk.intr.front diff -u xc/doc/specs/Xt/Xtk.intr.front:1.1.1.4 xc/doc/specs/Xt/Xtk.intr.front:1.2 --- xc/doc/specs/Xt/Xtk.intr.front:1.1.1.4 Tue Jan 16 17:03:44 2001 +++ xc/doc/specs/Xt/Xtk.intr.front Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Xtk.intr.front,v 1.3 2000/08/17 19:42:48 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/Xtk.intr.front,v 1.2 2006/01/09 14:56:36 dawes Exp $ .\" MIT header page and copyright notice .\" MIT page header and footers .\" Index: xc/doc/specs/Xt/appA diff -u xc/doc/specs/Xt/appA:1.1.1.3 xc/doc/specs/Xt/appA:1.2 --- xc/doc/specs/Xt/appA:1.1.1.3 Tue Jan 16 17:03:44 2001 +++ xc/doc/specs/Xt/appA Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: appA,v 1.3 2000/08/17 19:42:48 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/appA,v 1.2 2006/01/09 14:56:36 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/appB diff -u xc/doc/specs/Xt/appB:1.1.1.3 xc/doc/specs/Xt/appB:1.2 --- xc/doc/specs/Xt/appB:1.1.1.3 Tue Jan 16 17:03:45 2001 +++ xc/doc/specs/Xt/appB Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: appB,v 1.3 2000/08/17 19:42:48 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/appB,v 1.2 2006/01/09 14:56:36 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/appC diff -u xc/doc/specs/Xt/appC:1.1.1.3 xc/doc/specs/Xt/appC:1.2 --- xc/doc/specs/Xt/appC:1.1.1.3 Tue Jan 16 17:03:45 2001 +++ xc/doc/specs/Xt/appC Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: appC,v 1.3 2000/08/17 19:42:48 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/appC,v 1.2 2006/01/09 14:56:36 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/appD diff -u xc/doc/specs/Xt/appD:1.1.1.3 xc/doc/specs/Xt/appD:1.2 --- xc/doc/specs/Xt/appD:1.1.1.3 Tue Jan 16 17:03:45 2001 +++ xc/doc/specs/Xt/appD Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: appD,v 1.3 2000/08/17 19:42:48 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/appD,v 1.2 2006/01/09 14:56:36 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/appE diff -u xc/doc/specs/Xt/appE:1.1.1.3 xc/doc/specs/Xt/appE:1.2 --- xc/doc/specs/Xt/appE:1.1.1.3 Tue Jan 16 17:03:46 2001 +++ xc/doc/specs/Xt/appE Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: appE,v 1.3 2000/08/17 19:42:48 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/appE,v 1.2 2006/01/09 14:56:36 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/appF diff -u xc/doc/specs/Xt/appF:1.3 xc/doc/specs/Xt/appF:1.4 --- xc/doc/specs/Xt/appF:1.3 Wed Jan 17 11:57:44 2001 +++ xc/doc/specs/Xt/appF Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: appF,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/appF,v 1.4 2006/01/09 14:56:36 dawes Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1991, 1994 .\" X Consortium .\" Index: xc/doc/specs/Xt/postproc diff -u xc/doc/specs/Xt/postproc:1.1.1.3 xc/doc/specs/Xt/postproc:1.2 --- xc/doc/specs/Xt/postproc:1.1.1.3 Tue Jan 16 17:03:46 2001 +++ xc/doc/specs/Xt/postproc Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: postproc,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/postproc,v 1.2 2006/01/09 14:56:36 dawes Exp $ .EH '''' .OH '''' .if o .bp \" blank page to make index and ToC start on odd page Index: xc/doc/specs/Xt/strings.mit diff -u xc/doc/specs/Xt/strings.mit:1.1.1.5 xc/doc/specs/Xt/strings.mit:1.2 --- xc/doc/specs/Xt/strings.mit:1.1.1.5 Tue Jan 16 17:03:47 2001 +++ xc/doc/specs/Xt/strings.mit Mon Jan 9 09:56:36 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: strings.mit,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/Xt/strings.mit,v 1.2 2006/01/09 14:56:36 dawes Exp $ .ds tk X Toolkit .ds xT X Toolkit Intrinsics \(em C Language Interface .ds xI Intrinsics Index: xc/doc/specs/i18n/Framework.ms diff -u xc/doc/specs/i18n/Framework.ms:1.5 xc/doc/specs/i18n/Framework.ms:1.6 --- xc/doc/specs/i18n/Framework.ms:1.5 Thu Feb 8 19:02:52 2001 +++ xc/doc/specs/i18n/Framework.ms Mon Jan 9 09:56:37 2006 @@ -1,6 +1,5 @@ -.\" $Xorg: Framework.ms,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ .\" To print this out, type tbl macros.t ThisFile | troff -ms -.\" $XFree86: xc/doc/specs/i18n/Framework.ms,v 1.5 2001/02/09 00:02:52 dawes Exp $ +.\" $XFree86: xc/doc/specs/i18n/Framework.ms,v 1.6 2006/01/09 14:56:37 dawes Exp $ .EH '''' .OH '''' .EF '''' Index: xc/doc/specs/i18n/Imakefile diff -u xc/doc/specs/i18n/Imakefile:1.2 xc/doc/specs/i18n/Imakefile:1.3 --- xc/doc/specs/i18n/Imakefile:1.2 Mon Apr 23 11:53:57 2001 +++ xc/doc/specs/i18n/Imakefile Mon Jan 9 09:56:37 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/i18n/Imakefile,v 1.2 2001/04/23 15:53:57 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/i18n/Imakefile,v 1.3 2006/01/09 14:56:37 dawes Exp $ MakeTblDoc(i18nFramework,Framework.ms) Index: xc/doc/specs/i18n/LocaleDB.ms diff -u xc/doc/specs/i18n/LocaleDB.ms:1.1.1.5 xc/doc/specs/i18n/LocaleDB.ms:1.2 --- xc/doc/specs/i18n/LocaleDB.ms:1.1.1.5 Tue Jan 16 17:03:48 2001 +++ xc/doc/specs/i18n/LocaleDB.ms Mon Jan 9 09:56:37 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: LocaleDB.ms,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/i18n/LocaleDB.ms,v 1.2 2006/01/09 14:56:37 dawes Exp $ .\" To print this out, type tbl macros.t ThisFile | troff -ms .EH '''' .OH '''' @@ -400,7 +400,7 @@ .sp .RS .nf -# $Xorg: LocaleDB.ms,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ +# # XLocale Database Sample for ja_JP.euc # Index: xc/doc/specs/i18n/Trans.ms diff -u xc/doc/specs/i18n/Trans.ms:1.1.1.5 xc/doc/specs/i18n/Trans.ms:1.2 --- xc/doc/specs/i18n/Trans.ms:1.1.1.5 Tue Jan 16 17:03:48 2001 +++ xc/doc/specs/i18n/Trans.ms Mon Jan 9 09:56:37 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: Trans.ms,v 1.3 2000/08/17 19:42:49 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/i18n/Trans.ms,v 1.2 2006/01/09 14:56:37 dawes Exp $ .\" To print this out, type tbl macros.t This File | troff -ms .EH '''' .OH '''' Index: xc/doc/specs/programs/Imakefile diff -u xc/doc/specs/programs/Imakefile:1.27 xc/doc/specs/programs/Imakefile:1.29 --- xc/doc/specs/programs/Imakefile:1.27 Sat Mar 12 18:13:28 2005 +++ xc/doc/specs/programs/Imakefile Tue Jun 7 04:02:14 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/doc/specs/programs/Imakefile,v 1.27 2005/03/12 23:13:28 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/programs/Imakefile,v 1.29 2005/06/07 08:02:14 dawes Exp $ /* * Copyright (c) 2000-2005 by The XFree86 Project, Inc. * All rights reserved. @@ -145,7 +145,7 @@ $(TOP)/config/util/ccmakedep.man \ $(TOP)/config/util/cleanlinks.man \ $(TOP)/programs/Xserver/hw/sun/constype.man \ - $(TOP)/programs/cxpm/cxpm.man \ + $(TOP)/extras/Xpm/cxpm/cxpm.man \ $(TOP)/programs/xf86dga/dga.man \ $(TOP)/programs/dpsexec/dpsexec.man \ $(TOP)/programs/dpsinfo/dpsinfo.man \ @@ -191,7 +191,7 @@ $(TOP)/programs/rgb/showrgb.man \ $(TOP)/programs/smproxy/smproxy.man \ $(TOP)/programs/xinit/startx.man \ - $(TOP)/programs/sxpm/sxpm.man \ + $(TOP)/extras/Xpm/sxpm/sxpm.man \ $(TOP)/programs/xrx/testplugin/testplugin.man \ $(TOP)/programs/texteroids/texteroids.man \ $(TOP)/programs/twm/twm.man \ @@ -284,3 +284,5 @@ InstallRoffDoc(man) +clean:: + RemoveFile(man.$(MANSRCSUFFIX)) Index: xc/doc/specs/rstart/Imakefile diff -u xc/doc/specs/rstart/Imakefile:1.3 xc/doc/specs/rstart/Imakefile:1.4 --- xc/doc/specs/rstart/Imakefile:1.3 Tue May 29 14:14:12 2001 +++ xc/doc/specs/rstart/Imakefile Mon Jan 9 09:56:37 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:50 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/rstart/Imakefile,v 1.3 2001/05/29 18:14:12 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/rstart/Imakefile,v 1.4 2006/01/09 14:56:37 dawes Exp $ /* * This is to allow building in symlink trees without trying to figure out Index: xc/doc/specs/rstart/fix.awk diff -u xc/doc/specs/rstart/fix.awk:1.1.1.2 xc/doc/specs/rstart/fix.awk:1.2 --- xc/doc/specs/rstart/fix.awk:1.1.1.2 Tue Jan 16 17:03:49 2001 +++ xc/doc/specs/rstart/fix.awk Mon Jan 9 09:56:37 2006 @@ -1,5 +1,5 @@ #! /bin/awk -f -# $Xorg: fix.awk,v 1.3 2000/08/17 19:42:50 cpqbld Exp $ +# $XFree86: xc/doc/specs/rstart/fix.awk,v 1.2 2006/01/09 14:56:37 dawes Exp $ # BEGIN { Index: xc/doc/specs/rstart/fix.nawk diff -u xc/doc/specs/rstart/fix.nawk:1.1.1.2 xc/doc/specs/rstart/fix.nawk:1.2 --- xc/doc/specs/rstart/fix.nawk:1.1.1.2 Tue Jan 16 17:03:49 2001 +++ xc/doc/specs/rstart/fix.nawk Mon Jan 9 09:56:37 2006 @@ -1,5 +1,5 @@ #! /bin/nawk -f -# $Xorg: fix.nawk,v 1.3 2000/08/17 19:42:50 cpqbld Exp $ +# $XFree86: xc/doc/specs/rstart/fix.nawk,v 1.2 2006/01/09 14:56:37 dawes Exp $ # BEGIN { Index: xc/doc/specs/rstart/fix.sed diff -u xc/doc/specs/rstart/fix.sed:1.1.1.2 xc/doc/specs/rstart/fix.sed:1.2 --- xc/doc/specs/rstart/fix.sed:1.1.1.2 Tue Jan 16 17:03:49 2001 +++ xc/doc/specs/rstart/fix.sed Mon Jan 9 09:56:37 2006 @@ -1,6 +1,6 @@ #! /bin/sed -f # -# $Xorg: fix.sed,v 1.3 2000/08/17 19:42:50 cpqbld Exp $ +# $XFree86: xc/doc/specs/rstart/fix.sed,v 1.2 2006/01/09 14:56:37 dawes Exp $ # s/o+/./g s/|-/+/g Index: xc/doc/specs/saver/saver.ms diff -u xc/doc/specs/saver/saver.ms:1.1 xc/doc/specs/saver/saver.ms:1.2 --- xc/doc/specs/saver/saver.ms:1.1 Tue May 7 16:08:25 2002 +++ xc/doc/specs/saver/saver.ms Mon Jan 9 09:56:38 2006 @@ -1,6 +1,5 @@ .\" Use tbl, -ms -.\" $XConsortium: saver.ms,v 1.5 92/02/11 17:05:26 keith Exp $ -.\" $NCDId: @(#)screensaver.ms,v 1.24 1992/02/22 14:00:00 jim Exp jim $ +.\" $XFree86: xc/doc/specs/saver/saver.ms,v 1.2 2006/01/09 14:56:38 dawes Exp $ .EH '''' .OH '''' .EF '''' Index: xc/doc/specs/test/00.header diff -u xc/doc/specs/test/00.header:1.1 xc/doc/specs/test/00.header:removed --- xc/doc/specs/test/00.header:1.1 Sat Dec 6 14:11:52 2003 +++ xc/doc/specs/test/00.header Tue May 9 21:52:05 2006 @@ -1,89 +0,0 @@ -.\" $XConsortium: 00.header /main/11 1995/12/12 17:26:28 gildea $ -.\" Copyright (c) 1991, 1992 X Consortium -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice shall be included in -.\" all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -.\" SOFTWARE. -.\" -.\" Except as contained in this notice, the name of the X Consortium shall not -.\" be used in advertising or otherwise to promote the sale, use or other -.\" dealing in this Software without prior written authorization from the -.\" X Consortium. -.de TP -.sp 1 -.tl \\*(}t -.if e 'tl \\*(}e -.if o 'tl \\*(}o -.sp 1 -.. -.\" uncomment next line for A4 paper -.\" .VM 0 3 -.de )k -.. -.PH "''''" -.PF "''''" -.ds HP +2 +2 +2 +2 -.ds rC "UniSoft Group Limited -.ds xW "X\ Window System -.ds xT "X\ Test Suite -.ds xP X\ Protocol tests -.ds xL Xlib tests -.ds xR "X\ Version\ 11\ Release\ 6.1 -.ds cH "0" -.nr Hs 4 -.S 18 -.B -.DS 2 -Xlib and X Protocol Test Suite -\*(xR - -\*(dD -.DE -.R -.SP 8 -.S 14 -.DS 2 -July 1992 -.DE -.SP 15 -.S 10 -.sp -Copyright \(co 1991, 1992 UniSoft Group Limited -.P -Permission to use, copy, modify, distribute, and sell this software and -its documentation for any purpose is hereby granted without fee, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of UniSoft not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. UniSoft -makes no representations about the suitability of this software for any -purpose. It is provided "as is" without express or implied warranty. -.S 11 -.pn 1 -.PH "''''" -.EH "''\s14\*(dD''" -.OH "''\s14\*(dD''" -.SK -.PF "\s12''''" -.OF "\s12''- % -''" -.EF "\s12''- % -''" -.S 16 -.B -\*(dD -.R -.S 12 Index: xc/doc/specs/test/Copyright diff -u xc/doc/specs/test/Copyright:1.1 xc/doc/specs/test/Copyright:removed --- xc/doc/specs/test/Copyright:1.1 Sat Dec 6 14:11:52 2003 +++ xc/doc/specs/test/Copyright Tue May 9 21:52:05 2006 @@ -1,40 +0,0 @@ -/* - -Copyright (c) 1990, 1991, 1992 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the X Consortium shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the X Consortium. - - * - * Copyright 1990, 1991, 1992 by UniSoft Group Limited. - * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation for any purpose is hereby granted without fee, - * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in - * supporting documentation, and that the name of UniSoft not be - * used in advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. UniSoft - * makes no representations about the suitability of this software for any - * purpose. It is provided "as is" without express or implied warranty. - * - * $XConsortium: Copyright,v 1.3 94/04/17 21:00:08 rws Exp $ - */ Index: xc/doc/specs/test/Imakefile diff -u xc/doc/specs/test/Imakefile:1.1 xc/doc/specs/test/Imakefile:removed --- xc/doc/specs/test/Imakefile:1.1 Sat Dec 6 14:11:52 2003 +++ xc/doc/specs/test/Imakefile Tue May 9 21:52:05 2006 @@ -1,13 +0,0 @@ -XCOMM $XFree86: xc/doc/specs/test/Imakefile,v 1.1 2003/12/06 19:11:52 dawes Exp $ - -MSMACROS = -mm - -MakeTblDoc(xtest-userguide,userguide.mm) -MakeTblDoc(xtest-progguide,progguide.mm) -MakeTblDoc(xtest-paper,paper.mm) -MakeTblDoc(xtest-relnotes,relnotes.mm) - -InstallRoffDoc(xtest-userguide) -InstallRoffDoc(xtest-progguide) -InstallRoffDoc(xtest-paper) -InstallRoffDoc(xtest-relnotes) Index: xc/doc/specs/test/abbrev.t diff -u xc/doc/specs/test/abbrev.t:1.1 xc/doc/specs/test/abbrev.t:removed --- xc/doc/specs/test/abbrev.t:1.1 Sat Dec 6 14:11:52 2003 +++ xc/doc/specs/test/abbrev.t Tue May 9 21:52:05 2006 @@ -1,109 +0,0 @@ -.\" Abbreviated xtest assertions list macros, can be substituted for head.t -.\" $XConsortium: abbrev.t,v 1.1 94/03/06 19:48:11 rws Exp $ -'\" Simple table specification - to avoid the need to use tbl. -.de tL \" table line -.nf -\\&\\$1\\h'|10n'\\$2\\h'|26n'\\$3\\h'|30n'\\$4\\h'|34n'\\$5\\h'|43n'\\$6\\h'|50n'\\$7\\h'|61n'\\$8 -.fi -.. -.hy 0 -'\" Font for arguments -.ds fA \f(CO -'\" Font for structure member names -.ds fM \fI -'\" Font for symbols. -.ds fS \fC -'\" Font for function names -.ds fF \fC -'\" -'\" -'\" ### .TH - Header for a test set. -.de TH -.nr Ac 0 1 \" Set the assertion counter to zero. -'\" Save the name -.ds Na \\$1 -.ds Ch \\$2 \" Save the chapter name -.ne 3 -.sp -.ps +2 -\fB\\*(Na\fP -.ps -.. -'\" ### .TI - Start assertion. -.de TI -.ds Ty \\$1 -.if '\\*(Ty'' .ds Ty -.br -\fB\\n+(Ac(\\*(Ty).\fR -.. -'\" ### .A - Argument -.de A -\&\\*(fA\\$1\fR\\$2\\*(fA\\$3\fR\\$4\\*(fA\\$5\fR\\$6 -.. -'\" ### .M - Structure member name -.de M -\&\\*(fM\\$1\fR\\$2\\*(fM\\$3\fR\\$4\\*(fM\\$5\fR\\$6 -.. -'\" ### .S - Symbol name -.de S -\&\\*(fS\\$1\fR\\$2\\*(fS\\$3\fR\\$4\\*(fS\\$5\fR\\$6 -.. -'\" ### .F - Function name -.de F -.ie '\\$1'' \\*(fF\\*(Na\fR -.el \&\\*(fF\\$1\fR\\$2\\*(fF\\$3\fR\\$4\\*(fF\\$5\fR\\$6 -.. -'\" ### .SM - Make argument smaller -.de SM -.ie \\n(.$-2 \&\\$1\s-1\\$2\s0\\$3 -.el \&\s-1\\$1\s0\\$2 -.. -'\" The following macros NS and NE are for internal review purposes. -'\" ### .NS - Start a note from a comment in the source. -.de NS -.br -.ft I -.ps -1 -.in 1c -.. -'\" ### .NE - End a note from a comment in the source. -.de NE -.ft P -.ps -.in -.br -.. -'\" ### .)h - header macro -.de )h -'ev 1 -'sp .5i -'nr P +1 -.tl \\*({h -'sp .25i -.br -'ev -.. -'\" ### .)f - footer macro -.de )f -'ev 1 -'sp .5i -.tl \\*({f -.br -'ev -'bp -.. -.if !\nS .nr S 5 -.ps \nS -.vs \nS+.5p -.ev 1 -.ps 12 -.vs 12 -.ev -.if !\nO .nr O 7 -.po \nO -.ll 7i -.wh 0 )h -.wh -1i )f -.ds {h "'\\*(Na''\\*(Ch'" -.ds {f "''%''" -.nr P 0 1 Index: xc/doc/specs/test/head.t diff -u xc/doc/specs/test/head.t:1.1 xc/doc/specs/test/head.t:removed --- xc/doc/specs/test/head.t:1.1 Sat Dec 6 14:11:52 2003 +++ xc/doc/specs/test/head.t Tue May 9 21:52:05 2006 @@ -1,108 +0,0 @@ -.\" $XConsortium: head.t,v 1.1 92/06/11 15:32:55 rws Exp $ -'\" Simple table specification - to avoid the need to use tbl. -.de tL \" table line -.nf -\\&\\$1\\h'|10n'\\$2\\h'|26n'\\$3\\h'|30n'\\$4\\h'|34n'\\$5\\h'|43n'\\$6\\h'|50n'\\$7\\h'|61n'\\$8 -.fi -.. -.hy 0 -'\" Font for arguments -.ds fA \f(CO -'\" Font for structure member names -.ds fM \fI -'\" Font for symbols. -.ds fS \fC -'\" Font for function names -.ds fF \fC -'\" -'\" -'\" ### .TH - Header for a test set. -.de TH -.nr Ac 0 1 \" Set the assertion counter to zero. -'\" Save the name -.ds Na \\$1 -.ds Ch \\$2 \" Save the chapter name -.if \\n(nl .bp 1 -.sp 2 -.ps +2 -Assertions for \\*(Na -.ps -.sp 2 -.. -'\" ### .TI - Start assertion. -.de TI -.ds Ty \\$1 -.if '\\*(Ty'' .ds Ty -.sp -\fBAssertion \\*(Na-\\n+(Ac(\\*(Ty).\fR -.br -.. -'\" ### .A - Argument -.de A -\&\\*(fA\\$1\fR\\$2\\*(fA\\$3\fR\\$4\\*(fA\\$5\fR\\$6 -.. -'\" ### .M - Structure member name -.de M -\&\\*(fM\\$1\fR\\$2\\*(fM\\$3\fR\\$4\\*(fM\\$5\fR\\$6 -.. -'\" ### .S - Symbol name -.de S -\&\\*(fS\\$1\fR\\$2\\*(fS\\$3\fR\\$4\\*(fS\\$5\fR\\$6 -.. -'\" ### .F - Function name -.de F -.ie '\\$1'' \\*(fF\\*(Na\fR -.el \&\\*(fF\\$1\fR\\$2\\*(fF\\$3\fR\\$4\\*(fF\\$5\fR\\$6 -.. -'\" ### .SM - Make argument smaller -.de SM -.ie \\n(.$-2 \&\\$1\s-1\\$2\s0\\$3 -.el \&\s-1\\$1\s0\\$2 -.. -'\" The following macros NS and NE are for internal review purposes. -'\" ### .NS - Start a note from a comment in the source. -.de NS -.br -.ft I -.ps -1 -.in 1c -.. -'\" ### .NE - End a note from a comment in the source. -.de NE -.ft P -.ps -.in -.br -.. -'\" ### .)h - header macro -.de )h -'ev 1 -'sp .5i -'nr P +1 -.tl \\*({h -'sp .5i -.br -'ev -.. -'\" ### .)f - footer macro -.de )f -'ev 1 -'sp .5i -.tl \\*({f -.br -'ev -'bp -.. -.if !\nS .nr S 12 -.ps \nS -.ev 1 -.ps \nS -.ev -.if !\nO .nr O 7 -.po \nO -.ll 6i -.wh 0 )h -.wh -1i )f -.ds {h "'\\*(Na''\\*(Ch'" -.ds {f "''%''" -.nr P 0 1 Index: xc/doc/specs/test/paper.mm diff -u xc/doc/specs/test/paper.mm:1.1 xc/doc/specs/test/paper.mm:removed --- xc/doc/specs/test/paper.mm:1.1 Sat Dec 6 14:11:52 2003 +++ xc/doc/specs/test/paper.mm Tue May 9 21:52:05 2006 @@ -1,408 +0,0 @@ -.\" $XConsortium: paper.mm,v 1.1 92/06/11 15:33:25 rws Exp $ -.ds )k -.. -.ds HF 3 3 3 3 3 -.nr Hb 7 -.nr Hs 7 -.nr Hi 1 -.nr Pt 1 -.in +6 -.ll -6 -.S +2 -.DS 2 -\fBAn Approach to Testing X Window System Servers at a -Protocol Level\fR -.DE -.S -2 -.DS 2 -\fIMichael Lee Squires\fR - -\fILen Wyatt\fR -.DE -.DS 2 -Sequent Computer Systems, Inc. -15450 SW Koll Parkway -Beaverton, OR\ \ 97006 -(503) 626-5700 - -\fIABSTRACT\fR -.DE -.P 1 -An approach to testing display servers for the X Window System -is presented which depends only on an underlying communications -mechanism. -The server tester is intended to provide coverage -for those server specifications -which cannot be tested from the Xlib level. -It also ensures that the basic facilities needed to -run the Xlib tests are operational. -All testing is performed by sending messages to the server and -evaluating the responses from the server. -.in -6 -.ll +6 -.H 1 "INTRODUCTION" -.P 1 -The purpose of this document is to present a set of requirements -for a \fIserver tester\fP and to outline a -software structure which will satisfy those requirements. -This document is intended to guide not only the server tester -developers, but -other X Window System developers and testers also. -.H 2 "Background" -.P 1 -There are a variety of interfaces, services, and protocols specified -as part of the X Window System. -These are implemented by a set of components which may be produced by -different organizations, -running on different hardware and using different operating systems. -.P 1 -In order to promote a standard, -it is not sufficient to merely -publish an interface specification. -Examples of software which implement the standards -and which illustrate the use of the services must be made available. -Test procedures and test suites -which verify that specific component implementations adhere to the -specifications must be defined and made generally available. -.P 1 -The MIT X effort has addressed the interface specification, -software implementation, -and example use. -It has not, -thus far, -addressed the issue of testing and -specification compliance. -.P 1 -In the interests of promoting the X Window System as an industry standard, -a number of organizations have formed a -\fIconsortium\fP -for the purpose of defining and generating an appropriate -set of test tools and procedures for X. -This document addresses a specific facet of X testing which has -been identified by the consortium. -.H 1 "PROBLEM STATEMENT" -.H 2 "Testing Goals" -.H 3 "General" -.P 1 -The goals for testing X implementations are to: -.DL -.LI -promote \fIportability\fP of applications and application -libraries by ensuring a consistent set of interfaces -across disparate computer systems and operating systems. -That is, -if we have an application program which compiles and -runs on system A, -we should be able to transfer the source to -system B and, -within the constraints of language and operating system portability, -compile and run that program satisfactorily. -Since most applications are currently written to -the procedural interface provided in C by the Xlib -library, -this interface is the first target of the testing effort -for portability. -.LI -promote \fIinteroperability\fP of clients and servers which -may be running on disparate computer systems. -That is, -if we have a client which runs on system A and uses the -display server available on system B, -then that client should be able to operate successfully with -a server running on system C -(ignoring protocol extensions and client device dependencies). -.LE -.H 3 "Server Tester Goals" -.P 1 -The primary goal of the server tester is to address those -areas of interoperability which cannot be adequately covered -by tests at the Xlib level. -A secondary goal is to facilitate the Xlib testing -by ensuring that the basic server functions are operational. -Another secondary goal is to provide a low-level diagnostic -tool which would be useful to server developers. -.H 2 "Definitions" -.P 1 -The following definitions form a basis for understanding the -requirements of the server tester. -.P 1 -We define an \fBinterface\fP as an implementation -dependent functional boundary between two adjacent components. -Taking Xlib as an example, -the function names, calling sequences, and data types -necessary to interact with Xlib are its interface. -.P 1 -We define a \fBservice\fP as an implementation -independent set of capabilities that a particular -layer of software provides. -Again using Xlib as an example, -we could define an equivalent level library for another -language which provided the same services via a different -interface. -.P 1 -We define a \fBprotocol\fP as the specification of interaction -between two peer processes. -This specification consists of: -.DL -.LI -a message catalog -.LI -sequencing rules for message exchange -.LI -the specifications of the actions of the individual -processes in response to the message sequencing -.LE -.P 1 -When we examine the X Window System, -we see that the X protocol specification encompasses -three components: -the client, the server, -and the display hardware. -Thus a complete test of a server's adherence to -the protocol specification would include observing -its effect on the display hardware as well as its -ability to adhere to the rules for message sequencing. -.P 1 -We also notice that the "XLib Interface Specification" -actually consists of both an interface and a service -specification. -Furthermore, -the service specification depends on the adherence -of a particular server to the protocol specification. -.P 1 -Because Xlib was designed to provide fairly direct -access to the underlying X protocol, -many of the messages defined in the protocol specification -and their corresponding actions have a direct mapping -at the Xlib level. -This concept of a \fBmapping\fP between the -Xlib specification and the protocol specification -is a key element in determining the requirements for -a server tester. -.H 1 "APPROACH" -.H 2 "General" -.P 1 -Because many of the actions specified in the protocol specification -can be tested at the Xlib level, -because the Xlib level will be more heavily used by the majority -of X-based programmers, -and because DEC is mounting a substantial effort to rigorously -test the Xlib interfaces and services, -we will defer the bulk of the testing of server actions to the -Xlib testing effort. -.P 1 -We will design and implement a server tester which will concentrate -on testing those features of the protocol which are not testable -at the Xlib level or which are prerequisites to the Xlib level -testing. -Thus, -we will test the ability of the server to accept all legal -message types and respond appropriately. -We will ensure that server capabilities -which the Xlib testing will depend on -work within some bounds -(e.g ensure that the server can send a pixmap to the client -upon request). -We will test to ensure adherence to the canonical byte stream of -the protocol, -independent of the host byte sex or compiler structure packing. -.H 2 "Determining Specific Requirements" -.P 1 -We have developed a decision tree which allows us to determine -which server actions should be addressed by the server tester. -.P 1 -The first decision in the tree is "is the mapping of this action -(and the stimulus to cause it) to the Xlib level direct enough -to allow it to be tested at the Xlib level?" -An example of an action which can be tested at the Xlib level -is drawing a line within a window. -Initializing the server connection with an incorrect protocol -version number is an example of a test which cannot be performed -at the Xlib level. -.P 1 -If the mapping is direct enough to allow testing at the Xlib level, -then we need to ask "is this capability fundamental enough -that the Xlib tests cannot be reasonably performed if -the capability is deficient?" -An example of a fundamental capability is the server's ability -to send error responses. -.P 1 -If the mapping is not direct enough to allow the testing at -the Xlib level, -then we ask "can the action be inferred from other data available -at the Xlib level?" -An example of something which could be inferred is the initialization -of the default color map. -By reading the color map immediately following opening the display, -an Xlib level test can determine if the color map was properly initialized. -.TS -expand,box; -c s c s c -l l l l l. -Decision #1 Decision #2 Result -_ -T{ -Is the mapping direct enough to test at the Xlib level? -T} NO T{ -Can the action be inferred? -T} NO TEST -\^ \^ \^ YES DON'T TEST -\^ -\^ YES T{ -Is the action fundamental? -T} NO DON'T TEST -\^ \^ \^ YES TEST -.TE -.P 1 -We will apply this set of decisions to the protocol specification -to generate specific tests to perform in the server tester. -Generating this list is a specific deliverable on the development -schedule (see section 6). -.H 1 "SPECIFICATIONS" -.H 2 "General Requirements" -.P 1 -The server tester must satisfy the following requirements: -.DL -.LI -It will not use X as a basis for its user interaction. -(This provides a new server developer the ability to run -the tester using standard character terminals.) -.LI -It will verify that the server can accept all legal message types. -.LI -It will verify that the server will reject invalid message types. -.LI -It will perform all tests which are derived from applying -the decision criteria in section 3.2 to the protocol specification. -The complete list of tests is presented in section 4.2. -.LI -It will be portable to different computer systems -and operating systems. -(That is, any machine/operating system dependencies will be isolated. -We are not committing to port it to any/all systems.) -.LI -It will adapt the tests to different display hardware. -(That is, a mechanism for modifying test parameters based on -display characteristics will be provided.) -.LI -It will provide the capability to continue a test suite after -errors are encountered in a particular test. -.LI -It will provide the capability to test a server's ability -to deal with clients running on different byte sex hosts. -(That is, the tester will be capable of 'masquerading' -as a host with a different byte sex than it really has. -This allows an organization to more completely test -a server with a single host system.) -.LE -Additionally, -we will provide user documentation and -internal documentation for the server tester. -.H 2 "Specific Tests" -.P 1 -This subsection is currently \fBTBD\fP. -The detailed list of tests is the first deliverable discussed -in section 6. -.H 1 "SOFTWARE STRUCTURE" -.P 1 -The basic approach to developing the server tester and the test cases -which use it is to provide a layered set of C routines which constitute -the bulk of the test mechanism. -Individual test cases will be implemented as C programs which make -use of this layered set. -We will explore development of some sort of front-end tool -(e.g. preprocessor, interpreter) which will facilitate test case -generation, -but given the resource and schedule constraints we are unwilling to -commit to that at this time. -.P 1 -We will structure the test cases as a series of C programs, -each one designed to test a specific capability or set of capabilities. -This allows incremental development of the test cases, -selective use of individual tests during development or -diagnoses, and -ease of test suite configuration via use of command scripts. -.P 1 -The software will consist of 5 software layers: -.DL -.LI -Communication Manipulation - -lowest level - contains the -machine and operating dependent software - -responsible for byte swapping, buffering, -and ensuring the canonical byte stream. -.LI -Message Handling -low level utilities -(which look \fIvery\fP similar to the various internal -utilities within the -current Xlib implementation) - -expose more of their internal data structures than Xlib does to provide -test case writers the capability to "damage" messages -.LI -Message Generation - -essentially a subset of the current Xlib with many parameters omitted in -favor of their defaults - -(i.e. Generate_Standard_Create_Window_Request would be a candidate routine) -.LI -Adaptation - -all routines necessary to adapt the tests to specific display parameters - -(e.g. Generate_Safe_Rectangle_Set) -.LI -specific test cases -.LE -.P 1 -Note that this software really consists of two major components - -the "tools" (levels 1-4) and the test cases themselves. -This division is used to generate the milestones in section 6. -.DS L -.ft C -+--------------------------------------+ -| TEST CASE | -+--------------------------------------+ - | | | | - | | | | - v | | | -+------------+ | | | -| ADAPTATION | | | | -+------------+ | | | - | | | - | | | - v | | -+----------------------+ | | -| MESSAGE GENERATION | | | -+----------------------+ | | - | | - | | - v | -+-------------------------+ | -| MESSAGE HANDLING | | -+-------------------------+ | - | - | - v -+--------------------------------------+ -| COMMUNICATION MANIPULATION | -+--------------------------------------+ -.ft -.DE -.H 1 "DEVELOPMENT SCHEDULE" -.DS -.TS -box; -l l. -Deliverable Date -_ -T{ -Complete list of server tests -T} 7/17/87 - -T{ -Tools + initial set of test cases -T} 10/9/87 - -T{ -Remainder of test cases -T} 12/18/87 -.TE -.DE Index: xc/doc/specs/test/progguide.mm diff -u xc/doc/specs/test/progguide.mm:1.1 xc/doc/specs/test/progguide.mm:removed --- xc/doc/specs/test/progguide.mm:1.1 Sat Dec 6 14:11:52 2003 +++ xc/doc/specs/test/progguide.mm Tue May 9 21:52:05 2006 @@ -1,4028 +0,0 @@ -.\" $XConsortium: progguide.mm,v 1.5 94/04/18 21:04:07 rws Exp $ -.\" Copyright (c) 1992 X Consortium -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice shall be included in -.\" all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -.\" SOFTWARE. -.\" -.\" Except as contained in this notice, the name of the X Consortium shall not -.\" be used in advertising or otherwise to promote the sale, use or other -.\" dealing in this Software without prior written authorization from the -.\" X Consortium. -' -.ds dD Programmers Guide for the X Test Suite -.so 00.header -'\" -'\" Start and end of a user-typed display -'\" -.de eS -.in +2 -.nf -.ft C -.ps -2 -.. -.de eE -.ps +2 -.ft R -.fi -.in -2 -.. -.de cS -.DS I -.ft C -.ps -2 -.. -.de cE -.ps +2 -.ft R -.DE -.. -'\" # Courier -.de C -\fC\\$1\fP\\$2\fC\\$3\fP\\$4\fC\\$5\fP\\$6 -.. -'\" ### -.H 1 "Introduction" -This document is a Programmers Guide to the \*(xT. -.P -Instructions for installing and running the -\*(xT are contained in the document -"User Guide for the \*(xT". -It is not -necessary to read the Programmers Guide in order to install and run the test -suite. -.H 1 "Purpose of this guide" -The information in this section is designed to be used by a programmer -intending to review the source code in the -revised \*(xT. It is also intended to be used by an experienced -programmer, familiar -with the \*(xW, to modify or extend the \*(xT to add additional tests. -.P -Before reading this document, it is necessary to read -the document "User Guide for the \*(xT". -This is because the nomenclature used in this -document is explained in the "User Guide". Appendix F of that document is -a glossary, which explains the meaning of -some terms which may not be in common usage. -.P -The directory structure used within the \*(xT is described further in -"Appendix A - Contents of \*(xR" in -the "User Guide". You should be familiar with that -appendix before reading further. -.H 1 "Contents of this guide" -The test set source files in the -revised \*(xT have been developed in the format of a -simple language, specially produced as part of the -test suite development project. -Files in the test suite which use this -language have the suffix ".m" and are known as dot-m files. -.P -The syntax of this language is described in the next section of this -document entitled "Source file syntax". -.P -During the stage one review of the development project, it was determined -that there were some advantages in methods of automatically generating -source code for the tests from templates. The dot-m file may be seen as -a template for the tests. At the same time, it was important that -any utilities associated with the code generation should be commonly -available or provided within the test suite. -.P -For this reason, a utility -.C mc -has been provided to convert dot-m files -into C source code and produce Makefiles automatically -for the test set. -The file formats which may be produced -are described in the section entitled -"Source file formats". -Summaries of usage of the utilies are given in appendices D-F. -.P -As part of the test suite development, a number of conventions were -established to define how the syntax of this language should be used in -writing test sets. -It is useful to understand these conventions in order to understand -the structure of the existing tests. -You are recommended to use the existing tests as a model, -and follow the same structure when modifying or extending the \*(xT. -This is described in the section entitled -"Source file structure". -.P -The test set structure has deliberately -been kept as simple as possible, and common -functions have been developed in libraries. The contents of these -libraries is described in the section entitled "Source file libraries". -.H 2 "Typographical conventions used in this document" -The following conventions have been used in this document: -.AL -.LI -Items appearing in angle brackets <> should be substituted with a suitable -value. -.LI -Items appearing in square brackets [] are optional. -.LE -.SK -.H 1 "Source file syntax" -It is a design requirement that -the test code for each test purpose has an associated description of what -is being tested -(an -.I assertion ) -and a description of the procedure used to test it -(a -.I "test strategy" ). -All of these items are contained in dot-m files, -and programs are used to extract the relevant parts. -The utilies developed for the purpose are -outlined in appendices D-F, and the format of the files they output -is described in the section entitled -"Source file formats. -.P -The format of a dot-m file consists of a number of sections -introduced by keywords. The sections of a dot-m file are as follows: -.AL -.LI -A copyright notice. -.LI -A section introduced by the >>TITLE keyword. This section -defines the name of the function being tested and its arguments. -.P -The >>TITLE keyword, and the declaration and arguments -which follows it, are together known as the "title section". -.LI -Optionally, there may be a section introduced by the >>MAKE keyword. -This section defines additional rules for -.C make -beyond the default rules. -.P -The >>MAKE keyword, and the text which follows it, are together -known as a "make section". -.LI -Optionally, there may be a section introduced by the >>CFILES keyword. -This section defines additional C source files -source files that should be compiled and linked -(together with the -C source files produced by -.C mc ) -when building a test set. -.LI -Optionally, there may be a section introduced by the >>EXTERN keyword. -This section defines C source code which will be in scope for -all test purposes in the test set. -.P -The >>EXTERN keyword, and the source code which follows it, are together -known as an "extern section". -.LI -For each test purpose in the test set, there will be -a section introduced by an >>ASSERTION keyword. These sections -each contain the text of an assertion for the function being tested. -.P -The >>ASSERTION keyword, and the text which follows it, are together -known as an "assertion section". -.LI -An assertion section is normally followed by a section introduced -by a >>STRATEGY keyword, which is followed by the strategy. This is -a description of how the assertion is tested. -.P -The >>STRATEGY keyword, and the strategy which follows it, are together -known as a "strategy section". -.LI -The strategy is always followed by a section introduced -by a >>CODE keyword, which is followed by a section of C source -code which will test -whether the assertion is true or false on the system being tested. -.P -The >>CODE keyword, and the C source code which follows it, are together -known as a "code section". -.LI -Optionally, the >>INCLUDE keyword includes, from a file, one or more -of the above sections, at that point in the dot-m file. -It terminates the previous section. -.LE -.P -The keywords introducing the sections are defined in detail below. -.P -There are also optional keywords which may appear anywhere in a dot-m file: -.P -.AL -.LI -The >>SET keyword sets options which apply in the dot-m file. -.LI -The >># keyword introduces a comment in a dot-m file. -.LE -.P -The optional keywords are also defined in detail below. -.P -.H 2 "Title section - >>TITLE" -.H 3 "Description" -.cS -\&>>TITLE

-.cE -.P -This keyword must be used at the start of a test purpose immediately after -the copyright message. -.P -It may be followed by the declaration of the data type returned and -the function arguments. -These lines may be omitted if XCALL is never used in any code section -in the test set. -.P -.AL -.LI -The line after >>TITLE should specify the data type returned. -.LI -The next line should specify the function call with any arguments. -This is no longer mandatory, since the information is not used in the current -version of -.C mc . -So the second line may be left completely blank. -.LI -The following lines should specify the arguments and may set them -to any expression (not necessarily a constant expression). -Usually arguments are set to the return value of a function call, -a global variable inserted by the -.C mc -utility, -or a global variable declared in an >>EXTERN section. -.P -Static variables will be created to match these arguments, and -will be reset as specified automatically before the start -of each test purpose, by the function -.C setargs() -(described in the section entitled -"Source file formats"). -.LE -.H 3 "Arguments" -.VL 12 2 -.LI function -This is the name of the function in the \*(xW to be tested. -In the \*(xP -it should be the name of an X\ Protocol request or -an X\ event. -In the \*(xL -it should be the name of an Xlib function or -an X\ event. -.P -The XCALL macro will invoke the named function or macro (which should be in -Xlib) with the arguments specified on the lines following >>TITLE. -.LI section -This is the section of the \*(xT in which this particular test set is stored. -It should be the name of a directory in -.C $TET_ROOT/tset . -The section name is used in formatting the assertions in the test set, -and for output to the journal file for reporting purposes. -The section name does not affect the building and execution of the tests. -.LE -.H 2 "Make section - >>MAKE" -.H 3 "Description" -.cS -\&>>MAKE -.cE -.P -This keyword may be used anywhere in the dot-m file after the end of -a section. -.P -It should be followed by lines which will be copied into the Makefile -by the -.C mc -utility, when the Makefile is remade using the -.C -m -option. -.P -The lines specified will be joined together and placed in order -before the first -rule in the Makefile. In this way, the lines copied may contain both -initialisation of Make variables, and additional rules. -.P -This keyword should be used sparingly, since the additional Makefile lines -must be consistent with the rest of the -Makefile (see later section entitled "Makefile"). -.P -These lines are designed to allow auxiliary programs to be made by -.C make -(in addition to the default target which is -.C Test ). -For example, if test purposes in the test set -execute programs -.C Test1 -and -.C Test2 , -which must also be built, -the >>MAKE keyword can be -followed by lines which specify rules for building -these executable programs. This can be done as follows: -.P -.cS ->>MAKE -AUXFILES=Test1 Test2 -AUXCLEAN=Test1.o Test1 Test2.o Test2 - -all: Test - -Test1 : Test1.o $(LIBS) $(TCMCHILD) - $(CC) $(LDFLAGS) -o $@ Test1.o $(TCMCHILD) $(LIBLOCAL) $(LIBS) $(SYSLIBS) - -Test2 : Test2.o $(LIBS) $(TCMCHILD) - $(CC) $(LDFLAGS) -o $@ Test2.o $(TCMCHILD) $(LIBLOCAL) $(LIBS) $(SYSLIBS) -.cE -Notice that the default target -.C Test -is still made by the new default Make rule. -Also, notice that \fCTest1\fP and \fCTest2\fP are not dependencies for the -\fCall\fP target. They are dependencies for \fCTest\fP. -(See the later section entitled "Makefile".) -.H 2 "Additional source files - >>CFILES" -.H 3 "Description" -.cS -\&>>CFILES ... -.cE -This keyword may be used anywhere in the dot-m file after the end -of a section. -.P -The list of files following the keyword are taken as the names of C -source files that should be compiled and linked (together with the -C source files produced by -.C mc ) -when building a test set. -This allows code to be split among several files. -.P -The only effect is to alter the Makefile that is produced by -.C mmkf . -.H 2 "Extern section - >>EXTERN" -.H 3 "Description" -.cS -\&>>EXTERN -.cE -.P -This keyword may be used anywhere in the dot-m file after the end of -a section. -.P -It should be followed by lines of C source code which will be copied -into the C source file -by the -.C mc -utility, when the C source code is remade. -.P -These lines will be copied unaltered into the C source file -before the source code for the first test purpose. -.P -This section is useful for including three types of source code: -.AL -.LI -static variables declarations which are used by a number of -test purposes in the test set. -.LI -static functions which are used by a number of -test purposes in the test set. -.LI -header file inclusions which are needed in addition to the default header file -inclusions in the C source code. -.LE -.H 2 "Assertion section - >>ASSERTION" -.H 3 "Description" -.cS -\&>>ASSERTION [ [] ] -.cE -.P -This keyword is used at the start of each test purpose. -.P -It should be followed by the text of the assertion -which is a description of what is tested by this particular test purpose. -.P -The text should not contain troff font change commands (or any other -nroff/troff commands). This is because the majority of nroff/troff -commands will not be understood by the -.C ma -utility. -However, various macros can be -used to enable mapping of the format of special text -onto similar fonts to those used in the \*(xW documentation. -These are described in appendix B. -.P -The keyword xname in the assertion text will be replaced by -.C mc -with the name of the function -under test obtained from the >>TITLE keyword. -.P -Unless the -.C category -argument specifies an extended assertion, or the -.C test-type -is -.C gc -or -.C def , -the assertion text must be followed by the >>STRATEGY keyword, strategy -section, >>CODE keyword and code section. -Refer to the description of the -.C category -argument. -.P -If the >>CODE keyword is missing, following the text of an assertion -which is not an extended assertion, the -.C mc -utility will insert code to produce a result code UNREPORTED for this -test purpose when the test set is executed. -.H 3 "Arguments" -.VL 12 2 -.LI test-type -.VL 6 2 -.LI Good -.P -This is a "good" test. -The function under test is expected to give a successful result. -.P -By convention these assertions appear in the dot-m file -before all assertions with test-type Bad. -.LI Bad -.P -This is a "bad" test. -The function under test is expected to give an unsuccessful result -under the conditions that the test imposes. -.P -By convention these assertions appear in the dot-m file -after all assertions with test-type Good. -.P -The assertion text for many of these assertions is included via the .ER -keyword, described below. -.LI gc -.P -The assertion text states which gc components affect the function under test. -In this case the remaining arguments are unused, and -.C mc -inserts into the C source file a series of assertions, strategies and -test code corresponding to the gc components listed in the assertion text -via the macro -.cS -\&.M gc-comp , -.cE -or -.cS -\&.M gc-comp . -.cE -.P -The assertions, strategies and test -code are included, from files in the directory -\fC$TET_ROOT/xtest/lib/gc\fP. -.P -The \.M macro is used, since the gc components correspond to structure members -in a gc structure. -.LI def -.P -The assertion text is tested in the test for another assertion. -These assertions are often definitions of terms, which cannot be tested in -isolation, hence the abbreviation "def". -The remaining arguments are unused, and -.C mc -inserts code into the C file to issue the result code NOTINUSE, and -issues a message stating that the assertion is tested elsewhere. -.LE -.ne 5 -.LI category -.P -.P -This is the assertion category, modelled on the corresponding -codes in the document\*F -.FS -Obtainable from Publication Sales, IEEE\ Service\ Center, P.O.\ Box\ 1331, -445\ Hoes\ Lane, Piscataway, NJ\ 08854-1331, (201)\ 981-0060 -.FE -POSIX.3 entitled "Test Methods for Measuring Conformance to POSIX". -It is either A, B, C or D. -.P -If the assertion tests a conditional feature, it is categorised as type -C or D, otherwise it is categorised as type A or B. -.P -If the assertion is classified as an "extended assertion" -it is categorised as type -B or D. -Otherwise it is categorised -as type A or C and is known as a "base assertion". -.TS -center box; -c | c | c. - Base Assertion Extended Assertion -_ -Required Feature A B -_ -Conditional Feature C D -.TE -.P -Tests are always required for base assertions. Tests are not required -for extended assertions, but should be provided if possible. -Extended assertions are used to describe features that may be difficult -to test. -.P -In some -cases partial testing may be performed for extended assertions. -An example is that it may be possible to test that some specific common -faults are not present. -In this the result code would be FAIL if an error is detected, or -UNTESTED if no failure is detected, but the assertion is still -not fully tested. -.P -For this reason, the strategy and code sections are optional for -extended assertions. -If they are not supplied, -.C mc -will automatically generate source code to -put out a result code UNTESTED, with a message which describes -the reason. -If they are supplied, they will override the automatically generated sections. -.P -Since there is not yet an equivalent document to POSIX.3 for -the \*(xW then these codes are subject to change. For example, an -assertion classified as an "extended assertion" (type B) might -become a "base assertion" (type A) if a test method is later identified. -.P -The following table lists the allowed test result codes for each category. -.P -.TS -center box; -c | l. -Category Allowed Result Codes -_ -A PASS, FAIL, UNRESOLVED -B PASS, FAIL, UNTESTED, UNRESOLVED -C PASS, FAIL, UNSUPPORTED, UNRESOLVED -D PASS, FAIL, UNSUPPORTED, UNTESTED, UNRESOLVED -.TE -.LI reason -.P -In the case of extended assertions (category B or D) -a reason code must be supplied. These are the same as in POSIX.3. -A list of the reason codes, and the corresponding text of the reason, are -shown in appendix A. -.LE -.H 2 "Strategy section - >>STRATEGY" -.H 3 "Description" -.cS -\&>>STRATEGY -.cE -.P -If the category of an assertion is A or C, -this keyword must be used immediately after the assertion section. -.P -If the category of an assertion is B or D, -this keyword may be optionally be used immediately after the assertion section. -.P -It should be followed by the strategy, which is a description of how the -assertion is to be tested. -.P -The text of the strategy is in free format sentences. -It may contain the xname keyword, which is an abbreviation for the name -of the function under test. -.P -The use of the XCALL keyword in the strategy section as an abbreviation -for "Call xname" is discontinued, -although in this release, some occurrences remain. -.H 2 "Code section - >>CODE" -.H 3 "Description" -.cS -\&>>CODE [] -.cE -.P -This keyword must be used immediately after the strategy section. -.P -It should be followed by the C source code which will test the assertion. -.P -The C source code will be converted by -.C mc -into a format suitable for the use by the -.SM "TET API" . -The way in which this is done is described -in the section entitled -"Source file formats". -.P -A blank line must separate the declarations of automatic variables -in the test function -from the first executable statement. There must be no other blank lines -within these declarations. -.P -The utility -.C mc -also expands the XCALL macro to call the function under test, and -to call library functions, before and after the function under test, -to install and deinstall error handlers and flush pending requests to the -X server. The way in which this is done is described -in the section entitled -"Source file formats". -.H 3 "Arguments" -.VL 12 2 -.LI BadThing -.P -This is an optional argument to the >>CODE macro. -.P -If it is omitted, -the XCALL macro will cause code to be -inserted to ensure that the function -under test produces no X\ Protocol error, and issues a result code FAIL if an -error is detected. -.P -If it is set to the symbolic value of an \*(xW -error code, the XCALL macro will cause code to be -inserted to ensure that the -function under test produces that X\ Protocol error, -and issues a result code FAIL -if the wrong error, or no error, is detected. -.LE -.H 2 "Included section - >>INCLUDE" -.H 3 "Description" -.cS -\&>>INCLUDE -.cE -This keyword includes the contents of -.C filename , -which must be a file containing -one or more sections in the dot-m file format, optionally containing a -copyright header. -The sections in the included file should -produce a valid dot-m file, if they were included directly at the point -of inclusion. The >>INCLUDE keyword terminates the preceding section - -it cannot be used in the middle of a section. -.P -The included sections are processed at the point of inclusion when -the C source code is generated by the -.C mc -utility. -.P -The >>INCLUDE keyword is usually used when including test purposes -which are common to more than one test set. -The >>INCLUDE mechanism allows an entire test purpose (including -assertion, strategy and code sections) to be included. -.P -The >>INCLUDE keyword should not be used for merely including -common functions called by a number of test purposes. -If the functions are common to -one dot-m file, they should be placed in an extern section. If the functions -are common to many test sets, they should be placed in one of the -\*(xT libraries. -.SK -.H 2 "Included errors - .ER" -.H 3 "Description" -.cS -\&.ER [Bad]Access grab -\&.ER [Bad]Access colormap-free -\&.ER [Bad]Access colormap-store -\&.ER [Bad]Access acl -\&.ER [Bad]Access select -\&.ER [Bad]Alloc -\&.ER [Bad]Atom [val1] [val2] ... \(dg -\&.ER [Bad]Color -\&.ER [Bad]Cursor [val1] [val2] ... \(dg -\&.ER [Bad]Drawable [val1] [val2] ... \(dg -\&.ER [Bad]Font bad-font -\&.ER [Bad]Font bad-fontable -\&.ER [Bad]GC -\&.ER [Bad]Match inputonly -\&.ER [Bad]Match gc-drawable-depth -\&.ER [Bad]Match gc-drawable-screen -\&.ER [Bad]Match wininputonly -\&.ER [Bad]Name font -\&.ER [Bad]Name colour -\&.ER [Bad]Pixmap [val1] [val2] ... \(dg -\&.ER [Bad]Value [mask] [val2] ... \(dd -\&.ER [Bad]Window [val1] [val2] ... \(dg -.cE -.S -1 -\(dg - these arguments are optional. -.P -\(dd - the and at least argument must be supplied. The -mask argument, and additional arguments, are optional. -.P -Note - the \fCBad\fP prefix is in each case optional. -.S -.P -This keyword -causes -.C mc -to insert into the C source file the text of an assertion, -and in some cases default strategy and -default -test code to test for the generation of a particular X\ Protocol error by -an Xlib function. -.P -In some cases there is no strategy and code in the included file, -because only the assertion is common - the strategy and code -sections are specific to each test purpose, and must be provided immediately -after the .ER keyword. -.P -The default strategy and code sections (if included) may be overridden by -sections in the dot-m file immediately after the .ER keyword. -.P -Note that this keyword does not insert the >>ASSERTION keyword - this must -appear on the line before .ER is invoked. Thus the keyword does not -include the entire assertion section. -.P -The assertion text, strategy and test -code are included from files in the directory -\fC$TET_ROOT/xtest/lib/error\fP. -.P -The names of these files, and the -assertion text in each file, is shown in appendix C. -.H 2 "Set options - >>SET" -.H 3 "Description" -.cS -\&>>SET startup -\&>>SET cleanup -\&>>SET tpstartup -\&>>SET tpcleanup -\&>>SET need-gc-flush -\&>>SET fail-return -\&>>SET fail-no-return -\&>>SET return-value -\&>>SET no-error-status-check -\&>>SET macro [ ] -\&>>SET begin-function -\&>>SET end-function -.cE -.P -These options control how the -.C mc -utility converts the dot-m file into a C source file. -.P -Except where specifically stated, -they may appear anywhere in the dot-m file and apply from that point on, unless -reset by a further >>SET keyword with the same first argument. -.P -.H 3 "Arguments" -.VL 12 2 -.LI startup -.br -The name of the function called before all test -purposes is to be set to func_startup (rather than the default, startup()). -.LI cleanup -.br -The name of the function called after all test -purposes is to be set to func_cleanup (rather than the default, cleanup()). -.LI tpstartup -.br -The name of the function called before each test -purpose is to be set to func_tpstartup (rather than the default, tpstartup()). -.LI tpcleanup -.br -The name of the function called after each test -purpose is to be set to func_tpcleanup (rather than the default, tpcleanup()). -.LI need-gc-flush -.br -When the XCALL macro is expanded, code to call the \*(xT library -function gcflush(display, gc) will be inserted -after the code to call the function under test. -.LI fail-return -.br -When the XCALL macro is expanded, code to end the test purpose -will be inserted where an error is reported -(the default is to continue after an error is reported). -.LI fail-no-return -.br -When the XCALL macro is expanded, no code to end the test purpose -will be inserted where an error is reported (this reverses the effect earlier -using >>SET fail-return). -.LI return-value -.br -When the XCALL macro is expanded, and the Xlib function call has return type -.C Status , -and the return value of XCALL is not saved for testing in the calling code, -code will be inserted to report an error if the function under test does not -return . -(By default, -when the Xlib function call has return type -.C Status , -an error is reported for assertions with test-type -Good if the return value is zero, and for assertions with test-type Bad if -the return value is non-zero). -.LI no-error-status-check -.br -When the XCALL macro is expanded, the default code to check for X Protocol -errors will not be inserted. The test purpose can perform alternative checking -after invoking XCALL. -This setting only applies up to the end of the current section. -.LI macro -.br -There is a macro in an \*(xW header file for which a -test set source file will be produced which uses identical test purposes -to the function under test. This is used to automatically -generate test purposes for -the Display and Screen information macros, which are identical to those -for the corresponding Xlib functions. -.P -The macro name is set to -.C -- the default is the -.C function -argument in the >>TITLE keyword, -with the leading letter `X' removed. -.P -This option must be specified -.B before -the title section of the dot-m file. -.P -Note - this option may not be used for macros which have no arguments. -.LI begin-function -.br -The name of an additional function called before each test -purpose, after tpstartup() and global function arguments are initialised. -.LI end-function -.br -The name of an additional function called after each test -purpose, before tpcleanup(). -.LE -.H 2 "Comment lines - >>#" -.H 3 "Description" -.cS -\&>># -.cE -This keyword specifies a one line comment. These are not intended to replace -code comments in the code section - in fact the -.C mc -utility does not copy dot-m format comments to the C source file. -Comments in the dot-m file are used for higher level comments rather -than detailed comments. For example, comments are used to record the -history of the development of the dot-m file, to preserve previous versions -of assertions where necessary, -and to draw attention to unresolved problem areas. -.SK -.H 1 "Source file formats" -This section describes the output from -various utilities which may be used to format -the contents of a dot-m file. -.P -The code-maker utility -.C mc -builds C source files from a dot-m file. -Appendix D gives a usage summary. -.P -The Makefile utility -.C mmkf -builds Makefiles from a dot-m file. -Appendix E gives a usage summary. -.P -The assertion utility -.C ma -produces a list of assertions from a dot-m file. -Appendix F gives a usage summary. -.P -Instructions for building and installing the -.C mc -utility are given in the "User Guide". When the utility -.C mc -is built and installed, the utilities -.C mmkf -and -.C ma , -which are links to the same program -.C mc -differing only in name, are automatically installed as well. -.H 2 "C files for standalone executable - \fCTest.c\fP" -The command -.cS -mc -o Test.c stclpmsk.m -.cE -produces a C file named -.C Test.c . -This may be compiled to produce a standalone executable file named -.C Test . -Instructions on building and executing the tests are given in the "User Guide". -The -.C Test.c -files are not provided as part of this release, but are built -automatically when building the \*(xT. -.P -The C file contains all of the interface code required -to invoke the test purposes from the -.SM TET -and a description of the assertion being tested is placed as a comment -above the code for each test -purpose to make it easy to understand what is being tested. -.P -The remaining parts of this section describe the format of the -.C Test.c -files in more detail. The descriptions are in the order in which the text -is inserted into the -.C Test.c -file. -.P -Some parts of the -.C Test.c -file are constructed by copying in template files specifically written -to work with -.C mc . -These files are all located in the directory -\fC$TET_ROOT/xtest/lib/mc\fP. -.H 3 "Copyright header" -A copyright header is inserted as a C source comment block. This will -contain lines showing the SCCS versions of the dot-m file and any -included files. -.H 3 "SYNOPSIS section" -A synopsis defining the arguments of the function being tested is inserted -as a C source comment block. -This is constructed from the lines following the >>TITLE keyword in the -dot-m file. -It includes the data type returned and any arguments -to the function. -.P -The synopsis section is omitted if there are no lines -following the the >>TITLE keyword. -.P -For example: -.cS -/* - * SYNOPSIS: - * void - * XSetClipMask(display, gc, pixmap) - * Display *display; - * GC gc; - * Pixmap pixmap; - */ -.cE -.H 3 "Include files" -For the \*(xL, when the -.C section -argument to the >>TITLE keyword is -other than -.C XPROTO , -the contents of the file -.C mcinclude.mc -are then included. -.P -In this release the contents of this file are -as follows: -.cS -#include -#include "xtest.h" -#include "Xlib.h" -#include "Xutil.h" -#include "Xresource.h" -#include "tet_api.h" -#include "xtestlib.h" -#include "pixval.h" -.cE -.P -For the \*(xP, when the -.C section -argument to the >>TITLE keyword is -.C XPROTO -the contents of the file -.C mcxpinc.mc -are then included. -.P -In this release the contents of this file are -as follows: -.cS -#include -#include "xtest.h" -#include "tet_api.h" -.cE -.H 3 "External variables" -For the \*(xL, when the -.C section -argument to the >>TITLE keyword is -other than -.C XPROTO , -the contents of the file -.C mcextern.mc -are then included. -.P -In this release the contents of this file are -as follows: -.cS -extern Display *Dsp; -extern Window Win; - -extern Window ErrdefWindow; -extern Drawable ErrdefDrawable; -extern GC ErrdefGC; -extern Colormap ErrdefColormap; -extern Pixmap ErrdefPixmap; -extern Atom ErrdefAtom; -extern Cursor ErrdefCursor; -extern Font ErrdefFont; -.cE -.P -The external variables are defined in the file -.C startup.c -or (when linking a program executed via \fCtet_exec()\fP) -in the file -.C ex_startup.c . -.P -For the \*(xP, when the -.C section -argument to the >>TITLE keyword is -.C XPROTO -the contents of the file -.C mcxpext.mc -are then included. -.P -In this release this file is empty. -.H 3 "Test set symbol and name" -A symbol is defined indicating the function under test. -.P -For example: -.P -.cS -#define T_XSetClipMask 1 -.cE -.P -You may use this in a -.C #ifdef -control line, -to distinguish special cases for particular functions in code sections -of a dot-m file included via the >>INCLUDE keyword. -.P -The global variable -.C TestName -is initialised to the name of the function under test, which is the -.C function -argument given to the >>TITLE keyword. -.P -For example: -.P -.cS -char *TestName = "XSetClipMask"; -.cE -.P -You can use this within a code section -of a dot-m file to obtain the name of the function under test. -.H 3 "Definitions for arguments" -Symbols are defined to correspond with any arguments to the -.C function -specified in the >>TITLE keyword. -.P -These correspond to the lines following the >>TITLE keyword in the -dot-m file. -.P -For example: -.P -.cS -/* - * Defines for different argument types - */ -#define A_DISPLAY display -#define A_GC gc -#define A_PIXMAP pixmap -#define A_DRAWABLE pixmap -.cE -.P -These are used by the code in various included files, to substitute a symbol -representing a particular argument type with the -actual variable used as the argument by the function under test. -.H 3 "Static variables" -Static variables are defined to correspond with any arguments to the -.C function -specified in the >>TITLE keyword. -.P -These correspond to the lines following the >>TITLE keyword in the -dot-m file. -.P -For example: -.P -.cS -/* - * Arguments to the XSetClipMask function - */ -static Display *display; -static GC gc; -static Pixmap pixmap; -.cE -.P -These are the arguments that will be passed to the function under test -when the XCALL macro is expanded. -.P -You can initialise these in a code section of a -dot-m file as required prior to invoking the macro XCALL. -.P -These variables will be initialised at the start of each test purpose -using the function -.C setargs() -described below in the section entitled "Initialising arguments". -.H 3 "Test purpose number" -You can use this within a code section -of a dot-m file to obtain the number of the current test purpose. -.cS -int tet_thistest; -.cE -.H 3 "Initialising arguments" -A function -.C setargs() -is defined to initialise the arguments to the function under -test. -.P -Code to call this function is inserted at the start of each -test purpose before the code you put in the code section. -.P -The arguments are initialised to have the value of the expression -you specified in the title section. This does not have to be a constant -expression - for example, it my be a return value of a function in -a library or extern section. -By default arguments are initialised to zero values. -.P -For example: -.cS -/* - * Called at the beginning of each test purpose to reset the - * arguments to their initial values - */ -static void -setargs() -{ - display = Dsp; - gc = 0; - pixmap = 0; -} -.cE -.H 3 "Initialising arguments when test-type is Bad" -A function -.C seterrdef() -is defined to initialise some of the arguments to the function under -test to values which are suitable for conducting the included -error tests. -.P -This is called in some of the included error tests to initialise -the arguments to known good values. -.P -For example: -.cS -/* - * Set arguments to default values for error tests - */ -static void -seterrdef() -{ - gc = ErrdefGC; - pixmap = ErrdefPixmap; -} -.cE -.H 3 "Code sections" -The code sections in the dot-m file are converted into a sequence of -functions named t\fCnnn\fP(), where \fCnnn\fP is a three digit number which -is filled with leading zeros if necessary, the first code section -being named t001(). This is known as a "test function". -.P -Each of the test functions is preceded by the corresponding assertion -for the test purpose, in a C source code comment, labelled with the -test purpose number. -.P -Code to call the library function -.C tpstartup() -is inserted at the start of the test function, immediately -after any automatic variables declared in your code section. -This function performs initialisation required for each test purpose, -including setting error handlers to trap unexpected errors. -.P -Code to call the automatically generated test-set specific function -.C setargs() -is then inserted. This function -is described further in the previous section entitled "Initialising arguments". -.P -The contents of your code section are then inserted. -.P -The macro XCALL in a dot-m file is expanded to call the function -under test with arguments -corresponding to the lines following the >>TITLE keyword. -.P -For example: -.cS - XCALL; -.cE -is by default expanded to -.cS - startcall(display); - if (isdeleted()) - return; - XSetClipMask(display, gc, pixmap); - endcall(display); - if (geterr() != Success) { - report("Got %s, Expecting Success", errorname(geterr())); - FAIL; - } -.cE -.P -The stages in this expansion are as follows: -.AL -.LI -The library function -.C startcall() -is called to check for any outstanding unexpected X protocol errors, -which might have been generated, for example, during the setup -part of the test. -A call to -.C XSync() -is made to achieve this. -.LI -The library function -.C startcall() -installs a test error handler in place of the unexpected X protocol -error handler. -.LI -The library function -.C isdeleted() -returns -.C True -if the test purpose has already issued a result code UNRESOLVED due to -an earlier call to -.C delete() . -(This must be done after calling -.C startcall() -in case -.C XSync() -flushed an unexpected X protocol error.) -.LI -The function under test is then called with the arguments listed -in the title section. -.LI -The library function -.C endcall() -is called to check for any X protocol errors caused by the -function under test. -A call to -.C XSync() -is made to achieve this. -.LI -The library function -.C endcall() -installs the unexpected X protocol -error handler. -.LI -The test error handler saves the number of the most recent X protocol error. -It is accessed by calling the function -.C geterr() -and the value is checked. The value is expected to be -.C Success -by default, or -.C BadThing -if the code section was introduced in the dot-m file by -.cS ->>CODE BadThing -.cE -.P -If it is desirable to skip checking the error status at this point, the -option -.cS ->>SET no-error-status-check -.cE -may be inserted in the dot-m file in the current code section before the -XCALL. -This setting only applies up to the end of the current section. -.LE -.H 3 "TET initialisation code" -The -.C mc -utility -adds a reference to the function into an array of functions which can -be invoked via the -.SM "TET API" . -.P -For example: -.P -.cS -struct tet_testlist tet_testlist[] = { - t001, 1, - t002, 2, - t003, 3, - NULL, 0 -}; -.cE -Code to calculate the number of test purposes in the test set is -inserted as follows: -.cS -int ntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1; -.cE -.P -Finally, the names of the startup and cleanup functions are used to -initialise variables used by the -.SM "TET API" . -These functions are -called before the first test purpose and after the last test purpose. -The functions called can be overridden using the options ->>SET startup and >>SET cleanup. -.P -The default library functions perform initialisation including -reading the TET configuration variables and opening a default -client. -.P -Should you override the default startup and cleanup functions, you -are recommended to call -.C startup() -as the first line of your startup function and -.C cleanup() -as the last line of your cleanup function. -.cS -void (*tet_startup)() = startup; -void (*tet_cleanup)() = cleanup; -.cE -.H 2 "C files for standalone executable in macro tests - \fCMTest.c\fP" -When the dot-m file contains the line -.cS ->>SET macro -.cE -the command -.cS -mc -m -o MTest.c scrncnt.m -.cE -produces a C file named -.C MTest.c . -This may be compiled to produce a standalone executable file named -.C MTest . -Instructions on building and executing the tests are given in the "User Guide". -The -.C MTest.c -files are not provided as part of this release, but are built -automatically when building the \*(xT. -.P -The file -.C MTest.c -is identical to the file -.C Test.c -except that a macro (which is expected to be made visible by including -the file Xlib.h) -is tested instead of the Xlib function named in the -title section of the dot-m file. -.P -The macro name is set to the -.C -argument of the >>SET macro option - if there is no >>SET macro -option in the file, or no argument specified, the default is the -.C function -argument in the >>TITLE keyword, -with the leading letter `X' removed. -.H 2 "C files for linked executable - \fClink.c\fP" -The command -.cS -mc -l -o link.c stclpmsk.m -.cE -produces a C file named -.C link.c . -This is identical to the -.C Test.c -file with the exception of the initialisation code -which -enables the source code to be -compiled and linked into a space-saving executable file. -This is an executable file -which may invoke any of the test purposes in the various link.c files, -thereby reducing the number of executable files required, and -saving space. -The -.C link.c -files are not provided as part of this release, but are built -automatically when building the \*(xT. -.P -The remaining parts of this section describe the differences in -format of the -.C link.c -and -.C Test.c -files. -.P -The differences are associated with the TET initialisation code -being in a separate source file named -.C linktbl.c , -rather than in the test set source file. -.P -A -.C linktbl.c -file is provided for each section of the \*(xT in each subdirectory of -.C $TET_ROOT/xtest/tset . -This file contains a pointer to an array of -.C linkinfo -structures, one for each test set in the section. -Each -.C linkinfo -structure contains the following items: -.VL 20 0 -.LI \fCname\fP -a unique name for that test set (the name of the test set directory). -.LI \fCtestname\fP -the actual Xlib function tested by the test set. -.LI \fCntests\fP -the number of test purposes in the test set. -.LI \fCtestlist\fP -a pointer to the array of test functions constructed for that test set -from the contents of the link.c file. -.LI \fClocalstartup\fP -a pointer to the startup function specific to that test set. -.LI \fClocalcleanup\fP -a pointer to the cleanup function specific to that test set. -.LE -.P -Later in this section there are example values of these structure members. -.P -When the space-saving executable is executed, -the TET -initialisation code in the library function -.C linkstart.c -determines which test set is required. This is done by matching \fCargv[0]\fP -with a \fCname\fP element in the array of -.C linkinfo -structures. The test functions specified by the corresponding -\fCtestlist\fP -element of the -.C linkinfo -structure are then executed, preceded and followed by the corresponding -startup and cleanup function respectively. -.H 3 "Test set symbol and name" -The global variable -.C TestName -is made static. -.cS -static char *TestName = "XSetClipMask"; -.cE -.H 3 "Test purpose number" -This is defined in -.C linktbl.c , -and is made available via the following code: -.cS -extern int tet_thistest; -.cE -.H 3 "TET initialisation code" -The global variable -.C tet_testlist -is made static. -.P -For example: -.P -.cS -static struct tet_testlist tet_testlist[] = { - t001, 1, - t002, 2, - t003, 3, - NULL, 0 -}; -.cE -The global variable -.C ntests -is made static. -.cS -static int ntests = sizeof(tet_testlist)/sizeof(struct tet_testlist)-1; -.cE -The -.C linkinfo -structure specific to this test set is defined. -.P -For example: -.P -.cS -struct linkinfo EXStClpMsk = { - "stclpmsk", - "XSetClipMask", - &ntests, - tet_testlist, - 0, - 0, -}; -.cE -.P -The TET variables for the startup and cleanup functions are defined in -.C linktbl.c , -and are made available via the following code: -.cS -extern void (*tet_startup)(); -extern void (*tet_cleanup)(); -.cE -.H 2 "C files for linked executable in macro tests - \fCmlink.c\fP" -When the dot-m file contains the line -.cS ->>SET macro -.cE -the command -.cS -mc -m -l -o mlink.c scrncnt.m -.cE -produces a C file named -.C mlink.c . -The -.C mlink.c -files are not provided as part of this release, but are built -automatically when building the \*(xT. -.P -The file -.C mlink.c -is identical to the file -.C link.c , -except that a macro (which is expected to be made visible by including -the file Xlib.h) -is tested instead of the Xlib function named in the -title section of the dot-m file. -.P -The macro name is set to the -.C -argument of the >>SET macro option - if there is no >>SET macro -option in the file, or no argument specified, the default is the -.C function -argument in the >>TITLE keyword, -with the leading letter `X' removed. -.H 2 "Makefile" -The command -.cS -mmkf -o Makefile scrncnt.m -.cE -produces a Makefile which can be used to build -all the C source files described in the previous sections -and to build the test executables from the C files. -.P -Further instructions appear in the "User Guide" in the section -entitled -"Building, executing and reporting tests without using the TET". -.P -The Makefiles produced by -.C mc -are portable in that they use symbolic names to describe commands -and parameters which may vary from system to system. -The values of these symbolic names are all obtained by a utility -.C pmake -from the -build configuration file, which is described in the -"User Guide" in the section entitled -"Configuring the \*(xT". -.P -The targets in the Makefile which can be invoked by -.C pmake -are as follows: -.VL 12 0 -.LI "\fCpmake Test\fP" -.br -Builds standalone executable version of the test set. -.LI "\fCpmake Test.c\fP" -.br -Builds -.C Test.c -using -.C mc -with the format described in the earlier section entitled -"C files for standalone executable - \fCTest.c\fP". -.LI "\fCpmake MTest\fP" -.br -Builds standalone executable version of the test set to test the macro -version of the function. -.LI "\fCpmake MTest.c\fP" -.br -Builds -.C MTest.c -using -.C mc -with the format described in the earlier section entitled -"C files for standalone executable - \fCMTest.c\fP". -.LI "\fCpmake linkexec\fP" -.br -Builds the object files and links -which can be used to produce a linked executable file. These -targets are used when building space-saving executables as -described in the "User Guide". -.LI "\fCpmake link.c\fP" -.br -Builds -.C link.c -using -.C mc -with the format described in the earlier section entitled -"C files for linked executable - \fClink.c\fP". -.LI "\fCpmake mlink.c\fP" -.br -Builds -.C mlink.c -using -.C mc -with the format described in the earlier section entitled -"C files for linked executable - \fCmlink.c\fP". -.LI "\fCpmake clean\fP" -.br -This -removes object files and temporary files from the test set directory. -.LI "\fCpmake clobber\fP" -.br -This -removes object files and temporary files from the test set directory -and additionally removes all the source files which -.C mc -can remake. -.LE -.P -The remaining parts of this section describe the format of the -Makefiles in more detail. -.P -Refer to the section entitled "Make section - >>MAKE" for examples of how -the variables -.SM AUXFILES -and -.SM AUXCLEAN -may be set. -.H 3 "Copyright header" -A copyright header is inserted as a comment block. This will contain -lines showing the SCCS versions of the dot-m file and any included files. -.H 3 "Make variables" -A series of -.C make -variables are initialised -to represent the names of -the source, object and executable files. -.cS -SOURCES=scrncnt.m -CFILES=Test.c -OFILES=Test.o -MOFILES=MTest.o -LOFILES=link.o mlink.o -LINKOBJ=scrncnt.o -LINKEXEC=scrncnt -.cE -.H 3 "Targets for \*(xP" -For the \*(xP, when the -.C section -argument to the >>TITLE keyword is -.C XPROTO -the contents of the file -.C mmxpinit.mc -are then included. -.P -This file initialises various -.C make -variables to specific values for the \*(xP. -.P -In this release the contents of this file are as follows: -.cS -# -# X Protocol tests. -# - -# CFLAGS - Compilation flags specific to the X Protocol tests. -# -CFLAGS=$(XP_CFLAGS) -SYSLIBS=$(XP_SYSLIBS) -LIBS=$(XP_LIBS) - -# LINTFLAGS - Flags for lint specific to the X Protocol tests. -# -LINTFLAGS=$(XP_LINTFLAGS) -LINTLIBS=$(XP_LINTLIBS) - -.cE -.H 3 "Targets for standalone executable - \fCTest\fP" -The contents of the file -.C mmsa.mc -are included. These are the targets to create the standalone executable file -.C Test . -.cS -# -# Build a standalone version of the test case. -# -Test: $(OFILES) $(LIBS) $(TCM) $(AUXFILES) - $(CC) $(LDFLAGS) -o $@ $(OFILES) $(TCM) $(LIBLOCAL) $(LIBS) $(SYSLIBS) - -Test.c: $(SOURCES) - $(CODEMAKER) -o Test.c $(SOURCES) - -.cE -.H 3 "Targets for standalone executable - \fCMTest\fP" -If the dot-m file contains the >>SET macro option, -the contents of the file -.C mmmsa.mc -are included. These are the targets to create the standalone executable file -.C MTest -for the macro version of the specified Xlib function. -.cS -# -# Build a standalone version of the test case using the macro version -# of the function. -# -MTest: $(MOFILES) $(LIBS) $(TCM) $(AUXFILES) - $(CC) $(LDFLAGS) -o $@ $(MOFILES) $(TCM) $(LIBLOCAL) $(LIBS) $(SYSLIBS) - -MTest.c: $(SOURCES) - $(CODEMAKER) -m -o MTest.c $(SOURCES) - -.cE -.H 3 "Targets for linked executable" -The contents of the file -.C mmlink.mc -are included. -These are the targets to create object files and links -which can be used to produce a linked executable file. -These targets are used when building space-saving executables as described in -the "User Guide". -.cS -# -# A version of the test that can be combined together with -# all the other tests to make one executable. This will save a -# fair amount of disk space especially if the system does not -# have shared libraries. Different names are used so that -# there is no possibility of confusion. -# -link.c: $(SOURCES) - $(CODEMAKER) -l -o link.c $(SOURCES) - -# Link the objects into one large object. -# -$(LINKOBJ): $(LOFILES) - $(LD) $(LINKOBJOPTS) $(LOFILES) -o $(LINKOBJ) - -# Link the object file into the parent directory. -# -\^../$(LINKOBJ): $(LINKOBJ) - $(RM) ../$(LINKOBJ) - $(LN) $(LINKOBJ) .. - -# Make a link to the combined executable. -# -$(LINKEXEC): ../Tests - $(RM) $(LINKEXEC) - $(LN) ../Tests $(LINKEXEC) - -\^../Tests: ../$(LINKOBJ) - -linkexec:: $(LINKEXEC) $(AUXFILES) ; - -.cE -.H 3 "Targets for linked executable - macro version" -If the dot-m file contains the >>SET macro option, -the contents of the file -.C mmmlink.mc -are included. -These are the targets to create object files and links -for the macro version of the specified Xlib function -which can be used to produce a linked executable file. -These targets are used when building space-saving executables as described in -the "User Guide". -.cS -# A version of the test that can be combined with all the other tests for -# the macro version of the function. -# -mlink.c: $(SOURCES) - $(CODEMAKER) -m -l -o mlink.c $(SOURCES) - -linkexec:: m$(LINKEXEC) $(AUXFILES) ; - -m$(LINKEXEC): ../Tests - $(RM) m$(LINKEXEC) - $(LN) ../Tests m$(LINKEXEC) -.cE -.H 3 "Targets for libraries" -For the \*(xL, when the -.C section -argument to the >>TITLE keyword is -other than -.C XPROTO , -the contents of the file -.C mmlib.mc -are then included. -.P -In this release the contents of this file are -as follows: -.cS -# -# This part of the makefile checks for the existance of the libraries -# and creates them if necessary. -# - -# The xtestlib is made if it doesn't exist -# -$(XTESTLIB): - cd $(XTESTROOT)/src/lib; $(TET_BUILD_TOOL) install - -# The fontlib is made if it doesn't exist -# -$(XTESTFONTLIB): - cd $(XTESTROOT)/fonts; $(TET_BUILD_TOOL) install - -.cE -For the \*(xP, when the -.C section -argument to the >>TITLE keyword is -.C XPROTO -the contents of the file -.C mmxplib.mc -are then included. This file is identical to -.C mmlib.mc -except for the following additional lines: -.cS -# The X Protocol test library is made if it doesn't exist -# -$(XSTLIB): - cd $(XTESTROOT)/src/libproto; $(TET_BUILD_TOOL) install -.cE -.H 3 "Targets for cleaning and linting" -The contents of the file -.C mmmisc.mc -are then included. -.P -This file includes a -.C clean -target to remove object files and temporary files, and a -.C clobber -target which additionally removes all the source files which -.C mc -can remake. -.P -There is also a -.C LINT -target which enables the C source files to be checked against lint -libraries specified in the build configuration file. -.cS -# -# Miscellaneous housekeeping functions. -# - -# clean up object and junk files. -# -clean: - $(RM) Test $(OFILES) $(LOFILES) $(LINKOBJ) $(LINKEXEC) core\e - MTest m$(LINKEXEC) $(MOFILES) CONFIG Makefile.bak $(AUXCLEAN) - -# clobber - clean up and remove remakable sources. -# -clobber: clean - $(RM) MTest.c Test.c mlink.c link.c Makefile - -# Lint makerules -# -lint: $(CFILES) - $(LINT) $(LINTFLAGS) $(CFILES) $(LINTTCM) $(LINTLIBS) - -LINT:lint - -.cE -.H 3 "Targets for building known good image files" -The contents of the file -.C mmpgen.mc -are then included. -.P -These include targets which enable the test set to be built so that -it generates known good image files. -.P -These are not intended to be used outside the development -environment at UniSoft. -.cS -# -# Pixel generation makerules for generating the reference -# known good image files. -# - -PVOFILES=pvtest.o - -pvgen: $(PVOFILES) $(PVLIBS) $(TCM) - $(CC) $(LDFLAGS) -o $@ $(PVOFILES) $(TCM) \e - $(PVLIBS) $(SYSLIBS) $(SYSMATHLIB) - -pvtest.o: pvtest.c - cc -c -DGENERATE_PIXMAPS $(CFLAGS) pvtest.c - -pvtest.c: Test.c - $(RM) pvtest.c; \e - $(LN) Test.c pvtest.c - -.cE -.H 3 "Targets for included files" -Rules are included to specify the dependency of the C source files -on any included files. -.P -For example: -.P -.cS -Test.c link.c: $(XTESTLIBDIR)/error/EAll.mc -Test.c link.c: $(XTESTLIBDIR)/error/EGC.mc -Test.c link.c: $(XTESTLIBDIR)/error/EPix.mc -.cE -.H 2 "Formatting assertions" -The command -.cS -ma -o stclpmsk.a -h -m stclpmsk.m -.cE -produces in the file -.C stclpmsk.a -a list of the assertions from the -assertion sections of the specified dot-m file. -The assertions are output in nroff format. All macros -used in the assertion text can be obtained using the -h and -s -options as described below. -.P -The remaining parts of this section describe the output format -in more detail. -.H 3 "Copyright header" -A copyright header is output as an nroff comment block. -This will contain lines showing the SCCS versions of the dot-m file -and any included files. -.H 3 "Macro definitions" -If the -h option was specified, macros that are later used in the -assertion text will be output from the file -.C maheader.mc . -.H 3 "Title" -The line -.cS -\&.TH
-.cE -is output, where -.C -and -.C
-are obtained from the title section of the dot-m file. -.P -The default macro definition for .TH in -.C maheader.mc -causes the section and function name to be printed at the top -of each page. -.H 3 "Assertions" -For each assertion section, the line -.cS -\&.TI \e" -n -.cE -is output, where -.C -is obtained from the second argument of the >>ASSERTION keyword and -.C -is obtained from the title section of the dot-m file, -and -.C n -is the number of the assertion in the test set. -.P -This is -followed by the assertion text in which -.C xname -is converted to -.C . -For example: -.cS -\&.TI A \e" XSetClipMask-1 -A call to -\&.F XSetClipMask -sets the -\&.M clip_mask -component of the specified GC to the value of the -\&.A pixmap -argument. -.cE -.P -The other macros used in the assertion text to control font changes -are described in appendix B. -.P -The default macro definition for .TH in -.C maheader.mc -causes the example assertion to be printed as follows: -.P -.cS - \fBAssertion XSetClipMask-1(A).\fR - \fRA call to \fCXSetClipMask\fP sets the \fIclip_mask\fP component of the - specified GC to the value of the \f(COpixmap\fP argument. -.cE -.SK -.H 1 "Source file structure" -This section describes the C source coding style and conventions which -which have been used in the development of the revised \*(xT. These -conventions -apply to the structure of the code sections of the dot-m files, whose -overall structure is defined in previous sections of the Programmers -Guide. In some -cases (particularly in the structure of the \*(xP) -the style and conventions have been deleloped from the earlier T7 -\*(xT. -.P -You are advised to study the contents of this section before attempting to -modify or extend the \*(xT. The contents of this section will give you -guidelines on how to structure the test code so that it is easy -to follow, gives correct and reliable information when the tests are -executed, and is written as compactly as possible. -.P -Libraries of common functions have been used and further -developed in the revised \*(xT -in order to keep the source code in the test sets as compact as possible. -The rest of this section describes recommendations on how particular library -functions should be used. It does not describe the contents of the -libraries in detail. -A complete list of library contents is provided in the section entitled -"Source file libraries". -.P -During the development of the \*(xL, a library of support -functions has been developed. This library includes functions for -performing common operations required when testing the \*(xW, as well as -performing common reporting operations. This library includes a small -number of functions developed for the Xlib tests within the T7 \*(xT. -This library is known as the -"X test suite library" in this document, and the source of the library is in -the directory -.C $TET_ROOT/xtest/src/lib . -.P -Calls to any function in this library may be made by any test set in the -\*(xT. -.H 2 "Structure of the \*(xL" -This section describes the structure of the code sections of the \*(xL. -.P -The \*(xL are the tests for sections 2 to 10 of the X11R4 Xlib specifications. -They are stored in subdirectories of the directories \fCCH02\fP to \fCCH10\fP -(which are to be found in the directory \fC$TET_ROOT/xtest/tset\fP). -There is a subdirectory for each Xlib function containing a dot-m file -which includes all the test purposes provided for that Xlib function. -The naming scheme which is used for these directories is described in -appendix B of the "User Guide". -.H 3 "Result code macros" -It is good practice where possible to structure the test so that only -one test result code -is assigned before the code section returns or ends. -.P -The significance of the various test result codes that may -be assigned are described more fully in appendix D of the -"User Guide". -.P -The following macros -may be used to assign the test result code. -These macros call the function -\fCtet_result()\fP -which is part of the TET API. -.VL 12 0 -.LI PASS -.br -This assigns test result code PASS. -.LI FAIL -.br -This assigns test result code FAIL. -.LI UNRESOLVED -.br -This assigns test result code UNRESOLVED. -.LI UNSUPPORTED -.br -This assigns test result code UNSUPPORTED. -.LI UNTESTED -.br -This assigns test result code UNTESTED. -.LI NOTINUSE -.br -This assigns test result code NOTINUSE. -.LI WARNING -.br -This assigns test result code WARNING. -.LI FIP -.br -This assigns test result code FIP. -.LE -.P -Note that there are two other test result codes which may not be assigned -directly within a test purpose. -.P -The result code UNINITIATED will be assigned to a test purpose from within the -TET when the function \fCtet_delete()\fP -has been called in an earlier test purpose -or startup function. This is useful to prevent initiation of later test -purposes when it is not possible to continue executing test purposes in -the test set. -.P -The result code NORESULT will be assigned to a test purpose from within the -TET if the test purpose is initiated but no result code has been -output by the time control returns from the test purpose to the TET. -.P -The FAIL macro also increments a failure counter which is used to prevent -a result code being assigned in a later call to CHECKPASS (see below). -.H 3 "Result code functions" -There are a series of convenience functions which output a particular -test result code preceded by a test information message of type REPORT. -(See "Outputting test information messages", below). -.P -In each case the arguments are -exactly like those for \fIprintf(3)\fP. -.P -These are as follows: -.P -.VL 12 0 -.LI untested() -.br -This function may be used for an extended assertion -to output the test result code UNTESTED, preceded by a message. -.LI unsupported() -.br -This function may be used for a conditional assertion -to output the test result code UNSUPPORTED, preceded by a message. -.LI notinuse() -.br -This function may be used to output the test result code NOTINUSE, -preceded by a message. -.LI delete() -.br -This function may be used to output the test result code UNRESOLVED, -preceded by a message. -.LE -.H 3 "Assigning result codes" -The code should be structured such that a PASS result code is only -assigned if there is no doubt that the assertion being tested has been -determined to be positively true on the system being tested. Absence of -failure should not be taken as proof of success. For this reason, there -should if possible be just one place where a PASS result may be assigned, -whilst there may be many code paths which report other result codes. -.P -The result code FAIL should not be called until the function under -test has been called. -.P -During execution of the test purpose, it may not be possible to setup the -conditions for the assertion to be conclusively tested. In this case -the result code UNRESOLVED should be assigned rather than FAIL. -.P -For example: -.cS -.ft C ->>CODE - - if (setup()) { - delete("setup() failed; the test could not be completed"); - return; - } - - ret = XCALL; - - if (ret == 0) - PASS; - else - fAIL; -.ft -.cE -.H 3 "Assigning result codes for extended assertions" -Extended assertions are described in more detail as part of the ->>ASSERTION keyword. -.P -In some cases partial testing may be done for extended -assertions. In this case, the result code would be FAIL if an error -is detected, or UNTESTED if no failure is detected but the assertion is still -not fully tested. -.P -For example: -.cS -.ft C ->>CODE - - ret = XCALL; - - if (ret == 0) - PASS; - else - untested("The assertion could not be completely tested"); -.ft -.cE -.H 3 "Assigning result codes for conditional assertions" -Conditional assertions are described in more detail as part of the ->>ASSERTION keyword. -.P -It is usual to determine at the beginning of the test purpose -whether the conditional feature described in the assertion is supported. -.P -For example: -.cS -.ft C ->>CODE - - if (!feature_supported) { - unsupported("The required feature is not supported"); - return; - } - - ret = XCALL; - - if (ret == 0) - PASS; - else - FAIL; -.ft -.cE -.H 3 "Assigning result codes for multi-part tests" -It is often the case that the test strategy for an assertion requires -a number of separate checks to be performed, all of which must pass before -the test purpose can be assigned a PASS result code. -.P -In order to ensure that all relevant checks have been performed, -a macro CHECK is provided which increments a pass counter. At the end of the -test, a further macro CHECKPASS checks that the counter has reached the -required value before assigning a PASS result. (The expected value -of the pass counter is normally a constant, but may be a function of -a loop counter if the test involves calling CHECK in a loop.) -.P -The macro CHECK uses \fCtrace()\fP to print the pass counter and line number -in the TET journal file. -The format of the TET journal file is described further in appendix C -of the -"User Guide". -.P -CHECKPASS also ensures that the pass counter is not zero, and that the fail -counter is zero. -.P -For example: -.cS -.ft C ->>CODE - - n_ret = -1; - ret = XCALL; - - if (ret == 0) - CHECK; - else - FAIL; - - if (n_ret == expected_number) - CHECK; - else - FAIL; - - CHECKPASS(2); -.ft -.cE -.P -In the case of extended assertions, the macro CHECKUNTESTED may be called, -which is identical to CHECKPASS, except that the final result code -assigned will be UNTESTED. -.H 3 "Outputting test information messages" -Test information messages are normally output to describe the reason -for any test result codes which are other than PASS, and for other -purposes, as described in this section. -.P -Appendix D of the "User Guide" describes the -four different categories of test information messages which may appear -in the TET journal file. This section describes how these messages are -output from the test purpose. -.P -The functions described in this section call the function -\fCtet_infoline()\fP -which is part of the TET API. -.P -.VL 12 0 -.LI REPORT -.br -A test information message with type REPORT is used to report the reason -for any test result code which is other than PASS. A warning message is -printed by the report writer \fCrpt\fP if a test information message of -type REPORT is given in a test purpose which produced a test result code PASS. -.P -This is output using the function \fCreport()\fP, which takes arguments -exactly like those for \fIprintf(3)\fP. -.LI CHECK -.br -A test information message with type CHECK should not be output directly - -this should only be done via the CHECK macro. -.LI TRACE -.br -A test information message with type TRACE is used to -describe the state of the test being executed. -.P -This is not output to the TET journal file if the execution -configuration parameter XT_OPTION_NO_TRACE is set to Yes. -.P -This is output using the function \fCtrace()\fP, which takes arguments -exactly like those for \fIprintf(3)\fP. -.LI DEBUG -.br -A test information message with type DEBUG is a debug message inserted -during the development of the test. -.P -This is only output to the TET journal file if the value of the -execution configuration parameter XT_DEBUG is greater than or equal to -the level of the debug message. -.P -This is output using the function \fCdebug()\fP, which takes arguments -exactly like those for \fIprintf(3)\fP, except that the \fIprintf(3)\fP -arguments are preceded by a single argument which is the debug level. -The debug level should be between 1 and 3. -.LE -.P -For example: -.cS -.ft C ->>CODE - - debug(1, "about to call %s", TestName); - ret = XCALL; - - if (ret == 0) - trace("%s returned %d", TestName, ret); - PASS; - } else { - report("%s returned %d instead of 0", TestName, ret); - FAIL; - } -.ft -.cE -.H 3 "Creating new test purposes" -You can create new test purposes within an existing dot-m file using the -guidelines in this section. -.P -It is expected that in doing this you will be primarily aiming to produce -new test purposes for a particular Xlib function. You should add the -new test purpose to the dot-m file containing the test purposes for that -Xlib function. -.H 4 "Creating new sections in the dot-m file" -You are advised to create an assertion section and strategy section -at the end of the file, using as a template one of the existing -sections in the dot-m file. -.P -You should then create a code section commencing with the >>CODE -keyword. Since there are many different styles of Xlib functions -which may be tested, there are few additional guidelines that can be given -beyond those contained in earlier parts of this guide. -.H 4 "Creating test purposes which use pixmap verification" -If you have not done so yet, refer to the section entitled -"Examining image files" in the "User Guide". -This explains some background to the pixmap verification scheme, and -in particular how to view image files produced when running the \*(xT. -.P -A number of test purposes supplied in the \*(xT use a scheme known as -pixmap verification, to compare the image produced by the X server with a -known good image which is stored in a known good image file. -.P -All the required known good image files for the test programs in the -\*(xT (as supplied) have been created in advance. -The known good image files for each test program -are supplied in the \*(xT in the test set directory in which the dot-m -file is supplied. They are named a\fCnnn\fP.dat, where \fCnnn\fP is the -number of the test purpose for which the known good image file was generated. -.P -The known good image files are generated as follows. The \*(xT is compiled -with the additional compilation flag -DGENERATE_PIXMAPS, and linked with -a replacement Xlib which determines analytically the expected X server display -contents at any point. At the points where pixmap verification is going -to be performed, the expected image is instead written to a data file, which -is the known good image file. -.P -It is not possible to generate further known good image files in this way, -because the replacement Xlib is not part of the \*(xT. -.P -However, it is possible -to write a server-specific image file -containing the -contents of the X server display at points where pixmap verification is -going to be performed. -This may be useful for the purposes of validation and regression -testing against a known server. -This may be done by working through the following stages: -.P -.AL -.LI -Create the test purpose with a call to the macro PIXCHECK at the -point where you want to validate the image displayed by the X server. -Note that the macro PIXCHECK calls the macros CHECK or FAIL depending on -whether the image displayed by the X server matches that in the image file. -The code invoked by the macro PIXCHECK(display, drawable) is as follows: -.P -.cS - if (verifyimage(display, drawable, (struct area *)0)) - CHECK; - else - FAIL; -.cE -.P -The function -.C verifyimage() -is described in more detail in the section entitled -"Source file libraries". -.P -.LI -Build and execute the test without using the -.SM TCC , -(refer to the "User Guide") -and check that the newly created -test purpose gives result code UNRESOLVED due to -the absence of a known good image file as follows: -.cS -pmake -pt -prp -.cE -.LI -Rerun the test, -saving the image produced by the X server -as follows: -.cS -pt -v XT_SAVE_SERVER_IMAGE=Yes -.cE -.LI -This should create a file named a\fCnnn\fP.sav, where \fCnnn\fP is the name -of the newly created test purpose. This is a server-specific image file. -Rename this file to the name used -for known good image files as follows: -.cS -mv a\fCnnn\fP.sav a\fCnnn\fP.dat -.cE -.LI -Check that the process has worked by executing the test without using the -.SM TCC , -and enabling pixmap verification against the server-specific image file -as follows: -.cS -pt -prp -.cE -.P -The newly created test purpose should give a result code of PASS. -.LE -.P -It is particularly important that new test purposes are added at the end -of the file if an earlier test purpose calls the macro \fCPIXCHECK\fP. -This is because inserting a test purpose before another test purpose -will cause the later test purpose to be renumbered. As well as causing -unnecessary confusion in other ways, this will cause the later test purpose -to now look for the wrong known good image file. -.H 2 "Structure of the \*(xP" -This section describes the structure of the code sections of the \*(xP. -.P -The \*(xP are the touch tests for the X Protocol (version 11). -They are stored in subdirectories of the directory \fCXPROTO\fP -(which is to be found in the directory \fC$TET_ROOT/xtest/tset\fP). -There is a subdirectory for each X Protocol request containing a dot-m file -which includes all the test purposes provided for that X Protocol request. -The naming scheme which is used for these directories is described in -appendix B of the "User Guide". -.P -During the development of the \*(xP, extensive use has also been made of -a library of support functions developed in the earlier T7 \*(xT. This -library is known as the "X\ Protocol library" in this document, -and the source of the library is in -the directory -.C $TET_ROOT/xtest/src/libproto . -.P -Calls to any function in this library may be made by any of the \*(xP in the -\*(xT. -.H 3 "Structure of the code sections" -In the T7 release of the \*(xT, each of the \*(xP consisted of a -\fCmain()\fP function which called library functions to -send an X Protocol request to the X server, and -checked for the correct response (reply, error or nothing). -.P -In the revised \*(xT, the test code originally in the -\fCmain()\fP function has been moved to a function called \fCtester()\fP -which is located in an >>EXTERN section in each dot-m file, -so that it can be called from each test purpose as described below. -The test function \fCtester()\fP is -in turn called from a library function \fCtestfunc()\fP. -.P -For example: -.P -.cS -.ft C ->>CODE - - test_type = GOOD; - - /* Call a library function to exercise the test code */ - testfunc(tester); -.ft -.cE -.P -By default, -the library function \fCtestfunc()\fP calls \fCtester()\fP for each byte -orientation. The test function \fCtester()\fP is called in a sub-process -via the TET API function \fCtet_fork()\fP, and returns the exit status of -the test process to \fCtestfunc()\fP. -.P -If required, the execution configuration parameter XT_DEBUG_BYTE_SEX may be -set to NATIVE, REVERSE, MSB or LSB to call \fCtester()\fP just once -with the required byte orientation. -.P -Each client has a test type, which is initialised when the client is created. -The test type determines whether X Protocol requests sent by the client -are to be good requests or invalid requests (expecting an X Protocol error -to be returned). The test type may be modified during the lifetime of -the client by invoking the macro \fCSet_Test_Type()\fP. -In many tests, this is done by setting the test type to one of the following -values before calling \fCSend_Req()\fP, then setting it to GOOD immediately -afterwards for subsequent library calls: -.P -.VL 12 0 -.LI GOOD -.br -The request sent will be a known good X Protocol request (unless -otherwise modified in \fCtester()\fP before calling \fCSend_Req()\fP). -.LI BAD_LENGTH -.br -The request sent will have length field less than the minimum needed -to contain the request. -.LI JUST_TOO_LONG -.br -The request sent will have length field greater than the minimum needed -to contain the request (and, for requests where the length is used to -determine the number of fields in the request, the length is also -not the minimum length plus a multiple of the field size). -.LI TOO_LONG -.br -The request sent will have a length field which is greater than that -accepted by the X server under test. -.LI BAD_IDCHOICE1 -.br -The request sent will have a resource ID that is already in use -(it is the responsibility of the function \fCtester()\fP to ensure the -resource ID is in use before calling \fCSend_Req()\fP). -.LI BAD_IDCHOICE2 -.br -The request sent will have a resource ID that is out of range -(it is the responsibility of the function \fCtester()\fP to ensure the -resource ID is out of range before calling \fCSend_Req()\fP). -.LI BAD_VALUE -.br -The request sent will have an invalid mask bit set -(it is the responsibility of the function \fCtester()\fP to ensure the -mask field contains an invalid bit before calling \fCSend_Req()\fP). -.LI OPEN_DISPLAY -.br -A special value used only in the test for OpenDisplay -for testing the connection setup protocol. -.LI SETUP -.br -The initial test type of a client, which will cause errors during -test setup to produce result code -.SM UNRESOLVED -rather than -.SM FAIL . -.LE -.H 3 "Outputting test information and result code" -Errors may be detected and reported both within the test function -\fCtester()\fP and within library functions. When an error is detected, -the function \fCLog_Err()\fP should be -called. This increments an error count and uses \fCreport()\fP -to output a test information message of type REPORT to the TET journal file. -.P -If no error is detected, the function Log_Trace() may be called to -record that the expected response was received. This uses \fCtrace()\fP -to output a test information message of type TRACE to the TET journal file. -.P -You can also use the function Log_Debug() to -output more detailed test information such as the contents of request, -reply and event structures. This uses \fCdebug()\fP -to output a test information message of type DEBUG at level one -to the TET journal file. -.P -The function \fCExit()\fP should be called at any point after an error has -occurred, which will assign a test result code FAIL and print the error -count (or UNRESOLVED if the error counter is zero). The exit status will be -EXIT_FAIL in this case. -.P -If \fCtester()\fP performs all checks and the results are correct, -the function \fCExit_OK()\fP should be called. The exit status will be -EXIT_SUCCESS in this case. -.P -A result code of PASS is only assigned to a test purpose in the library -function \fCtestfunc()\fP if all calls to -\fCtester()\fP give exit status EXIT_SUCCESS. It should not be assigned -anywhere else. -.H 3 "Creating new test purposes" -You can create new test purposes within an existing dot-m file using the -guidelines in this section. -.P -It is expected that in doing this you will be primarily aiming to produce -new test purposes for a particular X Protocol request. You should add the -new test purpose to the dot-m file containing the test purposes for that -X Protocol request. -.H 4 "Creating new sections in the dot-m file" -You are advised to create an assertion section and strategy section -at the end of the file, using as a template one of the existing -sections in the dot-m file. -.P -You should then create a code section which passes a function \fCmy_test()\fP -you are about to create to the library function \fCtestfunc()\fP. -.P -For example: -.P -.cS -.ft C ->>CODE - - test_type = GOOD; - - /* Call a library function to exercise the test code */ - testfunc(my_test); -.ft -.cE -.H 4 "Creating a new test function" -You should create a function \fCmy_test()\fP in an >>EXTERN section -in the dot-m file using the guidelines in this section. -.P -A client is a connection to the X server under test. -Each X Protocol request is sent from a particular client. -You can create a client numbered \fCclient\fP -using \fCCreate_Client(client)\fP. -Normally a single client is created, but it is -possible to create more than one client. This will be necessary when -testing the effect on the server of multiple clients. -.P -The client data structure \fCXst_clients\fP is used to store the -information about each client you have created. This includes resource ID's -and -a display structure which is filled in when the client is created. -The client data structure is documented in more detail in the header file in -which it is defined (\fC$TET_ROOT/xtest/include/Xstlib.h\fP). -.P -Next you will need to create a request structure. The function -\fCMake_Req(client, req_type)\fP should -be called to create a request of a specified type \fCreq_type\fP for -a specified client \fCclient\fP -and return a pointer to the request structure. The request structure will -be filled in with defaults which may be suitable for the test purpose you are -creating. The file -.C MakeReq.c -in the X Protocol library fills in the default values. -.P -Should you want to change the defaults you can do this at any point between -creating the request structure and sending it to the X server. It may -be modified by accessing the structure members. The format of the request -structures is exactly as defined in your X Protocol header file (normally -\fC/usr/include/X11/Xproto.h\fP). You can alter value list items using the -following functions: -.P -.VL 12 0 -.LI \fCAdd_Masked_Value()\fP -.br -.LI \fCDel_Masked_Value()\fP -.br -.LI \fCClear_Masked_Value()\fP -.br -.LI \fCAdd_Counted_Value()\fP -.br -.LI \fCClear_Counted_Value()\fP -.br -.LI \fCAdd_Counted_Bytes()\fP -.br -.LE -.P -When you have the request structure you wish to pass to the X server, -call the function \fCSend_Req(client)\fP. -This sends the request \fCreq\fP from client \fCclient\fP to the X server, -and handles byte swapping and request packing as necessary. -If you wish the X Protocol library to further modify the request -structure to send an invalid protocol request, set the test type of the -client before calling \fCSend_Req(client)\fP using the macro -\fCSet_Test_Type(client)\fP. The possible test types are listed in the -earlier section entitled "Structure of the code sections". -.P -To check that the X server has reacted correctly to the request sent, you -will need to call the function \fCExpect()\fP. For convenience, a number -of macros and functions have been created to call \fCExpect()\fP -depending on the outcome you are expecting. These are as follows: -.P -.VL 12 0 -.LI "\fCExpect_Event(client, event_type)\fP" -.br -This expects an event of type \fCevent_type\fP to be sent back from the -X server to client \fCclient\fP. -.LI "\fCExpect_Reply(client, req_type)\fP" -.br -This expects a reply to the X Protocol request of type \fCreq_type\fP -to be sent back from the X server to client \fCclient\fP. -.LI "\fCExpect_Error(client, error_type)\fP" -.br -This expects an error of type \fCerror_type\fP -to be sent back from the X server to client \fCclient\fP. -.LI "\fCExpect_BadLength(client)\fP" -.br -This expects a BadLength error -to be sent back from the X server to client \fCclient\fP. -.LI "\fCExpect_BadIDChoice(client)\fP" -.br -This expects a BadIDChoice error -to be sent back from the X server to client \fCclient\fP. -.LI "\fCExpect_Nothing(client)\fP" -.br -This expects neither an error, event or reply -to be sent back from the X server to client \fCclient\fP. -.LE -.P -The \fCExpect()\fP function will check that the response from the X server -is of the correct type and has the correct length. It will be byte swapped -and unpacked as necessary into an event or reply structure, to which a -pointer will be returned. -.P -It is recommended that one of these functions be called immediately after -sending an X Protocol request to the X server. -This causes any pending response from the X server to be flushed out, -and checked. This makes it easier to locate wrong responses from the X server. -This is effectively designing the test to run synchronously. -.P -Once an error, event or reply has been returned, it can be examined directly. -.P -Since the structures allocated for -requests, replies and events are allocated dynamically, it is wise to free -the structure after use. this may be done using the functions -\fCFree_Req()\fP, -\fCFree_Reply()\fP and -\fCFree_Event()\fP. -.P -When the outcome of sending the X Protocol request has been assessed, -you will want to either report an error or output a trace -message indicating that the expected response was received. -Refer to the earlier section entitled -"Outputting test information and result code". -.P -You should end the test purpose if every part of the test purpose has -succeeded by calling \fCExit_OK()\fP. This should only be done once, -because it is the means of passing back to the library function -\fCtestfunc()\fP the fact that the test purpose passed. If at -an earlier part of the test purpose an error occurs and it is desired to -exit, call \fCExit()\fP. -.H 4 "Creating test purposes to test X Protocol extensions" -The nature of the extension mechanism in X makes it difficult to -just add support in the switch statements throughout the X Protocol -library to support protocol extensions. -.P -The reason for this is that you do not know the value of the event -types and reply types until you have queried the X server. -.P -For this reason, you are recommended to review the scope of the work -that would be required in modifying the supplied X Protocol library -before attempting to test X Protocol extensions. -You can use the supplied X Protocol library as a framework, -and develop new versions of routines which handle events and replies. -.SK -.H 1 "Source file libraries" -This sections lists the contents of the principal libraries of -source files used by many tests in the \*(xT. -.H 2 "The \*(xT library" -A library of common subroutines for the \*(xT -has source in \fC$TET_ROOT/xtest/src/lib\fP. -This is built automatically when building tests in the \*(xT. -Should it be required to build it separately for any reason -run the command. -.cS -cd $TET_ROOT/xtest/src/lib -pmake install -.cE -The list of source files in this library, -with a brief description of the contents of each file, is as follows: -.VL 12 0 -.LI XTestExt.c -.br -If -.SM XTESTEXTENSION -is defined, -this file contains routines to access the -.SM XTEST -extension in order to simulate device events and obtain information on the -cursor attributes of windows. -.P -If -.SM XTESTEXTENSION -is not defined, dummy routines are used instead. -.P -If -.SM XTESTEXTENSION -is not defined, client-side functions -previously in file XTestLib.c (now available in the -.SM XTEST -extension library) -are still included. -These are XTestDiscard() (to discard current request in request -buffer) and XTestSetGContextOfGC() and XTestSetVisualIDOfVisual() -(to set values in opaque Xlib data structures). These functions require -access to data structures now in the internal Xlib header file -.C Xlibint.h . -.LI badcmap.c -.br -Create an invalid colourmap ID by creating a readonly colourmap -of the default visual type. -.LI badfont.c -.br -Return a bad font ID by loading a font and then unloading it. -.LI badgc.c -.br -Return a bad GC id on display disp by creating a GC and -invalidating it using the -.SM XTEST -extension library function -XTestSetGContextOfGC. -.LI badpixm.c -.br -Return a bad pixmap id on display disp by creating -a pixmap and freeing it. -.LI badvis.c -.br -Make a visual bad by using the -.SM XTEST -extension library function -XTestSetVisualIDOfVisual. -.LI badwin.c -.br -Return a bad window id on display disp by creating -a window and destroying it. -.LI bitcount.c -.br -Handle bits in words. -.LI block.c -.br -Check whether process blocks when testing event handling functions. -.LI buildtree.c -.br -Build a tree of windows specified by a list which determines position, -size and parentage of each window. -.LI checkarea.c -.br -Check pixels inside and/or outside an area of a drawable are set to given values. -.LI checkevent.c -.br -Check two arbitrary events to see if they match, report -an error if they don't. -.LI checkfont.c -.br -Check returned font characteristics, properties, text extents and widths -against those expected in the supplied test fonts. -.LI checkgc.c -.br -Check GC components against expected values. -.LI checkimg.c -.br -Check pixels inside and/or outside an area of an image are set to given values. -.LI checkpixel.c -.br -Check specified pixels of a drawable are set to given values. -.LI checktile.c -.br -Check that an area of a drawable is filled with a specified tile. -.LI config.c -.br -Initialise the config structure by getting all the execution -parameters. -.LI crechild.c -.br -Create a mapped child window for a parent window, and wait for the -child window to become viewable. -.LI cursor.c -.br -Routines for accessing cursor information. This includes convenience functions -for checking the cursor defined for a given window. -These routines call those in XTestExt.c to use the -.SM XTEST -extension to access the cursor information. -.LI delete.c -.br -Set the test result code for the current test purpose to -.SM UNRESOLVED . -.LI devcntl.c -.br -Routines for input device control. This includes convenience functions -for pressing keys and buttons and remembering those pressed. -These routines call those in XTestExt.c to use the -.SM XTEST -extension to simulate the required device events. -.LI dset.c -.br -Set every pixel in a drawable to a specified value. -.LI dumpimage.c -.br -Dump the contents of an image to a file. -.LI environ.c -.br -Contains a test suite specific version of putenv() (which may not be available -on POSIX.1 systems). This is required to set up the environment -before some calls to tet_exec(). -.LI err.c -.br -Test error handler (installed when calling the function under test). -Unexpected error handler (installed at all other times). -I/O error handler (installed at all times). -Obtain the error code and resource ID saved by the test error handler. -.LI events.c -.br -Handle the serial fields of incoming requests. -.LI ex_startup.c -.br -Generic startup routines required before executing the first test purpose -and after executing the last test purpose. -The routines -.C exec_startup() -and -.C exec_cleanup() -in this file should be called at the start and end of the -.C main() -function of each program executed via the TET function -.C tet_exec() . -.LI exposechk.c -.br -Check that either enough expose events were received to -restore the window, or that the window has been restored from backing -store. -.LI extenavail.c -.br -If -.SM XTESTEXTENSION -is defined, the function IsExtTestAvailable() returns True if the -server extension -.SM XTEST -is available, otherwise it returns False. -.P -If -.SM XTESTEXTENSION -is not defined, the function IsExtTestAvailable() always returns False. -.LI gcflush.c -.br -Flush the GC cache. -.LI gcinclude.c -.br -Functions which are called from the code included to test the -correctness of use of GC components by the drawing functions. -.P -The only function included at present is -.C setfuncpixel() , -which finds the first pixel set in a drawable (this will vary depending on the -drawing function). -.LI getevent.c -.br -Check if there are events on the queue and if so return the -first one. -.LI getsize.c -.br -Get the size of a drawable. Just uses XGetGeometry but avoids all -the other information that you get with that. -.LI gettime.c -.br -Get the current server time. Use a property attached to the root window -of the display called -.SM XT_TIMESTAMP -and replace it with 42 (32-bits). -The PropertyNotify event that is generated supplies the time stamp returned. -.LI iponlywin.c -.br -Create an input only window. -.LI issuppvis.c -.br -The function -.C issuppvis() -takes a visual class as argument and returns true -if such a class is supported by the server under test. -This function uses the XGetVisualInfo() function rather than -the user-supplied -.SM XT_VISUAL_CLASSES -parameter. -.P -The function -.C visualsupported() -takes a mask indicating a set of visuals, and returns -a mask indicating the subset that is supported. -If the mask is 0L then the mask shows all supported -visuals. -.P -The function -.C resetsupvis() -takes a mask indicating a set of visuals. Subsequent calls to -.C nextsupvis() -will return the next supported visual specified in the mask and increment a -counter. -The function -.C nsupvis() -returns this counter. -.LI linkstart.c -.br -Define global variables used by the TET which are required when -linking test programs to produce a space-saving executable. -.P -When the space-saving executable is executed, -the TET -initialisation code in the library function -.C linkstart.c -determines which test set is required. This is done by matching \fCargv[0]\fP -with the \fCname\fP elements in the array of -.C linkinfo -structures. The corresponding test functions specified by the -\fCtestlist\fP -element of the -.C linkinfo -structure are then executed. -.LI lookupname.c -.br -Convert symbolic values from \*(xW header files to appropriate names. -.LI makecolmap.c -.br -Make a colourmap for the screen associated with the default -root window. -.LI makecur.c -.br -Create a cursor that can be used within the test suite. -The cursor is created using XCreateFontCursor. The shape -chosen can be controlled through the configuration variable -.SM XT_FONTCURSOR_GOOD . -.LI makegc.c -.br -Make a GC suitable for use with the given drawable. -.LI makeimg.c -.br -Creates a general purpose image that can be used within the -test suite. The image is cleared to W_BG. -.LI makepixm.c -.br -Creates a general purpose pixmap that can be used within the -test suite. The pixmap is cleared to W_BG. -.LI makeregion.c -.br -Creates a general purpose region that can be used within the -test suite. -.LI makewin.c -.br -Creates a general purpose windows that can be used within the -test suite. -.LI makewin2.c -.br -Creates windows corresponding to a particular area. -.LI maxsize.c -.br -Obtain the number of cells in a colourmap. -.LI nextvclass.c -.br -Functions to cycle through all the visual classes that are supposed to -supported by the display/screen that is being tested. -Note that these functions are only used in the tests for -XMatchVisualInfo and XGetVisualInfo. -.P -The function -.C initvclass() -initialises the visual class table. The visual classes that are -supported are supplied by the test suite user in the -variable -.SM XT_VISUAL_CLASSES , -together with the depths at which they are supported. -.P -The function -.C resetvclass() -resets the visual class table. Subsequent calls to -.C nextvclass() -obtain the next visual class and depth. -The function -.C nvclass() -returns the size of the visual class table. -.LI nextvinf.c -.br -Functions to cycle through all the visuals that are supported -on the screen under test. -These functions use the XGetVisualInfo() function rather than -the user-supplied -.SM XT_VISUAL_CLASSES -parameter. If the parameter -.SM XT_DEBUG_VISUAL_IDS -is set to a non-empty string, -only the visuals ID's in the string are used. -.P -The function -.C resetvinf() -obtains a list of all visuals supported for a particular screen. -Subsequent calls to -.C nextvinf() -obtain the next visual. -The function -.C nvinf() -returns the number of visuals. -.LI nondpth1pix.c -.br -Obtain a pixmap of depth other than 1 if such a pixmap is supported. -.LI notmember.c -.br -Returns a list of numbers that are not members of given list. -(This is used to test assertions of the form "When an argument -is other than X or Y, then a BadValue error occurs". -.LI opendisp.c -.br -Open a connection to the server under test. -.LI openfonts.c -.br -Open the xtest fonts, and place their ID's in the fonts array. -.LI pattern.c -.br -Draw a pattern consisting of vertical bands on the specified drawable. -.LI pfcount.c -.br -Functions which may take arguments which are set to the -pass and fail counters in test set code created by -.C mc . -Calls to the -.C pfcount -functions are inserted in order to use the counters at least once, -and so prevent -.C lint -reporting unwanted errors. -.LI pointer.c -.br -Routines to move the pointer, and determine if the pointer has been moved. -.LI regid.c -.br -Routines are provided to register resources created during a test purpose. -Wherever possible, library functions register resources, and test purposes -may do so directly if desired. -Registered resources are then destroyed at the end of the test purpose. -.LI report.c -.br -Reporting functions, which output test information messages to the TET -journal file. -These all use the TET reporting function -.C tet_infoline() . -.LI rpt.c -.br -Reporting functions, which output test information messages to the TET -journal file, and additionally assign a test result code. -These all use the TET reporting function -.C tet_infoline() . -.LI savimage.c -.br -The function -.C savimage() -returns a pointer to a saved image on a drawable using -.C XGetImage . -.P -The function -.C compsavimage() -checks that the image currently on the drawable matches a saved image. -.P -The function -.C diffsavimage() -checks that the image currently on the drawable differs from a saved image. -.P -These functions are used where the precise pixels drawn cannot be -determined in advance, but the test result may still be infered by -image comparisons. -.LI setline.c -.br -Convenience functions to set line width, cap style, -line style and join style in a GC, using -.C XChangeGC() . -.LI settimeout.c -.br -The function -.C settimeout() -sets a timeout which causes the process to exit after a timeout. This -should be done only in a child process of a test purpose created by -.C tet_fork() . -.P -The function -.C cleartimeout() -clears a previously set timeout. -.LI stackorder.c -.br -The function -.C stackorder() -uses -.C XQueryTree() -to determine the position of a window in the stacking order. -.LI startcall.c -.br -The function -.C startcall() -checks for any outstanding unexpected X protocol errors, -which might have been generated, for example, during the setup -part of the test. -A call to -.C XSync() -is made to achieve this. -.P -The function -.C startcall() -installs a test error handler in place of the unexpected X protocol -error handler. -.P -The function -.C endcall() -checks for any X protocol errors caused by the -function under test. -A call to -.C XSync() -is made to achieve this. -.P -The function -.C endcall() -installs the unexpected X protocol -error handler. -.LI startup.c -.br -Generic startup routines called by TET before executing the first test purpose -and after executing the last test purpose. -.LI tpstartup.c -.br -Generic startup routines called by TET before executing each test purpose -and after executing each test purpose. -.LI verimage.c -.br -The function -.C verifyimage() -uses -.C XGetImage() -to obtain the contents of the specified drawable. -This is then compared with the contents of a "known good image file". -If there is a discrepancy, -the image produced by the server is dumped to a file using -.C dumpimage() -together with the known good image. -The image produced by the server and the known good image may be -examined as described in the section in the -"User Guide" -entitled -"Examining image files". -.P -If the execution configuration parameter -.SM XT_DEBUG_NO_PIXCHECK -is set to -.C Yes , -the image checking is skipped in -.C verifyimage() . -.P -If the execution configuration parameter -.SM XT_SAVE_SERVER_IMAGE -is set to -.C Yes , -the image produced by the server is dumped to a file using -.C dumpimage() -(regardless of whether it matches the "known good image file"). -.P -For more background on pixmap verification see the earlier section -entitled "Creating test purposes which use pixmap verification". -.LI winh.c -.br -Build a tree of windows to test event generation, propogation and delivery. -.LI xthost.c -.br -Specifies operating system dependent data used by the access control list -functions. -This includes arrays of -.C XHostAddress -structures. -These should be checked and if necessary edited refering to the -section in the -"User Guide" -entitled -"System dependent source files". -.LI xtestlib.h -.br -This file contains definitions which are common to many of the -source files in the \*(xT library, and it is included in those -source files. -.LI xtlibproto.h -.br -This file contains declarations and (if required by an -.SM ANSI -Standard-C compiler) -function prototypes for all the functions in the source files -in the \*(xT library. -.LE -.H 2 "The X Protocol library" -A library of common subroutines for the \*(xP in the \*(xT -has source in \fC$TET_ROOT/xtest/src/libproto\fP. -This is built automatically when building tests in the \*(xT. -Should it be required to build it separately for any reason -run the command. -.cS -cd $TET_ROOT/xtest/src/libproto -pmake install -.cE -The list of source files in this library, -with a brief description of the contents of each file, is as follows: -.VL 12 0 -.LI ClientMng.c -.br -Having established a client connection to the X server using the functions -in ConnectMng.c, allocate a client data -structure and fill in its display structure. -.LI ConnectMng.c -.br -Establish a client connection to the X server. -.LI DataMove.c -.br -Convert individual fields into format for sending to the X server. -.LI DfltVals.c -.br -Obtain reasonable default values for contents of request structures. -.LI Expect.c -.br -Check for the expected response (error, event, reply, or nothing) -from the X server. -.LI JustALink.c -.br -This file is a link to one of the files XlibXtst.c, XlibOpaque.c, -or XlibNoXtst.c. The link is created when the X Protocol library -is built, and the file used depends on the configuration parameter -.SM XP_OPEN_DIS . -.LI Log.c -.br -Log test results. -.LI MakeReq.c -.br -Construct a request structure using the functions in DfltVals.c, -which has reasonable default values so that it may be immediately sent -to the X server using the functions in SendReq.c. -.LI RcvErr.c -.br -.LI RcvEvt.c -.br -.LI RcvRep.c -.br -Unpack the response from the server into a structure (RcvErr.c for errors, -RcvEvt.c for events, RcvRep.c for replies; these all use DataMove.c to do -the unpacking). -.LI ResMng.c -.br -Create a resource (e.g. atom, window) and store its resource ID -in the client data structure. -.LI SendEvt.c -.br -Pack an event structure into a request structure (only used by SendEvent -protocol request). -.LI SendReq.c -.br -Pack a request structure in correct format using the functions in DataMove.c -and send to the X server. -.LI SendSup.c -.br -Support routines for packing request structure. -.LI ShowErr.c -.br -.LI ShowEvt.c -.br -.LI ShowRep.c -.br -.LI ShowReq.c -.br -.LI ShowSup.c -.br -Display contents of structures in nice human-readable form (ShowErr.c for -errors, ShowEvt.c for events, ShowRep.c for replies, and ShowReq.c for -requests, all of which call ShowSup.c support routines). -.LI TestMng.c -.br -Manage the setup and closedown of the tests. This file includes definitions and -initialisation of global variables (including TET configuration -variables) and assigning test result codes. -.LI TestSup.c -.br -Support routines for handling mapping state and event masks of windows. -.LI Timer.c -.br -Set up a timer that will execute a certain routine on completion. -.LI Utils.c -.br -Utilities for isolating operating system dependencies. -.LI Validate.c -.br -Routines to check whether the server under test supports the feature -being tested (eg. writable colour cells). -.LI ValListMng.c -.br -Modify the value lists at the ends of request structures. -.LI XlibNoXtst.c -.br -This file contains functions which emulate the post R5 enhanced connection -setup scheme. A connection can be established in client native or byte-swapped -orientations, and (when testing XOpenDisplay) both valid and invalid -byte orderings may be sent to the X server. -The connection is made using operating system specific -procedures which were developed in 4.2BSD environment, and may need -modifications to work on other systems. -.LI XlibOpaque.c -.br -This file contains portable functions to handle connection setup where -the Xlib implementation does not support the post R5 enhanced connection -setup scheme. -The Xlib functions XOpenDisplay and ConnectionNumber are called here to -obtain a connection using the client native byte orientation, -and subsequent X Protocol requests are made using this connection. -.LI XlibXtst.c -.br -This file contains portable functions to handle connection setup where -the Xlib implementation supports the post R5 enhanced connection setup scheme. -The enhancement involves using additional parameters to the -Xlib function _XConnectDisplay() which allow a byte swapped connection to -be established. Details of operating system specific connection setup -procedures including networking are thus not needed in the X Protocol library. -.LI XstIO.c -.br -Routines to handle protocol packet transmission and reception -including fatal I/O errors. -.LI delete.c -.br -Set the test result code for the current test purpose to UNRESOLVED. -.LI linkstart.c -.br -Define global variables used by the TET which are required when -linking test programs to produce a space-saving executable. -.P -When the space-saving executable is executed, -the TET -initialisation code in the library function -.C linkstart.c -determines which test set is required. This is done by matching \fCargv[0]\fP -with the \fCname\fP elements in the array of -.C linkinfo -structures. The corresponding test functions specified by the -\fCtestlist\fP -element of the -.C linkinfo -structure are then executed. -.LI startup.c -.br -Generic startup routines called by TET before executing the first test purpose. -.LI tpstartup.c -.br -Generic startup routines called by TET before executing each test purpose. -.LI DataMove.h -.br -This file contains the macros for byte swapping and word alignment. -.LI XstlibInt.h -.br -This file contains definitions which are common to many of the -source files in the X Protocol library, and it is included in those -source files. -.LI XstosInt.h -.br -This file contains definitions related to operating system functions -which are common to many of the -source files in the X Protocol library, and it is included in those -source files. -.LE -.H 2 "The X test fonts library" -A library of common subroutines defining the -characteristics of the test fonts for the \*(xT -has source in \fC$TET_ROOT/xtest/fonts\fP. -This is built automatically when building tests in the \*(xT. -Should it be required to build it separately for any reason -run the command. -.cS -cd $TET_ROOT/xtest/fonts -pmake install -.cE -The source files -.C xtfont0.c -to -.C xtfont6.c -contain definitions of -.C XFontStruct -structures named -.C xtfont0 -to -.C xtfont6 -which define the characteristics of the test fonts used by many of the -text drawing functions. -.SK -.H 1 "Appendix A - reason codes for extended assertions" -The reason code -is a number between 1 and 6 (currently) and is used if -and only if the category is B or D. This number corresponds to a reason -from the following table which is coded into -.C mc . -.P -The text of the -reason will be printed with a result code UNTESTED if there -is no >>CODE. -.P -1 - "There is no known portable test method for this assertion", -.br -2 - "The statement in the X11 specification is not specific enough to write a test", -.br -3 - "There is no known reliable test method for this assertion", -.br -4 - "Testing the assertion would require setup procedures that involve an unreasonable amount of effort by the user of the test suite.", -.br -5 - "Testing the assertion would require an unreasonable amount of time or resources on most systems", -.br -6 - "Creating a test would require an unreasonable amount of test development time." -.SK -.H 1 "Appendix B - commands for fonts and symbols in assertions" -In the text of assertions there should be no in-line nroff font changes. -This is because the font names may need to be changed on some systems. -.P -As an alternative, a number of macros have been defined which are understood -by the utilities developed during stage two of the project. The definition -of these macros uses appropriate fonts to correspond closely with those -used by the \*(xW documentation. -.AL -.LI -Arguments to a function should be written: -.P -\&.A window -.LI -Function names should be written: -.P -\&.F XAllocColorCells -.P -(When the special symbol xname is used it can be left as it is, so -the .F form only needs using when refering to some other function. We -have avoided cross references to other functions where possible). -.LI -Structure members should be written: -.P -\&.M override_redirect -.P -.LI -Symbols should be written: -.P -\&.S InputOutput -.P -This is used for everything that is in the courier font in the \*(xW -documentation and -which is not a function name or structure member. -This includes the #define constants in the headers and typedef'ed names. -.P -.cS -Eg. - BadColor - IsViewable - DirectColor - Visual - Display - MotionNotifyEvent -.cE -.LE -.P -Punctuation separated by white space from the argument will be -in the original font, as in mm. -.P -\&.A InputOutput , -.br -\&.A InputOnly . -.P -.DL -.LI -There is a .SM macro, as in mm. Any word that -is uppercase only should use it to obtain a reduced point size. -.P -\&.SM DEBUG -.br -\&.SM MIT -.LE -.SK -.H 1 "Appendix C - Included error assertions" -The .ER keyword is described in the section entitled -"Included errors - .ER". -.P -This appendix gives the names the files which are included when this -keyword is used with the supported arguments, -and shows the text of the assertions in those files. -.P -All the files from which included tests are stored are located -in the directory \fC$TET_ROOT/xtest/lib/error\fP. -.P -The names of the files which are included, and the text of the assertion -contained in the file, are specified in the following list: -.VL 8 0 -.LI "Access grab" -.br -File included: EAcc1.mc -.br -Assertion text: -.eS -When an attempt to grab a key/button combination already -grabbed by another client is made, then a BadAccess error -occurs. -.eE -.LI "Access colormap-free" -.br -File included: EAcc2.mc -.br -Assertion text: -.eS -When an attempt to free a colormap entry not allocated by -the client is made, then a BadAccess error occurs. -.eE -.LI "Access colormap-store" -.br -File included: EAcc3.mc -.br -Assertion text: -.eS -When an attempt to store into a read-only or an unallocated -colormap entry is made, then a BadAccess error occurs. -.eE -.LI "Access acl" -.br -File included: EAcc4.mc -.br -Assertion text: -.eS -When an attempt is made to modify the access control list -from a client that is not authorised in a server-dependent -way to do so, then a BadAccess error occurs. -.eE -.LI "Access select" -.br -File included: EAcc5.mc -.br -Assertion text: -.eS -When an attempt to select an event type is made, which at -most one client can select, and another client has already -selected it then a BadAccess error occurs. -.eE -.LI "Alloc" -.br -File included: EAll.mc -.br -Assertion text: -.eS -When the server fails to allocate a required resource, then -a BadAlloc error occurs. -.eE -.LI "Atom [ARG1] [ARG2] ..." -.br -File included: EAto.mc -.br -Assertion text: -.eS -When an atom argument does not name a valid Atom [, ARG1] [or -ARG2], then a BadAtom error occurs. -.eE -.LI "Color" -.br -File included: ECol.mc -.br -Assertion text: -.eS -When a colourmap argument does not name a valid colourmap, -then a BadColor error occurs. -.eE -.LI "Cursor [ARG1] [ARG2] ..." -.br -File included: ECur.mc -.br -Assertion text: -.eS -When a cursor argument does not name a valid Cursor [, ARG1] [or -ARG2], then a BadCursor error occurs. -.eE -.LI "Drawable [ARG1] [ARG2] ..." -.br -File included: EDra.mc -.br -Assertion text: -.eS -When a drawable argument does not name a valid Drawable, -[ARG1] [or ARG2], then a BadDrawable error occurs. -.eE -.LI "Font bad-font" -.br -File included: EFon1.mc -.br -Assertion text: -.eS -When a font argument does not name a valid font, then a -BadFont error occurs. -.eE -.LI "Font bad-fontable" -.br -File included: EFon2.mc -.br -Assertion text: -.eS -When the font argument does not name a valid GContext or -font resource, then a BadFont error occurs. -.eE -.LI "GC" -.br -File included: EGC.mc -.br -Assertion text: -.eS -When the GC argument does not name a defined GC, then a -BadGC error occurs. -.eE -.LI "Match inputonly" -.br -File included: EMat1.mc -.br -Assertion text: -.eS -When a drawable argument is an InputOnly window then a -BadMatch error occurs. -.eE -.LI "Match gc-drawable-depth" -.br -File included: EMat2.mc -.br -Assertion text: -.eS -When the graphics context and the drawable do not have the -same depth, then a BadMatch error occurs. -.eE -.LI "Match gc-drawable-screen" -.br -File included: EMat3.mc -.br -Assertion text: -.eS -When the graphics context and the drawable were not created -for the same root, then a BadMatch error occurs. -.eE -.LI "Match wininputonly" -.br -File included: EMat4.mc -.br -Assertion text: -.eS -When the window argument is an InputOnly window then a -BadMatch error occurs. -.eE -.LI "Name font" -.br -File included: ENam1.mc -.br -Assertion text: -.eS -When the specified font does not exist, then a BadName error -occurs. -.eE -.LI "Name colour" -.br -File included: ENam2.mc -.br -Assertion text: -.eS -When the specified colour does not exist, then a BadName -error occurs. -.eE -.LI "Pixmap [ARG1] [ARG2] ..." -.br -File included: EPix.mc -.br -Assertion text: -.eS -When a pixmap argument does not name a valid Pixmap [, ARG1] [or -ARG2], then a BadPixmap error occurs. -.eE -.LI "Value ARG1 VAL1 [VAL2] ..." -.br -File included: EVal.mc \(dg -.br -Assertion text: -.eS -When the value of ARG1 is other than VAL1 [or VAL2], then a -BadValue error occurs. -.eE -.P -.S -1 -\(dg - the assertion text is not in the included file, but is -inserted directly by -.C mc . -.S -.LI "Value ARG1 mask VAL1 [VAL2] ..." -.br -File included: EVal.mc \(dg -.br -Assertion text: -.eS -When the value of ARG1 is not a bitwise combination of VAL1 -[or VAL2], then a BadValue error occurs. -.eE -.P -.S -1 -\(dg - the assertion text is not in the included file, but is -inserted directly by -.C mc . -.S -.LI "Window [ARG1] [ARG2] ..." -.br -File included: EWin.mc -.br -Assertion text: -.eS -When a window argument does not name a valid Window [, ARG1] [or -ARG2], then a BadWindow error occurs. -.eE -.LE -.SK -.H 1 "Appendix D - \fCmc\fP utility" -.B Usage -.cS -mc [-a a_list] [-o ] [-l] [-m] [-s] [-p] [] -.cE -The -.C mc -utility -outputs a C source file containing tests specified in the input -file -.C , -which must be a dot-m file which has the format specified -in the section entitled "Source file syntax". -.P -If no -.C -is specified, the input is taken from standard input. -Multiple input files -can be processed by the utility, but the overall syntax must still conform -to that defined in the section entitled "Source file syntax". -A consequence of this is that you cannot specify another title section -for a different function -and expect to output tests for more than one function simultaneously. -Limited diagnostics are -given if the file does not have the required syntax. By default, the -C source file is written to the standard output stream. -.P -More details of the formats of the C source files produced by -.C mc -are given in the section entitled "Source file formats". -.P -.B Options -.VL 5 0 -.LI "\fC-a a_list\fP" -.br -This permits the specification of a list of assertions of the form -.C n1-m1,n2-m2,... -to be output. Test code will only be output corresponding to the tests -in the specified ranges. -.LI "\fC-o output-file\fP" -.br -This sends the output to the file -.C -instead of the standard output stream. -.LI \fC-l\fP -.br -This option outputs a C source file containing tests with modified -startup code which allows the source code to be compiled and linked into -a space-saving executable file. The format of these files -is described in the section entitled -"C files for linked executable - \fClink.c\fP". -.LI \fC-m\fP -.br -This option outputs a C source file containing tests for the -macro version of the function specified in the title section of the -dot-m file. The format of these files -is described in the section entitled -"C files for standalone executable in macro tests - \fCMTest.c\fP". -.P -The macro name is set to the -.C -argument of the >>SET macro option - if there is no >>SET macro -option in the file, or no argument specified, the default is the -.C function -argument in the >>TITLE keyword, -with the leading letter `X' removed. -.LI \fC-s\fP -.br -This option outputs a test strategy from the dot-m file -as a C source code comment block between the assertion and the -code. The test strategy is derived from the corresponding -strategy section in the dot-m file. -.LI \fC-p\fP -.br -This causes additional output including indicators of line number -in the original dot-m file (where possible). -This means that any diagnostics produced by -.I cc(1) -or -.I lint(1) -will refer to the line numbers in the original dot-m file rather -than the C source file. -.LE -.SK -.H 1 "Appendix E - \fCmmkf\fP utility" -.B Usage -.cS -mmkf [-o ] [-s sections] [] -.cE -The -.C mmkf -utility -outputs a Makefile corresponding to the specified input file -.C , -which must be a dot-m file which has the format specified -in the section entitled "Source file syntax". -The Makefile can build all the C source files that can be -output by -.C mc -from the input file -.C . -.P -If no -.C -is specified, the input is taken from standard input. -Multiple input files -can be processed by the utility, but the overall syntax must still conform -to that defined in the section entitled "Source file syntax". -A consequence of this is that you cannot specify another title section -for a different function -and expect to output Makefiles for more than one function simultaneously. -Limited diagnostics are -given if the file does not have the required syntax. By default, the -Makefile is written to the standard output stream. -.P -More details of the formats of the Makefiles produced by -.C mmkf -are given in the sub-section entitled "Makefile" in the section entitled -"Source file formats". -.P -.B Options -.VL 5 0 -.LI "\fC-o output-file\fP" -.br -This sends the output to the file -.C -instead of the standard output stream. -.LI "\fC-s sections\fP" -.br -This option enables output of certain optional sections of the -Makefile. By default, output of all these sections is enabled. There -is no reason why you should need to use this option with the -current version of the \*(xT. -.P -The -.C sections -argument is a character string which may contain the key letters -.C l , -.C L , -.C m -and -.C p . -If these characters are included, the specified sections of the Makefile -are then output. -.TS -box center; -l | l. -Key Optional -letter section -_ -l Targets for linked executable -L Targets for libraries -m Targets for linting and cleaning -p Targets for building known good image files -.TE -.LE -.SK -.H 1 "Appendix F - \fCma\fP utility" -.B Usage -.cS -ma [-a a_list] [-o ] [-h] [-s] [-p] [-m] [] -.cE -The -.C ma -utility -outputs a file containing a list of assertions in -.I nroff(1) -format (requiring no macros other than those supplied in file -\fCmaheader.mc\fP). -The assertions are specified in the input file -.C , -which must be a dot-m file which has the format specified -in the section entitled "Source file syntax". -.P -If no -.C -is specified, the input is taken from standard input. -Multiple input files -can be processed by the utility, but the overall syntax must still conform -to that defined in the section entitled "Source file syntax". -A consequence of this is that you cannot specify another title section -for a different function -and expect to output assertions for more than one function simultaneously. -Limited diagnostics are -given if the file does not have the required syntax. By default, the -assertion list is written to the standard output stream. -.P -More details of the format of the assertion list produced by -.C ma -are given in the sub-section entitled "Formatting assertions" -in the section entitled -"Source file formats". -.P -.B Options -.VL 5 0 -.LI "\fC-a a_list\fP" -.br -This permits the specification of a list of assertions of the form -.C n1-m1,n2-m2,... -to be output. Assertions will only be output corresponding to the tests -in the specified ranges. -.LI "\fC-o output-file\fP" -.br -This sends the output to the file -.C -instead of the standard output stream. -.LI \fC-h\fP -.br -The macros required for formatting the assertions are included -at the start of the output stream. These are copied from the file -\fCmaheader.mc\fP. -.P -By default, the macros are not copied to the output stream. -.LI \fC-s\fP -.br -If this option is specified, and the -.C -h -option is specified, the line -.cS -\&.so head.t -.cE -will be output at the start of the output stream. -.P -This option is not intended for general use - it was used when -distributing assertions in compact form for external review. -.LI \fC-p\fP -.br -The macros \fC.NS\fP and \fC.NE\fP -will be output before and after each line in the dot-m file which is a -comment (commencing with >>#). By default, dot-m file comments are not output. -The macros \fC.NS\fP and \fC.NE\fP are defined in \fCmaheader.mc\fP; -they cause the dot-m file comment lines to be printed in italic font by -.I nroff(1) . -.P -This option is not intended for general use - it was used when -reviewing assertions before delivery. -.LI \fC-m\fP -.br -This option outputs assertions for the macro version of the function -specified in the title section of the dot-m file. -.P -The macro name is set to the -.C -argument of the >>SET macro option - if there is no >>SET macro -option in the file, or no argument specified, the default is the -.C function -argument in the >>TITLE keyword, -with the leading letter `X' removed. -.LE -.TC Index: xc/doc/specs/test/relnotes.mm diff -u xc/doc/specs/test/relnotes.mm:1.1 xc/doc/specs/test/relnotes.mm:removed --- xc/doc/specs/test/relnotes.mm:1.1 Sat Dec 6 14:11:52 2003 +++ xc/doc/specs/test/relnotes.mm Tue May 9 21:52:05 2006 @@ -1,283 +0,0 @@ -.\" $XConsortium: relnotes.mm,v 1.7 92/07/07 16:59:43 rws Exp $ -.ds dD Release Notes for the X Test Suite -.so 00.header -'\" -'\" Start and end of a user-typed display -'\" -.de cS -.DS I -.ft C -.ps -2 -.. -.de cE -.ps +2 -.ft R -.DE -.. -'\" # Courier -.de C -\fC\\$1\fP\\$2\fC\\$3\fP\\$4\fC\\$5\fP\\$6 -.. -'\" ### -.H 1 "Acknowledgements" -The \*(xT was produced by UniSoft Group Limited under contract to the -MIT X Consortium. -.P -.nf -UniSoft Group Limited, -Spa House, -Chapel Place, -Rivington Street, -LONDON EC2A 3DQ -.fi -.H 1 "Introduction" -This release of the \*(xT tests sections 2 to 10 -of the -\fIXlib: C\ Language X\ Interface -(MIT\ X\ Consortium\ Standard - X\ Version\ 11, Release 4)\fR\*F. -.FS -The \*(xW is a trademark of the Massachusetts Institute of Technology. -.br -\*(xW Version\ 11 Release\ 4 is abbreviated to X11R4 in this document. -.br -\*(xW Version\ 11 Release\ 5 is abbreviated to X11R5 in this document. -.FE -It also tests parts of the -\fIX\ Window\ System\ Protocol -(MIT\ X\ Consortium\ Standard - X\ Version\ 11)\fR -where these cannot be inferred from tests at the Xlib level. -.P -The \*(xT may be used to test later versions of X11. The -test suite is known to build correctly using the X11R5 Xlib distributed by MIT. -However, only R4 functionality is tested; new interfaces and functionality -introduced in later releases are not tested. -.H 1 "Installation" -The distribution normally comes a single tar file, either on -tape or across a network. Create a directory to hold the distribution, -\fCcd\fP to it, and untar everything from that directory. For example: -.DS -mkdir \fIsourcedir\fP -cd \fIsourcedir\fP -tar xfp \fItar-file-or-tape-device\fP -.DE -.P -If you have obtained compressed and split tar file over the network, -then the sequence might be: -.DS -cat xtest.?? | uncompress | (cd \fIsourcedir\fP; tar xfp -) -.DE -.P -The \fIsourcedir\fP directory you choose can be anywhere in any of your -filesystems that is convenient to you. -.P -The \*(xT requires about 10Mb of disk space to -unpack the sources, and perhaps 50-100Mb of disk space to build -space-saving executable files (dependent on machine architecture). -If you choose to build standard executable files -you will require perhaps 100-250Mb of disk space. -See the User Guide for build instructions. -.H 1 "Documentation" -The following documentation is provided for the \*(xT. -To format the .mm files, you need the utilities \fCsoelim\fP, \fCtbl\fP, -and \fCnroff/troff\fP with the mm macros. The file xtest/doc/Makefile contains -rules showing how to use these utilities to format and print -the documents. -.AL -.LI -The User Guide -gives enough information to enable an experienced test suite user, -(not necessarily familiar with the \*(xW) to configure, build and -execute the \*(xT, and analyse the results produced. -.P -You can find the source of the User Guide -in the file xtest/doc/userguide.mm, and in PostScript -form in file xtest/doc/userguide.ps. -.LI -The Programmers Guide -gives enough information to enable an experienced programmer -familiar with the \*(xW to modify or extend the \*(xT. -.P -You can find the source of the Programmers Guide -in the file xtest/doc/progguide.mm, and in PostScript -form in file xtest/doc/progguide.ps. -.LI -A paper distributed in the old T7 X test suite, -"An Approach to Testing X Window System Servers at a Protocol Level", -is included in this release. This is a technical paper which defines in -outline terms the areas of the \*(xW server which should be tested at the -X Protocol level rather than the Xlib level. -.P -The approach recommended in this paper, and adopted in the design of -the T7 X test suite, has been maintained in this \*(xT. -The paper explains the choice of test cases and division of tests -between the \*(xP and \*(xL. This paper has been left "as is"; as a result, -some sections of this paper -are out of date in that they refer to development schedules for a -previous software development project. -.P -You can find the source of this paper in the file xtest/doc/paper.mm. -.LE -.H 1 "Portability" -The main portability limitations occur in the -.SM TET -which is described further below. This is because the -.SM TET -was originally developed to run on systems which are POSIX.1\*F -.FS -IEEE Std 1003.1-1990, \fIPortable Operating System Interface for -Computer Environments\fR -.FE -compliant. -.P -To enable the \*(xT to build easily on -BSD4.2 systems, a portability library has been developed which contains -POSIX.1 functions not present on vanilla BSD4.2 systems. The -contents and use of this library are described further in the User Guide. -Beyond this, non-POSIX systems may require -some porting effort dependent on the number of commonly supported functions -which are absent in a particular implementation. -.P -Maintenance and enhancement of the portability library is a low priority -for the MIT X Consortium. -.P -It should be possible to build and run this test suite against any -R4 or later Xlib and X server. However, to build and execute the complete -set of tests, your X server must support the XTEST protocol extension and -you need the library interface to this extension. This extension is not -part of R4 or R5; it was developed after R5 was released. The extension is -not included in this distribution, and had only been released to members -of the X Consortium at the time this distribution was released. -It is expected that the extension will be released to the public -sometime in the future (before R6). -.P -It is also possible to configure the test suite to use an -Xlib internal function to obtain raw connections to the X server. -The interface to this function was revised after R5 was released -in order to provide an adequate interface for this test suite. -The Xlib changes for this had only been released to members -of the X Consortium at the time this distribution was released. -It is expected that these changes will be released to the public -sometime in the future (before R6). -.H 1 "Status of the Test Environment Toolkit (\s-1TET\s0)" -Included in this release is a version of the -"Test Environment Toolkit" -.SM ( TET ). -This is required to build and execute the \*(xT. -The "Test Environment Toolkit" -is a software tool developed by X/Open, -UNIX International, -and the Open Software Foundation. -.AL -.LI -The \*(xT includes a copy of -.SM TET -version 1.9 with a small number of changes described below. -.LI -The supplied version of -.SM TET -includes fixes to several bugs reported since the -.SM TET -1.9 release. -.LI -The Makefiles supplied with -.SM TET -1.9 have been modified slightly to use the build configuration -scheme used by the \*(xT. -This reduces the need to edit Makefiles to modify configuration variables -when building the -.SM TET. -.LI -You should only refer to the instructions in the User Guide for the \*(xT -for details of installation of the -.SM TET . -.P -For more complete information on the features of the \s-1TET\s0, you can format -and print the on-line documentation for the -.SM TET -(see "\s-1TET\s0 Documentation"). -.LI -It is intended that the \*(xT should work in conjunction with -future versions of the -.SM TET -later than 1.9. -.P -You can obtain the latest released version by -sending electronic mail to infoserver@xopen.co.uk. A message body of -.cS -request: tet -topic: index -request: end -.cE -will obtain the index of files available for the -.SM TET . -.LE -.H 1 "TET Documentation" -You need only refer to the instructions in the -User Guide for the \*(xT for details of installation and usage of the -.SM TET . -.P -For more background information on the features and scope of the -.SM TET , -you can format and print the following items of documentation which are -part of the -.SM TET . -.P -Any conflict between this documentation and the User Guide for the \*(xT is -unintentional. You should assume the User Guide is correct in case of conflict, -because it has been checked against the \*(xT. -.AL -.LI -The release note for -.SM TET -1.9 is supplied in the file -tet/doc/posix_c/rel_note.mm, and in PostScript -form in file tet/doc/posix_c/rel_note.ps. -.P -To format rel_note.mm, you require the utilities \fCtbl\fP, -and \fCnroff/troff\fP with the mm macros. -.LI -A manual page for the \fCtcc\fP utility is provided in file -tet/doc/posix_c/tcc.1. -.P -To format the man page, you require the utility -\fCnroff/troff\fP with the man macros. -.LE -.H 1 "Filing bug reports" -If you find a reproducible bug in the software or documentation, -please send a bug report to MIT using the form in the file bug-report -and the destination address: -.DS -xbugs@expo.lcs.mit.edu -.DE -.P -Please try to provide all of the information requested on the form if it is -applicable; the little extra time you spend on the report will make it -much easier for us to reproduce, find, and fix the bug. Receipt of bug -reports is generally acknowledged, but sometimes it can be delayed by a -few weeks. -.P -This test suite will report numerous bugs in the public R4 and R5 -distributions from MIT, and in some cases will cause the X server to crash. -In general, it is not necessary to report bugs in the MIT Xlib and X server -software found by running this test suite to MIT. The test suite is used -extensively at the X Consortium, and at the time of this release nearly all -bugs reported by this test suite when running on monochrome and 8-bit color -systems (as well as some 12-bit and 24-bit systems) have been corrected in -the sources maintained at MIT. However, if you discover bugs that you think -will not show up on systems tested at MIT, feel free to report them. -.P -Bugs in TET/tcc software and documentation should not be reported to MIT. -Send TET/tcc bug reports to tet_support@xopen.co.uk. -.H 1 "Setting up your X\ server" -Your attention is drawn to section 7.1 of the User Guide entitled -"Setting up your X\ server". You should follow the guidelines in section -7.1.1 to obtain reliable, repeatable results against your X\ server, -when running formal verification tests. -.P -It is also important to ensure that your X\ server is running no other clients -before starting formal verification tests. This is because some test programs -(for example, those which enable access control) may interfere with later -tests unless the X\ server resets in between. To ensure the X\ server resets -after each test program, make sure you are not running any other clients -at the time. -.SK Index: xc/doc/specs/test/userguide.mm diff -u xc/doc/specs/test/userguide.mm:1.1 xc/doc/specs/test/userguide.mm:removed --- xc/doc/specs/test/userguide.mm:1.1 Sat Dec 6 14:11:52 2003 +++ xc/doc/specs/test/userguide.mm Tue May 9 21:52:05 2006 @@ -1,3682 +0,0 @@ -.\" $XConsortium: userguide.mm,v 1.12 94/09/08 13:44:28 dpw Exp $ -' -.ds dD User Guide for the X Test Suite -.so 00.header -'\" -'\" Start and end of a user-typed display -'\" -.de cS -.DS I -.ft C -.ps -2 -.. -.de cE -.ps +2 -.ft R -.DE -.. -'\" # Courier -.de C -\fC\\$1\fP\\$2\fC\\$3\fP\\$4\fC\\$5\fP\\$6 -.. -'\" ### -.H 1 "Introduction" -This document is a guide to installing and running -\*(xR of the \*(xT. -In order to do this, please work through all of the steps described -in this guide in order. Information on the content, purpose and goals of the -\*(xT -is found in a series of appendices, which follow the installation -instructions. -.P -Please read the "Release Notes for the \*(xT", -which describe particular features of this release. -.P -Further information, which would be required by a programmer to modify or extend -the \*(xT, is contained in a separate document, "Programmers Guide for the -\*(xT". -.P -Included in this release is a version of the -"Test Environment Toolkit" -.SM ( TET ). -This is required to build and execute the \*(xT. -The "Test Environment Toolkit" -is a software tool developed by X/Open, -UNIX International, -and the Open Software Foundation. -More details of the \s-1TET\s0 appear in appendix E. -.P -The contents of this document cover the installation and use of the included -version of the \s-1TET\s0. -.SK -.H 1 "Preparation" -This section of the User Guide describes how to check that the system on which -you want to build the \*(xT has the required utilities and sufficient -disc space, how to check the version of the \*(xW\*F -.FS -The \*(xW is a trademark of the Massachusetts Institute of Technology. -.br -\*(xW Version\ 11 Release\ 4 is abbreviated to X11R4 in this document. -.br -\*(xW Version\ 11 Release\ 5 is abbreviated to X11R5 in this document. -.FE -you wish to test, -and how to extract the software from the supplied distribution media. -.H 2 "Utilities" -The \*(xT assumes that the following utilities are available on your system. -.H 3 "Bourne shell" -The configuration and building stages include example instructions which -have only been tested using the Bourne shell. -.P -The build configuration file sets the SHELL variable so that the Bourne -shell will be used by \fCmake\fP. No other settings for this variable -have been tested. -.H 3 "make" -The building stages assume the existence of \fCmake\fP. -.H 3 "awk" -The report writer \fCrpt\fP uses \fCawk\fP. -.H 3 "Compiler" -A C compiler and link editor are required. The \*(xT assumes that when these -utilities execute successfully, they return a value of zero. -The names of these utilities may be set in build -configuration parameters. -.H 3 "Library archiver" -A library archiver and a means of ordering the libraries are required. -The ordering software may be part of the library archiver, the -\fCranlib\fP utility, or the utilities \fClorder\fP and \fCtsort\fP. -The names of these utilities may be set in build -configuration parameters. -.H 3 "File utilities" -The \*(xT uses utilities to copy, move, remove and link files during -the build stages. -The names of these utilities may be set in build -configuration parameters. -.H 2 "Checking your version of the \*(xW" -If your version of the \*(xW supports the -.SM XTEST -extension, you will -be able to perform tests for -some assertions which are otherwise untestable. The -.SM XTEST -extension has been produced by MIT since the initial release of X11R5, -based on a specification\*F -.FS -Drake, K.J., -\(lqSome Proposals for a Minimal X11 Testing Extension.\(rq -.I -UniSoft Ltd. June 1991 -.FE -produced by UniSoft. -The extension provides access to the X server to enable -testing of the following areas of the \*(xW: -.DL -.LI -Those which rely on the simulation of device events. -.LI -Those requiring access to opaque client side data structures. -.LI -Those requiring information on the cursor attribute of windows. -.LE -.P -Before you configure the \*(xT, you should determine whether your -version of the \*(xW includes the -.SM XTEST -extension, and, if so, whether -you wish to configure and build the \*(xT to enable these features to -be tested. -.P -There are two things to check: -.AL -.LI -Check whether your X server supports the -.SM XTEST -extension. -This can be done by printing the list of extensions available in your -X server using the X utility -.C xdpyinfo . -Note - the name of the -extension should be printed exactly as in this User Guide - -there are other testing extensions for X which are not compatible -with the -.SM XTEST -extension. -.LI -Check whether you have the required libraries to link the test suite clients -so as to access the -.SM XTEST -extension. All test suite clients must be linked with Xlib, which is -normally named -.C libX11.a . -If you want to access the -.SM XTEST -extension, -you will need two further libraries. These are the -.SM XTEST -library (normally named -.C libXtst.a ) -and the X extension library (normally named -.C libXext.a ). -.LE -.H 2 "Installing the \*(xT" -Change to the directory in which you wish to install the distribution. -Set an environment variable \s-1TET_ROOT\s0 to the full path name of -that directory. -.P -Load the software from the media supplied into that directory. -The precise commands you should use depend on the format of the media -supplied to you, the utilities available on your system, -the options -supported by the utilities, and -the names of -the tape devices on your system. -See the Release Notes for more information about installation. -.P -.SK -.H 1 "Configuring the \*(xT" -This section contains instructions on all the procedures you should -go through in order to configure the \*(xT, before attempting to -build it. -.P -There is a description of the \s-1TET\s0 build tool in section 3.1, and the -relationship between the \s-1TET\s0 build scheme and the Imake scheme in -section 3.2. -.P -Sections 3.3 and 3.4 contain details of build and clean -configuration parameters, which you -should edit to reflect the configuration of the target platform on which -the \*(xT is to be built. -.P -Section 3.5 contains details of source files and include files -which contain system dependent -data which cannot be specified via the build configuration parameters. -You should check these files before configuration and if necessary edit -them to be suitable for your system. -.H 2 "The \s-1TET\s0 build tool" -The \s-1TET\s0 provides a scheme to execute a build tool, which builds -the tests in the \*(xT. -The execution of the build tool in the -\s-1TET\s0 -is controlled by a small number of -\s-1TET\s0 -configuration parameters, contained in a build configuration file. These -are described in section 3.3.1. -.P -A build tool has been developed and is provided as part of the \*(xT. -This is a shell script named \fCpmake\fP, which is supplied in the directory -\fC$TET_ROOT/xtest/bin\fP. The shell script \fCpmake\fP is an interface to the -\fCmake\fP system command, and when invoked from the -\s-1TET\s0 -it builds a test using the rules provided in a -\fCMakefile\fP. -.P -Each \fCMakefile\fP in the \*(xT -is written portably, using symbolic names to describe commands and -parameters which may vary from system to system. The values of these -symbolic names are all obtained by \fCpmake\fP from additional parameters in -the build configuration file -which are described in sections 3.3.2-3.3.7. -.P -The \fCpmake\fP utility may be invoked directly from the shell, -as well as via the \s-1TET\s0, to build individual parts of the -\*(xT. This is described further in subsequent sections of this guide. -.P -There is also a clean tool \fCpclean\fP which is -an interface to the system \fCmake clean\fP system command. This -uses parameters in a clean configuration file. -.H 2 "Relationship between \s-1TET\s0 build scheme and Imake" -The \s-1TET\s0 is designed to provide a simple and self contained -interface to configure and build tests. The \*(xT can be configured and -built with no specialised knowledge of the \*(xW beyond -that contained in the \*(xT documentation, and using a limited set of commonly -available system commands. The only information required to configure and -build the \*(xT is the location of the \*(xW Xlib and include files. -.P -The \*(xW itself includes a -configuration scheme which is known as \fCImake\fP. -This uses a utility \fCimake\fP supplied as part of the \*(xW -to create \fCMakefiles\fP from portable -description files called \fCImakefiles\fP. -.P -If you are familiar with the \fCImake\fP scheme, and have used it to configure -and build -the \*(xW on the platform being used to build the \*(xT, you may be able -to set a limited number of the \s-1TET\s0 build configuration variables -described in section 3.3 to the same value you used for -an \fCImake\fP variable. Where this -is possible, the name of the corresponding \fCImake\fP variable is cross -referenced. -.H 2 "Build configuration parameters" -All build configuration parameters are contained in -a configuration file that forms part of the \s-1TET\s0. -This file should be edited to reflect the configuration of the target machine. -The file -.cS -$TET_ROOT/xtest/tetbuild.cfg -.cE -contains all the parameters that are needed to build the \*(xT. -The parameters are grouped in seven sections within the configuration file. -.H 3 "Configuration Parameters defined by the \s-1TET\s0" -None of these parameters require changing. They are already set to -defaults which are correct for the \*(xT. -.P -.VL 15 0 -.LI \s-1TET_BUILD_TOOL\s0 -.br -The name of the program that the -.SM TET -will execute in build mode. -.P -You should use the \fCpmake\fP command that is supplied -in the directory \fC$TET_ROOT/xtest/bin\fP. -.cS -Eg: TET_BUILD_TOOL=pmake -.cE -.LI \s-1TET_BUILD_FILE\s0 -.br -Any flags required by the build tool. -This parameter should be empty. -.cS -Eg: TET_BUILD_FILE= -.cE -.LI \s-1TET_CLEAN_TOOL\s0 -.br -The name of the program that the -.SM TET -will execute in clean mode. -.P -You should use the \fCpclean\fP command that is supplied -in the directory \fC$TET_ROOT/xtest/bin\fP. -.cS -Eg: TET_CLEAN_TOOL=pclean -.cE -.LI \s-1TET_CLEAN_FILE\s0 -.br -Any flags required by the clean tool. -This parameter should be empty. -.cS -Eg: TET_CLEAN_FILE= -.cE -.LI \s-1TET_OUTPUT_CAPTURE\s0 -.br -This flag is used by the \s-1TET\s0 to enable the output from the build tool -to be saved and copied into the journal file. This line should not be -altered. -.LE -.H 3 "Configuration for system commands" -In this section the names of system commands are specified. -.VL 15 0 -.LI \s-1SHELL\s0 -The following line should cause the Bourne shell to be used -by make. -.cS -Eg: SHELL=/bin/sh -.cE -.LI \s-1CC\s0 -A command to invoke the C compiler. -.cS -Eg: CC=cc -.cE -.P -\fIImake variable: CcCmd\fP -.LI \s-1RM\s0 -A command to remove a file without interactive help. -.cS -Eg: RM=rm -f -.cE -.P -\fIImake variable: RmCmd\fP -.LI \s-1AR\s0 -A command to generate a library archive. -.cS -Eg: AR=ar crv -.cE -.P -\fIImake variable: ArCmd\fP -.LI \s-1LD\s0 -A command to link object files. -.cS -Eg: LD=ld -.cE -.P -\fIImake variable: LdCmd\fP -.LI \s-1LN\s0 -A command to make hard links. -.cS -Eg: LN=ln -.cE -.P -\fINB: This does not correspond to the Imake variable: LnCmd\fP -.LI \s-1RANLIB\s0 -If the system supports a command to order library -archives into random access libraries, then set the parameter to that command. -Otherwise it should be set to \fCecho\fP (or a command that does nothing). -.cS -Eg: RANLIB=ranlib -.cE -.P -\fIImake variable: RanlibCmd\fP -.LI \s-1TSORT\s0 -Set to \fCcat\fP if AR was set to a command which inserts a symbol table -in the library archive, -or if RANLIB was set to a command which creates a random access library, -otherwise set to \fCtsort\fP. -.LI \s-1LORDER\s0 -Set to \fCecho\fP if AR was set to a command which inserts a symbol table -in the library archive, -or if RANLIB was set to a command which creates a random access library. -otherwise set to \fClorder\fP. -.LI \s-1CP\s0 -A command to copy files. -.cS -Eg: CP=cp -.cE -.P -\fIImake variable: CpCmd\fP -.LI \s-1CODEMAKER\s0 -A utility to produce C source files from dot-m files. -The supplied utility \fCmc\fP should always be used. -This line should not be altered. -.cS -Eg: CODEMAKER=mc -.cE -.LE -.H 3 "Configuration for the \s-1TET\s0" -This section contains the locations of various parts of the \s-1TET\s0. -Usually only the first four parameters will need changing, -unless files have been moved from their default locations. -.VL 15 0 -.LI \s-1TET_ROOT\s0 -The directory that contains all the files in the \*(xT. -This should be set to the path to which \fCTET_ROOT\fP was set (see the -section entitled "Installing the \*(xT"). -It must be written out as a full path without using any variable notation. -.LI \s-1TETBASE\s0 -The directory that contains all the files in the \s-1TET\s0 system. -This is used for convenience in defining the other directories. -This should be set to \fC${TET_ROOT}/tet\fP. -.LI \s-1PORTINC\s0 -An option that can be given to the C compiler -that will cause it to search all directories that are -required to allow portability to systems that do not support -.SM POSIX . -Should be empty for -.SM POSIX -systems. -If compiling on a \s-1BSD\s0 system using the supplied compatibility library, -then the following line should be used. -(See section entitled "The portability library"). -.cS -Eg: PORTINC=-I${TET_ROOT}/port/INC -.cE -.LI \s-1PORTLIB\s0 -A library containing -.SM POSIX.1 -and C library functions that -are not supplied by the system. -This should be empty for a -.SM POSIX -system. -If compiling on a \s-1BSD\s0 system using the supplied compatibility library, -then the following line should be used. -(See section entitled "The portability library"). -.cS -Eg: PORTLIB=${TET_ROOT}/port/libport.a -.cE -.LI \s-1TETINCDIR\s0 -The directory containing the -.SM TET -headers. -.cS -Eg: TETINCDIR=${TETBASE}/inc/posix_c -.cE -.LI \s-1TETLIB\s0 -The directory containing the -.SM TET -library. -.cS -Eg: TETLIB=${TETBASE}/lib/posix_c -.cE -.LI \s-1TCM\s0 -The Test Control Manager. -This is part of the \s-1TET\s0. -It is an object file that is linked with each test. -.cS -Eg: TCM=${TETLIB}/tcm.o -.cE -.LI \s-1TCMCHILD\s0 -The Test Control Manager. -This is part of the \s-1TET\s0. -It is an object file that is linked with each program that is -executed within a test by tet_exec(). -.cS -Eg: TCMCHILD=${TETLIB}/tcmchild.o -.cE -.LI \s-1APILIB\s0 -The \s-1TET\s0 \s-1API\s0 library. -.cS -Eg: APILIB=${TETLIB}/libapi.a -.cE -.LE -.H 3 "Configuration parameters for the \*(xT" -Only the first two of these parameters require changing unless -directories have been moved from their default locations. -.VL 15 0 -.LI \s-1XTESTHOST\s0 -The name of the host on which test suite clients are to be executed. -This may be set to the value returned by a command which can be executed -using the PATH you have set on your host, or may be set to a specific name. -This is used to produce a resource file named .Xdefaults-$(\s-1XTESTHOST\s0) -in the test execution directory. -The resource file is created when building the test for XGetDefault. -This parameter is only used in the Makefile of the test for XGetDefault. -.cS -Eg. XTESTHOST=`hostname` -Eg. XTESTHOST=`uname -n` -Eg. XTESTHOST=triton -.cE -.LI \s-1XTESTFONTDIR\s0 -The directory in which to install the test fonts. -.cS -Eg: XTESTFONTDIR=/usr/lib/X11/fonts/xtest -.cE -.LI \s-1XTESTROOT\s0 -The directory that is the root of the \*(xT. -.cS -Eg: XTESTROOT=${TET_ROOT}/xtest -.cE -.LI \s-1XTESTLIBDIR\s0 -The directory containing libraries for the \*(xT. -.cS -Eg: XTESTLIBDIR=${XTESTROOT}/lib -.cE -.LI \s-1XTESTLIB\s0 -The xtest library. -This library contains -subroutines that are common to many tests in the \*(xT. -.cS -Eg: XTESTLIB=${XTESTLIBDIR}/libxtest.a -.cE -.LI \s-1XSTLIB\s0 -The X Protocol test library. -This library contains -subroutines that are common to many tests in the X Protocol section -of the \*(xT. -.cS -Eg: XSTLIB=${XTESTLIBDIR}/libXst.a -.cE -.LI \s-1XTESTFONTLIB\s0 -The fonts library. -This library contains -font descriptions that are common to many tests in the \*(xT. -.cS -Eg: XTESTFONTLIB=${XTESTLIBDIR}/libfont.a -.cE -.LI \s-1XTESTINCDIR\s0 -The xtest header file directory. -This directory contains headers that are local to the \*(xT. -.cS -Eg: XTESTINCDIR=${XTESTROOT}/include -.cE -.LI \s-1XTESTBIN\s0 -The xtest binary file directory. -This directory contains utility programs that are used by \*(xT. -.cS -Eg: XTESTBIN=${XTESTROOT}/bin -.cE -.LE -.H 3 "System Parameters" -Location of system libraries and include files. -.VL 15 0 -.LI \s-1SYSLIBS\s0 -Options to cause the C compiler to search -any system libraries that are required for the \*(xT -that are not searched by default. -This will probably include Xlib. -.cS -Eg: SYSLIBS=-lX11 -.cE -If you wish to build the \*(xT to make use of the -.SM XTEST -extension, you -will need to include the -.SM XTEST -library and the X\ extension library (in that order). -.cS -Eg: SYSLIBS=-lXtst -lXext -lX11 -.cE -.P -\fIImake variables: ExtraLibraries\fP -.LI \s-1XP_SYSLIBS\s0 -Any system libraries that are needed, to link the -X Protocol tests. This will include Xlib, since libXst.a -(which is part of the test suite) will include at least one call to -XOpenDisplay. -.cS -Eg: XP_SYSLIBS=-lX11 -.cE -.P -\fIImake variables: ExtraLibraries\fP -.LI \s-1SYSINC\s0 -Any commands that should be given to the C compiler -to cause all relevant system include files to be included. This will -probably -include /usr/include/X11. -.cS -Eg: SYSINC=-I/usr/include/X11 -.cE -.LE -.H 3 "C Compiler Directives" -Directives to the C compiler. -Usually only the first four parameters will need changing. The -remainder are internally used parameters, which are an amalgam of previously -set parameters. -.VL 15 0 -.LI \s-1COPTS\s0 -Options to the C compiler. -.cS -Eg: COPTS=-O -.cE -.P -\fIImake variables: DefaultCDebugFlags and DefaultCCOptions\fP -.LI \s-1DEFINES\s0 -Options required by the C compiler to set up any required defines. -For example in strict -.SM ANSI -Standard-C systems you will need to define -.SM _POSIX_SOURCE . -Additionally on an -.SM X/Open -conformant system it may be necessary to define -.SM _XOPEN_SOURCE . -.cS -Eg: DEFINES=-D_POSIX_SOURCE -.cE -.P -If there is no symbol -.C NSIG -defined in the system header file -\fCsignal.h\fP, then this has to be supplied for -use by the \s-1TET\s0 \s-1API\s0. -It should be the number of signal types on the system. -.cS -Eg: DEFINES=-D_POSIX_SOURCE -DNSIG=32 -.cE -If you wish to build the \*(xT to make use of the -.SM XTEST -extension, you -will need to define -.SM XTESTEXTENSION . -.br -.SM XTESTEXTENSION -is only used when building the \*(xT library. -.cS -Eg: DEFINES=-D_POSIX_SOURCE -DNSIG=32 -DXTESTEXTENSION -.cE -.P -\fIImake variables: StandardDefines\fP -.LI \s-1XP_DEFINES\s0 -C compiler defines specific to the X Protocol tests. -.br -This can be set as DEFINES, but -you can build support for additional connection methods beyond TCP/IP, -using the following defines, if XP_OPEN_DIS is -XlibNoXtst.c (R4/R5 XOpenDisplay emulation): -.cS --DDNETCONN - Connections can also use DECnet\*F. --DUNIXCONN - Connections can also use UNIX\*F domain sockets. -.cE -.br -Refer to your documentation for building and installing Xlib on -your platform. -.FS -DEC and DECnet are registered trademarks of Digital -Equipment Corporation. -.FE -.FS -UNIX is a registered trademark of UNIX System Laboratories, Inc. in -the U.S. and other countries. -.FE -.br -If XP_OPEN_DIS is one of XlibXtst.c or XlibOpaque.c then none of -the defines listed above will be required. -.cS -Eg: XP_DEFINES=-D_POSIX_SOURCE -DUNIXCONN -.cE -.P -\fIImake variables: StandardDefines\fP -.LI \s-1LINKOBJOPTS\s0 -Options to give to the LD program to link object -files together into one object file that can be further linked. -.cS -Eg: LINKOBJOPTS=-r -.cE -.LI \s-1INCLUDES\s0 -Options to cause C compiler to search the correct directories -for headers. -This should not need changing as it is just an amalgam of -other parameters. -.cS -.ps -2 -INCLUDES=-I. ${PORTINC} -I${TETINCDIR} -I${XTESTINCDIR} ${SYSINC} -.ps +2 -.cE -.LI \s-1CFLAGS\s0 -Flags for the C compiler. -This should not need changing as it is just an amalgam of other -parameters. -Note that \fC\s-1CFLOCAL\s0\fP is not defined in the configuration file; -it is available for use in makefiles, to define -parameters that only apply to a particular case. -(It intentionally uses parentheses rather than braces) -.cS -.ps -2 -CFLAGS=$(CFLOCAL) $(COPTS) $(INCLUDES) $(DEFINES) -.ps +2 -.cE -.LI \s-1XP_CFLAGS\s0 -Flags for the C compiler. -This parameter is used by the \*(xP in the \*(xT. -This should not need changing as it is just an amalgam of other -parameters. -.cS -.ps -2 -XP_CFLAGS=$(CFLOCAL) $(COPTS) $(INCLUDES) $(XP_DEFINES) -.ps +2 -.cE -.LI \s-1LDFLAGS\s0 -Flags used by the loader. -This is needed on some systems -to specify options used when object files are linked to produce an executable. -.cS -.ps -2 -Eg. LDFLAGS=-ZP -.ps +2 -.cE -.LI \s-1LIBS\s0 -List of libraries. -This should not need changing as it is just an amalgam of other -parameters. -.cS -.ps -2 -LIBS=${XTESTLIB} ${XTESTFONTLIB} ${APILIB} ${PORTLIB} -.ps +2 -.cE -.LI \s-1XP_LIBS\s0 -List of libraries. -This parameter is used by the \*(xP in the \*(xT. -This should not need changing as it is just an amalgam of other -parameters. -.cS -.ps -2 -XP_LIBS=${XSTLIB} ${XTESTLIB} ${XTESTFONTLIB} ${APILIB} ${PORTLIB} -.ps +2 -.cE -.LI \s-1XP_OPEN_DIS\s0 -A choice of which code to build in the X Protocol library -to make an X server connection. -This must be set to one of three possible values: -.VL 4 0 -.LI XlibXtst.c -.br -Use this option only if your Xlib includes post R5 enhancements -to _XConnectDisplay -ensuring maximum portable protocol test coverage. These enhancements include -arguments to _XConnectDisplay to return authorisation details on -connection. If you use this option when your Xlib does not have these -enhancements to _XConnectDisplay, the results of running the \*(xP -will be -.B undefined . -.LI XlibOpaque.c -.br -You have a normal R4 Xlib or early R5 Xlib which you -cannot patch to include the enhancements to -_XConnectDisplay, and you cannot emulate these by -building XlibNoXtst.c, so only client-native testing -can be done portably, and no failure testing of -XOpenDisplay can be done. -This option uses XOpenDisplay to make the connection, -from which the file descriptor is recovered for our own use. -XCloseDisplay shuts down the connection. -.LI XlibNoXtst.c -.br -As for XlibOpaque.c but you can use the R4/R5 -connection emulation supplied. (Note: R4/R5 independent) -This will ensure maximum protocol test coverage -but may not be portable to all platforms. -.LE -.P -Reasons for not being able to build XlibNoXtst.c might include: -.br -i) different interfaces to connection setup and connection read/write; -.br -ii) different access control mechanisms. -.br -Refer to your Xlib documentation for further details. -.cS -Eg. XP_OPEN_DIS=XlibOpaque.c -.cE -.LE -.H 3 "Pixel validation section" -This section defines a number of parameters that are used only when -generating known good image files. These are not intended to be modified -and need not be used when running the test suite. -They are only used in the development environment -at UniSoft when generating known good image files. -.H 2 "Clean configuration parameters" -The \s-1TET\s0 provides a scheme to execute a clean tool, which removes -previously built tests and object files. -.P -All clean configuration parameters are contained in a configuration file that -forms part of the \s-1TET\s0. -The file -.cS -$TET_ROOT/xtest/tetclean.cfg -.cE -contains all the parameters that are needed to clean the \*(xT. -.P -To save configuration effort, -we have arranged that the build and clean configuration files -may contain identical parameter settings. Both files are needed, -since the -.SM TET -requires both a default build and clean configuration file. -.P -Copy the build configuration file into the clean configuration file: -.cS -cd $TET_ROOT/xtest -cp tetbuild.cfg tetclean.cfg -.cE -.H 2 "System dependent source files" -This section describes source files and include files provided -in the \*(xT which contain data, -which you may need to edit to reflect the system under test. -.H 3 "Host address structures" -The file \fCxthost.c\fP -in the directory \fC$TET_ROOT/xtest/src/lib\fP -contains three items, which you may need to edit to reflect the system -under test. These are all related to the mechanisms provided by the X -server under test to add, get or remove hosts from the access control list. -These are only used in the tests -for those Xlib functions which use or modify the access control list. -.P -The host access control functions use the XHostAddress structure. You -should refer to the Xlib documentation for your system, to determine -the allowed formats for host addresses in an XHostAddress structure. -You may also find it helpful to refer to the X Window System Protocol -documentation supplied with the X server under test. The section -describing the ChangeHosts protocol request gives examples of host -address formats supported by many X servers. The symbols FamilyInternet, -FamilyDECnet, FamilyChaos and FamilyUname are defined on many systems -in the include files X.h and Xstreams.h. The X server under test is not -guaranteed to support these families, and may support families not -listed here. You should find out which families are supported for the X -server under test, by examining the header files supplied with your -system, and consulting the documentation supplied with the X server. -.P -Some default declarations are contained in the file, but there is no -guarantee that they will work correctly on your system. -.P -The three items are as follows: -.AL -.LI -You should ensure that there is a declaration for an -array xthosts[] of at least 5 XHostAddress structures containing -valid family,length,address triples. -.LI -You should ensure that there is a declaration for an -array xtbadhosts[] of at least 5 XHostAddress structures containing -invalid family,length,address triples. -You should ensure that there is a declaration for an array -xtbadhosts[] of at least 5 XHostAddress structures containing invalid -family,length,address triples. If you cannot use the supplied examples, -the simplest way to do this is to use an invalid family, which is not -supported by the X server under test, in each structure of the array. -.LI -You should ensure that there is a declaration for a -function samehost() that compares two XHostAddress structures -and returns True if they are equivalent. (It is unlikely that the sample -function will need modification - no systems requiring modification have -yet been identified). -.LE -.SK -.H 1 "Building the \s-1TET\s0" -The \*(xT -runs under the -Test Environment Toolkit -(\s-1TET\s0). -.P -This section of the User Guide tells you how to build and install the -supplied version of the -.SM TET . -.P -The following instructions assume the use of a Bourne shell. -.P -The \s-1PATH\s0 variable should have the directory \fC$TET_ROOT/xtest/bin\fP -prepended to it. -.cS -PATH=$TET_ROOT/xtest/bin:$PATH -export PATH -.cE -.H 2 "The portability library" -The current version of the \s-1TET\s0 used by the \*(xT -is designed to run on a -\s-1POSIX.1\s0 -system. -.P -Since many systems running the \*(xW -currently run on \s-1BSD\s0 based systems a portability library -that emulates the required routines using \s-1BSD\s0 facilities has -been provided. -.P -This library is not part of the \s-1TET\s0 itself. -.P -The portability library source is kept in \fC$TET_ROOT/port\fP. -.P -The portability library may be useful in porting the \*(xT to other -environments as described below. -Please refer to the "Release Notes for the \*(xT" -for details of the target execution environments, -and a list of systems to which it has already been ported. -.H 3 "Porting to a POSIX.1 system" -If your system conforms to -.SM POSIX.1 -and has an -.SM ANSI -Standard-C compiler then this library should not be built -and so this section can be skipped. -The exception is that \fCputenv()\fP may not exist on a -\s-1POSIX.1\s0\*F -.FS -IEEE Std 1003.1-1990, \fIPortable Operating System Interface for -Computer Environments\fR -.FE -system, however it is in the -\s-1SVID\s0\*F -.FS -System V Interface Definition, Issue 1, AT&T, Spring 1985. -.FE -and the -\s-1XPG\s0\*F, -.FS -\fIX/Open Portability Guide Issue 3, Volume 2: XSI System Interface and Headers\fR -.FE -so in practice most -.SM non- BSD -machines will have this function. -.H 3 "Porting to a BSD system" -If the system is a standard \s-1BSD\s0 one, -then the portability library can be used as it is; build -it as follows. -.cS -cd $TET_ROOT/port -pmake -.cE -.H 3 "Porting to other systems" -The portability -library may be useful as a base for porting the \s-1TET\s0 to other -.SM non- POSIX -systems, -however the portability library is designed to run on a \s-1BSD\s0 system, -and will not necessarily build without change on other systems. -.P -The following routines are emulated for use under a \s-1BSD\s0 system, -and these may be needed on other systems: -.cS -getcwd() getopt() putenv() sigaction() -sigaddset() sigdelset() sigemptyset() sigfillset() -sigismember() sigpending() sigprocmask() sigsuspend() -strchr() strcspn() strftime() strpbrk() strrchr() -strspn() strtok() toupper() upcase() -vsprintf() waitpid() -.cE -Only the features that are used by the \*(xT are emulated. -They are not meant to mimic completely the standard behaviour. -.P -There is also an include directory -.C $TET_ROOT/port/INC -that contains header files -that are required that are not found on a \s-1BSD\s0 system. -These files contain only items that are needed for the \*(xT, -they are not designed to replace completely the standard ones. -.P -To adapt the portability library to other systems, -the following hints may be found useful: -.BL -.LI -Examine the directory -.C $TET_ROOT/port/INC . -If the system already provides a standard conforming header file -of the same name -as one in the \s-1INC\s0 directory, then remove the version -from the \s-1INC\s0 directory. -.LI -The header files contain the bare minimum required to compile the -\*(xT, and use \s-1BSD\s0 features. -It may be necessary to alter them to suit the local system. -This applies particularly to -.C signal.h . -.LI -It may be necessary to add other header files. -.LI -In the library \fCMakefile\fP remove any function that is already provided by -the system in a standard conforming form. -.LI -Examine the code of the remaining functions to make -sure that they will work on the target system. -.LE -.P -.H 2 "Building libraries and utilities" -There is a top level Makefile which can be used to automatically perform -a number of the following steps. You should still check through the User Guide -and perform the steps which need to be done manually. In particular you -need to build -and install the test fonts as described in the section entitled -"Compiling and installing the test fonts". -.P -The top level Makefile enables the following steps to be performed: -.P -Building the \s-1TET\s0: -.AL -.LI -The Test Case Controller (TCC) -.LI -The API library -.LE -.P -Building the X test suite libraries and utilities: -.AL -.LI -Building the X test suite library -.LI -Building the X Protocol library -.LI -Building the X test fonts library -.LI -Building the mc utility -.LI -Building the blowup utility -.LE -.P -To use the top level Makefile, move to the top level directory: -.cS -cd $TET_ROOT -.cE -.P -Make the utilities and libraries with the command: -.cS -make -.cE -.H 2 "The Test Case Controller (TCC)" -Move to the directory containing the \s-1TCC\s0 source. -.cS -cd $TET_ROOT/tet/src/posix_c/tools -.cE -.P -Make the -.SM TCC -with the command: -.cS -pmake install -.cE -.P -Note: the supplied version of the \s-1TCC\s0 -assumes that the \fIcp\fP utility on your system supports recursive -copy using the option \fI-r\fP. There are two occurrences of \fIcp\fP in -the file \fCexec.c\fP which use this option. -.P -In the \*(xT, recursive copying is not required. -.P -If your system does not support this option, you can remove the use of -this option in the source code -before building the \s-1TCC\s0. If you do this you may -not be able to use the supplied \s-1TCC\s0 with other test suites. -.P -Alternatively, you can provide a shell script in the directory -\fC$TET_ROOT/xtest/bin\fP -which copies files using \fIcp\fP but ignores any option \fI-r\fP. -.H 2 "The \s-1API\s0 library" -Move to the -.SM API -library source directory. -.cS -cd $TET_ROOT/tet/src/posix_c/api -.cE -.P -Run the command -.cS -pmake install -.cE -which should produce the files \fClibapi.a\fP and the Test -Case Manager files \fCtcm.o\fP and \fCtcmchild.o\fP. -.H 1 "Building the X test suite libraries and utilities" -.H 2 "The X test suite library" -A library of common subroutines for the \*(xT -has source in \fC$TET_ROOT/xtest/src/lib\fP. -This is built automatically when building tests in the \*(xT. -Should it be required to build it separately for any reason -run the command. -.cS -cd $TET_ROOT/xtest/src/lib -pmake install -.cE -.P -The list of source files in this library is described in the -"Programmers Guide". -.H 2 "The X Protocol library" -A library of common subroutines for the \*(xP in the \*(xT -has source in \fC$TET_ROOT/xtest/src/libproto\fP. -This is built automatically when building tests in the \*(xT. -Should it be required to build it separately for any reason -run the command. -.cS -cd $TET_ROOT/xtest/src/libproto -pmake install -.cE -.P -The list of source files in this library is described in the -"Programmers Guide". -.H 2 "The X test fonts library" -A library of common subroutines defining the -characteristics of the test fonts for the \*(xT -has source in \fC$TET_ROOT/xtest/fonts\fP. -This is built automatically when building tests in the \*(xT. -Should it be required to build it separately for any reason -run the command. -.cS -cd $TET_ROOT/xtest/fonts -pmake install -.cE -.P -The list of source files in this library is described in the -"Programmers Guide". -.P -Note that the directory -\fC$TET_ROOT/xtest/fonts\fP also contains the test fonts themselves in -bdf format, which must be compiled and installed. Instructions for -performing these steps are included in the next section entitled -"Compiling and installing the test fonts". -.H 2 "Compiling and installing the test fonts" -The \*(xT contains a series of test fonts which are used -to test the correctness of the information returned by the graphics -functions in the \*(xW. This is done by comparing the information -returned by those functions with the expected font characteristics -which are compiled into the tests via the X test fonts library. -The X test fonts library is described in an earlier section of this document. -.P -There are seven test fonts whose descriptions are contained in the files -.cS -xtfont0.bdf xtfont1.bdf xtfont2.bdf -xtfont3.bdf xtfont4.bdf xtfont5.bdf -xtfont6.bdf -.cE -.P -These files are located in the directory \fC$TET_ROOT/xtest/fonts\fP. -.P -The manner in which fonts should be compiled and installed for any -particular X server is system dependent, and you should refer to -the instructions supplied with your release of the \*(xW for -details of how to do this. -.P -Some sample instructions are given here which may be useful on many -systems. These may not be appropriate for your system, or they may -need adaptation to work properly on your system and so are provided -only as a guide. -.AL -.LI -Move to the directory \fC$TET_ROOT/xtest/fonts\fP. -.cS -cd $TET_ROOT/xtest/fonts -.cE -.LI -Compile the seven \fCbdf\fP files into \fCsnf\fP, \fCpcf\fP, or \fCfb\fP -format, as appropriate for your system. -.cS -pmake comp_snf -.cE -or -.cS -pmake comp_pcf -.cE -or -.cS -pmake comp_dxpcf -.cE -or -.cS -pmake comp_fb -.cE -.LI -Copy the compiled fonts into the server font directory -(the \fCXTESTFONTDIR\fP configuration parameter). -.cS -pmake install_snf -.cE -or -.cS -pmake install_pcf -.cE -or -.cS -pmake install_dxpcf -.cE -or -.cS -pmake install_fb -.cE -.LE -.H 2 "Building the \fCmc\fP utility" -The -.C mc -utility is used to generate test set source files and Makefiles -from a template file, known as a dot-m file. -The file naming scheme is described further in appendix B. -The file formats are described further in the "Programmers Guide". -.P -The Makefiles and test set source files will be created using -.C mc -whenever test sets are built, if the dot-m file is found to be -newer than the source file or Makefile, or if these files do not -exist. -.P -Build -.C mc -and install in the xtest bin directory as follows. -.cS -cd $TET_ROOT/xtest/src/bin/mc -pmake install -cd $TET_ROOT/xtest/src/bin/mc/tmpl -pmake install -.cE -.H 2 "Building the blowup utility" -The blowup utility is required for examining any incorrect image files -generated by the X server during a test run. Instructions for running the -blowup program are given in the section entitled "Examining image files". -.P -Build -.C blowup -and install in the xtest bin directory as follows. -.cS -cd $TET_ROOT/xtest/src/pixval/blowup -pmake install -.cE -.SK -.H 1 "Building the tests" -.H 2 "Building tests using the \s-1TET\s0" -The entire \*(xT can be built by using the -build mode of the \s-1TCC\s0. In this mode, the build configuration -parameters in the file -.C $TET_ROOT/xtest/tetbuild.cfg -are used to build each test -set in the \*(xT separately. -.P -.cS -cd $TET_ROOT/xtest -tcc -b [ -s scenario_file ] [ -j journal_file ] [ -y string ] xtest all -.cE -.VL 5 0 -.LI \fC-b\fP -.br -This invokes the \s-1TCC\s0 in build mode. -(If you have just finished building the \s-1TCC\s0 from the \fCcsh\fP, -you will probably have to \fCrehash\fP to get \fCtcc\fP in your path.) -.LI "\fC-s scenario_file\fP" -.br -This option builds the test sets in the named scenario file. -The default is a file named \fCtet_scen\fP in the directory -\fC$TET_ROOT/xtest\fP. -For more details refer to the section entitled -"Building modified scenarios using the \s-1TET\s0". -.LI "\fC-j journal_file\fP" -.br -This option sends the output of the build to the named journal file. -The default is a file named \fCjournal\fP in a newly created sub-directory -of \fC$TET_ROOT/xtest/results\fP. Sub-directories are created with sequential -four digit numbers, with the -.SM TCC -flags (in this case "b") appended. -The \s-1TCC\s0 will exit if the specified journal file already exists, thus the -journal file should be renamed or removed -before attempting to execute the \s-1TCC\s0. -.LI "\fC-y string\fP" -.br -This option only builds tests which include the specified string in the -scenario file line. This may be used to build specific sections or individual -test sets. -.LI \fCxtest\fP -.br -This is the name of the test suite. -It determines the directory under $\s-1TET_ROOT\s0 -where the test suite is to be found. -.LI \fCall\fP -.br -This is the scenario name in the default scenario file -\fC$TET_ROOT/xtest/tet_scen\fP. -For more details refer to the section entitled -"Building modified scenarios using the \s-1TET\s0" -.LE -.P -This will execute the \s-1TET\s0 build tool in the \s-1TET\s0 configuration -variable -.SM TET_BUILD_TOOL -(which is normally pmake), -in each test set directory of the \*(xT. -.P -The journal file should be examined to verify -that the build process succeeded. -The report writer \fCrpt\fP cannot interpret the contents -of a journal file produced during the build process. -.P -Note: If the \s-1TCC\s0 -terminates due to receipt of a signal which -cannot be caught, the \s-1TCC\s0 -may leave lock files in the test source directories. Subsequent -attempts to restart the \s-1TCC\s0 may give error messages -saying that a lock file was encountered. At this point -\s-1TCC\s0 -may suspend the build. It may be -necessary to find and remove files or directories named \fCtet_lock\fP -before continuing. -.H 3 "Signal handling in the \s-1TET\s0" -An interrupt signal (caused for example by typing the -system interrupt character on the controlling terminal) -will cause the \s-1TCC\s0 to abort the currently executing test case. The -journal file output records the fact that the test case was interrupted. -.P -Any other signal which can be caught by the \s-1TCC\s0 causes it to terminate. -By default, the system suspend character will also cause the \s-1TCC\s0 -to terminate. If you wish to be able to suspend the \s-1TCC\s0, -you can add the relevant signals to the parameter SIG_LEAVE -in the Makefile for the \s-1TCC\s0. -Signals in this list will not be caught, but will cause their -default action. -This is explained further in the Test Environment Tookit Release Notes. -.H 2 "Building, executing and cleaning tests using the \s-1TET\s0" -Each test in the \*(xT may be built, executed and cleaned before -the next test set in the scenario. This mode of use has the advantage that -the entire \*(xT may be executed, without necessarily building all the -test sets in advance. This mode of use has the disadvantage that you will -need to rebuild a test set before rerunning, which will take -considerably longer than when it is built in advance. -.P -To do this, skip to the section entitled "Executing the \*(xT", -and refer to the instructions in the sub-section entitled -"Building, executing and cleaning tests using the \s-1TET\s0" -.H 2 "Building modified scenarios using the \s-1TET\s0" -.H 3 "Format of the scenario file" -The \s-1TET\s0 uses a scenario file to determine which test sets to build. -The file -\fC$TET_ROOT/xtest/tet_scen\fP -is the default scenario file. -The format is basically a scenario name starting in column one, -followed by list of test sets to be built (each starting beyond column one). -Only one scenario named "all" is provided in the default scenario file. -.P -The names of the test sets are given relative to the directory -$TET_ROOT/xtest, and must commence with a leading slash. -.H 3 "Modifying the scenario file" -The file -\fC$TET_ROOT/xtest/tet_scen\fP -may be modified by removing lines corresponding to test sets which are not -wanted. These will then simply not be built by the \s-1TCC\s0. -Alternatively, unwanted -lines may be commented out by placing \fC#\fP in column one of a line. -.P -It is recommended that the supplied scenario file should be saved if it is -modified. -.H 3 "Creating new scenario files" -A new scenario file may be created in the directory -\fC$TET_ROOT/xtest\fP. -The \s-1TCC\s0 will use this scenario file instead of the file -\fC$TET_ROOT/xtest/tet_scen\fP -if it is passed via the \fC-s\fP option. For example -.cS -cd $TET_ROOT/xtest -tcc -b -s scenario_file [ -j journal_file ] [ -y string ] xtest all -.cE -.H 2 "Building tests without using the \s-1TET\s0" -See section 11, entitled -"Building, executing and reporting tests without using the \s-1TET\s0". -.H 2 "Building tests in space-saving format" -It is possible to build the tests in the \*(xT such that -all the executable files in one section are links to a single -executable file. This normally allows a considerable reduction -in the disc space requirements for the \*(xT when fully built. -.P -Note that the names of the files built in space-saving format -are different to the names of the separate executable files -built using the instructions in previous sections. There is -nothing to prevent both sets of executables being built (although -there is no value in this, and unnecessary disc space will be consumed). -.H 3 "Building tests in space-saving format using the \s-1TET\s0" -Before reading this section, read the section entitled "Building -the tests using the \s-1TET\s0". This gives an explanation of the build mode -of the \s-1TET\s0, and the structure of scenario files. -.P -A scenario named \fClinkbuild\fP is provided in a scenario file -named \fClink_scen\fP in the directory -$TET_ROOT/xtest. -This enables the \s-1TCC\s0 to build the space-saving -executable files and create all the required links for each test set in -each section of the \*(xT. -The -y option allows a particular space-saving -executable for a single section to be built. -.P -Execute the command: -.cS -cd $TET_ROOT/xtest -tcc -b -s link_scen [ -j journal_file ] [ -y string ] xtest linkbuild -.cE -This command will execute the \s-1TET\s0 build tool in the \s-1TET\s0 configuration -variable -.SM TET_BUILD_TOOL -(which is normally pmake), -in the top level directory of each section of the test suite. -.H 3 "Building tests in space-saving format without using the \s-1TET\s0" -This section describes how to build the space-saving -executable files for a particular section of the -\*(xT directly without using the \s-1TET\s0. -.P -This can be simply done by calling pmake in the required directory. -For example, to build all the space-saving executable files for -section 5 of the \*(xT, execute the command: -.cS -cd $TET_ROOT/xtest/tset/CH05 -pmake -.cE -.SK -.H 1 "Executing the \*(xT" -Once you have built the \*(xT as described in the previous sections, -work through the following sections to execute the tests. -.H 2 "Setting up your X server" -The first step is to ensure that the X server to be tested is correctly set up. -.H 3 "Formal verification testing" -A number of the tests within the \*(xT can only give reliable results -if there is no window manager and no other clients making connections to -the X server. Thus, when conducting formal verification tests, there -should be no window manager and no other clients connected to the X server. -.P -It is recommended that you close down and restart your X server before -a formal verification test run, in order to ensure that results produced -are repeatable and are not affected by earlier tests, although this is -not strictly necessary. -.P -You should switch off the -screen saver if possible before starting formal verification tests. -This is because some X servers implement the screen saver in a way -which interferes with windows created by test suite clients, which may cause -misleading results. If the screen saver cannot be switched off, the -time interval should be set so large as to prevent interference with the tests. -.P -You should also ensure that access control is disabled for the server -under test, so that the test suite can make connections to the server. -Also (if the X server allows this) you should ensure that clients on the -host system (as specified in the build -configuration parameter -.SM XTESTHOST ) -can modify the access control list. -Some X servers support the -ac option which disables host-based access -control mechanisms. If this option is supported, you should use it. -.H 3 "Informal testing and debugging" -Although no guarantee can be made that the tests within the \*(xT will give -correct results if there are window managers and other clients connected -to the X server, it is still possible to run many tests satisfactorily. -.P -This section gives some guidelines which may be helpful in running tests -with a window manager present, and still deriving correct results. -The guidelines have been derived from the experience gained -during the development of the tests. -.P -Using these guidelines in connection with the instructions -in section 11, -entitled -"Building, executing and reporting tests without using the \s-1TET\s0", -gives a rapid means to investigate the results of particular tests in detail. -.P -.AL -.LI -Set XT_DEBUG_OVERRIDE_REDIRECT=Yes -in your execution configuration file. This is described in more detail in the -next section. -.LI -Do not raise any windows on top of those created by -running tests. -.LI -Avoid having any windows at position (0,0). Note that some window managers -such as \fCtvtwm\fP -create their own "root" window at position (0,0). -This mainly affects tests for section 8 of the X11R4 Xlib specifications. -.LI -Be prepared to lose the input focus when tests are running -and don't forcibly restore it. -This mainly affects tests for section 8 of the X11R4 Xlib specifications. -.LE -.H 2 "Execute configuration parameters" -The next step is to set up the execution configuration file. -.P -All execution configuration parameters are contained in -a configuration file that -forms part of the \s-1TET\s0. -This file should be edited to reflect the configuration of the X server -to be tested and the underlying operating system on which Xlib -is implemented. -The file -.cS -\fC$TET_ROOT/xtest/tetexec.cfg\fP -.cE -contains all the parameters that are needed to execute the \*(xT. -The parameters are grouped in eight sections within the configuration file. -.P -Numeric execution parameters may be specified in decimal, -octal, or hexadecimal. Octal values must be a sequence of octal digits -preceded by 0. Hexadecimal values must be a sequence of hexadecimal digits -preceded by 0x or 0X. -.H 3 "Configuration parameters defined by the \s-1TET\s0" -.VL 5 0 -.LI \s-1TET_EXEC_IN_PLACE\s0 -.br -Setting this variable to -.C False -indicates that files will be executed -in a temporary execution directory. -Use of a temporary execution directory for each test enables -parallel execution of the test suite against multiple servers. -.P -Setting this variable to -.C True -will give you improved performance if you are not attempting -parallel execution of the test suite against multiple servers. -.cS -Eg: TET_EXEC_IN_PLACE=False -.cE -.LI \s-1TET_SAVE_FILES\s0 -.br -This indicates which files generated during execution of -tests are to be saved for later examination. -This line should not be altered. -.cS -Eg. TET_SAVE_FILES=Err*.err,*.sav -.cE -.LE -.H 3 "Configuration Parameters for the \*(xT" -The following parameters are used in many places in the \*(xT. -These should be set to match the -X server to be tested and the underlying operating system on which Xlib -is implemented. -.VL 5 0 -.LI \s-1XT_DISPLAY\s0 -.br -This should be set to a display string that can be passed to XOpenDisplay, -to access the display under test. -It must include a screen; -all testing is done for a particular screen. -.cS -Eg: XT_DISPLAY=:0.0 -.cE -.LI \s-1XT_ALT_SCREEN\s0 -.br -If the display supports more than one screen, -this parameter should be set to the number of a screen -that is different from that incorporated in the XT_DISPLAY variable. -.br -Set to the string -.SM UNSUPPORTED -if only one screen is available. -.br -Note that this should be a screen number, not a display string that can -be passed to XOpenDisplay. -.cS -Eg: XT_ALT_SCREEN=1 -.cE -.LI \s-1XT_FONTPATH\s0 -.br -This should be set to a comma separated list that -is a valid font path for the X server. It should include at least -the components of the default font path for the X server, enabling the cursor -font to be accessed. -One of the components must be the directory -in which the test fonts were installed (see the section entitled "Compiling -and installing the test fonts"). -.P -This parameter will be used to set the font path for specific test purposes -which access the test fonts. The font path is restored on completion -of the specific test purposes. -.cS -Eg: \s-1XT_FONTPATH=/usr/lib/X11/fonts/xtest/,/usr/lib/X11/fonts/misc/\s0 -.cE -.LI \s-1XT_SPEEDFACTOR\s0 -.br -This is a speedfactor which should be set to reflect the relative delay -in response of the underlying operating system and X server combined. -Co-operating processes which -must synchronize allow a time delay in proportion to this speedfactor, to -account for scheduling delays in the underlying operating system and X server. -This should be set to a number greater than or equal to one. -There should be no need to change the default unless the round trip time to -the X server can be very long ( >15 seconds); -in this case set this parameter to a -value larger than the maximum round trip time divided by 3. -.cS -Eg: XT_SPEEDFACTOR=5 -.cE -.LI \s-1XT_RESET_DELAY\s0 -.br -Specifies a delay time in seconds. -Set this to be a time which is greater than or equal to the maximum time -required by your server to reset when the last client is closed. -The test suite pauses for this time whenever a connection is about to be -opened and the server may be resetting. -The server may be resetting when the test case is entered (in startup()) -as a result of closing the last connection in the previous test case. -The server also resets in a few places in the test for XCloseDisplay(). -.cS -Eg. XT_RESET_DELAY=1 -.cE -.LI \s-1XT_EXTENSIONS\s0 -.br -Specifies whether you wish to test the extended assertions -which require the XTEST extension. -Set this to Yes if the XTEST extension is available on your system, -and you have configured the test suite to use the XTEST extension, -and you want to execute these tests, otherwise set to No. -.br -.cS -Eg. XT_EXTENSIONS=No -.cE -.LE -.H 3 "Configuration parameters for specific tests" -The following parameters are used to control -one or more specific test purposes in the \*(xT. -These should be set to appropriate values for the X server to be tested. -.P -These parameters may cause temporary changes in the settings -of the X server under test (such as the font path). -Settings are restored on completion of the specific test purposes. -.VL 5 0 -.LI \s-1XT_VISUAL_CLASSES\s0 -.br -A space separated list of the visual classes that -are supported for the screen given by XT_DISPLAY. Each visual class -is followed by a list of depths at which the class is supported -(enclosed by brackets and separated by commas with no spaces). -Visual classes and depths that are supported only by other screens should -not be included. -.br -Note that this parameter is only used to check the correctness of the values -returned by XMatchVisualInfo and XGetVisualInfo. Other tests which loop -over visuals obtain the values by calling these functions. -.cS -Eg. XT_VISUAL_CLASSES=StaticGray(8) GrayScale(8) StaticColor(8) - PseudoColor(8) TrueColor(8) DirectColor(8) -\fR(This must be typed as one line.)\fP -.cE -.LI \s-1XT_FONTCURSOR_GOOD\s0 -.br -This specifies the number of a glyph in the -default cursor font known to exist. -.SM XT_FONTCURSOR_GOOD+2 -should also be a glyph in the -default cursor font. -Neither of these should be the same as the X server's default cursor. -.cS -Eg: XT_FONTCURSOR_GOOD=2 -.cE -.LI \s-1XT_FONTCURSOR_BAD\s0 -.br -This specifies the number of a glyph in the -default cursor font known not to exist. -If no such value exists, set to -.SM UNSUPPORTED . -.cS -Eg: XT_FONTCURSOR_BAD=9999 -.cE -.LI \s-1XT_FONTPATH_GOOD\s0 -.br -This should be set to a comma separated list that -is a valid font path for the X server. -It should -be different from XT_FONTPATH. It need not contain the -test fonts. -.cS -Eg: \s-1XT_FONTPATH_GOOD=/usr/lib/X11/fonts/100dpi/,/usr/lib/X11/fonts/75dpi/\s0 -.cE -.LI \s-1XT_FONTPATH_BAD\s0 -.br -This should be set to a comma separated list that -is an invalid font path for the X server. -If you cannot determine a suitable value, set to -.SM UNSUPPORTED . -There is no default value - by default, tests which use this parameter -will be reported as -.SM UNSUPPORTED . -.cS -Eg: XT_FONTPATH_BAD=/jfkdsjfksl -.cE -.LI \s-1XT_BAD_FONT_NAME\s0 -.br -This should be set to a non-existent font name. -.cS -XT_BAD_FONT_NAME=non-existent-font-name -.cE -.LI \s-1XT_GOOD_COLORNAME\s0 -.br -This should be set to the name of a colour -which exists in the colour database for the X server. -.cS -Eg: XT_GOOD_COLORNAME=red -.cE -.LI \s-1XT_BAD_COLORNAME\s0 -.br -This should be set to the name of a colour -which does not exist in the colour database for the X server. -.cS -Eg: XT_BAD_COLORNAME=nosuchcolour -.cE -.LI \s-1XT_DISPLAYMOTIONBUFFERSIZE\s0 -.br -This should be set to a non-zero value (the value -returned by XDisplayMotionBufferSize) if the X server supports a more complete -history of pointer motion than that provided by event notification, or -zero otherwise. The -more complete history is made available via the Xlib functions -XDisplayMotionBufferSize and XGetMotionEvents. -.cS -Eg: XT_DISPLAYMOTIONBUFFERSIZE=256 -.cE -.LE -.H 3 "Configuration parameters for Display functions" -The following parameters are used to control one or more test purposes for Xlib -Display functions which are in section 2 of the X11R4 Xlib specifications. -These should be set to match the display specified in the XT_DISPLAY parameter. -.P -Some of these parameters are specific to the particular screen of -the display under test. This is also specified in the XT_DISPLAY parameter. -.P -Settings to these parameters will not cause any change in the settings -of the X server under test. -.P -Suitable values for most of these parameters can be obtained from the -output of the X11 utility -.C xdpyinfo . -.VL 5 0 -.LI \s-1XT_SCREEN_COUNT\s0 -.br -This parameter should be set to the number of screens -available on the display as returned by XScreenCount. -.br -.cS -Eg: XT_SCREEN_COUNT=2 -.cE -.LI \s-1XT_PIXMAP_DEPTHS\s0 -.br -A space separated list of depths supported by the specified -screen of the display that can be used for pixmaps. -.cS -Eg: XT_PIXMAP_DEPTHS=1 8 -.cE -.LI \s-1XT_BLACK_PIXEL\s0 -.br -This parameter should be set to the black pixel value -of the specified screen of the display. -.cS -Eg: XT_BLACK_PIXEL=1 -.cE -.LI \s-1XT_WHITE_PIXEL\s0 -.br -This parameter should be set to the white pixel value -of the specified screen of the display. -.cS -Eg: XT_WHITE_PIXEL=0 -.cE -.LI \s-1XT_HEIGHT_MM\s0 -.br -This parameter should be set to the height in millimeters -of the specified screen of the display. -.cS -Eg: XT_HEIGHT_MM=254 -.cE -.LI \s-1XT_WIDTH_MM\s0 -.br -This parameter should be set to the width in millimeters -of the specified screen of the display. -.cS -Eg: XT_WIDTH_MM=325 -.cE -.LI \s-1XT_PROTOCOL_VERSION\s0 -.br -This should be set to the major version number (11) -of the X protocol as returned by XProtocolVersion. -.cS -Eg. XT_PROTOCOL_VERSION=11 -.cE -.LI \s-1XT_PROTOCOL_REVISION\s0 -.br -This should be set to the minor protocol -revision number as returned by XProtocolRevision. -.cS -Eg. XT_PROTOCOL_REVISION=0 -.cE -.LI \s-1XT_SERVER_VENDOR\s0 -.br -This should be set to the X server vendor string -as returned by XServerVendor. -.cS -Eg: XT_SERVER_VENDOR=MIT X Consortium -.cE -.LI \s-1XT_VENDOR_RELEASE\s0 -.br -This should be set to the X server vendor's release -number as returned by XVendorRelease. -.cS -Eg. XT_VENDOR_RELEASE=5000 -.cE -.LI \s-1XT_DOES_SAVE_UNDERS\s0 -.br -Set this to Yes if the specified screen of the display -supports save unders (indicated by XDoesSaveUnders returning True) -otherwise set to No. -.cS -Eg. XT_DOES_SAVE_UNDERS=Yes -.cE -.LI \s-1XT_DOES_BACKING_STORE\s0 -.br -Set this to the following value: -.br -0 - the specified screen supports backing store NotUseful -.br -1 - the specified screen supports backing store WhenMapped -.br -2 - the specified screen supports backing store Always -.br -The way the specified screen supports backing store is indicated by the -return value of XDoesBackingStore. -.cS -Eg. XT_DOES_BACKING_STORE=2 -.cE -.LE -.H 3 "Configuration parameters for connection tests" -The following parameters are used to control -one or more test purposes for XOpenDisplay, XCloseDisplay and -XConnectionNumber. -These should be set to match the display specified in the XT_DISPLAY parameter -and the characteristics of the underlying operating system. -.P -Settings to these parameters will not cause any change in the settings -of the X server under test. -.P -These parameters are not used when making connections to the -X server in other tests. -.VL 5 0 -.LI \s-1XT_POSIX_SYSTEM\s0 -.br -This may be set to Yes to indicate that the -underlying operating system is a POSIX system. If this parameter is -set to Yes, some extended assertions which describe implementation -dependent functionality will be tested assuming POSIX concepts. -.cS -Eg. XT_POSIX_SYSTEM=Yes -.cE -.LI \s-1XT_DECNET\s0 -.br -Set this to Yes if clients can connect to the X server under -test using DECnet. -This will be used (on a POSIX system) -in the tests for XOpenDisplay. -.cS -Eg. XT_DECNET=No -.cE -.LI \s-1XT_TCP\s0 -.br -Set this to Yes if clients can connect to the X server under -test using TCP streams. -This will be used (on a POSIX system) -in the tests for XOpenDisplay. -.cS -Eg. XT_TCP=Yes -.cE -.LI \s-1XT_DISPLAYHOST\s0 -.br -Set this to the hostname of the machine on which the display -is physically attached. This will be used instead of XT_DISPLAY -(on a POSIX system) -in the tests for XOpenDisplay which specifically test the hostname -component of the display name. -.P -Note that this may not be the same as the machine on which the -test suite clients execute (XTESTHOST). -.cS -Eg. XT_DISPLAYHOST=xdisplay.lcs.mit.edu -.cE -.LI \s-1XT_LOCAL\s0 -.br -Set this to Yes if clients can connect to a local X server -without passing a hostname to XOpenDisplay. -This will be used (on a POSIX system) -in the tests for XOpenDisplay. -This is usually the case when the X server under test is running on the -same platform as the \*(xT. -When a hostname is omitted, the Xlib implementation of XOpenDisplay -can use the fastest available transport mechanism to make local connections. -.cS -Eg. XT_LOCAL=No -.cE -.LE -.P -.H 3 "Configuration Parameters which do not affect test results" -There are a number of execution configuration parameters which can be used -to reduce the size of the journal file, or dump out more information from the -test suite. -They will not alter the behaviour of the tests or the test results. -.P -.VL 5 0 -.LI \s-1XT_SAVE_SERVER_IMAGE\s0 -.br -When set to Yes, -the image produced by the server -that is compared with the known good image is dumped to a file -with suffix ".sav" . -.cS -Eg: XT_SAVE_SERVER_IMAGE=Yes -.cE -.LI \s-1XT_OPTION_NO_CHECK\s0 -.br -This may be set to Yes to suppress the journal file -records containing -.SM CHECK -keywords. Refer to appendix D for -information on the contents of these messages. -.cS -Eg: XT_OPTION_NO_CHECK=Yes -.cE -.LI \s-1XT_OPTION_NO_TRACE\s0 -.br -This may be set to Yes to suppress the journal file -records containing -.SM TRACE -keywords. Refer to appendix D for -information on the contents of these messages. -.cS -Eg: XT_OPTION_NO_TRACE=Yes -.cE -.LE -.P -.H 3 "Configuration Parameters for debugging tests" -There are a number of execution configuration parameters which should -not be set when performing verification test runs. These are intended -for debugging purposes. These parameters may affect the behaviour of some test -purposes if they are set to assist debugging. -.P -.VL 5 0 -.LI \s-1XT_DEBUG\s0 -.br -This may be set to a debugging level. -A higher level produces more debugging output. Output is only -produced by the test suite at levels 1, 2 and 3. Setting -this variable to 0 produces no debug output, and 3 gives everything -possible (setting this variable to 3 can give an enormous volume of output -so you should not do this when running large numbers of test sets). -.cS -Eg: XT_DEBUG=0 -.cE -.LI \s-1XT_DEBUG_OVERRIDE_REDIRECT\s0 -.br -When set to -.C Yes , -windows are created with -override_redirect set. -This enables tests to be run more easily with a -window manager running on the same screen. -This should not be set to -.C Yes -for verification tests. -.cS -Eg: XT_DEBUG_OVERRIDE_REDIRECT=No -.cE -.LI \s-1XT_DEBUG_PAUSE_AFTER\s0 -.br -When set to -.C Yes , -the test pauses after each call to the Xlib -function being tested, until Carriage Return is entered. -This is useful to enable the results of -graphics operations to be observed. -This should not be set to -.C Yes -for verification tests. -.cS -Eg: XT_DEBUG_PAUSE_AFTER=No -.cE -.LI \s-1XT_DEBUG_PIXMAP_ONLY\s0 -.br -When set to -.C Yes , -tests which would normally loop over -both windows and pixmaps are restricted to loop over just pixmaps. -This is useful for speeding up the -execution of the test set. -This should not be set to -.C Yes -for verification tests. -.P -If -.SM XT_DEBUG_WINDOW_ONLY -is also set to -.C Yes , -some tests will report -.SM UNRESOLVED -due to the fact that nothing has been tested. -.cS -Eg: XT_DEBUG_PIXMAP_ONLY=No -.cE -.LI \s-1XT_DEBUG_WINDOW_ONLY\s0 -.br -When set to -.C Yes , -tests which would normally loop over -both windows and pixmaps are restricted to loop over just windows. -This is useful for speeding up the -execution of the test set. -This should not be set to -.C Yes -for verification tests. -.P -If -.SM XT_DEBUG_PIXMAP_ONLY -is also set to -.C Yes , -some tests will report -.SM UNRESOLVED -due to the fact that nothing has been tested. -.cS -Eg: XT_DEBUG_WINDOW_ONLY=No -.cE -.LI \s-1XT_DEBUG_DEFAULT_DEPTHS\s0 -.br -When set to -.C Yes , -tests which would normally loop over multiple -depths are restricted to test just the first visual returned by -XGetVisualInfo and/or the first pixmap depth returned by XListDepths -(depending on whether -.SM XT_DEBUG_PIXMAP_ONLY -or -.SM XT_DEBUG_WINDOW_ONLY -is also set). -This is useful for speeding up the -execution of the test set. -This should not be set to -.C Yes -for verification tests. -.P -Note that the first visual returned by XGetVisualInfo may not be the default -visual for the screen. -.cS -Eg: XT_DEBUG_DEFAULT_DEPTHS=No -.cE -.LI \s-1XT_DEBUG_VISUAL_IDS\s0 -.br -When set to a non-empty string, tests which would -normally loop over multiple depths are restricted to test just the -visuals ID's listed. Note that visual ID's for visuals on more than -one screen may be entered, but those used will depend on whether the test -being executed uses visuals on the default screen or alternate screen. -The visuals ID's should be entered in decimal, octal or hexadecimal -and separated with commas and with no intervening spaces. -This should not be set to a non-empty string for verification tests. -.cS -Eg. XT_DEBUG_VISUAL_IDS=0x22,0x24,0x27 -.cE -.LI \s-1XT_DEBUG_NO_PIXCHECK\s0 -.br -When set to -.C Yes , -tests -which would normally perform pixmap verification omit this (all other -processing is performed in those tests as normal). -Pixmap verification is a scheme which compares the image produced by the -X server with a known good image file which is part of the \*(xT (this is -described further in the section entitled "Examining Image Files"). -This should not be set to -.C Yes -for verification tests. -.cS -Eg: XT_DEBUG_NO_PIXCHECK=No -.cE -.LI \s-1XT_DEBUG_BYTE_SEX\s0 -.br -When set to -.SM NATIVE , -.SM REVERSE , -.SM MSB -or -.SM LSB , -the X Protocol tests will only be executed with the specified byte sex. -When set to -.SM BOTH , -the X Protocol tests make connections to the X server using -both the native and reversed byte sex. -.P -Note: The parameter should always be set to -.SM NATIVE -when the build configuration parameter -.SM XP_OPEN_DIS -was set to XlibOpaque.c -.cS -Eg: XT_DEBUG_BYTE_SEX=NATIVE -.cE -.LI \s-1XT_DEBUG_VISUAL_CHECK\s0 -.br -When set to a non-zero value, the X Protocol tests -will pause for the specified time interval (in seconds), to enable a visual -check to be performed on the displayed screen contents. -.cS -Eg: XT_DEBUG_VISUAL_CHECK=5 -.cE -.H 3 "Configuration Parameters used only during test development" -This section defines a number of parameters that are used only when -generating known good image files. These are not intended to be modified -and need not be used when running the test suite. -They are only used in the development environment -at UniSoft when generating known good image files. -.P -.VL 5 0 -.LI \s-1XT_FONTDIR\s0 -.br -The directory in which the xtest fonts are located -(before being installed). -This must be set such that appending a string gives a valid file name. -This is normally set to \fC$TET_ROOT/xtest/fonts/\fP. -.cS -Eg: XT_FONTDIR=/usr/mit/testsuite/xtest/fonts/ -.cE -.LE -.H 2 "Executing tests using the \s-1TET\s0" -The \*(xT is executed by invoking the execute mode of the Test Case -Controller. -.cS -cd $TET_ROOT/xtest -tcc -e [ -s scenario_file ] [ -j journal_file ] [ -x config_file ] - [ -y string ] xtest all -.cE -.VL 5 0 -.LI \fC-e\fP -.br -This invokes the \s-1TCC\s0 in execute mode. -.LI "\fC-s scenario_file\fP" -.br -This option executes the test sets in the named scenario file. -The default is a file named \fCtet_scen\fP in the directory -\fC$TET_ROOT/xtest\fP. -For more details refer to the section entitled -"Executing modified scenarios using the \s-1TET\s0". -.LI "\fC-j journal_file\fP" -.br -This option sends the test results to the named journal file. -The default is a file named \fCjournal\fP in a newly created sub-directory -of \fC$TET_ROOT/xtest/results\fP. Sub-directories are created with sequential -four digit numbers, with the -.SM TCC -flags (in this case "e") appended. -The \s-1TCC\s0 will exit if the specified journal file already exists, thus the -journal file should be renamed or removed -before attempting to execute the \s-1TCC\s0. -.LI "\fC-x config_file\fP" -.br -This is an option to run the test suite using the information in a -modified execution configuration file named -.C config_file . -The default is -.C tetexec.cfg . -.LI "\fC-y string\fP" -.br -This option only executes tests which include the specified string in the -scenario file line. This may be used to execute specific sections or individual -test sets. -.LI \fCxtest\fP -.br -This is the name of the test suite. -It determines the directory under $\s-1TET_ROOT\s0 -where the test suite is to be found. -.LI \fCall\fP -.br -This is the scenario name in the default scenario file -\fC$TET_ROOT/xtest/tet_scen\fP. -For more details refer to the section entitled -"Executing modified scenarios using the \s-1TET\s0". -.LE -.P -A journal file -will be produced. -More information on the contents of the journal file is given in -appendix C. -.P -Note: If the \s-1TCC\s0 -terminates due to receipt of a signal which -cannot be caught, the \s-1TCC\s0 -may leave lock files in the test source directories. Subsequent -attempts to restart the \s-1TCC\s0 may give error messages -saying that a lock file was encountered. At this point -\s-1TCC\s0 -may suspend the build. It may be -necessary to find and remove files or directories named \fCtet_lock\fP -before continuing. -.H 2 "Building, executing and cleaning tests using the \s-1TET\s0" -Each test in the \*(xT may be built, executed and cleaned before -the next test set in the scenario. This mode of use has the advantage that -the entire \*(xT may be executed without necessarily building all the -test sets in advance, thus ensuring disc space is conserved throughout. -This mode of use has the disadvantage that you will -need to rebuild a test set before rerunning, which will take -considerably longer than if it is built in advance. -.P -The \*(xT is built, executed and cleaned -by simultaneously invoking the build, execute and clean modes of the Test Case -Controller. -.cS -cd $TET_ROOT/xtest -tcc -bec [ -s scenario_file ] [ -j journal_file ] [ -x config_file ] - [ -y string ] xtest all -.cE -.VL 5 0 -.LI \fC-b\fP -This invokes the \s-1TCC\s0 in build mode. -.LI \fC-e\fP -This invokes the \s-1TCC\s0 in execute mode. -.LI \fC-c\fP -This invokes the \s-1TCC\s0 in clean mode. -.LE -.P -The other options are as described in the earlier section entitled -"Executing tests using the \s-1TET\s0". -.P -A journal file -will be produced. This contains for each test set in order the results of -the build, followed by the test results, followed by the results of the clean. -More information on the contents of the journal file is given in -appendix C. -.P -The default journal file is named \fCjournal\fP in a newly created sub-directory -of \fC$TET_ROOT/xtest/results\fP. Sub-directories are created with sequential -four digit numbers, with the -.SM TCC -flags (in this case "bec") appended. -.H 2 "Executing modified scenarios using the \s-1TET\s0" -.H 3 "Format of the scenario file" -The \s-1TET\s0 uses a scenario file to determine which test sets to execute. -The file -\fC$TET_ROOT/xtest/tet_scen\fP -is the default scenario file. -The format is basically a scenario name starting in column one, -followed by list of test sets to be executed (each starting beyond column one). -Only one scenario named "all" is provided in the default scenario file. -.P -The names of the test sets are given relative to the directory -$TET_ROOT/xtest, and must commence with a leading slash. -.H 3 "Modifying the scenario file" -The file -\fC$TET_ROOT/xtest/tet_scen\fP -may be modified by removing lines corresponding to test sets which are not -wanted. These will then simply not be executed by the \s-1TCC\s0. -Alternatively, unwanted -lines may be commented out by placing \fC#\fP at the start of the line. -.P -If you wish to execute just a subset of the test purposes in a test set, -refer to the section below entitled "Executing individual test purposes -using the \s-1TET\s0". -.P -It is recommended that the supplied scenario file should be saved if it is -modified. -.H 3 "Creating new scenario files" -A new scenario file may be created in the directory -\fC$TET_ROOT/xtest\fP. -The \s-1TCC\s0 will use this scenario file instead of the file -\fC$TET_ROOT/xtest/tet_scen\fP -if it is passed via the \fC-s\fP option. For example -.cS -cd $TET_ROOT/xtest -tcc -e -s scenario_file [ -j journal_file ] [ -x config_file ] - [ -y string ] xtest all -.cE -.H 2 "Executing individual test purposes using the \s-1TET\s0" -Each assertion in the \*(xT has separate test code which is known as a -test purpose. -We have arranged that each test purpose is also -a separately invocable component, -and that the invocable component number is identical -to the test purpose number. -.P -The expression within the braces -at the end of a line within a scenario file is an -invocable component list (or IC_list). -The default invocable component list \fCall\fP causes the -\s-1TCC\s0 to execute all invocable components in a test set. -.P -By altering the invocable component list for a test set, -particular invocable components of interest can be -executed. -.P -The invocable component list consists of one or more elements separated -by commas. Each element is either an invocable component number, -or a range of invocable component numbers separated by a dash. -.P -This is useful for quickly executing a particular test purpose of interest -for example: -.cS -/tset/CH05/stclpmsk/Test{3} -.cE -This is also useful for executing all test purposes except one known -to cause a system error. This may be useful if a particular test purpose -causes your X server to exit (at present the \s-1TET\s0 provides no high level -control facilities to conditionally cancel later test sets). -For example: -.cS -/tset/CH05/stclpmsk/Test{1-2,4-6} -.cE -.P -Note that the placement of windows used by the test suite may differ -when an earlier test purpose is not executed. It is intended that test -purposes produce the same results regardless of window placement. -.H 2 "Executing tests without using the \s-1TET\s0" -See section 11, entitled -"Building, executing and reporting tests without using the \s-1TET\s0". -.H 2 "Executing tests in space-saving format using the \s-1TET\s0" -Before reading this section, read the section entitled "Building -tests in space-saving format". -When you have built all the sections of the test suite in space-saving -format, you can execute all the tests in the test suite using -the instructions in this section. -.P -A scenario named \fClinkexec\fP is provided in a scenario file -named \fClink_scen\fP in the directory -$TET_ROOT/xtest. -This enables the \s-1TCC\s0 to execute the space-saving -executable files which have been built. -.P -Execute the command: -.cS -cd $TET_ROOT/xtest -tcc -e -s link_scen [ -j journal_file ] [ -x config_file ] - [ -y string ] xtest linkexec -.cE -.SK -.H 1 "Report writer" -A basic report writer -\fCrpt\fP -is included with the \*(xT. -It extracts and formats the main information from a -TET journal file produced by executing the \s-1TCC\s0 in execute -mode, or build-execute-clean mode. -It does not format the \s-1TET\s0 journal file produced by the -\s-1TCC\s0 in build only or clean only mode. -The main features of the \s-1TET\s0 journal file produced by the \s-1TCC\s0 in -execute or build-execute-clean mode are described in appendix\ C. -.P -Execute the report writer as follows: -.P -.cS -rpt [ -t ] [ -d ] [ -p ] [ -s ] [ -f file ] -.cE -With only the -f argument, \fCrpt\fP lists the results of each test purpose -for all test sets that appear in the journal file \fCfile\fP. -The default is the file named -.C journal -in the highest numbered subdirectory of the -.C $TET_ROOT/xtest/results -directory that has an 'e' suffix. -.P -The reason for any test result code which is other than PASS is printed out. -This is done by copying the test information messages of type REPORT. -For further details, see appendix D. -.P -A warning message is printed if a test information message of type REPORT -is given in a test purpose which produced a test result code PASS. -.P -The results for each test set are followed -by a summary of the number of test purposes in the test set -which produced each result code type. -.P -There is no overall summary list of results for all test sets in the journal -file. -.P -.VL 5 0 -.LI -t -.br -Test information messages of type TRACE in the test purposes -specified are printed. -For further details, see appendix D. -.LI -d -.br -Test information messages of type TRACE or DEBUG in the test purposes -specified are printed. -For further details, see appendix D. -.LI -p -.br -Output is restricted to omit reporting on test purposes that -resolve to \s-1PASS\s0, \s-1UNSUPPORTED\s0, \s-1UNTESTED\s0 -or \s-1NOTINUSE\s0 \*(EM thereby -reporting only tests showing possible errors. -.LI -s -.br -The result summaries after the end of each test set are omitted. -.LE -.SK -.H 1 "Examining image files" -.H 2 "Generating pixmap error files" -During the test run, discrepancies may be encountered between the image -displayed by the server and the known good image. The known good image -may have been obtained from a known good image file supplied with the -release, or it may have been determined analytically. -.P -Should a discrepancy be encountered, the test purpose -will give a result code of FAIL. The failure reason message will -name a pixmap error file in which is contained both the known good image and -the server image. -.P -A debug option has been provided, which skips any verification of the -image produced by the server with known good image files. This -is done by setting the execution configuration parameter -.SM XT_DEBUG_NO_PIXCHECK -to \fCYes\fP. -.H 2 "Pixmap error file naming scheme" -Each invocation of the -.SM TCC -creates a sub-directory -in \fC$TET_ROOT/xtest/results\fP. Sub-directories are created with sequential -four digit numbers, with the -.SM TCC -flags ("e" or "bec") appended. The default -.SM TET -journal is a file named -\fCjournal\fP created in this directory. -.P -Pixmap error files are stored in a directory tree created within the -newly created results sub-directory. So, for example, when the -line -.cS -/tset/CH06/drwln -.cE -is executed in a scenario file, pixmap error files might be produced -in a directory named -\fC$TET_ROOT/xtest/results/0001bec/tset/CH06/drwln\fP. -.P -The creation of a new results directory tree for each execution of the -.SM TCC -enables results to be obtained in parallel against multiple -X servers. -.P -Pixmap error files are named Err\fCnnnn\fP.err, -where \fCnnnn\fP -is a four digit number. This number does not -correspond to the number of the test purpose which caused the error. -.P -Note - when tests are executed without using the -.SM TCC -the error files are produced in the current directory. -.H 2 "Known good image file naming scheme" -All the required known good image files for the test programs in the -\*(xT (as supplied) have been created in advance. -The known good image files for each test program -are supplied in the \*(xT in the test set directory in which the dot-m -file is supplied. They are named a\fCnnn\fP.dat, where \fCnnn\fP is the -number of the test purpose for which the known good image file was generated. -.P -More details of the contents of this release are in appendix A. -.H 2 "Using blowup to view image files" -The contents of the two images in a pixmap error file -may be compared by using the blowup utility. -.P -Also, a known good image file may be viewed directly. -.P -The file formats of the error file and the known good image file are -the same. The blowup utility detects which file type is being viewed -by means of file name. For this reason, do not rename the -pixmap error or known good image files. -.H 3 "Blowup command" -The blowup utility may be used to view one or more pixmap error files or -known good image files as follows: -.P -.cS -blowup [-z zoom_factor] [-f font] [-d display] [-colour] file(s) -.cE -.VL 5 0 -.LI "\fC-z zoom_factor\fP" -.br -This option sets the magnification factor in all the blowup windows. -.LI "\fC-f font\fP" -.br -This option ensures that -.C font -is used rather than the default font. The default font is 6x10. -.LI "\fC-d display\fP" -.br -This option uses the display named -.C display -for the display windows. -.LI "\fC-colour\fP" -.br -On a colour display, this option will display different pixel -values in different colours corresponding to that server's colour table. -No attempt is made to preserve colours between different servers. -.LE -.H 3 "Blowup windows" -Two windows are created. The first is called Comparison, -and the second is called Blowup. -The Blowup window -shows a magnified version of a portion of the Comparison window, -which is indicated in the Comparison window by a rectangle. A user -interface menu is shown in the Blowup window. -.P -The title of the Comparison window will change to -"Server Data", then to "Pixval Data" and then back to "Comparison" -when the "B/G/Both" option on the menu is used. -.H 3 "Selection of a viewing region" -This may be done in one of three ways: -.AL -.LI -Click in the Comparison window. -.LI -Click in a square in the Blowup window. This becomes the new centre square -in that window. -.LI -Choose the "next error" option on the menu. The next pixel at which there -is a discrepancy will become the new centre square in the Blowup -window. -.LE -.H 3 "Information displayed" -The value stored in the centre pixel -and its coordinates are shown as the top items -in the menu. Under some circumstances, the expected pixel value will -be shown to the right of the actual value. -.H 3 "Display of errors" -When the "B/G/Both" option is set to Both, and the title of the Comparison -window is Comparison, -errors are displayed in two ways: one for each window. -.VL 5 0 -.LI -In the Comparison window pixels set to non-zero in the "good image" -but set incorrectly in the "server data" are shown as a cross (X). -.LI -In the blowup window these are shown as a white square with -a cross (X) through it. -.LI -In the Comparison window pixels set to zero in the "good image" -but set incorrectly in the "server data" are shown as shaded squares. -.LI -In the blowup window these are shown as a black square with -a white cross through it. -.LE -.P -The reason that we have proposed the two different methods of displaying errors -is as follows. One normally has a higher magnification in the Blowup -window and the use of a cross (X) through incorrect pixels -is good, and simple to remember -at this level of zoom. In the Comparison window -this style of display -does not work well at the lower magnification levels; all the crosses merge to -a blur so it is hard to see what type of error is being displayed. -.H 3 "Commands (via menu in the Blowup window)" -All of the commands are invoked by clicking the left mouse button when the -corresponding menu item is highlighted (inverted). The available commands are, -from top to bottom: -.VL 5 0 -.LI B/G/Both -.br -Show Bad (Server Data), Good (Pixval Data) or Both -(Comparison). Clicking in this advances around the -cycle -.ft C -.DS -Bad ----> Good -> Both - \------<------<----/ -.DE -.ft -The Comparison window's name changes to reflect the -current state. -.P -If a known good image file is being displayed then only the Good -option is available. A pixmap error file is required for this -command to be useful. -.LI color/mono -.br -Use colour/monochrome in the Blowup window. -.LI "next error" -.br -Advance centre pixel point to be next pixel at which there is a -discrepancy. -.LI "sub-zoom +" -.br -Zoom in (make bigger by zoomfactor) on the Blowup window -.LI "sub-zoom -" -.br -Zoom out (make smaller by zoomfactor) on the Blowup window -.LI "quit" -.br -Quit from the blowup utility. -.LI "big-zoom +" -.br -Zoom in (make bigger by zoomfactor) on the Comparison window -.LI "big-zoom -" -.br -Zoom out (make smaller by zoomfactor) on the Comparison window -.LI "next" -.br -View next file in the list. The Blowup window will -be removed and a new one created for each file. The -size, and zoom factor, of the Comparison window will -be preserved across files. -.LE -.SK -.H 1 "Cleaning the tests" -.H 2 "Cleaning tests using the \s-1TET\s0" -The entire \*(xT can be cleaned by using the -clean mode of the \s-1TCC\s0. In this mode, the clean configuration -parameters in the file -.C $TET_ROOT/xtest/tetclean.cfg -are used to clean each test -set in the \*(xT separately. Previously built test set executables -and object files are removed. -.P -.cS -cd $TET_ROOT/xtest -tcc -c [ -s scenario_file ] [ -j journal_file ] [ -y string ] xtest all -.cE -.VL 5 0 -.LI \fC-c\fP -.br -This invokes the \s-1TCC\s0 in clean mode. -.LI "\fC-s scenario_file\fP" -.br -This option cleans the test sets in the named scenario file. -The default is a file named \fCtet_scen\fP in the directory -\fC$TET_ROOT/xtest\fP. -For more details refer to the section entitled -"Cleaning modified scenarios using the \s-1TET\s0". -.LI "\fC-j journal_file\fP" -.br -This option sends the output of the clean to the named journal file. -The default is a file named \fCjournal\fP in a newly created sub-directory -of \fC$TET_ROOT/xtest/results\fP. Sub-directories are created with sequential -four digit numbers, with the -.SM TCC -flags (in this case "c") appended. -The \s-1TCC\s0 will exit if the specified journal file already exists, thus the -journal file should be renamed or removed -before attempting to execute the \s-1TCC\s0. -.LI "\fC-y string\fP" -.br -This option only cleans tests which include the specified string in the -scenario file line. This may be used to clean specific sections or individual -test sets. -.LI \fCxtest\fP -.br -This is the name of the test suite. -It determines the directory under $\s-1TET_ROOT\s0 -where the test suite is to be found. -.LI \fCall\fP -.br -This is the scenario name in the default scenario file -\fC$TET_ROOT/xtest/tet_scen\fP. -For more details refer to the section entitled -"Cleaning modified scenarios using the \s-1TET\s0". -.LE -.P -This will execute the \s-1TET\s0 clean tool in the \s-1TET\s0 configuration -variable -.SM TET_CLEAN_TOOL -(which is normally pclean), -in each test set directory of the \*(xT. -.P -The journal file should be examined to verify -that the clean process succeeded. -The report writer \fCrpt\fP cannot interpret the contents -of a journal file produced during the clean process. -.P -Note: If the \s-1TCC\s0 -terminates due to receipt of a signal which -cannot be caught, the \s-1TCC\s0 -may leave lock files in the test source directories. Subsequent -attempts to restart the \s-1TCC\s0 may give error messages -saying that a lock file was encountered. At this point -\s-1TCC\s0 -may suspend the build. It may be -necessary to find and remove files or directories named \fCtet_lock\fP -before continuing. -.H 2 "Cleaning modified scenarios using the \s-1TET\s0" -.H 3 "Format of the scenario file" -Refer to the earlier section "Building modified scenarios using the \s-1TET\s0". -.H 3 "Modifying the scenario file" -Refer to the earlier section "Building modified scenarios using the \s-1TET\s0". -.H 3 "Creating new scenario files" -A new scenario file may be created in the directory -\fC$TET_ROOT/xtest\fP. -The \s-1TCC\s0 will use this scenario file instead of the file -\fC$TET_ROOT/xtest/tet_scen\fP -if it is passed via the \fC-s\fP option. For example -.cS -cd $TET_ROOT/xtest -tcc -c -s scenario_file [ -j journal_file ] [ -y string ] xtest all -.cE -.H 2 "Cleaning tests without using the \s-1TET\s0" -See section 11, entitled -"Building, executing and reporting tests without using the \s-1TET\s0". -.H 2 "Cleaning tests built in space-saving format" -It is possible to clean the tests in the \*(xT which were -previously built in space-saving format. -.H 3 "Cleaning tests in space-saving format using the \s-1TET\s0" -A scenario named \fClinkbuild\fP is provided in a scenario file -named \fClink_scen\fP in the directory -$TET_ROOT/xtest. -This enables the \s-1TCC\s0 to clean the space-saving -executable files and remove all the required links for each test set in -each section of the \*(xT. -The -y option allows a particular space-saving -executable and its links for a single section to be removed. -.P -Execute the command: -.cS -cd $TET_ROOT/xtest -tcc -c -s link_scen [ -j journal_file ] [ -y string ] xtest linkbuild -.cE -This command will execute the \s-1TET\s0 clean tool in the \s-1TET\s0 configuration -variable -.SM TET_CLEAN_TOOL -(which is normally pclean), -in the top level directory of each section of the test suite. -.H 3 "Cleaning tests in space-saving format without using the \s-1TET\s0" -This section describes how to clean the space-saving -executable files for a particular section of the -\*(xT directly without using the \s-1TET\s0. -.P -This can be simply done by calling pclean in the required directory. -For example, to clean all the space-saving executable files for -section 5 of the \*(xT, execute the command: -.cS -cd $TET_ROOT/xtest/tset/CH05 -pclean -.cE -.SK -.H 1 "Building, executing and reporting tests without using the \s-1TET\s0" -.H 2 "Building tests" -An individual test set can be rebuilt -without the need to use the build mode of the \s-1TCC\s0. -This is done by executing \fCpmake\fP directly, rather than as a \s-1TET\s0 -build tool. -.P -This is a useful facility for building a single test set after a -previous build has failed. -.P -The build configuration parameters used by \fCpmake\fP -are obtained from a file named -$TET_BUILDCONFIG, or, if TET_BUILDCONFIG is not set in your environment, -from the file named $TET_ROOT/xtest/tetbuild.cfg. -.P -The \fCpmake\fP command should be executed in the directory containing the -source code for the test set which is to be rebuilt. For more details -of the names of the directories containing the source code -for the test sets, refer to appendix A. -.P -For example -.cS -cd $TET_ROOT/xtest/tset/CH05/stclpmsk -pmake -.cE -.P -No journal file is created when \fCpmake\fP is executed directly. -.P -The test set can also be rebuilt using the command -.cS -pmake Test -.cE -.P -If there is a macro version of the Xlib function, this may be rebuilt -using the command -.cS -pmake MTest -.cE -.H 2 "Executing tests" -An individual test set can be executed -without the need to use the execute mode of the \s-1TCC\s0. -This is done by executing a shell script \fCpt\fP. -.P -This is a useful facility for executing a single test set -repeatedly when investigating a particular test result. -.P -The execution configuration parameters used by \fCpt\fP -are obtained from a file named -$TET_CONFIG, or, if TET_CONFIG is not set in your environment, -from the file named $TET_ROOT/xtest/tetexec.cfg. -.P -The \fCpt\fP command is a shell -script, which attempts to execute the binary file named \fCTest\fP -in the current directory. If the file \fCTest\fP is not found, -the \fCpt\fP command attempts to execute the space-saving executable file -built in that directory. -.P -The \fCpt\fP command should be executed in the directory containing the -test set which has been built. -Unless you have manually installed the test set elsewhere, this will be -the directory containing the source code for the test set. For more details -of the names of the directories containing the source code -for the test sets, refer to appendix A. -.P -For example -.cS -cd $TET_ROOT/xtest/tset/CH05/stclpmsk -pt -.cE -.P -A \s-1TET\s0 results file is created when \fCpt\fP is executed directly. -This is a file named \fCtet_xres\fP located in the directory in which the -test was executed. -.P -There are a number of options which may be passed to \fCpt\fP which -alter the manner in which the test set is executed. -.P -Execute \fCpt\fP as follows: -.P -.cS -pt [ -v XT_VARIABLE_NAME ] [ -d display ] [-i IC_list ] [ -p ] [ -w ] - [ -P ] [ -D ] [ -x debug_level ] [ -g ] [ -m ] -.cE -.P -.VL 5 0 -.LI "-v XT_VARIABLE_NAME=Value" -.br -Modifies the value of the execution configuration parameter named -XT_VARIABLE_NAME, assigning it a value of \fCValue\fP. -.LI "-d display" -.br -Sets the display string to be used for the test. -.br -The default value is taken from the environment variable DISPLAY, -or, if this is not set, from the -execution configuration parameter XT_DISPLAY. -.LI "-i IC_list" -.br -The invocable components executed will be those specified -in IC_list. -.P -Each assertion in the \*(xT has separate test code, which is known as a -test purpose. -We have arranged that each test purpose is also -a separately invocable component, -and that the invocable component number is identical -to the test purpose number. -.P -The invocable component list consists of one or more elements separated -by commas. Each element is either an invocable component number -or a range of invocable component numbers separated by a dash. -.P -This is useful for quickly executing a particular test purpose of interest -for example: -.cS -pt -i 37 -.cE -This is also useful for executing all test purposes except one known -to cause a system error. -For example: -.cS -pt -i 1-36,38-57 -.cE -Note that the placement of windows used by the test suite may differ -when an earlier test purpose is not executed. It is intended that test -purposes produce the same results regardless of window placement. -.LI -p -.br -This option is equivalent to setting the -execution configuration parameter XT_DEBUG_PIXMAP_ONLY to Yes. -.LI -w -.br -This option is equivalent to setting the -execution configuration parameter XT_DEBUG_WINDOW_ONLY to Yes. -.LI -P -.br -This option is equivalent to setting the -execution configuration parameter XT_DEBUG_PAUSE_AFTER to Yes. -.LI -D -.br -This option is equivalent to setting the -execution configuration parameter XT_DEBUG_DEFAULT_DEPTHS to Yes. -.LI "-x debug_level" -.br -This option is equivalent to setting the -execution configuration parameter XT_DEBUG to \fCdebug_level\fP. -.LI -g -.br -The binary file \fCpvgen\fP will be executed instead of the binary -file \fCTest\fP. This option should not be used, since binary -files named \fCpvgen\fP -are only used in the development environment -at UniSoft when generating known good image files. -.LI -m -.br -The binary file \fCMTest\fP will be executed instead of the binary -file \fCTest\fP. Files named \fCMTest\fP contain tests for the -macro version of an Xlib function. -.LE -.P -Note that \fCpt\fP creates a temporary file -\fCCONFIG\fP in the current directory -containing the configuration parameters, so write permission is required -to this file (or if no file is there, to the current directory). -.P -Note also that the binary file \fCTest\fP creates a temporary -file \fC.tmpresfd\fP in the current directory -containing the configuration parameters, so write permission is required -to this file. -.H 2 "Reporting tests" -The \s-1TET\s0 results file produced for an individual test set can be formatted -using the basic report writer \fCrpt\fP, which is described in more detail -in the section entitled "Report writer". The argument \fC-f tet_xres\fP -formats the contents of the \fCtet_xres\fP file. -.P -For convenience, a separate report writer -\fCprp\fP -is provided, which is identical to -\fCrpt\fP, -except that the default file used is \fCtet_xres\fP -in the current directory. -.P -This is a useful facility for quickly formatting the -results from the execution of a test set, and looking at the summary -of the result codes for each test purpose executed. -.P -The \fCprp\fP command should be executed in the directory containing -the \s-1TET\s0 results file named \fCtet_xres\fP. -Unless you have manually installed and executed the -test set elsewhere, this will be the directory containing the source -code for the test set. For more details -of the names of the directories containing the source code -for the test sets, refer to appendix A. -.P -For example -.cS -cd $TET_ROOT/xtest/tset/CH05/stclpmsk -prp -.cE -.H 2 "Cleaning tests" -An individual test set can be cleaned -without the need to use the clean mode of the \s-1TCC\s0. -This is done by executing \fCpclean\fP directly, rather than as a \s-1TET\s0 -clean tool. -.P -The clean configuration parameters used by \fCpclean\fP -are obtained from a file named -$TET_CLEANCONFIG, or, if TET_CLEANCONFIG is not set in your environment, -from the file named $TET_ROOT/xtest/tetclean.cfg. -.P -The \fCpclean\fP command should be executed in the directory containing the -test set which was built. For more details -of the names of the directories containing the source code -for the test sets, refer to appendix A. -.P -For example -.cS -cd $TET_ROOT/xtest/tset/CH05/stclpmsk -pclean -.cE -.P -No journal file is created when \fCpclean\fP is executed directly. -.SK -.H 1 "Appendix A - Contents of \*(xR" -This section describes the contents of the directories in the \fCTET_ROOT\fP -directory which are supplied in -this release of the \*(xT. The revised \*(xT has been developed from the -T7 \*(xT. -This section therefore also explains how the arrangement of the -revised \*(xT compares with the T7 \*(xT. -.H 2 "tet" -.br -This contains the source files and include files needed to build -the Test Environment Toolkit (TET). The contents of the -subdirectories are as follows: -.H 3 "tet/src" -.br -This contains the source files for -the \s-1TET\s0. -.H 3 "tet/inc" -.br -This contains the include files for -the \s-1TET\s0. -.H 3 "tet/lib" -.br -This contains the libraries and object files when the -TET has been built. -.H 3 "tet/bin" -.br -This should be empty since the -TET utilities will be copied into -.C $TET_ROOT/xtest/bin , -rather than this directory, when using the modified -Makefiles supplied with the \s-1TET\s0. -.H 3 "tet/doc" -.br -This contains the release notes and man pages for -the \s-1TET\s0. -.H 3 "tet/demo" -.br -This contains a demonstration program for -the \s-1TET\s0. -.H 2 "xtest" -.br -This contains the tests included in the revised X test suite -which are stored as a complete \s-1TET\s0 test suite. This includes all -necessary configuration files and scenario files to enable you to use -the \s-1TET\s0 following the instructions in the documentation. -.H 2 "xtest/bin" -.br -This contains commands you will need to install, configure, build -and execute the \*(xT. -After installation, this directory -contains shell script commands. After configuration -and building the \*(xT, -this directory also contains executable programs built for your system. -.H 2 "xtest/doc" -.br -This contains the documentation. -It contains this user guide, the programmers guide and the release -notes. These are supplied in \fItroff(1)\fP format requiring the \fCmm\fP -macro package, and also in PostScript format. It also contains a -template for error -reports and a description of how to submit them. -.P -It also contains a file -.C paper.mm , -which is a copy of the file -.C Xproto_verf/doc/paper.ms -originally supplied in the T7 \*(xT, converted -to use the \fImm\fP macro package. -This file contains a paper entitled -"An Approach to Testing X Window System Servers at a Protocol Level". -.P -This is a technical paper, which defines in outline terms the areas -of the \*(xW server which should be tested at the X Protocol level -rather than the Xlib level. -.P -The approach recommended in this paper, and adopted in the design of the -T7 \*(xT, has been maintained in the revised \*(xT. The paper -explains the choice of test cases and division of tests between -the \*(xP and \*(xL. -.P -Before the revision of the \*(xT, UniSoft recommended that this paper should be -left "as is". As a result, some sections of this paper are out of date in -that they refer to development schedules for a -previous software development project, which have now been superseded with the -production of the revised \*(xT. -.H 2 "xtest/fonts" -.br -This contains test fonts which should be installed using the instructions -in this user guide. It also contains a software library describing the -fonts which is used by the tests for text drawing. -.H 2 "xtest/include" -.br -This contains include files for the software in the xtest/src and xtest/tset -directories. -.H 2 "xtest/lib" -.br -This contains libraries and other common software which are used by the -tests in the xtest/tset directory. The libraries are built using the -instructions in this user guide. -.H 2 "xtest/results" -.br -This is an empty directory which is used by the \s-1TET\s0 to store journal -files produced when executing the \*(xT. -.H 2 "xtest/src" -.br -This contains the source for the libraries and utilities. These are -built using the instructions in this user guide. -.H 2 "xtest/tset" -.br -This contains the source for the tests for sections 2 to 10 of the -X11R4 Xlib specifications, in directories CH02 to CH10. -These are -built using the instructions in this user guide. -In the rest of this document, these -are refered to as the "\*(xL". -.P -Each of the directories CH02 to CH10 contains further subdirectories -which are known as test set directories. -Each of these contain all the test code for a single Xlib function. -The name of the directory is derived from the name of the Xlib -function by a scheme which is described in appendix B. -.P -So, for example for -.C XSetClipMask -we have the following: -.cS -tset/CH05/stclpmsk -tset/CH05/stclpmsk/stclpmsk.m -.cE -.P -The file -.C stclpmsk.m -is the source file, which is also known as a dot-m file. -The format of the dot-m file is described further in the "Programmers Guide". -.P -The \*(xL are designed to accomplish the following: -.P -.AL -.LI -Test the ability of the Xlib function to behave as specified in the X11R4 -Xlib specifications, in situations where no X Protocol error should -be generated. This is tested by a series of separate tests known, -as "test purposes", each of which is designed to test a single statement -in the Xlib specifications. The statement which is tested is contained -in an "assertion", which is also contained in the dot-m file, and -precedes the test code for that test purpose. -.LI -Test the ability of the Xlib function to produce the expected X Protocol -errors in specified situations. This is tested in further test purposes, -each preceded in the dot-m file -by an assertion describing the situation which should produce the error. -.LE -.H 2 "xtest/tset/XPROTO" -.br -This contains the source for the touch tests for the X Protocol (version 11). -These are -built using the instructions in this user guide. -In the rest of this document, these -are refered to as the "\*(xP". -.P -These tests were in a separate test suite in the T7 \*(xT, which was -located in a directory Xproto_verf. This included -separate documentation, drivers, parameter files, include files and libraries. -In the revised \*(xT, the directory XPROTO only contains the source of -the tests - the other items are integrated within the \*(xT as described -in this user guide. -.P -The directory XPROTO contains further subdirectories -which are known as test set directories. -The structure of test set directories is exactly as for the \*(xL, -described in the previous section. -.P -The \*(xP tests are designed to accomplish the following: -.P -.AL -.LI -Test the ability of the \*(xW server to accept all legal message types and -respond appropriately. -.LI -Ensure that the server capabilities which Xlib testing depends on -work in the simplest cases. -.LI -Test that the X server adheres to the canonical byte stream of the X Protocol, -independent of the host byte sex or compiler structure packing. -.LE -.P -For further details of the choice of test cases and division of tests between -the \*(xP and \*(xL, refer to the document entitled -"An Approach to Testing X Window System Servers at a Protocol Level" -contained in file xtest/doc/paper.mm. -.SK -.H 1 "Appendix B - File naming scheme" -A file naming scheme has been devised which -is for naming the directories containing dot-m files -and the dot-m files themselves. -.P -The file naming scheme converts from an -\*(xW name to an abbreviated name. This is done as follows: -.DL -.LI -Remove leading X. -.LI -Replace: -.DS - Background -> Bg - Subwindow -> Sbwn - String -> Str - Window -> Wdw -.DE -.LI -Remove all lowercase vowels aeiou. -.LI -Truncate to 10 chars. -We have already checked that -truncation to ten characters still gives uniqueness. -.LI -If the string before truncation ended in "16" then force truncated - string to end in "16". -.LI -convert to lowercase. -.LI -add ".m" suffix to get name of source file containing C code, assertions - and strategies. -.LE -.SK -.H 1 "Appendix C - Format of the \s-1TET\s0 journal file" -This appendix describes the manner in which the \*(xT uses -some of the \s-1TET\s0 journal file facilities. The format of the \s-1TET\s0 -journal file is not fully described here - only the main features used by the -\*(xT are described. -In a future release of the \*(xT the format is expected to -be described fully in the \s-1TET\s0 documentation. -.P -Journal files are produced by the -\s-1TCC\s0 -during the build and execute stages. -.P -The journal file produced during the execute stage contains two basic sections: -.AL -.LI -Details of the configuration parameters and environment in which the -tests were executed. This may also be preceded by build configuration -parameters and/or followed by clean configuration parameters, if the -.SM TCC -was invoked in build-execute-clean mode. -.LI -Details of the test results. -This includes the test result -codes and test information messages output by the test suite. -.LE -.P -Each line in the second section of a journal file -is made up from three components separated by a vertical bar: -.AL -.LI -Message type. There is a unique numeric code for each message -type which is always the first field on a line. -.LI -Message parameters. These contain serial number and similar -information. -.LI -Message area. The format of this area is specific to the -Message Type. -.LE -.P -An example of the second section is as follows: -.cS -10|53 /tset/CH02/vndrrls/vndrrls 13:41:12|TC Start, scenario ref 85-1, ICs {all} -15|53 1.9 1|TCM Start -520|53 0 7457 1 1|TRACE:NAME: XVendorRelease -400|53 1 1 13:41:14|IC Start -200|53 1 13:41:14|TP Start -520|53 1 7457 1 1|REPORT:XVendorRelease() returned 5000 instead of 1. -220|53 1 1 13:41:14|FAIL -410|53 1 1 13:41:14|IC End -80|53 0 13:41:15|TC End -.cE -This consists of a block of information -for each test set executed which contains the following -lines: -.AL -.LI -Message Type 10 - Test Case Start (TC Start) -.br -A single message indicating that the Test Case Controller (the part of the -\s-1TET\s0 which executes test sets) is about to execute a test set. -This also indicates the start of the results for this -test set (which in \s-1TET\s0 terminology is known as a test case). -This line indicates the name of the test set -obtained from the scenario file. -.LI -Message Type 15 - Test Case Manager Start (TCM Start) -.br -A single message indicating that the Test Case Manager (the part of the -\s-1TET\s0 which calls the test purposes) has started executing. -.LI -Each assertion in the \*(xT has separate test code, which is known as a -test purpose. -We have arranged that each test purpose is also -a separately invocable component, -and that the invocable component number is identical -to the test purpose number. -For each test purpose these -lines follow: -.AL -.LI -Message Type 400 - Invocable Component Start (IC Start) -.br -The second field of the Message Parameters gives the IC number. -.LI -Message Type 200 - Test Purpose Start (TP Start) -.br -The second field of the Message Parameters gives the -number of the test purpose within the test set. -.LI -Message Type 520 - Test Case Information -.br -The second field of the Message Parameters gives the -number of the test purpose within the test set. -.br -The Message Area contains a text message output by the \*(xT - -the possible types of message are described further in -appendix D -"Interpreting test results" in the section entitled -"Test information messages". -.LI -Message Type 220 - Test Purpose Result -.br -The second field of the Message Parameters gives the -number of the test purpose within the test set. -.br -The Message Area contains the test result code - the possible -test result codes are described further in appendix D -"Interpreting test results" in the section entitled -"Test result codes". -.LI -Message Type 410 - Invocable Component End (IC End) -.br -The second field of the Message Parameters gives the IC number. -.LE -.LI -Message Type 80 - Test Case End (TC End) -.br -A single message indicating the end of the results for this -test set (which in \s-1TET\s0 terminology is known as a test case). -.LE -.SK -.H 1 "Appendix D - Interpreting test results" -This section includes information describing the significance -of the test result codes and the accompanying -test information messages that may appear in a \s-1TET\s0 journal file. -.H 2 "Categorisation of assertions" -The test result codes which are output for each test purpose -are dependent on the category of the assertion. -.P -The model for the categorisation of assertions -which is used in the \*(xT is described in POSIX.3. -.P -There are four categories of assertions described by POSIX.3 which are -designated A, B, C and D. -.P -If the assertion tests a conditional feature, it is categorised as type -C or D, otherwise it is categorised as type A or B. -.P -If the assertion is classified as an "extended assertion", -it is categorised as type -B or D. Otherwise it is categorised -as type A or C and is known as a "base assertion". -.P -Tests are always required for base assertions. Tests are not required -for extended assertions, but should be provided if possible. -There are a number of "extended assertions" for which tests have -been written in the \*(xT. -Extended assertions are used to describe features that may be difficult -to test conclusively. -.P -.TS -center box; -c | c | c. - Base Assertion Extended Assertion -_ -Required Feature A B -_ -Conditional Feature C D -.TE -.H 2 "Test result codes" -The following test result codes may be found within the \s-1TET\s0 journal -file. These will be found in Test Purpose Result lines with Message Type 220 -(described in appendix C). -.P -The reason for any -result codes -.SM NORESULT , -.SM UNRESOLVED -and -.SM UNINITIATED -should be determined and resolved. -.VL 15 0 -.LI \s-1PASS\s0 -The implementation passed the test for the corresponding assertion. -.LI \s-1FAIL\s0 -The implementation failed the test for the corresponding assertion. -.LI \s-1UNRESOLVED\s0 -The test for the corresponding assertion commenced, but was -unable to establish the required conditions to complete all -required stages of the test. -The reasons for this should be investigated -and if necessary the test rerun. -.P -In some tests, reliance is made on the successful behaviour of another -area of the \*(xW. Where this reliance is made, and that area of -the \*(xW does not behave as expected, a result code -.SM UNRESOLVED -may occur. The test information messages -should indicate the area of the underlying problem. It may be -necessary to look at the test results for that area -first and investigate and resolve the underlying problem -before re-running the -.SM UNRESOLVED -tests. -.P -Tests which give a result code of UNRESOLVED and the message "Path check error" -normally contain programming errors. The test reached the point at which a PASS -result would be assigned, but the number of check points passed -in executing the test code differs from the expected number. -.P -Tests which give a result code of UNRESOLVED and the message -"No CHECK marks encountered" -may be due to programming errors. -The test reached the point at which a PASS -result would be assigned, but no check points had been passed. -This can also occur when you execute the tests using debug options. -For example, the message occurs -when you execute tests which normally loop over windows -and pixmaps and set -.SM XT_DEBUG_PIXMAP_ONLY=Yes -or -.SM XT_DEBUG_WINDOW_ONLY=Yes -or -.SM XT_DEBUG_DEFAULT_DEPTHS=Yes -or -.SM XT_DEBUG_VISUAL_IDS=Yes . -.LI \s-1NOTINUSE\s0 -Although there is an assertion within the test set, there is no -specific test provided for the assertion. This might be because -the assertion is tested adequately as part of the test for another -assertion, or because the assertion has been automatically included -into a test set in which it is not applicable. -.P -In either case, tests which report the result code NOTINUSE do not -need to be investigated further. -.LI \s-1UNSUPPORTED\s0 -This result code may only be used for assertions in category C or D -(conditional assertions). -.P -The implementation does not support some optional feature of -the \*(xW, which is needed to test the -corresponding assertion. In this case, the assertion will normally -make clear what optional feature is required, and there will be -an accompanying test information message describing the feature -which was found to be unsupported. -.LI \s-1UNTESTED\s0 -This result code may only be used for assertions in category B or D -(extended assertions). -.P -The implementation could not be conclusively tested to determine -the truth of the corresponding assertion. -.P -Note that this does not mean that no testing was performed -in the \*(xT. There are a number of "extended assertions" -for which we have provided tests where possible (to test some likely -problem areas, for example). -.LI \s-1UNINITIATED\s0 -The test for the corresponding assertion could not commence due to -a problem in an earlier test purpose or an initialisation routine. -.P -Tests which produce this result code should be resolved as for -those reporting -.SM UNRESOLVED . -.LI \s-1NORESULT\s0 -Each test purpose should output a test result code before -completing. -This special result code will be inserted by the \s-1TET\s0 in the journal -file, if the test purpose -did not output a test result code. This indicates -a major fault during the execution of the test set -which should be investigated. -.LI \s-1WARNING\s0 -The implementation passed the test for the corresponding assertion. -Whilst the behaviour of the implementation was found to be -acceptable, -it behaves in a manner which is not recommended in the -X11 specification -on which the assertion is based. -.LI \s-1FIP\s0 -The contents of the journal file must be examined by hand -to determine whether the -implementation passed the test for the corresponding assertion. -This is used for testing functions which produce -output whose correctness cannot be easily determined automatically -by the test suite. -.LE -.H 2 "Test information messages" -There are four types of test information messages which are output -by the \*(xT. Each one results in a \s-1TET\s0 journal file line -with Message Type "Test Case Information" (520), and with -the Message Area beginning with one of the following keywords: -.VL 15 0 -.LI \s-1REPORT\s0 -This keyword is used to report -the reason for any test result codes whch are other than -.SM PASS . -A warning message is printed by the report -writer \fCrpt\fP, if a test information message of type -.SM REPORT -is given in a test purpose which produced a test result code -.SM PASS . -.LI \s-1CHECK\s0 -This keyword is used to record the passing of a particular -checkpoint in the test suite code. These messages contain -the checkpoint number within the test purpose, and the line -number within the source code. -.P -These messages are not output -to the journal file if the execution configuration parameter -.SM XT_OPTION_NO_CHECK -is set to Yes. -This option can reduce the size -of the journal file considerably. -.LI \s-1TRACE\s0 -This keyword is used for any messages describing the state of the -test being executed which are not failure messages. -.P -When running the \*(xP, messages with this keyword are output to -the journal file, to -describe briefly the interaction between the X server and the test program. -.P -These messages are not output -to the journal file, if the execution configuration parameter -.SM XT_OPTION_NO_TRACE -is set to Yes. -This option can reduce the size -of the journal file considerably. -.LI \s-1DEBUG\s0 -This keyword is used for debug messages -inserted during the development of the \*(xT. -.P -When running the \*(xP, messages with this keyword -are output to the journal file, when the debug level is greater than zero, to -describe in detail the interaction between the X server and the test program. -This includes the contents of requests, replies and events. -.P -This is output if the value of the -execution configuration parameter -.SM XT_DEBUG -is greater than or equal to the level of the debug message. -.SM XT_DEBUG -may be set from 0 to 3. -.LE -.SK -.H 1 "Appendix E - Outline of Test Environment Toolkit" -The "Test Environment Toolkit" -is a software tool developed by X/Open\*F, -.FS -X/Open is a trademark of the X/Open Company, Ltd. in the U.K. and -other countries. -.FE -UNIX International (UI)\*F, -.FS -UI is a trademark of UNIX International. -.FE -and the Open Software Foundation (OSF)\*F. -.FS -Open Software Foundation, OSF and OSF/1 -are trademarks of the Open Software Foundation, Inc. -.FE -The project which produced this software and the -associated interface specifications was also known as Project Phoenix. -.P -The \s-1TET\s0 consists of a user interface program known as the Test Case -Controller (\s-1TCC\s0). This enables test software to be built and executed. -The \s-1TCC\s0 uses configuration files to specify the environment -for both the build and execute operations. The \s-1TCC\s0 also uses a -scenario file to control which tests to build or execute. -.P -The \s-1TCC\s0 produces a journal file which is intended to -be formated by a test suite specific report writing program. -.P -The \s-1TET\s0 also includes an Application Programming Interface (API) -Part of the API is the Test Case Manager (TCM). -This includes a -.B main() -function which calls user supplied test functions. -The -API also includes a library of functions to manage the test -functions and perform output operations to the journal file -in a structured fashion. -.P -Since the developers of the \s-1TET\s0 have indicated a commitment to -develop software test suites that execute within this -environment, the \s-1TET\s0 can be seen as an emerging de facto standard -environment for test suite execution. -.P -During stage one of the \*(xT development project we -identified that the \s-1TET\s0 provides features which are -required by the revised test suite. -.P -For this reason we have developed the revised test suite -within the \s-1TET\s0 environment, -and supplied a copy of the \s-1TET\s0 with the revised test suite. -.P -Release 1.9 of the \s-1TET\s0 was issued by the -developers during March 1992, -and is included in this release of the \*(xT. -The software is complete -in that the functionality is stable and the implementation -agrees with the \s-1TET\s0 specification. -Documentation including -release notes and -\fCman\fP pages for the \s-1TET\s0 utilities, are included in -this release of the \*(xT. -However, this release does not contain a Programmers Guide or Users Guide. -These are under development by UNIX International, -but are not complete at the time of this -release, and so are not part of the current version of the \s-1TET\s0. -.SK -.H 1 "Appendix F - Glossary" -.VL 4 0 -.LI "assertion" -.br -A statement of functionality for an -.I element -of the \*(xW, -phrased such that it will be -.B true -for a system conforming to the \*(xW specifications. -An example would be a -.I "test description" -phrased according to the requirements of POSIX.3. -.LI "assertion test" -.br -Synonymous with -.IR "test purpose" . -.LI "base assertion" -.br -An -.I assertion -for which a test suite must provide an -.IR "assertion test" . -Every assertion that is not an extended assertion is a base assertion. -.LI "element" -.br -A particular \*(xW interface -such as an Xlib function, header file or X11 Procotol. -.LI "extended assertion" -.br -An -.I assertion -for which a test suite is not required to provide an -.IR "assertion test" . -An -.I "assertion test" -should still be provided if possible. -.P -Reasons why a test suite is not required to provide a test are given in -appendix A of the Programmers Guide. -.LI "POSIX.1" -.br -Part one of the IEEE POSIX 1003 standards, the document\(dg -entitled -\fISystem Application Program Interface (API) [C language]\fR. -Also known as P1003.1. -.LI "POSIX.3" -.br -Part three of the IEEE POSIX 1003 standards, the document\(dg -.FS \(dg -Obtainable from Publication Sales, IEEE\ Service\ Center, P.O.\ Box\ 1331, -445\ Hoes\ Lane, Piscataway, NJ\ 08854-1331, (201)\ 981-0060 -.FE -entitled -\fITest Methods for Measuring Conformance to POSIX\fR. -Also known as P1003.3. -.LI "Project Phoenix" -.br -Synonymous with -.SM TET . -.LI SVID -.br -System V Interface Definition. -.LI TCC -.br -The Test Case Controller. This is part of the -.SM TET . -This is a user interface program which enables the test software to be -executed. See appendix E for more details. -.LI TCM -.br -The Test Case Manager. This is part of the -.SM TET . -This is an object file containing a -.B main() -function which calls user supplied test functions. -See appendix E for more details. -.LI "TET" -.br -The "Test Environment Toolkit". This is a software tool which provides a -framework within which tests may be developed and executed. -More information is given in appendix E. -.LI "test case" -.br -Synonymous with -.IR "test set". -.LI "test description" -.br -The description of a particular test -to be performed on an -.IR element . -This is presented in functional terms and -describes precisely what aspect of the \*(xW is to be tested for that -.I element . -An -.I assertion -is an example of a -.IR "test description" , -but the reverse is not the case. -.LI "test program" -.br -Synonymous with -.IR "test set" . -.LI "test purpose" -.br -The software which tests the conformance of an implementation of the \*(xW -to an -.IR assertion . -.LI "test set" -.br -The software containing all the -.I "test purposes" -for an -.IR "element" . -.LI "test strategy" -.br -A description of the design and method used to implement a -.IR "test purpose" . -This should say how a -.I "test purpose" -is implemented rather than what feature is being tested. -.LI XPG -.br -The X/Open Portability Guide. -.LI "\*(xL" -.br -These are the tests for sections 2 to 10 of the -X11R4 Xlib specifications. -They are stored in subdirectories of the directories \fCCH02\fP to \fCCH10\fP -(which are to be found in the directory \fC$TET_ROOT/xtest/tset\fP). -.LI "\*(xP" -.br -These are the touch tests for the X Protocol (version 11). -They are stored in subdirectories of the directory \fCXPROTO\fP -(which is to be found in the directory \fC$TET_ROOT/xtest/tset\fP). -.LE -.TC Index: xc/doc/specs/xfs/FSlib.doc diff -u xc/doc/specs/xfs/FSlib.doc:1.1.1.2 xc/doc/specs/xfs/FSlib.doc:1.2 --- xc/doc/specs/xfs/FSlib.doc:1.1.1.2 Tue Jan 16 17:03:50 2001 +++ xc/doc/specs/xfs/FSlib.doc Mon Jan 9 09:56:38 2006 @@ -1,4 +1,4 @@ -$Xorg: FSlib.doc,v 1.3 2000/08/17 19:42:50 cpqbld Exp $ +$XFree86: xc/doc/specs/xfs/FSlib.doc,v 1.2 2006/01/09 14:56:38 dawes Exp $ Protocol requests Index: xc/doc/specs/xfs/Imakefile diff -u xc/doc/specs/xfs/Imakefile:1.2 xc/doc/specs/xfs/Imakefile:1.3 --- xc/doc/specs/xfs/Imakefile:1.2 Mon Apr 23 11:53:59 2001 +++ xc/doc/specs/xfs/Imakefile Mon Jan 9 09:56:38 2006 @@ -1,5 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:50 cpqbld Exp $ -XCOMM $XFree86: xc/doc/specs/xfs/Imakefile,v 1.2 2001/04/23 15:53:59 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/xfs/Imakefile,v 1.3 2006/01/09 14:56:38 dawes Exp $ MakeSimpleDoc(xfs-design,design.ms) Index: xc/doc/specs/xfs/design.ms diff -u xc/doc/specs/xfs/design.ms:1.1.1.2 xc/doc/specs/xfs/design.ms:1.2 --- xc/doc/specs/xfs/design.ms:1.1.1.2 Tue Jan 16 17:03:51 2001 +++ xc/doc/specs/xfs/design.ms Mon Jan 9 09:56:38 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: design.ms,v 1.3 2000/08/17 19:42:51 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/xfs/design.ms,v 1.2 2006/01/09 14:56:38 dawes Exp $ .\" roff -ms .de Ip .IP \(bu 3 Index: xc/doc/specs/xterm/Imakefile diff -u xc/doc/specs/xterm/Imakefile:1.5 xc/doc/specs/xterm/Imakefile:1.6 --- xc/doc/specs/xterm/Imakefile:1.5 Wed Jan 17 11:57:45 2001 +++ xc/doc/specs/xterm/Imakefile Mon Jan 9 09:56:38 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:51 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/doc/specs/xterm/Imakefile,v 1.5 2001/01/17 16:57:45 dawes Exp $ +XCOMM $XFree86: xc/doc/specs/xterm/Imakefile,v 1.6 2006/01/09 14:56:38 dawes Exp $ MakeTblDoc(ctlseqs,ctlseqs.ms) Index: xc/doc/specs/xterm/ctlseqs.ms diff -u xc/doc/specs/xterm/ctlseqs.ms:3.55 xc/doc/specs/xterm/ctlseqs.ms:3.60 --- xc/doc/specs/xterm/ctlseqs.ms:3.55 Thu Jan 13 20:50:00 2005 +++ xc/doc/specs/xterm/ctlseqs.ms Sun Mar 12 20:27:53 2006 @@ -1,16 +1,12 @@ .\"#! troff -ms $1 -*- Nroff -*- .\" "Xterm Control Sequences" document -.\" $XTermId: ctlseqs.ms,v 1.148 2005/01/08 15:23:27 tom Exp $ +.\" $XTermId: ctlseqs.ms,v 1.162 2006/03/12 20:26:05 tom Exp $ .\" .\" -.\" $Xorg: ctlseqs.ms,v 1.3 2000/08/17 19:42:51 cpqbld Exp $ +.\" $XFree86: xc/doc/specs/xterm/ctlseqs.ms,v 3.60 2006/03/13 01:27:53 dickey Exp $ .\" .\" -.\" -.\" $XFree86: xc/doc/specs/xterm/ctlseqs.ms,v 3.55 2005/01/14 01:50:00 dickey Exp $ -.\" -.\" -.\" Copyright 1996-2004,2005 by Thomas E. Dickey +.\" Copyright 1996-2005,2006 by Thomas E. Dickey .\" .\" All Rights Reserved .\" @@ -260,6 +256,7 @@ .ds Cy \fIC\v'.3m'\h'-.2m'\s-2y\s0\v'-.3m'\fP .ds Pb \fIP\v'.3m'\h'-.2m'\s-2b\s0\v'-.3m'\fP .ds Pc \fIP\v'.3m'\h'-.2m'\s-2c\s0\v'-.3m'\fP +.ds Pd \fIP\v'.3m'\h'-.2m'\s-2d\s0\v'-.3m'\fP .ds Pe \fIP\v'.3m'\h'-.2m'\s-2e\s0\v'-.3m'\fP .ds Pl \fIP\v'.3m'\h'-.2m'\s-2l\s0\v'-.3m'\fP .ds Pm \fIP\v'.3m'\h'-.2m'\s-2m\s0\v'-.3m'\fP @@ -293,7 +290,7 @@ .AU Thomas Dickey .AI -XFree86 Project (1996-2004) +XFree86 Project (1996-2005) .AU . .am BT \" add page numbers after first page @@ -665,7 +662,7 @@ Scroll down \*(Ps lines (default = 1) (SD) . .IP \\*(Cs\\*(Ps\\*s\\*;\\*(Ps\\*s\\*;\\*(Ps\\*s\\*;\\*(Ps\\*s\\*;\\*(Ps\\*s\\*T -Initiate hilite mouse tracking. +Initiate highlight mouse tracking. Parameters are [func;startx;starty;firstrow;lastrow]. See the section \fBMouse Tracking\fP. . @@ -683,7 +680,7 @@ . .IP \\*(Cs\\*(Ps\\*s\\*c Send Device Attributes (Primary DA) - \*(Ps = \*0, 1 or omitted \(-> request attributes from terminal. + \*(Ps = \*0 or omitted \(-> request attributes from terminal. The response depends on the \fBdecTerminalID\fP resource setting. \(-> \*(Cs\*?\*1\*;\*2\*c (``VT100 with Advanced Video Option'') \(-> \*(Cs\*?\*1\*;\*0\*c (``VT101 with No Options'') @@ -703,7 +700,7 @@ . .IP \\*(Cs\\*>\\*(Ps\\*s\\*c Send Device Attributes (Secondary DA) - \*(Ps = \*0, 1 or omitted \(-> request the terminal's identification code. + \*(Ps = \*0 or omitted \(-> request the terminal's identification code. The response depends on the \fBdecTerminalID\fP resource setting. It should apply only to VT220 and up, but \fIxterm\fP extends this to VT100. \(-> \*(Cs\*s\*>\*(Pp\*s\*;\*(Pv\*s\*;\*(Pc\*s\*c @@ -766,7 +763,7 @@ \*(Ps = \*4\*7 \(-> Use Alternate Screen Buffer (unless disabled by the \fBtiteInhibit\fP resource) \*(Ps = \*6\*6 \(-> Application keypad (DECNKM) - \*(Ps = \*6\*7 \(-> Backarrow key sends delete (DECBKM) + \*(Ps = \*6\*7 \(-> Backarrow key sends backspace (DECBKM) \*(Ps = \*1\*0\*0\*0 \(-> Send Mouse X & Y on button press and release. See the section \fBMouse Tracking\fP. \*(Ps = \*1\*0\*0\*1 \(-> Use Hilite Mouse Tracking. @@ -792,6 +789,7 @@ \*(Ps = \*1\*0\*5\*3 \(-> Set SCO function-key mode. \*(Ps = \*1\*0\*6\*0 \(-> Set legacy keyboard emulation (X11R6). \*(Ps = \*1\*0\*6\*1 \(-> Set Sun/PC keyboard emulation of VT220 keyboard. + \*(Ps = \*2\*0\*0\*4 \(-> Set bracketed paste mode. . .IP \\*(Cs\\*(Pm\\*s\\*i Media Copy (MC) @@ -841,7 +839,7 @@ (normally disabled by a compile-time option) \*(Ps = \*4\*7 \(-> Use Normal Screen Buffer \*(Ps = \*6\*6 \(-> Numeric keypad (DECNKM) - \*(Ps = \*6\*7 \(-> Backarrow key sends backspace (DECBKM) + \*(Ps = \*6\*7 \(-> Backarrow key sends delete (DECBKM) \*(Ps = \*1\*0\*0\*0 \(-> Don't Send Mouse X & Y on button press and release. See the section \fBMouse Tracking\fP. @@ -869,6 +867,7 @@ \*(Ps = \*1\*0\*5\*3 \(-> Reset SCO function-key mode. \*(Ps = \*1\*0\*6\*0 \(-> Reset legacy keyboard emulation (X11R6). \*(Ps = \*1\*0\*6\*1 \(-> Reset Sun/PC keyboard emulation of VT220 keyboard. + \*(Ps = \*2\*0\*0\*4 \(-> Reset bracketed paste mode. . .IP \\*(Cs\\*(Pm\\*s\\*m Character Attributes (SGR) @@ -1005,6 +1004,7 @@ . .IP \\*(Cs\\*(Ps\\*s\\*;\\*(Ps\\*s\\*;\\*(Ps\\*s\\*t Window manipulation (from \fIdtterm\fP, as well as extensions). +These controls may be disabled using the \fIallowWindowOps\fP resource. Valid values for the first (and any additional parameters) are: \*(Ps = \*1 \(-> De-iconify window. \*(Ps = \*2 \(-> Iconify window. @@ -1201,7 +1201,7 @@ i.e., after it was started. They are not the same as the ANSI colors. One or more parameters is expected for \*(Pt. -Each succesive parameter changes the next color in the list. +Each successive parameter changes the next color in the list. The value of \*(Ps tells the starting point in the list. The colors are specified by name or RGB specification as per \fIXParseColor\fP. .sp @@ -1223,11 +1223,40 @@ .sp \*(Ps = \*4\*6 \(-> Change Log File to \*(Pt (normally disabled by a compile-time option) +.sp \*(Ps = \*5\*0 \(-> Set Font to \*(Pt If \*(Pt begins with a "#", index in the font menu, relative (if the next character is a plus or minus sign) or absolute. A number is expected but not required after the sign (the default is the current entry for relative, zero for absolute indexing). +.sp + \*(Ps = \*5\*1 (reserved for Emacs shell) +.sp + \*(Ps = \*5\*2 \(-> Manipulate Selection Data. +These controls may be disabled using the \fIallowWindowOps\fP resource. +The parameter \*(Pt is parsed as +.br + \*(Pc\*;\*(Pd +.br +The first, \*(Pc, may contain any character from the +set \*c \*p \*(cs \*0 \*1 \*2 \*3 \*4 \*5 \*6 \*7. +It is used to construct a list of selection parameters for +clipboard, +primary, +select, +or cut buffers 0 through 8 respectively, +in the order given. +If the parameter is empty, \fIxterm\fP uses \*(cs\*0, +to specify the configurable primary/clipboard selection and cut buffer 0. +.br +The second parameter, \*(Pd, gives the selection data. +Normally this is a string encoded in base64. +The data becomes the new selection, +which is then available for pasting by other applications. +.br +If the second parameter is a \*?, +\fIxterm\fP replies to the host with the selection +data encoded using the same protocol. .Ed . .St @@ -1563,6 +1592,16 @@ to make the details of switching independent of the application that requests the switch. .SH +Bracketed Paste Mode +.ds RH Bracketed Paste Mode +.LP +When bracketed paste mode is set, +pasted text is bracketed with control sequences +so that the program can differentiate pasted text from typed-in text. +When bracketed paste mode is set, +the program will receive: ESC [ 200 ~, +followed by the pasted text, followed by ESC [ 201 ~. +.SH Mouse Tracking .ds RH Mouse Tracking .LP @@ -1637,7 +1676,7 @@ except that 64 is added to the event code. Release events for the wheel buttons are not reported. -Mouse hilite tracking notifies a program of a button press, receives a +Mouse highlight tracking notifies a program of a button press, receives a range of lines from the program, highlights the region covered by the mouse within that range until button release, and then sends the program the release coordinates. @@ -1653,7 +1692,7 @@ received from the pty:\fP \*(Cs\*(Ps\*s\*;\*(Ps\*s\*;\*(Ps\*s\*;\*(Ps\*s\*;\*(Ps\*s\*T. The parameters are \fIfunc, startx, starty, firstrow,\fP and \fIlastrow.\fP -\fIfunc\fP is non-zero to initiate hilite tracking and zero to abort. +\fIfunc\fP is non-zero to initiate highlight tracking and zero to abort. \fIstartx\fP and \fIstarty\fP give the starting x and y location for the highlighted region. The ending location tracks the mouse, but will never be above row \fIfirstrow\fP and will always be above row @@ -1796,7 +1835,7 @@ Parameters for cursor movement are at the end of the \*(Es\*Y escape sequence. Each ordinate is encoded in a single character as \fIvalue\fP+32. For example, \*! is 1. -The screen coodinate system is 0-based. +The screen coordinate system is 0-based. .St .IP \\*(Es\\*A Cursor up. Index: xc/doc/util/macros.t diff -u xc/doc/util/macros.t:1.1.1.3 xc/doc/util/macros.t:1.2 --- xc/doc/util/macros.t:1.1.1.3 Tue Jan 16 16:58:58 2001 +++ xc/doc/util/macros.t Mon Jan 9 09:56:38 2006 @@ -1,4 +1,4 @@ -.\" $Xorg: macros.t,v 1.3 2000/08/17 19:42:51 cpqbld Exp $ +.\" $XFree86: xc/doc/util/macros.t,v 1.2 2006/01/09 14:56:38 dawes Exp $ .\" macros.t -- macros for X Consortium documents .\" Revised and commented by smarks 93.12.20. .\" Index: xc/extras/Mesa/docs/RELNOTES-4.1 diff -u xc/extras/Mesa/docs/RELNOTES-4.1:1.1.1.1 xc/extras/Mesa/docs/RELNOTES-4.1:1.2 --- xc/extras/Mesa/docs/RELNOTES-4.1:1.1.1.1 Sun Sep 28 13:22:36 2003 +++ xc/extras/Mesa/docs/RELNOTES-4.1 Mon Jan 9 09:56:38 2006 @@ -305,4 +305,3 @@ ---------------------------------------------------------------------- -$Id: RELNOTES-4.1,v 1.22 2002/10/29 15:06:37 brianp Exp $ Index: xc/extras/Mesa/docs/RELNOTES-5.0 diff -u xc/extras/Mesa/docs/RELNOTES-5.0:1.1.1.1 xc/extras/Mesa/docs/RELNOTES-5.0:1.2 --- xc/extras/Mesa/docs/RELNOTES-5.0:1.1.1.1 Sun Sep 28 13:22:36 2003 +++ xc/extras/Mesa/docs/RELNOTES-5.0 Mon Jan 9 09:56:38 2006 @@ -82,4 +82,3 @@ ---------------------------------------------------------------------- -$Id: RELNOTES-5.0,v 3.2 2002/11/13 15:33:51 brianp Exp $ Index: xc/extras/Mesa/docs/RELNOTES-5.0.1 diff -u xc/extras/Mesa/docs/RELNOTES-5.0.1:1.1.1.2 xc/extras/Mesa/docs/RELNOTES-5.0.1:1.2 --- xc/extras/Mesa/docs/RELNOTES-5.0.1:1.1.1.2 Thu Apr 8 05:15:17 2004 +++ xc/extras/Mesa/docs/RELNOTES-5.0.1 Mon Jan 9 09:56:38 2006 @@ -43,4 +43,3 @@ ---------------------------------------------------------------------- -$Id: RELNOTES-5.0.1,v 3.1 2003/03/30 16:17:54 brianp Exp $ Index: xc/extras/Mesa/docs/RELNOTES-5.0.2 diff -u xc/extras/Mesa/docs/RELNOTES-5.0.2:1.1.1.2 xc/extras/Mesa/docs/RELNOTES-5.0.2:1.2 --- xc/extras/Mesa/docs/RELNOTES-5.0.2:1.1.1.2 Thu Apr 8 05:15:17 2004 +++ xc/extras/Mesa/docs/RELNOTES-5.0.2 Mon Jan 9 09:56:38 2006 @@ -43,4 +43,3 @@ ---------------------------------------------------------------------- -$Id: RELNOTES-5.0.2,v 1.1 2003/09/04 23:10:38 brianp Exp $ Index: xc/extras/Mesa/docs/RELNOTES-6.0 diff -u xc/extras/Mesa/docs/RELNOTES-6.0:1.1.1.1 xc/extras/Mesa/docs/RELNOTES-6.0:1.2 --- xc/extras/Mesa/docs/RELNOTES-6.0:1.1.1.1 Thu Apr 8 05:15:17 2004 +++ xc/extras/Mesa/docs/RELNOTES-6.0 Mon Jan 9 09:56:38 2006 @@ -84,4 +84,3 @@ ---------------------------------------------------------------------- -$Id: RELNOTES-6.0,v 1.3 2004/01/15 15:47:57 brianp Exp $ Index: xc/extras/Mesa/docs/RELNOTES-6.0.1 diff -u xc/extras/Mesa/docs/RELNOTES-6.0.1:1.3 xc/extras/Mesa/docs/RELNOTES-6.0.1:1.4 --- xc/extras/Mesa/docs/RELNOTES-6.0.1:1.3 Fri Dec 10 10:30:08 2004 +++ xc/extras/Mesa/docs/RELNOTES-6.0.1 Mon Jan 9 09:56:38 2006 @@ -47,4 +47,3 @@ ---------------------------------------------------------------------- -$Id: RELNOTES-6.0.1,v 3.1 2004/04/02 23:37:02 brianp Exp $ Index: xc/extras/Mesa/docs/RELNOTES-6.1 diff -u xc/extras/Mesa/docs/RELNOTES-6.1:1.1.1.2 xc/extras/Mesa/docs/RELNOTES-6.1:1.2 --- xc/extras/Mesa/docs/RELNOTES-6.1:1.1.1.2 Fri Dec 10 10:07:01 2004 +++ xc/extras/Mesa/docs/RELNOTES-6.1 Mon Jan 9 09:56:39 2006 @@ -109,4 +109,3 @@ ---------------------------------------------------------------------- -$Id: RELNOTES-6.1,v 3.5 2004/08/17 22:58:23 brianp Exp $ Index: xc/extras/Mesa/docs/RELNOTES-6.2 diff -u xc/extras/Mesa/docs/RELNOTES-6.2:1.1.1.1 xc/extras/Mesa/docs/RELNOTES-6.2:1.2 --- xc/extras/Mesa/docs/RELNOTES-6.2:1.1.1.1 Fri Dec 10 10:07:01 2004 +++ xc/extras/Mesa/docs/RELNOTES-6.2 Mon Jan 9 09:56:39 2006 @@ -46,4 +46,3 @@ ---------------------------------------------------------------------- -$Id: RELNOTES-6.2,v 3.3 2004/10/02 14:59:29 brianp Exp $ Index: xc/extras/Mesa/docs/RELNOTES-6.2.1 diff -u xc/extras/Mesa/docs/RELNOTES-6.2.1:1.1.1.1 xc/extras/Mesa/docs/RELNOTES-6.2.1:1.2 --- xc/extras/Mesa/docs/RELNOTES-6.2.1:1.1.1.1 Fri Dec 10 10:34:03 2004 +++ xc/extras/Mesa/docs/RELNOTES-6.2.1 Mon Jan 9 09:56:39 2006 @@ -47,4 +47,3 @@ ---------------------------------------------------------------------- -$Id: RELNOTES-6.2.1,v 1.1.2.2 2004/12/09 23:09:19 brianp Exp $ Index: xc/extras/Mesa/include/GL/glxext.h diff -u xc/extras/Mesa/include/GL/glxext.h:1.12 xc/extras/Mesa/include/GL/glxext.h:1.13 --- xc/extras/Mesa/include/GL/glxext.h:1.12 Fri Dec 10 12:21:09 2004 +++ xc/extras/Mesa/include/GL/glxext.h Thu Mar 24 21:22:50 2005 @@ -33,7 +33,7 @@ ** not been independently verified as being compliant with the OpenGL(R) ** version 1.2.1 Specification. */ -/* $XFree86: xc/extras/Mesa/include/GL/glxext.h,v 1.12 2004/12/10 17:21:09 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/include/GL/glxext.h,v 1.13 2005/03/25 02:22:50 dawes Exp $ */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) #define WIN32_LEAN_AND_MEAN 1 @@ -676,6 +676,54 @@ typedef unsigned int ( * PFNGLXGETAGPOFFSETMESAPROC) (const void *pointer); #endif +#ifndef GLX_MESA_swap_interval +#define GLX_MESA_swap_interval 1 +#ifdef GLX_GLXEXT_PROTOTYPES +extern int glXSwapIntervalMESA(unsigned interval); +#endif +typedef int ( * PFNGLXSWAPINTERVALMESAPROC) (unsigned interval); +#endif + +#ifndef GLX_MESA_get_swap_interval +#define GLX_MESA_get_swap_interval 1 +#ifdef GLX_GLXEXT_PROTOTYPES +extern int glXGetSwapIntervalMESA(void); +#endif +typedef int ( * PFNGLXGETSWAPINTERVALMESAPROC) (void); +#endif + +#ifndef GLX_MESA_begin_frame_tracking +#define GLX_MESA_begin_frame_tracking 1 +#ifdef GLX_GLXEXT_PROTOTYPES +extern int glXBeginFrameTrackingMESA(Display *dpy, GLXDrawable drawable); +#endif +typedef int ( * PFNGLXBEGINFRAMETRACKINGMESAPROC) (Display *dpy, GLXDrawable drawable); +#endif + +#ifndef GLX_MESA_end_frame_tracking +#define GLX_MESA_end_frame_tracking 1 +#ifdef GLX_GLXEXT_PROTOTYPES +extern int glXEndFrameTrackingMESA(Display *dpy, GLXDrawable drawable); +#endif +typedef int ( * PFNGLXENDFRAMETRACKINGMESAPROC) (Display *dpy, GLXDrawable drawable); +#endif + +#ifndef GLX_MESA_get_frame_usage +#define GLX_MESA_get_frame_usage 1 +#ifdef GLX_GLXEXT_PROTOTYPES +extern int glXGetFrameUsageMESA(Display *dpy, GLXDrawable drawable, float *usage); +#endif +typedef int ( * PFNGLXGETFRAMEUSAGEMESAPROC) (Display *dpy, GLXDrawable drawable, float *usage); +#endif + +#ifndef GLX_MESA_query_frame_tracking +#define GLX_MESA_query_frame_tracking 1 +#ifdef GLX_GLXEXT_PROTOTYPES +extern int glXQueryFrameTrackingMESA(Display *dpy, GLXDrawable drawable, int64_t *sbc, int64_t *missedFrames, float *lastMissedUsage); +#endif +typedef int ( * PFNGLXQUERYFRAMETRACKINGMESAPROC) (Display *dpy, GLXDrawable drawable, int64_t *sbc, int64_t *missedFrames, float *lastMissedUsage); +#endif + #ifdef __cplusplus } #endif Index: xc/extras/Mesa/include/GL/internal/dri_interface.h diff -u xc/extras/Mesa/include/GL/internal/dri_interface.h:1.2 xc/extras/Mesa/include/GL/internal/dri_interface.h:1.4 --- xc/extras/Mesa/include/GL/internal/dri_interface.h:1.2 Fri Dec 10 13:24:34 2004 +++ xc/extras/Mesa/include/GL/internal/dri_interface.h Tue Apr 12 19:20:00 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/include/GL/internal/dri_interface.h,v 1.4 2005/04/12 23:20:00 dawes Exp $ */ /* * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. * (C) Copyright IBM Corporation 2004 @@ -175,15 +176,6 @@ /** - * XML document describing the configuration options supported by the - * driver. - */ -extern const char __driConfigOptions[]; - -/*@}*/ - - -/** * Stored version of some component (i.e., server-side DRI module, kernel-side * DRM, etc.). * Index: xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c:1.3 xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c:1.3 Mon Dec 13 17:40:49 2004 +++ xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c Fri Oct 14 11:15:54 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c,v 1.3 2004/12/13 22:40:49 tsi Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/common/dri_util.c,v 1.4 2005/10/14 15:15:54 tsi Exp $ */ /** * \file dri_util.c * DRI utility functions. @@ -39,8 +39,8 @@ #ifndef DRI_NEW_INTERFACE_ONLY # include -# include -# include +# include +# include # include "xf86dri.h" # define _mesa_malloc(b) Xmalloc(b) # define _mesa_free(m) Xfree(m) Index: xc/extras/Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h diff -u xc/extras/Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h:1.1.1.1 xc/extras/Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h:1.2 --- xc/extras/Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h:1.1.1.1 Fri Dec 10 10:06:12 2004 +++ xc/extras/Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h Tue Jun 28 21:14:08 2005 @@ -31,7 +31,7 @@ * */ -/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h,v 1.1.1.1 2004/12/10 15:06:12 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/dri_client/imports/xf86drm.h,v 1.2 2005/06/29 01:14:08 dawes Exp $ */ #ifndef _XF86DRM_H_ #define _XF86DRM_H_ @@ -285,7 +285,7 @@ #define DRM_LOCK_CONT 0x40000000 /**< Hardware lock is contended */ #if defined(__GNUC__) && (__GNUC__ >= 2) -# if defined(__i386) || defined(__AMD64__) +# if defined(__i386) || defined(__amd64__) || defined(__x86_64__) /* Reflect changes here to drmP.h */ #define DRM_CAS(lock,old,new,__ret) \ do { \ Index: xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.c:1.1.1.2 xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.c:1.2 --- xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.c:1.1.1.2 Fri Dec 10 10:05:44 2004 +++ xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.c Tue Feb 28 23:08:26 2006 @@ -22,7 +22,7 @@ * * */ -/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.c,v 1.1.1.2 2004/12/10 15:05:44 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.c,v 1.2 2006/03/01 04:08:26 dawes Exp $ */ #include "glheader.h" @@ -323,7 +323,7 @@ -void i810PrintSetupFlags(char *msg, GLuint flags ) +void i810PrintSetupFlags(const char *msg, GLuint flags ) { fprintf(stderr, "%s(%x): %s%s%s%s%s%s\n", msg, Index: xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.h diff -u xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.h:1.1.1.1 xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.h:1.2 --- xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.h:1.1.1.1 Thu Apr 8 05:16:57 2004 +++ xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.h Tue Feb 28 23:08:26 2006 @@ -22,7 +22,7 @@ * * */ -/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.h,v 1.1.1.1 2004/04/08 09:16:57 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i810/i810vb.h,v 1.2 2006/03/01 04:08:26 dawes Exp $ */ #ifndef I810VB_INC #define I810VB_INC @@ -58,6 +58,6 @@ extern void i810FreeVB( GLcontext *ctx ); extern void i810_print_vertex( GLcontext *ctx, const i810Vertex *v ); -extern void i810PrintSetupFlags(char *msg, GLuint flags ); +extern void i810PrintSetupFlags(const char *msg, GLuint flags ); #endif Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_reg.h diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_reg.h:1.3 xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_reg.h:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_reg.h:1.3 Sun Jan 9 15:47:18 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_reg.h Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/i830_reg.h,v 1.4 2005/03/29 04:00:28 tsi Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_context.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_context.c:1.4 xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_context.c:1.5 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_context.c:1.4 Sun Jan 9 15:47:18 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_context.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_context.c,v 1.5 2005/03/29 04:00:28 tsi Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_program.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_program.c:1.2 xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_program.c:1.3 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_program.c:1.2 Fri Dec 10 12:47:22 2004 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_program.c Sun Mar 27 21:50:58 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_program.c,v 1.3 2005/03/28 02:50:58 dawes Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. @@ -25,7 +26,7 @@ * **************************************************************************/ -#include +#include #include "glheader.h" #include "macros.h" Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_reg.h diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_reg.h:1.3 xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_reg.h:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_reg.h:1.3 Sun Jan 9 15:47:19 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_reg.h Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_reg.h,v 1.4 2005/03/29 04:00:28 tsi Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_state.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_state.c:1.3 xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_state.c:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_state.c:1.3 Sun Jan 9 15:47:19 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_state.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_state.c,v 1.4 2005/03/29 04:00:28 tsi Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_tex.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_tex.c:1.3 xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_tex.c:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_tex.c:1.3 Sun Jan 9 15:47:19 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_tex.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_tex.c,v 1.4 2005/03/29 04:00:28 tsi Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texprog.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texprog.c:1.3 xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texprog.c:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texprog.c:1.3 Sun Jan 9 15:47:19 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texprog.c Sun Mar 27 21:50:58 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texprog.c,v 1.4 2005/03/28 02:50:58 dawes Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. @@ -25,7 +26,7 @@ * **************************************************************************/ -#include +#include #include "glheader.h" #include "macros.h" Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c:1.3 xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c:1.3 Sun Jan 9 15:47:19 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/i915_texstate.c,v 1.4 2005/03/29 04:00:28 tsi Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c:1.3 xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c:1.3 Sun Jan 9 15:47:19 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.c,v 1.4 2005/03/29 04:00:28 tsi Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.h diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.h:1.4 xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.h:1.5 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.h:1.4 Sun Jan 9 15:47:19 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.h Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_context.h,v 1.5 2005/03/29 04:00:28 tsi Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_state.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_state.c:1.3 xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_state.c:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_state.c:1.3 Sun Jan 9 15:47:19 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_state.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_state.c,v 1.4 2005/03/29 04:00:28 tsi Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. Index: xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_tex.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_tex.c:1.3 xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_tex.c:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_tex.c:1.3 Sun Jan 9 15:47:19 2005 +++ xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_tex.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/i915/intel_tex.c,v 1.4 2005/03/29 04:00:28 tsi Exp $ */ /************************************************************************** * * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. Index: xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c:1.1.1.2 xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c:1.2 --- xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c:1.1.1.2 Fri Dec 10 10:05:59 2004 +++ xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c Tue Mar 22 22:11:22 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c,v 1.1.1.2 2004/12/10 15:05:59 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_sse.c,v 1.2 2005/03/23 03:11:22 dawes Exp $ */ /* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. @@ -38,6 +38,11 @@ #include "simple_list.h" #include "r200_vtxfmt.h" +/* Temporarily disabled as it is broken w/the new cubemap code. - idr */ +#ifndef TEXCOORD_BROKEN +#define TEXCOORD_BROKEN 1 +#endif + #if defined(USE_SSE_ASM) #include "x86/common_x86_asm.h" @@ -49,15 +54,18 @@ EXTERN( _sse_Attribute2f ); EXTERN( _sse_Attribute3fv ); EXTERN( _sse_Attribute3f ); +#if !TEXCOORD_BROKEN EXTERN( _sse_MultiTexCoord2fv ); EXTERN( _sse_MultiTexCoord2f ); EXTERN( _sse_MultiTexCoord2fv_2 ); EXTERN( _sse_MultiTexCoord2f_2 ); +#endif /* Build specialized versions of the immediate calls on the fly for * the current state. */ +#if !TEXCOORD_BROKEN static struct dynfn *r200_makeSSEAttribute2fv( struct dynfn * cache, const int * key, const char * name, void * dest) { @@ -83,6 +91,7 @@ FIXUP(dfn->code, 8, 0x0, (int)dest); return dfn; } +#endif static struct dynfn *r200_makeSSEAttribute3fv( struct dynfn * cache, const int * key, const char * name, void * dest) @@ -154,7 +163,7 @@ } } -#if 0 /* Temporarily disabled as it is broken w/the new cubemap code. - idr */ +#if !TEXCOORD_BROKEN static struct dynfn *r200_makeSSETexCoord2fv( GLcontext *ctx, const int * key ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); @@ -215,7 +224,7 @@ gen->Normal3f = (void *) r200_makeSSENormal3f; gen->Color3fv = (void *) r200_makeSSEColor3fv; gen->Color3f = (void *) r200_makeSSEColor3f; -#if 0 /* Temporarily disabled as it is broken w/the new cubemap code. - idr */ +#if !TEXCOORD_BROKEN gen->TexCoord2fv = (void *) r200_makeSSETexCoord2fv; gen->TexCoord2f = (void *) r200_makeSSETexCoord2f; gen->MultiTexCoord2fvARB = (void *) r200_makeSSEMultiTexCoord2fv; Index: xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c:1.1.1.2 xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c:1.2 --- xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c:1.1.1.2 Fri Dec 10 10:05:59 2004 +++ xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c Tue Mar 22 22:11:22 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c,v 1.1.1.2 2004/12/10 15:05:59 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/r200/r200_vtxfmt_x86.c,v 1.2 2005/03/23 03:11:22 dawes Exp $ */ /* Copyright (C) The Weather Channel, Inc. 2002. All Rights Reserved. @@ -38,6 +38,11 @@ #include "simple_list.h" #include "r200_vtxfmt.h" +/* Temporarily disabled as it is broken w/the new cubemap code. - idr */ +#ifndef TEXCOORD_BROKEN +#define TEXCOORD_BROKEN 1 +#endif + #if defined(USE_X86_ASM) #define EXTERN( FUNC ) \ @@ -57,10 +62,12 @@ EXTERN ( _x86_Color4ubv_ub ); EXTERN ( _x86_Color4ubv_4f ); EXTERN ( _x86_Color4ub_ub ); +#if !TEXCOORD_BROKEN EXTERN ( _x86_MultiTexCoord2fv ); EXTERN ( _x86_MultiTexCoord2fv_2 ); EXTERN ( _x86_MultiTexCoord2f ); EXTERN ( _x86_MultiTexCoord2f_2 ); +#endif /* Build specialized versions of the immediate calls on the fly for @@ -180,6 +187,7 @@ return dfn; } +#if !TEXCOORD_BROKEN static struct dynfn * r200_makeX86Attribute2fv( struct dynfn * cache, const int *key, const char * name, void * dest ) @@ -210,6 +218,7 @@ return dfn; } +#endif static struct dynfn * @@ -337,7 +346,7 @@ -#if 0 /* Temporarily disabled as it is broken w/the new cubemap code. - idr */ +#if !TEXCOORD_BROKEN struct dynfn *r200_makeX86TexCoord2fv( GLcontext *ctx, const int *key ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); @@ -406,7 +415,7 @@ gen->Color4ubv = r200_makeX86Color4ubv; /* PKCOLOR only */ gen->Normal3f = r200_makeX86Normal3f; gen->Normal3fv = r200_makeX86Normal3fv; -#if 0 /* Temporarily disabled as it is broken w/the new cubemap code. - idr */ +#if !TEXCOORD_BROKEN gen->TexCoord2f = r200_makeX86TexCoord2f; gen->TexCoord2fv = r200_makeX86TexCoord2fv; gen->MultiTexCoord2fARB = r200_makeX86MultiTexCoord2fARB; Index: xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_subset_select.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_subset_select.c:1.1.1.1 xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_subset_select.c:1.2 --- xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_subset_select.c:1.1.1.1 Thu Apr 8 05:17:14 2004 +++ xc/extras/Mesa/src/mesa/drivers/dri/radeon/radeon_subset_select.c Mon Jan 9 09:56:39 2006 @@ -27,9 +27,6 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: radeon_subset_select.c,v 1.2 2003/08/22 20:11:45 brianp Exp $ */ - - #include "glheader.h" #include "imports.h" #include "context.h" Index: xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tex.c diff -u xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tex.c:1.3 xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tex.c:1.4 --- xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tex.c:1.3 Wed Dec 15 10:40:28 2004 +++ xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tex.c Thu Mar 24 21:22:50 2005 @@ -23,7 +23,7 @@ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tex.c,v 1.3 2004/12/15 15:40:28 tsi Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/drivers/dri/tdfx/tdfx_tex.c,v 1.4 2005/03/25 02:22:50 dawes Exp $ */ /* * New fixes: @@ -50,7 +50,7 @@ /* no borders! can't halve 1x1! (stride > width * comp) not allowed */ -void +static void _mesa_halve2x2_teximage2d ( GLcontext *ctx, struct gl_texture_image *texImage, GLuint bytesPerPixel, Index: xc/extras/Mesa/src/mesa/glapi/APIspec diff -u xc/extras/Mesa/src/mesa/glapi/APIspec:1.1.1.2 xc/extras/Mesa/src/mesa/glapi/APIspec:1.2 --- xc/extras/Mesa/src/mesa/glapi/APIspec:1.1.1.2 Thu Jun 10 10:23:34 2004 +++ xc/extras/Mesa/src/mesa/glapi/APIspec Mon Jan 9 09:56:39 2006 @@ -1,5 +1,3 @@ -# $Id: APIspec,v 1.23 2004/01/27 18:52:40 idr Exp $ - # This file describes all the OpenGL functions. # We use a number of Python scripts to parse this file and # generate some source files. We used to use the SGI gl.spec Index: xc/extras/Mesa/src/mesa/glapi/apiparser.py diff -u xc/extras/Mesa/src/mesa/glapi/apiparser.py:1.1.1.1 xc/extras/Mesa/src/mesa/glapi/apiparser.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/apiparser.py:1.1.1.1 Thu Apr 8 05:17:32 2004 +++ xc/extras/Mesa/src/mesa/glapi/apiparser.py Mon Jan 9 09:56:39 2006 @@ -1,7 +1,5 @@ #!/usr/bin/env python -# $Id: apiparser.py,v 1.2 2003/08/19 01:06:24 brianp Exp $ - # Mesa 3-D graphics library # Version: 4.1 # Index: xc/extras/Mesa/src/mesa/glapi/glapitemp.py diff -u xc/extras/Mesa/src/mesa/glapi/glapitemp.py:1.1.1.2 xc/extras/Mesa/src/mesa/glapi/glapitemp.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/glapitemp.py:1.1.1.2 Fri Dec 10 10:05:31 2004 +++ xc/extras/Mesa/src/mesa/glapi/glapitemp.py Mon Jan 9 09:56:39 2006 @@ -1,7 +1,5 @@ #!/usr/bin/env python -# $Id: glapitemp.py,v 1.6 2004/06/29 19:08:20 idr Exp $ - # Mesa 3-D graphics library # Version: 4.1 # Index: xc/extras/Mesa/src/mesa/glapi/gloffsets.py diff -u xc/extras/Mesa/src/mesa/glapi/gloffsets.py:1.1.1.1 xc/extras/Mesa/src/mesa/glapi/gloffsets.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/gloffsets.py:1.1.1.1 Thu Apr 8 05:17:35 2004 +++ xc/extras/Mesa/src/mesa/glapi/gloffsets.py Mon Jan 9 09:56:39 2006 @@ -1,7 +1,5 @@ #!/usr/bin/env python -# $Id: gloffsets.py,v 1.5 2001/11/18 22:42:57 brianp Exp $ - # Mesa 3-D graphics library # Version: 4.1 # Index: xc/extras/Mesa/src/mesa/glapi/glprocs.py diff -u xc/extras/Mesa/src/mesa/glapi/glprocs.py:1.1.1.1 xc/extras/Mesa/src/mesa/glapi/glprocs.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/glprocs.py:1.1.1.1 Thu Apr 8 05:17:35 2004 +++ xc/extras/Mesa/src/mesa/glapi/glprocs.py Mon Jan 9 09:56:39 2006 @@ -1,7 +1,5 @@ #!/usr/bin/env python -# $Id: glprocs.py,v 1.1 2001/11/18 22:42:57 brianp Exp $ - # Mesa 3-D graphics library # Version: 4.1 # Index: xc/extras/Mesa/src/mesa/glapi/mesadef.py diff -u xc/extras/Mesa/src/mesa/glapi/mesadef.py:1.1.1.2 xc/extras/Mesa/src/mesa/glapi/mesadef.py:1.2 --- xc/extras/Mesa/src/mesa/glapi/mesadef.py:1.1.1.2 Fri Dec 10 10:05:28 2004 +++ xc/extras/Mesa/src/mesa/glapi/mesadef.py Mon Jan 9 09:56:39 2006 @@ -1,7 +1,5 @@ #!/usr/bin/env python -# $Id: mesadef.py,v 1.2 2004/05/10 07:42:27 dborca Exp $ - # Mesa 3-D graphics library # Version: 4.1 # Index: xc/extras/Mesa/src/mesa/main/imports.h diff -u xc/extras/Mesa/src/mesa/main/imports.h:1.7 xc/extras/Mesa/src/mesa/main/imports.h:1.8 --- xc/extras/Mesa/src/mesa/main/imports.h:1.7 Fri Dec 10 10:41:02 2004 +++ xc/extras/Mesa/src/mesa/main/imports.h Tue Jun 28 21:14:08 2005 @@ -21,7 +21,7 @@ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/extras/Mesa/src/mesa/main/imports.h,v 1.7 2004/12/10 15:41:02 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/main/imports.h,v 1.8 2005/06/29 01:14:08 dawes Exp $ */ /** * \file imports.h @@ -224,7 +224,7 @@ ***/ #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \ defined(__s390x__) || defined(__powerpc__) || \ - defined(__amd64__) || \ + defined(__amd64__) || defined(__x86_64__) || \ defined(ia64) || defined(__ia64__) || \ defined(__hppa__) || defined(hpux) || \ defined(__mips) || defined(_MIPS_ARCH) || \ Index: xc/extras/Mesa/src/mesa/sparc/clip.S diff -u xc/extras/Mesa/src/mesa/sparc/clip.S:1.3 xc/extras/Mesa/src/mesa/sparc/clip.S:1.5 --- xc/extras/Mesa/src/mesa/sparc/clip.S:1.3 Fri Dec 10 10:41:02 2004 +++ xc/extras/Mesa/src/mesa/sparc/clip.S Fri Sep 23 01:07:48 2005 @@ -1,10 +1,18 @@ -/* $XFree86: xc/extras/Mesa/src/mesa/sparc/clip.S,v 1.3 2004/12/10 15:41:02 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/sparc/clip.S,v 1.5 2005/09/23 05:07:48 tsi Exp $ */ /* * Clip testing in SPARC assembly */ -#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) +#if (defined(__sparc_v9__) && \ + (!defined(__linux__) || defined(__linux_sparc_64__))) + + /* Solaris requires this for 64-bit. */ + .register %g2, #scratch + .register %g3, #scratch + .register %g7, #scratch + +#define SAVESZ 128 #define LDPTR ldx #define V4F_DATA 0x00 #define V4F_START 0x08 @@ -13,6 +21,7 @@ #define V4F_SIZE 0x18 #define V4F_FLAGS 0x1c #else +#define SAVESZ 64 #define LDPTR ld #define V4F_DATA 0x00 #define V4F_START 0x04 @@ -27,13 +36,6 @@ #define VEC_SIZE_3 7 #define VEC_SIZE_4 15 -#ifdef SVR4 - /* Solaris requires this for 64-bit. */ - .register %g2, #scratch - .register %g3, #scratch - .register %g7, #scratch -#endif - .text .align 64 @@ -73,7 +75,7 @@ .globl _mesa_sparc_cliptest_points4 _mesa_sparc_cliptest_points4: - save %sp, -64, %sp + save %sp, -SAVESZ, %sp call __pc_tramp sub %o7, (. - one_dot_zero - 4), %g1 ld [%g1 + 0x0], %f4 @@ -169,7 +171,7 @@ .globl _mesa_sparc_cliptest_points4_np _mesa_sparc_cliptest_points4_np: - save %sp, -64, %sp + save %sp, -SAVESZ, %sp call __pc_tramp sub %o7, (. - one_dot_zero - 4), %g1 Index: xc/extras/Mesa/src/mesa/sparc/norm.S diff -u xc/extras/Mesa/src/mesa/sparc/norm.S:1.3 xc/extras/Mesa/src/mesa/sparc/norm.S:1.5 --- xc/extras/Mesa/src/mesa/sparc/norm.S:1.3 Fri Dec 10 10:41:02 2004 +++ xc/extras/Mesa/src/mesa/sparc/norm.S Mon Jan 9 09:56:39 2006 @@ -1,17 +1,14 @@ -/* $Id: norm.S,v 1.3.2.1 2004/11/22 19:27:21 brianp Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/sparc/norm.S,v 1.3 2004/12/10 15:41:02 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/sparc/norm.S,v 1.5 2006/01/09 14:56:39 dawes Exp $ */ #include "sparc_matrix.h" -#ifdef SVR4 - /* Solaris requires this for 64-bit. */ - .register %g2, #scratch - .register %g3, #scratch -#endif .text #if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) + /* Solaris requires this for 64-bit. */ + .register %g2, #scratch + .register %g3, #scratch #define STACK_VAR_OFF (2047 + (8 * 16)) #else #define STACK_VAR_OFF (4 * 16) Index: xc/extras/Mesa/src/mesa/sparc/sparc.h diff -u xc/extras/Mesa/src/mesa/sparc/sparc.h:1.1.1.1 xc/extras/Mesa/src/mesa/sparc/sparc.h:1.2 --- xc/extras/Mesa/src/mesa/sparc/sparc.h:1.1.1.1 Thu Apr 8 05:17:55 2004 +++ xc/extras/Mesa/src/mesa/sparc/sparc.h Mon Jan 9 09:56:39 2006 @@ -1,5 +1,3 @@ -/* $Id: sparc.h,v 1.3 2001/06/06 22:55:28 davem69 Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.1 Index: xc/extras/Mesa/src/mesa/sparc/xform.S diff -u xc/extras/Mesa/src/mesa/sparc/xform.S:1.2 xc/extras/Mesa/src/mesa/sparc/xform.S:1.4 --- xc/extras/Mesa/src/mesa/sparc/xform.S:1.2 Thu Apr 22 09:58:37 2004 +++ xc/extras/Mesa/src/mesa/sparc/xform.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: xform.S,v 1.2 2001/06/05 23:54:01 davem69 Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/sparc/xform.S,v 1.2 2004/04/22 13:58:37 tsi Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/sparc/xform.S,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* TODO * @@ -19,7 +18,7 @@ #include "sparc_matrix.h" -#ifdef SVR4 +#if (defined(__sparc_v9__) && (!defined(__linux__) || defined(__linux_sparc_64__))) /* Solaris requires this for 64-bit. */ .register %g2, #scratch .register %g3, #scratch Index: xc/extras/Mesa/src/mesa/x86/3dnow.c diff -u xc/extras/Mesa/src/mesa/x86/3dnow.c:1.1.1.1 xc/extras/Mesa/src/mesa/x86/3dnow.c:1.2 --- xc/extras/Mesa/src/mesa/x86/3dnow.c:1.1.1.1 Thu Apr 8 05:18:05 2004 +++ xc/extras/Mesa/src/mesa/x86/3dnow.c Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: 3dnow.c,v 1.23 2003/03/29 16:38:37 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 5.0.1 Index: xc/extras/Mesa/src/mesa/x86/3dnow.h diff -u xc/extras/Mesa/src/mesa/x86/3dnow.h:1.1.1.1 xc/extras/Mesa/src/mesa/x86/3dnow.h:1.2 --- xc/extras/Mesa/src/mesa/x86/3dnow.h:1.1.1.1 Thu Apr 8 05:18:05 2004 +++ xc/extras/Mesa/src/mesa/x86/3dnow.h Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: 3dnow.h,v 1.6 2002/04/09 14:58:03 keithw Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/3dnow_normal.S diff -u xc/extras/Mesa/src/mesa/x86/3dnow_normal.S:1.4 xc/extras/Mesa/src/mesa/x86/3dnow_normal.S:1.5 --- xc/extras/Mesa/src/mesa/x86/3dnow_normal.S:1.4 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/3dnow_normal.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/3dnow_normal.S,v 1.4 2004/12/10 15:30:13 alanh Exp $ */ -/* $Id: 3dnow_normal.S,v 1.8 2004/04/26 10:10:25 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/3dnow_normal.S,v 1.5 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/3dnow_xform1.S diff -u xc/extras/Mesa/src/mesa/x86/3dnow_xform1.S:1.3 xc/extras/Mesa/src/mesa/x86/3dnow_xform1.S:1.4 --- xc/extras/Mesa/src/mesa/x86/3dnow_xform1.S:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/3dnow_xform1.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: 3dnow_xform1.S,v 1.2 2004/04/26 10:10:25 alanh Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/3dnow_xform1.S,v 1.3 2004/12/10 15:30:13 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/3dnow_xform1.S,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/3dnow_xform2.S diff -u xc/extras/Mesa/src/mesa/x86/3dnow_xform2.S:1.3 xc/extras/Mesa/src/mesa/x86/3dnow_xform2.S:1.4 --- xc/extras/Mesa/src/mesa/x86/3dnow_xform2.S:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/3dnow_xform2.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: 3dnow_xform2.S,v 1.2 2004/04/26 10:10:25 alanh Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/3dnow_xform2.S,v 1.3 2004/12/10 15:30:13 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/3dnow_xform2.S,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/3dnow_xform3.S diff -u xc/extras/Mesa/src/mesa/x86/3dnow_xform3.S:1.3 xc/extras/Mesa/src/mesa/x86/3dnow_xform3.S:1.4 --- xc/extras/Mesa/src/mesa/x86/3dnow_xform3.S:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/3dnow_xform3.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: 3dnow_xform3.S,v 1.3 2004/04/26 10:10:25 alanh Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/3dnow_xform3.S,v 1.3 2004/12/10 15:30:13 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/3dnow_xform3.S,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/3dnow_xform4.S diff -u xc/extras/Mesa/src/mesa/x86/3dnow_xform4.S:1.3 xc/extras/Mesa/src/mesa/x86/3dnow_xform4.S:1.4 --- xc/extras/Mesa/src/mesa/x86/3dnow_xform4.S:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/3dnow_xform4.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: 3dnow_xform4.S,v 1.3 2004/04/26 10:10:25 alanh Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/3dnow_xform4.S,v 1.3 2004/12/10 15:30:13 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/3dnow_xform4.S,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/clip_args.h diff -u xc/extras/Mesa/src/mesa/x86/clip_args.h:1.1.1.1 xc/extras/Mesa/src/mesa/x86/clip_args.h:1.2 --- xc/extras/Mesa/src/mesa/x86/clip_args.h:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/clip_args.h Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: clip_args.h,v 1.5 2002/10/29 20:28:57 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/common_x86_asm.S diff -u xc/extras/Mesa/src/mesa/x86/common_x86_asm.S:1.1.1.1 xc/extras/Mesa/src/mesa/x86/common_x86_asm.S:1.2 --- xc/extras/Mesa/src/mesa/x86/common_x86_asm.S:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/common_x86_asm.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: common_x86_asm.S,v 1.17 2003/01/21 16:13:58 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 5.1 Index: xc/extras/Mesa/src/mesa/x86/common_x86_asm.h diff -u xc/extras/Mesa/src/mesa/x86/common_x86_asm.h:1.3 xc/extras/Mesa/src/mesa/x86/common_x86_asm.h:1.4 --- xc/extras/Mesa/src/mesa/x86/common_x86_asm.h:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/common_x86_asm.h Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: common_x86_asm.h,v 1.11 2004/04/26 10:10:25 alanh Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/common_x86_asm.h,v 1.3 2004/12/10 15:30:13 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/common_x86_asm.h,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/common_x86_features.h diff -u xc/extras/Mesa/src/mesa/x86/common_x86_features.h:1.1.1.1 xc/extras/Mesa/src/mesa/x86/common_x86_features.h:1.2 --- xc/extras/Mesa/src/mesa/x86/common_x86_features.h:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/common_x86_features.h Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: common_x86_features.h,v 1.6 2003/01/21 16:14:00 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 5.1 Index: xc/extras/Mesa/src/mesa/x86/common_x86_macros.h diff -u xc/extras/Mesa/src/mesa/x86/common_x86_macros.h:1.1.1.1 xc/extras/Mesa/src/mesa/x86/common_x86_macros.h:1.2 --- xc/extras/Mesa/src/mesa/x86/common_x86_macros.h:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/common_x86_macros.h Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: common_x86_macros.h,v 1.3 2002/10/29 20:28:58 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/mmx.h diff -u xc/extras/Mesa/src/mesa/x86/mmx.h:1.1.1.1 xc/extras/Mesa/src/mesa/x86/mmx.h:1.2 --- xc/extras/Mesa/src/mesa/x86/mmx.h:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/mmx.h Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: mmx.h,v 1.9 2002/04/19 20:12:30 jrfonseca Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/norm_args.h diff -u xc/extras/Mesa/src/mesa/x86/norm_args.h:1.1.1.1 xc/extras/Mesa/src/mesa/x86/norm_args.h:1.2 --- xc/extras/Mesa/src/mesa/x86/norm_args.h:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/norm_args.h Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: norm_args.h,v 1.4 2003/11/26 08:32:36 dborca Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/sse.h diff -u xc/extras/Mesa/src/mesa/x86/sse.h:1.1.1.1 xc/extras/Mesa/src/mesa/x86/sse.h:1.2 --- xc/extras/Mesa/src/mesa/x86/sse.h:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/sse.h Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: sse.h,v 1.2 2002/04/09 14:58:03 keithw Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/sse_normal.S diff -u xc/extras/Mesa/src/mesa/x86/sse_normal.S:1.3 xc/extras/Mesa/src/mesa/x86/sse_normal.S:1.4 --- xc/extras/Mesa/src/mesa/x86/sse_normal.S:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/sse_normal.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: sse_normal.S,v 1.4 2004/04/26 10:10:25 alanh Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/sse_normal.S,v 1.3 2004/12/10 15:30:13 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/sse_normal.S,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/sse_xform1.S diff -u xc/extras/Mesa/src/mesa/x86/sse_xform1.S:1.3 xc/extras/Mesa/src/mesa/x86/sse_xform1.S:1.4 --- xc/extras/Mesa/src/mesa/x86/sse_xform1.S:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/sse_xform1.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: sse_xform1.S,v 1.2 2004/04/26 10:10:25 alanh Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/sse_xform1.S,v 1.3 2004/12/10 15:30:13 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/sse_xform1.S,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/sse_xform2.S diff -u xc/extras/Mesa/src/mesa/x86/sse_xform2.S:1.3 xc/extras/Mesa/src/mesa/x86/sse_xform2.S:1.4 --- xc/extras/Mesa/src/mesa/x86/sse_xform2.S:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/sse_xform2.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: sse_xform2.S,v 1.2 2004/04/26 10:10:25 alanh Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/sse_xform2.S,v 1.3 2004/12/10 15:30:13 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/sse_xform2.S,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/sse_xform3.S diff -u xc/extras/Mesa/src/mesa/x86/sse_xform3.S:1.3 xc/extras/Mesa/src/mesa/x86/sse_xform3.S:1.4 --- xc/extras/Mesa/src/mesa/x86/sse_xform3.S:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/sse_xform3.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: sse_xform3.S,v 1.2 2004/04/26 10:10:25 alanh Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/sse_xform3.S,v 1.3 2004/12/10 15:30:13 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/sse_xform3.S,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/sse_xform4.S diff -u xc/extras/Mesa/src/mesa/x86/sse_xform4.S:1.3 xc/extras/Mesa/src/mesa/x86/sse_xform4.S:1.4 --- xc/extras/Mesa/src/mesa/x86/sse_xform4.S:1.3 Fri Dec 10 10:30:13 2004 +++ xc/extras/Mesa/src/mesa/x86/sse_xform4.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,4 @@ -/* $Id: sse_xform4.S,v 1.2 2004/04/26 10:10:25 alanh Exp $ */ -/* $XFree86: xc/extras/Mesa/src/mesa/x86/sse_xform4.S,v 1.3 2004/12/10 15:30:13 alanh Exp $ */ +/* $XFree86: xc/extras/Mesa/src/mesa/x86/sse_xform4.S,v 1.4 2006/01/09 14:56:40 dawes Exp $ */ /* * Mesa 3-D graphics library Index: xc/extras/Mesa/src/mesa/x86/x86.c diff -u xc/extras/Mesa/src/mesa/x86/x86.c:1.1.1.1 xc/extras/Mesa/src/mesa/x86/x86.c:1.2 --- xc/extras/Mesa/src/mesa/x86/x86.c:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/x86.c Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: x86.c,v 1.25 2002/04/09 14:58:03 keithw Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/x86.h diff -u xc/extras/Mesa/src/mesa/x86/x86.h:1.1.1.1 xc/extras/Mesa/src/mesa/x86/x86.h:1.2 --- xc/extras/Mesa/src/mesa/x86/x86.h:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/x86.h Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: x86.h,v 1.5 2002/04/09 14:58:03 keithw Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/x86_cliptest.S diff -u xc/extras/Mesa/src/mesa/x86/x86_cliptest.S:1.1.1.1 xc/extras/Mesa/src/mesa/x86/x86_cliptest.S:1.2 --- xc/extras/Mesa/src/mesa/x86/x86_cliptest.S:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/x86_cliptest.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: x86_cliptest.S,v 1.10 2002/06/11 01:26:58 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/x86_xform2.S diff -u xc/extras/Mesa/src/mesa/x86/x86_xform2.S:1.1.1.1 xc/extras/Mesa/src/mesa/x86/x86_xform2.S:1.2 --- xc/extras/Mesa/src/mesa/x86/x86_xform2.S:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/x86_xform2.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: x86_xform2.S,v 1.2 2002/03/07 21:40:08 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/x86_xform3.S diff -u xc/extras/Mesa/src/mesa/x86/x86_xform3.S:1.1.1.1 xc/extras/Mesa/src/mesa/x86/x86_xform3.S:1.2 --- xc/extras/Mesa/src/mesa/x86/x86_xform3.S:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/x86_xform3.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: x86_xform3.S,v 1.2 2002/03/07 21:40:08 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/x86_xform4.S diff -u xc/extras/Mesa/src/mesa/x86/x86_xform4.S:1.1.1.1 xc/extras/Mesa/src/mesa/x86/x86_xform4.S:1.2 --- xc/extras/Mesa/src/mesa/x86/x86_xform4.S:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/x86_xform4.S Mon Jan 9 09:56:40 2006 @@ -1,5 +1,3 @@ -/* $Id: x86_xform4.S,v 1.2 2002/03/07 21:40:08 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Mesa/src/mesa/x86/xform_args.h diff -u xc/extras/Mesa/src/mesa/x86/xform_args.h:1.1.1.1 xc/extras/Mesa/src/mesa/x86/xform_args.h:1.2 --- xc/extras/Mesa/src/mesa/x86/xform_args.h:1.1.1.1 Thu Apr 8 05:18:06 2004 +++ xc/extras/Mesa/src/mesa/x86/xform_args.h Mon Jan 9 09:56:41 2006 @@ -1,5 +1,3 @@ -/* $Id: xform_args.h,v 1.5 2002/10/29 20:28:58 brianp Exp $ */ - /* * Mesa 3-D graphics library * Version: 3.5 Index: xc/extras/Xpm/README.XFree86 diff -u xc/extras/Xpm/README.XFree86:1.1 xc/extras/Xpm/README.XFree86:1.2 --- xc/extras/Xpm/README.XFree86:1.1 Mon Jan 11 09:40:01 1999 +++ xc/extras/Xpm/README.XFree86 Mon Mar 28 23:00:28 2005 @@ -2,3 +2,7 @@ cvs import -m "Xpm version A.Bc" xc/extras/Xpm XPM XPM-A_Bc + + + +$XFree86: xc/extras/Xpm/README.XFree86,v 1.2 2005/03/29 04:00:28 tsi Exp $ Index: xc/extras/Xpm/cxpm/cxpm.c diff -u xc/extras/Xpm/cxpm/cxpm.c:1.3 xc/extras/Xpm/cxpm/cxpm.c:1.4 --- xc/extras/Xpm/cxpm/cxpm.c:1.3 Tue May 27 12:45:41 2003 +++ xc/extras/Xpm/cxpm/cxpm.c Thu Mar 24 21:22:50 2005 @@ -22,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Arnaud LE HORS. */ -/* $XFree86: xc/extras/Xpm/cxpm/cxpm.c,v 1.3 2003/05/27 16:45:41 tsi Exp $ */ +/* $XFree86: xc/extras/Xpm/cxpm/cxpm.c,v 1.4 2005/03/25 02:22:50 dawes Exp $ */ /*****************************************************************************\ * cxpm.c: * @@ -47,9 +47,7 @@ * note that 's' could stand both for "special" and "slow" ;-) */ static int -sGetc(data, file) - xpmData *data; - FILE *file; +sGetc(xpmData *data, FILE *file) { int c = getc(data->stream.file); if (c == '\n') { @@ -62,10 +60,7 @@ } static void -sUngetc(data, c, file) - xpmData *data; - int c; - FILE *file; +sUngetc(xpmData *data, int c, FILE *file) { ungetc(c, data->stream.file); if (c == '\n') { @@ -85,11 +80,8 @@ #include "../lib/Attrib.c" #include "../lib/Image.c" -void -ErrorMessage(ErrorStatus, data) - int ErrorStatus; - xpmData *data; - +static void +ErrorMessage(int ErrorStatus, xpmData *data) { char *error = NULL; @@ -121,9 +113,7 @@ } int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { XpmImage image; char *filename; Index: xc/extras/Xpm/lib/Attrib.c diff -u xc/extras/Xpm/lib/Attrib.c:1.3 xc/extras/Xpm/lib/Attrib.c:1.4 --- xc/extras/Xpm/lib/Attrib.c:1.3 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/Attrib.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Xpm/lib/Attrib.c,v 1.4 2005/03/29 04:00:28 tsi Exp $ */ /* * Copyright (C) 1989-95 GROUPE BULL * Index: xc/extras/Xpm/lib/Imakefile diff -u xc/extras/Xpm/lib/Imakefile:1.2 xc/extras/Xpm/lib/Imakefile:1.3 --- xc/extras/Xpm/lib/Imakefile:1.2 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/Imakefile Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +XCOMM $XFree86: xc/extras/Xpm/lib/Imakefile,v 1.3 2005/03/29 04:00:28 tsi Exp $ XCOMM XCOMM Copyright (C) 1989-95 GROUPE BULL XCOMM Index: xc/extras/Xpm/lib/RdFToBuf.c diff -u xc/extras/Xpm/lib/RdFToBuf.c:1.2 xc/extras/Xpm/lib/RdFToBuf.c:1.3 --- xc/extras/Xpm/lib/RdFToBuf.c:1.2 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/RdFToBuf.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Xpm/lib/RdFToBuf.c,v 1.3 2005/03/29 04:00:28 tsi Exp $ */ /* * Copyright (C) 1989-95 GROUPE BULL * Index: xc/extras/Xpm/lib/RdFToI.c diff -u xc/extras/Xpm/lib/RdFToI.c:1.3 xc/extras/Xpm/lib/RdFToI.c:1.4 --- xc/extras/Xpm/lib/RdFToI.c:1.3 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/RdFToI.c Thu Mar 24 21:22:50 2005 @@ -31,7 +31,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/RdFToI.c,v 1.3 2004/11/18 21:30:51 herrb Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/RdFToI.c,v 1.4 2005/03/25 02:22:50 dawes Exp $ */ /* October 2004, source code review by Thomas Biege */ @@ -126,9 +126,9 @@ * open the given file to be read as an xpmData which is returned. */ #ifndef NO_ZPIPE - FILE *s_popen(char *cmd, const char *type); +# define safe_popen s_popen #else -# define s_popen popen +# define safe_popen popen #endif static int @@ -157,13 +157,13 @@ if ((len > 2) && !strcmp(".Z", filename + (len - 2))) { mdata->type = XPMPIPE; snprintf(buf, sizeof(buf), "uncompress -c \"%s\"", filename); - if (!(mdata->stream.file = s_popen(buf, "r"))) + if (!(mdata->stream.file = safe_popen(buf, "r"))) return (XpmOpenFailed); } else if ((len > 3) && !strcmp(".gz", filename + (len - 3))) { mdata->type = XPMPIPE; snprintf(buf, sizeof(buf), "gunzip -qc \"%s\"", filename); - if (!(mdata->stream.file = s_popen(buf, "r"))) + if (!(mdata->stream.file = safe_popen(buf, "r"))) return (XpmOpenFailed); } else { @@ -174,7 +174,7 @@ snprintf(compressfile, len+4, "%s.Z", filename); if (!stat(compressfile, &status)) { snprintf(buf, sizeof(buf), "uncompress -c \"%s\"", compressfile); - if (!(mdata->stream.file = s_popen(buf, "r"))) { + if (!(mdata->stream.file = safe_popen(buf, "r"))) { XpmFree(compressfile); return (XpmOpenFailed); } @@ -183,7 +183,7 @@ snprintf(compressfile, len+4, "%s.gz", filename); if (!stat(compressfile, &status)) { snprintf(buf, sizeof(buf), "gunzip -c \"%s\"", compressfile); - if (!(mdata->stream.file = s_popen(buf, "r"))) { + if (!(mdata->stream.file = safe_popen(buf, "r"))) { XpmFree(compressfile); return (XpmOpenFailed); } Index: xc/extras/Xpm/lib/WrFFrBuf.c diff -u xc/extras/Xpm/lib/WrFFrBuf.c:1.2 xc/extras/Xpm/lib/WrFFrBuf.c:1.3 --- xc/extras/Xpm/lib/WrFFrBuf.c:1.2 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/WrFFrBuf.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Xpm/lib/WrFFrBuf.c,v 1.3 2005/03/29 04:00:28 tsi Exp $ */ /* * Copyright (C) 1989-95 GROUPE BULL * Index: xc/extras/Xpm/lib/WrFFrI.c diff -u xc/extras/Xpm/lib/WrFFrI.c:1.4 xc/extras/Xpm/lib/WrFFrI.c:1.5 --- xc/extras/Xpm/lib/WrFFrI.c:1.4 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/WrFFrI.c Thu Mar 24 21:22:50 2005 @@ -31,7 +31,7 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/WrFFrI.c,v 1.4 2004/11/18 21:30:51 herrb Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/WrFFrI.c,v 1.5 2005/03/25 02:22:50 dawes Exp $ */ /* * The code related to AMIGA has been added by @@ -305,9 +305,9 @@ * open the given file to be written as an xpmData which is returned */ #ifndef NO_ZPIPE - FILE *s_popen(char *cmd, const char *type); +# define safe_popen s_popen #else -# define s_popen popen +# define safe_popen popen #endif static int OpenWriteFile(filename, mdata) @@ -334,13 +334,13 @@ if (len > 2 && !strcmp(".Z", filename + (len - 2))) { snprintf(buf, sizeof(buf), "compress > \"%s\"", filename); - if (!(mdata->stream.file = s_popen(buf, "w"))) + if (!(mdata->stream.file = safe_popen(buf, "w"))) return (XpmOpenFailed); mdata->type = XPMPIPE; } else if (len > 3 && !strcmp(".gz", filename + (len - 3))) { snprintf(buf, sizeof(buf), "gzip -q > \"%s\"", filename); - if (!(mdata->stream.file = s_popen(buf, "w"))) + if (!(mdata->stream.file = safe_popen(buf, "w"))) return (XpmOpenFailed); mdata->type = XPMPIPE; Index: xc/extras/Xpm/lib/XpmI.h diff -u xc/extras/Xpm/lib/XpmI.h:1.11 xc/extras/Xpm/lib/XpmI.h:1.12 --- xc/extras/Xpm/lib/XpmI.h:1.11 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/XpmI.h Thu Mar 24 21:22:50 2005 @@ -22,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from GROUPE BULL. */ -/* $XFree86: xc/extras/Xpm/lib/XpmI.h,v 1.11 2004/11/18 21:30:51 herrb Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/XpmI.h,v 1.12 2005/03/25 02:22:50 dawes Exp $ */ /*****************************************************************************\ * XpmI.h: * @@ -326,4 +326,7 @@ FUNC(xpmatoui, unsigned int, (char *p, unsigned int l, unsigned int *ui_return)); +FUNC(s_popen, FILE *, (char *cmd, const char *type)); + + #endif Index: xc/extras/Xpm/lib/data.c diff -u xc/extras/Xpm/lib/data.c:1.6 xc/extras/Xpm/lib/data.c:1.7 --- xc/extras/Xpm/lib/data.c:1.6 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/data.c Mon Jan 9 09:56:41 2006 @@ -31,18 +31,11 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/data.c,v 1.6 2004/11/18 21:30:51 herrb Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/data.c,v 1.7 2006/01/09 14:56:41 dawes Exp $ */ /* October 2004, source code review by Thomas Biege */ #ifndef CXPMPROG -#if 0 -/* Official version number */ -static char *RCS_Version = "$XpmVersion: 3.4k $"; - -/* Internal version number */ -static char *RCS_Id = "Id: xpm.shar,v 3.71 1998/03/19 19:47:14 lehors Exp $"; -#endif #include "XpmI.h" #endif #include Index: xc/extras/Xpm/lib/hashtab.c diff -u xc/extras/Xpm/lib/hashtab.c:1.3 xc/extras/Xpm/lib/hashtab.c:1.4 --- xc/extras/Xpm/lib/hashtab.c:1.3 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/hashtab.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Xpm/lib/hashtab.c,v 1.4 2005/03/29 04:00:28 tsi Exp $ */ /* * Copyright (C) 1989-95 GROUPE BULL * Index: xc/extras/Xpm/lib/misc.c diff -u xc/extras/Xpm/lib/misc.c:1.2 xc/extras/Xpm/lib/misc.c:1.3 --- xc/extras/Xpm/lib/misc.c:1.2 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/misc.c Mon Mar 28 23:00:28 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/Xpm/lib/misc.c,v 1.3 2005/03/29 04:00:28 tsi Exp $ */ /* * Copyright (C) 1989-95 GROUPE BULL * Index: xc/extras/Xpm/lib/parse.c diff -u xc/extras/Xpm/lib/parse.c:1.6 xc/extras/Xpm/lib/parse.c:1.7 --- xc/extras/Xpm/lib/parse.c:1.6 Thu Nov 18 16:30:51 2004 +++ xc/extras/Xpm/lib/parse.c Mon Jan 9 09:56:41 2006 @@ -1,4 +1,3 @@ -/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */ /* * Copyright (C) 1989-95 GROUPE BULL * @@ -23,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from GROUPE BULL. */ -/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.6 2004/11/18 21:30:51 herrb Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.7 2006/01/09 14:56:41 dawes Exp $ */ /*****************************************************************************\ * parse.c: * @@ -34,7 +33,6 @@ * * * Developed by Arnaud Le Hors * \*****************************************************************************/ -/* $XFree86: xc/extras/Xpm/lib/parse.c,v 1.6 2004/11/18 21:30:51 herrb Exp $ */ /* * The code related to FOR_MSW has been added by Index: xc/extras/Xpm/lib/s_popen.c diff -u xc/extras/Xpm/lib/s_popen.c:1.2 xc/extras/Xpm/lib/s_popen.c:1.3 --- xc/extras/Xpm/lib/s_popen.c:1.2 Fri Dec 17 11:38:03 2004 +++ xc/extras/Xpm/lib/s_popen.c Thu Mar 24 21:22:50 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/Xpm/lib/s_popen.c,v 1.2 2004/12/17 16:38:03 tsi Exp $ */ +/* $XFree86: xc/extras/Xpm/lib/s_popen.c,v 1.3 2005/03/25 02:22:50 dawes Exp $ */ /* * Copyright (C) 2004 The X.Org fundation * @@ -44,6 +44,7 @@ #include #include #include +#include "XpmI.h" #define __SEC_POPEN_TOKEN " " Index: xc/extras/Xpm/sxpm/sxpm.c diff -u xc/extras/Xpm/sxpm/sxpm.c:1.3 xc/extras/Xpm/sxpm/sxpm.c:1.4 --- xc/extras/Xpm/sxpm/sxpm.c:1.3 Sat Oct 27 23:32:13 2001 +++ xc/extras/Xpm/sxpm/sxpm.c Thu Mar 24 21:22:51 2005 @@ -22,7 +22,7 @@ * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from GROUPE BULL. */ -/* $XFree86: xc/extras/Xpm/sxpm/sxpm.c,v 1.3 2001/10/28 03:32:13 tsi Exp $ */ +/* $XFree86: xc/extras/Xpm/sxpm/sxpm.c,v 1.4 2005/03/25 02:22:51 dawes Exp $ */ /*****************************************************************************\ * sxpm.c: * @@ -99,16 +99,11 @@ #define xrdb XtDatabase(dpy) static Colormap colormap; -void Usage(); -void ErrorMessage(); -void Punt(); -void VersionInfo(); - -#ifdef __STDC__ -void kinput(Widget widget, char *tag, XEvent *xe, Boolean *b); -#else -void kinput(); -#endif +static void Usage(void); +static void ErrorMessage(int ErrorStatus, char *tag); +static void Punt(int i); +static void VersionInfo(void); +static void kinput(Widget widget, char *tag, XEvent *xe, Boolean *b); #define IWIDTH 50 #define IHEIGHT 50 @@ -128,9 +123,7 @@ }; int -main(argc, argv) - int argc; - char **argv; +main(int argc, char **argv) { int ErrorStatus; unsigned int verbose = 0; /* performs verbose output */ @@ -556,8 +549,8 @@ return 0; } -void -Usage() +static void +Usage(void) { fprintf(stderr, "\nUsage: %s [options...]\n", command[0]); fprintf(stderr, "Where options are:\n\ @@ -592,10 +585,8 @@ } -void -ErrorMessage(ErrorStatus, tag) - int ErrorStatus; - char *tag; +static void +ErrorMessage(int ErrorStatus, char *tag) { char *error = NULL; char *warning = NULL; @@ -629,9 +620,8 @@ } } -void -Punt(i) - int i; +static void +Punt(int i) { if (icon.pixmap) { XFreePixmap(dpy, icon.pixmap); @@ -658,12 +648,8 @@ exit(i); } -void -kinput(widget, tag, xe, b) - Widget widget; - char *tag; - XEvent *xe; - Boolean *b; +static void +kinput(Widget widget, char *tag, XEvent *xe, Boolean *b) { char c = '\0'; @@ -676,20 +662,17 @@ * small function to extract various version numbers from the given global * number (following the rule described in xpm.h). */ -void -GetNumbers(num, format_return, libmajor_return, libminor_return) - int num; - int *format_return; - int *libmajor_return; - char *libminor_return; +static void +GetNumbers(int num, int *format_return, int *libmajor_return, + char *libminor_return) { *format_return = num / 10000; *libmajor_return = (num % 10000) / 100; *libminor_return = 'a' + (num % 10000) % 100 - 1; } -void -VersionInfo() +static void +VersionInfo(void) { int format, libmajor; char libminor; Index: xc/extras/expat/lib/internal.h diff -u xc/extras/expat/lib/internal.h:1.2 xc/extras/expat/lib/internal.h:1.3 --- xc/extras/expat/lib/internal.h:1.2 Thu Nov 6 13:37:54 2003 +++ xc/extras/expat/lib/internal.h Sun Feb 19 19:14:35 2006 @@ -19,12 +19,13 @@ Note: Use of these macros is based on judgement, not hard rules, and therefore subject to change. */ -/* $XFree86: xc/extras/expat/lib/internal.h,v 1.2 2003/11/06 18:37:54 tsi Exp $ */ +/* $XFree86: xc/extras/expat/lib/internal.h,v 1.3 2006/02/20 00:14:35 dawes Exp $ */ #if defined(__GNUC__) && \ !defined(ia64) && !defined(__ia64__) && \ !defined(__sparc__) && !defined(__sparc_v9__) && !defined(sparc) && \ - !defined(__sparc64__) && !defined(__arch64__) + !defined(__sparc64__) && !defined(__arch64__) && !defined(__alpha__) && \ + !defined(__powerpc__) /* Instability reported with egcs on a RedHat Linux 7.3. Let's comment it out: Index: xc/extras/fontconfig/fontconfig-config.in diff -u xc/extras/fontconfig/fontconfig-config.in:1.2 xc/extras/fontconfig/fontconfig-config.in:1.3 --- xc/extras/fontconfig/fontconfig-config.in:1.2 Fri Oct 31 15:49:04 2003 +++ xc/extras/fontconfig/fontconfig-config.in Mon Mar 28 23:00:29 2005 @@ -1,5 +1,7 @@ #! /bin/sh +# $XFree86: xc/extras/fontconfig/fontconfig-config.in,v 1.3 2005/03/29 04:00:29 tsi Exp $ + prefix="@prefix@" exec_prefix="@exec_prefix@" libdir="@libdir@" Index: xc/extras/fontconfig/src/fccfg.c diff -u xc/extras/fontconfig/src/fccfg.c:1.2 xc/extras/fontconfig/src/fccfg.c:1.4 --- xc/extras/fontconfig/src/fccfg.c:1.2 Wed Jun 4 12:29:39 2003 +++ xc/extras/fontconfig/src/fccfg.c Sun Mar 26 20:32:46 2006 @@ -19,7 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/extras/fontconfig/src/fccfg.c,v 1.2 2003/06/04 16:29:39 dawes Exp $ */ +/* $XFree86: xc/extras/fontconfig/src/fccfg.c,v 1.4 2006/03/27 01:32:46 dawes Exp $ */ #include "fcint.h" @@ -675,6 +675,7 @@ r = FcPatternGet (p, e->u.field, 0, &v); if (r != FcResultMatch) v.type = FcTypeVoid; + v = FcValueSave (v); break; case FcOpConst: if (FcNameConstant (e->u.constant, &v.u.i)) @@ -1382,10 +1383,11 @@ file = 0; switch (*url) { case '~': - dir = (FcChar8 *) getenv ("HOME"); - if (dir) + dir = FcGetHomeDir (); + if (dir) { file = FcConfigFileExists (dir, url + 1); - else + FcStrFree (dir); + } else file = 0; break; case '/': Index: xc/extras/fontconfig/src/fcdir.c diff -u xc/extras/fontconfig/src/fcdir.c:1.2 xc/extras/fontconfig/src/fcdir.c:1.4 --- xc/extras/fontconfig/src/fcdir.c:1.2 Wed Jun 4 12:29:39 2003 +++ xc/extras/fontconfig/src/fcdir.c Mon Jun 6 21:33:38 2005 @@ -19,10 +19,11 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/extras/fontconfig/src/fcdir.c,v 1.2 2003/06/04 16:29:39 dawes Exp $ */ +/* $XFree86: xc/extras/fontconfig/src/fcdir.c,v 1.4 2005/06/07 01:33:38 tsi Exp $ */ #include "fcint.h" #include +#include static FcBool FcFileIsDir (const FcChar8 *file) @@ -219,3 +220,23 @@ { return FcDirCacheWriteDir (set, dirs, dir); } + +FcChar8 * +FcGetHomeDir () +{ + struct passwd *pw; + char *home = NULL, *p; + + if (!(home = getenv("HOME"))) { + if ((p = getenv("USER"))) { + pw = getpwnam(p); + } else { + pw = getpwuid(getuid()); + } + if (pw) { + home = pw->pw_dir; + } + } + return FcStrCopy((FcChar8 *)home); +} + Index: xc/extras/fontconfig/src/fcint.h diff -u xc/extras/fontconfig/src/fcint.h:1.2 xc/extras/fontconfig/src/fcint.h:1.3 --- xc/extras/fontconfig/src/fcint.h:1.2 Wed Oct 22 13:15:22 2003 +++ xc/extras/fontconfig/src/fcint.h Tue May 3 16:43:27 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/extras/fontconfig/src/fcint.h,v 1.2 2003/10/22 17:15:22 tsi Exp $ + * $XFree86: xc/extras/fontconfig/src/fcint.h,v 1.3 2005/05/03 20:43:27 dawes Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -467,6 +467,8 @@ FcDebug (void); /* fcdir.c */ +FcChar8 * +FcGetHomeDir (void); /* fcfont.c */ int Index: xc/extras/fontconfig/src/fcmatch.c diff -u xc/extras/fontconfig/src/fcmatch.c:1.1.1.1 xc/extras/fontconfig/src/fcmatch.c:1.2 --- xc/extras/fontconfig/src/fcmatch.c:1.1.1.1 Tue Jun 3 22:58:01 2003 +++ xc/extras/fontconfig/src/fcmatch.c Sat Mar 18 20:58:37 2006 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/extras/fontconfig/src/fcmatch.c,v 1.1.1.1 2003/06/04 02:58:01 dawes Exp $ + * $XFree86: xc/extras/fontconfig/src/fcmatch.c,v 1.2 2006/03/19 01:58:37 dawes Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -27,6 +27,7 @@ #include "fcint.h" #include +#if 0 static double FcCompareInteger (char *object, FcValue value1, FcValue value2) { @@ -39,6 +40,7 @@ v = -v; return (double) v; } +#endif static double FcCompareString (char *object, FcValue value1, FcValue value2) @@ -173,7 +175,7 @@ { FC_LANG, FcCompareLang, 3, 3 }, #define MATCH_LANG 3 - { FC_SPACING, FcCompareInteger, 5, 5 }, + { FC_SPACING, FcCompareSize, 5, 5 }, #define MATCH_SPACING 4 { FC_PIXEL_SIZE, FcCompareSize, 6, 6 }, @@ -182,10 +184,10 @@ { FC_STYLE, FcCompareString, 7, 7 }, #define MATCH_STYLE 6 - { FC_SLANT, FcCompareInteger, 8, 8 }, + { FC_SLANT, FcCompareSize, 8, 8 }, #define MATCH_SLANT 7 - { FC_WEIGHT, FcCompareInteger, 9, 9 }, + { FC_WEIGHT, FcCompareSize, 9, 9 }, #define MATCH_WEIGHT 8 { FC_ANTIALIAS, FcCompareBool, 10, 10 }, @@ -197,7 +199,7 @@ { FC_OUTLINE, FcCompareBool, 12, 12 }, #define MATCH_OUTLINE 11 - { FC_FONTVERSION, FcCompareInteger, 13, 13 }, + { FC_FONTVERSION, FcCompareSize, 13, 13 }, #define MATCH_FONTVERSION 12 }; Index: xc/extras/fontconfig/src/fcstr.c diff -u xc/extras/fontconfig/src/fcstr.c:1.3 xc/extras/fontconfig/src/fcstr.c:1.4 --- xc/extras/fontconfig/src/fcstr.c:1.3 Fri Nov 7 13:12:36 2003 +++ xc/extras/fontconfig/src/fcstr.c Tue May 3 16:43:27 2005 @@ -19,7 +19,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/extras/fontconfig/src/fcstr.c,v 1.3 2003/11/07 18:12:36 dawes Exp $ */ +/* $XFree86: xc/extras/fontconfig/src/fcstr.c,v 1.4 2005/05/03 20:43:27 dawes Exp $ */ #include #include @@ -426,7 +426,7 @@ if (*s == '~') { - FcChar8 *home = (FcChar8 *) getenv ("HOME"); + FcChar8 *home = FcGetHomeDir (); int size; if (!home) return 0; @@ -437,6 +437,7 @@ FcMemAlloc (FC_MEM_STRING, size); strcpy ((char *) new, (char *) home); strcat ((char *) new, (char *) s + 1); + FcStrFree (home); } else { Index: xc/extras/fontconfig/src/fontconfig-def.cpp diff -u xc/extras/fontconfig/src/fontconfig-def.cpp:1.2 xc/extras/fontconfig/src/fontconfig-def.cpp:1.3 --- xc/extras/fontconfig/src/fontconfig-def.cpp:1.2 Wed Jun 4 12:29:39 2003 +++ xc/extras/fontconfig/src/fontconfig-def.cpp Sat Apr 8 14:30:24 2006 @@ -194,5 +194,10 @@ FcCharSetFirstPage FcCharSetNextPage FcUtf16ToUcs4 +FcPatternEqual +FcPatternHash +FcPatternReference +FcFontSort +FcFontSetSortDestroy #endif -/* $XFree86: xc/extras/fontconfig/src/fontconfig-def.cpp,v 1.2 2003/06/04 16:29:39 dawes Exp $ */ +/* $XFree86: xc/extras/fontconfig/src/fontconfig-def.cpp,v 1.3 2006/04/08 18:30:24 dawes Exp $ */ Index: xc/extras/fonts/ClearlyU/README diff -u xc/extras/fonts/ClearlyU/README:1.5 xc/extras/fonts/ClearlyU/README:1.6 --- xc/extras/fonts/ClearlyU/README:1.5 Fri Dec 13 22:51:39 2002 +++ xc/extras/fonts/ClearlyU/README Mon Jan 9 09:56:41 2006 @@ -1,5 +1,5 @@ # -# Id: README,v 1.19 2002/11/22 23:11:31 mleisher Exp $ +# $XFree86: xc/extras/fonts/ClearlyU/README,v 1.6 2006/01/09 14:56:41 dawes Exp $ # # Copyright 2002 Computing Research Lab, New Mexico State University # Index: xc/extras/fonts/ClearlyU/cu-alt12.bdf diff -u xc/extras/fonts/ClearlyU/cu-alt12.bdf:1.5 xc/extras/fonts/ClearlyU/cu-alt12.bdf:1.6 --- xc/extras/fonts/ClearlyU/cu-alt12.bdf:1.5 Fri Dec 13 22:51:39 2002 +++ xc/extras/fonts/ClearlyU/cu-alt12.bdf Mon Jan 9 09:56:41 2006 @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT -COMMENT Id: cu-alt12.bdf,v 1.12 2002/11/22 22:46:24 mleisher Exp $ +COMMENT $XFree86: xc/extras/fonts/ClearlyU/cu-alt12.bdf,v 1.6 2006/01/09 14:56:41 dawes Exp $ COMMENT COMMENT Copyright 2002 Computing Research Labs, New Mexico State University COMMENT Index: xc/extras/fonts/ClearlyU/cu-arabic12.bdf diff -u xc/extras/fonts/ClearlyU/cu-arabic12.bdf:1.5 xc/extras/fonts/ClearlyU/cu-arabic12.bdf:1.6 --- xc/extras/fonts/ClearlyU/cu-arabic12.bdf:1.5 Fri Dec 13 22:51:39 2002 +++ xc/extras/fonts/ClearlyU/cu-arabic12.bdf Mon Jan 9 09:56:41 2006 @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT -COMMENT Id: cu-arabic12.bdf,v 1.7 2002/11/22 22:46:24 mleisher Exp $ +COMMENT $XFree86: xc/extras/fonts/ClearlyU/cu-arabic12.bdf,v 1.6 2006/01/09 14:56:41 dawes Exp $ COMMENT COMMENT Copyright 2002 Computing Research Labs, New Mexico State University COMMENT Index: xc/extras/fonts/ClearlyU/cu-devnag12.bdf diff -u xc/extras/fonts/ClearlyU/cu-devnag12.bdf:1.3 xc/extras/fonts/ClearlyU/cu-devnag12.bdf:1.4 --- xc/extras/fonts/ClearlyU/cu-devnag12.bdf:1.3 Fri Dec 13 22:51:39 2002 +++ xc/extras/fonts/ClearlyU/cu-devnag12.bdf Mon Jan 9 09:56:42 2006 @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT -COMMENT Id: cu-devnag12.bdf,v 1.2 2002/11/22 22:46:25 mleisher Exp $ +COMMENT $XFree86: xc/extras/fonts/ClearlyU/cu-devnag12.bdf,v 1.4 2006/01/09 14:56:42 dawes Exp $ COMMENT COMMENT Copyright 2002 Computing Research Labs, New Mexico State University COMMENT Index: xc/extras/fonts/ClearlyU/cu-lig12.bdf diff -u xc/extras/fonts/ClearlyU/cu-lig12.bdf:1.5 xc/extras/fonts/ClearlyU/cu-lig12.bdf:1.6 --- xc/extras/fonts/ClearlyU/cu-lig12.bdf:1.5 Fri Dec 13 22:51:39 2002 +++ xc/extras/fonts/ClearlyU/cu-lig12.bdf Mon Jan 9 09:56:42 2006 @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT -COMMENT Id: cu-lig12.bdf,v 1.7 2002/11/22 22:46:25 mleisher Exp $ +COMMENT $XFree86: xc/extras/fonts/ClearlyU/cu-lig12.bdf,v 1.6 2006/01/09 14:56:42 dawes Exp $ COMMENT COMMENT Copyright 2002 Computing Research Labs, New Mexico State University COMMENT Index: xc/extras/fonts/ClearlyU/cu-pua12.bdf diff -u xc/extras/fonts/ClearlyU/cu-pua12.bdf:1.5 xc/extras/fonts/ClearlyU/cu-pua12.bdf:1.6 --- xc/extras/fonts/ClearlyU/cu-pua12.bdf:1.5 Fri Dec 13 22:51:39 2002 +++ xc/extras/fonts/ClearlyU/cu-pua12.bdf Mon Jan 9 09:56:42 2006 @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT -COMMENT Id: cu-pua12.bdf,v 1.8 2002/11/22 22:46:25 mleisher Exp $ +COMMENT $XFree86: xc/extras/fonts/ClearlyU/cu-pua12.bdf,v 1.6 2006/01/09 14:56:42 dawes Exp $ COMMENT COMMENT Copyright 2002 Computing Research Labs, New Mexico State University COMMENT Index: xc/extras/fonts/ClearlyU/cu12.bdf diff -u xc/extras/fonts/ClearlyU/cu12.bdf:1.7 xc/extras/fonts/ClearlyU/cu12.bdf:1.8 --- xc/extras/fonts/ClearlyU/cu12.bdf:1.7 Fri Dec 13 22:51:39 2002 +++ xc/extras/fonts/ClearlyU/cu12.bdf Mon Jan 9 09:56:42 2006 @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT -COMMENT Id: cu12.bdf,v 1.26 2002/11/22 23:07:56 mleisher Exp $ +COMMENT $XFree86: xc/extras/fonts/ClearlyU/cu12.bdf,v 1.8 2006/01/09 14:56:42 dawes Exp $ COMMENT COMMENT Copyright 2002 Computing Research Labs, New Mexico State University COMMENT Index: xc/extras/fonts/ClearlyU/cuarabic12.bdf diff -u xc/extras/fonts/ClearlyU/cuarabic12.bdf:1.2 xc/extras/fonts/ClearlyU/cuarabic12.bdf:1.3 --- xc/extras/fonts/ClearlyU/cuarabic12.bdf:1.2 Fri Dec 13 23:00:04 2002 +++ xc/extras/fonts/ClearlyU/cuarabic12.bdf Mon Jan 9 09:56:43 2006 @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT -COMMENT Id: cuarabic12.bdf,v 1.6 2002/11/22 22:46:31 mleisher Exp $ +COMMENT $XFree86: xc/extras/fonts/ClearlyU/cuarabic12.bdf,v 1.3 2006/01/09 14:56:43 dawes Exp $ COMMENT COMMENT Copyright 2002 Computing Research Labs, New Mexico State University COMMENT Index: xc/extras/fonts/ClearlyU/cudevnag12.bdf diff -u xc/extras/fonts/ClearlyU/cudevnag12.bdf:1.2 xc/extras/fonts/ClearlyU/cudevnag12.bdf:1.3 --- xc/extras/fonts/ClearlyU/cudevnag12.bdf:1.2 Fri Dec 13 23:00:04 2002 +++ xc/extras/fonts/ClearlyU/cudevnag12.bdf Mon Jan 9 09:56:43 2006 @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT -COMMENT Id: cudevnag12.bdf,v 1.1 2002/11/22 22:46:31 mleisher Exp $ +COMMENT $XFree86: xc/extras/fonts/ClearlyU/cudevnag12.bdf,v 1.3 2006/01/09 14:56:43 dawes Exp $ COMMENT COMMENT Copyright 2002 Computing Research Labs, New Mexico State University COMMENT Index: xc/extras/fonts/arabic24/README diff -u xc/extras/fonts/arabic24/README:1.2 xc/extras/fonts/arabic24/README:1.3 --- xc/extras/fonts/arabic24/README:1.2 Sun May 9 03:50:51 1999 +++ xc/extras/fonts/arabic24/README Mon Jan 9 09:56:44 2006 @@ -1,6 +1,4 @@ # -# From: Id: README,v 1.2 1999/05/03 14:21:32 mleisher Exp $ -# # Copyright 1996, 1997, 1998, 1999 Computing Research Labs, # New Mexico State University # @@ -70,3 +68,5 @@ 08 February 1999 mleisher@crl.nmsu.edu (Mark Leisher) + +$XFree86: xc/extras/fonts/arabic24/README,v 1.3 2006/01/09 14:56:44 dawes Exp $ Index: xc/extras/fonts/arabic24/arabic24.bdf diff -u xc/extras/fonts/arabic24/arabic24.bdf:1.4 xc/extras/fonts/arabic24/arabic24.bdf:1.5 --- xc/extras/fonts/arabic24/arabic24.bdf:1.4 Sun May 9 03:50:51 1999 +++ xc/extras/fonts/arabic24/arabic24.bdf Mon Jan 9 09:56:44 2006 @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT -COMMENT From: Id: arabic24.bdf,v 1.2 1999/05/03 14:21:32 mleisher Exp $ +COMMENT $XFree86: xc/extras/fonts/arabic24/arabic24.bdf,v 1.5 2006/01/09 14:56:44 dawes Exp $ COMMENT COMMENT Copyright 1996, 1997, 1998, 1999 Computing Research Labs, COMMENT New Mexico State University Index: xc/extras/fonts/arabic24/uniarab.txt diff -u xc/extras/fonts/arabic24/uniarab.txt:1.2 xc/extras/fonts/arabic24/uniarab.txt:1.3 --- xc/extras/fonts/arabic24/uniarab.txt:1.2 Sun May 9 03:50:52 1999 +++ xc/extras/fonts/arabic24/uniarab.txt Mon Jan 9 09:56:44 2006 @@ -1,5 +1,5 @@ # -# From: Id: uniarab.txt,v 1.1 1999/02/08 22:21:52 mleisher Exp $ +# $XFree86: xc/extras/fonts/arabic24/uniarab.txt,v 1.3 2006/01/09 14:56:44 dawes Exp $ # # Copyright 1996, 1997, 1998, 1999 Computing Research Labs, # New Mexico State University Index: xc/extras/freetype2/src/gzip/adler32.c diff -u xc/extras/freetype2/src/gzip/adler32.c:1.1.1.1 xc/extras/freetype2/src/gzip/adler32.c:1.2 --- xc/extras/freetype2/src/gzip/adler32.c:1.1.1.1 Wed May 28 22:01:52 2003 +++ xc/extras/freetype2/src/gzip/adler32.c Mon Jan 9 09:56:44 2006 @@ -3,8 +3,6 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: adler32.c,v 1.4 2003/01/30 23:24:18 davidT Exp $ */ - #include "zlib.h" #define BASE 65521L /* largest prime smaller than 65536 */ Index: xc/extras/freetype2/src/gzip/zconf.h diff -u xc/extras/freetype2/src/gzip/zconf.h:1.1.1.1 xc/extras/freetype2/src/gzip/zconf.h:1.2 --- xc/extras/freetype2/src/gzip/zconf.h:1.1.1.1 Wed May 28 22:01:52 2003 +++ xc/extras/freetype2/src/gzip/zconf.h Mon Jan 9 09:56:44 2006 @@ -3,8 +3,6 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: zconf.h,v 1.3 2002/12/26 20:50:40 davidT Exp $ */ - #ifndef _ZCONF_H #define _ZCONF_H Index: xc/extras/freetype2/src/gzip/zutil.c diff -u xc/extras/freetype2/src/gzip/zutil.c:1.1.1.1 xc/extras/freetype2/src/gzip/zutil.c:1.2 --- xc/extras/freetype2/src/gzip/zutil.c:1.1.1.1 Wed May 28 22:01:52 2003 +++ xc/extras/freetype2/src/gzip/zutil.c Mon Jan 9 09:56:44 2006 @@ -3,8 +3,6 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id: zutil.c,v 1.2 2002/11/06 22:32:54 davidT Exp $ */ - #include "zutil.h" #ifndef STDC Index: xc/extras/freetype2/src/gzip/zutil.h diff -u xc/extras/freetype2/src/gzip/zutil.h:1.3 xc/extras/freetype2/src/gzip/zutil.h:1.4 --- xc/extras/freetype2/src/gzip/zutil.h:1.3 Mon Apr 26 12:15:54 2004 +++ xc/extras/freetype2/src/gzip/zutil.h Mon Jan 9 09:56:44 2006 @@ -8,9 +8,7 @@ subject to change. Applications should only use zlib.h. */ -/* @(#) $Id: zutil.h,v 1.4 2003/05/21 07:39:42 werner Exp $ */ - -/* $XFree86: xc/extras/freetype2/src/gzip/zutil.h,v 1.3 2004/04/26 16:15:54 dawes Exp $ */ +/* $XFree86: xc/extras/freetype2/src/gzip/zutil.h,v 1.4 2006/01/09 14:56:44 dawes Exp $ */ #ifndef _Z_UTIL_H #define _Z_UTIL_H Index: xc/extras/freetype2/src/lzw/zopen.c diff -u xc/extras/freetype2/src/lzw/zopen.c:1.2 xc/extras/freetype2/src/lzw/zopen.c:1.3 --- xc/extras/freetype2/src/lzw/zopen.c:1.2 Thu Dec 16 17:15:48 2004 +++ xc/extras/freetype2/src/lzw/zopen.c Mon Jan 9 09:56:44 2006 @@ -1,5 +1,4 @@ -/* $XFree86: xc/extras/freetype2/src/lzw/zopen.c,v 1.2 2004/12/16 22:15:48 tsi Exp $ */ -/* $NetBSD: zopen.c,v 1.8 2003/08/07 11:13:29 agc Exp $ */ +/* $XFree86: xc/extras/freetype2/src/lzw/zopen.c,v 1.3 2006/01/09 14:56:44 dawes Exp $ */ /*- * Copyright (c) 1985, 1986, 1992, 1993 @@ -43,14 +42,6 @@ * */ -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93"; -#else -static char rcsid[] = "$NetBSD: zopen.c,v 1.8 2003/08/07 11:13:29 agc Exp $"; -#endif -#endif /* LIBC_SCCS and not lint */ - /*- * fcompress.c - File compression ala IEEE Computer, June 1984. * Index: xc/extras/freetype2/src/lzw/zopen.h diff -u xc/extras/freetype2/src/lzw/zopen.h:1.1.1.1 xc/extras/freetype2/src/lzw/zopen.h:1.2 --- xc/extras/freetype2/src/lzw/zopen.h:1.1.1.1 Mon Apr 26 11:40:41 2004 +++ xc/extras/freetype2/src/lzw/zopen.h Mon Jan 9 09:56:44 2006 @@ -1,5 +1,3 @@ -/* $NetBSD: zopen.c,v 1.8 2003/08/07 11:13:29 agc Exp $ */ - /*- * Copyright (c) 1985, 1986, 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -42,14 +40,6 @@ * */ -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93"; -#else -static char rcsid[] = "$NetBSD: zopen.c,v 1.8 2003/08/07 11:13:29 agc Exp $"; -#endif -#endif /* LIBC_SCCS and not lint */ - #include #define BITS 16 /* Default bits. */ Index: xc/extras/ogl-sample/main/doc/man/manrules diff -u xc/extras/ogl-sample/main/doc/man/manrules:1.3 xc/extras/ogl-sample/main/doc/man/manrules:1.4 --- xc/extras/ogl-sample/main/doc/man/manrules:1.3 Tue Feb 6 12:45:08 2001 +++ xc/extras/ogl-sample/main/doc/man/manrules Mon Jan 9 09:56:44 2006 @@ -31,8 +31,6 @@ # published by SGI, but has not been independently verified as being # compliant with the OpenGL(R) version 1.2.1 Specification. # -# $Date$ $Revision$ -# $Header$ # Generic rules for making manpages # Index: xc/extras/ogl-sample/main/doc/man/macros/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/macros/GNUmakefile:1.3 xc/extras/ogl-sample/main/doc/man/macros/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/macros/GNUmakefile:1.3 Tue Feb 6 12:45:08 2001 +++ xc/extras/ogl-sample/main/doc/man/macros/GNUmakefile Tue May 9 21:53:39 2006 @@ -1,48 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header$ - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -default headers headers_install libs libs_install install apps: - -distsi distoss: - $(MAKE) $(COMMONPREF)$@ - -$(COMMONTARGS): % : $(COMMONPREF)% - -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/mangl/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/mangl/GNUmakefile:1.4 xc/extras/ogl-sample/main/doc/man/mangl/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/mangl/GNUmakefile:1.4 Fri Feb 22 16:32:34 2002 +++ xc/extras/ogl-sample/main/doc/man/mangl/GNUmakefile Tue May 9 21:53:39 2006 @@ -1,53 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -SUBDIRS = \ - standard \ - ftn \ - html \ - html_ftn \ - $(NULL) - -default $(ALLTARGS): $(_FORCE) - $(SUBDIRS_MAKERULE) - -distoss: - $(MAKE) $(COMMONPREF)$@ - $(SUBDIRS_MAKERULE) - -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/mangl/ftn/Distfile diff -u xc/extras/ogl-sample/main/doc/man/mangl/ftn/Distfile:1.4 xc/extras/ogl-sample/main/doc/man/mangl/ftn/Distfile:removed --- xc/extras/ogl-sample/main/doc/man/mangl/ftn/Distfile:1.4 Fri Feb 22 16:32:34 2002 +++ xc/extras/ogl-sample/main/doc/man/mangl/ftn/Distfile Tue May 9 21:53:39 2006 @@ -1,142 +0,0 @@ -# -# - -DISTDIR_SI = /xc/doc/man/GL/gl_ftn - -DISTFILES_SI = \ - Imakefile \ - fglaccum.3gl \ - fglalphafunc.3gl \ - fglaretexturesresident.3gl \ - fglarrayelement.3gl \ - fglbegin.3gl \ - fglbindtexture.3gl \ - fglbitmap.3gl \ - fglblendfunc.3gl \ - fglcalllist.3gl \ - fglcalllists.3gl \ - fglclear.3gl \ - fglclearaccum.3gl \ - fglclearcolor.3gl \ - fglcleardepth.3gl \ - fglclearindex.3gl \ - fglclearstencil.3gl \ - fglclipplane.3gl \ - fglcolor.3gl \ - fglcolormask.3gl \ - fglcolormaterial.3gl \ - fglcolorpointer.3gl \ - fglcopypixels.3gl \ - fglcopyteximage1d.3gl \ - fglcopyteximage2d.3gl \ - fglcopytexsubimage1d.3gl \ - fglcopytexsubimage2d.3gl \ - fglcullface.3gl \ - fgldeletelists.3gl \ - fgldeletetextures.3gl \ - fgldepthfunc.3gl \ - fgldepthmask.3gl \ - fgldepthrange.3gl \ - fgldrawarrays.3gl \ - fgldrawbuffer.3gl \ - fgldrawelements.3gl \ - fgldrawpixels.3gl \ - fgledgeflag.3gl \ - fgledgeflagpointer.3gl \ - fglenable.3gl \ - fglenableclientstate.3gl \ - fglevalcoord.3gl \ - fglevalmesh.3gl \ - fglevalpoint.3gl \ - fglfeedbackbuffer.3gl \ - fglfinish.3gl \ - fglflush.3gl \ - fglfog.3gl \ - fglfrontface.3gl \ - fglfrustum.3gl \ - fglgenlists.3gl \ - fglgentextures.3gl \ - fglget.3gl \ - fglgetclipplane.3gl \ - fglgeterror.3gl \ - fglgetlight.3gl \ - fglgetmap.3gl \ - fglgetmaterial.3gl \ - fglgetpixelmap.3gl \ - fglgetpointerv.3gl \ - fglgetpolygonstipple.3gl \ - fglgetstring.3gl \ - fglgettexenv.3gl \ - fglgettexgen.3gl \ - fglgetteximage.3gl \ - fglgettexlevelparameter.3gl \ - fglgettexparameter.3gl \ - fglhint.3gl \ - fglindex.3gl \ - fglindexmask.3gl \ - fglindexpointer.3gl \ - fglinitnames.3gl \ - fglinterleavedarrays.3gl \ - fglisenabled.3gl \ - fglislist.3gl \ - fglistexture.3gl \ - fgllight.3gl \ - fgllightmodel.3gl \ - fgllinestipple.3gl \ - fgllinewidth.3gl \ - fgllistbase.3gl \ - fglloadidentity.3gl \ - fglloadmatrix.3gl \ - fglloadname.3gl \ - fgllogicop.3gl \ - fglmap1.3gl \ - fglmap2.3gl \ - fglmapgrid.3gl \ - fglmaterial.3gl \ - fglmatrixmode.3gl \ - fglmultmatrix.3gl \ - fglnewlist.3gl \ - fglnormal.3gl \ - fglnormalpointer.3gl \ - fglortho.3gl \ - fglpassthrough.3gl \ - fglpixelmap.3gl \ - fglpixelstore.3gl \ - fglpixeltransfer.3gl \ - fglpixelzoom.3gl \ - fglpointsize.3gl \ - fglpolygonmode.3gl \ - fglpolygonoffset.3gl \ - fglpolygonstipple.3gl \ - fglprioritizetextures.3gl \ - fglpushattrib.3gl \ - fglpushclientattrib.3gl \ - fglpushmatrix.3gl \ - fglpushname.3gl \ - fglrasterpos.3gl \ - fglreadbuffer.3gl \ - fglreadpixels.3gl \ - fglrect.3gl \ - fglrendermode.3gl \ - fglrotate.3gl \ - fglscale.3gl \ - fglscissor.3gl \ - fglselectbuffer.3gl \ - fglshademodel.3gl \ - fglstencilfunc.3gl \ - fglstencilmask.3gl \ - fglstencilop.3gl \ - fgltexcoord.3gl \ - fgltexcoordpointer.3gl \ - fgltexenv.3gl \ - fgltexgen.3gl \ - fglteximage1d.3gl \ - fglteximage2d.3gl \ - fgltexparameter.3gl \ - fgltexsubimage1d.3gl \ - fgltexsubimage2d.3gl \ - fgltranslate.3gl \ - fglvertex.3gl \ - fglvertexpointer.3gl \ - fglviewport.3gl \ - $(NULL) Index: xc/extras/ogl-sample/main/doc/man/mangl/ftn/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/mangl/ftn/GNUmakefile:1.4 xc/extras/ogl-sample/main/doc/man/mangl/ftn/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/mangl/ftn/GNUmakefile:1.4 Fri Feb 22 16:32:34 2002 +++ xc/extras/ogl-sample/main/doc/man/mangl/ftn/GNUmakefile Tue May 9 21:53:39 2006 @@ -1,100 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# - -# NOTES: -# - The file "lor-c.mn" contains the source for the List of Routines section -# of the C edition of the GL Reference Guide. The usual targets -# lor-c.p, lor-c.ps, and lor-c.psv exist for it; however, it does not have -# a .3g suffix because we don't want to include it as a on-line man page. -# The file should be generated!!! - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -DEPTH = ../.. -LANGOPT = f -PREFIX = gl -IDB_PATH = /usr/catman/g_man/cat3/standard - -MANPREF = man -include $(DEPTH)/mandefs - -APIFILE = $(ROOT)/usr/include/GL/gl.h - -VERSION = Version 1.2 -DATE = 10 Nov 1998 -RELEASE = 1.0 -MMFLAGS = -rs2 - -LEGALSUF1 = gl# -LEGALSUF2 = gl# -LEGALSUF3 = gl# -LEGALSUF4 = gl# - -LOCALPRINTLISTFILTER = | sed -e '/^intro\.p$$/d' | (echo intro.p ; cat ) - -default: - $(MAKE) links - $(MAKE) manpages - -headers headers_install libs libs_install install apps: - -distsi: default - $(MAKE) $(COMMONPREF)$@ - -distoss: - $(MAKE) $(COMMONPREF)$@ - -links: - cd ../standard ; \ - for i in *.gl ; do \ - ( cd ../ftn ; if test ! -L fgl$$i ; then \ - /bin/ln -s ../standard/$$i fgl$$i; fi ); \ - done - -manpages: $(patsubst %.gl,%.3gl,$(wildcard *.gl)) - -const.diff: const.awk *.gl $(ROOT)/usr/include/GL/gl.h - awk -f const.awk $(ROOT)/usr/include/GL/gl.h *.gl | \ - sort | uniq > const.diff - -clean: - rm -f *.gl - -clobber: clean - rm -f *.3gl - -include $(DEPTH)/manrules -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/mangl/html/Distfile diff -u xc/extras/ogl-sample/main/doc/man/mangl/html/Distfile:1.4 xc/extras/ogl-sample/main/doc/man/mangl/html/Distfile:removed --- xc/extras/ogl-sample/main/doc/man/mangl/html/Distfile:1.4 Fri Feb 22 16:32:35 2002 +++ xc/extras/ogl-sample/main/doc/man/mangl/html/Distfile Tue May 9 21:53:39 2006 @@ -1,141 +0,0 @@ -# -# - -DISTDIR_SI = /xc/doc/hardcopy/GL/html/gl - -DISTFILES_SI = \ - accum.html \ - alphafunc.html \ - aretexturesresident.html \ - arrayelement.html \ - begin.html \ - bindtexture.html \ - bitmap.html \ - blendfunc.html \ - calllist.html \ - calllists.html \ - clear.html \ - clearaccum.html \ - clearcolor.html \ - cleardepth.html \ - clearindex.html \ - clearstencil.html \ - clipplane.html \ - color.html \ - colormask.html \ - colormaterial.html \ - colorpointer.html \ - copypixels.html \ - copyteximage1d.html \ - copyteximage2d.html \ - copytexsubimage1d.html \ - copytexsubimage2d.html \ - cullface.html \ - deletelists.html \ - deletetextures.html \ - depthfunc.html \ - depthmask.html \ - depthrange.html \ - drawarrays.html \ - drawbuffer.html \ - drawelements.html \ - drawpixels.html \ - edgeflag.html \ - edgeflagpointer.html \ - enable.html \ - enableclientstate.html \ - evalcoord.html \ - evalmesh.html \ - evalpoint.html \ - feedbackbuffer.html \ - finish.html \ - flush.html \ - fog.html \ - frontface.html \ - frustum.html \ - genlists.html \ - gentextures.html \ - get.html \ - getclipplane.html \ - geterror.html \ - getlight.html \ - getmap.html \ - getmaterial.html \ - getpixelmap.html \ - getpointerv.html \ - getpolygonstipple.html \ - getstring.html \ - gettexenv.html \ - gettexgen.html \ - getteximage.html \ - gettexlevelparameter.html \ - gettexparameter.html \ - hint.html \ - index.html \ - indexmask.html \ - indexpointer.html \ - initnames.html \ - interleavedarrays.html \ - isenabled.html \ - islist.html \ - istexture.html \ - light.html \ - lightmodel.html \ - linestipple.html \ - linewidth.html \ - listbase.html \ - loadidentity.html \ - loadmatrix.html \ - loadname.html \ - logicop.html \ - map1.html \ - map2.html \ - mapgrid.html \ - material.html \ - matrixmode.html \ - multmatrix.html \ - newlist.html \ - normal.html \ - normalpointer.html \ - ortho.html \ - passthrough.html \ - pixelmap.html \ - pixelstore.html \ - pixeltransfer.html \ - pixelzoom.html \ - pointsize.html \ - polygonmode.html \ - polygonoffset.html \ - polygonstipple.html \ - prioritizetextures.html \ - pushattrib.html \ - pushclientattrib.html \ - pushmatrix.html \ - pushname.html \ - rasterpos.html \ - readbuffer.html \ - readpixels.html \ - rect.html \ - rendermode.html \ - rotate.html \ - scale.html \ - scissor.html \ - selectbuffer.html \ - shademodel.html \ - stencilfunc.html \ - stencilmask.html \ - stencilop.html \ - texcoord.html \ - texcoordpointer.html \ - texenv.html \ - texgen.html \ - teximage1d.html \ - teximage2d.html \ - texparameter.html \ - texsubimage1d.html \ - texsubimage2d.html \ - translate.html \ - vertex.html \ - vertexpointer.html \ - viewport.html \ - $(NULL) Index: xc/extras/ogl-sample/main/doc/man/mangl/html/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/mangl/html/GNUmakefile:1.4 xc/extras/ogl-sample/main/doc/man/mangl/html/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/mangl/html/GNUmakefile:1.4 Fri Feb 22 16:32:35 2002 +++ xc/extras/ogl-sample/main/doc/man/mangl/html/GNUmakefile Tue May 9 21:53:39 2006 @@ -1,67 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -DEPTH = ../.. -LANGOPT = c -PREFIX = gl -MANSRC = ../standard - -MANPREF = man -include $(DEPTH)/mandefs - -# Dependencies are in the man page source directory -VPATH = $(shell cd $(MANSRC) ; pwd) - -default: - $(MAKE) html - -headers headers_install libs libs_install install apps: - -distsi: default - $(MAKE) $(COMMONPREF)$@ - -distoss: - $(MAKE) $(COMMONPREF)$@ - -html: $(patsubst %.3gl,%.html,$(notdir $(wildcard $(MANSRC)/*.3gl))) - -clobber: - rm -rf *.html - -include $(DEPTH)/manrules -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/mangl/html_ftn/Distfile diff -u xc/extras/ogl-sample/main/doc/man/mangl/html_ftn/Distfile:1.4 xc/extras/ogl-sample/main/doc/man/mangl/html_ftn/Distfile:removed --- xc/extras/ogl-sample/main/doc/man/mangl/html_ftn/Distfile:1.4 Fri Feb 22 16:32:35 2002 +++ xc/extras/ogl-sample/main/doc/man/mangl/html_ftn/Distfile Tue May 9 21:53:39 2006 @@ -1,141 +0,0 @@ -# -# - -DISTDIR_SI = /xc/doc/hardcopy/GL/html/gl_ftn - -DISTFILES_SI = \ - fglaccum.html \ - fglalphafunc.html \ - fglaretexturesresident.html \ - fglarrayelement.html \ - fglbegin.html \ - fglbindtexture.html \ - fglbitmap.html \ - fglblendfunc.html \ - fglcalllist.html \ - fglcalllists.html \ - fglclear.html \ - fglclearaccum.html \ - fglclearcolor.html \ - fglcleardepth.html \ - fglclearindex.html \ - fglclearstencil.html \ - fglclipplane.html \ - fglcolor.html \ - fglcolormask.html \ - fglcolormaterial.html \ - fglcolorpointer.html \ - fglcopypixels.html \ - fglcopyteximage1d.html \ - fglcopyteximage2d.html \ - fglcopytexsubimage1d.html \ - fglcopytexsubimage2d.html \ - fglcullface.html \ - fgldeletelists.html \ - fgldeletetextures.html \ - fgldepthfunc.html \ - fgldepthmask.html \ - fgldepthrange.html \ - fgldrawarrays.html \ - fgldrawbuffer.html \ - fgldrawelements.html \ - fgldrawpixels.html \ - fgledgeflag.html \ - fgledgeflagpointer.html \ - fglenable.html \ - fglenableclientstate.html \ - fglevalcoord.html \ - fglevalmesh.html \ - fglevalpoint.html \ - fglfeedbackbuffer.html \ - fglfinish.html \ - fglflush.html \ - fglfog.html \ - fglfrontface.html \ - fglfrustum.html \ - fglgenlists.html \ - fglgentextures.html \ - fglget.html \ - fglgetclipplane.html \ - fglgeterror.html \ - fglgetlight.html \ - fglgetmap.html \ - fglgetmaterial.html \ - fglgetpixelmap.html \ - fglgetpointerv.html \ - fglgetpolygonstipple.html \ - fglgetstring.html \ - fglgettexenv.html \ - fglgettexgen.html \ - fglgetteximage.html \ - fglgettexlevelparameter.html \ - fglgettexparameter.html \ - fglhint.html \ - fglindex.html \ - fglindexmask.html \ - fglindexpointer.html \ - fglinitnames.html \ - fglinterleavedarrays.html \ - fglisenabled.html \ - fglislist.html \ - fglistexture.html \ - fgllight.html \ - fgllightmodel.html \ - fgllinestipple.html \ - fgllinewidth.html \ - fgllistbase.html \ - fglloadidentity.html \ - fglloadmatrix.html \ - fglloadname.html \ - fgllogicop.html \ - fglmap1.html \ - fglmap2.html \ - fglmapgrid.html \ - fglmaterial.html \ - fglmatrixmode.html \ - fglmultmatrix.html \ - fglnewlist.html \ - fglnormal.html \ - fglnormalpointer.html \ - fglortho.html \ - fglpassthrough.html \ - fglpixelmap.html \ - fglpixelstore.html \ - fglpixeltransfer.html \ - fglpixelzoom.html \ - fglpointsize.html \ - fglpolygonmode.html \ - fglpolygonoffset.html \ - fglpolygonstipple.html \ - fglprioritizetextures.html \ - fglpushattrib.html \ - fglpushclientattrib.html \ - fglpushmatrix.html \ - fglpushname.html \ - fglrasterpos.html \ - fglreadbuffer.html \ - fglreadpixels.html \ - fglrect.html \ - fglrendermode.html \ - fglrotate.html \ - fglscale.html \ - fglscissor.html \ - fglselectbuffer.html \ - fglshademodel.html \ - fglstencilfunc.html \ - fglstencilmask.html \ - fglstencilop.html \ - fgltexcoord.html \ - fgltexcoordpointer.html \ - fgltexenv.html \ - fgltexgen.html \ - fglteximage1d.html \ - fglteximage2d.html \ - fgltexparameter.html \ - fgltexsubimage1d.html \ - fgltexsubimage2d.html \ - fgltranslate.html \ - fglvertex.html \ - fglvertexpointer.html \ - fglviewport.html \ - $(NULL) Index: xc/extras/ogl-sample/main/doc/man/mangl/html_ftn/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/mangl/html_ftn/GNUmakefile:1.4 xc/extras/ogl-sample/main/doc/man/mangl/html_ftn/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/mangl/html_ftn/GNUmakefile:1.4 Fri Feb 22 16:32:35 2002 +++ xc/extras/ogl-sample/main/doc/man/mangl/html_ftn/GNUmakefile Tue May 9 21:53:39 2006 @@ -1,67 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -DEPTH = ../.. -LANGOPT = c -PREFIX = gl -MANSRC = ../ftn - -MANPREF = man -include $(DEPTH)/mandefs - -# Dependencies are in the man page source directory -VPATH = $(shell cd $(MANSRC) ; pwd) - -default: - $(MAKE) html - -headers headers_install libs libs_install install apps: - -distsi: default - $(MAKE) $(COMMONPREF)$@ - -distoss: - $(MAKE) $(COMMONPREF)$@ - -html: $(patsubst %.3gl,%.html,$(notdir $(wildcard $(MANSRC)/*.3gl))) - -clobber: - rm -rf *.html - -include $(DEPTH)/manrules -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/mangl/standard/Distfile diff -u xc/extras/ogl-sample/main/doc/man/mangl/standard/Distfile:1.4 xc/extras/ogl-sample/main/doc/man/mangl/standard/Distfile:removed --- xc/extras/ogl-sample/main/doc/man/mangl/standard/Distfile:1.4 Fri Feb 22 16:32:36 2002 +++ xc/extras/ogl-sample/main/doc/man/mangl/standard/Distfile Tue May 9 21:53:39 2006 @@ -1,142 +0,0 @@ -# -# - -DISTDIR_SI = /xc/doc/man/GL/gl - -DISTFILES_SI = \ - Imakefile \ - accum.3gl \ - alphafunc.3gl \ - aretexturesresident.3gl \ - arrayelement.3gl \ - begin.3gl \ - bindtexture.3gl \ - bitmap.3gl \ - blendfunc.3gl \ - calllist.3gl \ - calllists.3gl \ - clear.3gl \ - clearaccum.3gl \ - clearcolor.3gl \ - cleardepth.3gl \ - clearindex.3gl \ - clearstencil.3gl \ - clipplane.3gl \ - color.3gl \ - colormask.3gl \ - colormaterial.3gl \ - colorpointer.3gl \ - copypixels.3gl \ - copyteximage1d.3gl \ - copyteximage2d.3gl \ - copytexsubimage1d.3gl \ - copytexsubimage2d.3gl \ - cullface.3gl \ - deletelists.3gl \ - deletetextures.3gl \ - depthfunc.3gl \ - depthmask.3gl \ - depthrange.3gl \ - drawarrays.3gl \ - drawbuffer.3gl \ - drawelements.3gl \ - drawpixels.3gl \ - edgeflag.3gl \ - edgeflagpointer.3gl \ - enable.3gl \ - enableclientstate.3gl \ - evalcoord.3gl \ - evalmesh.3gl \ - evalpoint.3gl \ - feedbackbuffer.3gl \ - finish.3gl \ - flush.3gl \ - fog.3gl \ - frontface.3gl \ - frustum.3gl \ - genlists.3gl \ - gentextures.3gl \ - get.3gl \ - getclipplane.3gl \ - geterror.3gl \ - getlight.3gl \ - getmap.3gl \ - getmaterial.3gl \ - getpixelmap.3gl \ - getpointerv.3gl \ - getpolygonstipple.3gl \ - getstring.3gl \ - gettexenv.3gl \ - gettexgen.3gl \ - getteximage.3gl \ - gettexlevelparameter.3gl \ - gettexparameter.3gl \ - hint.3gl \ - index.3gl \ - indexmask.3gl \ - indexpointer.3gl \ - initnames.3gl \ - interleavedarrays.3gl \ - isenabled.3gl \ - islist.3gl \ - istexture.3gl \ - light.3gl \ - lightmodel.3gl \ - linestipple.3gl \ - linewidth.3gl \ - listbase.3gl \ - loadidentity.3gl \ - loadmatrix.3gl \ - loadname.3gl \ - logicop.3gl \ - map1.3gl \ - map2.3gl \ - mapgrid.3gl \ - material.3gl \ - matrixmode.3gl \ - multmatrix.3gl \ - newlist.3gl \ - normal.3gl \ - normalpointer.3gl \ - ortho.3gl \ - passthrough.3gl \ - pixelmap.3gl \ - pixelstore.3gl \ - pixeltransfer.3gl \ - pixelzoom.3gl \ - pointsize.3gl \ - polygonmode.3gl \ - polygonoffset.3gl \ - polygonstipple.3gl \ - prioritizetextures.3gl \ - pushattrib.3gl \ - pushclientattrib.3gl \ - pushmatrix.3gl \ - pushname.3gl \ - rasterpos.3gl \ - readbuffer.3gl \ - readpixels.3gl \ - rect.3gl \ - rendermode.3gl \ - rotate.3gl \ - scale.3gl \ - scissor.3gl \ - selectbuffer.3gl \ - shademodel.3gl \ - stencilfunc.3gl \ - stencilmask.3gl \ - stencilop.3gl \ - texcoord.3gl \ - texcoordpointer.3gl \ - texenv.3gl \ - texgen.3gl \ - teximage1d.3gl \ - teximage2d.3gl \ - texparameter.3gl \ - texsubimage1d.3gl \ - texsubimage2d.3gl \ - translate.3gl \ - vertex.3gl \ - vertexpointer.3gl \ - viewport.3gl \ - $(NULL) Index: xc/extras/ogl-sample/main/doc/man/mangl/standard/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/mangl/standard/GNUmakefile:1.4 xc/extras/ogl-sample/main/doc/man/mangl/standard/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/mangl/standard/GNUmakefile:1.4 Fri Feb 22 16:32:36 2002 +++ xc/extras/ogl-sample/main/doc/man/mangl/standard/GNUmakefile Tue May 9 21:53:39 2006 @@ -1,95 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# - -# NOTES: -# - The file "lor-c.mn" contains the source for the List of Routines section -# of the C edition of the GL Reference Guide. The usual targets -# lor-c.p, lor-c.ps, and lor-c.psv exist for it; however, it does not have -# a .3g suffix because we don't want to include it as a on-line man page. -# The file should be generated!!! - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -DEPTH = ../.. -LANGOPT = c -PREFIX = gl -IDB_PATH = /usr/catman/g_man/cat3/standard - -MANPREF = man -include $(DEPTH)/mandefs - -APIFILE = $(ROOT)/usr/include/GL/gl.h - -VERSION = Version 1.2 -DATE = 24 September 1999 -RELEASE = 1.2.1 -MMFLAGS = -rs2 -M4OPTS = -B8192 - -LEGALSUF1 = 3g# -LEGALSUF2 = 3g# -LEGALSUF3 = 3g# -LEGALSUF4 = 3g# - -LOCALPRINTLISTFILTER = | sed -e '/^intro\.p$$/d' | (echo intro.p ; cat ) - -default: - $(MAKE) manpages - -headers headers_install libs libs_install apps: - -distsi: default - $(MAKE) $(COMMONPREF)$@ - -distoss: - $(MAKE) $(COMMONPREF)$@ - -manpages: $(patsubst %.gl,%.3gl,$(wildcard *.gl)) - -install: manpages - for file in *.3gl; do \ - install -D -m 644 $$file ${ROOT}/usr/man/man3/gl`basename $$file .3gl`.3gl ; \ - done - -const.diff: const.awk *.gl $(ROOT)/usr/include/GL/gl.h - awk -f const.awk $(ROOT)/usr/include/GL/gl.h *.gl | \ - sort | uniq > const.diff - -clobber: - rm -f *.3gl - -include $(DEPTH)/manrules -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/manglu/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/manglu/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/manglu/GNUmakefile:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/GNUmakefile Tue May 9 21:53:40 2006 @@ -1,55 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/manglu/GNUmakefile#9 $ - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -SUBDIRS = \ - standard \ - ftn \ - html \ - html_ftn \ - $(NULL) - -default $(ALLTARGS): $(_FORCE) - $(SUBDIRS_MAKERULE) - -distoss: - $(MAKE) $(COMMONPREF)$@ - $(SUBDIRS_MAKERULE) - -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/manglu/ftn/Distfile diff -u xc/extras/ogl-sample/main/doc/man/manglu/ftn/Distfile:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/ftn/Distfile:removed --- xc/extras/ogl-sample/main/doc/man/manglu/ftn/Distfile:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/ftn/Distfile Tue May 9 21:53:40 2006 @@ -1,64 +0,0 @@ -# -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/manglu/ftn/Distfile#5 $ -# - -DISTDIR_SI = /xc/doc/man/GL/glu_ftn - -DISTFILES_SI = \ - Imakefile \ - fglubegincurve.3gl \ - fglubeginpolygon.3gl \ - fglubeginsurface.3gl \ - fglubegintrim.3gl \ - fglubuild1dmipmaplevels.3gl \ - fglubuild1dmipmaps.3gl \ - fglubuild2dmipmaplevels.3gl \ - fglubuild2dmipmaps.3gl \ - fglubuild3dmipmaplevels.3gl \ - fglubuild3dmipmaps.3gl \ - fglucheckextension.3gl \ - fglucylinder.3gl \ - fgludeletenurbsrenderer.3gl \ - fgludeletequadric.3gl \ - fgludeletetess.3gl \ - fgludisk.3gl \ - fgluerrorstring.3gl \ - fglugetnurbsproperty.3gl \ - fglugetstring.3gl \ - fglugettessproperty.3gl \ - fgluloadsamplingmatrices.3gl \ - fglulookat.3gl \ - fglunewnurbsrenderer.3gl \ - fglunewquadric.3gl \ - fglunewtess.3gl \ - fglunextcontour.3gl \ - fglunurbscallback.3gl \ - fglunurbscallbackdata.3gl \ - fglunurbscallbackdataext.3gl \ - fglunurbscurve.3gl \ - fglunurbsproperty.3gl \ - fglunurbssurface.3gl \ - fgluortho2d.3gl \ - fglupartialdisk.3gl \ - fgluperspective.3gl \ - fglupickmatrix.3gl \ - fgluproject.3gl \ - fglupwlcurve.3gl \ - fgluquadriccallback.3gl \ - fgluquadricdrawstyle.3gl \ - fgluquadricnormals.3gl \ - fgluquadricorientation.3gl \ - fgluquadrictexture.3gl \ - fgluscaleimage.3gl \ - fglusphere.3gl \ - fglutessbegincontour.3gl \ - fglutessbeginpolygon.3gl \ - fglutesscallback.3gl \ - fglutessendpolygon.3gl \ - fglutessnormal.3gl \ - fglutessproperty.3gl \ - fglutessvertex.3gl \ - fgluunproject.3gl \ - fgluunproject4.3gl \ - $(NULL) Index: xc/extras/ogl-sample/main/doc/man/manglu/ftn/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/manglu/ftn/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/ftn/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/manglu/ftn/GNUmakefile:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/ftn/GNUmakefile Tue May 9 21:53:40 2006 @@ -1,102 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/manglu/ftn/GNUmakefile#9 $ - -# NOTES: -# - The file "lor-c.mn" contains the source for the List of Routines section -# of the C edition of the GL Reference Guide. The usual targets -# lor-c.p, lor-c.ps, and lor-c.psv exist for it; however, it does not have -# a .3g suffix because we don't want to include it as a on-line man page. -# The file should be generated!!! - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -DEPTH = ../.. -LANGOPT = f -PREFIX = glu -IDB_PATH = /usr/catman/g_man/cat3/standard - -MANPREF = man -include $(DEPTH)/mandefs - -APIFILE = $(ROOT)/usr/include/GL/glu.h - -VERSION = Version 1.2 -DATE = 10 Nov 1998 -RELEASE = 1.0 -MMFLAGS = -rs2 - -LEGALSUF1 = gl# -LEGALSUF2 = gl# -LEGALSUF3 = gl# -LEGALSUF4 = gl# - -LOCALPRINTLISTFILTER = | sed -e '/^intro\.p$$/d' | (echo intro.p ; cat ) - -default: - $(MAKE) links - $(MAKE) manpages - -headers headers_install libs libs_install install apps: - -distsi: default - $(MAKE) $(COMMONPREF)$@ - -distoss: - $(MAKE) $(COMMONPREF)$@ - -links: - cd ../standard ; \ - for i in *.gl ; do \ - ( cd ../ftn ; if test ! -L fglu$$i ; then \ - /bin/ln -s ../standard/$$i fglu$$i; fi ) ; \ - done - -manpages: $(patsubst %.gl,%.3gl,$(wildcard *.gl)) - -const.diff: const.awk *.gl $(ROOT)/usr/include/GL/gl.h - awk -f const.awk $(ROOT)/usr/include/GL/gl.h *.gl | \ - sort | uniq > const.diff - -clean: - rm -f *.gl - -clobber: clean - rm -f *.3gl - -include $(DEPTH)/manrules -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/manglu/html/Distfile diff -u xc/extras/ogl-sample/main/doc/man/manglu/html/Distfile:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/html/Distfile:removed --- xc/extras/ogl-sample/main/doc/man/manglu/html/Distfile:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/html/Distfile Tue May 9 21:53:40 2006 @@ -1,63 +0,0 @@ -# -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/manglu/html/Distfile#4 $ -# - -DISTDIR_SI = /xc/doc/hardcopy/GL/html/glu - -DISTFILES_SI = \ - begincurve.html \ - beginpolygon.html \ - beginsurface.html \ - begintrim.html \ - build1dmipmaplevels.html \ - build1dmipmaps.html \ - build2dmipmaplevels.html \ - build2dmipmaps.html \ - build3dmipmaplevels.html \ - build3dmipmaps.html \ - checkextension.html \ - cylinder.html \ - deletenurbsrenderer.html \ - deletequadric.html \ - deletetess.html \ - disk.html \ - errorstring.html \ - getnurbsproperty.html \ - getstring.html \ - gettessproperty.html \ - loadsamplingmatrices.html \ - lookat.html \ - newnurbsrenderer.html \ - newquadric.html \ - newtess.html \ - nextcontour.html \ - nurbscallback.html \ - nurbscallbackdata.html \ - nurbscallbackdataext.html \ - nurbscurve.html \ - nurbsproperty.html \ - nurbssurface.html \ - ortho2d.html \ - partialdisk.html \ - perspective.html \ - pickmatrix.html \ - project.html \ - pwlcurve.html \ - quadriccallback.html \ - quadricdrawstyle.html \ - quadricnormals.html \ - quadricorientation.html \ - quadrictexture.html \ - scaleimage.html \ - sphere.html \ - tessbegincontour.html \ - tessbeginpolygon.html \ - tesscallback.html \ - tessendpolygon.html \ - tessnormal.html \ - tessproperty.html \ - tessvertex.html \ - unproject.html \ - unproject4.html \ - $(NULL) Index: xc/extras/ogl-sample/main/doc/man/manglu/html/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/manglu/html/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/html/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/manglu/html/GNUmakefile:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/html/GNUmakefile Tue May 9 21:53:40 2006 @@ -1,68 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/manglu/html/GNUmakefile#9 $ - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -DEPTH = ../.. -LANGOPT = c -PREFIX = gl -MANSRC = ../standard - -MANPREF = man -include $(DEPTH)/mandefs - -VPATH = $(shell cd $(MANSRC) ; pwd) - -default: - $(MAKE) html - -headers headers_install libs libs_install install apps: - -distsi: default - $(MAKE) $(COMMONPREF)$@ - -distoss: - $(MAKE) $(COMMONPREF)$@ - -html: $(patsubst %.3gl,%.html,$(notdir $(wildcard $(MANSRC)/*.3gl))) - -clobber: - rm -rf *.html - -include $(DEPTH)/manrules -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/manglu/html_ftn/Distfile diff -u xc/extras/ogl-sample/main/doc/man/manglu/html_ftn/Distfile:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/html_ftn/Distfile:removed --- xc/extras/ogl-sample/main/doc/man/manglu/html_ftn/Distfile:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/html_ftn/Distfile Tue May 9 21:53:40 2006 @@ -1,63 +0,0 @@ -# -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/manglu/html_ftn/Distfile#4 $ -# - -DISTDIR_SI = /xc/doc/hardcopy/GL/html/glu_ftn - -DISTFILES_SI = \ - fglubegincurve.html \ - fglubeginpolygon.html \ - fglubeginsurface.html \ - fglubegintrim.html \ - fglubuild1dmipmaplevels.html \ - fglubuild1dmipmaps.html \ - fglubuild2dmipmaplevels.html \ - fglubuild2dmipmaps.html \ - fglubuild3dmipmaplevels.html \ - fglubuild3dmipmaps.html \ - fglucheckextension.html \ - fglucylinder.html \ - fgludeletenurbsrenderer.html \ - fgludeletequadric.html \ - fgludeletetess.html \ - fgludisk.html \ - fgluerrorstring.html \ - fglugetnurbsproperty.html \ - fglugetstring.html \ - fglugettessproperty.html \ - fgluloadsamplingmatrices.html \ - fglulookat.html \ - fglunewnurbsrenderer.html \ - fglunewquadric.html \ - fglunewtess.html \ - fglunextcontour.html \ - fglunurbscallback.html \ - fglunurbscallbackdata.html \ - fglunurbscallbackdataext.html \ - fglunurbscurve.html \ - fglunurbsproperty.html \ - fglunurbssurface.html \ - fgluortho2d.html \ - fglupartialdisk.html \ - fgluperspective.html \ - fglupickmatrix.html \ - fgluproject.html \ - fglupwlcurve.html \ - fgluquadriccallback.html \ - fgluquadricdrawstyle.html \ - fgluquadricnormals.html \ - fgluquadricorientation.html \ - fgluquadrictexture.html \ - fgluscaleimage.html \ - fglusphere.html \ - fglutessbegincontour.html \ - fglutessbeginpolygon.html \ - fglutesscallback.html \ - fglutessendpolygon.html \ - fglutessnormal.html \ - fglutessproperty.html \ - fglutessvertex.html \ - fgluunproject.html \ - fgluunproject4.html \ - $(NULL) Index: xc/extras/ogl-sample/main/doc/man/manglu/html_ftn/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/manglu/html_ftn/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/html_ftn/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/manglu/html_ftn/GNUmakefile:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/html_ftn/GNUmakefile Tue May 9 21:53:40 2006 @@ -1,69 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/manglu/html_ftn/GNUmakefile#9 $ - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -DEPTH = ../.. -LANGOPT = c -PREFIX = gl -MANSRC = ../ftn - -MANPREF = man -include $(DEPTH)/mandefs - -# Dependencies are in the man page source directory -VPATH = $(shell cd $(MANSRC) ; pwd) - -default: - $(MAKE) html - -headers headers_install libs libs_install install apps: - -distsi: default - $(MAKE) $(COMMONPREF)$@ - -distoss: - $(MAKE) $(COMMONPREF)$@ - -html: $(patsubst %.3gl,%.html,$(notdir $(wildcard $(MANSRC)/*.3gl))) - -clobber: - rm -rf *.html - -include $(DEPTH)/manrules -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/Distfile diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/Distfile:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/Distfile:removed --- xc/extras/ogl-sample/main/doc/man/manglu/standard/Distfile:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/Distfile Tue May 9 21:53:40 2006 @@ -1,64 +0,0 @@ -# -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/manglu/standard/Distfile#5 $ -# - -DISTDIR_SI = /xc/doc/man/GL/glu - -DISTFILES_SI = \ - Imakefile \ - begincurve.3gl \ - beginpolygon.3gl \ - beginsurface.3gl \ - begintrim.3gl \ - build1dmipmaplevels.3gl \ - build1dmipmaps.3gl \ - build2dmipmaplevels.3gl \ - build2dmipmaps.3gl \ - build3dmipmaplevels.3gl \ - build3dmipmaps.3gl \ - checkextension.3gl \ - cylinder.3gl \ - deletenurbsrenderer.3gl \ - deletequadric.3gl \ - deletetess.3gl \ - disk.3gl \ - errorstring.3gl \ - getnurbsproperty.3gl \ - getstring.3gl \ - gettessproperty.3gl \ - loadsamplingmatrices.3gl \ - lookat.3gl \ - newnurbsrenderer.3gl \ - newquadric.3gl \ - newtess.3gl \ - nextcontour.3gl \ - nurbscallback.3gl \ - nurbscallbackdata.3gl \ - nurbscallbackdataext.3gl \ - nurbscurve.3gl \ - nurbsproperty.3gl \ - nurbssurface.3gl \ - ortho2d.3gl \ - partialdisk.3gl \ - perspective.3gl \ - pickmatrix.3gl \ - project.3gl \ - pwlcurve.3gl \ - quadriccallback.3gl \ - quadricdrawstyle.3gl \ - quadricnormals.3gl \ - quadricorientation.3gl \ - quadrictexture.3gl \ - scaleimage.3gl \ - sphere.3gl \ - tessbegincontour.3gl \ - tessbeginpolygon.3gl \ - tesscallback.3gl \ - tessendpolygon.3gl \ - tessnormal.3gl \ - tessproperty.3gl \ - tessvertex.3gl \ - unproject.3gl \ - unproject4.3gl \ - $(NULL) Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/manglu/standard/GNUmakefile:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/GNUmakefile Tue May 9 21:53:40 2006 @@ -1,93 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/manglu/standard/GNUmakefile#9 $ - -# NOTES: -# - The file "lor-c.mn" contains the source for the List of Routines section -# of the C edition of the GL Reference Guide. The usual targets -# lor-c.p, lor-c.ps, and lor-c.psv exist for it; however, it does not have -# a .3g suffix because we don't want to include it as a on-line man page. -# The file should be generated!!! - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -DEPTH = ../.. -LANGOPT = c -PREFIX = glu -IDB_PATH = /usr/catman/g_man/cat3/standard - -MANPREF = man -include $(DEPTH)/mandefs - -APIFILE = $(ROOT)/usr/include/GL/glu.h - -VERSION = Version 1.2 -DATE = 6 March 1997 -RELEASE = 1.2.0 -MMFLAGS = -rs2 - -LEGALSUF1 = 3g# -LEGALSUF2 = 3g# -LEGALSUF3 = 3g# -LEGALSUF4 = 3g# - -LOCALPRINTLISTFILTER = | sed -e '/^intro\.p$$/d' | (echo intro.p ; cat ) - -default: - $(MAKE) manpages - -headers headers_install libs libs_install apps: - -distsi: default - $(MAKE) $(COMMONPREF)$@ - -distoss: - $(MAKE) $(COMMONPREF)$@ - -manpages: $(patsubst %.gl,%.3gl,$(wildcard *.gl)) - -install: manpages - for file in *.3gl; do \ - install -D -m 644 $$file ${ROOT}/usr/man/man3/glu`basename $$file .3gl`.3gl ; \ - done - - -clobber: - rm -f *.3gl - -include $(DEPTH)/manrules -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/begincurve.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/begincurve.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/begincurve.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/begincurve.gl:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/begincurve.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/beginsurface.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/beginsurface.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/beginsurface.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/beginsurface.gl:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/beginsurface.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/begintrim.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/begintrim.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/begintrim.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/begintrim.gl:1.1.1.1 Mon Jan 15 16:47:58 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/begintrim.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/build1dmipmaplevels.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/build1dmipmaplevels.gl:1.1.1.2 xc/extras/ogl-sample/main/doc/man/manglu/standard/build1dmipmaplevels.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/build1dmipmaplevels.gl:1.1.1.2 Thu Feb 1 03:26:39 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/build1dmipmaplevels.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/build1dmipmaps.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/build1dmipmaps.gl:1.1.1.2 xc/extras/ogl-sample/main/doc/man/manglu/standard/build1dmipmaps.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/build1dmipmaps.gl:1.1.1.2 Thu Feb 1 03:26:40 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/build1dmipmaps.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/build2dmipmaplevels.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/build2dmipmaplevels.gl:1.1.1.2 xc/extras/ogl-sample/main/doc/man/manglu/standard/build2dmipmaplevels.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/build2dmipmaplevels.gl:1.1.1.2 Thu Feb 1 03:26:40 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/build2dmipmaplevels.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/build2dmipmaps.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/build2dmipmaps.gl:1.1.1.2 xc/extras/ogl-sample/main/doc/man/manglu/standard/build2dmipmaps.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/build2dmipmaps.gl:1.1.1.2 Thu Feb 1 03:26:40 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/build2dmipmaps.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/build3dmipmaplevels.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/build3dmipmaplevels.gl:1.1.1.2 xc/extras/ogl-sample/main/doc/man/manglu/standard/build3dmipmaplevels.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/build3dmipmaplevels.gl:1.1.1.2 Thu Feb 1 03:26:40 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/build3dmipmaplevels.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/build3dmipmaps.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/build3dmipmaps.gl:1.1.1.2 xc/extras/ogl-sample/main/doc/man/manglu/standard/build3dmipmaps.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/build3dmipmaps.gl:1.1.1.2 Thu Feb 1 03:26:40 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/build3dmipmaps.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/checkextension.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/checkextension.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/checkextension.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/checkextension.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/checkextension.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/cylinder.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/cylinder.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/cylinder.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/cylinder.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/cylinder.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/deletenurbsrenderer.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/deletenurbsrenderer.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/deletenurbsrenderer.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/deletenurbsrenderer.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/deletenurbsrenderer.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/deletequadric.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/deletequadric.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/deletequadric.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/deletequadric.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/deletequadric.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/deletetess.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/deletetess.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/deletetess.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/deletetess.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/deletetess.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/disk.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/disk.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/disk.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/disk.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/disk.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/errorstring.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/errorstring.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/errorstring.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/errorstring.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/errorstring.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/getnurbsproperty.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/getnurbsproperty.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/getnurbsproperty.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/getnurbsproperty.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/getnurbsproperty.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/getstring.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/getstring.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/getstring.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/getstring.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/getstring.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/gettessproperty.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/gettessproperty.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/gettessproperty.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/gettessproperty.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/gettessproperty.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/loadsamplingmatrices.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/loadsamplingmatrices.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/loadsamplingmatrices.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/loadsamplingmatrices.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/loadsamplingmatrices.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/lookat.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/lookat.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/lookat.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/lookat.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/lookat.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/newnurbsrenderer.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/newnurbsrenderer.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/newnurbsrenderer.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/newnurbsrenderer.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/newnurbsrenderer.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/newquadric.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/newquadric.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/newquadric.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/newquadric.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/newquadric.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/newtess.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/newtess.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/newtess.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/newtess.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/newtess.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/nextcontour.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/nextcontour.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/nextcontour.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/nextcontour.gl:1.1.1.1 Mon Jan 15 16:48:00 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/nextcontour.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallback.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallback.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallback.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallback.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallback.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallbackdata.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallbackdata.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallbackdata.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallbackdata.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallbackdata.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallbackdataext.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallbackdataext.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallbackdataext.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallbackdataext.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscallbackdataext.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscurve.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscurve.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscurve.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscurve.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbscurve.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbsproperty.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbsproperty.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbsproperty.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbsproperty.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbsproperty.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbssurface.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbssurface.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbssurface.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbssurface.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/nurbssurface.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/ortho2d.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/ortho2d.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/ortho2d.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/ortho2d.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/ortho2d.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/partialdisk.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/partialdisk.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/partialdisk.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/partialdisk.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/partialdisk.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/perspective.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/perspective.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/perspective.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/perspective.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/perspective.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/pickmatrix.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/pickmatrix.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/pickmatrix.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/pickmatrix.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/pickmatrix.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/project.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/project.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/project.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/project.gl:1.1.1.1 Mon Jan 15 16:48:03 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/project.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/pwlcurve.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/pwlcurve.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/pwlcurve.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/pwlcurve.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/pwlcurve.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/quadriccallback.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/quadriccallback.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/quadriccallback.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/quadriccallback.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/quadriccallback.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricdrawstyle.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricdrawstyle.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricdrawstyle.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricdrawstyle.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricdrawstyle.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricnormals.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricnormals.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricnormals.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricnormals.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricnormals.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricorientation.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricorientation.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricorientation.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricorientation.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/quadricorientation.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/quadrictexture.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/quadrictexture.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/quadrictexture.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/quadrictexture.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/quadrictexture.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/scaleimage.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/scaleimage.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/scaleimage.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/scaleimage.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/scaleimage.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/sphere.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/sphere.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/sphere.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/sphere.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/sphere.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/tessbegincontour.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/tessbegincontour.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/tessbegincontour.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/tessbegincontour.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/tessbegincontour.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/tessbeginpolygon.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/tessbeginpolygon.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/tessbeginpolygon.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/tessbeginpolygon.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/tessbeginpolygon.gl Mon Jan 9 09:56:46 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/tesscallback.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/tesscallback.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/tesscallback.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/tesscallback.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/tesscallback.gl Mon Jan 9 09:56:47 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/tessendpolygon.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/tessendpolygon.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/tessendpolygon.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/tessendpolygon.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/tessendpolygon.gl Mon Jan 9 09:56:47 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/tessnormal.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/tessnormal.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/tessnormal.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/tessnormal.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/tessnormal.gl Mon Jan 9 09:56:47 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/tessproperty.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/tessproperty.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/tessproperty.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/tessproperty.gl:1.1.1.1 Mon Jan 15 16:48:06 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/tessproperty.gl Mon Jan 9 09:56:47 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/tessvertex.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/tessvertex.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/tessvertex.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/tessvertex.gl:1.1.1.1 Mon Jan 15 16:48:08 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/tessvertex.gl Mon Jan 9 09:56:47 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/unproject.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/unproject.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/unproject.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/unproject.gl:1.1.1.1 Mon Jan 15 16:48:08 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/unproject.gl Mon Jan 9 09:56:47 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglu/standard/unproject4.gl diff -u xc/extras/ogl-sample/main/doc/man/manglu/standard/unproject4.gl:1.1.1.1 xc/extras/ogl-sample/main/doc/man/manglu/standard/unproject4.gl:1.2 --- xc/extras/ogl-sample/main/doc/man/manglu/standard/unproject4.gl:1.1.1.1 Mon Jan 15 16:48:08 2001 +++ xc/extras/ogl-sample/main/doc/man/manglu/standard/unproject4.gl Mon Jan 9 09:56:47 2006 @@ -30,7 +30,6 @@ _C_ published by SGI, but has not been independently verified as being _C_ compliant with the OpenGL(R) version 1.2.1 Specification. _C_ -_C_ $Date$ $Revision$ _C_ The first character in this file must be an '_'! _C_ Anything on a line after _C_ is ignored _define(_filters,eqn)_C_ Index: xc/extras/ogl-sample/main/doc/man/manglw/Distfile diff -u xc/extras/ogl-sample/main/doc/man/manglw/Distfile:1.2 xc/extras/ogl-sample/main/doc/man/manglw/Distfile:removed --- xc/extras/ogl-sample/main/doc/man/manglw/Distfile:1.2 Wed May 2 09:37:45 2001 +++ xc/extras/ogl-sample/main/doc/man/manglw/Distfile Tue May 9 21:53:41 2006 @@ -1,11 +0,0 @@ -# -# - -DISTDIR_SI = /xc/doc/man/GL/glw - -DISTFILES_SI = \ - glwcreatemdrawingarea.3gl \ - glwdrawingarea.3gl \ - glwdrawingareamakecurrent.3gl \ - glwdrawingareaswapbuffers.3gl \ - $(NULL) Index: xc/extras/ogl-sample/main/doc/man/manglw/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/manglw/GNUmakefile:1.2 xc/extras/ogl-sample/main/doc/man/manglw/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/manglw/GNUmakefile:1.2 Wed May 2 09:37:45 2001 +++ xc/extras/ogl-sample/main/doc/man/manglw/GNUmakefile Tue May 9 21:53:41 2006 @@ -1,83 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -DEPTH = .. -LANGOPT = c -PREFIX = GLw -IDB_PATH = /usr/share/catman/g_man/cat3/glw - -MANPREF = man -include $(DEPTH)/mandefs - -APIFILE = $(ROOT)/usr/include/GL/gl.h - -VERSION = Version 1.0 -DATE = Aug 1998 -MMFLAGS = -rs2 - -LEGALSUF1 = gl# -LEGALSUF2 = gl# -LEGALSUF3 = gl# -LEGALSUF4 = gl# -LEGALSUF5 = gl# - -LOCALPRINTLISTFILTER = | sed -e '/^intro\.p$$/d' | (echo intro.p ; cat ) - -default: - $(MAKE) manpages - -headers headers_install libs libs_install apps: - -distsi: default - $(MAKE) $(COMMONPREF)$@ - -distoss: - $(MAKE) $(COMMONPREF)$@ - -manpages: $(patsubst %.gl,%.3gl,$(wildcard *.gl)) - -install: manpages - for file in *.3gl; do \ - install -D -m 644 $$file ${ROOT}/usr/man/man3/`basename $$file .3gl`.3gl ; \ - done - -clobber: - rm -f *.3gl - -include $(DEPTH)/manrules -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/tools/GNUmakefile diff -u xc/extras/ogl-sample/main/doc/man/tools/GNUmakefile:1.3 xc/extras/ogl-sample/main/doc/man/tools/GNUmakefile:removed --- xc/extras/ogl-sample/main/doc/man/tools/GNUmakefile:1.3 Tue Feb 6 12:45:09 2001 +++ xc/extras/ogl-sample/main/doc/man/tools/GNUmakefile Tue May 9 21:53:42 2006 @@ -1,49 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/tools/GNUmakefile#11 $ - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -default headers headers_install libs libs_install install apps: - chmod +x mdate.pl mmdoc glman - -distsi distoss: - $(MAKE) $(COMMONPREF)$@ - -$(COMMONTARGS): % : $(COMMONPREF)% - -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/doc/man/tools/constCheck.pl diff -u xc/extras/ogl-sample/main/doc/man/tools/constCheck.pl:1.3 xc/extras/ogl-sample/main/doc/man/tools/constCheck.pl:1.4 --- xc/extras/ogl-sample/main/doc/man/tools/constCheck.pl:1.3 Tue Feb 6 12:45:09 2001 +++ xc/extras/ogl-sample/main/doc/man/tools/constCheck.pl Mon Jan 9 09:56:48 2006 @@ -32,8 +32,6 @@ # published by SGI, but has not been independently verified as being # compliant with the OpenGL(R) version 1.2.1 Specification. # -# $Date$ $Revision$ -# $Header$ #----------------------------------------------------------------------------- # Index: xc/extras/ogl-sample/main/doc/man/tools/glman diff -u xc/extras/ogl-sample/main/doc/man/tools/glman:1.3 xc/extras/ogl-sample/main/doc/man/tools/glman:1.4 --- xc/extras/ogl-sample/main/doc/man/tools/glman:1.3 Tue Feb 6 12:45:09 2001 +++ xc/extras/ogl-sample/main/doc/man/tools/glman Mon Jan 9 09:56:48 2006 @@ -32,8 +32,6 @@ # published by SGI, but has not been independently verified as being # compliant with the OpenGL(R) version 1.2.1 Specification. # -# $Date$ $Revision$ -# $Header$ # $1 is the value of $PREFIX, $2 is the value of $DEPTH, # $3 is the target name, and $4 is the api file name. Index: xc/extras/ogl-sample/main/doc/man/tools/mdate.pl diff -u xc/extras/ogl-sample/main/doc/man/tools/mdate.pl:1.3 xc/extras/ogl-sample/main/doc/man/tools/mdate.pl:1.4 --- xc/extras/ogl-sample/main/doc/man/tools/mdate.pl:1.3 Tue Feb 6 12:45:09 2001 +++ xc/extras/ogl-sample/main/doc/man/tools/mdate.pl Mon Jan 9 09:56:48 2006 @@ -32,8 +32,6 @@ # published by SGI, but has not been independently verified as being # compliant with the OpenGL(R) version 1.2.1 Specification. # -# $Date$ $Revision$ -# $Header: //depot/main/doc/man/tools/mdate.pl#3 $ foreach (@ARGV) { ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime, Index: xc/extras/ogl-sample/main/gfx/lib/glu/Distfile diff -u xc/extras/ogl-sample/main/gfx/lib/glu/Distfile:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/Distfile:removed --- xc/extras/ogl-sample/main/gfx/lib/glu/Distfile:1.1.1.1 Mon Jan 15 16:48:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/Distfile Tue May 9 21:53:43 2006 @@ -1,212 +0,0 @@ -# -# $Header: //depot/main/gfx/lib/glu/Distfile#4 $ -# - -DISTDIR_SI = /xc/lib/GL/glu - -DISTFILES_SI = \ - Imakefile \ - include/gluos.h \ - libnurbs/interface/bezierEval.cc \ - libnurbs/interface/bezierEval.h \ - libnurbs/interface/bezierPatchMesh.cc \ - libnurbs/interface/bezierPatchMesh.h \ - libnurbs/interface/bezierPatch.cc \ - libnurbs/interface/bezierPatch.h \ - libnurbs/interface/glcurveval.cc \ - libnurbs/interface/glcurveval.h \ - libnurbs/interface/glimports.h \ - libnurbs/interface/glinterface.cc \ - libnurbs/interface/glrenderer.cc \ - libnurbs/interface/glrenderer.h \ - libnurbs/interface/glsurfeval.cc \ - libnurbs/interface/glsurfeval.h \ - libnurbs/interface/incurveeval.cc \ - libnurbs/interface/insurfeval.cc \ - libnurbs/interface/Imakefile \ - libnurbs/interface/mystdio.h \ - libnurbs/interface/mystdlib.h \ - libnurbs/internals/arcsorter.cc \ - libnurbs/internals/arcsorter.h \ - libnurbs/internals/arctess.cc \ - libnurbs/internals/arctess.h \ - libnurbs/internals/arc.cc \ - libnurbs/internals/arc.h \ - libnurbs/internals/backend.cc \ - libnurbs/internals/backend.h \ - libnurbs/internals/basiccrveval.cc \ - libnurbs/internals/basiccrveval.h \ - libnurbs/internals/basicsurfeval.cc \ - libnurbs/internals/basicsurfeval.h \ - libnurbs/internals/bezierarc.h \ - libnurbs/internals/bin.cc \ - libnurbs/internals/bin.h \ - libnurbs/internals/bufpool.cc \ - libnurbs/internals/bufpool.h \ - libnurbs/internals/cachingeval.cc \ - libnurbs/internals/cachingeval.h \ - libnurbs/internals/ccw.cc \ - libnurbs/internals/checker.h \ - libnurbs/internals/coveandtiler.cc \ - libnurbs/internals/coveandtiler.h \ - libnurbs/internals/curvelist.cc \ - libnurbs/internals/curvelist.h \ - libnurbs/internals/curvesub.cc \ - libnurbs/internals/curve.cc \ - libnurbs/internals/curve.h \ - libnurbs/internals/dataTransform.cc \ - libnurbs/internals/dataTransform.h \ - libnurbs/internals/defines.h \ - libnurbs/internals/displaylist.cc \ - libnurbs/internals/displaylist.h \ - libnurbs/internals/displaymode.h \ - libnurbs/internals/flistsorter.cc \ - libnurbs/internals/flistsorter.h \ - libnurbs/internals/flist.cc \ - libnurbs/internals/flist.h \ - libnurbs/internals/gridline.h \ - libnurbs/internals/gridtrimvertex.h \ - libnurbs/internals/gridvertex.h \ - libnurbs/internals/hull.cc \ - libnurbs/internals/hull.h \ - libnurbs/internals/intersect.cc \ - libnurbs/internals/Imakefile \ - libnurbs/internals/jarcloc.h \ - libnurbs/internals/knotvector.cc \ - libnurbs/internals/knotvector.h \ - libnurbs/internals/knot.h \ - libnurbs/internals/mapdescv.cc \ - libnurbs/internals/mapdesc.cc \ - libnurbs/internals/mapdesc.h \ - libnurbs/internals/maplist.cc \ - libnurbs/internals/maplist.h \ - libnurbs/internals/mesher.cc \ - libnurbs/internals/mesher.h \ - libnurbs/internals/monotonizer.cc \ - libnurbs/internals/monotonizer.h \ - libnurbs/internals/monoTriangulationBackend.cc \ - libnurbs/internals/myassert.h \ - libnurbs/internals/mybstring.h \ - libnurbs/internals/mycode.cc \ - libnurbs/internals/mymath.h \ - libnurbs/internals/mysetjmp.h \ - libnurbs/internals/mystring.h \ - libnurbs/internals/nurbsconsts.h \ - libnurbs/internals/nurbsinterfac.cc \ - libnurbs/internals/nurbstess.cc \ - libnurbs/internals/nurbstess.h \ - libnurbs/internals/patchlist.cc \ - libnurbs/internals/patchlist.h \ - libnurbs/internals/patch.cc \ - libnurbs/internals/patch.h \ - libnurbs/internals/pwlarc.h \ - libnurbs/internals/quilt.cc \ - libnurbs/internals/quilt.h \ - libnurbs/internals/reader.cc \ - libnurbs/internals/reader.h \ - libnurbs/internals/renderhints.cc \ - libnurbs/internals/renderhints.h \ - libnurbs/internals/README.Copyright \ - libnurbs/internals/simplemath.h \ - libnurbs/internals/slicer.cc \ - libnurbs/internals/slicer.h \ - libnurbs/internals/sorter.cc \ - libnurbs/internals/sorter.h \ - libnurbs/internals/splitarcs.cc \ - libnurbs/internals/subdivider.cc \ - libnurbs/internals/subdivider.h \ - libnurbs/internals/tobezier.cc \ - libnurbs/internals/trimline.cc \ - libnurbs/internals/trimline.h \ - libnurbs/internals/trimregion.cc \ - libnurbs/internals/trimregion.h \ - libnurbs/internals/trimvertex.h \ - libnurbs/internals/trimvertpool.cc \ - libnurbs/internals/trimvertpool.h \ - libnurbs/internals/types.h \ - libnurbs/internals/uarray.cc \ - libnurbs/internals/uarray.h \ - libnurbs/internals/varray.cc \ - libnurbs/internals/varray.h \ - libnurbs/Imakefile \ - libnurbs/nurbtess/definitions.h \ - libnurbs/nurbtess/directedLine.cc \ - libnurbs/nurbtess/directedLine.h \ - libnurbs/nurbtess/glimports.h \ - libnurbs/nurbtess/gridWrap.cc \ - libnurbs/nurbtess/gridWrap.h \ - libnurbs/nurbtess/Imakefile \ - libnurbs/nurbtess/monoChain.cc \ - libnurbs/nurbtess/monoChain.h \ - libnurbs/nurbtess/monoPolyPart.cc \ - libnurbs/nurbtess/monoPolyPart.h \ - libnurbs/nurbtess/monoTriangulation.cc \ - libnurbs/nurbtess/monoTriangulation.h \ - libnurbs/nurbtess/mystdio.h \ - libnurbs/nurbtess/mystdlib.h \ - libnurbs/nurbtess/partitionX.cc \ - libnurbs/nurbtess/partitionX.h \ - libnurbs/nurbtess/partitionY.cc \ - libnurbs/nurbtess/partitionY.h \ - libnurbs/nurbtess/polyDBG.cc \ - libnurbs/nurbtess/polyDBG.h \ - libnurbs/nurbtess/polyUtil.cc \ - libnurbs/nurbtess/polyUtil.h \ - libnurbs/nurbtess/primitiveStream.cc \ - libnurbs/nurbtess/primitiveStream.h \ - libnurbs/nurbtess/quicksort.cc \ - libnurbs/nurbtess/quicksort.h \ - libnurbs/nurbtess/rectBlock.cc \ - libnurbs/nurbtess/rectBlock.h \ - libnurbs/nurbtess/sampleCompBot.cc \ - libnurbs/nurbtess/sampleCompBot.h \ - libnurbs/nurbtess/sampleCompRight.cc \ - libnurbs/nurbtess/sampleCompRight.h \ - libnurbs/nurbtess/sampleCompTop.cc \ - libnurbs/nurbtess/sampleCompTop.h \ - libnurbs/nurbtess/sampleComp.cc \ - libnurbs/nurbtess/sampleComp.h \ - libnurbs/nurbtess/sampledLine.cc \ - libnurbs/nurbtess/sampledLine.h \ - libnurbs/nurbtess/sampleMonoPoly.cc \ - libnurbs/nurbtess/sampleMonoPoly.h \ - libnurbs/nurbtess/searchTree.cc \ - libnurbs/nurbtess/searchTree.h \ - libnurbs/nurbtess/zlassert.h \ - libtess/dict-list.h \ - libtess/dict.c \ - libtess/dict.h \ - libtess/geom.c \ - libtess/geom.h \ - libtess/Imakefile \ - libtess/memalloc-non-thread-safe.c \ - libtess/memalloc-non-thread-safe.h \ - libtess/memalloc.c \ - libtess/memalloc.h \ - libtess/mesh.c \ - libtess/mesh.h \ - libtess/normal.c \ - libtess/normal.h \ - libtess/priorityq-heap.c \ - libtess/priorityq-heap.h \ - libtess/priorityq-sort.h \ - libtess/priorityq.c \ - libtess/priorityq.h \ - libtess/render.c \ - libtess/render.h \ - libtess/README \ - libtess/sweep.c \ - libtess/sweep.h \ - libtess/tessmono.c \ - libtess/tessmono.h \ - libtess/tess.c \ - libtess/tess.h \ - libutil/error.c \ - libutil/glue.c \ - libutil/gluint.h \ - libutil/Imakefile \ - libutil/mipmap.c \ - libutil/project.c \ - libutil/quad.c \ - libutil/registry.c \ - $(NULL) Index: xc/extras/ogl-sample/main/gfx/lib/glu/GNUmakefile diff -u xc/extras/ogl-sample/main/gfx/lib/glu/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/GNUmakefile:removed --- xc/extras/ogl-sample/main/gfx/lib/glu/GNUmakefile:1.1.1.1 Mon Jan 15 16:48:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/GNUmakefile Tue May 9 21:53:43 2006 @@ -1,108 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/gfx/lib/glu/GNUmakefile#17 $ - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs -include $(ROOT)/usr/include/libspec/libspecdefs - -TARGET = libGLU.so.1 - -TARGETS = $(TARGET) - -LLDLIBS = -lGL -lm -ifeq ($(OS),Linux) -# use g++ rather than ld -LD=g++ -LDDSOFLAGS=-shared -Wl,-soname=$(TARGET) -Wl,--whole-archive -LDFLAGS=-Wl,--no-whole-archive -else -LLDLIBS += -lc -lC -endif -DSONAME = $(TARGET) -DSOEXPORTS = glu.exports - -SUBDIRS = \ - include \ - libutil \ - libtess \ - libnurbs \ - $(NULL) - -UTIL = libutil/libutil.a -TESS = libtess/libtess.a -NURB_INTERNAL = libnurbs/internals/libinternals.a -NURB_INTERFACE = libnurbs/interface/libinterface.a -NURB_TESS = libnurbs/nurbtess/libnurbtess.a -SRCLIBS = $(UTIL) $(TESS) $(NURB_INTERNAL) $(NURB_INTERFACE) $(NURB_TESS) - -default libs: $(_FORCE) - cd libutil; $(MAKE); - cd libtess; $(MAKE); - cd libnurbs/internals; $(MAKE); - cd libnurbs/interface; $(MAKE); - cd libnurbs/nurbtess; $(MAKE); - $(MAKE) $(TARGET); - -headers headers_install apps: - -libs_install install: default - $(INSTALL) -F $(LIB_LOCATION) $(TARGET); - -distsi distoss: - $(MAKE) $(COMMONPREF)$@ - $(SUBDIRS_MAKERULE) - -$(TARGET): $(DSOEXPORTS) $(SRCLIBS) - $(LD) $(LDDSOFLAGS) $(SRCLIBS) $(LDFLAGS) -o $@; - -$(DSOEXPORTS): $(LIBSPEC_PARSER) $(TYPEMAPSDIR)/$(C_TYPEMAP) \ - $(SPECDIR)/$(GLU_SPEC) exports.ls GNUmakefile - rm -f $@.tmp.ls; - cat exports.ls > $@.tmp.ls; - $(LIBSPEC) -DOUTPUT="$@" -DPROCPREFIX="glu" \ - -DTYPEMAP=$(TYPEMAPSDIR)/$(C_TYPEMAP) \ - -P $(LIBSPEC_PARSER) $@.tmp.ls "$(SPECDIR)/$(GLU_SPEC)" > $@; - sort +1 $@ -o $@; - rm $@.tmp.ls; - -# local dirt, cpp output files and assembler listings -LDIRT = $(DSOEXPORTS) - -include $(COMMONRULES) - -$(COMMONTARGS): % : $(COMMONPREF)% - $(SUBDIRS_MAKERULE) Index: xc/extras/ogl-sample/main/gfx/lib/glu/exports.ls diff -u xc/extras/ogl-sample/main/gfx/lib/glu/exports.ls:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/exports.ls:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/exports.ls:1.1.1.1 Mon Jan 15 16:48:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/exports.ls Mon Jan 9 09:56:48 2006 @@ -36,8 +36,6 @@ # Declare the language and type map to use and initialize any special tables # required for processing. # -# $Date$ $Revision$ -# $Header: //depot/main/gfx/lib/glu/exports.ls#4 $ function initialize() { Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/GNUmakefile diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/GNUmakefile:removed --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/GNUmakefile:1.1.1.1 Mon Jan 15 16:48:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/GNUmakefile Tue May 9 21:53:44 2006 @@ -1,54 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/gfx/lib/glu/libnurbs/GNUmakefile#7 $ - -COMMONPREF = standard -include $(ROOT)/usr/include/make/commondefs - -SUBDIRS = \ - internals \ - interface \ - nurbtess \ - $(NULL) - -default $(ALLTARGS): $(_FORCE) - $(SUBDIRS_MAKERULE) - -distoss: - $(MAKE) $(COMMONPREF)$@ - $(SUBDIRS_MAKERULE) - -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/GNUmakefile diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/GNUmakefile:removed --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/GNUmakefile:1.1.1.1 Mon Jan 15 16:48:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/GNUmakefile Tue May 9 21:53:44 2006 @@ -1,75 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/gfx/lib/glu/libnurbs/interface/GNUmakefile#8 $ - -include $(ROOT)/usr/include/make/commondefs - -TARGET = libinterface.a - -TARGETS = $(TARGET) - -LCXXDEFS = -DNDEBUG -DLIBRARYBUILD -LCXXINCS = -I. -I../../include -I../internals -I../nurbtess - -HFILES = \ - glcurveval.h \ - glrenderer.h \ - glsurfeval.h \ - bezierPatch.h \ - bezierEval.h \ - bezierPatchMesh.h \ - $(NULL) - -CCFILES = \ - glcurveval.cc \ - glinterface.cc \ - glrenderer.cc \ - glsurfeval.cc \ - insurfeval.cc \ - bezierPatch.cc \ - bezierEval.cc \ - bezierPatchMesh.cc \ - incurveeval.cc \ - $(NULL) - -default libs libs_install install: $(TARGET) - -headers headers_install apps: - -$(TARGET): $(OBJECTS) - $(AR) crl $@ $(OBJECTS); - -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.cc:1.2 Wed Oct 22 15:20:55 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.cc Mon Jan 9 09:56:48 2006 @@ -31,12 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.cc,v 1.2 2003/10/22 19:20:55 tsi Exp $ */ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/interface/bezierEval.cc#3 $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.cc,v 1.3 2006/01/09 14:56:48 dawes Exp $ */ #include #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.h:1.1.1.1 Mon Jan 15 16:48:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierEval.h Mon Jan 9 09:56:49 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/interface/bezierEval.h#4 $ */ #ifndef _BEZIEREVAL_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatch.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatch.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatch.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatch.cc:1.1.1.1 Mon Jan 15 16:48:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatch.cc Mon Jan 9 09:56:49 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/interface/bezierPatch.cc#4 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatch.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatch.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatch.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatch.h:1.1.1.1 Mon Jan 15 16:48:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatch.h Mon Jan 9 09:56:49 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/interface/bezierPatch.h#4 $ */ #ifndef _BEZIERPATCH_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.cc:1.1.1.1 Mon Jan 15 16:48:13 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.cc Mon Jan 9 09:56:49 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.cc#4 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.h:1.1.1.1 Mon Jan 15 16:48:13 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.h Mon Jan 9 09:56:49 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/interface/bezierPatchMesh.h#5 $ */ #ifndef _BEZIERPATCHMESH_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.cc:1.2 Sun Jan 21 16:19:07 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.cc Mon Jan 9 09:56:49 2006 @@ -31,13 +31,11 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.cc,v 1.2 2001/01/21 21:19:07 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.cc,v 1.3 2006/01/09 14:56:49 dawes Exp $ */ /* * glcurveval.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/interface/glcurveval.cc#7 $ */ /* Polynomial Evaluator Interface */ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.h:1.1.1.1 Mon Jan 15 16:48:13 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glcurveval.h Mon Jan 9 09:56:49 2006 @@ -35,8 +35,6 @@ /* * glcurveval.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/interface/glcurveval.h#9 $ */ #ifndef __gluglcurveval_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glimports.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glimports.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glimports.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glimports.h:1.1.1.1 Mon Jan 15 16:48:13 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glimports.h Mon Jan 9 09:56:49 2006 @@ -35,8 +35,6 @@ /* * glimports.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/interface/glimports.h#3 $ */ #ifndef __gluimports_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glrenderer.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glrenderer.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glrenderer.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glrenderer.cc:1.1.1.1 Mon Jan 15 16:48:16 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glrenderer.cc Mon Jan 9 09:56:49 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/interface/glrenderer.cc#4 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glrenderer.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glrenderer.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glrenderer.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glrenderer.h:1.1.1.1 Mon Jan 15 16:48:16 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glrenderer.h Mon Jan 9 09:56:49 2006 @@ -35,8 +35,6 @@ /* * glrenderer.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/interface/glrenderer.h#10 $ */ #ifndef __gluglrenderer_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.cc:1.2 Wed Oct 22 15:20:55 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.cc Mon Jan 9 09:56:49 2006 @@ -31,13 +31,11 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.cc,v 1.2 2003/10/22 19:20:55 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.cc,v 1.3 2006/01/09 14:56:49 dawes Exp $ */ /* * glsurfeval.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/interface/glsurfeval.cc#7 $ */ /* Polynomial Evaluator Interface */ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.h:1.1.1.1 Mon Jan 15 16:48:18 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/glsurfeval.h Mon Jan 9 09:56:49 2006 @@ -35,8 +35,6 @@ /* * glsurfeval.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/interface/glsurfeval.h#9 $ */ #ifndef __gluglsurfeval_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/incurveeval.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/incurveeval.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/incurveeval.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/incurveeval.cc:1.2 Wed Oct 22 15:20:55 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/incurveeval.cc Mon Jan 9 09:56:49 2006 @@ -31,13 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/incurveeval.cc,v 1.2 2003/10/22 19:20:55 tsi Exp $ */ - -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/interface/incurveeval.cc#4 $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/incurveeval.cc,v 1.3 2006/01/09 14:56:49 dawes Exp $ */ #include #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/insurfeval.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/insurfeval.cc:1.3 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/insurfeval.cc:1.4 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/insurfeval.cc:1.3 Wed Oct 22 15:20:55 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/insurfeval.cc Mon Jan 9 09:56:49 2006 @@ -31,12 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ */ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/interface/insurfeval.cc#4 $ -*/ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/insurfeval.cc,v 1.3 2003/10/22 19:20:55 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/insurfeval.cc,v 1.4 2006/01/09 14:56:49 dawes Exp $ */ #include "gluos.h" #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/mystdio.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/mystdio.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/mystdio.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/mystdio.h:1.1.1.1 Mon Jan 15 16:48:20 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/mystdio.h Mon Jan 9 09:56:49 2006 @@ -35,8 +35,6 @@ /* * mystdio.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/interface/mystdio.h#3 $ */ #ifndef __glumystdio_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/mystdlib.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/mystdlib.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/mystdlib.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/mystdlib.h:1.1.1.1 Mon Jan 15 16:48:20 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/interface/mystdlib.h Mon Jan 9 09:56:49 2006 @@ -35,8 +35,6 @@ /* * mystdlib.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/interface/mystdlib.h#3 $ */ #ifndef __glumystdlib_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/GNUmakefile diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/GNUmakefile:removed --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/GNUmakefile:1.1.1.1 Mon Jan 15 16:48:21 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/GNUmakefile Tue May 9 21:53:44 2006 @@ -1,160 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/gfx/lib/glu/libnurbs/internals/GNUmakefile#12 $ - -include $(ROOT)/usr/include/make/commondefs - -TARGET = libinternals.a - -TARGETS = $(TARGET) - -LCXXDEFS = -DNDEBUG -DLIBRARYBUILD -LCXXINCS = -I../nurbtess -I../interface -I../../include - -HFILES = \ - arc.h \ - arcsorter.h \ - arctess.h \ - backend.h \ - basiccrveval.h \ - basicsurfeval.h \ - bezierarc.h \ - bin.h \ - bufpool.h \ - cachingeval.h \ - coveandtiler.h \ - curve.h \ - curvelist.h \ - defines.h \ - displaylist.h \ - displaymode.h \ - flist.h \ - flistsorter.h \ - glimports.h \ - gridline.h \ - gridtrimvertex.h \ - gridvertex.h \ - hull.h \ - jarcloc.h \ - knotvector.h \ - mapdesc.h \ - maplist.h \ - mesher.h \ - monotonizer.h \ - myassert.h \ - mymath.h \ - mysetjmp.h \ - mystdio.h \ - mystdlib.h \ - mystring.h \ - nurbsconsts.h \ - nurbstess.h \ - patch.h \ - patchlist.h \ - pwlarc.h \ - quilt.h \ - reader.h \ - renderhints.h \ - simplemath.h \ - slicer.h \ - sorter.h \ - subdivider.h \ - trimline.h \ - trimregion.h \ - trimvertex.h \ - trimvertpool.h \ - types.h \ - uarray.h \ - varray.h \ - dataTransform.h \ - $(NULL) - -CCFILES = \ - arc.cc \ - arcsorter.cc \ - arctess.cc \ - backend.cc \ - basiccrveval.cc \ - basicsurfeval.cc \ - bin.cc \ - bufpool.cc \ - cachingeval.cc \ - ccw.cc \ - coveandtiler.cc \ - curve.cc \ - curvelist.cc \ - curvesub.cc \ - displaylist.cc \ - flist.cc \ - flistsorter.cc \ - hull.cc \ - intersect.cc \ - knotvector.cc \ - mapdesc.cc \ - mapdescv.cc \ - maplist.cc \ - mesher.cc \ - monotonizer.cc \ - mycode.cc \ - nurbsinterfac.cc \ - nurbstess.cc \ - patch.cc \ - patchlist.cc \ - quilt.cc \ - reader.cc \ - renderhints.cc \ - slicer.cc \ - sorter.cc \ - splitarcs.cc \ - subdivider.cc \ - tobezier.cc \ - trimline.cc \ - trimregion.cc \ - trimvertpool.cc \ - uarray.cc \ - varray.cc \ - dataTransform.cc \ - monoTriangulationBackend.cc \ - $(NULL) - -default libs libs_install install: $(TARGET) - -headers headers_install apps: - -$(TARGET): $(OBJECTS) - $(AR) crl $@ $(OBJECTS); - -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.cc:1.2 Wed Oct 22 15:20:56 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.cc Mon Jan 9 09:56:49 2006 @@ -35,10 +35,8 @@ /* * arc.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/arc.cc#4 $ */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.cc,v 1.2 2003/10/22 19:20:56 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.cc,v 1.3 2006/01/09 14:56:49 dawes Exp $ */ #include #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.h:1.1.1.1 Mon Jan 15 16:48:23 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arc.h Mon Jan 9 09:56:49 2006 @@ -35,8 +35,6 @@ /* * arc.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/arc.h#5 $ */ #ifndef __gluarc_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arcsorter.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arcsorter.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arcsorter.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arcsorter.cc:1.1.1.1 Mon Jan 15 16:48:23 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arcsorter.cc Mon Jan 9 09:56:49 2006 @@ -35,8 +35,6 @@ /* * arcsorter.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/arcsorter.cc#3 $ */ #ifndef __gluarcsorter_c_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arcsorter.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arcsorter.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arcsorter.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arcsorter.h:1.1.1.1 Mon Jan 15 16:48:23 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arcsorter.h Mon Jan 9 09:56:49 2006 @@ -35,8 +35,6 @@ /* * arcsorter.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/arcsorter.h#4 $ */ #ifndef __gluarcsorter_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.cc:1.2 Wed Oct 22 15:20:56 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.cc Mon Jan 9 09:56:49 2006 @@ -31,13 +31,11 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.cc,v 1.2 2003/10/22 19:20:56 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.cc,v 1.3 2006/01/09 14:56:49 dawes Exp $ */ /* * arctessellator.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/arctess.cc#4 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.h:1.1.1.1 Mon Jan 15 16:48:23 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/arctess.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * arctess.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/arctess.h#5 $ */ #ifndef __gluarctess_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.cc:1.2 Wed Oct 22 15:20:56 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.cc Mon Jan 9 09:56:50 2006 @@ -31,13 +31,11 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.cc,v 1.2 2003/10/22 19:20:56 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.cc,v 1.3 2006/01/09 14:56:50 dawes Exp $ */ /* * backend.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/backend.cc#3 $ */ /* Bezier surface backend Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.h:1.1.1.1 Mon Jan 15 16:48:23 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/backend.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * backend.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/backend.h#4 $ */ #ifndef __glubackend_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basiccrveval.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basiccrveval.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basiccrveval.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basiccrveval.cc:1.1.1.1 Mon Jan 15 16:48:23 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basiccrveval.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * basiccrveval.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/basiccrveval.cc#3 $ */ #include "mystdio.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basiccrveval.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basiccrveval.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basiccrveval.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basiccrveval.h:1.1.1.1 Mon Jan 15 16:48:23 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basiccrveval.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * basiccurveeval.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/basiccrveval.h#4 $ */ #ifndef __glubasiccrveval_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.cc:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * basicsurfaceevaluator.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.cc#3 $ */ #include "mystdio.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.h:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * basicsurfeval.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/basicsurfeval.h#4 $ */ #ifndef __glubasicsurfeval_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bezierarc.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bezierarc.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bezierarc.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bezierarc.h:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bezierarc.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * bezierarc.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/bezierarc.h#4 $ */ #ifndef __glubezierarc_h Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.cc:1.2 Wed Oct 22 15:20:56 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.cc Mon Jan 9 09:56:50 2006 @@ -31,13 +31,11 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.cc,v 1.2 2003/10/22 19:20:56 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.cc,v 1.3 2006/01/09 14:56:50 dawes Exp $ */ /* * bin.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/bin.cc#4 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.h:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bin.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * bin.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/bin.h#5 $ */ #ifndef __glubin_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * bufpool.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/bufpool.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/bufpool.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * bufpool.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/bufpool.h#4 $ */ #ifndef __glubufpool_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/cachingeval.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/cachingeval.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/cachingeval.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/cachingeval.cc:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/cachingeval.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * cachingeval.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/cachingeval.cc#3 $ */ #include "cachingeval.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/cachingeval.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/cachingeval.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/cachingeval.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/cachingeval.h:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/cachingeval.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * cachingeval.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/cachingeval.h#4 $ */ #ifndef __glucachingval_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/ccw.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/ccw.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/ccw.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/ccw.cc:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/ccw.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * ccw.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/ccw.cc#4 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/coveandtiler.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/coveandtiler.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/coveandtiler.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/coveandtiler.cc:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/coveandtiler.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * coveandtiler.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/coveandtiler.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/coveandtiler.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/coveandtiler.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/coveandtiler.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/coveandtiler.h:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/coveandtiler.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * coveandtiler.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/coveandtiler.h#4 $ */ #ifndef __glucoveandtiler_h Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.cc:1.4 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.cc:1.5 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.cc:1.4 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.cc Mon Jan 9 09:56:50 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.cc,v 1.4 2003/10/22 19:20:57 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.cc,v 1.5 2006/01/09 14:56:50 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -36,8 +36,6 @@ /* * curve.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/curve.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.h:1.1.1.1 Mon Jan 15 16:48:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curve.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * curve.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/curve.h#4 $ */ #ifndef __glucurve_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvelist.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvelist.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvelist.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvelist.cc:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvelist.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * curvelist.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/curvelist.cc#4 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvelist.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvelist.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvelist.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvelist.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvelist.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * curvelist.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/curvelist.h#4 $ */ #ifndef __glucurvelist_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvesub.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvesub.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvesub.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvesub.cc:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/curvesub.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * curvesub.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/curvesub.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.cc:1.2 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.cc Mon Jan 9 09:56:50 2006 @@ -31,12 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ */ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/internals/dataTransform.cc#4 $ -*/ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.cc,v 1.2 2003/10/22 19:20:57 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.cc,v 1.3 2006/01/09 14:56:50 dawes Exp $ */ #include #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/dataTransform.h Mon Jan 9 09:56:50 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/internals/dataTransform.h#4 $ */ #ifndef _DATA_TRANSFORM_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/defines.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/defines.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/defines.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/defines.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/defines.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * defines.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/defines.h#4 $ */ #ifndef __gludefines_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaylist.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaylist.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaylist.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaylist.cc:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaylist.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * displaylist.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/displaylist.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaylist.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaylist.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaylist.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaylist.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaylist.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * displaylist.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/displaylist.h#4 $ */ #ifndef __gludisplaylist_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaymode.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaymode.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaymode.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaymode.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/displaymode.h Mon Jan 9 09:56:50 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/internals/displaymode.h#4 $ */ #ifndef __gludisplaymode_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flist.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flist.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flist.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flist.cc:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flist.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * flist.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/flist.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flist.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flist.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flist.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flist.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flist.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * flist.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/flist.h#4 $ */ #ifndef __gluflist_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flistsorter.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flistsorter.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flistsorter.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flistsorter.cc:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flistsorter.cc Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * flistsorter.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/flistsorter.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flistsorter.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flistsorter.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flistsorter.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flistsorter.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/flistsorter.h Mon Jan 9 09:56:50 2006 @@ -35,8 +35,6 @@ /* * flistsorter.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/flistsorter.h#4 $ */ #ifndef __gluflistsorter_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridline.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridline.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridline.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridline.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridline.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * gridline.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/gridline.h#4 $ */ #ifndef __glugridline_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridtrimvertex.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridtrimvertex.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridtrimvertex.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridtrimvertex.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridtrimvertex.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * gridtrimvertex.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/gridtrimvertex.h#4 $ */ #ifndef __glugridtrimvertex_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridvertex.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridvertex.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridvertex.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridvertex.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/gridvertex.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * gridvertex.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/gridvertex.h#4 $ */ #ifndef __glugridvertex_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/hull.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/hull.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/hull.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/hull.cc:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/hull.cc Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * hull.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/hull.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/hull.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/hull.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/hull.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/hull.h:1.1.1.1 Mon Jan 15 16:48:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/hull.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * hull.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/hull.h#4 $ */ #ifndef __gluhull_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/intersect.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/intersect.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/intersect.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/intersect.cc:1.2 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/intersect.cc Mon Jan 9 09:56:51 2006 @@ -31,13 +31,11 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/intersect.cc,v 1.2 2003/10/22 19:20:57 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/intersect.cc,v 1.3 2006/01/09 14:56:51 dawes Exp $ */ /* * intersect.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/intersect.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/jarcloc.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/jarcloc.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/jarcloc.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/jarcloc.h:1.1.1.1 Mon Jan 15 16:48:31 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/jarcloc.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * jarcloc.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/jarcloc.h#5 $ */ #ifndef __glujarcloc_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc:1.1.1.1 Mon Jan 15 16:48:31 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.cc Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * knotvector.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/knotvector.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h:1.1.1.1 Mon Jan 15 16:48:31 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/knotvector.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * knotvector.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/knotvector.h#4 $ */ #ifndef __gluknotvector_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdesc.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdesc.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdesc.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdesc.cc:1.1.1.1 Mon Jan 15 16:48:31 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdesc.cc Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * mapdesc.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/mapdesc.cc#4 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdesc.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdesc.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdesc.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdesc.h:1.1.1.1 Mon Jan 15 16:48:31 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdesc.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * mapdesc.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/mapdesc.h#4 $ */ #ifndef __glumapdesc_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdescv.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdescv.cc:1.4 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdescv.cc:1.5 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdescv.cc:1.4 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdescv.cc Mon Jan 9 09:56:51 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdescv.cc,v 1.4 2003/10/22 19:20:57 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mapdescv.cc,v 1.5 2006/01/09 14:56:51 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -36,8 +36,6 @@ /* * mapdescv.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/mapdescv.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/maplist.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/maplist.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/maplist.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/maplist.cc:1.1.1.1 Mon Jan 15 16:48:31 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/maplist.cc Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * maplist.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/maplist.cc#4 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/maplist.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/maplist.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/maplist.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/maplist.h:1.1.1.1 Mon Jan 15 16:48:31 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/maplist.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * maplist.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/maplist.h#4 $ */ #ifndef __glumaplist_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mesher.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mesher.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mesher.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mesher.cc:1.1.1.1 Mon Jan 15 16:48:33 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mesher.cc Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * mesher.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/mesher.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mesher.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mesher.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mesher.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mesher.h:1.1.1.1 Mon Jan 15 16:48:33 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mesher.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * mesher.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/mesher.h#4 $ */ #ifndef __glumesher_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monoTriangulationBackend.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monoTriangulationBackend.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monoTriangulationBackend.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monoTriangulationBackend.cc:1.2 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monoTriangulationBackend.cc Mon Jan 9 09:56:51 2006 @@ -31,12 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ */ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/internals/monoTriangulationBackend.cc#3 $ -*/ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monoTriangulationBackend.cc,v 1.2 2003/10/22 19:20:57 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monoTriangulationBackend.cc,v 1.3 2006/01/09 14:56:51 dawes Exp $ */ #include "monoTriangulation.h" #include "polyUtil.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.cc:1.1.1.1 Mon Jan 15 16:48:33 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.cc Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * monotonizer.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/monotonizer.cc#4 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.h:1.1.1.1 Mon Jan 15 16:48:33 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.h Mon Jan 9 09:56:51 2006 @@ -13,7 +13,6 @@ /* * monotonizer.h * - * $Header: /cvs/projects/ogl-sample/main/gfx/lib/glu/libnurbs/internals/monotonizer.h,v 1.1 2000/04/26 05:53:59 ljp Exp $ */ #ifndef __glumonotonizer_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/myassert.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/myassert.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/myassert.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/myassert.h:1.1.1.1 Mon Jan 15 16:48:33 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/myassert.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * myassert.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/myassert.h#4 $ */ #ifndef __glumyassert_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mycode.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mycode.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mycode.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mycode.cc:1.1.1.1 Mon Jan 15 16:48:33 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mycode.cc Mon Jan 9 09:56:51 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/internals/mycode.cc#3 $ */ #include "mymath.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h:1.3 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h:1.4 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h:1.3 Fri May 31 12:36:49 2002 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h Mon Jan 9 09:56:51 2006 @@ -35,13 +35,9 @@ /* * mymath.h * - * Date Revision - * Header: //depot/main/gfx/lib/glu/libnurbs/internals/mymath.h#4 */ - - -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h,v 1.3 2002/05/31 16:36:49 dawes Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mymath.h,v 1.4 2006/01/09 14:56:51 dawes Exp $ */ #ifndef __glumymath_h_ #define __glumymath_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h:1.4 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h:1.5 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h:1.4 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h Mon Jan 9 09:56:51 2006 @@ -31,13 +31,11 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h,v 1.4 2003/10/22 19:20:57 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h,v 1.5 2006/01/09 14:56:51 dawes Exp $ */ /* * mysetjmp.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/mysetjmp.h#4 $ */ #ifndef __glumysetjmp_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mystring.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mystring.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mystring.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mystring.h:1.1.1.1 Mon Jan 15 16:48:33 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/mystring.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * mystring.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/mystring.h#4 $ */ #ifndef __glumystring_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbsconsts.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbsconsts.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbsconsts.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbsconsts.h:1.1.1.1 Mon Jan 15 16:48:33 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbsconsts.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * nurbsconsts.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/nurbsconsts.h#4 $ */ #ifndef __glunurbsconsts_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbsinterfac.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbsinterfac.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbsinterfac.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbsinterfac.cc:1.1.1.1 Mon Jan 15 16:48:36 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbsinterfac.cc Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * nurbsinterfac.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/nurbsinterfac.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc:1.1.1.1 Mon Jan 15 16:48:36 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * nurbstess.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/nurbstess.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h:1.1.1.1 Mon Jan 15 16:48:36 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/nurbstess.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * nurbstess.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/nurbstess.h#5 $ */ #ifndef __glunurbstess_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.cc:1.3 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.cc:1.4 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.cc:1.3 Fri Apr 27 08:58:28 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.cc Mon Jan 9 09:56:51 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.cc,v 1.3 2001/04/27 12:58:28 dawes Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.cc,v 1.4 2006/01/09 14:56:51 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -36,8 +36,6 @@ /* * patch.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/patch.cc#4 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.h:1.1.1.1 Mon Jan 15 16:48:38 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patch.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * patch.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/patch.h#4 $ */ #ifndef __glupatch_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patchlist.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patchlist.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patchlist.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patchlist.cc:1.1.1.1 Mon Jan 15 16:48:38 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patchlist.cc Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * patchlist.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/patchlist.cc#3 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patchlist.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patchlist.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patchlist.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patchlist.h:1.1.1.1 Mon Jan 15 16:48:38 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/patchlist.h Mon Jan 9 09:56:51 2006 @@ -35,8 +35,6 @@ /* * patchlist.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/patchlist.h#4 $ */ #ifndef __glupatchlist_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/pwlarc.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/pwlarc.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/pwlarc.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/pwlarc.h:1.1.1.1 Mon Jan 15 16:48:38 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/pwlarc.h Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * pwlarc.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/pwlarc.h#5 $ */ #ifndef __glupwlarc_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/quilt.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/quilt.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/quilt.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/quilt.cc:1.1.1.1 Mon Jan 15 16:48:38 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/quilt.cc Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * quilt.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/quilt.cc#5 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/quilt.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/quilt.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/quilt.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/quilt.h:1.1.1.1 Mon Jan 15 16:48:38 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/quilt.h Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * quilt.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/quilt.h#5 $ */ #ifndef __gluquilt_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/reader.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/reader.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/reader.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/reader.cc:1.1.1.1 Mon Jan 15 16:48:38 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/reader.cc Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * reader.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/reader.cc#3 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/reader.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/reader.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/reader.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/reader.h:1.1.1.1 Mon Jan 15 16:48:38 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/reader.h Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * reader.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/reader.h#4 $ */ #ifndef __glureader_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/renderhints.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/renderhints.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/renderhints.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/renderhints.cc:1.1.1.1 Mon Jan 15 16:48:38 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/renderhints.cc Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * renderhints.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/renderhints.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/renderhints.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/renderhints.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/renderhints.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/renderhints.h:1.1.1.1 Mon Jan 15 16:48:38 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/renderhints.h Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * renderhints.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/renderhints.h#4 $ */ #ifndef __glurenderhints_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h:1.3 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h:1.4 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h:1.3 Sat Apr 3 17:26:20 2004 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h Mon Jan 9 09:56:52 2006 @@ -31,12 +31,11 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h,v 1.3 2004/04/03 22:26:20 dawes Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/simplemath.h,v 1.4 2006/01/09 14:56:52 dawes Exp $ */ /* * simplemath.h * - * Header: //depot/main/gfx/lib/glu/libnurbs/internals/simplemath.h#4 $ */ #ifndef __glusimplemath_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.cc:1.3 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.cc:1.4 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.cc:1.3 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.cc Mon Jan 9 09:56:52 2006 @@ -31,13 +31,11 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.cc,v 1.3 2003/10/22 19:20:57 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.cc,v 1.4 2006/01/09 14:56:52 dawes Exp $ */ /* * slicer.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/slicer.cc#4 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.h:1.1.1.1 Mon Jan 15 16:48:40 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/slicer.h Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * slicer.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/slicer.h#5 $ */ #ifndef __gluslicer_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/sorter.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/sorter.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/sorter.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/sorter.cc:1.1.1.1 Mon Jan 15 16:48:40 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/sorter.cc Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * sorter.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/sorter.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/sorter.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/sorter.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/sorter.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/sorter.h:1.1.1.1 Mon Jan 15 16:48:40 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/sorter.h Mon Jan 9 09:56:52 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/internals/sorter.h#4 $ */ #ifndef __glusorter_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/splitarcs.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/splitarcs.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/splitarcs.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/splitarcs.cc:1.1.1.1 Mon Jan 15 16:48:40 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/splitarcs.cc Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * splitarcs.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/splitarcs.cc#4 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/subdivider.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/subdivider.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/subdivider.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/subdivider.cc:1.1.1.1 Mon Jan 15 16:48:43 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/subdivider.cc Mon Jan 9 09:56:52 2006 @@ -35,8 +35,6 @@ /* * subdivider.cxx * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/subdivider.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/subdivider.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/subdivider.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/subdivider.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/subdivider.h:1.1.1.1 Mon Jan 15 16:48:43 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/subdivider.h Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * subdivider.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/subdivider.h#5 $ */ #ifndef __glusubdivider_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/tobezier.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/tobezier.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/tobezier.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/tobezier.cc:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/tobezier.cc Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * tobezier.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/tobezier.cc#4 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.cc:1.2 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.cc Mon Jan 9 09:56:53 2006 @@ -31,13 +31,11 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.cc,v 1.2 2003/10/22 19:20:57 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.cc,v 1.3 2006/01/09 14:56:53 dawes Exp $ */ /* * trimline.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/trimline.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.h:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimline.h Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * trimline.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/trimline.h#5 $ */ #ifndef __glutrimline_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimregion.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimregion.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimregion.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimregion.cc:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimregion.cc Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * trimregion.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/trimregion.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimregion.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimregion.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimregion.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimregion.h:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimregion.h Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * trimregion.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/trimregion.h#5 $ */ #ifndef __glutrimregion_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertex.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertex.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertex.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertex.h:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertex.h Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * trimvertex.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/trimvertex.h#5 $ */ #ifndef __glutrimvertex_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertpool.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertpool.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertpool.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertpool.cc:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertpool.cc Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * trimvertexpool.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/trimvertpool.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertpool.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertpool.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertpool.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertpool.h:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/trimvertpool.h Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * trimvertexpool.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/trimvertpool.h#4 $ */ #ifndef __glutrimvertpool_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/types.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/types.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/types.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/types.h:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/types.h Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * types.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/types.h#4 $ */ #ifndef __glutypes_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/uarray.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/uarray.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/uarray.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/uarray.cc:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/uarray.cc Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * uarray.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/uarray.cc#3 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/uarray.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/uarray.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/uarray.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/uarray.h:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/uarray.h Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * uarray.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/uarray.h#5 $ */ #ifndef __gluuarray_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/varray.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/varray.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/varray.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/varray.cc:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/varray.cc Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * varray.c++ * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/varray.cc#4 $ */ #include "glimports.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/varray.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/varray.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/varray.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/varray.h:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/internals/varray.h Mon Jan 9 09:56:53 2006 @@ -35,8 +35,6 @@ /* * varray.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/libnurbs/internals/varray.h#4 $ */ #ifndef __gluvarray_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/GNUmakefile diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/GNUmakefile:removed --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/GNUmakefile:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/GNUmakefile Tue May 9 21:53:45 2006 @@ -1,99 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/GNUmakefile#8 $ - -include $(ROOT)/usr/include/make/commondefs - -TARGET = libnurbtess.a - -TARGETS = $(TARGET) - -LCXXINCS = -I../../include - -HFILES = \ - definitions.h \ - directedLine.h \ - gridWrap.h \ - monoTriangulation.h \ - partitionY.h \ - polyDBG.h \ - polyUtil.h \ - primitiveStream.h \ - quicksort.h \ - rectBlock.h \ - sampleComp.h \ - sampleCompBot.h \ - sampleCompRight.h \ - sampleCompTop.h \ - sampleMonoPoly.h \ - sampledLine.h \ - searchTree.h \ - zlassert.h \ - partitionX.h \ - monoChain.h \ - monoPolyPart.h \ - $(NULL) - -CCFILES = \ - directedLine.cc \ - gridWrap.cc \ - monoTriangulation.cc \ - partitionY.cc \ - polyDBG.cc \ - polyUtil.cc \ - primitiveStream.cc \ - quicksort.cc \ - rectBlock.cc \ - sampleComp.cc \ - sampleCompBot.cc \ - sampleCompRight.cc \ - sampleCompTop.cc \ - sampleMonoPoly.cc \ - sampledLine.cc \ - searchTree.cc \ - partitionX.cc \ - monoChain.cc \ - monoPolyPart.cc \ - $(NULL) - -default libs libs_install install: $(TARGET) - -headers headers_install apps: - -$(TARGET): $(OBJECTS) - $(AR) crl $@ $(OBJECTS); - -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/definitions.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/definitions.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/definitions.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/definitions.h:1.1.1.1 Mon Jan 15 16:48:46 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/definitions.h Mon Jan 9 09:56:56 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/definitions.h#4 $ */ #ifndef _DEFINITIONS_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.cc:1.1.1.1 Mon Jan 15 16:48:50 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.cc Mon Jan 9 09:56:56 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.cc#4 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.h:1.1.1.1 Mon Jan 15 16:48:50 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.h Mon Jan 9 09:56:56 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/directedLine.h#5 $ */ #ifndef _DIRECTEDLINE_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/glimports.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/glimports.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/glimports.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/glimports.h:1.1.1.1 Mon Jan 15 16:48:50 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/glimports.h Mon Jan 9 09:56:56 2006 @@ -35,8 +35,6 @@ /* * glimports.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/include/glimports.h#1 $ */ #ifndef __gluimports_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.cc:1.1.1.1 Mon Jan 15 16:48:50 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.cc Mon Jan 9 09:56:56 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.cc#3 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.h:1.1.1.1 Mon Jan 15 16:48:50 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.h Mon Jan 9 09:56:56 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/gridWrap.h#4 $ */ #ifndef _GRIDWRAP_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.cc:1.2 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.cc Mon Jan 9 09:56:56 2006 @@ -31,13 +31,9 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.cc,v 1.2 2003/10/22 19:20:57 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.cc,v 1.3 2006/01/09 14:56:56 dawes Exp $ */ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.cc#4 $ -*/ #include "gluos.h" #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.h:1.1.1.1 Mon Jan 15 16:48:51 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.h Mon Jan 9 09:56:56 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/monoChain.h#5 $ */ #ifndef _MONO_CHAIN_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoPolyPart.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoPolyPart.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoPolyPart.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoPolyPart.cc:1.1.1.1 Mon Jan 15 16:48:51 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoPolyPart.cc Mon Jan 9 09:56:56 2006 @@ -31,7 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ */ /* *monoPolyPart.C Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoPolyPart.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoPolyPart.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoPolyPart.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoPolyPart.h:1.1.1.1 Mon Jan 15 16:48:51 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoPolyPart.h Mon Jan 9 09:56:57 2006 @@ -31,7 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ */ /* *monoPolyPart.h Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.cc:1.2 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.cc Mon Jan 9 09:56:57 2006 @@ -31,13 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.cc,v 1.2 2003/10/22 19:20:57 tsi Exp $ */ - -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.cc#4 $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.cc,v 1.3 2006/01/09 14:56:57 dawes Exp $ */ #include #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.h:1.1.1.1 Mon Jan 15 16:48:53 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.h Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/monoTriangulation.h#4 $ */ #ifndef _MONO_TRIANGULATION_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdio.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdio.h:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdio.h:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdio.h:1.2 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdio.h Mon Jan 9 09:56:57 2006 @@ -35,10 +35,8 @@ /* * mystdio.h * - * $Date$ $Revision$ - * $Header: //depot/main/gfx/lib/glu/include/mystdio.h#1 $ */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdio.h,v 1.2 2003/10/22 19:20:57 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdio.h,v 1.3 2006/01/09 14:56:57 dawes Exp $ */ #ifndef __glumystdio_h_ #define __glumystdio_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdlib.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdlib.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdlib.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdlib.h:1.1.1.1 Mon Jan 15 16:48:53 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/mystdlib.h Mon Jan 9 09:56:57 2006 @@ -35,7 +35,6 @@ /* * mystdlib.h * - * $Header: //depot/main/gfx/lib/glu/include/mystdlib.h#1 $ */ #ifndef __glumystdlib_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.cc:1.1.1.1 Mon Jan 15 16:48:53 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.cc Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.cc#3 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.h:1.1.1.1 Mon Jan 15 16:48:53 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.h Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/partitionX.h#4 $ */ #ifndef _PARTITIONX_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.cc:1.1.1.1 Mon Jan 15 16:48:56 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.cc Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.cc#3 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.h:1.1.1.1 Mon Jan 15 16:48:56 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.h Mon Jan 9 09:56:57 2006 @@ -31,7 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ */ /* *partitionY.h: @@ -53,7 +52,6 @@ *A vertex is an interior cusp if it is a cusp and a reflex. *A vertex is an exterior cusp if it is a cusp but not a reflex. * - * $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/partitionY.h#4 $ */ #ifndef _PARTITIONY_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.cc:1.2 Wed Oct 22 15:20:57 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.cc Mon Jan 9 09:56:57 2006 @@ -31,12 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.cc,v 1.2 2003/10/22 19:20:57 tsi Exp $ */ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.cc#3 $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.cc,v 1.3 2006/01/09 14:56:57 dawes Exp $ */ #include #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.h:1.1.1.1 Mon Jan 15 16:48:56 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.h Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/polyDBG.h#5 $ */ #ifndef _POLYDBG_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.cc:1.1.1.1 Mon Jan 15 16:48:56 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.cc Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.cc#3 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.h:1.1.1.1 Mon Jan 15 16:48:56 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.h Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/polyUtil.h#4 $ */ #ifndef _POLYUTIL_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.cc:1.1.1.1 Mon Jan 15 16:48:59 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.cc Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.cc#3 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.h:1.1.1.1 Mon Jan 15 16:48:59 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.h Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/primitiveStream.h#4 $ */ /*we do not use the constans GL_... so that this file is independent of Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc:1.2 Wed Jan 23 12:06:18 2002 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc Mon Jan 9 09:56:57 2006 @@ -31,14 +31,9 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** Date Revision */ -/* -** Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc#3 -*/ - -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc,v 1.2 2002/01/23 17:06:18 dawes Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.cc,v 1.3 2006/01/09 14:56:57 dawes Exp $ */ #include #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.h:1.1.1.1 Mon Jan 15 16:48:59 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.h Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/quicksort.h#4 $ */ #ifndef _QUICKSORT_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.cc:1.1.1.1 Mon Jan 15 16:48:59 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.cc Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.cc#4 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.h:1.1.1.1 Mon Jan 15 16:48:59 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.h Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/rectBlock.h#5 $ */ #ifndef _RECTBLOCK_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.cc:1.1.1.1 Mon Jan 15 16:48:59 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.cc Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.cc#4 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.h:1.1.1.1 Mon Jan 15 16:48:59 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.h Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampleComp.h#4 $ */ #ifndef _SAMPLECOMP_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.cc:1.1.1.1 Mon Jan 15 16:49:01 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.cc Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.cc#3 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.h:1.1.1.1 Mon Jan 15 16:49:01 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.h Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompBot.h#4 $ */ #ifndef _SAMPLECOMPBOT_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.cc:1.2 Wed Oct 22 15:20:58 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.cc Mon Jan 9 09:56:57 2006 @@ -31,12 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.cc,v 1.2 2003/10/22 19:20:58 tsi Exp $ */ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.cc#4 $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.cc,v 1.3 2006/01/09 14:56:57 dawes Exp $ */ #include #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.h:1.1.1.1 Mon Jan 15 16:49:01 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.h Mon Jan 9 09:56:57 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompRight.h#4 $ */ #ifndef _SAMPLECOMPRIGHT_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.cc:1.3 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.cc:1.4 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.cc:1.3 Wed Oct 22 15:20:58 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.cc Mon Jan 9 09:56:58 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.cc,v 1.3 2003/10/22 19:20:58 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.cc,v 1.4 2006/01/09 14:56:58 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -32,10 +32,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.cc#3 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.h:1.1.1.1 Mon Jan 15 16:49:04 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.h Mon Jan 9 09:56:58 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampleCompTop.h#4 $ */ #ifndef _SAMPLECOMPTOP_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.cc:1.3 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.cc:1.4 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.cc:1.3 Wed Oct 22 15:20:58 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.cc Mon Jan 9 09:56:58 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.cc,v 1.3 2003/10/22 19:20:58 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.cc,v 1.4 2006/01/09 14:56:58 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -32,10 +32,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.cc#4 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.h:1.1.1.1 Mon Jan 15 16:49:08 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.h Mon Jan 9 09:56:58 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampleMonoPoly.h#4 $ */ #ifndef _SAMPLEMONOPOLY_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.cc:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.cc:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.cc:1.2 Wed Oct 22 15:20:58 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.cc Mon Jan 9 09:56:58 2006 @@ -31,13 +31,8 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.cc,v 1.2 2003/10/22 19:20:58 tsi Exp $ */ - -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.cc#4 $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.cc,v 1.3 2006/01/09 14:56:58 dawes Exp $ */ #include #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.h:1.1.1.1 Mon Jan 15 16:49:09 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.h Mon Jan 9 09:56:58 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/sampledLine.h#5 $ */ #ifndef _SAMPLEDLINE_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.cc diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.cc:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.cc:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.cc:1.1.1.1 Mon Jan 15 16:49:09 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.cc Mon Jan 9 09:56:58 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.cc#3 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.h:1.1.1.1 Mon Jan 15 16:49:09 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.h Mon Jan 9 09:56:58 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/searchTree.h#4 $ */ #ifndef _SEARCHTREE_H Index: xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/zlassert.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/zlassert.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/zlassert.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/zlassert.h:1.1.1.1 Mon Jan 15 16:49:09 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libnurbs/nurbtess/zlassert.h Mon Jan 9 09:56:58 2006 @@ -31,10 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -*/ -/* -** $Header: //depot/main/gfx/lib/glu/libnurbs/nurbtess/zlassert.h#4 $ */ /*XXXblythe this file should be deleted*/ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/GNUmakefile diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/GNUmakefile:removed --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/GNUmakefile:1.1.1.1 Mon Jan 15 16:49:09 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/GNUmakefile Tue May 9 21:53:45 2006 @@ -1,110 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/gfx/lib/glu/libtess/GNUmakefile#9 $ - -OBJECT_STYLE = N32 - -include $(ROOT)/usr/include/make/commondefs - -TARGET = libtess.a - -TARGETS = $(TARGET) - -LCINCS = -I../include - -# Compilation flags: -# -# -DNDEBUG is for the production code; it removes all assertion checks -# (note that looks at this symbol). -# -# -DNO_MALLOPT uses regular malloc instead of the mallopt() version. -# ***** Unless you use this flag, you must use "-lmalloc" to link -# ***** your application! -# -# -DMEMORY_DEBUG turns on the M_DEBUG option of mallopt; this can -# increase the running time a LOT. -# -# -DGLU_TESS_API_FLOAT compiles a single-precision version of the library. -# -# -float prevents automatic promotion to double precision; this will produce -# faster code when compiled with -DGLU_TESS_API_FLOAT. -# -# -DNO_BRANCH_CONDITIONS uses & and | instead of && and || on a couple -# of heavily-used tests (VertEq and VertLeq); some compilers can generate -# better code with these (use special instructions to avoid branching). -# -# -DFOR_TRITE_TEST_PROGRAM is *only* for use with the test program called -# "trite". It uses some variables which are defined by the test program, -# so you won't be able to link it with anything else. - -HFILES = \ - dict.h \ - dict-list.h \ - geom.h \ - memalloc.h \ - mesh.h \ - normal.h \ - priorityq-heap.h \ - priorityq-heap.c \ - priorityq-sort.h \ - priorityq.h \ - render.h \ - sweep.h \ - tess.h \ - tessmono.h \ - $(NULL) - -CFILES = \ - dict.c \ - geom.c \ - memalloc.c \ - mesh.c \ - normal.c \ - priorityq.c \ - render.c \ - sweep.c \ - tess.c \ - tessmono.c \ - $(NULL) - -default libs libs_install install: $(TARGET) - -headers headers_install apps: - -$(TARGET): $(OBJECTS) - $(AR) crl $@ $(OBJECTS); - -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/README diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/README:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/README:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/README:1.1.1.1 Mon Jan 15 16:49:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/README Mon Jan 9 09:56:59 2006 @@ -1,7 +1,3 @@ -/* -** $Header: /cvs/projects/ogl-sample/main/gfx/lib/glu/libtess/README,v 1.1 2000/04/26 05:53:59 ljp Exp $ -*/ - General Polygon Tesselation --------------------------- Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/alg-outline diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/alg-outline:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/alg-outline:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/alg-outline:1.1.1.1 Mon Jan 15 16:49:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/alg-outline Mon Jan 9 09:56:59 2006 @@ -1,6 +1,3 @@ -/* -** $Header: /cvs/projects/ogl-sample/main/gfx/lib/glu/libtess/alg-outline,v 1.1 2000/04/26 05:53:59 ljp Exp $ -*/ This is only a very brief overview. There is quite a bit of additional documentation in the source code itself. Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict-list.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict-list.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict-list.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict-list.h:1.1.1.1 Mon Jan 15 16:49:11 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict-list.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/dict-list.h#5 $ */ #ifndef __dict_list_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict.c:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict.c:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict.c:1.1.1.1 Mon Jan 15 16:49:13 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict.c Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/dict.c#5 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict.h:1.1.1.1 Mon Jan 15 16:49:13 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/dict.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/dict.h#5 $ */ #ifndef __dict_list_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/geom.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/geom.c:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/geom.c:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/geom.c:1.1.1.1 Mon Jan 15 16:49:13 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/geom.c Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/geom.c#5 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/geom.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/geom.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/geom.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/geom.h:1.1.1.1 Mon Jan 15 16:49:13 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/geom.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/geom.h#5 $ */ #ifndef __geom_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.c:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.c:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.c:1.1.1.1 Mon Jan 15 16:49:13 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.c Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/memalloc.c#5 $ */ #include "memalloc.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h:1.2 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h:1.2 Thu Mar 1 22:42:45 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h Mon Jan 9 09:56:59 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h,v 1.2 2001/03/02 03:42:45 dawes Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/memalloc.h,v 1.3 2006/01/09 14:56:59 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -36,8 +36,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/memalloc.h#5 $ */ #ifndef __memalloc_simple_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.c:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.c:1.3 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.c:1.1.1.1 Mon Jan 15 16:49:13 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.c Mon Mar 28 23:00:29 2005 @@ -35,8 +35,7 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/mesh.c#6 $ +** $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.c,v 1.3 2005/03/29 04:00:29 tsi Exp $ */ #include "gluos.h" @@ -48,12 +47,12 @@ #define TRUE 1 #define FALSE 0 -static GLUvertex *allocVertex() +static GLUvertex *allocVertex(void) { return (GLUvertex *)memAlloc( sizeof( GLUvertex )); } -static GLUface *allocFace() +static GLUface *allocFace(void) { return (GLUface *)memAlloc( sizeof( GLUface )); } Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.h:1.1.1.1 Mon Jan 15 16:49:16 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/mesh.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/mesh.h#5 $ */ #ifndef __mesh_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.h:1.1.1.1 Mon Jan 15 16:49:16 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/normal.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/normal.h#5 $ */ #ifndef __normal_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-heap.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-heap.c:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-heap.c:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-heap.c:1.1.1.1 Mon Jan 15 16:49:16 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-heap.c Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/priorityq-heap.c#5 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-heap.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-heap.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-heap.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-heap.h:1.1.1.1 Mon Jan 15 16:49:16 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-heap.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/priorityq-heap.h#5 $ */ #ifndef __priorityq_heap_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-sort.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-sort.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-sort.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-sort.h:1.1.1.1 Mon Jan 15 16:49:16 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq-sort.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/priorityq-sort.h#5 $ */ #ifndef __priorityq_sort_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq.c:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq.c:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq.c:1.1.1.1 Mon Jan 15 16:49:16 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq.c Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/priorityq.c#5 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq.h:1.1.1.1 Mon Jan 15 16:49:16 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/priorityq.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/priorityq.h#5 $ */ #ifndef __priorityq_sort_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c:1.1.1.1 Mon Jan 15 16:49:19 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.c Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/render.c#5 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.h:1.1.1.1 Mon Jan 15 16:49:19 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/render.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/render.h#5 $ */ #ifndef __render_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.h:1.1.1.1 Mon Jan 15 16:49:23 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/sweep.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/sweep.h#5 $ */ #ifndef __sweep_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.h:1.1.1.1 Mon Jan 15 16:49:24 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libtess/tess.h Mon Jan 9 09:56:59 2006 @@ -35,8 +35,6 @@ /* ** Author: Eric Veach, July 1994. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libtess/tess.h#6 $ */ #ifndef __tess_h_ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/GNUmakefile diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libutil/GNUmakefile:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libutil/GNUmakefile:removed --- xc/extras/ogl-sample/main/gfx/lib/glu/libutil/GNUmakefile:1.1.1.1 Mon Jan 15 16:49:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libutil/GNUmakefile Tue May 9 21:53:46 2006 @@ -1,68 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# -# $Date$ $Revision$ -# $Header: //depot/main/gfx/lib/glu/libutil/GNUmakefile#9 $ - -OBJECT_STYLE = N32 - -include $(ROOT)/usr/include/make/commondefs - -TARGET = libutil.a - -TARGETS = $(TARGET) - -LCINCS = -I../include - -HFILES = \ - gluint.h \ - $(NULL) - -CFILES = \ - error.c \ - glue.c \ - mipmap.c \ - project.c \ - quad.c \ - registry.c \ - $(NULL) - -default libs libs_install install: $(TARGET) - -headers headers_install apps: - -$(TARGET): $(OBJECTS) - $(AR) crl $@ $(OBJECTS); - -include $(COMMONRULES) Index: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/error.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libutil/error.c:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libutil/error.c:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libutil/error.c:1.1.1.1 Mon Jan 15 16:49:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libutil/error.c Mon Jan 9 09:57:00 2006 @@ -31,8 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libutil/error.c#7 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/glue.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libutil/glue.c:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libutil/glue.c:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libutil/glue.c:1.1.1.1 Mon Jan 15 16:49:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libutil/glue.c Mon Jan 9 09:57:00 2006 @@ -31,8 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libutil/glue.c#4 $ */ #include Index: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/gluint.h diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libutil/gluint.h:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libutil/gluint.h:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libutil/gluint.h:1.1.1.1 Mon Jan 15 16:49:26 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libutil/gluint.h Mon Jan 9 09:57:00 2006 @@ -31,8 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libutil/gluint.h#4 $ */ #ifndef __gluint_h__ Index: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c:1.5 xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c:1.6 --- xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c:1.5 Fri Feb 22 16:32:49 2002 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c Thu Mar 24 21:22:51 2005 @@ -32,7 +32,7 @@ ** compliant with the OpenGL(R) version 1.2.1 Specification. ** */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c,v 1.5 2002/02/22 21:32:49 dawes Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/mipmap.c,v 1.6 2005/03/25 02:22:51 dawes Exp $ */ #include "gluos.h" #include @@ -7251,7 +7251,7 @@ psm->unpack_skip_images * imageSize] ); } /* emptyImage3D() */ -int gluScaleImage3D(GLenum format, +static int gluScaleImage3D(GLenum format, GLint widthIn, GLint heightIn, GLint depthIn, GLenum typeIn, const void *dataIn, GLint widthOut, GLint heightOut, GLint depthOut, Index: xc/extras/ogl-sample/main/gfx/lib/glu/libutil/registry.c diff -u xc/extras/ogl-sample/main/gfx/lib/glu/libutil/registry.c:1.1.1.1 xc/extras/ogl-sample/main/gfx/lib/glu/libutil/registry.c:1.2 --- xc/extras/ogl-sample/main/gfx/lib/glu/libutil/registry.c:1.1.1.1 Mon Jan 15 16:49:37 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glu/libutil/registry.c Mon Jan 9 09:57:00 2006 @@ -31,8 +31,6 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. ** -** $Date$ $Revision$ -** $Header: //depot/main/gfx/lib/glu/libutil/registry.c#10 $ */ #include "gluos.h" Index: xc/extras/ogl-sample/main/gfx/lib/glw/Distfile diff -u xc/extras/ogl-sample/main/gfx/lib/glw/Distfile:1.2 xc/extras/ogl-sample/main/gfx/lib/glw/Distfile:removed --- xc/extras/ogl-sample/main/gfx/lib/glw/Distfile:1.2 Wed May 2 09:37:45 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glw/Distfile Tue May 9 21:53:46 2006 @@ -1,13 +0,0 @@ -# -# - -DISTFILES_SI = \ - GLwDrawA.h /xc/include/GL/GLwDrawA.h \ - GLwMDrawA.h /xc/include/GL/GLwMDrawA.h \ - Imakefile /xc/lib/GL/glw/Imakefile \ - GLwDrawAP.h /xc/lib/GL/glw/GLwDrawAP.h \ - GLwMDrawAP.h /xc/lib/GL/glw/GLwMDrawAP.h \ - GLwDAUtil.c /xc/lib/GL/glw/GLwDAUtil.c \ - GLwDrawA.c /xc/lib/GL/glw/GLwDrawA.c \ - GLwMDrawA.c /xc/lib/GL/glw/GLwMDrawA.c \ - $(NULL) Index: xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c diff -u xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c:1.4 xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c:1.5 --- xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c:1.4 Thu Nov 6 13:37:54 2003 +++ xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c Thu Mar 24 21:22:51 2005 @@ -38,12 +38,13 @@ * */ -/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c,v 1.4 2003/11/06 18:37:54 tsi Exp $ */ +/* $XFree86: xc/extras/ogl-sample/main/gfx/lib/glw/GLwDAUtil.c,v 1.5 2005/03/25 02:22:51 dawes Exp $ */ #include #include #include #include +#include "GLwDrawA.h" /* * By default only a static library is created because most of the UNIX Index: xc/extras/ogl-sample/main/gfx/lib/glw/GNUmakefile diff -u xc/extras/ogl-sample/main/gfx/lib/glw/GNUmakefile:1.2 xc/extras/ogl-sample/main/gfx/lib/glw/GNUmakefile:removed --- xc/extras/ogl-sample/main/gfx/lib/glw/GNUmakefile:1.2 Wed May 2 09:37:45 2001 +++ xc/extras/ogl-sample/main/gfx/lib/glw/GNUmakefile Tue May 9 21:53:46 2006 @@ -1,74 +0,0 @@ -#!gmake -# -# License Applicability. Except to the extent portions of this file are -# made subject to an alternative license as permitted in the SGI Free -# Software License B, Version 1.1 (the "License"), the contents of this -# file are subject only to the provisions of the License. You may not use -# this file except in compliance with the License. You may obtain a copy -# of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -# Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -# -# http://oss.sgi.com/projects/FreeB -# -# Note that, as provided in the License, the Software is distributed on an -# "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -# DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -# CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -# PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -# -# Original Code. The Original Code is: OpenGL Sample Implementation, -# Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -# Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -# Copyright in any portions created by third parties is as indicated -# elsewhere herein. All Rights Reserved. -# -# Additional Notice Provisions: The application programming interfaces -# established by SGI in conjunction with the Original Code are The -# OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -# April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -# 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -# Window System(R) (Version 1.3), released October 19, 1998. This software -# was created using the OpenGL(R) version 1.2.1 Sample Implementation -# published by SGI, but has not been independently verified as being -# compliant with the OpenGL(R) version 1.2.1 Specification. -# - -include $(ROOT)/usr/include/make/commondefs - -TARGET = libGLw.a - -TARGETS = $(TARGET) - -CFILES = \ - GLwDrawA.c \ - $(NULL) - -MOTIF_CFILES = \ - GLwMDrawA.c \ - GLwDAUtil.c \ - $(NULL) - -ifeq ($(HAVE_MOTIF),1) -LCDEFS += -D__GLX_MOTIF=1 -CFILES += $(MOTIF_CFILES) -ifeq ($(OS),Linux) -# assume motif is in / rather than $ROOT -LCINCS += -I/usr/X11R6/include -endif -endif - -INSTALLFLAGS += -srcdst - -default libs: $(TARGET) - -headers headers_install apps: - -libs_install install: default - $(INSTALL) -F $(ROOT)/usr/include/X11/GLw GLwDrawA.h - $(INSTALL) -F $(ROOT)/usr/include/X11/GLw GLwMDrawA.h - $(INSTALL) -F $(LIB_LOCATION) $(TARGET); - -$(TARGET): $(OBJECTS) - $(AR) crl $@ $(OBJECTS); - -include $(COMMONRULES) Index: xc/extras/regex/cclass.h diff -u xc/extras/regex/cclass.h:1.1.1.1 xc/extras/regex/cclass.h:1.2 --- xc/extras/regex/cclass.h:1.1.1.1 Sat Jan 2 01:56:23 1999 +++ xc/extras/regex/cclass.h Tue Jun 7 04:02:14 2005 @@ -1,31 +1,33 @@ +/* $XFree86: xc/extras/regex/cclass.h,v 1.2 2005/06/07 08:02:14 dawes Exp $ */ + /* character-class table */ static struct cclass { char *name; char *chars; char *multis; } cclasses[] = { - "alnum", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ -0123456789", "", - "alpha", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", - "", - "blank", " \t", "", - "cntrl", "\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\ -\25\26\27\30\31\32\33\34\35\36\37\177", "", - "digit", "0123456789", "", - "graph", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ + {"alnum", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ +0123456789", ""}, + {"alpha", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", + ""}, + {"blank", " \t", ""}, + {"cntrl", "\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\ +\25\26\27\30\31\32\33\34\35\36\37\177", ""}, + {"digit", "0123456789", ""}, + {"graph", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ 0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", - "", - "lower", "abcdefghijklmnopqrstuvwxyz", - "", - "print", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ + ""}, + {"lower", "abcdefghijklmnopqrstuvwxyz", + ""}, + {"print", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ 0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ", - "", - "punct", "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", - "", - "space", "\t\n\v\f\r ", "", - "upper", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", - "", - "xdigit", "0123456789ABCDEFabcdef", - "", - NULL, 0, "" + ""}, + {"punct", "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", + ""}, + {"space", "\t\n\v\f\r ", ""}, + {"upper", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", + ""}, + {"xdigit", "0123456789ABCDEFabcdef", + ""}, + {NULL, 0, ""} }; Index: xc/extras/regex/cname.h diff -u xc/extras/regex/cname.h:1.1.1.1 xc/extras/regex/cname.h:1.2 --- xc/extras/regex/cname.h:1.1.1.1 Sat Jan 2 01:56:24 1999 +++ xc/extras/regex/cname.h Tue Jun 7 04:02:14 2005 @@ -1,102 +1,104 @@ +/* $XFree86: xc/extras/regex/cname.h,v 1.2 2005/06/07 08:02:14 dawes Exp $ */ + /* character-name table */ static struct cname { char *name; char code; } cnames[] = { - "NUL", '\0', - "SOH", '\001', - "STX", '\002', - "ETX", '\003', - "EOT", '\004', - "ENQ", '\005', - "ACK", '\006', - "BEL", '\007', - "alert", '\007', - "BS", '\010', - "backspace", '\b', - "HT", '\011', - "tab", '\t', - "LF", '\012', - "newline", '\n', - "VT", '\013', - "vertical-tab", '\v', - "FF", '\014', - "form-feed", '\f', - "CR", '\015', - "carriage-return", '\r', - "SO", '\016', - "SI", '\017', - "DLE", '\020', - "DC1", '\021', - "DC2", '\022', - "DC3", '\023', - "DC4", '\024', - "NAK", '\025', - "SYN", '\026', - "ETB", '\027', - "CAN", '\030', - "EM", '\031', - "SUB", '\032', - "ESC", '\033', - "IS4", '\034', - "FS", '\034', - "IS3", '\035', - "GS", '\035', - "IS2", '\036', - "RS", '\036', - "IS1", '\037', - "US", '\037', - "space", ' ', - "exclamation-mark", '!', - "quotation-mark", '"', - "number-sign", '#', - "dollar-sign", '$', - "percent-sign", '%', - "ampersand", '&', - "apostrophe", '\'', - "left-parenthesis", '(', - "right-parenthesis", ')', - "asterisk", '*', - "plus-sign", '+', - "comma", ',', - "hyphen", '-', - "hyphen-minus", '-', - "period", '.', - "full-stop", '.', - "slash", '/', - "solidus", '/', - "zero", '0', - "one", '1', - "two", '2', - "three", '3', - "four", '4', - "five", '5', - "six", '6', - "seven", '7', - "eight", '8', - "nine", '9', - "colon", ':', - "semicolon", ';', - "less-than-sign", '<', - "equals-sign", '=', - "greater-than-sign", '>', - "question-mark", '?', - "commercial-at", '@', - "left-square-bracket", '[', - "backslash", '\\', - "reverse-solidus", '\\', - "right-square-bracket", ']', - "circumflex", '^', - "circumflex-accent", '^', - "underscore", '_', - "low-line", '_', - "grave-accent", '`', - "left-brace", '{', - "left-curly-bracket", '{', - "vertical-line", '|', - "right-brace", '}', - "right-curly-bracket", '}', - "tilde", '~', - "DEL", '\177', - NULL, 0, + {"NUL", '\0'}, + {"SOH", '\001'}, + {"STX", '\002'}, + {"ETX", '\003'}, + {"EOT", '\004'}, + {"ENQ", '\005'}, + {"ACK", '\006'}, + {"BEL", '\007'}, + {"alert", '\007'}, + {"BS", '\010'}, + {"backspace", '\b'}, + {"HT", '\011'}, + {"tab", '\t'}, + {"LF", '\012'}, + {"newline", '\n'}, + {"VT", '\013'}, + {"vertical-tab", '\v'}, + {"FF", '\014'}, + {"form-feed", '\f'}, + {"CR", '\015'}, + {"carriage-return", '\r'}, + {"SO", '\016'}, + {"SI", '\017'}, + {"DLE", '\020'}, + {"DC1", '\021'}, + {"DC2", '\022'}, + {"DC3", '\023'}, + {"DC4", '\024'}, + {"NAK", '\025'}, + {"SYN", '\026'}, + {"ETB", '\027'}, + {"CAN", '\030'}, + {"EM", '\031'}, + {"SUB", '\032'}, + {"ESC", '\033'}, + {"IS4", '\034'}, + {"FS", '\034'}, + {"IS3", '\035'}, + {"GS", '\035'}, + {"IS2", '\036'}, + {"RS", '\036'}, + {"IS1", '\037'}, + {"US", '\037'}, + {"space", ' '}, + {"exclamation-mark", '!'}, + {"quotation-mark", '"'}, + {"number-sign", '#'}, + {"dollar-sign", '$'}, + {"percent-sign", '%'}, + {"ampersand", '&'}, + {"apostrophe", '\''}, + {"left-parenthesis", '('}, + {"right-parenthesis", ')'}, + {"asterisk", '*'}, + {"plus-sign", '+'}, + {"comma", ','}, + {"hyphen", '-'}, + {"hyphen-minus", '-'}, + {"period", '.'}, + {"full-stop", '.'}, + {"slash", '/'}, + {"solidus", '/'}, + {"zero", '0'}, + {"one", '1'}, + {"two", '2'}, + {"three", '3'}, + {"four", '4'}, + {"five", '5'}, + {"six", '6'}, + {"seven", '7'}, + {"eight", '8'}, + {"nine", '9'}, + {"colon", ':'}, + {"semicolon", ';'}, + {"less-than-sign", '<'}, + {"equals-sign", '='}, + {"greater-than-sign", '>'}, + {"question-mark", '?'}, + {"commercial-at", '@'}, + {"left-square-bracket", '['}, + {"backslash", '\\'}, + {"reverse-solidus", '\\'}, + {"right-square-bracket", ']'}, + {"circumflex", '^'}, + {"circumflex-accent", '^'}, + {"underscore", '_'}, + {"low-line", '_'}, + {"grave-accent", '`'}, + {"left-brace", '{'}, + {"left-curly-bracket", '{'}, + {"vertical-line", '|'}, + {"right-brace", '}'}, + {"right-curly-bracket", '}'}, + {"tilde", '~'}, + {"DEL", '\177'}, + {NULL, 0} }; Index: xc/extras/regex/regcomp.c diff -u xc/extras/regex/regcomp.c:1.1.1.1 xc/extras/regex/regcomp.c:1.2 --- xc/extras/regex/regcomp.c:1.1.1.1 Sat Jan 2 01:56:24 1999 +++ xc/extras/regex/regcomp.c Tue Jun 7 04:02:14 2005 @@ -1,3 +1,5 @@ +/* $XFree86: xc/extras/regex/regcomp.c,v 1.2 2005/06/07 08:02:14 dawes Exp $ */ + #include #include #include @@ -51,7 +53,7 @@ #define NEXTn(n) (p->next += (n)) #define GETNEXT() (*p->next++) #define SETERROR(e) seterr(p, (e)) -#define REQUIRE(co, e) ((co) || SETERROR(e)) +#define REQUIRE(co, e) (void)((co) || SETERROR(e)) #define MUSTSEE(c, e) (REQUIRE(MORE() && PEEK() == (c), e)) #define MUSTEAT(c, e) (REQUIRE(MORE() && GETNEXT() == (c), e)) #define MUSTNOTSEE(c, e) (REQUIRE(!MORE() || PEEK() != (c), e)) @@ -192,8 +194,8 @@ int stop; /* character this ERE should end at */ { register char c; - register sopno prevback; - register sopno prevfwd; + register sopno prevback = 0; + register sopno prevfwd = 0; register sopno conc; register int first = 1; /* is this the first alternative? */ @@ -1169,9 +1171,10 @@ cs->multis[cs->smultis - 1] = '\0'; } +#if 0 /* - mcsub - subtract a collating element from a cset - == static void mcsub(register cset *cs, register char *cp); + X== static void mcsub(register cset *cs, register char *cp); */ static void mcsub(cs, cp) @@ -1198,7 +1201,7 @@ /* - mcin - is a collating element in a cset? - == static int mcin(register cset *cs, register char *cp); + X== static int mcin(register cset *cs, register char *cp); */ static int mcin(cs, cp) @@ -1210,7 +1213,7 @@ /* - mcfind - find a collating element in a cset - == static char *mcfind(register cset *cs, register char *cp); + X== static char *mcfind(register cset *cs, register char *cp); */ static char * mcfind(cs, cp) @@ -1226,6 +1229,7 @@ return(p); return(NULL); } +#endif /* - mcinvert - invert the list of collating elements in a cset @@ -1495,8 +1499,8 @@ register struct re_guts *g; { register sop *scan; - sop *start; - register sop *newstart; + sop *start = NULL; + register sop *newstart = NULL; register sopno newlen; register sop s; register char *cp; Index: xc/extras/regex/regerror.c diff -u xc/extras/regex/regerror.c:1.1.1.1 xc/extras/regex/regerror.c:1.2 --- xc/extras/regex/regerror.c:1.1.1.1 Sat Jan 2 01:56:24 1999 +++ xc/extras/regex/regerror.c Tue Jun 7 04:02:14 2005 @@ -1,3 +1,5 @@ +/* $XFree86: xc/extras/regex/regerror.c,v 1.2 2005/06/07 08:02:14 dawes Exp $ */ + #include #include #include @@ -35,24 +37,24 @@ char *name; char *explain; } rerrs[] = { - REG_OKAY, "REG_OKAY", "no errors detected", - REG_NOMATCH, "REG_NOMATCH", "regexec() failed to match", - REG_BADPAT, "REG_BADPAT", "invalid regular expression", - REG_ECOLLATE, "REG_ECOLLATE", "invalid collating element", - REG_ECTYPE, "REG_ECTYPE", "invalid character class", - REG_EESCAPE, "REG_EESCAPE", "trailing backslash (\\)", - REG_ESUBREG, "REG_ESUBREG", "invalid backreference number", - REG_EBRACK, "REG_EBRACK", "brackets ([ ]) not balanced", - REG_EPAREN, "REG_EPAREN", "parentheses not balanced", - REG_EBRACE, "REG_EBRACE", "braces not balanced", - REG_BADBR, "REG_BADBR", "invalid repetition count(s)", - REG_ERANGE, "REG_ERANGE", "invalid character range", - REG_ESPACE, "REG_ESPACE", "out of memory", - REG_BADRPT, "REG_BADRPT", "repetition-operator operand invalid", - REG_EMPTY, "REG_EMPTY", "empty (sub)expression", - REG_ASSERT, "REG_ASSERT", "\"can't happen\" -- you found a bug", - REG_INVARG, "REG_INVARG", "invalid argument to regex routine", - -1, "", "*** unknown regexp error code ***", + {REG_OKAY, "REG_OKAY", "no errors detected"}, + {REG_NOMATCH, "REG_NOMATCH", "regexec() failed to match"}, + {REG_BADPAT, "REG_BADPAT", "invalid regular expression"}, + {REG_ECOLLATE, "REG_ECOLLATE", "invalid collating element"}, + {REG_ECTYPE, "REG_ECTYPE", "invalid character class"}, + {REG_EESCAPE, "REG_EESCAPE", "trailing backslash (\\)"}, + {REG_ESUBREG, "REG_ESUBREG", "invalid backreference number"}, + {REG_EBRACK, "REG_EBRACK", "brackets ([ ]) not balanced"}, + {REG_EPAREN, "REG_EPAREN", "parentheses not balanced"}, + {REG_EBRACE, "REG_EBRACE", "braces not balanced"}, + {REG_BADBR, "REG_BADBR", "invalid repetition count(s)"}, + {REG_ERANGE, "REG_ERANGE", "invalid character range"}, + {REG_ESPACE, "REG_ESPACE", "out of memory"}, + {REG_BADRPT, "REG_BADRPT", "repetition-operator operand invalid"}, + {REG_EMPTY, "REG_EMPTY", "empty (sub)expression"}, + {REG_ASSERT, "REG_ASSERT", "\"can't happen\" -- you found a bug"}, + {REG_INVARG, "REG_INVARG", "invalid argument to regex routine"}, + {-1, "", "*** unknown regexp error code ***"} }; /* Index: xc/extras/regex/regexec.c diff -u xc/extras/regex/regexec.c:1.1.1.1 xc/extras/regex/regexec.c:1.2 --- xc/extras/regex/regexec.c:1.1.1.1 Sat Jan 2 01:56:24 1999 +++ xc/extras/regex/regexec.c Tue Jun 7 04:02:14 2005 @@ -1,3 +1,5 @@ +/* $XFree86: xc/extras/regex/regexec.c,v 1.2 2005/06/07 08:02:14 dawes Exp $ */ + /* * the outer shell of regexec() * @@ -16,7 +18,9 @@ #include "utils.h" #include "regex2.h" +#if 0 static int nope = 0; /* for use in asserts; shuts lint up */ +#endif /* macros for manipulating states, small version */ #define states unsigned Index: xc/extras/rman/rman.1 diff -u xc/extras/rman/rman.1:1.3 xc/extras/rman/rman.1:1.4 --- xc/extras/rman/rman.1:1.3 Wed Oct 22 15:55:02 2003 +++ xc/extras/rman/rman.1 Mon Jan 9 09:57:00 2006 @@ -1,4 +1,4 @@ -.\" $XFree86: xc/extras/rman/rman.1,v 1.3 2003/10/22 19:55:02 tsi Exp $ +.\" $XFree86: xc/extras/rman/rman.1,v 1.4 2006/01/09 14:57:00 dawes Exp $ .TH PolyglotMan 1 .SH "NAME " PolyglotMan, rman - reverse compile man pages from formatted @@ -266,5 +266,3 @@ University of California, Berkeley .br Computer Science Division -.PP -Manual page last updated on $Date: 1998/07/13 09:47:28 $ Index: xc/extras/rman/rman.c diff -u xc/extras/rman/rman.c:1.19 xc/extras/rman/rman.c:1.21 --- xc/extras/rman/rman.c:1.19 Wed Dec 31 19:47:45 2003 +++ xc/extras/rman/rman.c Sun Mar 12 19:54:46 2006 @@ -1,7 +1,3 @@ -#ifdef UNDEF -static char cvsid[] = "Header: /usr/build/rman/rman-031225/phelps/RCS/rman.c,v 1.154 2003/07/26 19:00:48 phelps Exp $"; -#endif - /* PolyglotMan by Thomas A. Phelps (phelps@ACM.org) @@ -18,7 +14,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.19 2004/01/01 00:47:45 dickey Exp $ */ +/* $XFree86: xc/extras/rman/rman.c,v 1.21 2006/03/13 00:54:46 dickey Exp $ */ #include #include @@ -1292,7 +1288,7 @@ /* always respond to these signals */ switch (cmd) { case CHARNBSP: printf(" "); I++; break; - case CHARTAB: printf("    "); break; + case CHARTAB: printf("    "); break; #ifdef XFree86 /* using named entities for ASCII quote characters is redundant */ case CHARLQUOTE: @@ -1531,8 +1527,8 @@ break; /* something better with CSS */ - case BEGININDENT: printf("
"); break; - case ENDINDENT: printf("
\n"); break; + case BEGININDENT: printf("
"); break; + case ENDINDENT: printf("
\n"); break; case FONTSIZE: /* HTML font step sizes are bigger than troff's */ @@ -3783,6 +3779,12 @@ char macrobuf[MAXBUF]; /* local so can have nested macros */ static char ft='\0'; static int fTableCenter=0; + static int doctype = 0; + + if (fn == HTML && !doctype) { + doctype = 1; + printf("\n"); + } /* should centralize command matching (binary search?), pointer bumping here if for no other reason than to catch conflicts -- and allow overrides? */ @@ -3876,6 +3878,13 @@ source_flush(); poppush(BEGINBODY); + } else if ((tphp = checkcmd("IP"))) { + source_flush(); + if (listtype >= 0) { + source_struct(ENDBULPAIR); + } + poppush(BEGINBODY); + } else if ((tphp=checkcmd("TP")) || (tphp=checkcmd("HP")) || checkcmd("IP") || checkcmd("LI")) { /* TP, HP: indented paragraph, tag on next line (DL list) */ /* IP, LI: tag as argument */ @@ -3968,7 +3977,7 @@ *q='\0'; p++; cond = (strcmp(if0,if1)==0); - } else cond=0; /* a guess, seems to be right bettern than half the time */ + } else cond=0; /* a guess, seems to be right better than half the time */ if (invcond) cond=1-cond; while (isspace(*p)) p++; @@ -4369,7 +4378,7 @@ fprintf(stderr, "macro \"%s\" not supported -- ignoring\n", cmd); #endif - } else { /* could be a macro definition */ + } else if (*cmd) { /* could be a macro definition */ supresseol=0; for (i=0; i Computer Science Division -

Manual page last updated on $Date: 1998/07/13 09:47:28 $ - Index: xc/extras/rman/contrib/hman.pl diff -u xc/extras/rman/contrib/hman.pl:1.1.1.1 xc/extras/rman/contrib/hman.pl:1.2 --- xc/extras/rman/contrib/hman.pl:1.1.1.1 Mon Mar 20 19:47:35 2000 +++ xc/extras/rman/contrib/hman.pl Mon Jan 9 09:57:00 2006 @@ -1,8 +1,6 @@ #!/usr/bin/perl -w #!/citi/gtfd/mach/bin/perl -w ############### -# $Id: hman.pl,v 1.7 1997/11/04 21:56:13 teto Exp teto $ -# $Source: /pub/src/dev/hman/RCS/hman.pl,v $ ############################################ # TODO: # reorganize location of man pages - move 3x stuff from man3 to man3x Index: xc/extras/rman/contrib/http-rman.c diff -u xc/extras/rman/contrib/http-rman.c:1.1.1.1 xc/extras/rman/contrib/http-rman.c:1.2 --- xc/extras/rman/contrib/http-rman.c:1.1.1.1 Mon Mar 20 19:47:35 2000 +++ xc/extras/rman/contrib/http-rman.c Mon Jan 9 09:57:01 2006 @@ -1,4 +1,4 @@ -/* $Id: http-rman.c,v 1.2 1994/05/15 14:55:12 fredrik Exp $ +/* * * Name: * http-rman.c -- a rudimentary man-page HTTP server Index: xc/extras/x86emu/include/x86emu/types.h diff -u xc/extras/x86emu/include/x86emu/types.h:1.7 xc/extras/x86emu/include/x86emu/types.h:1.8 --- xc/extras/x86emu/include/x86emu/types.h:1.7 Mon Jul 7 11:34:21 2003 +++ xc/extras/x86emu/include/x86emu/types.h Tue Jun 28 21:14:09 2005 @@ -36,7 +36,7 @@ * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.7 2003/07/07 15:34:21 eich Exp $ */ +/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.8 2005/06/29 01:14:09 dawes Exp $ */ #ifndef __X86EMU_TYPES_H #define __X86EMU_TYPES_H @@ -76,7 +76,7 @@ defined(__sparc64__) || \ defined(__s390x__) || \ (defined(__hppa__) && defined(__LP64)) || \ - defined(__AMD64__) || defined(AMD64) || \ + defined(__amd64__) || defined(__x86_64__) || \ (defined(__sgi) && (_MIPS_SZLONG == 64)) #define NUM32 int #else Index: xc/extras/x86emu/src/x86emu/prim_ops.c diff -u xc/extras/x86emu/src/x86emu/prim_ops.c:1.2 xc/extras/x86emu/src/x86emu/prim_ops.c:1.3 --- xc/extras/x86emu/src/x86emu/prim_ops.c:1.2 Sat Feb 12 15:52:01 2005 +++ xc/extras/x86emu/src/x86emu/prim_ops.c Mon Mar 28 23:00:29 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/extras/x86emu/src/x86emu/prim_ops.c,v 1.3 2005/03/29 04:00:29 tsi Exp $ */ /**************************************************************************** * * Realmode X86 Emulator Library Index: xc/extras/x86emu/src/x86emu/sys.c diff -u xc/extras/x86emu/src/x86emu/sys.c:1.7 xc/extras/x86emu/src/x86emu/sys.c:1.8 --- xc/extras/x86emu/src/x86emu/sys.c:1.7 Tue Dec 24 12:42:58 2002 +++ xc/extras/x86emu/src/x86emu/sys.c Thu Jun 2 21:34:33 2005 @@ -39,7 +39,7 @@ * user library. * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/src/x86emu/sys.c,v 1.7 2002/12/24 17:42:58 tsi Exp $ */ +/* $XFree86: xc/extras/x86emu/src/x86emu/sys.c,v 1.8 2005/06/03 01:34:33 tsi Exp $ */ #include "x86emu.h" #include "x86emu/x86emui.h" @@ -57,161 +57,6 @@ X86EMU_intrFuncs _X86EMU_intrTab[256]; /*----------------------------- Implementation ----------------------------*/ -#if defined(__alpha__) || defined(__alpha) -/* to cope with broken egcs-1.1.2 :-(((( */ - -/* - * inline functions to do unaligned accesses - * from linux/include/asm-alpha/unaligned.h - */ - -/* - * EGCS 1.1 knows about arbitrary unaligned loads. Define some - * packed structures to talk about such things with. - */ - -#if defined(__GNUC__) && ((__GNUC__ > 2) || (__GNUC_MINOR__ >= 91)) -struct __una_u64 { unsigned long x __attribute__((packed)); }; -struct __una_u32 { unsigned int x __attribute__((packed)); }; -struct __una_u16 { unsigned short x __attribute__((packed)); }; -#endif - -static __inline__ unsigned long ldq_u(unsigned long * r11) -{ -#if defined(__GNUC__) && ((__GNUC__ > 2) || (__GNUC_MINOR__ >= 91)) - const struct __una_u64 *ptr = (const struct __una_u64 *) r11; - return ptr->x; -#else - unsigned long r1,r2; - __asm__("ldq_u %0,%3\n\t" - "ldq_u %1,%4\n\t" - "extql %0,%2,%0\n\t" - "extqh %1,%2,%1" - :"=&r" (r1), "=&r" (r2) - :"r" (r11), - "m" (*r11), - "m" (*(const unsigned long *)(7+(char *) r11))); - return r1 | r2; -#endif -} - -static __inline__ unsigned long ldl_u(unsigned int * r11) -{ -#if defined(__GNUC__) && ((__GNUC__ > 2) || (__GNUC_MINOR__ >= 91)) - const struct __una_u32 *ptr = (const struct __una_u32 *) r11; - return ptr->x; -#else - unsigned long r1,r2; - __asm__("ldq_u %0,%3\n\t" - "ldq_u %1,%4\n\t" - "extll %0,%2,%0\n\t" - "extlh %1,%2,%1" - :"=&r" (r1), "=&r" (r2) - :"r" (r11), - "m" (*r11), - "m" (*(const unsigned long *)(3+(char *) r11))); - return r1 | r2; -#endif -} - -static __inline__ unsigned long ldw_u(unsigned short * r11) -{ -#if defined(__GNUC__) && ((__GNUC__ > 2) || (__GNUC_MINOR__ >= 91)) - const struct __una_u16 *ptr = (const struct __una_u16 *) r11; - return ptr->x; -#else - unsigned long r1,r2; - __asm__("ldq_u %0,%3\n\t" - "ldq_u %1,%4\n\t" - "extwl %0,%2,%0\n\t" - "extwh %1,%2,%1" - :"=&r" (r1), "=&r" (r2) - :"r" (r11), - "m" (*r11), - "m" (*(const unsigned long *)(1+(char *) r11))); - return r1 | r2; -#endif -} - -/* - * Elemental unaligned stores - */ - -static __inline__ void stq_u(unsigned long r5, unsigned long * r11) -{ -#if defined(__GNUC__) && ((__GNUC__ > 2) || (__GNUC_MINOR__ >= 91)) - struct __una_u64 *ptr = (struct __una_u64 *) r11; - ptr->x = r5; -#else - unsigned long r1,r2,r3,r4; - - __asm__("ldq_u %3,%1\n\t" - "ldq_u %2,%0\n\t" - "insqh %6,%7,%5\n\t" - "insql %6,%7,%4\n\t" - "mskqh %3,%7,%3\n\t" - "mskql %2,%7,%2\n\t" - "bis %3,%5,%3\n\t" - "bis %2,%4,%2\n\t" - "stq_u %3,%1\n\t" - "stq_u %2,%0" - :"=m" (*r11), - "=m" (*(unsigned long *)(7+(char *) r11)), - "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4) - :"r" (r5), "r" (r11)); -#endif -} - -static __inline__ void stl_u(unsigned long r5, unsigned int * r11) -{ -#if defined(__GNUC__) && ((__GNUC__ > 2) || (__GNUC_MINOR__ >= 91)) - struct __una_u32 *ptr = (struct __una_u32 *) r11; - ptr->x = r5; -#else - unsigned long r1,r2,r3,r4; - - __asm__("ldq_u %3,%1\n\t" - "ldq_u %2,%0\n\t" - "inslh %6,%7,%5\n\t" - "insll %6,%7,%4\n\t" - "msklh %3,%7,%3\n\t" - "mskll %2,%7,%2\n\t" - "bis %3,%5,%3\n\t" - "bis %2,%4,%2\n\t" - "stq_u %3,%1\n\t" - "stq_u %2,%0" - :"=m" (*r11), - "=m" (*(unsigned long *)(3+(char *) r11)), - "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4) - :"r" (r5), "r" (r11)); -#endif -} - -static __inline__ void stw_u(unsigned long r5, unsigned short * r11) -{ -#if defined(__GNUC__) && ((__GNUC__ > 2) || (__GNUC_MINOR__ >= 91)) - struct __una_u16 *ptr = (struct __una_u16 *) r11; - ptr->x = r5; -#else - unsigned long r1,r2,r3,r4; - - __asm__("ldq_u %3,%1\n\t" - "ldq_u %2,%0\n\t" - "inswh %6,%7,%5\n\t" - "inswl %6,%7,%4\n\t" - "mskwh %3,%7,%3\n\t" - "mskwl %2,%7,%2\n\t" - "bis %3,%5,%3\n\t" - "bis %2,%4,%2\n\t" - "stq_u %3,%1\n\t" - "stq_u %2,%0" - :"=m" (*r11), - "=m" (*(unsigned long *)(1+(char *) r11)), - "=&r" (r1), "=&r" (r2), "=&r" (r3), "=&r" (r4) - :"r" (r5), "r" (r11)); -#endif -} -#endif /**************************************************************************** PARAMETERS: @@ -257,19 +102,9 @@ DB(printk("mem_read: address %#lx out of range!\n", addr);) HALT_SYS(); } -#ifdef __BIG_ENDIAN__ - if (addr & 0x1) { - val = (*(u8*)(M.mem_base + addr) | - (*(u8*)(M.mem_base + addr + 1) << 8)); - } - else -#endif -#if defined(__alpha__) || defined(__alpha) - val = ldw_u((u16*)(M.mem_base + addr)); -#else - val = *(u16*)(M.mem_base + addr); -#endif - DB( if (DEBUG_MEM_TRACE()) + val = (*(u8*)(M.mem_base + addr) | + (*(u8*)(M.mem_base + addr + 1) << 8)); +DB( if (DEBUG_MEM_TRACE()) printk("%#08x 2 -> %#x\n", addr, val);) return val; } @@ -292,20 +127,10 @@ DB(printk("mem_read: address %#lx out of range!\n", addr);) HALT_SYS(); } -#ifdef __BIG_ENDIAN__ - if (addr & 0x3) { - val = (*(u8*)(M.mem_base + addr + 0) | - (*(u8*)(M.mem_base + addr + 1) << 8) | - (*(u8*)(M.mem_base + addr + 2) << 16) | - (*(u8*)(M.mem_base + addr + 3) << 24)); - } - else -#endif -#if defined(__alpha__) || defined(__alpha) - val = ldl_u((u32*)(M.mem_base + addr)); -#else - val = *(u32*)(M.mem_base + addr); -#endif + val = (*(u8*)(M.mem_base + addr + 0) | + (*(u8*)(M.mem_base + addr + 1) << 8) | + (*(u8*)(M.mem_base + addr + 2) << 16) | + (*(u8*)(M.mem_base + addr + 3) << 24)); DB( if (DEBUG_MEM_TRACE()) printk("%#08x 4 -> %#x\n", addr, val);) return val; @@ -350,18 +175,8 @@ DB(printk("mem_write: address %#lx out of range!\n", addr);) HALT_SYS(); } -#ifdef __BIG_ENDIAN__ - if (addr & 0x1) { - *(u8*)(M.mem_base + addr + 0) = (val >> 0) & 0xff; - *(u8*)(M.mem_base + addr + 1) = (val >> 8) & 0xff; - } - else -#endif -#if defined(__alpha__) || defined(__alpha) - stw_u(val,(u16*)(M.mem_base + addr)); -#else - *(u16*)(M.mem_base + addr) = val; -#endif + *(u8*)(M.mem_base + addr + 0) = (val >> 0) & 0xff; + *(u8*)(M.mem_base + addr + 1) = (val >> 8) & 0xff; } /**************************************************************************** @@ -382,20 +197,10 @@ DB(printk("mem_write: address %#lx out of range!\n", addr);) HALT_SYS(); } -#ifdef __BIG_ENDIAN__ - if (addr & 0x1) { - *(u8*)(M.mem_base + addr + 0) = (val >> 0) & 0xff; - *(u8*)(M.mem_base + addr + 1) = (val >> 8) & 0xff; - *(u8*)(M.mem_base + addr + 2) = (val >> 16) & 0xff; - *(u8*)(M.mem_base + addr + 3) = (val >> 24) & 0xff; - } - else -#endif -#if defined(__alpha__) || defined(__alpha) - stl_u(val,(u32*)(M.mem_base + addr)); -#else - *(u32*)(M.mem_base + addr) = val; -#endif + *(u8*)(M.mem_base + addr + 0) = (val >> 0) & 0xff; + *(u8*)(M.mem_base + addr + 1) = (val >> 8) & 0xff; + *(u8*)(M.mem_base + addr + 2) = (val >> 16) & 0xff; + *(u8*)(M.mem_base + addr + 3) = (val >> 24) & 0xff; } /**************************************************************************** Index: xc/extras/zlib/example.c diff -u xc/extras/zlib/example.c:1.1.1.1 xc/extras/zlib/example.c:1.2 --- xc/extras/zlib/example.c:1.1.1.1 Sun Jun 1 17:00:14 2003 +++ xc/extras/zlib/example.c Mon Jan 9 09:57:01 2006 @@ -3,8 +3,6 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -/* @(#) $Id$ */ - #include #include "zlib.h" Index: xc/extras/zlib/minigzip.c diff -u xc/extras/zlib/minigzip.c:1.1.1.1 xc/extras/zlib/minigzip.c:1.2 --- xc/extras/zlib/minigzip.c:1.1.1.1 Sun Jun 1 17:00:17 2003 +++ xc/extras/zlib/minigzip.c Mon Jan 9 09:57:01 2006 @@ -13,8 +13,6 @@ * or in pipe mode. */ -/* @(#) $Id$ */ - #include #include "zlib.h" Index: xc/fonts/Imakefile diff -u xc/fonts/Imakefile:3.11 xc/fonts/Imakefile:3.12 --- xc/fonts/Imakefile:3.11 Thu Jan 8 14:02:28 2004 +++ xc/fonts/Imakefile Mon Jan 9 09:57:01 2006 @@ -1,9 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:52 cpqbld Exp $ +XCOMM $XFree86: xc/fonts/Imakefile,v 3.12 2006/01/09 14:57:01 dawes Exp $ - - - -XCOMM $XFree86: xc/fonts/Imakefile,v 3.11 2004/01/08 19:02:28 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" Index: xc/fonts/bdf/Imakefile diff -u xc/fonts/bdf/Imakefile:3.3 xc/fonts/bdf/Imakefile:3.4 --- xc/fonts/bdf/Imakefile:3.3 Wed Apr 4 18:55:11 2001 +++ xc/fonts/bdf/Imakefile Mon Jan 9 09:57:01 2006 @@ -1,9 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:42:52 cpqbld Exp $ +XCOMM $XFree86: xc/fonts/bdf/Imakefile,v 3.4 2006/01/09 14:57:01 dawes Exp $ - - - -XCOMM $XFree86: xc/fonts/bdf/Imakefile,v 3.3 2001/04/04 22:55:11 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags /* as nothing */ Index: xc/fonts/bdf/100dpi/Imakefile diff -u xc/fonts/bdf/100dpi/Imakefile:1.8 xc/fonts/bdf/100dpi/Imakefile:1.9 --- xc/fonts/bdf/100dpi/Imakefile:1.8 Mon May 31 20:16:55 2004 +++ xc/fonts/bdf/100dpi/Imakefile Fri Mar 17 20:34:23 2006 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/fonts/bdf/100dpi/Imakefile,v 1.8 2004/06/01 00:16:55 dawes Exp $ +XCOMM $XFree86: xc/fonts/bdf/100dpi/Imakefile,v 1.9 2006/03/18 01:34:23 dawes Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -63,4 +63,5 @@ InstallFontObjs($(OBJS2),$(FONTINSTDIR)) InstallFontAliases($(FONTINSTDIR)) InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) +InstallFcCache($(FONTINSTDIR)) Index: xc/fonts/bdf/100dpi/UTBI__10.bdf diff -u xc/fonts/bdf/100dpi/UTBI__10.bdf:1.3 xc/fonts/bdf/100dpi/UTBI__10.bdf:1.4 --- xc/fonts/bdf/100dpi/UTBI__10.bdf:1.3 Tue Apr 17 17:57:11 2001 +++ xc/fonts/bdf/100dpi/UTBI__10.bdf Mon Jan 9 09:57:01 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-I-Normal--14-100-100-100-P-78-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 20 23 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTBI__10.bdf,v 1.4 2006/01/09 14:57:01 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTBI__12.bdf diff -u xc/fonts/bdf/100dpi/UTBI__12.bdf:1.3 xc/fonts/bdf/100dpi/UTBI__12.bdf:1.4 --- xc/fonts/bdf/100dpi/UTBI__12.bdf:1.3 Tue Apr 17 17:57:11 2001 +++ xc/fonts/bdf/100dpi/UTBI__12.bdf Mon Jan 9 09:57:01 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-I-Normal--17-120-100-100-P-93-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 24 29 -2 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTBI__12.bdf,v 1.4 2006/01/09 14:57:01 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTBI__14.bdf diff -u xc/fonts/bdf/100dpi/UTBI__14.bdf:1.3 xc/fonts/bdf/100dpi/UTBI__14.bdf:1.4 --- xc/fonts/bdf/100dpi/UTBI__14.bdf:1.3 Tue Apr 17 17:57:12 2001 +++ xc/fonts/bdf/100dpi/UTBI__14.bdf Mon Jan 9 09:57:01 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-I-Normal--19-140-100-100-P-109-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 28 31 -3 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTBI__14.bdf,v 1.4 2006/01/09 14:57:01 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTBI__18.bdf diff -u xc/fonts/bdf/100dpi/UTBI__18.bdf:1.3 xc/fonts/bdf/100dpi/UTBI__18.bdf:1.4 --- xc/fonts/bdf/100dpi/UTBI__18.bdf:1.3 Tue Apr 17 17:57:12 2001 +++ xc/fonts/bdf/100dpi/UTBI__18.bdf Mon Jan 9 09:57:01 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-I-Normal--25-180-100-100-P-139-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 37 43 -4 -13 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTBI__18.bdf,v 1.4 2006/01/09 14:57:01 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTBI__24.bdf diff -u xc/fonts/bdf/100dpi/UTBI__24.bdf:1.3 xc/fonts/bdf/100dpi/UTBI__24.bdf:1.4 --- xc/fonts/bdf/100dpi/UTBI__24.bdf:1.3 Tue Apr 17 17:57:13 2001 +++ xc/fonts/bdf/100dpi/UTBI__24.bdf Mon Jan 9 09:57:02 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-I-Normal--33-240-100-100-P-186-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 48 56 -5 -17 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTBI__24.bdf,v 1.4 2006/01/09 14:57:02 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTB___10.bdf diff -u xc/fonts/bdf/100dpi/UTB___10.bdf:1.3 xc/fonts/bdf/100dpi/UTB___10.bdf:1.4 --- xc/fonts/bdf/100dpi/UTB___10.bdf:1.3 Tue Apr 17 17:57:13 2001 +++ xc/fonts/bdf/100dpi/UTB___10.bdf Mon Jan 9 09:57:02 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-R-Normal--14-100-100-100-P-78-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 20 23 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTB___10.bdf,v 1.4 2006/01/09 14:57:02 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTB___12.bdf diff -u xc/fonts/bdf/100dpi/UTB___12.bdf:1.3 xc/fonts/bdf/100dpi/UTB___12.bdf:1.4 --- xc/fonts/bdf/100dpi/UTB___12.bdf:1.3 Tue Apr 17 17:57:14 2001 +++ xc/fonts/bdf/100dpi/UTB___12.bdf Mon Jan 9 09:57:02 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-R-Normal--17-120-100-100-P-93-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 24 29 -3 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTB___12.bdf,v 1.4 2006/01/09 14:57:02 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTB___14.bdf diff -u xc/fonts/bdf/100dpi/UTB___14.bdf:1.3 xc/fonts/bdf/100dpi/UTB___14.bdf:1.4 --- xc/fonts/bdf/100dpi/UTB___14.bdf:1.3 Tue Apr 17 17:57:14 2001 +++ xc/fonts/bdf/100dpi/UTB___14.bdf Mon Jan 9 09:57:02 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-R-Normal--19-140-100-100-P-108-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 27 31 -3 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTB___14.bdf,v 1.4 2006/01/09 14:57:02 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTB___18.bdf diff -u xc/fonts/bdf/100dpi/UTB___18.bdf:1.3 xc/fonts/bdf/100dpi/UTB___18.bdf:1.4 --- xc/fonts/bdf/100dpi/UTB___18.bdf:1.3 Tue Apr 17 17:57:14 2001 +++ xc/fonts/bdf/100dpi/UTB___18.bdf Mon Jan 9 09:57:02 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-R-Normal--25-180-100-100-P-140-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 35 41 -4 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTB___18.bdf,v 1.4 2006/01/09 14:57:02 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTB___24.bdf diff -u xc/fonts/bdf/100dpi/UTB___24.bdf:1.3 xc/fonts/bdf/100dpi/UTB___24.bdf:1.4 --- xc/fonts/bdf/100dpi/UTB___24.bdf:1.3 Tue Apr 17 17:57:15 2001 +++ xc/fonts/bdf/100dpi/UTB___24.bdf Mon Jan 9 09:57:02 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-R-Normal--33-240-100-100-P-186-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 47 53 -5 -14 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTB___24.bdf,v 1.4 2006/01/09 14:57:02 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTI___10.bdf diff -u xc/fonts/bdf/100dpi/UTI___10.bdf:1.3 xc/fonts/bdf/100dpi/UTI___10.bdf:1.4 --- xc/fonts/bdf/100dpi/UTI___10.bdf:1.3 Tue Apr 17 19:42:55 2001 +++ xc/fonts/bdf/100dpi/UTI___10.bdf Mon Jan 9 09:57:02 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-I-Normal--14-100-100-100-P-74-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 19 24 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTI___10.bdf,v 1.4 2006/01/09 14:57:02 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTI___12.bdf diff -u xc/fonts/bdf/100dpi/UTI___12.bdf:1.3 xc/fonts/bdf/100dpi/UTI___12.bdf:1.4 --- xc/fonts/bdf/100dpi/UTI___12.bdf:1.3 Tue Apr 17 19:42:55 2001 +++ xc/fonts/bdf/100dpi/UTI___12.bdf Mon Jan 9 09:57:02 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-I-Normal--17-120-100-100-P-89-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 23 28 -3 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTI___12.bdf,v 1.4 2006/01/09 14:57:02 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTI___14.bdf diff -u xc/fonts/bdf/100dpi/UTI___14.bdf:1.3 xc/fonts/bdf/100dpi/UTI___14.bdf:1.4 --- xc/fonts/bdf/100dpi/UTI___14.bdf:1.3 Tue Apr 17 19:42:55 2001 +++ xc/fonts/bdf/100dpi/UTI___14.bdf Mon Jan 9 09:57:03 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-I-Normal--19-140-100-100-P-104-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 27 32 -3 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTI___14.bdf,v 1.4 2006/01/09 14:57:03 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTI___18.bdf diff -u xc/fonts/bdf/100dpi/UTI___18.bdf:1.3 xc/fonts/bdf/100dpi/UTI___18.bdf:1.4 --- xc/fonts/bdf/100dpi/UTI___18.bdf:1.3 Tue Apr 17 19:42:56 2001 +++ xc/fonts/bdf/100dpi/UTI___18.bdf Mon Jan 9 09:57:03 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-I-Normal--25-180-100-100-P-134-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 34 42 -4 -13 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTI___18.bdf,v 1.4 2006/01/09 14:57:03 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTI___24.bdf diff -u xc/fonts/bdf/100dpi/UTI___24.bdf:1.3 xc/fonts/bdf/100dpi/UTI___24.bdf:1.4 --- xc/fonts/bdf/100dpi/UTI___24.bdf:1.3 Tue Apr 17 19:42:56 2001 +++ xc/fonts/bdf/100dpi/UTI___24.bdf Mon Jan 9 09:57:03 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-I-Normal--33-240-100-100-P-179-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 46 54 -6 -17 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTI___24.bdf,v 1.4 2006/01/09 14:57:03 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTRG__10.bdf diff -u xc/fonts/bdf/100dpi/UTRG__10.bdf:1.3 xc/fonts/bdf/100dpi/UTRG__10.bdf:1.4 --- xc/fonts/bdf/100dpi/UTRG__10.bdf:1.3 Tue Apr 17 19:42:56 2001 +++ xc/fonts/bdf/100dpi/UTRG__10.bdf Mon Jan 9 09:57:03 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-R-Normal--14-100-100-100-P-75-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 18 23 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTRG__10.bdf,v 1.4 2006/01/09 14:57:03 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTRG__12.bdf diff -u xc/fonts/bdf/100dpi/UTRG__12.bdf:1.3 xc/fonts/bdf/100dpi/UTRG__12.bdf:1.4 --- xc/fonts/bdf/100dpi/UTRG__12.bdf:1.3 Tue Apr 17 19:42:56 2001 +++ xc/fonts/bdf/100dpi/UTRG__12.bdf Mon Jan 9 09:57:03 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-R-Normal--17-120-100-100-P-91-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 22 27 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTRG__12.bdf,v 1.4 2006/01/09 14:57:03 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTRG__14.bdf diff -u xc/fonts/bdf/100dpi/UTRG__14.bdf:1.3 xc/fonts/bdf/100dpi/UTRG__14.bdf:1.4 --- xc/fonts/bdf/100dpi/UTRG__14.bdf:1.3 Tue Apr 17 19:42:56 2001 +++ xc/fonts/bdf/100dpi/UTRG__14.bdf Mon Jan 9 09:57:03 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-R-Normal--19-140-100-100-P-105-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 25 30 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTRG__14.bdf,v 1.4 2006/01/09 14:57:03 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTRG__18.bdf diff -u xc/fonts/bdf/100dpi/UTRG__18.bdf:1.3 xc/fonts/bdf/100dpi/UTRG__18.bdf:1.4 --- xc/fonts/bdf/100dpi/UTRG__18.bdf:1.3 Tue Apr 17 19:42:57 2001 +++ xc/fonts/bdf/100dpi/UTRG__18.bdf Mon Jan 9 09:57:03 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-R-Normal--25-180-100-100-P-135-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 33 39 -4 -10 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTRG__18.bdf,v 1.4 2006/01/09 14:57:03 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/UTRG__24.bdf diff -u xc/fonts/bdf/100dpi/UTRG__24.bdf:1.3 xc/fonts/bdf/100dpi/UTRG__24.bdf:1.4 --- xc/fonts/bdf/100dpi/UTRG__24.bdf:1.3 Tue Apr 17 19:42:57 2001 +++ xc/fonts/bdf/100dpi/UTRG__24.bdf Mon Jan 9 09:57:04 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-R-Normal--33-240-100-100-P-180-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 43 50 -5 -13 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/UTRG__24.bdf,v 1.4 2006/01/09 14:57:04 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/100dpi/charI08.bdf diff -u xc/fonts/bdf/100dpi/charI08.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charI08.bdf:1.2 --- xc/fonts/bdf/100dpi/charI08.bdf:1.1.1.2 Tue Jan 16 18:07:49 2001 +++ xc/fonts/bdf/100dpi/charI08.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI08.bdf,v 1.3 2000/08/17 19:42:53 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charI08.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charI10.bdf diff -u xc/fonts/bdf/100dpi/charI10.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charI10.bdf:1.2 --- xc/fonts/bdf/100dpi/charI10.bdf:1.1.1.2 Tue Jan 16 18:07:51 2001 +++ xc/fonts/bdf/100dpi/charI10.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI10.bdf,v 1.3 2000/08/17 19:42:53 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charI10.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charI12.bdf diff -u xc/fonts/bdf/100dpi/charI12.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charI12.bdf:1.2 --- xc/fonts/bdf/100dpi/charI12.bdf:1.1.1.2 Tue Jan 16 18:07:54 2001 +++ xc/fonts/bdf/100dpi/charI12.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI12.bdf,v 1.3 2000/08/17 19:42:53 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charI12.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charI14.bdf diff -u xc/fonts/bdf/100dpi/charI14.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charI14.bdf:1.2 --- xc/fonts/bdf/100dpi/charI14.bdf:1.1.1.2 Tue Jan 16 18:07:57 2001 +++ xc/fonts/bdf/100dpi/charI14.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI14.bdf,v 1.3 2000/08/17 19:42:53 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charI14.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charI18.bdf diff -u xc/fonts/bdf/100dpi/charI18.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charI18.bdf:1.2 --- xc/fonts/bdf/100dpi/charI18.bdf:1.1.1.2 Tue Jan 16 18:07:59 2001 +++ xc/fonts/bdf/100dpi/charI18.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI18.bdf,v 1.3 2000/08/17 19:42:53 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charI18.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charI24.bdf diff -u xc/fonts/bdf/100dpi/charI24.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charI24.bdf:1.2 --- xc/fonts/bdf/100dpi/charI24.bdf:1.1.1.2 Tue Jan 16 18:08:01 2001 +++ xc/fonts/bdf/100dpi/charI24.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI24.bdf,v 1.3 2000/08/17 19:42:54 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charI24.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charR08.bdf diff -u xc/fonts/bdf/100dpi/charR08.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charR08.bdf:1.2 --- xc/fonts/bdf/100dpi/charR08.bdf:1.1.1.2 Tue Jan 16 18:08:04 2001 +++ xc/fonts/bdf/100dpi/charR08.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR08.bdf,v 1.3 2000/08/17 19:42:54 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charR08.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charR10.bdf diff -u xc/fonts/bdf/100dpi/charR10.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charR10.bdf:1.2 --- xc/fonts/bdf/100dpi/charR10.bdf:1.1.1.2 Tue Jan 16 18:08:07 2001 +++ xc/fonts/bdf/100dpi/charR10.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR10.bdf,v 1.3 2000/08/17 19:42:54 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charR10.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charR12.bdf diff -u xc/fonts/bdf/100dpi/charR12.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charR12.bdf:1.2 --- xc/fonts/bdf/100dpi/charR12.bdf:1.1.1.2 Tue Jan 16 18:08:09 2001 +++ xc/fonts/bdf/100dpi/charR12.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR12.bdf,v 1.3 2000/08/17 19:42:54 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charR12.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charR14.bdf diff -u xc/fonts/bdf/100dpi/charR14.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charR14.bdf:1.2 --- xc/fonts/bdf/100dpi/charR14.bdf:1.1.1.2 Tue Jan 16 18:08:11 2001 +++ xc/fonts/bdf/100dpi/charR14.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR14.bdf,v 1.3 2000/08/17 19:42:54 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charR14.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charR18.bdf diff -u xc/fonts/bdf/100dpi/charR18.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charR18.bdf:1.2 --- xc/fonts/bdf/100dpi/charR18.bdf:1.1.1.2 Tue Jan 16 18:08:13 2001 +++ xc/fonts/bdf/100dpi/charR18.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR18.bdf,v 1.3 2000/08/17 19:42:54 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charR18.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/charR24.bdf diff -u xc/fonts/bdf/100dpi/charR24.bdf:1.1.1.2 xc/fonts/bdf/100dpi/charR24.bdf:1.2 --- xc/fonts/bdf/100dpi/charR24.bdf:1.1.1.2 Tue Jan 16 18:08:16 2001 +++ xc/fonts/bdf/100dpi/charR24.bdf Mon Jan 9 09:57:04 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR24.bdf,v 1.3 2000/08/17 19:42:55 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/charR24.bdf,v 1.2 2006/01/09 14:57:04 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/100dpi/courB08.bdf diff -u xc/fonts/bdf/100dpi/courB08.bdf:1.2 xc/fonts/bdf/100dpi/courB08.bdf:1.3 --- xc/fonts/bdf/100dpi/courB08.bdf:1.2 Wed Apr 4 18:55:15 2001 +++ xc/fonts/bdf/100dpi/courB08.bdf Mon Jan 9 09:57:04 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--11-80-100-100-M-60-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 12 16 -3 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courB08.bdf,v 1.3 2006/01/09 14:57:04 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courB10.bdf diff -u xc/fonts/bdf/100dpi/courB10.bdf:1.2 xc/fonts/bdf/100dpi/courB10.bdf:1.3 --- xc/fonts/bdf/100dpi/courB10.bdf:1.2 Wed Apr 4 18:55:16 2001 +++ xc/fonts/bdf/100dpi/courB10.bdf Mon Jan 9 09:57:04 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--14-100-100-100-M-90-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 13 21 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courB10.bdf,v 1.3 2006/01/09 14:57:04 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courB12.bdf diff -u xc/fonts/bdf/100dpi/courB12.bdf:1.2 xc/fonts/bdf/100dpi/courB12.bdf:1.3 --- xc/fonts/bdf/100dpi/courB12.bdf:1.2 Wed Apr 4 18:55:16 2001 +++ xc/fonts/bdf/100dpi/courB12.bdf Mon Jan 9 09:57:05 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--17-120-100-100-M-100-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 16 24 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courB12.bdf,v 1.3 2006/01/09 14:57:05 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courB14.bdf diff -u xc/fonts/bdf/100dpi/courB14.bdf:1.2 xc/fonts/bdf/100dpi/courB14.bdf:1.3 --- xc/fonts/bdf/100dpi/courB14.bdf:1.2 Wed Apr 4 18:55:16 2001 +++ xc/fonts/bdf/100dpi/courB14.bdf Mon Jan 9 09:57:05 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--20-140-100-100-M-110-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 17 26 -4 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courB14.bdf,v 1.3 2006/01/09 14:57:05 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courB18.bdf diff -u xc/fonts/bdf/100dpi/courB18.bdf:1.2 xc/fonts/bdf/100dpi/courB18.bdf:1.3 --- xc/fonts/bdf/100dpi/courB18.bdf:1.2 Wed Apr 4 18:55:16 2001 +++ xc/fonts/bdf/100dpi/courB18.bdf Mon Jan 9 09:57:05 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--25-180-100-100-M-150-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 22 35 -4 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courB18.bdf,v 1.3 2006/01/09 14:57:05 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courB24.bdf diff -u xc/fonts/bdf/100dpi/courB24.bdf:1.2 xc/fonts/bdf/100dpi/courB24.bdf:1.3 --- xc/fonts/bdf/100dpi/courB24.bdf:1.2 Wed Apr 4 18:55:16 2001 +++ xc/fonts/bdf/100dpi/courB24.bdf Mon Jan 9 09:57:05 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--34-240-100-100-M-200-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 30 44 -7 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courB24.bdf,v 1.3 2006/01/09 14:57:05 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courBO08.bdf diff -u xc/fonts/bdf/100dpi/courBO08.bdf:1.2 xc/fonts/bdf/100dpi/courBO08.bdf:1.3 --- xc/fonts/bdf/100dpi/courBO08.bdf:1.2 Wed Apr 4 18:55:16 2001 +++ xc/fonts/bdf/100dpi/courBO08.bdf Mon Jan 9 09:57:05 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--11-80-100-100-M-60-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 13 16 -3 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courBO08.bdf,v 1.3 2006/01/09 14:57:05 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courBO10.bdf diff -u xc/fonts/bdf/100dpi/courBO10.bdf:1.2 xc/fonts/bdf/100dpi/courBO10.bdf:1.3 --- xc/fonts/bdf/100dpi/courBO10.bdf:1.2 Wed Apr 4 18:55:17 2001 +++ xc/fonts/bdf/100dpi/courBO10.bdf Mon Jan 9 09:57:05 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--14-100-100-100-M-90-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 17 21 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courBO10.bdf,v 1.3 2006/01/09 14:57:05 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courBO12.bdf diff -u xc/fonts/bdf/100dpi/courBO12.bdf:1.2 xc/fonts/bdf/100dpi/courBO12.bdf:1.3 --- xc/fonts/bdf/100dpi/courBO12.bdf:1.2 Wed Apr 4 18:55:17 2001 +++ xc/fonts/bdf/100dpi/courBO12.bdf Mon Jan 9 09:57:05 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--17-120-100-100-M-100-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 21 24 -4 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courBO12.bdf,v 1.3 2006/01/09 14:57:05 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courBO14.bdf diff -u xc/fonts/bdf/100dpi/courBO14.bdf:1.2 xc/fonts/bdf/100dpi/courBO14.bdf:1.3 --- xc/fonts/bdf/100dpi/courBO14.bdf:1.2 Wed Apr 4 18:55:17 2001 +++ xc/fonts/bdf/100dpi/courBO14.bdf Mon Jan 9 09:57:05 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--20-140-100-100-M-110-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 21 26 -5 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courBO14.bdf,v 1.3 2006/01/09 14:57:05 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courBO18.bdf diff -u xc/fonts/bdf/100dpi/courBO18.bdf:1.2 xc/fonts/bdf/100dpi/courBO18.bdf:1.3 --- xc/fonts/bdf/100dpi/courBO18.bdf:1.2 Wed Apr 4 18:55:17 2001 +++ xc/fonts/bdf/100dpi/courBO18.bdf Mon Jan 9 09:57:05 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--25-180-100-100-M-150-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 28 33 -6 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courBO18.bdf,v 1.3 2006/01/09 14:57:05 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courBO24.bdf diff -u xc/fonts/bdf/100dpi/courBO24.bdf:1.2 xc/fonts/bdf/100dpi/courBO24.bdf:1.3 --- xc/fonts/bdf/100dpi/courBO24.bdf:1.2 Wed Apr 4 18:55:17 2001 +++ xc/fonts/bdf/100dpi/courBO24.bdf Mon Jan 9 09:57:06 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--34-240-100-100-M-200-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 36 44 -7 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courBO24.bdf,v 1.3 2006/01/09 14:57:06 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courO08.bdf diff -u xc/fonts/bdf/100dpi/courO08.bdf:1.2 xc/fonts/bdf/100dpi/courO08.bdf:1.3 --- xc/fonts/bdf/100dpi/courO08.bdf:1.2 Wed Apr 4 18:55:18 2001 +++ xc/fonts/bdf/100dpi/courO08.bdf Mon Jan 9 09:57:06 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--11-80-100-100-M-60-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 11 16 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courO08.bdf,v 1.3 2006/01/09 14:57:06 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courO10.bdf diff -u xc/fonts/bdf/100dpi/courO10.bdf:1.2 xc/fonts/bdf/100dpi/courO10.bdf:1.3 --- xc/fonts/bdf/100dpi/courO10.bdf:1.2 Wed Apr 4 18:55:18 2001 +++ xc/fonts/bdf/100dpi/courO10.bdf Mon Jan 9 09:57:06 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--14-100-100-100-M-90-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 16 20 -4 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courO10.bdf,v 1.3 2006/01/09 14:57:06 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courO12.bdf diff -u xc/fonts/bdf/100dpi/courO12.bdf:1.2 xc/fonts/bdf/100dpi/courO12.bdf:1.3 --- xc/fonts/bdf/100dpi/courO12.bdf:1.2 Wed Apr 4 18:55:18 2001 +++ xc/fonts/bdf/100dpi/courO12.bdf Mon Jan 9 09:57:06 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--17-120-100-100-M-100-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 20 24 -4 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courO12.bdf,v 1.3 2006/01/09 14:57:06 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courO14.bdf diff -u xc/fonts/bdf/100dpi/courO14.bdf:1.2 xc/fonts/bdf/100dpi/courO14.bdf:1.3 --- xc/fonts/bdf/100dpi/courO14.bdf:1.2 Wed Apr 4 18:55:18 2001 +++ xc/fonts/bdf/100dpi/courO14.bdf Mon Jan 9 09:57:06 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--20-140-100-100-M-110-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 19 26 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courO14.bdf,v 1.3 2006/01/09 14:57:06 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courO18.bdf diff -u xc/fonts/bdf/100dpi/courO18.bdf:1.2 xc/fonts/bdf/100dpi/courO18.bdf:1.3 --- xc/fonts/bdf/100dpi/courO18.bdf:1.2 Wed Apr 4 18:55:18 2001 +++ xc/fonts/bdf/100dpi/courO18.bdf Mon Jan 9 09:57:06 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--25-180-100-100-M-150-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 26 32 -4 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courO18.bdf,v 1.3 2006/01/09 14:57:06 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courO24.bdf diff -u xc/fonts/bdf/100dpi/courO24.bdf:1.2 xc/fonts/bdf/100dpi/courO24.bdf:1.3 --- xc/fonts/bdf/100dpi/courO24.bdf:1.2 Wed Apr 4 18:55:18 2001 +++ xc/fonts/bdf/100dpi/courO24.bdf Mon Jan 9 09:57:06 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--34-240-100-100-M-200-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 34 42 -6 -10 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courO24.bdf,v 1.3 2006/01/09 14:57:06 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courR08.bdf diff -u xc/fonts/bdf/100dpi/courR08.bdf:1.2 xc/fonts/bdf/100dpi/courR08.bdf:1.3 --- xc/fonts/bdf/100dpi/courR08.bdf:1.2 Wed Apr 4 18:55:18 2001 +++ xc/fonts/bdf/100dpi/courR08.bdf Mon Jan 9 09:57:07 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--11-80-100-100-M-60-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 10 16 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courR08.bdf,v 1.3 2006/01/09 14:57:07 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courR10.bdf diff -u xc/fonts/bdf/100dpi/courR10.bdf:1.2 xc/fonts/bdf/100dpi/courR10.bdf:1.3 --- xc/fonts/bdf/100dpi/courR10.bdf:1.2 Wed Apr 4 18:55:19 2001 +++ xc/fonts/bdf/100dpi/courR10.bdf Mon Jan 9 09:57:07 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--14-100-100-100-M-90-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 14 20 -3 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courR10.bdf,v 1.3 2006/01/09 14:57:07 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courR12.bdf diff -u xc/fonts/bdf/100dpi/courR12.bdf:1.2 xc/fonts/bdf/100dpi/courR12.bdf:1.3 --- xc/fonts/bdf/100dpi/courR12.bdf:1.2 Wed Apr 4 18:55:19 2001 +++ xc/fonts/bdf/100dpi/courR12.bdf Mon Jan 9 09:57:07 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--17-120-100-100-M-100-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 15 24 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courR12.bdf,v 1.3 2006/01/09 14:57:07 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courR14.bdf diff -u xc/fonts/bdf/100dpi/courR14.bdf:1.2 xc/fonts/bdf/100dpi/courR14.bdf:1.3 --- xc/fonts/bdf/100dpi/courR14.bdf:1.2 Wed Apr 4 18:55:19 2001 +++ xc/fonts/bdf/100dpi/courR14.bdf Mon Jan 9 09:57:07 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--20-140-100-100-M-110-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 16 26 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courR14.bdf,v 1.3 2006/01/09 14:57:07 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courR18.bdf diff -u xc/fonts/bdf/100dpi/courR18.bdf:1.2 xc/fonts/bdf/100dpi/courR18.bdf:1.3 --- xc/fonts/bdf/100dpi/courR18.bdf:1.2 Wed Apr 4 18:55:19 2001 +++ xc/fonts/bdf/100dpi/courR18.bdf Mon Jan 9 09:57:07 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--25-180-100-100-M-150-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 23 32 -5 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courR18.bdf,v 1.3 2006/01/09 14:57:07 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/courR24.bdf diff -u xc/fonts/bdf/100dpi/courR24.bdf:1.2 xc/fonts/bdf/100dpi/courR24.bdf:1.3 --- xc/fonts/bdf/100dpi/courR24.bdf:1.2 Wed Apr 4 18:55:19 2001 +++ xc/fonts/bdf/100dpi/courR24.bdf Mon Jan 9 09:57:07 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--34-240-100-100-M-200-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 28 42 -6 -10 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/courR24.bdf,v 1.3 2006/01/09 14:57:07 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvB08.bdf diff -u xc/fonts/bdf/100dpi/helvB08.bdf:1.3 xc/fonts/bdf/100dpi/helvB08.bdf:1.4 --- xc/fonts/bdf/100dpi/helvB08.bdf:1.3 Tue Apr 17 19:42:57 2001 +++ xc/fonts/bdf/100dpi/helvB08.bdf Mon Jan 9 09:57:07 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--11-80-100-100-P-60-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 12 19 -1 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvB08.bdf,v 1.4 2006/01/09 14:57:07 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvB10.bdf diff -u xc/fonts/bdf/100dpi/helvB10.bdf:1.3 xc/fonts/bdf/100dpi/helvB10.bdf:1.4 --- xc/fonts/bdf/100dpi/helvB10.bdf:1.3 Tue Apr 17 19:42:57 2001 +++ xc/fonts/bdf/100dpi/helvB10.bdf Mon Jan 9 09:57:07 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--14-100-100-100-P-82-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 17 23 -1 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvB10.bdf,v 1.4 2006/01/09 14:57:07 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvB12.bdf diff -u xc/fonts/bdf/100dpi/helvB12.bdf:1.3 xc/fonts/bdf/100dpi/helvB12.bdf:1.4 --- xc/fonts/bdf/100dpi/helvB12.bdf:1.3 Tue Apr 17 19:42:57 2001 +++ xc/fonts/bdf/100dpi/helvB12.bdf Mon Jan 9 09:57:07 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--17-120-100-100-P-92-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 20 27 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvB12.bdf,v 1.4 2006/01/09 14:57:07 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvB14.bdf diff -u xc/fonts/bdf/100dpi/helvB14.bdf:1.3 xc/fonts/bdf/100dpi/helvB14.bdf:1.4 --- xc/fonts/bdf/100dpi/helvB14.bdf:1.3 Tue Apr 17 19:42:58 2001 +++ xc/fonts/bdf/100dpi/helvB14.bdf Mon Jan 9 09:57:07 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--20-140-100-100-P-105-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 22 29 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvB14.bdf,v 1.4 2006/01/09 14:57:07 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvB18.bdf diff -u xc/fonts/bdf/100dpi/helvB18.bdf:1.3 xc/fonts/bdf/100dpi/helvB18.bdf:1.4 --- xc/fonts/bdf/100dpi/helvB18.bdf:1.3 Tue Apr 17 19:42:58 2001 +++ xc/fonts/bdf/100dpi/helvB18.bdf Mon Jan 9 09:57:08 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--25-180-100-100-P-138-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 28 37 -2 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvB18.bdf,v 1.4 2006/01/09 14:57:08 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvB24.bdf diff -u xc/fonts/bdf/100dpi/helvB24.bdf:1.3 xc/fonts/bdf/100dpi/helvB24.bdf:1.4 --- xc/fonts/bdf/100dpi/helvB24.bdf:1.3 Tue Apr 17 19:42:58 2001 +++ xc/fonts/bdf/100dpi/helvB24.bdf Mon Jan 9 09:57:08 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--34-240-100-100-P-182-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 40 49 -6 -12 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvB24.bdf,v 1.4 2006/01/09 14:57:08 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvBO08.bdf diff -u xc/fonts/bdf/100dpi/helvBO08.bdf:1.3 xc/fonts/bdf/100dpi/helvBO08.bdf:1.4 --- xc/fonts/bdf/100dpi/helvBO08.bdf:1.3 Tue Apr 17 19:42:58 2001 +++ xc/fonts/bdf/100dpi/helvBO08.bdf Mon Jan 9 09:57:08 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--11-80-100-100-P-60-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 13 19 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvBO08.bdf,v 1.4 2006/01/09 14:57:08 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvBO10.bdf diff -u xc/fonts/bdf/100dpi/helvBO10.bdf:1.3 xc/fonts/bdf/100dpi/helvBO10.bdf:1.4 --- xc/fonts/bdf/100dpi/helvBO10.bdf:1.3 Tue Apr 17 19:42:58 2001 +++ xc/fonts/bdf/100dpi/helvBO10.bdf Mon Jan 9 09:57:08 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--14-100-100-100-P-82-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 19 23 -1 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvBO10.bdf,v 1.4 2006/01/09 14:57:08 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvBO12.bdf diff -u xc/fonts/bdf/100dpi/helvBO12.bdf:1.3 xc/fonts/bdf/100dpi/helvBO12.bdf:1.4 --- xc/fonts/bdf/100dpi/helvBO12.bdf:1.3 Tue Apr 17 19:42:58 2001 +++ xc/fonts/bdf/100dpi/helvBO12.bdf Mon Jan 9 09:57:08 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--17-120-100-100-P-92-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 23 27 -4 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvBO12.bdf,v 1.4 2006/01/09 14:57:08 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvBO14.bdf diff -u xc/fonts/bdf/100dpi/helvBO14.bdf:1.3 xc/fonts/bdf/100dpi/helvBO14.bdf:1.4 --- xc/fonts/bdf/100dpi/helvBO14.bdf:1.3 Tue Apr 17 19:42:59 2001 +++ xc/fonts/bdf/100dpi/helvBO14.bdf Mon Jan 9 09:57:08 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--20-140-100-100-P-103-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 24 29 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvBO14.bdf,v 1.4 2006/01/09 14:57:08 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvBO18.bdf diff -u xc/fonts/bdf/100dpi/helvBO18.bdf:1.3 xc/fonts/bdf/100dpi/helvBO18.bdf:1.4 --- xc/fonts/bdf/100dpi/helvBO18.bdf:1.3 Tue Apr 17 19:42:59 2001 +++ xc/fonts/bdf/100dpi/helvBO18.bdf Mon Jan 9 09:57:08 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--25-180-100-100-P-138-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 29 37 -1 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvBO18.bdf,v 1.4 2006/01/09 14:57:08 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvBO24.bdf diff -u xc/fonts/bdf/100dpi/helvBO24.bdf:1.3 xc/fonts/bdf/100dpi/helvBO24.bdf:1.4 --- xc/fonts/bdf/100dpi/helvBO24.bdf:1.3 Tue Apr 17 19:42:59 2001 +++ xc/fonts/bdf/100dpi/helvBO24.bdf Mon Jan 9 09:57:08 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--34-240-100-100-P-182-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 43 49 -5 -12 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvBO24.bdf,v 1.4 2006/01/09 14:57:08 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvO08.bdf diff -u xc/fonts/bdf/100dpi/helvO08.bdf:1.3 xc/fonts/bdf/100dpi/helvO08.bdf:1.4 --- xc/fonts/bdf/100dpi/helvO08.bdf:1.3 Tue Apr 17 19:43:00 2001 +++ xc/fonts/bdf/100dpi/helvO08.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--11-80-100-100-P-57-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 13 18 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvO08.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvO10.bdf diff -u xc/fonts/bdf/100dpi/helvO10.bdf:1.3 xc/fonts/bdf/100dpi/helvO10.bdf:1.4 --- xc/fonts/bdf/100dpi/helvO10.bdf:1.3 Tue Apr 17 19:43:00 2001 +++ xc/fonts/bdf/100dpi/helvO10.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--14-100-100-100-P-78-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 19 22 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvO10.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvO12.bdf diff -u xc/fonts/bdf/100dpi/helvO12.bdf:1.3 xc/fonts/bdf/100dpi/helvO12.bdf:1.4 --- xc/fonts/bdf/100dpi/helvO12.bdf:1.3 Tue Apr 17 19:43:00 2001 +++ xc/fonts/bdf/100dpi/helvO12.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--17-120-100-100-P-88-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 22 27 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvO12.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvO14.bdf diff -u xc/fonts/bdf/100dpi/helvO14.bdf:1.3 xc/fonts/bdf/100dpi/helvO14.bdf:1.4 --- xc/fonts/bdf/100dpi/helvO14.bdf:1.3 Tue Apr 17 19:43:01 2001 +++ xc/fonts/bdf/100dpi/helvO14.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--20-140-100-100-P-98-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 23 29 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvO14.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvO18.bdf diff -u xc/fonts/bdf/100dpi/helvO18.bdf:1.3 xc/fonts/bdf/100dpi/helvO18.bdf:1.4 --- xc/fonts/bdf/100dpi/helvO18.bdf:1.3 Tue Apr 17 19:43:01 2001 +++ xc/fonts/bdf/100dpi/helvO18.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--25-180-100-100-P-130-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 29 37 -1 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvO18.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvO24.bdf diff -u xc/fonts/bdf/100dpi/helvO24.bdf:1.3 xc/fonts/bdf/100dpi/helvO24.bdf:1.4 --- xc/fonts/bdf/100dpi/helvO24.bdf:1.3 Tue Apr 17 19:43:01 2001 +++ xc/fonts/bdf/100dpi/helvO24.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--34-240-100-100-P-176-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 42 48 -5 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvO24.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvR08.bdf diff -u xc/fonts/bdf/100dpi/helvR08.bdf:1.3 xc/fonts/bdf/100dpi/helvR08.bdf:1.4 --- xc/fonts/bdf/100dpi/helvR08.bdf:1.3 Tue Apr 17 19:43:02 2001 +++ xc/fonts/bdf/100dpi/helvR08.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--11-80-100-100-P-56-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 13 18 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvR08.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvR10.bdf diff -u xc/fonts/bdf/100dpi/helvR10.bdf:1.3 xc/fonts/bdf/100dpi/helvR10.bdf:1.4 --- xc/fonts/bdf/100dpi/helvR10.bdf:1.3 Tue Apr 17 19:43:02 2001 +++ xc/fonts/bdf/100dpi/helvR10.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--14-100-100-100-P-76-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 17 22 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvR10.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvR12.bdf diff -u xc/fonts/bdf/100dpi/helvR12.bdf:1.3 xc/fonts/bdf/100dpi/helvR12.bdf:1.4 --- xc/fonts/bdf/100dpi/helvR12.bdf:1.3 Tue Apr 17 19:43:02 2001 +++ xc/fonts/bdf/100dpi/helvR12.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--17-120-100-100-P-88-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 20 26 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvR12.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvR14.bdf diff -u xc/fonts/bdf/100dpi/helvR14.bdf:1.3 xc/fonts/bdf/100dpi/helvR14.bdf:1.4 --- xc/fonts/bdf/100dpi/helvR14.bdf:1.3 Tue Apr 17 19:43:02 2001 +++ xc/fonts/bdf/100dpi/helvR14.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--20-140-100-100-P-100-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 22 29 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvR14.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvR18.bdf diff -u xc/fonts/bdf/100dpi/helvR18.bdf:1.3 xc/fonts/bdf/100dpi/helvR18.bdf:1.4 --- xc/fonts/bdf/100dpi/helvR18.bdf:1.3 Tue Apr 17 19:43:03 2001 +++ xc/fonts/bdf/100dpi/helvR18.bdf Mon Jan 9 09:57:09 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--25-180-100-100-P-130-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 28 37 -3 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvR18.bdf,v 1.4 2006/01/09 14:57:09 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/helvR24.bdf diff -u xc/fonts/bdf/100dpi/helvR24.bdf:1.3 xc/fonts/bdf/100dpi/helvR24.bdf:1.4 --- xc/fonts/bdf/100dpi/helvR24.bdf:1.3 Tue Apr 17 19:43:03 2001 +++ xc/fonts/bdf/100dpi/helvR24.bdf Mon Jan 9 09:57:10 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--34-240-100-100-P-176-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 39 48 -5 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/helvR24.bdf,v 1.4 2006/01/09 14:57:10 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/luBIS08.bdf diff -u xc/fonts/bdf/100dpi/luBIS08.bdf:1.3 xc/fonts/bdf/100dpi/luBIS08.bdf:1.4 --- xc/fonts/bdf/100dpi/luBIS08.bdf:1.3 Tue Apr 17 19:43:03 2001 +++ xc/fonts/bdf/100dpi/luBIS08.bdf Mon Jan 9 09:57:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBIS08.bdf,v 1.4 2006/01/09 14:57:10 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBIS10.bdf diff -u xc/fonts/bdf/100dpi/luBIS10.bdf:1.3 xc/fonts/bdf/100dpi/luBIS10.bdf:1.4 --- xc/fonts/bdf/100dpi/luBIS10.bdf:1.3 Tue Apr 17 19:43:04 2001 +++ xc/fonts/bdf/100dpi/luBIS10.bdf Mon Jan 9 09:57:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBIS10.bdf,v 1.4 2006/01/09 14:57:10 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBIS12.bdf diff -u xc/fonts/bdf/100dpi/luBIS12.bdf:1.3 xc/fonts/bdf/100dpi/luBIS12.bdf:1.4 --- xc/fonts/bdf/100dpi/luBIS12.bdf:1.3 Tue Apr 17 19:43:04 2001 +++ xc/fonts/bdf/100dpi/luBIS12.bdf Mon Jan 9 09:57:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBIS12.bdf,v 1.4 2006/01/09 14:57:10 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBIS14.bdf diff -u xc/fonts/bdf/100dpi/luBIS14.bdf:1.3 xc/fonts/bdf/100dpi/luBIS14.bdf:1.4 --- xc/fonts/bdf/100dpi/luBIS14.bdf:1.3 Tue Apr 17 19:43:04 2001 +++ xc/fonts/bdf/100dpi/luBIS14.bdf Mon Jan 9 09:57:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBIS14.bdf,v 1.4 2006/01/09 14:57:10 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBIS18.bdf diff -u xc/fonts/bdf/100dpi/luBIS18.bdf:1.3 xc/fonts/bdf/100dpi/luBIS18.bdf:1.4 --- xc/fonts/bdf/100dpi/luBIS18.bdf:1.3 Tue Apr 17 19:43:05 2001 +++ xc/fonts/bdf/100dpi/luBIS18.bdf Mon Jan 9 09:57:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBIS18.bdf,v 1.4 2006/01/09 14:57:10 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBIS19.bdf diff -u xc/fonts/bdf/100dpi/luBIS19.bdf:1.4 xc/fonts/bdf/100dpi/luBIS19.bdf:1.5 --- xc/fonts/bdf/100dpi/luBIS19.bdf:1.4 Mon Apr 7 12:23:25 2003 +++ xc/fonts/bdf/100dpi/luBIS19.bdf Mon Jan 9 09:57:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBIS19.bdf,v 1.5 2006/01/09 14:57:10 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBIS24.bdf diff -u xc/fonts/bdf/100dpi/luBIS24.bdf:1.3 xc/fonts/bdf/100dpi/luBIS24.bdf:1.4 --- xc/fonts/bdf/100dpi/luBIS24.bdf:1.3 Tue Apr 17 19:43:05 2001 +++ xc/fonts/bdf/100dpi/luBIS24.bdf Mon Jan 9 09:57:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBIS24.bdf,v 1.4 2006/01/09 14:57:10 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBS08.bdf diff -u xc/fonts/bdf/100dpi/luBS08.bdf:1.3 xc/fonts/bdf/100dpi/luBS08.bdf:1.4 --- xc/fonts/bdf/100dpi/luBS08.bdf:1.3 Tue Apr 17 19:43:05 2001 +++ xc/fonts/bdf/100dpi/luBS08.bdf Mon Jan 9 09:57:11 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBS08.bdf,v 1.4 2006/01/09 14:57:11 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBS10.bdf diff -u xc/fonts/bdf/100dpi/luBS10.bdf:1.3 xc/fonts/bdf/100dpi/luBS10.bdf:1.4 --- xc/fonts/bdf/100dpi/luBS10.bdf:1.3 Tue Apr 17 19:43:05 2001 +++ xc/fonts/bdf/100dpi/luBS10.bdf Mon Jan 9 09:57:11 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBS10.bdf,v 1.4 2006/01/09 14:57:11 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBS12.bdf diff -u xc/fonts/bdf/100dpi/luBS12.bdf:1.3 xc/fonts/bdf/100dpi/luBS12.bdf:1.4 --- xc/fonts/bdf/100dpi/luBS12.bdf:1.3 Tue Apr 17 19:43:06 2001 +++ xc/fonts/bdf/100dpi/luBS12.bdf Mon Jan 9 09:57:11 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBS12.bdf,v 1.4 2006/01/09 14:57:11 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBS14.bdf diff -u xc/fonts/bdf/100dpi/luBS14.bdf:1.3 xc/fonts/bdf/100dpi/luBS14.bdf:1.4 --- xc/fonts/bdf/100dpi/luBS14.bdf:1.3 Tue Apr 17 19:43:06 2001 +++ xc/fonts/bdf/100dpi/luBS14.bdf Mon Jan 9 09:57:11 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBS14.bdf,v 1.4 2006/01/09 14:57:11 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBS18.bdf diff -u xc/fonts/bdf/100dpi/luBS18.bdf:1.3 xc/fonts/bdf/100dpi/luBS18.bdf:1.4 --- xc/fonts/bdf/100dpi/luBS18.bdf:1.3 Tue Apr 17 19:43:06 2001 +++ xc/fonts/bdf/100dpi/luBS18.bdf Mon Jan 9 09:57:11 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBS18.bdf,v 1.4 2006/01/09 14:57:11 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBS19.bdf diff -u xc/fonts/bdf/100dpi/luBS19.bdf:1.4 xc/fonts/bdf/100dpi/luBS19.bdf:1.5 --- xc/fonts/bdf/100dpi/luBS19.bdf:1.4 Mon Apr 7 12:23:25 2003 +++ xc/fonts/bdf/100dpi/luBS19.bdf Mon Jan 9 09:57:11 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBS19.bdf,v 1.5 2006/01/09 14:57:11 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luBS24.bdf diff -u xc/fonts/bdf/100dpi/luBS24.bdf:1.3 xc/fonts/bdf/100dpi/luBS24.bdf:1.4 --- xc/fonts/bdf/100dpi/luBS24.bdf:1.3 Tue Apr 17 19:43:06 2001 +++ xc/fonts/bdf/100dpi/luBS24.bdf Mon Jan 9 09:57:11 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luBS24.bdf,v 1.4 2006/01/09 14:57:11 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luIS08.bdf diff -u xc/fonts/bdf/100dpi/luIS08.bdf:1.3 xc/fonts/bdf/100dpi/luIS08.bdf:1.4 --- xc/fonts/bdf/100dpi/luIS08.bdf:1.3 Tue Apr 17 19:43:07 2001 +++ xc/fonts/bdf/100dpi/luIS08.bdf Mon Jan 9 09:57:11 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luIS08.bdf,v 1.4 2006/01/09 14:57:11 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luIS10.bdf diff -u xc/fonts/bdf/100dpi/luIS10.bdf:1.3 xc/fonts/bdf/100dpi/luIS10.bdf:1.4 --- xc/fonts/bdf/100dpi/luIS10.bdf:1.3 Tue Apr 17 19:43:07 2001 +++ xc/fonts/bdf/100dpi/luIS10.bdf Mon Jan 9 09:57:11 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luIS10.bdf,v 1.4 2006/01/09 14:57:11 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luIS12.bdf diff -u xc/fonts/bdf/100dpi/luIS12.bdf:1.3 xc/fonts/bdf/100dpi/luIS12.bdf:1.4 --- xc/fonts/bdf/100dpi/luIS12.bdf:1.3 Tue Apr 17 19:43:07 2001 +++ xc/fonts/bdf/100dpi/luIS12.bdf Mon Jan 9 09:57:11 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luIS12.bdf,v 1.4 2006/01/09 14:57:11 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luIS14.bdf diff -u xc/fonts/bdf/100dpi/luIS14.bdf:1.3 xc/fonts/bdf/100dpi/luIS14.bdf:1.4 --- xc/fonts/bdf/100dpi/luIS14.bdf:1.3 Tue Apr 17 19:43:07 2001 +++ xc/fonts/bdf/100dpi/luIS14.bdf Mon Jan 9 09:57:12 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luIS14.bdf,v 1.4 2006/01/09 14:57:12 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luIS18.bdf diff -u xc/fonts/bdf/100dpi/luIS18.bdf:1.3 xc/fonts/bdf/100dpi/luIS18.bdf:1.4 --- xc/fonts/bdf/100dpi/luIS18.bdf:1.3 Tue Apr 17 19:43:07 2001 +++ xc/fonts/bdf/100dpi/luIS18.bdf Mon Jan 9 09:57:12 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luIS18.bdf,v 1.4 2006/01/09 14:57:12 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luIS19.bdf diff -u xc/fonts/bdf/100dpi/luIS19.bdf:1.4 xc/fonts/bdf/100dpi/luIS19.bdf:1.5 --- xc/fonts/bdf/100dpi/luIS19.bdf:1.4 Mon Apr 7 12:23:25 2003 +++ xc/fonts/bdf/100dpi/luIS19.bdf Mon Jan 9 09:57:12 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luIS19.bdf,v 1.5 2006/01/09 14:57:12 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luIS24.bdf diff -u xc/fonts/bdf/100dpi/luIS24.bdf:1.3 xc/fonts/bdf/100dpi/luIS24.bdf:1.4 --- xc/fonts/bdf/100dpi/luIS24.bdf:1.3 Tue Apr 17 19:43:08 2001 +++ xc/fonts/bdf/100dpi/luIS24.bdf Mon Jan 9 09:57:12 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luIS24.bdf,v 1.4 2006/01/09 14:57:12 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luRS08.bdf diff -u xc/fonts/bdf/100dpi/luRS08.bdf:1.3 xc/fonts/bdf/100dpi/luRS08.bdf:1.4 --- xc/fonts/bdf/100dpi/luRS08.bdf:1.3 Tue Apr 17 19:43:08 2001 +++ xc/fonts/bdf/100dpi/luRS08.bdf Mon Jan 9 09:57:12 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luRS08.bdf,v 1.4 2006/01/09 14:57:12 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luRS10.bdf diff -u xc/fonts/bdf/100dpi/luRS10.bdf:1.3 xc/fonts/bdf/100dpi/luRS10.bdf:1.4 --- xc/fonts/bdf/100dpi/luRS10.bdf:1.3 Tue Apr 17 19:43:08 2001 +++ xc/fonts/bdf/100dpi/luRS10.bdf Mon Jan 9 09:57:12 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luRS10.bdf,v 1.4 2006/01/09 14:57:12 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luRS12.bdf diff -u xc/fonts/bdf/100dpi/luRS12.bdf:1.3 xc/fonts/bdf/100dpi/luRS12.bdf:1.4 --- xc/fonts/bdf/100dpi/luRS12.bdf:1.3 Tue Apr 17 19:43:08 2001 +++ xc/fonts/bdf/100dpi/luRS12.bdf Mon Jan 9 09:57:12 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luRS12.bdf,v 1.4 2006/01/09 14:57:12 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luRS14.bdf diff -u xc/fonts/bdf/100dpi/luRS14.bdf:1.3 xc/fonts/bdf/100dpi/luRS14.bdf:1.4 --- xc/fonts/bdf/100dpi/luRS14.bdf:1.3 Tue Apr 17 19:43:09 2001 +++ xc/fonts/bdf/100dpi/luRS14.bdf Mon Jan 9 09:57:12 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luRS14.bdf,v 1.4 2006/01/09 14:57:12 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luRS18.bdf diff -u xc/fonts/bdf/100dpi/luRS18.bdf:1.3 xc/fonts/bdf/100dpi/luRS18.bdf:1.4 --- xc/fonts/bdf/100dpi/luRS18.bdf:1.3 Tue Apr 17 19:43:09 2001 +++ xc/fonts/bdf/100dpi/luRS18.bdf Mon Jan 9 09:57:12 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luRS18.bdf,v 1.4 2006/01/09 14:57:12 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luRS19.bdf diff -u xc/fonts/bdf/100dpi/luRS19.bdf:1.4 xc/fonts/bdf/100dpi/luRS19.bdf:1.5 --- xc/fonts/bdf/100dpi/luRS19.bdf:1.4 Mon Apr 7 12:23:26 2003 +++ xc/fonts/bdf/100dpi/luRS19.bdf Mon Jan 9 09:57:12 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luRS19.bdf,v 1.5 2006/01/09 14:57:12 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/luRS24.bdf diff -u xc/fonts/bdf/100dpi/luRS24.bdf:1.3 xc/fonts/bdf/100dpi/luRS24.bdf:1.4 --- xc/fonts/bdf/100dpi/luRS24.bdf:1.3 Tue Apr 17 19:43:09 2001 +++ xc/fonts/bdf/100dpi/luRS24.bdf Mon Jan 9 09:57:13 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/luRS24.bdf,v 1.4 2006/01/09 14:57:13 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubB08.bdf diff -u xc/fonts/bdf/100dpi/lubB08.bdf:1.3 xc/fonts/bdf/100dpi/lubB08.bdf:1.4 --- xc/fonts/bdf/100dpi/lubB08.bdf:1.3 Tue Apr 17 19:43:10 2001 +++ xc/fonts/bdf/100dpi/lubB08.bdf Mon Jan 9 09:57:13 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubB08.bdf,v 1.4 2006/01/09 14:57:13 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubB10.bdf diff -u xc/fonts/bdf/100dpi/lubB10.bdf:1.3 xc/fonts/bdf/100dpi/lubB10.bdf:1.4 --- xc/fonts/bdf/100dpi/lubB10.bdf:1.3 Tue Apr 17 19:43:10 2001 +++ xc/fonts/bdf/100dpi/lubB10.bdf Mon Jan 9 09:57:13 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubB10.bdf,v 1.4 2006/01/09 14:57:13 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubB12.bdf diff -u xc/fonts/bdf/100dpi/lubB12.bdf:1.3 xc/fonts/bdf/100dpi/lubB12.bdf:1.4 --- xc/fonts/bdf/100dpi/lubB12.bdf:1.3 Tue Apr 17 19:43:10 2001 +++ xc/fonts/bdf/100dpi/lubB12.bdf Mon Jan 9 09:57:13 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubB12.bdf,v 1.4 2006/01/09 14:57:13 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubB14.bdf diff -u xc/fonts/bdf/100dpi/lubB14.bdf:1.3 xc/fonts/bdf/100dpi/lubB14.bdf:1.4 --- xc/fonts/bdf/100dpi/lubB14.bdf:1.3 Tue Apr 17 19:43:10 2001 +++ xc/fonts/bdf/100dpi/lubB14.bdf Mon Jan 9 09:57:13 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubB14.bdf,v 1.4 2006/01/09 14:57:13 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubB18.bdf diff -u xc/fonts/bdf/100dpi/lubB18.bdf:1.3 xc/fonts/bdf/100dpi/lubB18.bdf:1.4 --- xc/fonts/bdf/100dpi/lubB18.bdf:1.3 Tue Apr 17 19:43:10 2001 +++ xc/fonts/bdf/100dpi/lubB18.bdf Mon Jan 9 09:57:13 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubB18.bdf,v 1.4 2006/01/09 14:57:13 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubB19.bdf diff -u xc/fonts/bdf/100dpi/lubB19.bdf:1.4 xc/fonts/bdf/100dpi/lubB19.bdf:1.5 --- xc/fonts/bdf/100dpi/lubB19.bdf:1.4 Mon Apr 7 12:23:26 2003 +++ xc/fonts/bdf/100dpi/lubB19.bdf Mon Jan 9 09:57:13 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubB19.bdf,v 1.5 2006/01/09 14:57:13 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubB24.bdf diff -u xc/fonts/bdf/100dpi/lubB24.bdf:1.3 xc/fonts/bdf/100dpi/lubB24.bdf:1.4 --- xc/fonts/bdf/100dpi/lubB24.bdf:1.3 Tue Apr 17 19:43:10 2001 +++ xc/fonts/bdf/100dpi/lubB24.bdf Mon Jan 9 09:57:13 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubB24.bdf,v 1.4 2006/01/09 14:57:13 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubBI08.bdf diff -u xc/fonts/bdf/100dpi/lubBI08.bdf:1.3 xc/fonts/bdf/100dpi/lubBI08.bdf:1.4 --- xc/fonts/bdf/100dpi/lubBI08.bdf:1.3 Tue Apr 17 19:43:11 2001 +++ xc/fonts/bdf/100dpi/lubBI08.bdf Mon Jan 9 09:57:13 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubBI08.bdf,v 1.4 2006/01/09 14:57:13 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubBI10.bdf diff -u xc/fonts/bdf/100dpi/lubBI10.bdf:1.3 xc/fonts/bdf/100dpi/lubBI10.bdf:1.4 --- xc/fonts/bdf/100dpi/lubBI10.bdf:1.3 Tue Apr 17 19:43:11 2001 +++ xc/fonts/bdf/100dpi/lubBI10.bdf Mon Jan 9 09:57:13 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubBI10.bdf,v 1.4 2006/01/09 14:57:13 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubBI12.bdf diff -u xc/fonts/bdf/100dpi/lubBI12.bdf:1.3 xc/fonts/bdf/100dpi/lubBI12.bdf:1.4 --- xc/fonts/bdf/100dpi/lubBI12.bdf:1.3 Tue Apr 17 19:43:11 2001 +++ xc/fonts/bdf/100dpi/lubBI12.bdf Mon Jan 9 09:57:14 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubBI12.bdf,v 1.4 2006/01/09 14:57:14 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubBI14.bdf diff -u xc/fonts/bdf/100dpi/lubBI14.bdf:1.3 xc/fonts/bdf/100dpi/lubBI14.bdf:1.4 --- xc/fonts/bdf/100dpi/lubBI14.bdf:1.3 Tue Apr 17 19:43:11 2001 +++ xc/fonts/bdf/100dpi/lubBI14.bdf Mon Jan 9 09:57:14 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubBI14.bdf,v 1.4 2006/01/09 14:57:14 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubBI18.bdf diff -u xc/fonts/bdf/100dpi/lubBI18.bdf:1.3 xc/fonts/bdf/100dpi/lubBI18.bdf:1.4 --- xc/fonts/bdf/100dpi/lubBI18.bdf:1.3 Tue Apr 17 19:43:11 2001 +++ xc/fonts/bdf/100dpi/lubBI18.bdf Mon Jan 9 09:57:14 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubBI18.bdf,v 1.4 2006/01/09 14:57:14 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubBI19.bdf diff -u xc/fonts/bdf/100dpi/lubBI19.bdf:1.4 xc/fonts/bdf/100dpi/lubBI19.bdf:1.5 --- xc/fonts/bdf/100dpi/lubBI19.bdf:1.4 Mon Apr 7 12:23:26 2003 +++ xc/fonts/bdf/100dpi/lubBI19.bdf Mon Jan 9 09:57:14 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubBI19.bdf,v 1.5 2006/01/09 14:57:14 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubBI24.bdf diff -u xc/fonts/bdf/100dpi/lubBI24.bdf:1.3 xc/fonts/bdf/100dpi/lubBI24.bdf:1.4 --- xc/fonts/bdf/100dpi/lubBI24.bdf:1.3 Tue Apr 17 19:43:11 2001 +++ xc/fonts/bdf/100dpi/lubBI24.bdf Mon Jan 9 09:57:14 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubBI24.bdf,v 1.4 2006/01/09 14:57:14 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubI08.bdf diff -u xc/fonts/bdf/100dpi/lubI08.bdf:1.3 xc/fonts/bdf/100dpi/lubI08.bdf:1.4 --- xc/fonts/bdf/100dpi/lubI08.bdf:1.3 Tue Apr 17 19:43:12 2001 +++ xc/fonts/bdf/100dpi/lubI08.bdf Mon Jan 9 09:57:14 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubI08.bdf,v 1.4 2006/01/09 14:57:14 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubI10.bdf diff -u xc/fonts/bdf/100dpi/lubI10.bdf:1.3 xc/fonts/bdf/100dpi/lubI10.bdf:1.4 --- xc/fonts/bdf/100dpi/lubI10.bdf:1.3 Tue Apr 17 19:43:12 2001 +++ xc/fonts/bdf/100dpi/lubI10.bdf Mon Jan 9 09:57:14 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubI10.bdf,v 1.4 2006/01/09 14:57:14 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubI12.bdf diff -u xc/fonts/bdf/100dpi/lubI12.bdf:1.3 xc/fonts/bdf/100dpi/lubI12.bdf:1.4 --- xc/fonts/bdf/100dpi/lubI12.bdf:1.3 Tue Apr 17 19:43:12 2001 +++ xc/fonts/bdf/100dpi/lubI12.bdf Mon Jan 9 09:57:14 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubI12.bdf,v 1.4 2006/01/09 14:57:14 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubI14.bdf diff -u xc/fonts/bdf/100dpi/lubI14.bdf:1.3 xc/fonts/bdf/100dpi/lubI14.bdf:1.4 --- xc/fonts/bdf/100dpi/lubI14.bdf:1.3 Tue Apr 17 19:43:12 2001 +++ xc/fonts/bdf/100dpi/lubI14.bdf Mon Jan 9 09:57:14 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubI14.bdf,v 1.4 2006/01/09 14:57:14 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubI18.bdf diff -u xc/fonts/bdf/100dpi/lubI18.bdf:1.3 xc/fonts/bdf/100dpi/lubI18.bdf:1.4 --- xc/fonts/bdf/100dpi/lubI18.bdf:1.3 Tue Apr 17 19:43:12 2001 +++ xc/fonts/bdf/100dpi/lubI18.bdf Mon Jan 9 09:57:14 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubI18.bdf,v 1.4 2006/01/09 14:57:14 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubI19.bdf diff -u xc/fonts/bdf/100dpi/lubI19.bdf:1.4 xc/fonts/bdf/100dpi/lubI19.bdf:1.5 --- xc/fonts/bdf/100dpi/lubI19.bdf:1.4 Mon Apr 7 12:23:26 2003 +++ xc/fonts/bdf/100dpi/lubI19.bdf Mon Jan 9 09:57:15 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubI19.bdf,v 1.5 2006/01/09 14:57:15 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubI24.bdf diff -u xc/fonts/bdf/100dpi/lubI24.bdf:1.3 xc/fonts/bdf/100dpi/lubI24.bdf:1.4 --- xc/fonts/bdf/100dpi/lubI24.bdf:1.3 Tue Apr 17 19:43:13 2001 +++ xc/fonts/bdf/100dpi/lubI24.bdf Mon Jan 9 09:57:15 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubI24.bdf,v 1.4 2006/01/09 14:57:15 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubR08.bdf diff -u xc/fonts/bdf/100dpi/lubR08.bdf:1.3 xc/fonts/bdf/100dpi/lubR08.bdf:1.4 --- xc/fonts/bdf/100dpi/lubR08.bdf:1.3 Tue Apr 17 19:43:13 2001 +++ xc/fonts/bdf/100dpi/lubR08.bdf Mon Jan 9 09:57:15 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubR08.bdf,v 1.4 2006/01/09 14:57:15 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubR10.bdf diff -u xc/fonts/bdf/100dpi/lubR10.bdf:1.3 xc/fonts/bdf/100dpi/lubR10.bdf:1.4 --- xc/fonts/bdf/100dpi/lubR10.bdf:1.3 Tue Apr 17 19:43:13 2001 +++ xc/fonts/bdf/100dpi/lubR10.bdf Mon Jan 9 09:57:15 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubR10.bdf,v 1.4 2006/01/09 14:57:15 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubR12.bdf diff -u xc/fonts/bdf/100dpi/lubR12.bdf:1.3 xc/fonts/bdf/100dpi/lubR12.bdf:1.4 --- xc/fonts/bdf/100dpi/lubR12.bdf:1.3 Tue Apr 17 19:43:13 2001 +++ xc/fonts/bdf/100dpi/lubR12.bdf Mon Jan 9 09:57:15 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubR12.bdf,v 1.4 2006/01/09 14:57:15 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubR14.bdf diff -u xc/fonts/bdf/100dpi/lubR14.bdf:1.3 xc/fonts/bdf/100dpi/lubR14.bdf:1.4 --- xc/fonts/bdf/100dpi/lubR14.bdf:1.3 Tue Apr 17 19:43:13 2001 +++ xc/fonts/bdf/100dpi/lubR14.bdf Mon Jan 9 09:57:15 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubR14.bdf,v 1.4 2006/01/09 14:57:15 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubR18.bdf diff -u xc/fonts/bdf/100dpi/lubR18.bdf:1.3 xc/fonts/bdf/100dpi/lubR18.bdf:1.4 --- xc/fonts/bdf/100dpi/lubR18.bdf:1.3 Tue Apr 17 19:43:13 2001 +++ xc/fonts/bdf/100dpi/lubR18.bdf Mon Jan 9 09:57:15 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubR18.bdf,v 1.4 2006/01/09 14:57:15 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubR19.bdf diff -u xc/fonts/bdf/100dpi/lubR19.bdf:1.4 xc/fonts/bdf/100dpi/lubR19.bdf:1.5 --- xc/fonts/bdf/100dpi/lubR19.bdf:1.4 Mon Apr 7 12:23:26 2003 +++ xc/fonts/bdf/100dpi/lubR19.bdf Mon Jan 9 09:57:15 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubR19.bdf,v 1.5 2006/01/09 14:57:15 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lubR24.bdf diff -u xc/fonts/bdf/100dpi/lubR24.bdf:1.3 xc/fonts/bdf/100dpi/lubR24.bdf:1.4 --- xc/fonts/bdf/100dpi/lubR24.bdf:1.3 Tue Apr 17 19:43:14 2001 +++ xc/fonts/bdf/100dpi/lubR24.bdf Mon Jan 9 09:57:15 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lubR24.bdf,v 1.4 2006/01/09 14:57:15 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/100dpi/lutBS08.bdf diff -u xc/fonts/bdf/100dpi/lutBS08.bdf:1.2 xc/fonts/bdf/100dpi/lutBS08.bdf:1.3 --- xc/fonts/bdf/100dpi/lutBS08.bdf:1.2 Wed Apr 4 18:55:34 2001 +++ xc/fonts/bdf/100dpi/lutBS08.bdf Mon Jan 9 09:57:16 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutBS08.bdf,v 1.3 2006/01/09 14:57:16 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-11-80-100-100-M-70-ISO10646-1 SIZE 8 100 100 Index: xc/fonts/bdf/100dpi/lutBS10.bdf diff -u xc/fonts/bdf/100dpi/lutBS10.bdf:1.2 xc/fonts/bdf/100dpi/lutBS10.bdf:1.3 --- xc/fonts/bdf/100dpi/lutBS10.bdf:1.2 Wed Apr 4 18:55:34 2001 +++ xc/fonts/bdf/100dpi/lutBS10.bdf Mon Jan 9 09:57:16 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutBS10.bdf,v 1.3 2006/01/09 14:57:16 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-14-100-100-100-M-80-ISO10646-1 SIZE 10 100 100 Index: xc/fonts/bdf/100dpi/lutBS12.bdf diff -u xc/fonts/bdf/100dpi/lutBS12.bdf:1.2 xc/fonts/bdf/100dpi/lutBS12.bdf:1.3 --- xc/fonts/bdf/100dpi/lutBS12.bdf:1.2 Wed Apr 4 18:55:34 2001 +++ xc/fonts/bdf/100dpi/lutBS12.bdf Mon Jan 9 09:57:16 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutBS12.bdf,v 1.3 2006/01/09 14:57:16 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-17-120-100-100-M-100-ISO10646-1 SIZE 12 100 100 Index: xc/fonts/bdf/100dpi/lutBS14.bdf diff -u xc/fonts/bdf/100dpi/lutBS14.bdf:1.2 xc/fonts/bdf/100dpi/lutBS14.bdf:1.3 --- xc/fonts/bdf/100dpi/lutBS14.bdf:1.2 Wed Apr 4 18:55:34 2001 +++ xc/fonts/bdf/100dpi/lutBS14.bdf Mon Jan 9 09:57:16 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutBS14.bdf,v 1.3 2006/01/09 14:57:16 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-20-140-100-100-M-120-ISO10646-1 SIZE 14 100 100 Index: xc/fonts/bdf/100dpi/lutBS18.bdf diff -u xc/fonts/bdf/100dpi/lutBS18.bdf:1.2 xc/fonts/bdf/100dpi/lutBS18.bdf:1.3 --- xc/fonts/bdf/100dpi/lutBS18.bdf:1.2 Wed Apr 4 18:55:34 2001 +++ xc/fonts/bdf/100dpi/lutBS18.bdf Mon Jan 9 09:57:16 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutBS18.bdf,v 1.3 2006/01/09 14:57:16 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-25-180-100-100-M-150-ISO10646-1 SIZE 18 100 100 Index: xc/fonts/bdf/100dpi/lutBS19.bdf diff -u xc/fonts/bdf/100dpi/lutBS19.bdf:1.3 xc/fonts/bdf/100dpi/lutBS19.bdf:1.4 --- xc/fonts/bdf/100dpi/lutBS19.bdf:1.3 Mon Apr 7 12:23:26 2003 +++ xc/fonts/bdf/100dpi/lutBS19.bdf Mon Jan 9 09:57:16 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutBS19.bdf,v 1.4 2006/01/09 14:57:16 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-26-190-100-100-M-159-ISO10646-1 SIZE 19 100 100 Index: xc/fonts/bdf/100dpi/lutBS24.bdf diff -u xc/fonts/bdf/100dpi/lutBS24.bdf:1.2 xc/fonts/bdf/100dpi/lutBS24.bdf:1.3 --- xc/fonts/bdf/100dpi/lutBS24.bdf:1.2 Wed Apr 4 18:55:35 2001 +++ xc/fonts/bdf/100dpi/lutBS24.bdf Mon Jan 9 09:57:16 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutBS24.bdf,v 1.3 2006/01/09 14:57:16 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-34-240-100-100-M-200-ISO10646-1 SIZE 24 100 100 Index: xc/fonts/bdf/100dpi/lutRS08.bdf diff -u xc/fonts/bdf/100dpi/lutRS08.bdf:1.2 xc/fonts/bdf/100dpi/lutRS08.bdf:1.3 --- xc/fonts/bdf/100dpi/lutRS08.bdf:1.2 Wed Apr 4 18:55:35 2001 +++ xc/fonts/bdf/100dpi/lutRS08.bdf Mon Jan 9 09:57:16 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutRS08.bdf,v 1.3 2006/01/09 14:57:16 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-11-80-100-100-M-70-ISO10646-1 SIZE 8 100 100 Index: xc/fonts/bdf/100dpi/lutRS10.bdf diff -u xc/fonts/bdf/100dpi/lutRS10.bdf:1.2 xc/fonts/bdf/100dpi/lutRS10.bdf:1.3 --- xc/fonts/bdf/100dpi/lutRS10.bdf:1.2 Wed Apr 4 18:55:35 2001 +++ xc/fonts/bdf/100dpi/lutRS10.bdf Mon Jan 9 09:57:17 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutRS10.bdf,v 1.3 2006/01/09 14:57:17 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-14-100-100-100-M-80-ISO10646-1 SIZE 10 100 100 Index: xc/fonts/bdf/100dpi/lutRS12.bdf diff -u xc/fonts/bdf/100dpi/lutRS12.bdf:1.2 xc/fonts/bdf/100dpi/lutRS12.bdf:1.3 --- xc/fonts/bdf/100dpi/lutRS12.bdf:1.2 Wed Apr 4 18:55:35 2001 +++ xc/fonts/bdf/100dpi/lutRS12.bdf Mon Jan 9 09:57:17 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutRS12.bdf,v 1.3 2006/01/09 14:57:17 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-17-120-100-100-M-100-ISO10646-1 SIZE 12 100 100 Index: xc/fonts/bdf/100dpi/lutRS14.bdf diff -u xc/fonts/bdf/100dpi/lutRS14.bdf:1.2 xc/fonts/bdf/100dpi/lutRS14.bdf:1.3 --- xc/fonts/bdf/100dpi/lutRS14.bdf:1.2 Wed Apr 4 18:55:36 2001 +++ xc/fonts/bdf/100dpi/lutRS14.bdf Mon Jan 9 09:57:17 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutRS14.bdf,v 1.3 2006/01/09 14:57:17 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-20-140-100-100-M-120-ISO10646-1 SIZE 14 100 100 Index: xc/fonts/bdf/100dpi/lutRS18.bdf diff -u xc/fonts/bdf/100dpi/lutRS18.bdf:1.2 xc/fonts/bdf/100dpi/lutRS18.bdf:1.3 --- xc/fonts/bdf/100dpi/lutRS18.bdf:1.2 Wed Apr 4 18:55:36 2001 +++ xc/fonts/bdf/100dpi/lutRS18.bdf Mon Jan 9 09:57:17 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutRS18.bdf,v 1.3 2006/01/09 14:57:17 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-25-180-100-100-M-150-ISO10646-1 SIZE 18 100 100 Index: xc/fonts/bdf/100dpi/lutRS19.bdf diff -u xc/fonts/bdf/100dpi/lutRS19.bdf:1.3 xc/fonts/bdf/100dpi/lutRS19.bdf:1.4 --- xc/fonts/bdf/100dpi/lutRS19.bdf:1.3 Mon Apr 7 12:23:27 2003 +++ xc/fonts/bdf/100dpi/lutRS19.bdf Mon Jan 9 09:57:17 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutRS19.bdf,v 1.4 2006/01/09 14:57:17 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-26-190-100-100-M-159-ISO10646-1 SIZE 19 100 100 Index: xc/fonts/bdf/100dpi/lutRS24.bdf diff -u xc/fonts/bdf/100dpi/lutRS24.bdf:1.2 xc/fonts/bdf/100dpi/lutRS24.bdf:1.3 --- xc/fonts/bdf/100dpi/lutRS24.bdf:1.2 Wed Apr 4 18:55:36 2001 +++ xc/fonts/bdf/100dpi/lutRS24.bdf Mon Jan 9 09:57:17 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/lutRS24.bdf,v 1.3 2006/01/09 14:57:17 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-34-240-100-100-M-200-ISO10646-1 SIZE 24 100 100 Index: xc/fonts/bdf/100dpi/ncenB08.bdf diff -u xc/fonts/bdf/100dpi/ncenB08.bdf:1.3 xc/fonts/bdf/100dpi/ncenB08.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenB08.bdf:1.3 Tue Apr 17 19:43:14 2001 +++ xc/fonts/bdf/100dpi/ncenB08.bdf Mon Jan 9 09:57:17 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--11-80-100-100-P-66-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 17 19 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenB08.bdf,v 1.4 2006/01/09 14:57:17 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenB10.bdf diff -u xc/fonts/bdf/100dpi/ncenB10.bdf:1.3 xc/fonts/bdf/100dpi/ncenB10.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenB10.bdf:1.3 Tue Apr 17 19:43:14 2001 +++ xc/fonts/bdf/100dpi/ncenB10.bdf Mon Jan 9 09:57:17 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--14-100-100-100-P-87-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 20 25 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenB10.bdf,v 1.4 2006/01/09 14:57:17 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenB12.bdf diff -u xc/fonts/bdf/100dpi/ncenB12.bdf:1.3 xc/fonts/bdf/100dpi/ncenB12.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenB12.bdf:1.3 Tue Apr 17 19:43:14 2001 +++ xc/fonts/bdf/100dpi/ncenB12.bdf Mon Jan 9 09:57:17 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--17-120-100-100-P-99-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 22 27 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenB12.bdf,v 1.4 2006/01/09 14:57:17 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenB14.bdf diff -u xc/fonts/bdf/100dpi/ncenB14.bdf:1.3 xc/fonts/bdf/100dpi/ncenB14.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenB14.bdf:1.3 Tue Apr 17 19:43:15 2001 +++ xc/fonts/bdf/100dpi/ncenB14.bdf Mon Jan 9 09:57:18 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--20-140-100-100-P-113-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 24 32 -3 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenB14.bdf,v 1.4 2006/01/09 14:57:18 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenB18.bdf diff -u xc/fonts/bdf/100dpi/ncenB18.bdf:1.3 xc/fonts/bdf/100dpi/ncenB18.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenB18.bdf:1.3 Tue Apr 17 19:43:15 2001 +++ xc/fonts/bdf/100dpi/ncenB18.bdf Mon Jan 9 09:57:18 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--25-180-100-100-P-149-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 33 40 -4 -10 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenB18.bdf,v 1.4 2006/01/09 14:57:18 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenB24.bdf diff -u xc/fonts/bdf/100dpi/ncenB24.bdf:1.3 xc/fonts/bdf/100dpi/ncenB24.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenB24.bdf:1.3 Tue Apr 17 19:43:15 2001 +++ xc/fonts/bdf/100dpi/ncenB24.bdf Mon Jan 9 09:57:18 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--34-240-100-100-P-193-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 39 53 -4 -13 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenB24.bdf,v 1.4 2006/01/09 14:57:18 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenBI08.bdf diff -u xc/fonts/bdf/100dpi/ncenBI08.bdf:1.3 xc/fonts/bdf/100dpi/ncenBI08.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenBI08.bdf:1.3 Tue Apr 17 19:43:15 2001 +++ xc/fonts/bdf/100dpi/ncenBI08.bdf Mon Jan 9 09:57:18 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--11-80-100-100-P-66-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 17 19 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenBI08.bdf,v 1.4 2006/01/09 14:57:18 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenBI10.bdf diff -u xc/fonts/bdf/100dpi/ncenBI10.bdf:1.3 xc/fonts/bdf/100dpi/ncenBI10.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenBI10.bdf:1.3 Tue Apr 17 19:43:15 2001 +++ xc/fonts/bdf/100dpi/ncenBI10.bdf Mon Jan 9 09:57:18 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--14-100-100-100-P-88-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 21 26 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenBI10.bdf,v 1.4 2006/01/09 14:57:18 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenBI12.bdf diff -u xc/fonts/bdf/100dpi/ncenBI12.bdf:1.3 xc/fonts/bdf/100dpi/ncenBI12.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenBI12.bdf:1.3 Tue Apr 17 19:43:16 2001 +++ xc/fonts/bdf/100dpi/ncenBI12.bdf Mon Jan 9 09:57:18 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--17-120-100-100-P-99-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 23 27 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenBI12.bdf,v 1.4 2006/01/09 14:57:18 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenBI14.bdf diff -u xc/fonts/bdf/100dpi/ncenBI14.bdf:1.3 xc/fonts/bdf/100dpi/ncenBI14.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenBI14.bdf:1.3 Tue Apr 17 19:43:16 2001 +++ xc/fonts/bdf/100dpi/ncenBI14.bdf Mon Jan 9 09:57:18 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--20-140-100-100-P-111-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 26 33 -5 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenBI14.bdf,v 1.4 2006/01/09 14:57:18 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenBI18.bdf diff -u xc/fonts/bdf/100dpi/ncenBI18.bdf:1.3 xc/fonts/bdf/100dpi/ncenBI18.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenBI18.bdf:1.3 Tue Apr 17 19:43:16 2001 +++ xc/fonts/bdf/100dpi/ncenBI18.bdf Mon Jan 9 09:57:18 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--25-180-100-100-P-148-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 34 41 -5 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenBI18.bdf,v 1.4 2006/01/09 14:57:18 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenBI24.bdf diff -u xc/fonts/bdf/100dpi/ncenBI24.bdf:1.3 xc/fonts/bdf/100dpi/ncenBI24.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenBI24.bdf:1.3 Tue Apr 17 19:43:17 2001 +++ xc/fonts/bdf/100dpi/ncenBI24.bdf Mon Jan 9 09:57:19 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--34-240-100-100-P-193-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 45 55 -7 -16 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenBI24.bdf,v 1.4 2006/01/09 14:57:19 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenI08.bdf diff -u xc/fonts/bdf/100dpi/ncenI08.bdf:1.3 xc/fonts/bdf/100dpi/ncenI08.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenI08.bdf:1.3 Tue Apr 17 19:43:17 2001 +++ xc/fonts/bdf/100dpi/ncenI08.bdf Mon Jan 9 09:57:19 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--11-80-100-100-P-60-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 14 19 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenI08.bdf,v 1.4 2006/01/09 14:57:19 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenI10.bdf diff -u xc/fonts/bdf/100dpi/ncenI10.bdf:1.3 xc/fonts/bdf/100dpi/ncenI10.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenI10.bdf:1.3 Tue Apr 17 19:43:17 2001 +++ xc/fonts/bdf/100dpi/ncenI10.bdf Mon Jan 9 09:57:19 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--14-100-100-100-P-81-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 19 26 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenI10.bdf,v 1.4 2006/01/09 14:57:19 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenI12.bdf diff -u xc/fonts/bdf/100dpi/ncenI12.bdf:1.3 xc/fonts/bdf/100dpi/ncenI12.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenI12.bdf:1.3 Tue Apr 17 19:43:18 2001 +++ xc/fonts/bdf/100dpi/ncenI12.bdf Mon Jan 9 09:57:19 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--17-120-100-100-P-92-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 23 27 -4 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenI12.bdf,v 1.4 2006/01/09 14:57:19 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenI14.bdf diff -u xc/fonts/bdf/100dpi/ncenI14.bdf:1.3 xc/fonts/bdf/100dpi/ncenI14.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenI14.bdf:1.3 Tue Apr 17 19:43:18 2001 +++ xc/fonts/bdf/100dpi/ncenI14.bdf Mon Jan 9 09:57:19 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--20-140-100-100-P-104-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 25 31 -2 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenI14.bdf,v 1.4 2006/01/09 14:57:19 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenI18.bdf diff -u xc/fonts/bdf/100dpi/ncenI18.bdf:1.3 xc/fonts/bdf/100dpi/ncenI18.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenI18.bdf:1.3 Tue Apr 17 19:43:18 2001 +++ xc/fonts/bdf/100dpi/ncenI18.bdf Mon Jan 9 09:57:19 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--25-180-100-100-P-136-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 31 39 -4 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenI18.bdf,v 1.4 2006/01/09 14:57:19 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenI24.bdf diff -u xc/fonts/bdf/100dpi/ncenI24.bdf:1.3 xc/fonts/bdf/100dpi/ncenI24.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenI24.bdf:1.3 Tue Apr 17 19:43:18 2001 +++ xc/fonts/bdf/100dpi/ncenI24.bdf Mon Jan 9 09:57:19 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--34-240-100-100-P-182-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 42 54 -7 -15 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenI24.bdf,v 1.4 2006/01/09 14:57:19 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenR08.bdf diff -u xc/fonts/bdf/100dpi/ncenR08.bdf:1.3 xc/fonts/bdf/100dpi/ncenR08.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenR08.bdf:1.3 Tue Apr 17 19:43:19 2001 +++ xc/fonts/bdf/100dpi/ncenR08.bdf Mon Jan 9 09:57:19 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--11-80-100-100-P-60-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 14 18 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenR08.bdf,v 1.4 2006/01/09 14:57:19 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenR10.bdf diff -u xc/fonts/bdf/100dpi/ncenR10.bdf:1.3 xc/fonts/bdf/100dpi/ncenR10.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenR10.bdf:1.3 Tue Apr 17 19:43:19 2001 +++ xc/fonts/bdf/100dpi/ncenR10.bdf Mon Jan 9 09:57:19 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--14-100-100-100-P-82-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 18 24 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenR10.bdf,v 1.4 2006/01/09 14:57:19 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenR12.bdf diff -u xc/fonts/bdf/100dpi/ncenR12.bdf:1.3 xc/fonts/bdf/100dpi/ncenR12.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenR12.bdf:1.3 Tue Apr 17 19:43:19 2001 +++ xc/fonts/bdf/100dpi/ncenR12.bdf Mon Jan 9 09:57:19 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--17-120-100-100-P-91-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 21 26 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenR12.bdf,v 1.4 2006/01/09 14:57:19 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenR14.bdf diff -u xc/fonts/bdf/100dpi/ncenR14.bdf:1.3 xc/fonts/bdf/100dpi/ncenR14.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenR14.bdf:1.3 Tue Apr 17 19:43:20 2001 +++ xc/fonts/bdf/100dpi/ncenR14.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--20-140-100-100-P-103-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 27 30 -4 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenR14.bdf,v 1.4 2006/01/09 14:57:20 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenR18.bdf diff -u xc/fonts/bdf/100dpi/ncenR18.bdf:1.3 xc/fonts/bdf/100dpi/ncenR18.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenR18.bdf:1.3 Tue Apr 17 19:43:20 2001 +++ xc/fonts/bdf/100dpi/ncenR18.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--25-180-100-100-P-136-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 31 37 -3 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenR18.bdf,v 1.4 2006/01/09 14:57:20 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/ncenR24.bdf diff -u xc/fonts/bdf/100dpi/ncenR24.bdf:1.3 xc/fonts/bdf/100dpi/ncenR24.bdf:1.4 --- xc/fonts/bdf/100dpi/ncenR24.bdf:1.3 Tue Apr 17 19:43:20 2001 +++ xc/fonts/bdf/100dpi/ncenR24.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--34-240-100-100-P-181-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 39 50 -6 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/ncenR24.bdf,v 1.4 2006/01/09 14:57:20 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/symb08.bdf diff -u xc/fonts/bdf/100dpi/symb08.bdf:1.1.1.3 xc/fonts/bdf/100dpi/symb08.bdf:1.2 --- xc/fonts/bdf/100dpi/symb08.bdf:1.1.1.3 Tue Jan 16 18:15:45 2001 +++ xc/fonts/bdf/100dpi/symb08.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--11-80-100-100-P-61-Adobe-FontSpecific SIZE 8 100 100 FONTBOUNDINGBOX 11 15 -1 -4 -COMMENT $Xorg: symb08.bdf,v 1.3 2000/08/17 19:43:28 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/symb08.bdf,v 1.2 2006/01/09 14:57:20 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/100dpi/symb10.bdf diff -u xc/fonts/bdf/100dpi/symb10.bdf:1.1.1.3 xc/fonts/bdf/100dpi/symb10.bdf:1.2 --- xc/fonts/bdf/100dpi/symb10.bdf:1.1.1.3 Tue Jan 16 18:15:47 2001 +++ xc/fonts/bdf/100dpi/symb10.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--14-100-100-100-P-85-Adobe-FontSpecific SIZE 10 100 100 FONTBOUNDINGBOX 16 15 -1 -3 -COMMENT $Xorg: symb10.bdf,v 1.3 2000/08/17 19:43:29 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/symb10.bdf,v 1.2 2006/01/09 14:57:20 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/100dpi/symb12.bdf diff -u xc/fonts/bdf/100dpi/symb12.bdf:1.1.1.3 xc/fonts/bdf/100dpi/symb12.bdf:1.2 --- xc/fonts/bdf/100dpi/symb12.bdf:1.1.1.3 Tue Jan 16 18:15:50 2001 +++ xc/fonts/bdf/100dpi/symb12.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--17-120-100-100-P-95-Adobe-FontSpecific SIZE 12 100 100 FONTBOUNDINGBOX 20 17 -3 -4 -COMMENT $Xorg: symb12.bdf,v 1.3 2000/08/17 19:43:29 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/symb12.bdf,v 1.2 2006/01/09 14:57:20 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/100dpi/symb14.bdf diff -u xc/fonts/bdf/100dpi/symb14.bdf:1.1.1.3 xc/fonts/bdf/100dpi/symb14.bdf:1.2 --- xc/fonts/bdf/100dpi/symb14.bdf:1.1.1.3 Tue Jan 16 18:15:52 2001 +++ xc/fonts/bdf/100dpi/symb14.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--20-140-100-100-P-107-Adobe-FontSpecific SIZE 14 100 100 FONTBOUNDINGBOX 20 19 -1 -5 -COMMENT $Xorg: symb14.bdf,v 1.3 2000/08/17 19:43:29 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/symb14.bdf,v 1.2 2006/01/09 14:57:20 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/100dpi/symb18.bdf diff -u xc/fonts/bdf/100dpi/symb18.bdf:1.1.1.3 xc/fonts/bdf/100dpi/symb18.bdf:1.2 --- xc/fonts/bdf/100dpi/symb18.bdf:1.1.1.3 Tue Jan 16 18:15:56 2001 +++ xc/fonts/bdf/100dpi/symb18.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--25-180-100-100-P-142-Adobe-FontSpecific SIZE 18 100 100 FONTBOUNDINGBOX 27 24 -1 -5 -COMMENT $Xorg: symb18.bdf,v 1.3 2000/08/17 19:43:30 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/symb18.bdf,v 1.2 2006/01/09 14:57:20 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/100dpi/symb24.bdf diff -u xc/fonts/bdf/100dpi/symb24.bdf:1.1.1.3 xc/fonts/bdf/100dpi/symb24.bdf:1.2 --- xc/fonts/bdf/100dpi/symb24.bdf:1.1.1.3 Tue Jan 16 18:15:59 2001 +++ xc/fonts/bdf/100dpi/symb24.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--34-240-100-100-P-191-Adobe-FontSpecific SIZE 24 100 100 FONTBOUNDINGBOX 40 34 -5 -7 -COMMENT $Xorg: symb24.bdf,v 1.3 2000/08/17 19:43:30 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/symb24.bdf,v 1.2 2006/01/09 14:57:20 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/100dpi/tech14.bdf diff -u xc/fonts/bdf/100dpi/tech14.bdf:1.1.1.3 xc/fonts/bdf/100dpi/tech14.bdf:1.2 --- xc/fonts/bdf/100dpi/tech14.bdf:1.1.1.3 Tue Jan 16 18:16:03 2001 +++ xc/fonts/bdf/100dpi/tech14.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Bitstream-Terminal-Medium-R-Normal--18-140-100-100-C-110-DEC-DECtech SIZE 14 100 100 FONTBOUNDINGBOX 11 20 0 -5 -COMMENT $Xorg: tech14.bdf,v 1.3 2000/08/17 19:43:30 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/tech14.bdf,v 1.2 2006/01/09 14:57:20 dawes Exp $ COMMENT COMMENT + COMMENT Copyright (c) 1987, 1994 Digital Equipment Corporation Index: xc/fonts/bdf/100dpi/techB14.bdf diff -u xc/fonts/bdf/100dpi/techB14.bdf:1.1.1.3 xc/fonts/bdf/100dpi/techB14.bdf:1.2 --- xc/fonts/bdf/100dpi/techB14.bdf:1.1.1.3 Tue Jan 16 18:16:05 2001 +++ xc/fonts/bdf/100dpi/techB14.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Bitstream-Terminal-Bold-R-Normal--18-140-100-100-C-110-DEC-DECtech SIZE 14 100 100 FONTBOUNDINGBOX 11 20 0 -5 -COMMENT $Xorg: techB14.bdf,v 1.3 2000/08/17 19:43:30 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/techB14.bdf,v 1.2 2006/01/09 14:57:20 dawes Exp $ COMMENT COMMENT + COMMENT Copyright (c) 1987, 1994 Digital Equipment Corporation Index: xc/fonts/bdf/100dpi/term14.bdf diff -u xc/fonts/bdf/100dpi/term14.bdf:1.1.1.3 xc/fonts/bdf/100dpi/term14.bdf:1.2 --- xc/fonts/bdf/100dpi/term14.bdf:1.1.1.3 Tue Jan 16 18:16:08 2001 +++ xc/fonts/bdf/100dpi/term14.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Bitstream-Terminal-Medium-R-Normal--18-140-100-100-C-110-ISO8859-1 SIZE 14 100 100 FONTBOUNDINGBOX 11 20 0 -5 -COMMENT $Xorg: term14.bdf,v 1.3 2000/08/17 19:43:30 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/term14.bdf,v 1.2 2006/01/09 14:57:20 dawes Exp $ COMMENT COMMENT + COMMENT Copyright (c) 1987, 1994 Digital Equipment Corporation Index: xc/fonts/bdf/100dpi/termB14.bdf diff -u xc/fonts/bdf/100dpi/termB14.bdf:1.1.1.3 xc/fonts/bdf/100dpi/termB14.bdf:1.2 --- xc/fonts/bdf/100dpi/termB14.bdf:1.1.1.3 Tue Jan 16 18:16:11 2001 +++ xc/fonts/bdf/100dpi/termB14.bdf Mon Jan 9 09:57:20 2006 @@ -2,7 +2,7 @@ FONT -Bitstream-Terminal-Bold-R-Normal--18-140-100-100-C-110-ISO8859-1 SIZE 14 100 100 FONTBOUNDINGBOX 11 20 0 -5 -COMMENT $Xorg: termB14.bdf,v 1.3 2000/08/17 19:43:30 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/termB14.bdf,v 1.2 2006/01/09 14:57:20 dawes Exp $ COMMENT COMMENT + COMMENT Copyright (c) 1987, 1994 Digital Equipment Corporation Index: xc/fonts/bdf/100dpi/timB08.bdf diff -u xc/fonts/bdf/100dpi/timB08.bdf:1.3 xc/fonts/bdf/100dpi/timB08.bdf:1.4 --- xc/fonts/bdf/100dpi/timB08.bdf:1.3 Tue Apr 17 19:43:21 2001 +++ xc/fonts/bdf/100dpi/timB08.bdf Mon Jan 9 09:57:21 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--11-80-100-100-P-57-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 13 18 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timB08.bdf,v 1.4 2006/01/09 14:57:21 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timB10.bdf diff -u xc/fonts/bdf/100dpi/timB10.bdf:1.3 xc/fonts/bdf/100dpi/timB10.bdf:1.4 --- xc/fonts/bdf/100dpi/timB10.bdf:1.3 Tue Apr 17 19:43:21 2001 +++ xc/fonts/bdf/100dpi/timB10.bdf Mon Jan 9 09:57:21 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--14-100-100-100-P-76-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 17 24 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timB10.bdf,v 1.4 2006/01/09 14:57:21 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timB12.bdf diff -u xc/fonts/bdf/100dpi/timB12.bdf:1.3 xc/fonts/bdf/100dpi/timB12.bdf:1.4 --- xc/fonts/bdf/100dpi/timB12.bdf:1.3 Tue Apr 17 19:43:21 2001 +++ xc/fonts/bdf/100dpi/timB12.bdf Mon Jan 9 09:57:21 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--17-120-100-100-P-88-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 19 27 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timB12.bdf,v 1.4 2006/01/09 14:57:21 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timB14.bdf diff -u xc/fonts/bdf/100dpi/timB14.bdf:1.3 xc/fonts/bdf/100dpi/timB14.bdf:1.4 --- xc/fonts/bdf/100dpi/timB14.bdf:1.3 Tue Apr 17 19:43:21 2001 +++ xc/fonts/bdf/100dpi/timB14.bdf Mon Jan 9 09:57:21 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--20-140-100-100-P-100-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 22 28 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timB14.bdf,v 1.4 2006/01/09 14:57:21 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timB18.bdf diff -u xc/fonts/bdf/100dpi/timB18.bdf:1.3 xc/fonts/bdf/100dpi/timB18.bdf:1.4 --- xc/fonts/bdf/100dpi/timB18.bdf:1.3 Tue Apr 17 19:43:22 2001 +++ xc/fonts/bdf/100dpi/timB18.bdf Mon Jan 9 09:57:21 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--25-180-100-100-P-132-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 27 38 -2 -10 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timB18.bdf,v 1.4 2006/01/09 14:57:21 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timB24.bdf diff -u xc/fonts/bdf/100dpi/timB24.bdf:1.3 xc/fonts/bdf/100dpi/timB24.bdf:1.4 --- xc/fonts/bdf/100dpi/timB24.bdf:1.3 Tue Apr 17 19:43:22 2001 +++ xc/fonts/bdf/100dpi/timB24.bdf Mon Jan 9 09:57:21 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--34-240-100-100-P-177-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 38 49 -5 -12 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timB24.bdf,v 1.4 2006/01/09 14:57:21 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timBI08.bdf diff -u xc/fonts/bdf/100dpi/timBI08.bdf:1.3 xc/fonts/bdf/100dpi/timBI08.bdf:1.4 --- xc/fonts/bdf/100dpi/timBI08.bdf:1.3 Tue Apr 17 19:43:22 2001 +++ xc/fonts/bdf/100dpi/timBI08.bdf Mon Jan 9 09:57:21 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--11-80-100-100-P-57-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 16 18 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timBI08.bdf,v 1.4 2006/01/09 14:57:21 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timBI10.bdf diff -u xc/fonts/bdf/100dpi/timBI10.bdf:1.3 xc/fonts/bdf/100dpi/timBI10.bdf:1.4 --- xc/fonts/bdf/100dpi/timBI10.bdf:1.3 Tue Apr 17 19:43:22 2001 +++ xc/fonts/bdf/100dpi/timBI10.bdf Mon Jan 9 09:57:21 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--14-100-100-100-P-77-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 19 23 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timBI10.bdf,v 1.4 2006/01/09 14:57:21 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timBI12.bdf diff -u xc/fonts/bdf/100dpi/timBI12.bdf:1.3 xc/fonts/bdf/100dpi/timBI12.bdf:1.4 --- xc/fonts/bdf/100dpi/timBI12.bdf:1.3 Tue Apr 17 19:43:23 2001 +++ xc/fonts/bdf/100dpi/timBI12.bdf Mon Jan 9 09:57:21 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--17-120-100-100-P-86-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 21 25 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timBI12.bdf,v 1.4 2006/01/09 14:57:21 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timBI14.bdf diff -u xc/fonts/bdf/100dpi/timBI14.bdf:1.3 xc/fonts/bdf/100dpi/timBI14.bdf:1.4 --- xc/fonts/bdf/100dpi/timBI14.bdf:1.3 Tue Apr 17 19:43:23 2001 +++ xc/fonts/bdf/100dpi/timBI14.bdf Mon Jan 9 09:57:21 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--20-140-100-100-P-98-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 23 31 -3 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timBI14.bdf,v 1.4 2006/01/09 14:57:21 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timBI18.bdf diff -u xc/fonts/bdf/100dpi/timBI18.bdf:1.3 xc/fonts/bdf/100dpi/timBI18.bdf:1.4 --- xc/fonts/bdf/100dpi/timBI18.bdf:1.3 Tue Apr 17 19:43:23 2001 +++ xc/fonts/bdf/100dpi/timBI18.bdf Mon Jan 9 09:57:22 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--25-180-100-100-P-128-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 31 39 -5 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timBI18.bdf,v 1.4 2006/01/09 14:57:22 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timBI24.bdf diff -u xc/fonts/bdf/100dpi/timBI24.bdf:1.3 xc/fonts/bdf/100dpi/timBI24.bdf:1.4 --- xc/fonts/bdf/100dpi/timBI24.bdf:1.3 Tue Apr 17 19:43:24 2001 +++ xc/fonts/bdf/100dpi/timBI24.bdf Mon Jan 9 09:57:22 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--34-240-100-100-P-170-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 41 52 -6 -15 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timBI24.bdf,v 1.4 2006/01/09 14:57:22 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timI08.bdf diff -u xc/fonts/bdf/100dpi/timI08.bdf:1.3 xc/fonts/bdf/100dpi/timI08.bdf:1.4 --- xc/fonts/bdf/100dpi/timI08.bdf:1.3 Tue Apr 17 19:43:24 2001 +++ xc/fonts/bdf/100dpi/timI08.bdf Mon Jan 9 09:57:22 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--11-80-100-100-P-52-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 13 18 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timI08.bdf,v 1.4 2006/01/09 14:57:22 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timI10.bdf diff -u xc/fonts/bdf/100dpi/timI10.bdf:1.3 xc/fonts/bdf/100dpi/timI10.bdf:1.4 --- xc/fonts/bdf/100dpi/timI10.bdf:1.3 Tue Apr 17 19:43:24 2001 +++ xc/fonts/bdf/100dpi/timI10.bdf Mon Jan 9 09:57:22 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--14-100-100-100-P-73-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 19 22 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timI10.bdf,v 1.4 2006/01/09 14:57:22 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timI12.bdf diff -u xc/fonts/bdf/100dpi/timI12.bdf:1.3 xc/fonts/bdf/100dpi/timI12.bdf:1.4 --- xc/fonts/bdf/100dpi/timI12.bdf:1.3 Tue Apr 17 19:43:25 2001 +++ xc/fonts/bdf/100dpi/timI12.bdf Mon Jan 9 09:57:22 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--17-120-100-100-P-84-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 22 26 -4 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timI12.bdf,v 1.4 2006/01/09 14:57:22 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timI14.bdf diff -u xc/fonts/bdf/100dpi/timI14.bdf:1.3 xc/fonts/bdf/100dpi/timI14.bdf:1.4 --- xc/fonts/bdf/100dpi/timI14.bdf:1.3 Tue Apr 17 19:43:25 2001 +++ xc/fonts/bdf/100dpi/timI14.bdf Mon Jan 9 09:57:22 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--20-140-100-100-P-94-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 23 30 -2 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timI14.bdf,v 1.4 2006/01/09 14:57:22 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timI18.bdf diff -u xc/fonts/bdf/100dpi/timI18.bdf:1.3 xc/fonts/bdf/100dpi/timI18.bdf:1.4 --- xc/fonts/bdf/100dpi/timI18.bdf:1.3 Tue Apr 17 19:43:25 2001 +++ xc/fonts/bdf/100dpi/timI18.bdf Mon Jan 9 09:57:22 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--25-180-100-100-P-125-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 31 39 -5 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timI18.bdf,v 1.4 2006/01/09 14:57:22 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timI24.bdf diff -u xc/fonts/bdf/100dpi/timI24.bdf:1.3 xc/fonts/bdf/100dpi/timI24.bdf:1.4 --- xc/fonts/bdf/100dpi/timI24.bdf:1.3 Tue Apr 17 19:43:25 2001 +++ xc/fonts/bdf/100dpi/timI24.bdf Mon Jan 9 09:57:22 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--34-240-100-100-P-168-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 41 52 -6 -15 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timI24.bdf,v 1.4 2006/01/09 14:57:22 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timR08.bdf diff -u xc/fonts/bdf/100dpi/timR08.bdf:1.3 xc/fonts/bdf/100dpi/timR08.bdf:1.4 --- xc/fonts/bdf/100dpi/timR08.bdf:1.3 Tue Apr 17 19:43:25 2001 +++ xc/fonts/bdf/100dpi/timR08.bdf Mon Jan 9 09:57:22 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--11-80-100-100-P-54-ISO10646-1 SIZE 8 100 100 FONTBOUNDINGBOX 12 17 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timR08.bdf,v 1.4 2006/01/09 14:57:22 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timR10.bdf diff -u xc/fonts/bdf/100dpi/timR10.bdf:1.3 xc/fonts/bdf/100dpi/timR10.bdf:1.4 --- xc/fonts/bdf/100dpi/timR10.bdf:1.3 Tue Apr 17 19:43:26 2001 +++ xc/fonts/bdf/100dpi/timR10.bdf Mon Jan 9 09:57:23 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--14-100-100-100-P-74-ISO10646-1 SIZE 10 100 100 FONTBOUNDINGBOX 17 24 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timR10.bdf,v 1.4 2006/01/09 14:57:23 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timR12.bdf diff -u xc/fonts/bdf/100dpi/timR12.bdf:1.3 xc/fonts/bdf/100dpi/timR12.bdf:1.4 --- xc/fonts/bdf/100dpi/timR12.bdf:1.3 Tue Apr 17 19:43:26 2001 +++ xc/fonts/bdf/100dpi/timR12.bdf Mon Jan 9 09:57:23 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--17-120-100-100-P-84-ISO10646-1 SIZE 12 100 100 FONTBOUNDINGBOX 19 26 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timR12.bdf,v 1.4 2006/01/09 14:57:23 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timR14.bdf diff -u xc/fonts/bdf/100dpi/timR14.bdf:1.3 xc/fonts/bdf/100dpi/timR14.bdf:1.4 --- xc/fonts/bdf/100dpi/timR14.bdf:1.3 Tue Apr 17 19:43:26 2001 +++ xc/fonts/bdf/100dpi/timR14.bdf Mon Jan 9 09:57:23 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--20-140-100-100-P-96-ISO10646-1 SIZE 14 100 100 FONTBOUNDINGBOX 22 29 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timR14.bdf,v 1.4 2006/01/09 14:57:23 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timR18.bdf diff -u xc/fonts/bdf/100dpi/timR18.bdf:1.3 xc/fonts/bdf/100dpi/timR18.bdf:1.4 --- xc/fonts/bdf/100dpi/timR18.bdf:1.3 Tue Apr 17 19:43:27 2001 +++ xc/fonts/bdf/100dpi/timR18.bdf Mon Jan 9 09:57:23 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--25-180-100-100-P-125-ISO10646-1 SIZE 18 100 100 FONTBOUNDINGBOX 29 37 -4 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timR18.bdf,v 1.4 2006/01/09 14:57:23 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/100dpi/timR24.bdf diff -u xc/fonts/bdf/100dpi/timR24.bdf:1.3 xc/fonts/bdf/100dpi/timR24.bdf:1.4 --- xc/fonts/bdf/100dpi/timR24.bdf:1.3 Tue Apr 17 19:43:27 2001 +++ xc/fonts/bdf/100dpi/timR24.bdf Mon Jan 9 09:57:23 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--34-240-100-100-P-170-ISO10646-1 SIZE 24 100 100 FONTBOUNDINGBOX 38 48 -5 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/100dpi/timR24.bdf,v 1.4 2006/01/09 14:57:23 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/Imakefile diff -u xc/fonts/bdf/75dpi/Imakefile:1.8 xc/fonts/bdf/75dpi/Imakefile:1.9 --- xc/fonts/bdf/75dpi/Imakefile:1.8 Mon May 31 20:16:55 2004 +++ xc/fonts/bdf/75dpi/Imakefile Fri Mar 17 20:34:23 2006 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/fonts/bdf/75dpi/Imakefile,v 1.8 2004/06/01 00:16:55 dawes Exp $ +XCOMM $XFree86: xc/fonts/bdf/75dpi/Imakefile,v 1.9 2006/03/18 01:34:23 dawes Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -63,4 +63,5 @@ InstallFontObjs($(OBJS2),$(FONTINSTDIR)) InstallFontAliases($(FONTINSTDIR)) InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) +InstallFcCache($(FONTINSTDIR)) Index: xc/fonts/bdf/75dpi/UTBI__10.bdf diff -u xc/fonts/bdf/75dpi/UTBI__10.bdf:1.3 xc/fonts/bdf/75dpi/UTBI__10.bdf:1.4 --- xc/fonts/bdf/75dpi/UTBI__10.bdf:1.3 Tue Apr 17 17:54:38 2001 +++ xc/fonts/bdf/75dpi/UTBI__10.bdf Mon Jan 9 09:57:30 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-I-Normal--10-100-75-75-P-58-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 15 18 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTBI__10.bdf,v 1.4 2006/01/09 14:57:30 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTBI__12.bdf diff -u xc/fonts/bdf/75dpi/UTBI__12.bdf:1.3 xc/fonts/bdf/75dpi/UTBI__12.bdf:1.4 --- xc/fonts/bdf/75dpi/UTBI__12.bdf:1.3 Tue Apr 17 17:54:38 2001 +++ xc/fonts/bdf/75dpi/UTBI__12.bdf Mon Jan 9 09:57:30 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-I-Normal--12-120-75-75-P-70-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 19 22 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTBI__12.bdf,v 1.4 2006/01/09 14:57:30 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTBI__14.bdf diff -u xc/fonts/bdf/75dpi/UTBI__14.bdf:1.3 xc/fonts/bdf/75dpi/UTBI__14.bdf:1.4 --- xc/fonts/bdf/75dpi/UTBI__14.bdf:1.3 Tue Apr 17 17:54:39 2001 +++ xc/fonts/bdf/75dpi/UTBI__14.bdf Mon Jan 9 09:57:30 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-I-Normal--15-140-75-75-P-82-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 20 23 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTBI__14.bdf,v 1.4 2006/01/09 14:57:30 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTBI__18.bdf diff -u xc/fonts/bdf/75dpi/UTBI__18.bdf:1.3 xc/fonts/bdf/75dpi/UTBI__18.bdf:1.4 --- xc/fonts/bdf/75dpi/UTBI__18.bdf:1.3 Tue Apr 17 17:54:39 2001 +++ xc/fonts/bdf/75dpi/UTBI__18.bdf Mon Jan 9 09:57:30 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-I-Normal--19-180-75-75-P-105-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 28 28 -4 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTBI__18.bdf,v 1.4 2006/01/09 14:57:30 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTBI__24.bdf diff -u xc/fonts/bdf/75dpi/UTBI__24.bdf:1.3 xc/fonts/bdf/75dpi/UTBI__24.bdf:1.4 --- xc/fonts/bdf/75dpi/UTBI__24.bdf:1.3 Tue Apr 17 17:54:39 2001 +++ xc/fonts/bdf/75dpi/UTBI__24.bdf Mon Jan 9 09:57:30 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-I-Normal--25-240-75-75-P-140-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 37 40 -5 -12 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTBI__24.bdf,v 1.4 2006/01/09 14:57:30 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTB___10.bdf diff -u xc/fonts/bdf/75dpi/UTB___10.bdf:1.3 xc/fonts/bdf/75dpi/UTB___10.bdf:1.4 --- xc/fonts/bdf/75dpi/UTB___10.bdf:1.3 Tue Apr 17 17:54:40 2001 +++ xc/fonts/bdf/75dpi/UTB___10.bdf Mon Jan 9 09:57:31 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-R-Normal--10-100-75-75-P-59-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 14 18 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTB___10.bdf,v 1.4 2006/01/09 14:57:31 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTB___12.bdf diff -u xc/fonts/bdf/75dpi/UTB___12.bdf:1.3 xc/fonts/bdf/75dpi/UTB___12.bdf:1.4 --- xc/fonts/bdf/75dpi/UTB___12.bdf:1.3 Tue Apr 17 17:54:40 2001 +++ xc/fonts/bdf/75dpi/UTB___12.bdf Mon Jan 9 09:57:31 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-R-Normal--12-120-75-75-P-70-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 17 21 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTB___12.bdf,v 1.4 2006/01/09 14:57:31 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTB___14.bdf diff -u xc/fonts/bdf/75dpi/UTB___14.bdf:1.3 xc/fonts/bdf/75dpi/UTB___14.bdf:1.4 --- xc/fonts/bdf/75dpi/UTB___14.bdf:1.3 Tue Apr 17 17:54:40 2001 +++ xc/fonts/bdf/75dpi/UTB___14.bdf Mon Jan 9 09:57:31 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-R-Normal--15-140-75-75-P-82-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 20 22 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTB___14.bdf,v 1.4 2006/01/09 14:57:31 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTB___18.bdf diff -u xc/fonts/bdf/75dpi/UTB___18.bdf:1.3 xc/fonts/bdf/75dpi/UTB___18.bdf:1.4 --- xc/fonts/bdf/75dpi/UTB___18.bdf:1.3 Tue Apr 17 17:54:41 2001 +++ xc/fonts/bdf/75dpi/UTB___18.bdf Mon Jan 9 09:57:31 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-R-Normal--19-180-75-75-P-105-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 26 28 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTB___18.bdf,v 1.4 2006/01/09 14:57:31 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTB___24.bdf diff -u xc/fonts/bdf/75dpi/UTB___24.bdf:1.3 xc/fonts/bdf/75dpi/UTB___24.bdf:1.4 --- xc/fonts/bdf/75dpi/UTB___24.bdf:1.3 Tue Apr 17 17:54:41 2001 +++ xc/fonts/bdf/75dpi/UTB___24.bdf Mon Jan 9 09:57:31 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Bold-R-Normal--25-240-75-75-P-140-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 35 38 -4 -10 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTB___24.bdf,v 1.4 2006/01/09 14:57:31 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTI___10.bdf diff -u xc/fonts/bdf/75dpi/UTI___10.bdf:1.3 xc/fonts/bdf/75dpi/UTI___10.bdf:1.4 --- xc/fonts/bdf/75dpi/UTI___10.bdf:1.3 Tue Apr 17 19:43:45 2001 +++ xc/fonts/bdf/75dpi/UTI___10.bdf Mon Jan 9 09:57:31 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-I-Normal--10-100-75-75-P-55-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 14 18 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTI___10.bdf,v 1.4 2006/01/09 14:57:31 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTI___12.bdf diff -u xc/fonts/bdf/75dpi/UTI___12.bdf:1.3 xc/fonts/bdf/75dpi/UTI___12.bdf:1.4 --- xc/fonts/bdf/75dpi/UTI___12.bdf:1.3 Tue Apr 17 19:43:45 2001 +++ xc/fonts/bdf/75dpi/UTI___12.bdf Mon Jan 9 09:57:32 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-I-Normal--12-120-75-75-P-67-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 16 22 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTI___12.bdf,v 1.4 2006/01/09 14:57:32 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTI___14.bdf diff -u xc/fonts/bdf/75dpi/UTI___14.bdf:1.3 xc/fonts/bdf/75dpi/UTI___14.bdf:1.4 --- xc/fonts/bdf/75dpi/UTI___14.bdf:1.3 Tue Apr 17 19:43:45 2001 +++ xc/fonts/bdf/75dpi/UTI___14.bdf Mon Jan 9 09:57:32 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-I-Normal--15-140-75-75-P-79-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 21 23 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTI___14.bdf,v 1.4 2006/01/09 14:57:32 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTI___18.bdf diff -u xc/fonts/bdf/75dpi/UTI___18.bdf:1.3 xc/fonts/bdf/75dpi/UTI___18.bdf:1.4 --- xc/fonts/bdf/75dpi/UTI___18.bdf:1.3 Tue Apr 17 19:43:46 2001 +++ xc/fonts/bdf/75dpi/UTI___18.bdf Mon Jan 9 09:57:32 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-I-Normal--19-180-75-75-P-100-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 25 28 -4 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTI___18.bdf,v 1.4 2006/01/09 14:57:32 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTI___24.bdf diff -u xc/fonts/bdf/75dpi/UTI___24.bdf:1.3 xc/fonts/bdf/75dpi/UTI___24.bdf:1.4 --- xc/fonts/bdf/75dpi/UTI___24.bdf:1.3 Tue Apr 17 19:43:46 2001 +++ xc/fonts/bdf/75dpi/UTI___24.bdf Mon Jan 9 09:57:32 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-I-Normal--25-240-75-75-P-133-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 33 39 -6 -12 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTI___24.bdf,v 1.4 2006/01/09 14:57:32 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTRG__10.bdf diff -u xc/fonts/bdf/75dpi/UTRG__10.bdf:1.3 xc/fonts/bdf/75dpi/UTRG__10.bdf:1.4 --- xc/fonts/bdf/75dpi/UTRG__10.bdf:1.3 Tue Apr 17 19:43:47 2001 +++ xc/fonts/bdf/75dpi/UTRG__10.bdf Mon Jan 9 09:57:32 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-R-Normal--10-100-75-75-P-56-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 13 17 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTRG__10.bdf,v 1.4 2006/01/09 14:57:32 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTRG__12.bdf diff -u xc/fonts/bdf/75dpi/UTRG__12.bdf:1.3 xc/fonts/bdf/75dpi/UTRG__12.bdf:1.4 --- xc/fonts/bdf/75dpi/UTRG__12.bdf:1.3 Tue Apr 17 19:43:47 2001 +++ xc/fonts/bdf/75dpi/UTRG__12.bdf Mon Jan 9 09:57:32 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-R-Normal--12-120-75-75-P-67-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 16 20 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTRG__12.bdf,v 1.4 2006/01/09 14:57:32 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTRG__14.bdf diff -u xc/fonts/bdf/75dpi/UTRG__14.bdf:1.3 xc/fonts/bdf/75dpi/UTRG__14.bdf:1.4 --- xc/fonts/bdf/75dpi/UTRG__14.bdf:1.3 Tue Apr 17 19:43:47 2001 +++ xc/fonts/bdf/75dpi/UTRG__14.bdf Mon Jan 9 09:57:33 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-R-Normal--15-140-75-75-P-79-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 19 22 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTRG__14.bdf,v 1.4 2006/01/09 14:57:33 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTRG__18.bdf diff -u xc/fonts/bdf/75dpi/UTRG__18.bdf:1.3 xc/fonts/bdf/75dpi/UTRG__18.bdf:1.4 --- xc/fonts/bdf/75dpi/UTRG__18.bdf:1.3 Tue Apr 17 19:43:47 2001 +++ xc/fonts/bdf/75dpi/UTRG__18.bdf Mon Jan 9 09:57:33 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-R-Normal--19-180-75-75-P-101-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 24 26 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTRG__18.bdf,v 1.4 2006/01/09 14:57:33 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/UTRG__24.bdf diff -u xc/fonts/bdf/75dpi/UTRG__24.bdf:1.3 xc/fonts/bdf/75dpi/UTRG__24.bdf:1.4 --- xc/fonts/bdf/75dpi/UTRG__24.bdf:1.3 Tue Apr 17 19:43:47 2001 +++ xc/fonts/bdf/75dpi/UTRG__24.bdf Mon Jan 9 09:57:33 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Utopia-Regular-R-Normal--25-240-75-75-P-135-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 32 37 -4 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/UTRG__24.bdf,v 1.4 2006/01/09 14:57:33 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 STARTPROPERTIES 28 FOUNDRY "Adobe" Index: xc/fonts/bdf/75dpi/charI08.bdf diff -u xc/fonts/bdf/75dpi/charI08.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charI08.bdf:1.2 --- xc/fonts/bdf/75dpi/charI08.bdf:1.1.1.2 Tue Jan 16 18:17:59 2001 +++ xc/fonts/bdf/75dpi/charI08.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI08.bdf,v 1.3 2000/08/17 19:43:38 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charI08.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charI10.bdf diff -u xc/fonts/bdf/75dpi/charI10.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charI10.bdf:1.2 --- xc/fonts/bdf/75dpi/charI10.bdf:1.1.1.2 Tue Jan 16 18:18:01 2001 +++ xc/fonts/bdf/75dpi/charI10.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI10.bdf,v 1.3 2000/08/17 19:43:38 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charI10.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charI12.bdf diff -u xc/fonts/bdf/75dpi/charI12.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charI12.bdf:1.2 --- xc/fonts/bdf/75dpi/charI12.bdf:1.1.1.2 Tue Jan 16 18:18:03 2001 +++ xc/fonts/bdf/75dpi/charI12.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI12.bdf,v 1.3 2000/08/17 19:43:38 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charI12.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charI14.bdf diff -u xc/fonts/bdf/75dpi/charI14.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charI14.bdf:1.2 --- xc/fonts/bdf/75dpi/charI14.bdf:1.1.1.2 Tue Jan 16 18:18:06 2001 +++ xc/fonts/bdf/75dpi/charI14.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI14.bdf,v 1.3 2000/08/17 19:43:38 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charI14.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charI18.bdf diff -u xc/fonts/bdf/75dpi/charI18.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charI18.bdf:1.2 --- xc/fonts/bdf/75dpi/charI18.bdf:1.1.1.2 Tue Jan 16 18:18:09 2001 +++ xc/fonts/bdf/75dpi/charI18.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI18.bdf,v 1.3 2000/08/17 19:43:39 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charI18.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charI24.bdf diff -u xc/fonts/bdf/75dpi/charI24.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charI24.bdf:1.2 --- xc/fonts/bdf/75dpi/charI24.bdf:1.1.1.2 Tue Jan 16 18:18:12 2001 +++ xc/fonts/bdf/75dpi/charI24.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charI24.bdf,v 1.3 2000/08/17 19:43:39 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charI24.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charR08.bdf diff -u xc/fonts/bdf/75dpi/charR08.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charR08.bdf:1.2 --- xc/fonts/bdf/75dpi/charR08.bdf:1.1.1.2 Tue Jan 16 18:18:15 2001 +++ xc/fonts/bdf/75dpi/charR08.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR08.bdf,v 1.3 2000/08/17 19:43:39 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charR08.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charR10.bdf diff -u xc/fonts/bdf/75dpi/charR10.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charR10.bdf:1.2 --- xc/fonts/bdf/75dpi/charR10.bdf:1.1.1.2 Tue Jan 16 18:18:17 2001 +++ xc/fonts/bdf/75dpi/charR10.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR10.bdf,v 1.3 2000/08/17 19:43:39 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charR10.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charR12.bdf diff -u xc/fonts/bdf/75dpi/charR12.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charR12.bdf:1.2 --- xc/fonts/bdf/75dpi/charR12.bdf:1.1.1.2 Tue Jan 16 18:18:20 2001 +++ xc/fonts/bdf/75dpi/charR12.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR12.bdf,v 1.3 2000/08/17 19:43:39 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charR12.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charR14.bdf diff -u xc/fonts/bdf/75dpi/charR14.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charR14.bdf:1.2 --- xc/fonts/bdf/75dpi/charR14.bdf:1.1.1.2 Tue Jan 16 18:18:23 2001 +++ xc/fonts/bdf/75dpi/charR14.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR14.bdf,v 1.3 2000/08/17 19:43:40 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charR14.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charR18.bdf diff -u xc/fonts/bdf/75dpi/charR18.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charR18.bdf:1.2 --- xc/fonts/bdf/75dpi/charR18.bdf:1.1.1.2 Tue Jan 16 18:18:25 2001 +++ xc/fonts/bdf/75dpi/charR18.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR18.bdf,v 1.3 2000/08/17 19:43:40 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charR18.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/charR24.bdf diff -u xc/fonts/bdf/75dpi/charR24.bdf:1.1.1.2 xc/fonts/bdf/75dpi/charR24.bdf:1.2 --- xc/fonts/bdf/75dpi/charR24.bdf:1.1.1.2 Tue Jan 16 18:18:28 2001 +++ xc/fonts/bdf/75dpi/charR24.bdf Mon Jan 9 09:57:33 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: charR24.bdf,v 1.3 2000/08/17 19:43:40 cpqbld Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/charR24.bdf,v 1.2 2006/01/09 14:57:33 dawes Exp $ COMMENT COMMENT Copyright 1988 Bitstream, Inc., Cambridge, Massachusetts, USA COMMENT Bitstream and Charter are registered trademarks of Bitstream, Inc. Index: xc/fonts/bdf/75dpi/courB08.bdf diff -u xc/fonts/bdf/75dpi/courB08.bdf:1.2 xc/fonts/bdf/75dpi/courB08.bdf:1.3 --- xc/fonts/bdf/75dpi/courB08.bdf:1.2 Wed Apr 4 18:56:11 2001 +++ xc/fonts/bdf/75dpi/courB08.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--8-80-75-75-M-50-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 8 15 -1 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courB08.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courB10.bdf diff -u xc/fonts/bdf/75dpi/courB10.bdf:1.2 xc/fonts/bdf/75dpi/courB10.bdf:1.3 --- xc/fonts/bdf/75dpi/courB10.bdf:1.2 Wed Apr 4 18:56:11 2001 +++ xc/fonts/bdf/75dpi/courB10.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--10-100-75-75-M-60-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 11 16 -3 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courB10.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courB12.bdf diff -u xc/fonts/bdf/75dpi/courB12.bdf:1.2 xc/fonts/bdf/75dpi/courB12.bdf:1.3 --- xc/fonts/bdf/75dpi/courB12.bdf:1.2 Wed Apr 4 18:56:11 2001 +++ xc/fonts/bdf/75dpi/courB12.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--12-120-75-75-M-70-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 11 20 -1 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courB12.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courB14.bdf diff -u xc/fonts/bdf/75dpi/courB14.bdf:1.2 xc/fonts/bdf/75dpi/courB14.bdf:1.3 --- xc/fonts/bdf/75dpi/courB14.bdf:1.2 Wed Apr 4 18:56:11 2001 +++ xc/fonts/bdf/75dpi/courB14.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--14-140-75-75-M-90-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 13 21 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courB14.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courB18.bdf diff -u xc/fonts/bdf/75dpi/courB18.bdf:1.2 xc/fonts/bdf/75dpi/courB18.bdf:1.3 --- xc/fonts/bdf/75dpi/courB18.bdf:1.2 Wed Apr 4 18:56:11 2001 +++ xc/fonts/bdf/75dpi/courB18.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--18-180-75-75-M-110-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 18 26 -4 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courB18.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courB24.bdf diff -u xc/fonts/bdf/75dpi/courB24.bdf:1.2 xc/fonts/bdf/75dpi/courB24.bdf:1.3 --- xc/fonts/bdf/75dpi/courB24.bdf:1.2 Wed Apr 4 18:56:11 2001 +++ xc/fonts/bdf/75dpi/courB24.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-R-Normal--24-240-75-75-M-150-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 22 34 -4 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courB24.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courBO08.bdf diff -u xc/fonts/bdf/75dpi/courBO08.bdf:1.2 xc/fonts/bdf/75dpi/courBO08.bdf:1.3 --- xc/fonts/bdf/75dpi/courBO08.bdf:1.2 Wed Apr 4 18:56:12 2001 +++ xc/fonts/bdf/75dpi/courBO08.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--8-80-75-75-M-50-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 8 15 -1 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courBO08.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courBO10.bdf diff -u xc/fonts/bdf/75dpi/courBO10.bdf:1.2 xc/fonts/bdf/75dpi/courBO10.bdf:1.3 --- xc/fonts/bdf/75dpi/courBO10.bdf:1.2 Wed Apr 4 18:56:12 2001 +++ xc/fonts/bdf/75dpi/courBO10.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--10-100-75-75-M-60-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 13 16 -3 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courBO10.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courBO12.bdf diff -u xc/fonts/bdf/75dpi/courBO12.bdf:1.2 xc/fonts/bdf/75dpi/courBO12.bdf:1.3 --- xc/fonts/bdf/75dpi/courBO12.bdf:1.2 Wed Apr 4 18:56:12 2001 +++ xc/fonts/bdf/75dpi/courBO12.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--12-120-75-75-M-70-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 14 20 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courBO12.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courBO14.bdf diff -u xc/fonts/bdf/75dpi/courBO14.bdf:1.2 xc/fonts/bdf/75dpi/courBO14.bdf:1.3 --- xc/fonts/bdf/75dpi/courBO14.bdf:1.2 Wed Apr 4 18:56:12 2001 +++ xc/fonts/bdf/75dpi/courBO14.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--14-140-75-75-M-90-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 16 21 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courBO14.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courBO18.bdf diff -u xc/fonts/bdf/75dpi/courBO18.bdf:1.2 xc/fonts/bdf/75dpi/courBO18.bdf:1.3 --- xc/fonts/bdf/75dpi/courBO18.bdf:1.2 Wed Apr 4 18:56:12 2001 +++ xc/fonts/bdf/75dpi/courBO18.bdf Mon Jan 9 09:57:34 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--18-180-75-75-M-110-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 21 26 -5 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courBO18.bdf,v 1.3 2006/01/09 14:57:34 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courBO24.bdf diff -u xc/fonts/bdf/75dpi/courBO24.bdf:1.2 xc/fonts/bdf/75dpi/courBO24.bdf:1.3 --- xc/fonts/bdf/75dpi/courBO24.bdf:1.2 Wed Apr 4 18:56:12 2001 +++ xc/fonts/bdf/75dpi/courBO24.bdf Mon Jan 9 09:57:35 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Bold-O-Normal--24-240-75-75-M-150-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 28 33 -6 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courBO24.bdf,v 1.3 2006/01/09 14:57:35 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courO08.bdf diff -u xc/fonts/bdf/75dpi/courO08.bdf:1.2 xc/fonts/bdf/75dpi/courO08.bdf:1.3 --- xc/fonts/bdf/75dpi/courO08.bdf:1.2 Wed Apr 4 18:56:12 2001 +++ xc/fonts/bdf/75dpi/courO08.bdf Mon Jan 9 09:57:35 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--8-80-75-75-M-50-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 8 15 -1 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courO08.bdf,v 1.3 2006/01/09 14:57:35 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courO10.bdf diff -u xc/fonts/bdf/75dpi/courO10.bdf:1.2 xc/fonts/bdf/75dpi/courO10.bdf:1.3 --- xc/fonts/bdf/75dpi/courO10.bdf:1.2 Wed Apr 4 18:56:12 2001 +++ xc/fonts/bdf/75dpi/courO10.bdf Mon Jan 9 09:57:35 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--10-100-75-75-M-60-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 12 16 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courO10.bdf,v 1.3 2006/01/09 14:57:35 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courO12.bdf diff -u xc/fonts/bdf/75dpi/courO12.bdf:1.2 xc/fonts/bdf/75dpi/courO12.bdf:1.3 --- xc/fonts/bdf/75dpi/courO12.bdf:1.2 Wed Apr 4 18:56:12 2001 +++ xc/fonts/bdf/75dpi/courO12.bdf Mon Jan 9 09:57:35 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--12-120-75-75-M-70-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 14 19 -4 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courO12.bdf,v 1.3 2006/01/09 14:57:35 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courO14.bdf diff -u xc/fonts/bdf/75dpi/courO14.bdf:1.2 xc/fonts/bdf/75dpi/courO14.bdf:1.3 --- xc/fonts/bdf/75dpi/courO14.bdf:1.2 Wed Apr 4 18:56:13 2001 +++ xc/fonts/bdf/75dpi/courO14.bdf Mon Jan 9 09:57:35 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--14-140-75-75-M-90-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 16 21 -4 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courO14.bdf,v 1.3 2006/01/09 14:57:35 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courO18.bdf diff -u xc/fonts/bdf/75dpi/courO18.bdf:1.2 xc/fonts/bdf/75dpi/courO18.bdf:1.3 --- xc/fonts/bdf/75dpi/courO18.bdf:1.2 Wed Apr 4 18:56:13 2001 +++ xc/fonts/bdf/75dpi/courO18.bdf Mon Jan 9 09:57:35 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--18-180-75-75-M-110-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 20 26 -4 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courO18.bdf,v 1.3 2006/01/09 14:57:35 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courO24.bdf diff -u xc/fonts/bdf/75dpi/courO24.bdf:1.2 xc/fonts/bdf/75dpi/courO24.bdf:1.3 --- xc/fonts/bdf/75dpi/courO24.bdf:1.2 Wed Apr 4 18:56:13 2001 +++ xc/fonts/bdf/75dpi/courO24.bdf Mon Jan 9 09:57:35 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-O-Normal--24-240-75-75-M-150-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 26 32 -4 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courO24.bdf,v 1.3 2006/01/09 14:57:35 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courR08.bdf diff -u xc/fonts/bdf/75dpi/courR08.bdf:1.2 xc/fonts/bdf/75dpi/courR08.bdf:1.3 --- xc/fonts/bdf/75dpi/courR08.bdf:1.2 Wed Apr 4 18:56:13 2001 +++ xc/fonts/bdf/75dpi/courR08.bdf Mon Jan 9 09:57:35 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--8-80-75-75-M-50-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 8 15 -1 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courR08.bdf,v 1.3 2006/01/09 14:57:35 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courR10.bdf diff -u xc/fonts/bdf/75dpi/courR10.bdf:1.2 xc/fonts/bdf/75dpi/courR10.bdf:1.3 --- xc/fonts/bdf/75dpi/courR10.bdf:1.2 Wed Apr 4 18:56:13 2001 +++ xc/fonts/bdf/75dpi/courR10.bdf Mon Jan 9 09:57:35 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--10-100-75-75-M-60-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 10 16 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courR10.bdf,v 1.3 2006/01/09 14:57:35 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courR12.bdf diff -u xc/fonts/bdf/75dpi/courR12.bdf:1.2 xc/fonts/bdf/75dpi/courR12.bdf:1.3 --- xc/fonts/bdf/75dpi/courR12.bdf:1.2 Wed Apr 4 18:56:13 2001 +++ xc/fonts/bdf/75dpi/courR12.bdf Mon Jan 9 09:57:36 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--12-120-75-75-M-70-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 11 19 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courR12.bdf,v 1.3 2006/01/09 14:57:36 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courR14.bdf diff -u xc/fonts/bdf/75dpi/courR14.bdf:1.2 xc/fonts/bdf/75dpi/courR14.bdf:1.3 --- xc/fonts/bdf/75dpi/courR14.bdf:1.2 Wed Apr 4 18:56:14 2001 +++ xc/fonts/bdf/75dpi/courR14.bdf Mon Jan 9 09:57:36 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--14-140-75-75-M-90-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 14 21 -3 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courR14.bdf,v 1.3 2006/01/09 14:57:36 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courR18.bdf diff -u xc/fonts/bdf/75dpi/courR18.bdf:1.2 xc/fonts/bdf/75dpi/courR18.bdf:1.3 --- xc/fonts/bdf/75dpi/courR18.bdf:1.2 Wed Apr 4 18:56:14 2001 +++ xc/fonts/bdf/75dpi/courR18.bdf Mon Jan 9 09:57:36 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--18-180-75-75-M-110-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 16 26 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courR18.bdf,v 1.3 2006/01/09 14:57:36 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/courR24.bdf diff -u xc/fonts/bdf/75dpi/courR24.bdf:1.2 xc/fonts/bdf/75dpi/courR24.bdf:1.3 --- xc/fonts/bdf/75dpi/courR24.bdf:1.2 Wed Apr 4 18:56:14 2001 +++ xc/fonts/bdf/75dpi/courR24.bdf Mon Jan 9 09:57:36 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Courier-Medium-R-Normal--24-240-75-75-M-150-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 23 32 -5 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/courR24.bdf,v 1.3 2006/01/09 14:57:36 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvB08.bdf diff -u xc/fonts/bdf/75dpi/helvB08.bdf:1.3 xc/fonts/bdf/75dpi/helvB08.bdf:1.4 --- xc/fonts/bdf/75dpi/helvB08.bdf:1.3 Tue Apr 17 19:43:48 2001 +++ xc/fonts/bdf/75dpi/helvB08.bdf Mon Jan 9 09:57:36 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--8-80-75-75-P-50-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 12 16 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvB08.bdf,v 1.4 2006/01/09 14:57:36 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvB10.bdf diff -u xc/fonts/bdf/75dpi/helvB10.bdf:1.3 xc/fonts/bdf/75dpi/helvB10.bdf:1.4 --- xc/fonts/bdf/75dpi/helvB10.bdf:1.3 Tue Apr 17 19:43:48 2001 +++ xc/fonts/bdf/75dpi/helvB10.bdf Mon Jan 9 09:57:36 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--10-100-75-75-P-60-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 12 19 -1 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvB10.bdf,v 1.4 2006/01/09 14:57:36 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvB12.bdf diff -u xc/fonts/bdf/75dpi/helvB12.bdf:1.3 xc/fonts/bdf/75dpi/helvB12.bdf:1.4 --- xc/fonts/bdf/75dpi/helvB12.bdf:1.3 Tue Apr 17 19:43:48 2001 +++ xc/fonts/bdf/75dpi/helvB12.bdf Mon Jan 9 09:57:36 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--12-120-75-75-P-70-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 15 20 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvB12.bdf,v 1.4 2006/01/09 14:57:36 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvB14.bdf diff -u xc/fonts/bdf/75dpi/helvB14.bdf:1.3 xc/fonts/bdf/75dpi/helvB14.bdf:1.4 --- xc/fonts/bdf/75dpi/helvB14.bdf:1.3 Tue Apr 17 19:43:48 2001 +++ xc/fonts/bdf/75dpi/helvB14.bdf Mon Jan 9 09:57:36 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--14-140-75-75-P-82-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 17 23 -1 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvB14.bdf,v 1.4 2006/01/09 14:57:36 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvB18.bdf diff -u xc/fonts/bdf/75dpi/helvB18.bdf:1.3 xc/fonts/bdf/75dpi/helvB18.bdf:1.4 --- xc/fonts/bdf/75dpi/helvB18.bdf:1.3 Tue Apr 17 19:43:48 2001 +++ xc/fonts/bdf/75dpi/helvB18.bdf Mon Jan 9 09:57:36 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--18-180-75-75-P-103-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 22 29 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvB18.bdf,v 1.4 2006/01/09 14:57:36 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvB24.bdf diff -u xc/fonts/bdf/75dpi/helvB24.bdf:1.3 xc/fonts/bdf/75dpi/helvB24.bdf:1.4 --- xc/fonts/bdf/75dpi/helvB24.bdf:1.3 Tue Apr 17 19:43:49 2001 +++ xc/fonts/bdf/75dpi/helvB24.bdf Mon Jan 9 09:57:37 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-R-Normal--24-240-75-75-P-138-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 28 37 -2 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvB24.bdf,v 1.4 2006/01/09 14:57:37 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvBO08.bdf diff -u xc/fonts/bdf/75dpi/helvBO08.bdf:1.3 xc/fonts/bdf/75dpi/helvBO08.bdf:1.4 --- xc/fonts/bdf/75dpi/helvBO08.bdf:1.3 Tue Apr 17 19:43:50 2001 +++ xc/fonts/bdf/75dpi/helvBO08.bdf Mon Jan 9 09:57:37 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--8-80-75-75-P-50-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 13 16 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvBO08.bdf,v 1.4 2006/01/09 14:57:37 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvBO10.bdf diff -u xc/fonts/bdf/75dpi/helvBO10.bdf:1.3 xc/fonts/bdf/75dpi/helvBO10.bdf:1.4 --- xc/fonts/bdf/75dpi/helvBO10.bdf:1.3 Tue Apr 17 19:43:50 2001 +++ xc/fonts/bdf/75dpi/helvBO10.bdf Mon Jan 9 09:57:37 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--10-100-75-75-P-60-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 13 19 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvBO10.bdf,v 1.4 2006/01/09 14:57:37 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvBO12.bdf diff -u xc/fonts/bdf/75dpi/helvBO12.bdf:1.3 xc/fonts/bdf/75dpi/helvBO12.bdf:1.4 --- xc/fonts/bdf/75dpi/helvBO12.bdf:1.3 Tue Apr 17 19:43:50 2001 +++ xc/fonts/bdf/75dpi/helvBO12.bdf Mon Jan 9 09:57:37 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--12-120-75-75-P-69-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 17 20 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvBO12.bdf,v 1.4 2006/01/09 14:57:37 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvBO14.bdf diff -u xc/fonts/bdf/75dpi/helvBO14.bdf:1.3 xc/fonts/bdf/75dpi/helvBO14.bdf:1.4 --- xc/fonts/bdf/75dpi/helvBO14.bdf:1.3 Tue Apr 17 19:43:50 2001 +++ xc/fonts/bdf/75dpi/helvBO14.bdf Mon Jan 9 09:57:37 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--14-140-75-75-P-82-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 19 24 -1 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvBO14.bdf,v 1.4 2006/01/09 14:57:37 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvBO18.bdf diff -u xc/fonts/bdf/75dpi/helvBO18.bdf:1.3 xc/fonts/bdf/75dpi/helvBO18.bdf:1.4 --- xc/fonts/bdf/75dpi/helvBO18.bdf:1.3 Tue Apr 17 19:43:50 2001 +++ xc/fonts/bdf/75dpi/helvBO18.bdf Mon Jan 9 09:57:37 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--18-180-75-75-P-104-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 24 30 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvBO18.bdf,v 1.4 2006/01/09 14:57:37 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvBO24.bdf diff -u xc/fonts/bdf/75dpi/helvBO24.bdf:1.3 xc/fonts/bdf/75dpi/helvBO24.bdf:1.4 --- xc/fonts/bdf/75dpi/helvBO24.bdf:1.3 Tue Apr 17 19:43:51 2001 +++ xc/fonts/bdf/75dpi/helvBO24.bdf Mon Jan 9 09:57:37 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Bold-O-Normal--24-240-75-75-P-138-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 29 37 -1 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvBO24.bdf,v 1.4 2006/01/09 14:57:37 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvO08.bdf diff -u xc/fonts/bdf/75dpi/helvO08.bdf:1.3 xc/fonts/bdf/75dpi/helvO08.bdf:1.4 --- xc/fonts/bdf/75dpi/helvO08.bdf:1.3 Tue Apr 17 19:43:51 2001 +++ xc/fonts/bdf/75dpi/helvO08.bdf Mon Jan 9 09:57:37 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--8-80-75-75-P-47-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 13 16 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvO08.bdf,v 1.4 2006/01/09 14:57:37 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvO10.bdf diff -u xc/fonts/bdf/75dpi/helvO10.bdf:1.3 xc/fonts/bdf/75dpi/helvO10.bdf:1.4 --- xc/fonts/bdf/75dpi/helvO10.bdf:1.3 Tue Apr 17 19:43:51 2001 +++ xc/fonts/bdf/75dpi/helvO10.bdf Mon Jan 9 09:57:37 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--10-100-75-75-P-57-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 13 18 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvO10.bdf,v 1.4 2006/01/09 14:57:37 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvO12.bdf diff -u xc/fonts/bdf/75dpi/helvO12.bdf:1.3 xc/fonts/bdf/75dpi/helvO12.bdf:1.4 --- xc/fonts/bdf/75dpi/helvO12.bdf:1.3 Tue Apr 17 19:43:51 2001 +++ xc/fonts/bdf/75dpi/helvO12.bdf Mon Jan 9 09:57:37 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--12-120-75-75-P-67-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 18 20 -3 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvO12.bdf,v 1.4 2006/01/09 14:57:37 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvO14.bdf diff -u xc/fonts/bdf/75dpi/helvO14.bdf:1.3 xc/fonts/bdf/75dpi/helvO14.bdf:1.4 --- xc/fonts/bdf/75dpi/helvO14.bdf:1.3 Tue Apr 17 19:43:51 2001 +++ xc/fonts/bdf/75dpi/helvO14.bdf Mon Jan 9 09:57:38 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--14-140-75-75-P-78-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 20 22 -3 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvO14.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvO18.bdf diff -u xc/fonts/bdf/75dpi/helvO18.bdf:1.3 xc/fonts/bdf/75dpi/helvO18.bdf:1.4 --- xc/fonts/bdf/75dpi/helvO18.bdf:1.3 Tue Apr 17 19:43:52 2001 +++ xc/fonts/bdf/75dpi/helvO18.bdf Mon Jan 9 09:57:38 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--18-180-75-75-P-98-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 23 29 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvO18.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvO24.bdf diff -u xc/fonts/bdf/75dpi/helvO24.bdf:1.3 xc/fonts/bdf/75dpi/helvO24.bdf:1.4 --- xc/fonts/bdf/75dpi/helvO24.bdf:1.3 Tue Apr 17 19:43:52 2001 +++ xc/fonts/bdf/75dpi/helvO24.bdf Mon Jan 9 09:57:38 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-O-Normal--24-240-75-75-P-130-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 29 37 -1 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvO24.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvR08.bdf diff -u xc/fonts/bdf/75dpi/helvR08.bdf:1.3 xc/fonts/bdf/75dpi/helvR08.bdf:1.4 --- xc/fonts/bdf/75dpi/helvR08.bdf:1.3 Tue Apr 17 19:43:52 2001 +++ xc/fonts/bdf/75dpi/helvR08.bdf Mon Jan 9 09:57:38 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--8-80-75-75-P-46-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 12 16 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvR08.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvR10.bdf diff -u xc/fonts/bdf/75dpi/helvR10.bdf:1.3 xc/fonts/bdf/75dpi/helvR10.bdf:1.4 --- xc/fonts/bdf/75dpi/helvR10.bdf:1.3 Tue Apr 17 19:43:52 2001 +++ xc/fonts/bdf/75dpi/helvR10.bdf Mon Jan 9 09:57:38 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--10-100-75-75-P-56-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 13 18 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvR10.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvR12.bdf diff -u xc/fonts/bdf/75dpi/helvR12.bdf:1.3 xc/fonts/bdf/75dpi/helvR12.bdf:1.4 --- xc/fonts/bdf/75dpi/helvR12.bdf:1.3 Tue Apr 17 19:43:52 2001 +++ xc/fonts/bdf/75dpi/helvR12.bdf Mon Jan 9 09:57:38 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--12-120-75-75-P-67-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 14 20 -1 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvR12.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvR14.bdf diff -u xc/fonts/bdf/75dpi/helvR14.bdf:1.3 xc/fonts/bdf/75dpi/helvR14.bdf:1.4 --- xc/fonts/bdf/75dpi/helvR14.bdf:1.3 Tue Apr 17 19:43:52 2001 +++ xc/fonts/bdf/75dpi/helvR14.bdf Mon Jan 9 09:57:38 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--14-140-75-75-P-77-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 17 22 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvR14.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvR18.bdf diff -u xc/fonts/bdf/75dpi/helvR18.bdf:1.3 xc/fonts/bdf/75dpi/helvR18.bdf:1.4 --- xc/fonts/bdf/75dpi/helvR18.bdf:1.3 Tue Apr 17 19:43:52 2001 +++ xc/fonts/bdf/75dpi/helvR18.bdf Mon Jan 9 09:57:38 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--18-180-75-75-P-98-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 22 29 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvR18.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/helvR24.bdf diff -u xc/fonts/bdf/75dpi/helvR24.bdf:1.3 xc/fonts/bdf/75dpi/helvR24.bdf:1.4 --- xc/fonts/bdf/75dpi/helvR24.bdf:1.3 Tue Apr 17 19:43:53 2001 +++ xc/fonts/bdf/75dpi/helvR24.bdf Mon Jan 9 09:57:38 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Helvetica-Medium-R-Normal--24-240-75-75-P-130-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 29 37 -3 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/helvR24.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/luBIS08.bdf diff -u xc/fonts/bdf/75dpi/luBIS08.bdf:1.3 xc/fonts/bdf/75dpi/luBIS08.bdf:1.4 --- xc/fonts/bdf/75dpi/luBIS08.bdf:1.3 Tue Apr 17 19:43:53 2001 +++ xc/fonts/bdf/75dpi/luBIS08.bdf Mon Jan 9 09:57:38 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBIS08.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBIS10.bdf diff -u xc/fonts/bdf/75dpi/luBIS10.bdf:1.3 xc/fonts/bdf/75dpi/luBIS10.bdf:1.4 --- xc/fonts/bdf/75dpi/luBIS10.bdf:1.3 Tue Apr 17 19:43:53 2001 +++ xc/fonts/bdf/75dpi/luBIS10.bdf Mon Jan 9 09:57:38 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBIS10.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBIS12.bdf diff -u xc/fonts/bdf/75dpi/luBIS12.bdf:1.3 xc/fonts/bdf/75dpi/luBIS12.bdf:1.4 --- xc/fonts/bdf/75dpi/luBIS12.bdf:1.3 Tue Apr 17 19:43:53 2001 +++ xc/fonts/bdf/75dpi/luBIS12.bdf Mon Jan 9 09:57:38 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBIS12.bdf,v 1.4 2006/01/09 14:57:38 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBIS14.bdf diff -u xc/fonts/bdf/75dpi/luBIS14.bdf:1.3 xc/fonts/bdf/75dpi/luBIS14.bdf:1.4 --- xc/fonts/bdf/75dpi/luBIS14.bdf:1.3 Tue Apr 17 19:43:53 2001 +++ xc/fonts/bdf/75dpi/luBIS14.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBIS14.bdf,v 1.4 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBIS18.bdf diff -u xc/fonts/bdf/75dpi/luBIS18.bdf:1.3 xc/fonts/bdf/75dpi/luBIS18.bdf:1.4 --- xc/fonts/bdf/75dpi/luBIS18.bdf:1.3 Tue Apr 17 19:43:53 2001 +++ xc/fonts/bdf/75dpi/luBIS18.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBIS18.bdf,v 1.4 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBIS19.bdf diff -u xc/fonts/bdf/75dpi/luBIS19.bdf:1.4 xc/fonts/bdf/75dpi/luBIS19.bdf:1.5 --- xc/fonts/bdf/75dpi/luBIS19.bdf:1.4 Mon Apr 7 12:23:29 2003 +++ xc/fonts/bdf/75dpi/luBIS19.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBIS19.bdf,v 1.5 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBIS24.bdf diff -u xc/fonts/bdf/75dpi/luBIS24.bdf:1.3 xc/fonts/bdf/75dpi/luBIS24.bdf:1.4 --- xc/fonts/bdf/75dpi/luBIS24.bdf:1.3 Tue Apr 17 19:43:53 2001 +++ xc/fonts/bdf/75dpi/luBIS24.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBIS24.bdf,v 1.4 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBS08.bdf diff -u xc/fonts/bdf/75dpi/luBS08.bdf:1.3 xc/fonts/bdf/75dpi/luBS08.bdf:1.4 --- xc/fonts/bdf/75dpi/luBS08.bdf:1.3 Tue Apr 17 19:43:54 2001 +++ xc/fonts/bdf/75dpi/luBS08.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBS08.bdf,v 1.4 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBS10.bdf diff -u xc/fonts/bdf/75dpi/luBS10.bdf:1.3 xc/fonts/bdf/75dpi/luBS10.bdf:1.4 --- xc/fonts/bdf/75dpi/luBS10.bdf:1.3 Tue Apr 17 19:43:54 2001 +++ xc/fonts/bdf/75dpi/luBS10.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBS10.bdf,v 1.4 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBS12.bdf diff -u xc/fonts/bdf/75dpi/luBS12.bdf:1.3 xc/fonts/bdf/75dpi/luBS12.bdf:1.4 --- xc/fonts/bdf/75dpi/luBS12.bdf:1.3 Tue Apr 17 19:43:54 2001 +++ xc/fonts/bdf/75dpi/luBS12.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBS12.bdf,v 1.4 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBS14.bdf diff -u xc/fonts/bdf/75dpi/luBS14.bdf:1.3 xc/fonts/bdf/75dpi/luBS14.bdf:1.4 --- xc/fonts/bdf/75dpi/luBS14.bdf:1.3 Tue Apr 17 19:43:54 2001 +++ xc/fonts/bdf/75dpi/luBS14.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBS14.bdf,v 1.4 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBS18.bdf diff -u xc/fonts/bdf/75dpi/luBS18.bdf:1.3 xc/fonts/bdf/75dpi/luBS18.bdf:1.4 --- xc/fonts/bdf/75dpi/luBS18.bdf:1.3 Tue Apr 17 19:43:54 2001 +++ xc/fonts/bdf/75dpi/luBS18.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBS18.bdf,v 1.4 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBS19.bdf diff -u xc/fonts/bdf/75dpi/luBS19.bdf:1.4 xc/fonts/bdf/75dpi/luBS19.bdf:1.5 --- xc/fonts/bdf/75dpi/luBS19.bdf:1.4 Mon Apr 7 12:23:29 2003 +++ xc/fonts/bdf/75dpi/luBS19.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBS19.bdf,v 1.5 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luBS24.bdf diff -u xc/fonts/bdf/75dpi/luBS24.bdf:1.3 xc/fonts/bdf/75dpi/luBS24.bdf:1.4 --- xc/fonts/bdf/75dpi/luBS24.bdf:1.3 Tue Apr 17 19:43:54 2001 +++ xc/fonts/bdf/75dpi/luBS24.bdf Mon Jan 9 09:57:39 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luBS24.bdf,v 1.4 2006/01/09 14:57:39 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luIS08.bdf diff -u xc/fonts/bdf/75dpi/luIS08.bdf:1.3 xc/fonts/bdf/75dpi/luIS08.bdf:1.4 --- xc/fonts/bdf/75dpi/luIS08.bdf:1.3 Tue Apr 17 19:43:54 2001 +++ xc/fonts/bdf/75dpi/luIS08.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luIS08.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luIS10.bdf diff -u xc/fonts/bdf/75dpi/luIS10.bdf:1.3 xc/fonts/bdf/75dpi/luIS10.bdf:1.4 --- xc/fonts/bdf/75dpi/luIS10.bdf:1.3 Tue Apr 17 19:43:55 2001 +++ xc/fonts/bdf/75dpi/luIS10.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luIS10.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luIS12.bdf diff -u xc/fonts/bdf/75dpi/luIS12.bdf:1.3 xc/fonts/bdf/75dpi/luIS12.bdf:1.4 --- xc/fonts/bdf/75dpi/luIS12.bdf:1.3 Tue Apr 17 19:43:55 2001 +++ xc/fonts/bdf/75dpi/luIS12.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luIS12.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luIS14.bdf diff -u xc/fonts/bdf/75dpi/luIS14.bdf:1.3 xc/fonts/bdf/75dpi/luIS14.bdf:1.4 --- xc/fonts/bdf/75dpi/luIS14.bdf:1.3 Tue Apr 17 19:43:55 2001 +++ xc/fonts/bdf/75dpi/luIS14.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luIS14.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luIS18.bdf diff -u xc/fonts/bdf/75dpi/luIS18.bdf:1.3 xc/fonts/bdf/75dpi/luIS18.bdf:1.4 --- xc/fonts/bdf/75dpi/luIS18.bdf:1.3 Tue Apr 17 19:43:55 2001 +++ xc/fonts/bdf/75dpi/luIS18.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luIS18.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luIS19.bdf diff -u xc/fonts/bdf/75dpi/luIS19.bdf:1.4 xc/fonts/bdf/75dpi/luIS19.bdf:1.5 --- xc/fonts/bdf/75dpi/luIS19.bdf:1.4 Mon Apr 7 12:23:29 2003 +++ xc/fonts/bdf/75dpi/luIS19.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luIS19.bdf,v 1.5 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luIS24.bdf diff -u xc/fonts/bdf/75dpi/luIS24.bdf:1.3 xc/fonts/bdf/75dpi/luIS24.bdf:1.4 --- xc/fonts/bdf/75dpi/luIS24.bdf:1.3 Tue Apr 17 19:43:55 2001 +++ xc/fonts/bdf/75dpi/luIS24.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luIS24.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luRS08.bdf diff -u xc/fonts/bdf/75dpi/luRS08.bdf:1.3 xc/fonts/bdf/75dpi/luRS08.bdf:1.4 --- xc/fonts/bdf/75dpi/luRS08.bdf:1.3 Tue Apr 17 19:43:55 2001 +++ xc/fonts/bdf/75dpi/luRS08.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luRS08.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luRS10.bdf diff -u xc/fonts/bdf/75dpi/luRS10.bdf:1.3 xc/fonts/bdf/75dpi/luRS10.bdf:1.4 --- xc/fonts/bdf/75dpi/luRS10.bdf:1.3 Tue Apr 17 19:43:55 2001 +++ xc/fonts/bdf/75dpi/luRS10.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luRS10.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luRS12.bdf diff -u xc/fonts/bdf/75dpi/luRS12.bdf:1.3 xc/fonts/bdf/75dpi/luRS12.bdf:1.4 --- xc/fonts/bdf/75dpi/luRS12.bdf:1.3 Tue Apr 17 19:43:55 2001 +++ xc/fonts/bdf/75dpi/luRS12.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luRS12.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luRS14.bdf diff -u xc/fonts/bdf/75dpi/luRS14.bdf:1.3 xc/fonts/bdf/75dpi/luRS14.bdf:1.4 --- xc/fonts/bdf/75dpi/luRS14.bdf:1.3 Tue Apr 17 19:43:56 2001 +++ xc/fonts/bdf/75dpi/luRS14.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luRS14.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luRS18.bdf diff -u xc/fonts/bdf/75dpi/luRS18.bdf:1.3 xc/fonts/bdf/75dpi/luRS18.bdf:1.4 --- xc/fonts/bdf/75dpi/luRS18.bdf:1.3 Tue Apr 17 19:43:56 2001 +++ xc/fonts/bdf/75dpi/luRS18.bdf Mon Jan 9 09:57:40 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luRS18.bdf,v 1.4 2006/01/09 14:57:40 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luRS19.bdf diff -u xc/fonts/bdf/75dpi/luRS19.bdf:1.4 xc/fonts/bdf/75dpi/luRS19.bdf:1.5 --- xc/fonts/bdf/75dpi/luRS19.bdf:1.4 Mon Apr 7 12:23:29 2003 +++ xc/fonts/bdf/75dpi/luRS19.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luRS19.bdf,v 1.5 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/luRS24.bdf diff -u xc/fonts/bdf/75dpi/luRS24.bdf:1.3 xc/fonts/bdf/75dpi/luRS24.bdf:1.4 --- xc/fonts/bdf/75dpi/luRS24.bdf:1.3 Tue Apr 17 19:43:56 2001 +++ xc/fonts/bdf/75dpi/luRS24.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/luRS24.bdf,v 1.4 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubB08.bdf diff -u xc/fonts/bdf/75dpi/lubB08.bdf:1.3 xc/fonts/bdf/75dpi/lubB08.bdf:1.4 --- xc/fonts/bdf/75dpi/lubB08.bdf:1.3 Tue Apr 17 19:43:56 2001 +++ xc/fonts/bdf/75dpi/lubB08.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubB08.bdf,v 1.4 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubB10.bdf diff -u xc/fonts/bdf/75dpi/lubB10.bdf:1.3 xc/fonts/bdf/75dpi/lubB10.bdf:1.4 --- xc/fonts/bdf/75dpi/lubB10.bdf:1.3 Tue Apr 17 19:43:56 2001 +++ xc/fonts/bdf/75dpi/lubB10.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubB10.bdf,v 1.4 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubB12.bdf diff -u xc/fonts/bdf/75dpi/lubB12.bdf:1.3 xc/fonts/bdf/75dpi/lubB12.bdf:1.4 --- xc/fonts/bdf/75dpi/lubB12.bdf:1.3 Tue Apr 17 19:43:57 2001 +++ xc/fonts/bdf/75dpi/lubB12.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubB12.bdf,v 1.4 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubB14.bdf diff -u xc/fonts/bdf/75dpi/lubB14.bdf:1.3 xc/fonts/bdf/75dpi/lubB14.bdf:1.4 --- xc/fonts/bdf/75dpi/lubB14.bdf:1.3 Tue Apr 17 19:43:57 2001 +++ xc/fonts/bdf/75dpi/lubB14.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubB14.bdf,v 1.4 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubB18.bdf diff -u xc/fonts/bdf/75dpi/lubB18.bdf:1.3 xc/fonts/bdf/75dpi/lubB18.bdf:1.4 --- xc/fonts/bdf/75dpi/lubB18.bdf:1.3 Tue Apr 17 19:43:57 2001 +++ xc/fonts/bdf/75dpi/lubB18.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubB18.bdf,v 1.4 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubB19.bdf diff -u xc/fonts/bdf/75dpi/lubB19.bdf:1.4 xc/fonts/bdf/75dpi/lubB19.bdf:1.5 --- xc/fonts/bdf/75dpi/lubB19.bdf:1.4 Mon Apr 7 12:23:29 2003 +++ xc/fonts/bdf/75dpi/lubB19.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubB19.bdf,v 1.5 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubB24.bdf diff -u xc/fonts/bdf/75dpi/lubB24.bdf:1.3 xc/fonts/bdf/75dpi/lubB24.bdf:1.4 --- xc/fonts/bdf/75dpi/lubB24.bdf:1.3 Tue Apr 17 19:43:57 2001 +++ xc/fonts/bdf/75dpi/lubB24.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubB24.bdf,v 1.4 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubBI08.bdf diff -u xc/fonts/bdf/75dpi/lubBI08.bdf:1.3 xc/fonts/bdf/75dpi/lubBI08.bdf:1.4 --- xc/fonts/bdf/75dpi/lubBI08.bdf:1.3 Tue Apr 17 19:43:58 2001 +++ xc/fonts/bdf/75dpi/lubBI08.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubBI08.bdf,v 1.4 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubBI10.bdf diff -u xc/fonts/bdf/75dpi/lubBI10.bdf:1.3 xc/fonts/bdf/75dpi/lubBI10.bdf:1.4 --- xc/fonts/bdf/75dpi/lubBI10.bdf:1.3 Tue Apr 17 19:43:58 2001 +++ xc/fonts/bdf/75dpi/lubBI10.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubBI10.bdf,v 1.4 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubBI12.bdf diff -u xc/fonts/bdf/75dpi/lubBI12.bdf:1.3 xc/fonts/bdf/75dpi/lubBI12.bdf:1.4 --- xc/fonts/bdf/75dpi/lubBI12.bdf:1.3 Tue Apr 17 19:43:58 2001 +++ xc/fonts/bdf/75dpi/lubBI12.bdf Mon Jan 9 09:57:41 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubBI12.bdf,v 1.4 2006/01/09 14:57:41 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubBI14.bdf diff -u xc/fonts/bdf/75dpi/lubBI14.bdf:1.3 xc/fonts/bdf/75dpi/lubBI14.bdf:1.4 --- xc/fonts/bdf/75dpi/lubBI14.bdf:1.3 Tue Apr 17 19:43:58 2001 +++ xc/fonts/bdf/75dpi/lubBI14.bdf Mon Jan 9 09:57:42 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubBI14.bdf,v 1.4 2006/01/09 14:57:42 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubBI18.bdf diff -u xc/fonts/bdf/75dpi/lubBI18.bdf:1.3 xc/fonts/bdf/75dpi/lubBI18.bdf:1.4 --- xc/fonts/bdf/75dpi/lubBI18.bdf:1.3 Tue Apr 17 19:43:58 2001 +++ xc/fonts/bdf/75dpi/lubBI18.bdf Mon Jan 9 09:57:42 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubBI18.bdf,v 1.4 2006/01/09 14:57:42 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubBI19.bdf diff -u xc/fonts/bdf/75dpi/lubBI19.bdf:1.4 xc/fonts/bdf/75dpi/lubBI19.bdf:1.5 --- xc/fonts/bdf/75dpi/lubBI19.bdf:1.4 Mon Apr 7 12:23:29 2003 +++ xc/fonts/bdf/75dpi/lubBI19.bdf Mon Jan 9 09:57:42 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubBI19.bdf,v 1.5 2006/01/09 14:57:42 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubBI24.bdf diff -u xc/fonts/bdf/75dpi/lubBI24.bdf:1.3 xc/fonts/bdf/75dpi/lubBI24.bdf:1.4 --- xc/fonts/bdf/75dpi/lubBI24.bdf:1.3 Tue Apr 17 19:43:59 2001 +++ xc/fonts/bdf/75dpi/lubBI24.bdf Mon Jan 9 09:57:42 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubBI24.bdf,v 1.4 2006/01/09 14:57:42 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubI08.bdf diff -u xc/fonts/bdf/75dpi/lubI08.bdf:1.3 xc/fonts/bdf/75dpi/lubI08.bdf:1.4 --- xc/fonts/bdf/75dpi/lubI08.bdf:1.3 Tue Apr 17 19:43:59 2001 +++ xc/fonts/bdf/75dpi/lubI08.bdf Mon Jan 9 09:57:42 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubI08.bdf,v 1.4 2006/01/09 14:57:42 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubI10.bdf diff -u xc/fonts/bdf/75dpi/lubI10.bdf:1.3 xc/fonts/bdf/75dpi/lubI10.bdf:1.4 --- xc/fonts/bdf/75dpi/lubI10.bdf:1.3 Tue Apr 17 19:43:59 2001 +++ xc/fonts/bdf/75dpi/lubI10.bdf Mon Jan 9 09:57:42 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubI10.bdf,v 1.4 2006/01/09 14:57:42 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubI12.bdf diff -u xc/fonts/bdf/75dpi/lubI12.bdf:1.3 xc/fonts/bdf/75dpi/lubI12.bdf:1.4 --- xc/fonts/bdf/75dpi/lubI12.bdf:1.3 Tue Apr 17 19:43:59 2001 +++ xc/fonts/bdf/75dpi/lubI12.bdf Mon Jan 9 09:57:42 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubI12.bdf,v 1.4 2006/01/09 14:57:42 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubI14.bdf diff -u xc/fonts/bdf/75dpi/lubI14.bdf:1.3 xc/fonts/bdf/75dpi/lubI14.bdf:1.4 --- xc/fonts/bdf/75dpi/lubI14.bdf:1.3 Tue Apr 17 19:43:59 2001 +++ xc/fonts/bdf/75dpi/lubI14.bdf Mon Jan 9 09:57:42 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubI14.bdf,v 1.4 2006/01/09 14:57:42 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubI18.bdf diff -u xc/fonts/bdf/75dpi/lubI18.bdf:1.3 xc/fonts/bdf/75dpi/lubI18.bdf:1.4 --- xc/fonts/bdf/75dpi/lubI18.bdf:1.3 Tue Apr 17 19:44:00 2001 +++ xc/fonts/bdf/75dpi/lubI18.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubI18.bdf,v 1.4 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubI19.bdf diff -u xc/fonts/bdf/75dpi/lubI19.bdf:1.4 xc/fonts/bdf/75dpi/lubI19.bdf:1.5 --- xc/fonts/bdf/75dpi/lubI19.bdf:1.4 Mon Apr 7 12:23:29 2003 +++ xc/fonts/bdf/75dpi/lubI19.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubI19.bdf,v 1.5 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubI24.bdf diff -u xc/fonts/bdf/75dpi/lubI24.bdf:1.3 xc/fonts/bdf/75dpi/lubI24.bdf:1.4 --- xc/fonts/bdf/75dpi/lubI24.bdf:1.3 Tue Apr 17 19:44:00 2001 +++ xc/fonts/bdf/75dpi/lubI24.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubI24.bdf,v 1.4 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubR08.bdf diff -u xc/fonts/bdf/75dpi/lubR08.bdf:1.3 xc/fonts/bdf/75dpi/lubR08.bdf:1.4 --- xc/fonts/bdf/75dpi/lubR08.bdf:1.3 Tue Apr 17 19:44:00 2001 +++ xc/fonts/bdf/75dpi/lubR08.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubR08.bdf,v 1.4 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubR10.bdf diff -u xc/fonts/bdf/75dpi/lubR10.bdf:1.3 xc/fonts/bdf/75dpi/lubR10.bdf:1.4 --- xc/fonts/bdf/75dpi/lubR10.bdf:1.3 Tue Apr 17 19:44:00 2001 +++ xc/fonts/bdf/75dpi/lubR10.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubR10.bdf,v 1.4 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubR12.bdf diff -u xc/fonts/bdf/75dpi/lubR12.bdf:1.3 xc/fonts/bdf/75dpi/lubR12.bdf:1.4 --- xc/fonts/bdf/75dpi/lubR12.bdf:1.3 Tue Apr 17 19:44:00 2001 +++ xc/fonts/bdf/75dpi/lubR12.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubR12.bdf,v 1.4 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubR14.bdf diff -u xc/fonts/bdf/75dpi/lubR14.bdf:1.3 xc/fonts/bdf/75dpi/lubR14.bdf:1.4 --- xc/fonts/bdf/75dpi/lubR14.bdf:1.3 Tue Apr 17 19:44:00 2001 +++ xc/fonts/bdf/75dpi/lubR14.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubR14.bdf,v 1.4 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubR18.bdf diff -u xc/fonts/bdf/75dpi/lubR18.bdf:1.3 xc/fonts/bdf/75dpi/lubR18.bdf:1.4 --- xc/fonts/bdf/75dpi/lubR18.bdf:1.3 Tue Apr 17 19:44:01 2001 +++ xc/fonts/bdf/75dpi/lubR18.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubR18.bdf,v 1.4 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubR19.bdf diff -u xc/fonts/bdf/75dpi/lubR19.bdf:1.4 xc/fonts/bdf/75dpi/lubR19.bdf:1.5 --- xc/fonts/bdf/75dpi/lubR19.bdf:1.4 Mon Apr 7 12:23:29 2003 +++ xc/fonts/bdf/75dpi/lubR19.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubR19.bdf,v 1.5 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lubR24.bdf diff -u xc/fonts/bdf/75dpi/lubR24.bdf:1.3 xc/fonts/bdf/75dpi/lubR24.bdf:1.4 --- xc/fonts/bdf/75dpi/lubR24.bdf:1.3 Tue Apr 17 19:44:01 2001 +++ xc/fonts/bdf/75dpi/lubR24.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lubR24.bdf,v 1.4 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lutBS08.bdf diff -u xc/fonts/bdf/75dpi/lutBS08.bdf:1.2 xc/fonts/bdf/75dpi/lutBS08.bdf:1.3 --- xc/fonts/bdf/75dpi/lutBS08.bdf:1.2 Wed Apr 4 18:56:34 2001 +++ xc/fonts/bdf/75dpi/lutBS08.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutBS08.bdf,v 1.3 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-8-80-75-75-M-50-ISO10646-1 SIZE 8 72 72 Index: xc/fonts/bdf/75dpi/lutBS10.bdf diff -u xc/fonts/bdf/75dpi/lutBS10.bdf:1.2 xc/fonts/bdf/75dpi/lutBS10.bdf:1.3 --- xc/fonts/bdf/75dpi/lutBS10.bdf:1.2 Wed Apr 4 18:56:34 2001 +++ xc/fonts/bdf/75dpi/lutBS10.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutBS10.bdf,v 1.3 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lutBS12.bdf diff -u xc/fonts/bdf/75dpi/lutBS12.bdf:1.2 xc/fonts/bdf/75dpi/lutBS12.bdf:1.3 --- xc/fonts/bdf/75dpi/lutBS12.bdf:1.2 Wed Apr 4 18:56:35 2001 +++ xc/fonts/bdf/75dpi/lutBS12.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutBS12.bdf,v 1.3 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lutBS14.bdf diff -u xc/fonts/bdf/75dpi/lutBS14.bdf:1.2 xc/fonts/bdf/75dpi/lutBS14.bdf:1.3 --- xc/fonts/bdf/75dpi/lutBS14.bdf:1.2 Wed Apr 4 18:56:35 2001 +++ xc/fonts/bdf/75dpi/lutBS14.bdf Mon Jan 9 09:57:43 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutBS14.bdf,v 1.3 2006/01/09 14:57:43 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lutBS18.bdf diff -u xc/fonts/bdf/75dpi/lutBS18.bdf:1.2 xc/fonts/bdf/75dpi/lutBS18.bdf:1.3 --- xc/fonts/bdf/75dpi/lutBS18.bdf:1.2 Wed Apr 4 18:56:35 2001 +++ xc/fonts/bdf/75dpi/lutBS18.bdf Mon Jan 9 09:57:44 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutBS18.bdf,v 1.3 2006/01/09 14:57:44 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lutBS19.bdf diff -u xc/fonts/bdf/75dpi/lutBS19.bdf:1.3 xc/fonts/bdf/75dpi/lutBS19.bdf:1.4 --- xc/fonts/bdf/75dpi/lutBS19.bdf:1.3 Mon Apr 7 12:23:30 2003 +++ xc/fonts/bdf/75dpi/lutBS19.bdf Mon Jan 9 09:57:44 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutBS19.bdf,v 1.4 2006/01/09 14:57:44 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-19-190-75-75-M-110-ISO10646-1 SIZE 19 72 72 Index: xc/fonts/bdf/75dpi/lutBS24.bdf diff -u xc/fonts/bdf/75dpi/lutBS24.bdf:1.2 xc/fonts/bdf/75dpi/lutBS24.bdf:1.3 --- xc/fonts/bdf/75dpi/lutBS24.bdf:1.2 Wed Apr 4 18:56:36 2001 +++ xc/fonts/bdf/75dpi/lutBS24.bdf Mon Jan 9 09:57:44 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutBS24.bdf,v 1.3 2006/01/09 14:57:44 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-24-240-75-75-M-140-ISO10646-1 SIZE 24 72 72 Index: xc/fonts/bdf/75dpi/lutRS08.bdf diff -u xc/fonts/bdf/75dpi/lutRS08.bdf:1.2 xc/fonts/bdf/75dpi/lutRS08.bdf:1.3 --- xc/fonts/bdf/75dpi/lutRS08.bdf:1.2 Wed Apr 4 18:56:36 2001 +++ xc/fonts/bdf/75dpi/lutRS08.bdf Mon Jan 9 09:57:44 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutRS08.bdf,v 1.3 2006/01/09 14:57:44 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-8-80-75-75-M-50-ISO10646-1 SIZE 8 72 72 Index: xc/fonts/bdf/75dpi/lutRS10.bdf diff -u xc/fonts/bdf/75dpi/lutRS10.bdf:1.2 xc/fonts/bdf/75dpi/lutRS10.bdf:1.3 --- xc/fonts/bdf/75dpi/lutRS10.bdf:1.2 Wed Apr 4 18:56:36 2001 +++ xc/fonts/bdf/75dpi/lutRS10.bdf Mon Jan 9 09:57:44 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutRS10.bdf,v 1.3 2006/01/09 14:57:44 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lutRS12.bdf diff -u xc/fonts/bdf/75dpi/lutRS12.bdf:1.2 xc/fonts/bdf/75dpi/lutRS12.bdf:1.3 --- xc/fonts/bdf/75dpi/lutRS12.bdf:1.2 Wed Apr 4 18:56:36 2001 +++ xc/fonts/bdf/75dpi/lutRS12.bdf Mon Jan 9 09:57:44 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutRS12.bdf,v 1.3 2006/01/09 14:57:44 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lutRS14.bdf diff -u xc/fonts/bdf/75dpi/lutRS14.bdf:1.2 xc/fonts/bdf/75dpi/lutRS14.bdf:1.3 --- xc/fonts/bdf/75dpi/lutRS14.bdf:1.2 Wed Apr 4 18:56:37 2001 +++ xc/fonts/bdf/75dpi/lutRS14.bdf Mon Jan 9 09:57:44 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutRS14.bdf,v 1.3 2006/01/09 14:57:44 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lutRS18.bdf diff -u xc/fonts/bdf/75dpi/lutRS18.bdf:1.2 xc/fonts/bdf/75dpi/lutRS18.bdf:1.3 --- xc/fonts/bdf/75dpi/lutRS18.bdf:1.2 Wed Apr 4 18:56:37 2001 +++ xc/fonts/bdf/75dpi/lutRS18.bdf Mon Jan 9 09:57:44 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutRS18.bdf,v 1.3 2006/01/09 14:57:44 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms Index: xc/fonts/bdf/75dpi/lutRS19.bdf diff -u xc/fonts/bdf/75dpi/lutRS19.bdf:1.3 xc/fonts/bdf/75dpi/lutRS19.bdf:1.4 --- xc/fonts/bdf/75dpi/lutRS19.bdf:1.3 Mon Apr 7 12:23:30 2003 +++ xc/fonts/bdf/75dpi/lutRS19.bdf Mon Jan 9 09:57:44 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutRS19.bdf,v 1.4 2006/01/09 14:57:44 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-19-190-75-75-M-110-ISO10646-1 SIZE 19 72 72 Index: xc/fonts/bdf/75dpi/lutRS24.bdf diff -u xc/fonts/bdf/75dpi/lutRS24.bdf:1.2 xc/fonts/bdf/75dpi/lutRS24.bdf:1.3 --- xc/fonts/bdf/75dpi/lutRS24.bdf:1.2 Wed Apr 4 18:56:37 2001 +++ xc/fonts/bdf/75dpi/lutRS24.bdf Mon Jan 9 09:57:45 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/lutRS24.bdf,v 1.3 2006/01/09 14:57:45 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-24-240-75-75-M-140-ISO10646-1 SIZE 24 72 72 Index: xc/fonts/bdf/75dpi/ncenB08.bdf diff -u xc/fonts/bdf/75dpi/ncenB08.bdf:1.3 xc/fonts/bdf/75dpi/ncenB08.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenB08.bdf:1.3 Tue Apr 17 19:44:01 2001 +++ xc/fonts/bdf/75dpi/ncenB08.bdf Mon Jan 9 09:57:45 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--8-80-75-75-P-56-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 17 17 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenB08.bdf,v 1.4 2006/01/09 14:57:45 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenB10.bdf diff -u xc/fonts/bdf/75dpi/ncenB10.bdf:1.3 xc/fonts/bdf/75dpi/ncenB10.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenB10.bdf:1.3 Tue Apr 17 19:44:01 2001 +++ xc/fonts/bdf/75dpi/ncenB10.bdf Mon Jan 9 09:57:45 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--10-100-75-75-P-66-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 17 20 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenB10.bdf,v 1.4 2006/01/09 14:57:45 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenB12.bdf diff -u xc/fonts/bdf/75dpi/ncenB12.bdf:1.3 xc/fonts/bdf/75dpi/ncenB12.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenB12.bdf:1.3 Tue Apr 17 19:44:01 2001 +++ xc/fonts/bdf/75dpi/ncenB12.bdf Mon Jan 9 09:57:45 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--12-120-75-75-P-77-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 20 22 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenB12.bdf,v 1.4 2006/01/09 14:57:45 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenB14.bdf diff -u xc/fonts/bdf/75dpi/ncenB14.bdf:1.3 xc/fonts/bdf/75dpi/ncenB14.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenB14.bdf:1.3 Tue Apr 17 19:44:01 2001 +++ xc/fonts/bdf/75dpi/ncenB14.bdf Mon Jan 9 09:57:45 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--14-140-75-75-P-87-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 20 25 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenB14.bdf,v 1.4 2006/01/09 14:57:45 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenB18.bdf diff -u xc/fonts/bdf/75dpi/ncenB18.bdf:1.3 xc/fonts/bdf/75dpi/ncenB18.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenB18.bdf:1.3 Tue Apr 17 19:44:01 2001 +++ xc/fonts/bdf/75dpi/ncenB18.bdf Mon Jan 9 09:57:45 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--18-180-75-75-P-113-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 24 31 -3 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenB18.bdf,v 1.4 2006/01/09 14:57:45 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenB24.bdf diff -u xc/fonts/bdf/75dpi/ncenB24.bdf:1.3 xc/fonts/bdf/75dpi/ncenB24.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenB24.bdf:1.3 Tue Apr 17 19:44:02 2001 +++ xc/fonts/bdf/75dpi/ncenB24.bdf Mon Jan 9 09:57:45 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-R-Normal--24-240-75-75-P-149-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 33 40 -4 -10 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenB24.bdf,v 1.4 2006/01/09 14:57:45 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenBI08.bdf diff -u xc/fonts/bdf/75dpi/ncenBI08.bdf:1.3 xc/fonts/bdf/75dpi/ncenBI08.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenBI08.bdf:1.3 Tue Apr 17 19:44:02 2001 +++ xc/fonts/bdf/75dpi/ncenBI08.bdf Mon Jan 9 09:57:45 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--8-80-75-75-P-56-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 17 17 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenBI08.bdf,v 1.4 2006/01/09 14:57:45 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenBI10.bdf diff -u xc/fonts/bdf/75dpi/ncenBI10.bdf:1.3 xc/fonts/bdf/75dpi/ncenBI10.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenBI10.bdf:1.3 Tue Apr 17 19:44:02 2001 +++ xc/fonts/bdf/75dpi/ncenBI10.bdf Mon Jan 9 09:57:45 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--10-100-75-75-P-66-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 17 20 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenBI10.bdf,v 1.4 2006/01/09 14:57:45 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenBI12.bdf diff -u xc/fonts/bdf/75dpi/ncenBI12.bdf:1.3 xc/fonts/bdf/75dpi/ncenBI12.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenBI12.bdf:1.3 Tue Apr 17 19:44:02 2001 +++ xc/fonts/bdf/75dpi/ncenBI12.bdf Mon Jan 9 09:57:45 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--12-120-75-75-P-76-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 20 22 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenBI12.bdf,v 1.4 2006/01/09 14:57:45 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenBI14.bdf diff -u xc/fonts/bdf/75dpi/ncenBI14.bdf:1.3 xc/fonts/bdf/75dpi/ncenBI14.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenBI14.bdf:1.3 Tue Apr 17 19:44:02 2001 +++ xc/fonts/bdf/75dpi/ncenBI14.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--14-140-75-75-P-88-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 21 26 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenBI14.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenBI18.bdf diff -u xc/fonts/bdf/75dpi/ncenBI18.bdf:1.3 xc/fonts/bdf/75dpi/ncenBI18.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenBI18.bdf:1.3 Tue Apr 17 19:44:02 2001 +++ xc/fonts/bdf/75dpi/ncenBI18.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--18-180-75-75-P-111-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 26 32 -5 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenBI18.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenBI24.bdf diff -u xc/fonts/bdf/75dpi/ncenBI24.bdf:1.3 xc/fonts/bdf/75dpi/ncenBI24.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenBI24.bdf:1.3 Tue Apr 17 19:44:03 2001 +++ xc/fonts/bdf/75dpi/ncenBI24.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Bold-I-Normal--24-240-75-75-P-148-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 34 41 -5 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenBI24.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenI08.bdf diff -u xc/fonts/bdf/75dpi/ncenI08.bdf:1.3 xc/fonts/bdf/75dpi/ncenI08.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenI08.bdf:1.3 Tue Apr 17 19:44:03 2001 +++ xc/fonts/bdf/75dpi/ncenI08.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--8-80-75-75-P-50-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 14 16 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenI08.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenI10.bdf diff -u xc/fonts/bdf/75dpi/ncenI10.bdf:1.3 xc/fonts/bdf/75dpi/ncenI10.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenI10.bdf:1.3 Tue Apr 17 19:44:03 2001 +++ xc/fonts/bdf/75dpi/ncenI10.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--10-100-75-75-P-60-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 14 19 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenI10.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenI12.bdf diff -u xc/fonts/bdf/75dpi/ncenI12.bdf:1.3 xc/fonts/bdf/75dpi/ncenI12.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenI12.bdf:1.3 Tue Apr 17 19:44:03 2001 +++ xc/fonts/bdf/75dpi/ncenI12.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--12-120-75-75-P-70-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 17 22 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenI12.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenI14.bdf diff -u xc/fonts/bdf/75dpi/ncenI14.bdf:1.3 xc/fonts/bdf/75dpi/ncenI14.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenI14.bdf:1.3 Tue Apr 17 19:44:03 2001 +++ xc/fonts/bdf/75dpi/ncenI14.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--14-140-75-75-P-81-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 19 26 -2 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenI14.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenI18.bdf diff -u xc/fonts/bdf/75dpi/ncenI18.bdf:1.3 xc/fonts/bdf/75dpi/ncenI18.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenI18.bdf:1.3 Tue Apr 17 19:44:03 2001 +++ xc/fonts/bdf/75dpi/ncenI18.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--18-180-75-75-P-104-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 25 30 -2 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenI18.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenI24.bdf diff -u xc/fonts/bdf/75dpi/ncenI24.bdf:1.3 xc/fonts/bdf/75dpi/ncenI24.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenI24.bdf:1.3 Tue Apr 17 19:44:03 2001 +++ xc/fonts/bdf/75dpi/ncenI24.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-I-Normal--24-240-75-75-P-136-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 31 39 -4 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenI24.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenR08.bdf diff -u xc/fonts/bdf/75dpi/ncenR08.bdf:1.3 xc/fonts/bdf/75dpi/ncenR08.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenR08.bdf:1.3 Tue Apr 17 19:44:04 2001 +++ xc/fonts/bdf/75dpi/ncenR08.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--8-80-75-75-P-50-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 14 16 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenR08.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenR10.bdf diff -u xc/fonts/bdf/75dpi/ncenR10.bdf:1.3 xc/fonts/bdf/75dpi/ncenR10.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenR10.bdf:1.3 Tue Apr 17 19:44:04 2001 +++ xc/fonts/bdf/75dpi/ncenR10.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--10-100-75-75-P-60-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 14 18 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenR10.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenR12.bdf diff -u xc/fonts/bdf/75dpi/ncenR12.bdf:1.3 xc/fonts/bdf/75dpi/ncenR12.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenR12.bdf:1.3 Tue Apr 17 19:44:04 2001 +++ xc/fonts/bdf/75dpi/ncenR12.bdf Mon Jan 9 09:57:46 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--12-120-75-75-P-70-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 17 22 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenR12.bdf,v 1.4 2006/01/09 14:57:46 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenR14.bdf diff -u xc/fonts/bdf/75dpi/ncenR14.bdf:1.3 xc/fonts/bdf/75dpi/ncenR14.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenR14.bdf:1.3 Tue Apr 17 19:44:04 2001 +++ xc/fonts/bdf/75dpi/ncenR14.bdf Mon Jan 9 09:57:47 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--14-140-75-75-P-82-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 20 25 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenR14.bdf,v 1.4 2006/01/09 14:57:47 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenR18.bdf diff -u xc/fonts/bdf/75dpi/ncenR18.bdf:1.3 xc/fonts/bdf/75dpi/ncenR18.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenR18.bdf:1.3 Tue Apr 17 19:44:04 2001 +++ xc/fonts/bdf/75dpi/ncenR18.bdf Mon Jan 9 09:57:47 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--18-180-75-75-P-103-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 27 30 -4 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenR18.bdf,v 1.4 2006/01/09 14:57:47 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/ncenR24.bdf diff -u xc/fonts/bdf/75dpi/ncenR24.bdf:1.3 xc/fonts/bdf/75dpi/ncenR24.bdf:1.4 --- xc/fonts/bdf/75dpi/ncenR24.bdf:1.3 Tue Apr 17 19:44:04 2001 +++ xc/fonts/bdf/75dpi/ncenR24.bdf Mon Jan 9 09:57:47 2006 @@ -2,7 +2,7 @@ FONT -Adobe-New Century Schoolbook-Medium-R-Normal--24-240-75-75-P-137-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 31 36 -3 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/ncenR24.bdf,v 1.4 2006/01/09 14:57:47 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/symb08.bdf diff -u xc/fonts/bdf/75dpi/symb08.bdf:1.1.1.3 xc/fonts/bdf/75dpi/symb08.bdf:1.2 --- xc/fonts/bdf/75dpi/symb08.bdf:1.1.1.3 Tue Jan 16 18:25:36 2001 +++ xc/fonts/bdf/75dpi/symb08.bdf Mon Jan 9 09:57:47 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--8-80-75-75-P-51-Adobe-FontSpecific SIZE 8 75 75 FONTBOUNDINGBOX 9 11 -1 -3 -COMMENT $Xorg: symb08.bdf,v 1.3 2000/08/18 15:17:37 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/symb08.bdf,v 1.2 2006/01/09 14:57:47 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/75dpi/symb10.bdf diff -u xc/fonts/bdf/75dpi/symb10.bdf:1.1.1.3 xc/fonts/bdf/75dpi/symb10.bdf:1.2 --- xc/fonts/bdf/75dpi/symb10.bdf:1.1.1.3 Tue Jan 16 18:25:37 2001 +++ xc/fonts/bdf/75dpi/symb10.bdf Mon Jan 9 09:57:47 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--10-100-75-75-P-61-Adobe-FontSpecific SIZE 10 75 75 FONTBOUNDINGBOX 11 14 -1 -4 -COMMENT $Xorg: symb10.bdf,v 1.3 2000/08/18 15:17:37 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/symb10.bdf,v 1.2 2006/01/09 14:57:47 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/75dpi/symb12.bdf diff -u xc/fonts/bdf/75dpi/symb12.bdf:1.1.1.3 xc/fonts/bdf/75dpi/symb12.bdf:1.2 --- xc/fonts/bdf/75dpi/symb12.bdf:1.1.1.3 Tue Jan 16 18:25:40 2001 +++ xc/fonts/bdf/75dpi/symb12.bdf Mon Jan 9 09:57:47 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--12-120-75-75-P-74-Adobe-FontSpecific SIZE 12 75 75 FONTBOUNDINGBOX 14 16 -1 -4 -COMMENT $Xorg: symb12.bdf,v 1.3 2000/08/18 15:17:37 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/symb12.bdf,v 1.2 2006/01/09 14:57:47 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/75dpi/symb14.bdf diff -u xc/fonts/bdf/75dpi/symb14.bdf:1.1.1.3 xc/fonts/bdf/75dpi/symb14.bdf:1.2 --- xc/fonts/bdf/75dpi/symb14.bdf:1.1.1.3 Tue Jan 16 18:25:42 2001 +++ xc/fonts/bdf/75dpi/symb14.bdf Mon Jan 9 09:57:47 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--14-140-75-75-P-85-Adobe-FontSpecific SIZE 14 75 75 FONTBOUNDINGBOX 16 20 -1 -6 -COMMENT $Xorg: symb14.bdf,v 1.3 2000/08/18 15:17:37 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/symb14.bdf,v 1.2 2006/01/09 14:57:47 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/75dpi/symb18.bdf diff -u xc/fonts/bdf/75dpi/symb18.bdf:1.1.1.3 xc/fonts/bdf/75dpi/symb18.bdf:1.2 --- xc/fonts/bdf/75dpi/symb18.bdf:1.1.1.3 Tue Jan 16 18:25:45 2001 +++ xc/fonts/bdf/75dpi/symb18.bdf Mon Jan 9 09:57:47 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--18-180-75-75-P-107-Adobe-FontSpecific SIZE 18 75 75 FONTBOUNDINGBOX 20 25 -1 -7 -COMMENT $Xorg: symb18.bdf,v 1.3 2000/08/18 15:17:37 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/symb18.bdf,v 1.2 2006/01/09 14:57:47 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/75dpi/symb24.bdf diff -u xc/fonts/bdf/75dpi/symb24.bdf:1.1.1.3 xc/fonts/bdf/75dpi/symb24.bdf:1.2 --- xc/fonts/bdf/75dpi/symb24.bdf:1.1.1.3 Tue Jan 16 18:25:48 2001 +++ xc/fonts/bdf/75dpi/symb24.bdf Mon Jan 9 09:57:47 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Symbol-Medium-R-Normal--24-240-75-75-P-142-Adobe-FontSpecific SIZE 24 75 75 FONTBOUNDINGBOX 26 32 -1 -8 -COMMENT $Xorg: symb24.bdf,v 1.3 2000/08/18 15:17:37 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/symb24.bdf,v 1.2 2006/01/09 14:57:47 dawes Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. Index: xc/fonts/bdf/75dpi/tech14.bdf diff -u xc/fonts/bdf/75dpi/tech14.bdf:1.1.1.3 xc/fonts/bdf/75dpi/tech14.bdf:1.2 --- xc/fonts/bdf/75dpi/tech14.bdf:1.1.1.3 Tue Jan 16 18:25:50 2001 +++ xc/fonts/bdf/75dpi/tech14.bdf Mon Jan 9 09:57:47 2006 @@ -2,7 +2,7 @@ FONT -DEC-Terminal-Medium-R-Normal--14-140-75-75-C-80-DEC-DECtech SIZE 14 75 75 FONTBOUNDINGBOX 8 15 0 -3 -COMMENT $Xorg: tech14.bdf,v 1.3 2000/08/18 15:17:37 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/tech14.bdf,v 1.2 2006/01/09 14:57:47 dawes Exp $ COMMENT COMMENT + COMMENT Copyright (c) 1987, 1994 Digital Equipment Corporation Index: xc/fonts/bdf/75dpi/techB14.bdf diff -u xc/fonts/bdf/75dpi/techB14.bdf:1.1.1.3 xc/fonts/bdf/75dpi/techB14.bdf:1.2 --- xc/fonts/bdf/75dpi/techB14.bdf:1.1.1.3 Tue Jan 16 18:25:53 2001 +++ xc/fonts/bdf/75dpi/techB14.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -DEC-Terminal-Bold-R-Normal--14-140-75-75-C-80-DEC-DECtech SIZE 14 75 75 FONTBOUNDINGBOX 8 15 0 -3 -COMMENT $Xorg: techB14.bdf,v 1.3 2000/08/18 15:17:37 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/techB14.bdf,v 1.2 2006/01/09 14:57:48 dawes Exp $ COMMENT COMMENT + COMMENT Copyright (c) 1987, 1994 Digital Equipment Corporation Index: xc/fonts/bdf/75dpi/term14.bdf diff -u xc/fonts/bdf/75dpi/term14.bdf:1.1.1.3 xc/fonts/bdf/75dpi/term14.bdf:1.2 --- xc/fonts/bdf/75dpi/term14.bdf:1.1.1.3 Tue Jan 16 18:25:55 2001 +++ xc/fonts/bdf/75dpi/term14.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -DEC-Terminal-Medium-R-Normal--14-140-75-75-C-80-ISO8859-1 SIZE 14 75 75 FONTBOUNDINGBOX 8 13 0 -2 -COMMENT $Xorg: term14.bdf,v 1.3 2000/08/18 15:17:37 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/term14.bdf,v 1.2 2006/01/09 14:57:48 dawes Exp $ COMMENT COMMENT + COMMENT Copyright (c) 1987, 1994 Digital Equipment Corporation Index: xc/fonts/bdf/75dpi/termB14.bdf diff -u xc/fonts/bdf/75dpi/termB14.bdf:1.1.1.3 xc/fonts/bdf/75dpi/termB14.bdf:1.2 --- xc/fonts/bdf/75dpi/termB14.bdf:1.1.1.3 Tue Jan 16 18:25:58 2001 +++ xc/fonts/bdf/75dpi/termB14.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -DEC-Terminal-Bold-R-Normal--14-140-75-75-C-80-ISO8859-1 SIZE 14 75 75 FONTBOUNDINGBOX 8 14 0 -2 -COMMENT $Xorg: termB14.bdf,v 1.3 2000/08/18 15:17:37 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/termB14.bdf,v 1.2 2006/01/09 14:57:48 dawes Exp $ COMMENT COMMENT + COMMENT Copyright (c) 1987, 1994 Digital Equipment Corporation Index: xc/fonts/bdf/75dpi/timB08.bdf diff -u xc/fonts/bdf/75dpi/timB08.bdf:1.3 xc/fonts/bdf/75dpi/timB08.bdf:1.4 --- xc/fonts/bdf/75dpi/timB08.bdf:1.3 Tue Apr 17 19:44:04 2001 +++ xc/fonts/bdf/75dpi/timB08.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--8-80-75-75-P-47-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 13 16 -3 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timB08.bdf,v 1.4 2006/01/09 14:57:48 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timB10.bdf diff -u xc/fonts/bdf/75dpi/timB10.bdf:1.3 xc/fonts/bdf/75dpi/timB10.bdf:1.4 --- xc/fonts/bdf/75dpi/timB10.bdf:1.3 Tue Apr 17 19:44:05 2001 +++ xc/fonts/bdf/75dpi/timB10.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--10-100-75-75-P-57-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 13 18 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timB10.bdf,v 1.4 2006/01/09 14:57:48 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timB12.bdf diff -u xc/fonts/bdf/75dpi/timB12.bdf:1.3 xc/fonts/bdf/75dpi/timB12.bdf:1.4 --- xc/fonts/bdf/75dpi/timB12.bdf:1.3 Tue Apr 17 19:44:05 2001 +++ xc/fonts/bdf/75dpi/timB12.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--12-120-75-75-P-67-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 15 22 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timB12.bdf,v 1.4 2006/01/09 14:57:48 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timB14.bdf diff -u xc/fonts/bdf/75dpi/timB14.bdf:1.3 xc/fonts/bdf/75dpi/timB14.bdf:1.4 --- xc/fonts/bdf/75dpi/timB14.bdf:1.3 Tue Apr 17 19:44:05 2001 +++ xc/fonts/bdf/75dpi/timB14.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--14-140-75-75-P-77-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 17 24 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timB14.bdf,v 1.4 2006/01/09 14:57:48 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timB18.bdf diff -u xc/fonts/bdf/75dpi/timB18.bdf:1.3 xc/fonts/bdf/75dpi/timB18.bdf:1.4 --- xc/fonts/bdf/75dpi/timB18.bdf:1.3 Tue Apr 17 19:44:05 2001 +++ xc/fonts/bdf/75dpi/timB18.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--18-180-75-75-P-99-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 23 28 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timB18.bdf,v 1.4 2006/01/09 14:57:48 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timB24.bdf diff -u xc/fonts/bdf/75dpi/timB24.bdf:1.3 xc/fonts/bdf/75dpi/timB24.bdf:1.4 --- xc/fonts/bdf/75dpi/timB24.bdf:1.3 Tue Apr 17 19:44:05 2001 +++ xc/fonts/bdf/75dpi/timB24.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-R-Normal--24-240-75-75-P-132-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 28 37 -2 -10 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timB24.bdf,v 1.4 2006/01/09 14:57:48 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timBI08.bdf diff -u xc/fonts/bdf/75dpi/timBI08.bdf:1.3 xc/fonts/bdf/75dpi/timBI08.bdf:1.4 --- xc/fonts/bdf/75dpi/timBI08.bdf:1.3 Tue Apr 17 19:44:05 2001 +++ xc/fonts/bdf/75dpi/timBI08.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--8-80-75-75-P-47-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 16 16 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timBI08.bdf,v 1.4 2006/01/09 14:57:48 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timBI10.bdf diff -u xc/fonts/bdf/75dpi/timBI10.bdf:1.3 xc/fonts/bdf/75dpi/timBI10.bdf:1.4 --- xc/fonts/bdf/75dpi/timBI10.bdf:1.3 Tue Apr 17 19:44:05 2001 +++ xc/fonts/bdf/75dpi/timBI10.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--10-100-75-75-P-57-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 16 18 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timBI10.bdf,v 1.4 2006/01/09 14:57:48 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timBI12.bdf diff -u xc/fonts/bdf/75dpi/timBI12.bdf:1.3 xc/fonts/bdf/75dpi/timBI12.bdf:1.4 --- xc/fonts/bdf/75dpi/timBI12.bdf:1.3 Tue Apr 17 19:44:06 2001 +++ xc/fonts/bdf/75dpi/timBI12.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--12-120-75-75-P-68-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 17 22 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timBI12.bdf,v 1.4 2006/01/09 14:57:48 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timBI14.bdf diff -u xc/fonts/bdf/75dpi/timBI14.bdf:1.3 xc/fonts/bdf/75dpi/timBI14.bdf:1.4 --- xc/fonts/bdf/75dpi/timBI14.bdf:1.3 Tue Apr 17 19:44:06 2001 +++ xc/fonts/bdf/75dpi/timBI14.bdf Mon Jan 9 09:57:48 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--14-140-75-75-P-77-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 19 24 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timBI14.bdf,v 1.4 2006/01/09 14:57:48 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timBI18.bdf diff -u xc/fonts/bdf/75dpi/timBI18.bdf:1.3 xc/fonts/bdf/75dpi/timBI18.bdf:1.4 --- xc/fonts/bdf/75dpi/timBI18.bdf:1.3 Tue Apr 17 19:44:06 2001 +++ xc/fonts/bdf/75dpi/timBI18.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--18-180-75-75-P-98-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 24 30 -4 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timBI18.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timBI24.bdf diff -u xc/fonts/bdf/75dpi/timBI24.bdf:1.3 xc/fonts/bdf/75dpi/timBI24.bdf:1.4 --- xc/fonts/bdf/75dpi/timBI24.bdf:1.3 Tue Apr 17 19:44:06 2001 +++ xc/fonts/bdf/75dpi/timBI24.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Bold-I-Normal--24-240-75-75-P-128-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 31 39 -5 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timBI24.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timI08.bdf diff -u xc/fonts/bdf/75dpi/timI08.bdf:1.3 xc/fonts/bdf/75dpi/timI08.bdf:1.4 --- xc/fonts/bdf/75dpi/timI08.bdf:1.3 Tue Apr 17 19:44:06 2001 +++ xc/fonts/bdf/75dpi/timI08.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--8-80-75-75-P-42-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 11 15 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timI08.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timI10.bdf diff -u xc/fonts/bdf/75dpi/timI10.bdf:1.3 xc/fonts/bdf/75dpi/timI10.bdf:1.4 --- xc/fonts/bdf/75dpi/timI10.bdf:1.3 Tue Apr 17 19:44:06 2001 +++ xc/fonts/bdf/75dpi/timI10.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--10-100-75-75-P-52-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 13 18 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timI10.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timI12.bdf diff -u xc/fonts/bdf/75dpi/timI12.bdf:1.3 xc/fonts/bdf/75dpi/timI12.bdf:1.4 --- xc/fonts/bdf/75dpi/timI12.bdf:1.3 Tue Apr 17 19:44:06 2001 +++ xc/fonts/bdf/75dpi/timI12.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--12-120-75-75-P-63-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 16 22 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timI12.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timI14.bdf diff -u xc/fonts/bdf/75dpi/timI14.bdf:1.3 xc/fonts/bdf/75dpi/timI14.bdf:1.4 --- xc/fonts/bdf/75dpi/timI14.bdf:1.3 Tue Apr 17 19:44:07 2001 +++ xc/fonts/bdf/75dpi/timI14.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--14-140-75-75-P-73-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 19 24 -3 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timI14.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timI18.bdf diff -u xc/fonts/bdf/75dpi/timI18.bdf:1.3 xc/fonts/bdf/75dpi/timI18.bdf:1.4 --- xc/fonts/bdf/75dpi/timI18.bdf:1.3 Tue Apr 17 19:44:07 2001 +++ xc/fonts/bdf/75dpi/timI18.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--18-180-75-75-P-94-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 23 30 -2 -9 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timI18.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timI24.bdf diff -u xc/fonts/bdf/75dpi/timI24.bdf:1.3 xc/fonts/bdf/75dpi/timI24.bdf:1.4 --- xc/fonts/bdf/75dpi/timI24.bdf:1.3 Tue Apr 17 19:44:07 2001 +++ xc/fonts/bdf/75dpi/timI24.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-I-Normal--24-240-75-75-P-125-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 31 40 -5 -11 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timI24.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timR08.bdf diff -u xc/fonts/bdf/75dpi/timR08.bdf:1.3 xc/fonts/bdf/75dpi/timR08.bdf:1.4 --- xc/fonts/bdf/75dpi/timR08.bdf:1.3 Tue Apr 17 19:44:07 2001 +++ xc/fonts/bdf/75dpi/timR08.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--8-80-75-75-P-44-ISO10646-1 SIZE 8 75 75 FONTBOUNDINGBOX 12 15 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timR08.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timR10.bdf diff -u xc/fonts/bdf/75dpi/timR10.bdf:1.3 xc/fonts/bdf/75dpi/timR10.bdf:1.4 --- xc/fonts/bdf/75dpi/timR10.bdf:1.3 Tue Apr 17 19:44:07 2001 +++ xc/fonts/bdf/75dpi/timR10.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--10-100-75-75-P-54-ISO10646-1 SIZE 10 75 75 FONTBOUNDINGBOX 12 17 -2 -4 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timR10.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timR12.bdf diff -u xc/fonts/bdf/75dpi/timR12.bdf:1.3 xc/fonts/bdf/75dpi/timR12.bdf:1.4 --- xc/fonts/bdf/75dpi/timR12.bdf:1.3 Tue Apr 17 19:44:08 2001 +++ xc/fonts/bdf/75dpi/timR12.bdf Mon Jan 9 09:57:49 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--12-120-75-75-P-64-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 15 20 -2 -5 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timR12.bdf,v 1.4 2006/01/09 14:57:49 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timR14.bdf diff -u xc/fonts/bdf/75dpi/timR14.bdf:1.3 xc/fonts/bdf/75dpi/timR14.bdf:1.4 --- xc/fonts/bdf/75dpi/timR14.bdf:1.3 Tue Apr 17 19:44:08 2001 +++ xc/fonts/bdf/75dpi/timR14.bdf Mon Jan 9 09:57:50 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--14-140-75-75-P-74-ISO10646-1 SIZE 14 75 75 FONTBOUNDINGBOX 17 24 -2 -6 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timR14.bdf,v 1.4 2006/01/09 14:57:50 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timR18.bdf diff -u xc/fonts/bdf/75dpi/timR18.bdf:1.3 xc/fonts/bdf/75dpi/timR18.bdf:1.4 --- xc/fonts/bdf/75dpi/timR18.bdf:1.3 Tue Apr 17 19:44:08 2001 +++ xc/fonts/bdf/75dpi/timR18.bdf Mon Jan 9 09:57:50 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--18-180-75-75-P-94-ISO10646-1 SIZE 18 75 75 FONTBOUNDINGBOX 22 28 -3 -7 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timR18.bdf,v 1.4 2006/01/09 14:57:50 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/75dpi/timR24.bdf diff -u xc/fonts/bdf/75dpi/timR24.bdf:1.3 xc/fonts/bdf/75dpi/timR24.bdf:1.4 --- xc/fonts/bdf/75dpi/timR24.bdf:1.3 Tue Apr 17 19:44:08 2001 +++ xc/fonts/bdf/75dpi/timR24.bdf Mon Jan 9 09:57:50 2006 @@ -2,7 +2,7 @@ FONT -Adobe-Times-Medium-R-Normal--24-240-75-75-P-124-ISO10646-1 SIZE 24 75 75 FONTBOUNDINGBOX 29 35 -4 -8 -COMMENT $Xorg: $ +COMMENT $XFree86: xc/fonts/bdf/75dpi/timR24.bdf,v 1.4 2006/01/09 14:57:50 dawes Exp $ COMMENT ISO10646-1 extension by Markus Kuhn , 2001-03-20 COMMENT COMMENT + Index: xc/fonts/bdf/cyrillic/Imakefile diff -u xc/fonts/bdf/cyrillic/Imakefile:3.3 xc/fonts/bdf/cyrillic/Imakefile:3.4 --- xc/fonts/bdf/cyrillic/Imakefile:3.3 Sat Dec 14 20:48:56 2002 +++ xc/fonts/bdf/cyrillic/Imakefile Fri Mar 17 20:34:23 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/fonts/bdf/cyrillic/Imakefile,v 3.3 2002/12/15 01:48:56 dawes Exp $ +XCOMM $XFree86: xc/fonts/bdf/cyrillic/Imakefile,v 3.4 2006/03/18 01:34:23 dawes Exp $ OBJS = FontObj(crox1c) FontObj(crox1cb) FontObj(crox1cbo) FontObj(crox1co) \ FontObj(crox1h) FontObj(crox1hb) FontObj(crox1hbo) FontObj(crox1ho) \ @@ -114,3 +114,4 @@ InstallFonts($(FONTINSTDIR)) InstallFontAliases($(FONTINSTDIR)) InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) +InstallFcCache($(FONTINSTDIR)) Index: xc/fonts/bdf/cyrillic/koi5x8.bdf diff -u xc/fonts/bdf/cyrillic/koi5x8.bdf:1.1 xc/fonts/bdf/cyrillic/koi5x8.bdf:1.2 --- xc/fonts/bdf/cyrillic/koi5x8.bdf:1.1 Sat Dec 14 20:49:06 2002 +++ xc/fonts/bdf/cyrillic/koi5x8.bdf Mon Jan 9 09:57:56 2006 @@ -3,10 +3,9 @@ COMMENT Generated with 'ucs2any.pl 5x8.bdf ../xcyr-2.3/tryfont/KOI8-C.TXT KOI8-C' COMMENT from an ISO10646-1 encoded source BDF font. COMMENT ucs2any.pl by Markus Kuhn , 1999. -COMMENT $Id: 5x8.bdf,v 1.24 1999-12-13 10:32:58+00 mgk25 Exp mgk25 $ COMMENT Send bug reports to Markus Kuhn COMMENT Changes 1999 by Serge Winitzki. -COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi5x8.bdf,v 1.1 2002/12/15 01:49:06 dawes Exp $ +COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi5x8.bdf,v 1.2 2006/01/09 14:57:56 dawes Exp $ FONT -Misc-Fixed-Medium-R-Normal--8-80-75-75-C-50-KOI8-R SIZE 11 75 75 FONTBOUNDINGBOX 5 8 0 -1 Index: xc/fonts/bdf/cyrillic/koi6x13b.bdf diff -u xc/fonts/bdf/cyrillic/koi6x13b.bdf:1.1 xc/fonts/bdf/cyrillic/koi6x13b.bdf:1.2 --- xc/fonts/bdf/cyrillic/koi6x13b.bdf:1.1 Sat Dec 14 20:49:07 2002 +++ xc/fonts/bdf/cyrillic/koi6x13b.bdf Mon Jan 9 09:57:56 2006 @@ -2,10 +2,9 @@ COMMENT Generated with 'ucs2any.pl 6x13B.bdf ../xcyr-2.3/tryfont/KOI8-C.TXT KOI8-C' COMMENT from an ISO10646-1 encoded source BDF font. COMMENT ucs2any.pl by Markus Kuhn , 1999. -COMMENT "Id: 6x13B.bdf,v 1.21 1999-12-13 10:23:03+00 mgk25 Exp mgk25 $" COMMENT "Send bug reports to Markus Kuhn " COMMENT Changes 1999 by Serge Winitzki. -COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi6x13b.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $ +COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi6x13b.bdf,v 1.2 2006/01/09 14:57:56 dawes Exp $ FONT -Misc-Fixed-Bold-R-SemiCondensed--13-120-75-75-C-60-KOI8-R SIZE 13 75 75 FONTBOUNDINGBOX 6 13 0 -2 Index: xc/fonts/bdf/cyrillic/koi6x9.bdf diff -u xc/fonts/bdf/cyrillic/koi6x9.bdf:1.1 xc/fonts/bdf/cyrillic/koi6x9.bdf:1.2 --- xc/fonts/bdf/cyrillic/koi6x9.bdf:1.1 Sat Dec 14 20:49:07 2002 +++ xc/fonts/bdf/cyrillic/koi6x9.bdf Mon Jan 9 09:57:56 2006 @@ -2,10 +2,9 @@ COMMENT Generated with 'ucs2any.pl 6x9.bdf xcyr-2.3/KOI8-C.TXT KOI8-C' COMMENT from an ISO10646-1 encoded source BDF font. COMMENT ucs2any.pl by Markus Kuhn , 1999. -COMMENT Id: 6x9.bdf,v 1.13 1999-11-06 20:18:24+00 mgk25 Exp mgk25 $ COMMENT Send bug reports to Markus Kuhn COMMENT Changes 1999 by Serge Winitzki. -COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi6x9.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $ +COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi6x9.bdf,v 1.2 2006/01/09 14:57:56 dawes Exp $ FONT -Misc-Fixed-Medium-R-Normal--9-90-75-75-C-60-KOI8-R SIZE 9 75 75 FONTBOUNDINGBOX 6 9 0 -2 Index: xc/fonts/bdf/cyrillic/koi7x14.bdf diff -u xc/fonts/bdf/cyrillic/koi7x14.bdf:1.1 xc/fonts/bdf/cyrillic/koi7x14.bdf:1.2 --- xc/fonts/bdf/cyrillic/koi7x14.bdf:1.1 Sat Dec 14 20:49:07 2002 +++ xc/fonts/bdf/cyrillic/koi7x14.bdf Mon Jan 9 09:57:56 2006 @@ -3,10 +3,9 @@ COMMENT Generated with 'ucs2any.pl 7x14.bdf ../tryfont/KOI8-C.TXT KOI8-C' COMMENT from an ISO10646-1 encoded source BDF font. COMMENT ucs2any.pl by Markus Kuhn , 1999. -COMMENT "Id: 7x14.bdf,v 1.37 1999-12-13 10:12:19+00 mgk25 Exp mgk25 $" COMMENT "Send bug reports to Markus Kuhn " COMMENT Changes 2000 by Serge Winitzki. -COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi7x14.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $ +COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi7x14.bdf,v 1.2 2006/01/09 14:57:56 dawes Exp $ FONT -Misc-Fixed-Medium-R-Normal--14-130-75-75-C-70-KOI8-R SIZE 7 75 75 FONTBOUNDINGBOX 7 14 0 -2 Index: xc/fonts/bdf/cyrillic/koi7x14b.bdf diff -u xc/fonts/bdf/cyrillic/koi7x14b.bdf:1.1 xc/fonts/bdf/cyrillic/koi7x14b.bdf:1.2 --- xc/fonts/bdf/cyrillic/koi7x14b.bdf:1.1 Sat Dec 14 20:49:07 2002 +++ xc/fonts/bdf/cyrillic/koi7x14b.bdf Mon Jan 9 09:57:56 2006 @@ -3,10 +3,9 @@ COMMENT Generated with 'ucs2any.pl 7x14B.bdf ../tryfont/KOI8-C.TXT KOI8-C' COMMENT from an ISO10646-1 encoded source BDF font. COMMENT ucs2any.pl by Markus Kuhn , 1999. -COMMENT "Id: 7x14B.bdf,v 1.19 1999-12-13 10:50:31+00 mgk25 Exp mgk25 $" COMMENT "Send bug reports to Markus Kuhn " COMMENT Changes 2000 by Serge Winitzki. -COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi7x14b.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $ +COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi7x14b.bdf,v 1.2 2006/01/09 14:57:56 dawes Exp $ FONT -Misc-Fixed-Bold-R-Normal--14-130-75-75-C-70-KOI8-R SIZE 7 75 75 FONTBOUNDINGBOX 7 14 0 -2 Index: xc/fonts/bdf/cyrillic/koi8x13.bdf diff -u xc/fonts/bdf/cyrillic/koi8x13.bdf:3.2 xc/fonts/bdf/cyrillic/koi8x13.bdf:3.3 --- xc/fonts/bdf/cyrillic/koi8x13.bdf:3.2 Sat Dec 14 20:49:07 2002 +++ xc/fonts/bdf/cyrillic/koi8x13.bdf Mon Jan 9 09:57:56 2006 @@ -3,9 +3,8 @@ COMMENT Generated with 'ucs2any.pl tmpfont.bdf ../KOI8-C.TXT KOI8-C' COMMENT from an ISO10646-1 encoded source BDF font. COMMENT ucs2any.pl by Markus Kuhn , 1999. -COMMENT "Id: 8x13.bdf,v 1.46 1999-11-13 20:49:01+00 mgk25 Exp mgk25 $" COMMENT "Send bug reports to Markus Kuhn " -COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi8x13.bdf,v 3.2 2002/12/15 01:49:07 dawes Exp $ +COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi8x13.bdf,v 3.3 2006/01/09 14:57:56 dawes Exp $ FONT -Misc-Fixed-Medium-R-Normal--13-120-75-75-C-80-KOI8-R SIZE 13 75 75 FONTBOUNDINGBOX 8 13 0 -2 Index: xc/fonts/bdf/cyrillic/koi9x15.bdf diff -u xc/fonts/bdf/cyrillic/koi9x15.bdf:3.2 xc/fonts/bdf/cyrillic/koi9x15.bdf:3.3 --- xc/fonts/bdf/cyrillic/koi9x15.bdf:3.2 Sat Dec 14 20:49:07 2002 +++ xc/fonts/bdf/cyrillic/koi9x15.bdf Mon Jan 9 09:57:56 2006 @@ -3,9 +3,8 @@ COMMENT Generated with 'ucs2any.pl 9x15.bdf KOI8-C.TXT KOI8-C' COMMENT from an ISO10646-1 encoded source BDF font. COMMENT ucs2any.pl by Markus Kuhn , 1999. -COMMENT "Id: 9x15.bdf,v 1.64 1999-11-13 20:49:01+00 mgk25 Exp mgk25 $" COMMENT "Send bug reports to Markus Kuhn " -COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi9x15.bdf,v 3.2 2002/12/15 01:49:07 dawes Exp $ +COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi9x15.bdf,v 3.3 2006/01/09 14:57:56 dawes Exp $ FONT -Misc-Fixed-Medium-R-Normal--15-140-75-75-C-90-KOI8-R SIZE 15 75 75 FONTBOUNDINGBOX 9 15 0 -3 Index: xc/fonts/bdf/cyrillic/koi9x18.bdf diff -u xc/fonts/bdf/cyrillic/koi9x18.bdf:1.1 xc/fonts/bdf/cyrillic/koi9x18.bdf:1.2 --- xc/fonts/bdf/cyrillic/koi9x18.bdf:1.1 Sat Dec 14 20:49:07 2002 +++ xc/fonts/bdf/cyrillic/koi9x18.bdf Mon Jan 9 09:57:56 2006 @@ -3,10 +3,9 @@ COMMENT Generated with 'ucs2any.pl 9x18.bdf KOI8-C KOI8-C' COMMENT from an ISO10646-1 encoded source BDF font. COMMENT ucs2any.pl by Markus Kuhn , 1999. -COMMENT "Id: 9x18.bdf,v 1.40 1999-11-20 11:52:26+00 mgk25 Rel mgk25 $" COMMENT "Send bug reports to Markus Kuhn " COMMENT Changes 1999 by Serge Winitzki. -COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi9x18.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $ +COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi9x18.bdf,v 1.2 2006/01/09 14:57:56 dawes Exp $ FONT -Misc-Fixed-Medium-R-Normal--18-120-100-100-C-90-KOI8-R SIZE 12 100 100 FONTBOUNDINGBOX 9 18 0 -4 Index: xc/fonts/bdf/cyrillic/koi9x18b.bdf diff -u xc/fonts/bdf/cyrillic/koi9x18b.bdf:1.1 xc/fonts/bdf/cyrillic/koi9x18b.bdf:1.2 --- xc/fonts/bdf/cyrillic/koi9x18b.bdf:1.1 Sat Dec 14 20:49:07 2002 +++ xc/fonts/bdf/cyrillic/koi9x18b.bdf Mon Jan 9 09:57:56 2006 @@ -3,9 +3,8 @@ COMMENT Generated with 'ucs2any.pl 9x18B.bdf KOI8-C KOI8-C' COMMENT from an ISO10646-1 encoded source BDF font. COMMENT ucs2any.pl by Markus Kuhn , 1999. -COMMENT "Id: 9x18B.bdf,v 1.7 1999-11-21 16:03:33+00 mgk25 Rel mgk25 $" COMMENT "Send bug reports to Markus Kuhn " -COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi9x18b.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $ +COMMENT $XFree86: xc/fonts/bdf/cyrillic/koi9x18b.bdf,v 1.2 2006/01/09 14:57:56 dawes Exp $ FONT -Misc-Fixed-Bold-R-Normal--18-120-100-100-C-90-KOI8-R SIZE 12 100 100 FONTBOUNDINGBOX 9 18 0 -4 Index: xc/fonts/bdf/misc/12x13ja.bdf diff -u xc/fonts/bdf/misc/12x13ja.bdf:1.6 xc/fonts/bdf/misc/12x13ja.bdf:1.7 --- xc/fonts/bdf/misc/12x13ja.bdf:1.6 Mon Jun 3 15:55:21 2002 +++ xc/fonts/bdf/misc/12x13ja.bdf Mon Jan 9 09:57:57 2006 @@ -4,7 +4,7 @@ COMMENT This font was scaled down from a 14x14 source font COMMENT Hangul glyphs prepared by Won-kyu Park COMMENT from BAEKMUK font. -COMMENT Id: 12x13ja.bdf,v 1.23 2000-12-07 21:56:41+00 mgk25 Exp mgk25 $ +COMMENT $XFree86: xc/fonts/bdf/misc/12x13ja.bdf,v 1.7 2006/01/09 14:57:57 dawes Exp $ FONT -Misc-Fixed-Medium-R-Normal-ja-13-120-75-75-C-120-ISO10646-1 SIZE 12 75 75 FONTBOUNDINGBOX 12 13 0 -2 Index: xc/fonts/bdf/misc/18x18ja.bdf diff -u xc/fonts/bdf/misc/18x18ja.bdf:1.6 xc/fonts/bdf/misc/18x18ja.bdf:1.7 --- xc/fonts/bdf/misc/18x18ja.bdf:1.6 Tue Jun 20 01:08:18 2000 +++ xc/fonts/bdf/misc/18x18ja.bdf Mon Jan 9 09:57:58 2006 @@ -4,7 +4,7 @@ COMMENT padded with one pixel on all sides, plus JIS X 0212-1990 glyphs COMMENT designed by Koichi Yasuoka et al. COMMENT Some Korean symbols derived from Daewoo's X11 font contribution. -COMMENT Id: 18x18ja.bdf,v 1.16 2000-06-19 11:32:33+01 mgk25 Exp mgk25 $ +COMMENT $XFree86: xc/fonts/bdf/misc/18x18ja.bdf,v 1.7 2006/01/09 14:57:58 dawes Exp $ COMMENT Send bug reports to Markus Kuhn FONT -Misc-Fixed-Medium-R-Normal-ja-18-120-100-100-C-180-ISO10646-1 SIZE 12 100 100 Index: xc/fonts/bdf/misc/18x18ko.bdf diff -u xc/fonts/bdf/misc/18x18ko.bdf:1.1 xc/fonts/bdf/misc/18x18ko.bdf:1.2 --- xc/fonts/bdf/misc/18x18ko.bdf:1.1 Tue Jun 20 01:08:21 2000 +++ xc/fonts/bdf/misc/18x18ko.bdf Mon Jan 9 09:58:01 2006 @@ -8,7 +8,7 @@ COMMENT (donated by Daewoo Inc. of Korea to the X Consortium). COMMENT Remain glyphs come from 18x18ja.bdf. COMMENT Prepared by Jungshik SHIN , 2000-04-02 -COMMENT Id: 18x18ko.bdf,v 1.3 2000-06-19 12:20:32+01 mgk25 Exp mgk25 $ +COMMENT $XFree86: xc/fonts/bdf/misc/18x18ko.bdf,v 1.2 2006/01/09 14:58:01 dawes Exp $ COMMENT Send bug reports to Markus Kuhn FONT -Misc-Fixed-Medium-R-Normal-ko-18-120-100-100-C-180-ISO10646-1 SIZE 12 100 100 Index: xc/fonts/bdf/misc/Imakefile diff -u xc/fonts/bdf/misc/Imakefile:1.31 xc/fonts/bdf/misc/Imakefile:1.32 --- xc/fonts/bdf/misc/Imakefile:1.31 Mon May 31 20:16:55 2004 +++ xc/fonts/bdf/misc/Imakefile Fri Mar 17 20:34:23 2006 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/fonts/bdf/misc/Imakefile,v 1.31 2004/06/01 00:16:55 dawes Exp $ +XCOMM $XFree86: xc/fonts/bdf/misc/Imakefile,v 1.32 2006/03/18 01:34:23 dawes Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -1297,4 +1297,5 @@ InstallFonts($(FONTINSTDIR)) InstallFontAliases($(FONTINSTDIR)) InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) +InstallFcCache($(FONTINSTDIR)) Index: xc/fonts/bdf/misc/clB6x10.bdf diff -u xc/fonts/bdf/misc/clB6x10.bdf:1.1.1.2 xc/fonts/bdf/misc/clB6x10.bdf:1.2 --- xc/fonts/bdf/misc/clB6x10.bdf:1.1.1.2 Tue Jan 16 18:37:47 2001 +++ xc/fonts/bdf/misc/clB6x10.bdf Mon Jan 9 09:58:07 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clB6x10.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clB6x10.bdf,v 1.2 2006/01/09 14:58:07 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clB6x12.bdf diff -u xc/fonts/bdf/misc/clB6x12.bdf:1.1.1.2 xc/fonts/bdf/misc/clB6x12.bdf:1.2 --- xc/fonts/bdf/misc/clB6x12.bdf:1.1.1.2 Tue Jan 16 18:37:49 2001 +++ xc/fonts/bdf/misc/clB6x12.bdf Mon Jan 9 09:58:07 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clB6x12.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clB6x12.bdf,v 1.2 2006/01/09 14:58:07 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clB8x10.bdf diff -u xc/fonts/bdf/misc/clB8x10.bdf:1.1.1.2 xc/fonts/bdf/misc/clB8x10.bdf:1.2 --- xc/fonts/bdf/misc/clB8x10.bdf:1.1.1.2 Tue Jan 16 18:37:51 2001 +++ xc/fonts/bdf/misc/clB8x10.bdf Mon Jan 9 09:58:08 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clB8x10.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clB8x10.bdf,v 1.2 2006/01/09 14:58:08 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clB8x12.bdf diff -u xc/fonts/bdf/misc/clB8x12.bdf:1.1.1.2 xc/fonts/bdf/misc/clB8x12.bdf:1.2 --- xc/fonts/bdf/misc/clB8x12.bdf:1.1.1.2 Tue Jan 16 18:37:53 2001 +++ xc/fonts/bdf/misc/clB8x12.bdf Mon Jan 9 09:58:08 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clB8x12.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clB8x12.bdf,v 1.2 2006/01/09 14:58:08 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clB8x13.bdf diff -u xc/fonts/bdf/misc/clB8x13.bdf:1.1.1.2 xc/fonts/bdf/misc/clB8x13.bdf:1.2 --- xc/fonts/bdf/misc/clB8x13.bdf:1.1.1.2 Tue Jan 16 18:37:55 2001 +++ xc/fonts/bdf/misc/clB8x13.bdf Mon Jan 9 09:58:08 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clB8x13.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clB8x13.bdf,v 1.2 2006/01/09 14:58:08 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clB8x14.bdf diff -u xc/fonts/bdf/misc/clB8x14.bdf:1.1.1.2 xc/fonts/bdf/misc/clB8x14.bdf:1.2 --- xc/fonts/bdf/misc/clB8x14.bdf:1.1.1.2 Tue Jan 16 18:37:57 2001 +++ xc/fonts/bdf/misc/clB8x14.bdf Mon Jan 9 09:58:08 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clB8x14.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clB8x14.bdf,v 1.2 2006/01/09 14:58:08 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clB8x16.bdf diff -u xc/fonts/bdf/misc/clB8x16.bdf:1.1.1.2 xc/fonts/bdf/misc/clB8x16.bdf:1.2 --- xc/fonts/bdf/misc/clB8x16.bdf:1.1.1.2 Tue Jan 16 18:37:58 2001 +++ xc/fonts/bdf/misc/clB8x16.bdf Mon Jan 9 09:58:08 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clB8x16.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clB8x16.bdf,v 1.2 2006/01/09 14:58:08 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clB8x8.bdf diff -u xc/fonts/bdf/misc/clB8x8.bdf:1.1.1.2 xc/fonts/bdf/misc/clB8x8.bdf:1.2 --- xc/fonts/bdf/misc/clB8x8.bdf:1.1.1.2 Tue Jan 16 18:38:00 2001 +++ xc/fonts/bdf/misc/clB8x8.bdf Mon Jan 9 09:58:08 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clB8x8.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clB8x8.bdf,v 1.2 2006/01/09 14:58:08 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clB9x15.bdf diff -u xc/fonts/bdf/misc/clB9x15.bdf:1.1.1.2 xc/fonts/bdf/misc/clB9x15.bdf:1.2 --- xc/fonts/bdf/misc/clB9x15.bdf:1.1.1.2 Tue Jan 16 18:38:01 2001 +++ xc/fonts/bdf/misc/clB9x15.bdf Mon Jan 9 09:58:08 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clB9x15.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clB9x15.bdf,v 1.2 2006/01/09 14:58:08 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clI6x12.bdf diff -u xc/fonts/bdf/misc/clI6x12.bdf:1.1.1.2 xc/fonts/bdf/misc/clI6x12.bdf:1.2 --- xc/fonts/bdf/misc/clI6x12.bdf:1.1.1.2 Tue Jan 16 18:38:05 2001 +++ xc/fonts/bdf/misc/clI6x12.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clI6x12.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clI6x12.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clI8x8.bdf diff -u xc/fonts/bdf/misc/clI8x8.bdf:1.1.1.2 xc/fonts/bdf/misc/clI8x8.bdf:1.2 --- xc/fonts/bdf/misc/clI8x8.bdf:1.1.1.2 Tue Jan 16 18:38:06 2001 +++ xc/fonts/bdf/misc/clI8x8.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clI8x8.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clI8x8.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR4x6.bdf diff -u xc/fonts/bdf/misc/clR4x6.bdf:1.1.1.2 xc/fonts/bdf/misc/clR4x6.bdf:1.2 --- xc/fonts/bdf/misc/clR4x6.bdf:1.1.1.2 Tue Jan 16 18:38:07 2001 +++ xc/fonts/bdf/misc/clR4x6.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR4x6.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR4x6.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR5x10.bdf diff -u xc/fonts/bdf/misc/clR5x10.bdf:1.1.1.2 xc/fonts/bdf/misc/clR5x10.bdf:1.2 --- xc/fonts/bdf/misc/clR5x10.bdf:1.1.1.2 Tue Jan 16 18:38:08 2001 +++ xc/fonts/bdf/misc/clR5x10.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR5x10.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR5x10.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR5x6.bdf diff -u xc/fonts/bdf/misc/clR5x6.bdf:1.1.1.2 xc/fonts/bdf/misc/clR5x6.bdf:1.2 --- xc/fonts/bdf/misc/clR5x6.bdf:1.1.1.2 Tue Jan 16 18:38:10 2001 +++ xc/fonts/bdf/misc/clR5x6.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR5x6.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR5x6.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR5x8.bdf diff -u xc/fonts/bdf/misc/clR5x8.bdf:1.1.1.2 xc/fonts/bdf/misc/clR5x8.bdf:1.2 --- xc/fonts/bdf/misc/clR5x8.bdf:1.1.1.2 Tue Jan 16 18:38:11 2001 +++ xc/fonts/bdf/misc/clR5x8.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR5x8.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR5x8.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR6x10.bdf diff -u xc/fonts/bdf/misc/clR6x10.bdf:1.1.1.2 xc/fonts/bdf/misc/clR6x10.bdf:1.2 --- xc/fonts/bdf/misc/clR6x10.bdf:1.1.1.2 Tue Jan 16 18:38:13 2001 +++ xc/fonts/bdf/misc/clR6x10.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR6x10.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR6x10.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR6x12.bdf diff -u xc/fonts/bdf/misc/clR6x12.bdf:1.3 xc/fonts/bdf/misc/clR6x12.bdf:1.4 --- xc/fonts/bdf/misc/clR6x12.bdf:1.3 Thu Nov 14 21:50:07 2002 +++ xc/fonts/bdf/misc/clR6x12.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $XConsortium: clR6x12.bdf,v 1.2 94/04/11 12:08:30 gildea Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR6x12.bdf,v 1.4 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR6x13.bdf diff -u xc/fonts/bdf/misc/clR6x13.bdf:1.1.1.2 xc/fonts/bdf/misc/clR6x13.bdf:1.2 --- xc/fonts/bdf/misc/clR6x13.bdf:1.1.1.2 Tue Jan 16 18:38:15 2001 +++ xc/fonts/bdf/misc/clR6x13.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR6x13.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR6x13.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR6x6.bdf diff -u xc/fonts/bdf/misc/clR6x6.bdf:1.1.1.2 xc/fonts/bdf/misc/clR6x6.bdf:1.2 --- xc/fonts/bdf/misc/clR6x6.bdf:1.1.1.2 Tue Jan 16 18:38:17 2001 +++ xc/fonts/bdf/misc/clR6x6.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR6x6.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR6x6.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR6x8.bdf diff -u xc/fonts/bdf/misc/clR6x8.bdf:1.1.1.2 xc/fonts/bdf/misc/clR6x8.bdf:1.2 --- xc/fonts/bdf/misc/clR6x8.bdf:1.1.1.2 Tue Jan 16 18:38:18 2001 +++ xc/fonts/bdf/misc/clR6x8.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR6x8.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR6x8.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR7x10.bdf diff -u xc/fonts/bdf/misc/clR7x10.bdf:1.1.1.2 xc/fonts/bdf/misc/clR7x10.bdf:1.2 --- xc/fonts/bdf/misc/clR7x10.bdf:1.1.1.2 Tue Jan 16 18:38:20 2001 +++ xc/fonts/bdf/misc/clR7x10.bdf Mon Jan 9 09:58:09 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR7x10.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR7x10.bdf,v 1.2 2006/01/09 14:58:09 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR7x12.bdf diff -u xc/fonts/bdf/misc/clR7x12.bdf:1.1.1.2 xc/fonts/bdf/misc/clR7x12.bdf:1.2 --- xc/fonts/bdf/misc/clR7x12.bdf:1.1.1.2 Tue Jan 16 18:38:21 2001 +++ xc/fonts/bdf/misc/clR7x12.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR7x12.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR7x12.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR7x14.bdf diff -u xc/fonts/bdf/misc/clR7x14.bdf:1.1.1.2 xc/fonts/bdf/misc/clR7x14.bdf:1.2 --- xc/fonts/bdf/misc/clR7x14.bdf:1.1.1.2 Tue Jan 16 18:38:22 2001 +++ xc/fonts/bdf/misc/clR7x14.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR7x14.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR7x14.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR7x8.bdf diff -u xc/fonts/bdf/misc/clR7x8.bdf:1.1.1.2 xc/fonts/bdf/misc/clR7x8.bdf:1.2 --- xc/fonts/bdf/misc/clR7x8.bdf:1.1.1.2 Tue Jan 16 18:38:25 2001 +++ xc/fonts/bdf/misc/clR7x8.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR7x8.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR7x8.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR8x10.bdf diff -u xc/fonts/bdf/misc/clR8x10.bdf:1.1.1.2 xc/fonts/bdf/misc/clR8x10.bdf:1.2 --- xc/fonts/bdf/misc/clR8x10.bdf:1.1.1.2 Tue Jan 16 18:38:27 2001 +++ xc/fonts/bdf/misc/clR8x10.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR8x10.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR8x10.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR8x12.bdf diff -u xc/fonts/bdf/misc/clR8x12.bdf:1.1.1.2 xc/fonts/bdf/misc/clR8x12.bdf:1.2 --- xc/fonts/bdf/misc/clR8x12.bdf:1.1.1.2 Tue Jan 16 18:38:28 2001 +++ xc/fonts/bdf/misc/clR8x12.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR8x12.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR8x12.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR8x13.bdf diff -u xc/fonts/bdf/misc/clR8x13.bdf:1.1.1.2 xc/fonts/bdf/misc/clR8x13.bdf:1.2 --- xc/fonts/bdf/misc/clR8x13.bdf:1.1.1.2 Tue Jan 16 18:38:31 2001 +++ xc/fonts/bdf/misc/clR8x13.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR8x13.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR8x13.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR8x14.bdf diff -u xc/fonts/bdf/misc/clR8x14.bdf:1.1.1.2 xc/fonts/bdf/misc/clR8x14.bdf:1.2 --- xc/fonts/bdf/misc/clR8x14.bdf:1.1.1.2 Tue Jan 16 18:38:34 2001 +++ xc/fonts/bdf/misc/clR8x14.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR8x14.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR8x14.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR8x16.bdf diff -u xc/fonts/bdf/misc/clR8x16.bdf:1.1.1.2 xc/fonts/bdf/misc/clR8x16.bdf:1.2 --- xc/fonts/bdf/misc/clR8x16.bdf:1.1.1.2 Tue Jan 16 18:38:37 2001 +++ xc/fonts/bdf/misc/clR8x16.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR8x16.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR8x16.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR8x8.bdf diff -u xc/fonts/bdf/misc/clR8x8.bdf:1.1.1.2 xc/fonts/bdf/misc/clR8x8.bdf:1.2 --- xc/fonts/bdf/misc/clR8x8.bdf:1.1.1.2 Tue Jan 16 18:38:39 2001 +++ xc/fonts/bdf/misc/clR8x8.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR8x8.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR8x8.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/clR9x15.bdf diff -u xc/fonts/bdf/misc/clR9x15.bdf:1.1.1.2 xc/fonts/bdf/misc/clR9x15.bdf:1.2 --- xc/fonts/bdf/misc/clR9x15.bdf:1.1.1.2 Tue Jan 16 18:38:42 2001 +++ xc/fonts/bdf/misc/clR9x15.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: clR9x15.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/clR9x15.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 Dale Schumacher, dal@syntel.mn.org COMMENT 399 Beacon Ave. Index: xc/fonts/bdf/misc/fonts.alias diff -u xc/fonts/bdf/misc/fonts.alias:1.6 xc/fonts/bdf/misc/fonts.alias:1.7 --- xc/fonts/bdf/misc/fonts.alias:1.6 Mon Jan 22 16:09:26 2001 +++ xc/fonts/bdf/misc/fonts.alias Mon Jan 9 09:58:10 2006 @@ -1,4 +1,4 @@ -! $Xorg: fonts.alias,v 1.3 2000/08/21 16:42:31 coskrey Exp $ +! $XFree86: xc/fonts/bdf/misc/fonts.alias,v 1.7 2006/01/09 14:58:10 dawes Exp $ fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 Index: xc/fonts/bdf/misc/olcursor.bdf diff -u xc/fonts/bdf/misc/olcursor.bdf:1.1.1.2 xc/fonts/bdf/misc/olcursor.bdf:1.2 --- xc/fonts/bdf/misc/olcursor.bdf:1.1.1.2 Tue Jan 16 18:39:41 2001 +++ xc/fonts/bdf/misc/olcursor.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: olcursor.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/olcursor.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 by Sun Microsystems, Inc. Mountain View, CA. COMMENT Index: xc/fonts/bdf/misc/olgl10.bdf diff -u xc/fonts/bdf/misc/olgl10.bdf:1.1.1.2 xc/fonts/bdf/misc/olgl10.bdf:1.2 --- xc/fonts/bdf/misc/olgl10.bdf:1.1.1.2 Tue Jan 16 18:39:43 2001 +++ xc/fonts/bdf/misc/olgl10.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: olgl10.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/olgl10.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 by Sun Microsystems, Inc. Mountain View, CA. COMMENT Index: xc/fonts/bdf/misc/olgl12.bdf diff -u xc/fonts/bdf/misc/olgl12.bdf:1.1.1.2 xc/fonts/bdf/misc/olgl12.bdf:1.2 --- xc/fonts/bdf/misc/olgl12.bdf:1.1.1.2 Tue Jan 16 18:39:44 2001 +++ xc/fonts/bdf/misc/olgl12.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: olgl12.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/olgl12.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 by Sun Microsystems, Inc. Mountain View, CA. COMMENT Index: xc/fonts/bdf/misc/olgl14.bdf diff -u xc/fonts/bdf/misc/olgl14.bdf:1.1.1.2 xc/fonts/bdf/misc/olgl14.bdf:1.2 --- xc/fonts/bdf/misc/olgl14.bdf:1.1.1.2 Tue Jan 16 18:39:45 2001 +++ xc/fonts/bdf/misc/olgl14.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: olgl14.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/olgl14.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 by Sun Microsystems, Inc. Mountain View, CA. COMMENT Index: xc/fonts/bdf/misc/olgl19.bdf diff -u xc/fonts/bdf/misc/olgl19.bdf:1.1.1.2 xc/fonts/bdf/misc/olgl19.bdf:1.2 --- xc/fonts/bdf/misc/olgl19.bdf:1.1.1.2 Tue Jan 16 18:39:46 2001 +++ xc/fonts/bdf/misc/olgl19.bdf Mon Jan 9 09:58:10 2006 @@ -1,5 +1,5 @@ STARTFONT 2.1 -COMMENT $Xorg: olgl19.bdf,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ +COMMENT $XFree86: xc/fonts/bdf/misc/olgl19.bdf,v 1.2 2006/01/09 14:58:10 dawes Exp $ COMMENT COMMENT Copyright 1989 by Sun Microsystems, Inc. Mountain View, CA. COMMENT Index: xc/fonts/encodings/sun_eu_greek.enc diff -u xc/fonts/encodings/sun_eu_greek.enc:1.1 xc/fonts/encodings/sun_eu_greek.enc:1.2 --- xc/fonts/encodings/sun_eu_greek.enc:1.1 Wed Sep 1 19:57:56 2004 +++ xc/fonts/encodings/sun_eu_greek.enc Mon Mar 28 23:00:29 2005 @@ -1,5 +1,6 @@ STARTENCODING suneu-greek SIZE 0xFF +# $XFree86: xc/fonts/encodings/sun_eu_greek.enc,v 1.2 2005/03/29 04:00:29 tsi Exp $ STARTMAPPING unicode 0x21 0x0021 0x22 0x0022 Index: xc/fonts/encodings/large/cns11643-1.enc diff -u xc/fonts/encodings/large/cns11643-1.enc:1.1 xc/fonts/encodings/large/cns11643-1.enc:1.2 --- xc/fonts/encodings/large/cns11643-1.enc:1.1 Wed Sep 1 19:57:56 2004 +++ xc/fonts/encodings/large/cns11643-1.enc Mon Mar 28 23:00:29 2005 @@ -2,6 +2,7 @@ ALIAS cns11643-1 # calculated FIRSTINDEX 0x20 0x22 # calculated matrix SIZE 0x7E 0x80 +# $XFree86: xc/fonts/encodings/large/cns11643-1.enc,v 1.2 2005/03/29 04:00:29 tsi Exp $ SIZE 0x7E 0x80 FIRSTINDEX 0x20 0x22 STARTMAPPING unicode Index: xc/fonts/encodings/large/cns11643-2.enc diff -u xc/fonts/encodings/large/cns11643-2.enc:1.1 xc/fonts/encodings/large/cns11643-2.enc:1.2 --- xc/fonts/encodings/large/cns11643-2.enc:1.1 Wed Sep 1 19:57:56 2004 +++ xc/fonts/encodings/large/cns11643-2.enc Mon Mar 28 23:00:29 2005 @@ -2,6 +2,7 @@ ALIAS cns11643-2 # calculated FIRSTINDEX 0x20 0x22 # calculated matrix SIZE 0x73 0x80 +# $XFree86: xc/fonts/encodings/large/cns11643-2.enc,v 1.2 2005/03/29 04:00:29 tsi Exp $ SIZE 0x73 0x80 FIRSTINDEX 0x20 0x22 STARTMAPPING unicode Index: xc/fonts/encodings/large/cns11643-3.enc diff -u xc/fonts/encodings/large/cns11643-3.enc:1.1 xc/fonts/encodings/large/cns11643-3.enc:1.2 --- xc/fonts/encodings/large/cns11643-3.enc:1.1 Wed Sep 1 19:57:56 2004 +++ xc/fonts/encodings/large/cns11643-3.enc Mon Mar 28 23:00:29 2005 @@ -2,6 +2,7 @@ ALIAS cns11643-3 # calculated FIRSTINDEX 0x20 0x22 # calculated matrix SIZE 0x63 0x80 +# $XFree86: xc/fonts/encodings/large/cns11643-3.enc,v 1.2 2005/03/29 04:00:29 tsi Exp $ SIZE 0x63 0x80 FIRSTINDEX 0x20 0x22 STARTMAPPING unicode Index: xc/fonts/scaled/Imakefile diff -u xc/fonts/scaled/Imakefile:3.5 xc/fonts/scaled/Imakefile:3.6 --- xc/fonts/scaled/Imakefile:3.5 Mon Feb 3 21:18:18 2003 +++ xc/fonts/scaled/Imakefile Mon Jan 9 09:58:13 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ - - - - -XCOMM $XFree86: xc/fonts/scaled/Imakefile,v 3.5 2003/02/04 02:18:18 dawes Exp $ +XCOMM $XFree86: xc/fonts/scaled/Imakefile,v 3.6 2006/01/09 14:58:13 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags /* as nothing */ Index: xc/fonts/scaled/Ethiopic/Imakefile diff -u xc/fonts/scaled/Ethiopic/Imakefile:1.2 xc/fonts/scaled/Ethiopic/Imakefile:1.3 --- xc/fonts/scaled/Ethiopic/Imakefile:1.2 Wed Dec 31 14:30:36 2003 +++ xc/fonts/scaled/Ethiopic/Imakefile Fri Mar 17 20:34:23 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/fonts/scaled/Ethiopic/Imakefile,v 1.2 2003/12/31 19:30:36 dawes Exp $ +XCOMM $XFree86: xc/fonts/scaled/Ethiopic/Imakefile,v 1.3 2006/03/18 01:34:23 dawes Exp $ TTFFONTS = GohaTibebZemen.ttf OTFFONTS = GohaTibebZemen.otf @@ -6,18 +6,13 @@ TTFINSTDIR = $(FONTDIR)/TTF OTFINSTDIR = $(FONTDIR)/OTF -#if UseFreetype2 MakeFcCache($(TTFFONTS) $(OTFFONTS)) -#endif InstallMultipleFlags($(TTFFONTS),$(TTFINSTDIR),$(INSTDATFLAGS)) InstallMultipleFlags($(OTFFONTS),$(OTFINSTDIR),$(INSTDATFLAGS)) -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - InstallFontsDir($(TTFINSTDIR)) InstallFontsDir($(OTFINSTDIR)) +InstallFcCache($(TTFINSTDIR) $(OTFINSTDIR)) + Index: xc/fonts/scaled/Meltho/Imakefile diff -u xc/fonts/scaled/Meltho/Imakefile:1.3 xc/fonts/scaled/Meltho/Imakefile:1.4 --- xc/fonts/scaled/Meltho/Imakefile:1.3 Wed Dec 31 14:30:36 2003 +++ xc/fonts/scaled/Meltho/Imakefile Fri Mar 17 20:34:23 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/fonts/scaled/Meltho/Imakefile,v 1.3 2003/12/31 19:30:36 dawes Exp $ +XCOMM $XFree86: xc/fonts/scaled/Meltho/Imakefile,v 1.4 2006/03/18 01:34:23 dawes Exp $ FONTS = SyrCOMAdiabene.otf SyrCOMAntioch.otf SyrCOMBatnan.otf \ SyrCOMBatnanBold.otf SyrCOMCtesiphon.otf SyrCOMEdessa.otf \ @@ -15,17 +15,9 @@ MakeFontsScale($(OBJS)) MakeFontsDir(fonts.scale) -#if UseFreetype2 MakeFcCache($(FONTS)) -#endif InstallFonts($(FONTINSTDIR)) InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) -#if UseFreetype2 InstallFcCache($(FONTINSTDIR)) -#endif -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif Index: xc/fonts/scaled/Speedo/Imakefile diff -u xc/fonts/scaled/Speedo/Imakefile:1.8 xc/fonts/scaled/Speedo/Imakefile:1.9 --- xc/fonts/scaled/Speedo/Imakefile:1.8 Mon Feb 16 13:14:35 2004 +++ xc/fonts/scaled/Speedo/Imakefile Mon Jan 9 09:58:13 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 15:17:40 xorgcvs Exp $ - - - -XCOMM $XFree86: xc/fonts/scaled/Speedo/Imakefile,v 1.8 2004/02/16 18:14:35 dawes Exp $ +XCOMM $XFree86: xc/fonts/scaled/Speedo/Imakefile,v 1.9 2006/01/09 14:58:13 dawes Exp $ OBJS = font0648.spd font0649.spd font0709.spd font0710.spd \ font0419.spd font0582.spd font0583.spd font0611.spd Index: xc/fonts/scaled/TTF/Imakefile diff -u xc/fonts/scaled/TTF/Imakefile:1.6 xc/fonts/scaled/TTF/Imakefile:1.7 --- xc/fonts/scaled/TTF/Imakefile:1.6 Tue Mar 2 14:43:20 2004 +++ xc/fonts/scaled/TTF/Imakefile Fri Mar 17 20:34:23 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.6 2004/03/02 19:43:20 dawes Exp $ +XCOMM $XFree86: xc/fonts/scaled/TTF/Imakefile,v 1.7 2006/03/18 01:34:23 dawes Exp $ LUXIFONTS = luximb.ttf luximbi.ttf luximr.ttf luximri.ttf \ luxirb.ttf luxirbi.ttf luxirr.ttf luxirri.ttf \ @@ -16,20 +16,11 @@ MakeFontsScale($(OBJS)) MakeFontsDir(fonts.scale) -#if UseFreetype2 MakeFcCache($(FONTS)) -#endif InstallFonts($(FONTINSTDIR)) InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) -#if UseFreetype2 InstallFcCache($(FONTINSTDIR)) -#endif - -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif LinkSourceFile(Vera.ttf,$(VERASRCDIR)) LinkSourceFile(VeraBI.ttf,$(VERASRCDIR)) Index: xc/fonts/scaled/Type1/Imakefile diff -u xc/fonts/scaled/Type1/Imakefile:1.19 xc/fonts/scaled/Type1/Imakefile:1.20 --- xc/fonts/scaled/Type1/Imakefile:1.19 Mon May 31 20:16:55 2004 +++ xc/fonts/scaled/Type1/Imakefile Fri Mar 17 20:34:23 2006 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/fonts/scaled/Type1/Imakefile,v 1.19 2004/06/01 00:16:55 dawes Exp $ +XCOMM $XFree86: xc/fonts/scaled/Type1/Imakefile,v 1.20 2006/03/18 01:34:23 dawes Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -73,17 +73,9 @@ MakeFontsScale($(OBJS)) MakeFontsDir(fonts.scale) -#if UseFreetype2 MakeFcCache($(OBJS)) -#endif InstallFonts($(FONTINSTDIR)) InstallEncodingsDir($(ENCODINGSSRC),$(FONTINSTDIR)) -#if UseFreetype2 InstallFcCache($(FONTINSTDIR)) -#endif -#ifdef IHaveSubdirs -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif Index: xc/fonts/util/8859-7.TXT diff -u xc/fonts/util/8859-7.TXT:1.2 xc/fonts/util/8859-7.TXT:1.3 --- xc/fonts/util/8859-7.TXT:1.2 Sun Jul 25 16:17:02 2004 +++ xc/fonts/util/8859-7.TXT Mon Mar 28 23:00:30 2005 @@ -1,3 +1,4 @@ +# $XFree86: xc/fonts/util/8859-7.TXT,v 1.3 2005/03/29 04:00:30 tsi Exp $ # # Name: ISO 8859-7:2003 to Unicode # Unicode version: 4.0 Index: xc/fonts/util/bdftruncate.pl diff -u xc/fonts/util/bdftruncate.pl:1.3 xc/fonts/util/bdftruncate.pl:1.4 --- xc/fonts/util/bdftruncate.pl:1.3 Sat Oct 12 12:06:42 2002 +++ xc/fonts/util/bdftruncate.pl Mon Jan 9 09:58:13 2006 @@ -6,7 +6,7 @@ # BDF font other ISO10646-1 BDF fonts in which all characters above # a threshold code value are stored unencoded. # -# Id: bdftruncate.pl,v 1.5 2001-05-31 10:58:58+01 mgk25 Exp $ +# $XFree86: xc/fonts/util/bdftruncate.pl,v 1.4 2006/01/09 14:58:13 dawes Exp $ # Subroutine to identify whether the ISO 10646/Unicode character code # ucs belongs into the East Asian Wide (W) or East Asian FullWidth Index: xc/fonts/util/ucs2any.c diff -u xc/fonts/util/ucs2any.c:1.1 xc/fonts/util/ucs2any.c:1.2 --- xc/fonts/util/ucs2any.c:1.1 Sun Sep 21 06:54:14 2003 +++ xc/fonts/util/ucs2any.c Mon Jan 9 09:58:14 2006 @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/fonts/util/ucs2any.c,v 1.1 2003/09/21 10:54:14 herrb Exp $ */ +/* $XFree86: xc/fonts/util/ucs2any.c,v 1.2 2006/01/09 14:58:14 dawes Exp $ */ /* * This utility allows you to generate from an ISO10646-1 encoded * BDF font other BDF fonts in any possible encoding. This way, you can @@ -631,7 +631,7 @@ spacing_index = ++nextheader; da_add_str(headers, spacing_index, NULL); } else if ((nextc = startswith(l, "COMMENT")) != NULL) { - if (strncmp(nextc, "$Id: ", 5)==0) { + if (strncmp(nextc, "$XFree86: ", 5)==0) { char *header = NULL; char *id = NULL, *end = NULL; id = zstrdup(nextc + 5); Index: xc/fonts/util/ucs2any.pl diff -u xc/fonts/util/ucs2any.pl:1.5 xc/fonts/util/ucs2any.pl:1.6 --- xc/fonts/util/ucs2any.pl:1.5 Sat Oct 12 12:06:42 2002 +++ xc/fonts/util/ucs2any.pl Mon Jan 9 09:58:14 2006 @@ -11,8 +11,7 @@ # storing the same fonts in many different encodings is clearly # a waste of storage capacity). # -# Id: ucs2any.pl,v 1.12 2001-02-17 15:21:05+00 mgk25 Rel -# $XFree86: xc/fonts/util/ucs2any.pl,v 1.5 2002/10/12 16:06:42 herrb Exp $ +# $XFree86: xc/fonts/util/ucs2any.pl,v 1.6 2006/01/09 14:58:14 dawes Exp $ use strict 'subs'; Index: xc/include/DECkeysym.h diff -u xc/include/DECkeysym.h:1.2 xc/include/DECkeysym.h:1.3 --- xc/include/DECkeysym.h:1.2 Fri Dec 14 14:53:24 2001 +++ xc/include/DECkeysym.h Mon Jan 9 09:58:14 2006 @@ -1,5 +1,4 @@ -/* $Xorg: DECkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ - +/* $XFree86: xc/include/DECkeysym.h,v 1.3 2006/01/09 14:58:14 dawes Exp $ */ /*********************************************************** Copyright 1988, 1998 The Open Group Index: xc/include/HPkeysym.h diff -u xc/include/HPkeysym.h:3.4 xc/include/HPkeysym.h:3.5 --- xc/include/HPkeysym.h:3.4 Fri Dec 14 14:53:25 2001 +++ xc/include/HPkeysym.h Mon Jan 9 09:58:14 2006 @@ -1,4 +1,4 @@ -/* $Xorg: HPkeysym.h,v 1.5 2001/02/09 02:03:22 xorgcvs Exp $ */ +/* $XFree86: xc/include/HPkeysym.h,v 3.5 2006/01/09 14:58:14 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/include/Imakefile diff -u xc/include/Imakefile:3.30 xc/include/Imakefile:3.31 --- xc/include/Imakefile:3.30 Sat Jan 15 19:13:16 2005 +++ xc/include/Imakefile Fri Oct 14 11:15:54 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/include/Imakefile,v 3.30 2005/01/16 00:13:16 dawes Exp $ +XCOMM $XFree86: xc/include/Imakefile,v 3.31 2005/10/14 15:15:54 tsi Exp $ #define IHaveSubdirs #define PassCDebugFlags /**/ @@ -12,10 +12,6 @@ SUBDIRS = bitmaps extensions fonts $(GLXDIR) $(DPSDIR) -#ifdef Win32Architecture -EXTRA_HEADERS = Xw32defs.h Xwinsock.h -#endif - HEADERS = DECkeysym.h \ HPkeysym.h \ Sunkeysym.h \ @@ -39,7 +35,8 @@ ap_keysym.h \ keysym.h \ keysymdef.h \ - $(EXTRA_HEADERS) + Xw32defs.h \ + Xwinsock.h all:: Index: xc/include/Sunkeysym.h diff -u xc/include/Sunkeysym.h:1.2 xc/include/Sunkeysym.h:1.3 --- xc/include/Sunkeysym.h:1.2 Fri Dec 14 14:53:25 2001 +++ xc/include/Sunkeysym.h Mon Jan 9 09:58:14 2006 @@ -1,5 +1,4 @@ -/* $Xorg: Sunkeysym.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ - +/* $XFree86: xc/include/Sunkeysym.h,v 1.3 2006/01/09 14:58:14 dawes Exp $ */ /************************************************************ Copyright 1991, 1998 The Open Group Index: xc/include/X.h diff -u xc/include/X.h:1.7 xc/include/X.h:1.8 --- xc/include/X.h:1.7 Fri Jul 18 11:53:24 2003 +++ xc/include/X.h Mon Jan 9 09:58:14 2006 @@ -1,7 +1,3 @@ -/* - * $Xorg: X.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ - */ - /* Definitions for the X window system likely to be used by applications */ #ifndef X_H @@ -53,7 +49,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/X.h,v 1.7 2003/07/18 15:53:24 tsi Exp $ */ +/* $XFree86: xc/include/X.h,v 1.8 2006/01/09 14:58:14 dawes Exp $ */ #define X_PROTOCOL 11 /* current protocol version */ #define X_PROTOCOL_REVISION 0 /* current minor version */ Index: xc/include/XWDFile.h diff -u xc/include/XWDFile.h:1.2 xc/include/XWDFile.h:1.3 --- xc/include/XWDFile.h:1.2 Fri Dec 14 14:53:25 2001 +++ xc/include/XWDFile.h Mon Jan 9 09:58:15 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XWDFile.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ +/* $XFree86: xc/include/XWDFile.h,v 1.3 2006/01/09 14:58:15 dawes Exp $ */ /* Copyright 1985, 1986, 1998 The Open Group Index: xc/include/Xalloca.h diff -u xc/include/Xalloca.h:3.11 xc/include/Xalloca.h:3.12 --- xc/include/Xalloca.h:3.11 Sun Dec 1 15:08:41 2002 +++ xc/include/Xalloca.h Mon Jan 9 09:58:15 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xalloca.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ - /* Copyright 1995, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/include/Xalloca.h,v 3.11 2002/12/01 20:08:41 tsi Exp $ */ +/* $XFree86: xc/include/Xalloca.h,v 3.12 2006/01/09 14:58:15 dawes Exp $ */ /* * The purpose of this header is to define the macros ALLOCATE_LOCAL and Index: xc/include/Xfuncproto.h diff -u xc/include/Xfuncproto.h:3.5 xc/include/Xfuncproto.h:3.6 --- xc/include/Xfuncproto.h:3.5 Wed Dec 19 16:37:28 2001 +++ xc/include/Xfuncproto.h Mon Jan 9 09:58:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xfuncproto.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ /* * Copyright 1989, 1991, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/include/Xfuncproto.h,v 3.5 2001/12/19 21:37:28 dawes Exp $ */ +/* $XFree86: xc/include/Xfuncproto.h,v 3.6 2006/01/09 14:58:15 dawes Exp $ */ /* Definitions to make function prototypes manageable */ Index: xc/include/Xfuncs.h diff -u xc/include/Xfuncs.h:3.12 xc/include/Xfuncs.h:3.13 --- xc/include/Xfuncs.h:3.12 Sat Apr 3 17:26:20 2004 +++ xc/include/Xfuncs.h Mon Jan 9 09:58:15 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ - * * Copyright 1990, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/include/Xfuncs.h,v 3.12 2004/04/03 22:26:20 dawes Exp $ */ +/* $XFree86: xc/include/Xfuncs.h,v 3.13 2006/01/09 14:58:15 dawes Exp $ */ #ifndef _XFUNCS_H_ #define _XFUNCS_H_ Index: xc/include/Xmd.h diff -u xc/include/Xmd.h:3.19 xc/include/Xmd.h:3.20 --- xc/include/Xmd.h:3.19 Thu Oct 23 11:19:01 2003 +++ xc/include/Xmd.h Tue Jun 28 21:14:09 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/Xmd.h,v 3.19 2003/10/23 15:19:01 tsi Exp $ */ +/* $XFree86: xc/include/Xmd.h,v 3.20 2005/06/29 01:14:09 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -47,7 +47,6 @@ ******************************************************************/ #ifndef XMD_H #define XMD_H 1 -/* $Xorg: Xmd.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ /* * Xmd.h: MACHINE DEPENDENT DECLARATIONS. */ @@ -64,7 +63,7 @@ defined(__sparc64__) || \ defined(__s390x__) || \ (defined(__hppa__) && defined(__LP64__)) || \ - defined(__AMD64__) || defined(AMD64) || \ + defined(__amd64__) || defined(__x86_64__) || \ (defined(sgi) && (_MIPS_SZLONG == 64)) #define LONG64 /* 32/64-bit architecture */ #endif Index: xc/include/Xos.h diff -u xc/include/Xos.h:3.43 xc/include/Xos.h:3.44 --- xc/include/Xos.h:3.43 Sat Apr 3 17:26:20 2004 +++ xc/include/Xos.h Mon Jan 9 09:58:15 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $ - * * Copyright 1987, 1998 The Open Group @@ -27,7 +25,7 @@ * The X Window System is a Trademark of The Open Group. * */ -/* $XFree86: xc/include/Xos.h,v 3.43 2004/04/03 22:26:20 dawes Exp $ */ +/* $XFree86: xc/include/Xos.h,v 3.44 2006/01/09 14:58:15 dawes Exp $ */ /* This is a collection of things to try and minimize system dependencies * in a "signficant" number of source files. Index: xc/include/Xos_r.h diff -u xc/include/Xos_r.h:1.19 xc/include/Xos_r.h:1.21 --- xc/include/Xos_r.h:1.19 Thu Oct 23 11:19:01 2003 +++ xc/include/Xos_r.h Wed Mar 1 16:01:55 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xos_r.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -22,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/Xos_r.h,v 1.19 2003/10/23 15:19:01 tsi Exp $ */ +/* $XFree86: xc/include/Xos_r.h,v 1.21 2006/03/01 21:01:55 dawes Exp $ */ /* * Various and sundry Thread-Safe functions used by X11, Motif, and CDE. @@ -180,10 +179,10 @@ # define _Xos_isThreadInitialized 0 # endif # ifndef _Xos_processLock -# define _Xos_processLock 0 +# define _Xos_processLock (void)0 # endif # ifndef _Xos_processUnlock -# define _Xos_processUnlock 0 +# define _Xos_processUnlock (void)0 # endif # endif Index: xc/include/Xosdefs.h diff -u xc/include/Xosdefs.h:3.22 xc/include/Xosdefs.h:3.23 --- xc/include/Xosdefs.h:3.22 Sat Apr 3 17:26:20 2004 +++ xc/include/Xosdefs.h Mon Jan 9 09:58:15 2006 @@ -1,8 +1,6 @@ /* * O/S-dependent (mis)feature macro definitions * - * $Xorg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $ - * Copyright 1991, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -25,7 +23,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.22 2004/04/03 22:26:20 dawes Exp $ */ +/* $XFree86: xc/include/Xosdefs.h,v 3.23 2006/01/09 14:58:15 dawes Exp $ */ #ifndef _XOSDEFS_H_ #define _XOSDEFS_H_ Index: xc/include/Xpoll.h diff -u xc/include/Xpoll.h:3.10 xc/include/Xpoll.h:3.11 --- xc/include/Xpoll.h:3.10 Wed Mar 31 11:37:08 2004 +++ xc/include/Xpoll.h Mon Jan 9 09:58:15 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xpoll.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/include/Xpoll.h,v 3.10 2004/03/31 16:37:08 tsi Exp $ */ +/* $XFree86: xc/include/Xpoll.h,v 3.11 2006/01/09 14:58:15 dawes Exp $ */ #ifndef _XPOLL_H_ #define _XPOLL_H_ Index: xc/include/Xproto.h diff -u xc/include/Xproto.h:1.2 xc/include/Xproto.h:1.3 --- xc/include/Xproto.h:1.2 Fri Dec 14 14:53:26 2001 +++ xc/include/Xproto.h Mon Jan 9 09:58:15 2006 @@ -1,6 +1,4 @@ -/* - * $Xorg: Xproto.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ - */ +/* $XFree86: xc/include/Xproto.h,v 1.3 2006/01/09 14:58:15 dawes Exp $ */ /* Definitions for the X window system used by server and c bindings */ Index: xc/include/Xprotostr.h diff -u xc/include/Xprotostr.h:1.2 xc/include/Xprotostr.h:1.3 --- xc/include/Xprotostr.h:1.2 Fri Dec 14 14:53:26 2001 +++ xc/include/Xprotostr.h Mon Jan 9 09:58:15 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Xprotostr.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ +/* $XFree86: xc/include/Xprotostr.h,v 1.3 2006/01/09 14:58:15 dawes Exp $ */ #ifndef XPROTOSTRUCTS_H #define XPROTOSTRUCTS_H Index: xc/include/Xthreads.h diff -u xc/include/Xthreads.h:3.11 xc/include/Xthreads.h:3.12 --- xc/include/Xthreads.h:3.11 Sat Mar 8 14:14:53 2003 +++ xc/include/Xthreads.h Mon Jan 9 09:58:15 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Xthreads.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $ - * * Copyright 1993, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * * */ -/* $XFree86: xc/include/Xthreads.h,v 3.11 2003/03/08 19:14:53 herrb Exp $ */ +/* $XFree86: xc/include/Xthreads.h,v 3.12 2006/01/09 14:58:15 dawes Exp $ */ #ifndef _XTHREADS_H_ #define _XTHREADS_H_ Index: xc/include/Xw32defs.h diff -u xc/include/Xw32defs.h:1.1.1.3 xc/include/Xw32defs.h:1.2 --- xc/include/Xw32defs.h:1.1.1.3 Tue Jan 16 17:04:44 2001 +++ xc/include/Xw32defs.h Mon Jan 9 09:58:15 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Xw32defs.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ +/* $XFree86: xc/include/Xw32defs.h,v 1.2 2006/01/09 14:58:15 dawes Exp $ */ #ifndef _XW32DEFS_H #define _XW32DEFS_H Index: xc/include/Xwinsock.h diff -u xc/include/Xwinsock.h:1.2 xc/include/Xwinsock.h:1.3 --- xc/include/Xwinsock.h:1.2 Fri Dec 14 14:53:26 2001 +++ xc/include/Xwinsock.h Mon Jan 9 09:58:15 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Xwinsock.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ +/* $XFree86: xc/include/Xwinsock.h,v 1.3 2006/01/09 14:58:15 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/include/keysym.h diff -u xc/include/keysym.h:1.4 xc/include/keysym.h:1.5 --- xc/include/keysym.h:1.4 Fri Dec 14 14:53:26 2001 +++ xc/include/keysym.h Mon Jan 9 09:58:15 2006 @@ -1,5 +1,3 @@ -/* $Xorg: keysym.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/keysym.h,v 1.4 2001/12/14 19:53:26 dawes Exp $ */ +/* $XFree86: xc/include/keysym.h,v 1.5 2006/01/09 14:58:15 dawes Exp $ */ /* default keysyms */ #define XK_MISCELLANY Index: xc/include/keysymdef.h diff -u xc/include/keysymdef.h:1.13 xc/include/keysymdef.h:1.14 --- xc/include/keysymdef.h:1.13 Mon Jun 14 16:43:04 2004 +++ xc/include/keysymdef.h Mon Jan 9 09:58:15 2006 @@ -1,5 +1,3 @@ -/* $Xorg: keysymdef.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1994, 1998 The Open Group @@ -47,7 +45,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/keysymdef.h,v 1.13 2004/06/14 20:43:04 dawes Exp $ */ +/* $XFree86: xc/include/keysymdef.h,v 1.14 2006/01/09 14:58:15 dawes Exp $ */ #define XK_VoidSymbol 0xFFFFFF /* void symbol */ Index: xc/include/DPS/dpsclient.h diff -u xc/include/DPS/dpsclient.h:1.4 xc/include/DPS/dpsclient.h:1.5 --- xc/include/DPS/dpsclient.h:1.4 Tue Jul 31 20:44:34 2001 +++ xc/include/DPS/dpsclient.h Thu Mar 24 21:22:51 2005 @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/dpsclient.h,v 1.4 2001/08/01 00:44:34 tsi Exp $ */ +/* $XFree86: xc/include/DPS/dpsclient.h,v 1.5 2005/03/25 02:22:51 dawes Exp $ */ #ifndef DPSCLIENT_H #define DPSCLIENT_H @@ -132,8 +132,6 @@ extern "C" { #endif -extern void DPSversion(DPSContext ctxt, int bufsize, char buf[]); - extern void DPSDefaultErrorProc(DPSContext ctxt, DPSErrorCode errorCode, long unsigned int arg1, long unsigned int arg2); @@ -361,18 +359,6 @@ /* Returns whether a context is a text context or an execution context */ - /* generated functions used in dpstk */ -extern void DPSrectfill(DPSContext ctxt, double x, double y, double w, double h); -extern void DPSsetcmykcolor(DPSContext ctxt, double c, double m, double y, double k); -extern void DPSsetgray(DPSContext ctxt, double gray); -extern void DPSsethsbcolor(DPSContext ctxt, double h, double s, double b); -extern void DPSsetrgbcolor(DPSContext ctxt, double r, double g, double b); -extern void DPSsetXoffset(DPSContext ctxt, int x, int y); -extern void DPSinitviewclip(DPSContext ctxt); -extern void DPSinitgraphics(DPSContext ctxt); -extern void DPSscale(DPSContext ctxt, double x, double y); -extern void DPSinitclip(DPSContext ctxt); - #if defined(__cplusplus) || defined(c_plusplus) } #endif Index: xc/include/DPS/dpsconfig.h diff -u xc/include/DPS/dpsconfig.h:1.8 xc/include/DPS/dpsconfig.h:1.9 --- xc/include/DPS/dpsconfig.h:1.8 Sun Mar 21 06:27:05 2004 +++ xc/include/DPS/dpsconfig.h Tue Jun 28 21:14:09 2005 @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/include/DPS/dpsconfig.h,v 1.8 2004/03/21 11:27:05 herrb Exp $ */ +/* $XFree86: xc/include/DPS/dpsconfig.h,v 1.9 2005/06/29 01:14:09 dawes Exp $ */ #ifndef DPSCONFIG_H #define DPSCONFIG_H @@ -89,7 +89,7 @@ #if defined(__alpha) || defined(__alpha__) || \ defined(__ia64__) || defined(ia64) || \ defined(__s390x__) || \ - defined(__AMD64__) || defined(AMD64) || defined(__amd64__) + defined(__amd64__) || defined(__x86_64__) #define IEEEFLOAT 1 #endif Index: xc/include/bitmaps/Imakefile diff -u xc/include/bitmaps/Imakefile:1.3 xc/include/bitmaps/Imakefile:1.4 --- xc/include/bitmaps/Imakefile:1.3 Tue Aug 28 12:48:08 2001 +++ xc/include/bitmaps/Imakefile Mon Jan 9 09:58:16 2006 @@ -1,8 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $ - - - -XCOMM $XFree86: xc/include/bitmaps/Imakefile,v 1.3 2001/08/28 16:48:08 tsi Exp $ +XCOMM $XFree86: xc/include/bitmaps/Imakefile,v 1.4 2006/01/09 14:58:16 dawes Exp $ HEADERS = \ 1x1 \ Index: xc/include/extensions/Imakefile diff -u xc/include/extensions/Imakefile:3.59 xc/include/extensions/Imakefile:3.61 --- xc/include/extensions/Imakefile:3.59 Tue Jul 6 23:46:22 2004 +++ xc/include/extensions/Imakefile Mon Jan 9 09:58:16 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $ - - - - -XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.59 2004/07/07 03:46:22 martin Exp $ +XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.61 2006/01/09 14:58:16 dawes Exp $ #if BuildScreenSaverExt || BuildScreenSaverLibrary SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h @@ -45,8 +40,8 @@ RANDRHEADERS = randr.h randrproto.h #endif #if BuildXTrap || BuildXTrapLibrary -XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \ - xtraplibp.h xtrapproto.h +XTRAPHEADERS = xtrapbits.h xtrapdi.h xtrapemacros.h xtraplib.h \ + xtraplibp.h #endif #if BuildXResExt || BuildXResLibrary XRESHEADERS = XRes.h XResproto.h Index: xc/include/extensions/MITMisc.h diff -u xc/include/extensions/MITMisc.h:1.3 xc/include/extensions/MITMisc.h:1.4 --- xc/include/extensions/MITMisc.h:1.3 Mon Nov 17 17:20:02 2003 +++ xc/include/extensions/MITMisc.h Mon Jan 9 09:58:16 2006 @@ -1,3 +1,4 @@ +/* $XFree86: xc/include/extensions/MITMisc.h,v 1.4 2006/01/09 14:58:16 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -26,8 +27,6 @@ /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */ -/* $Xorg: MITMisc.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ - #ifndef _XMITMISC_H_ #define _XMITMISC_H_ Index: xc/include/extensions/Print.h diff -u xc/include/extensions/Print.h:1.5 xc/include/extensions/Print.h:1.6 --- xc/include/extensions/Print.h:1.5 Wed Jan 17 12:53:15 2001 +++ xc/include/extensions/Print.h Mon Jan 9 09:58:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Print.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -57,7 +56,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/include/extensions/Print.h,v 1.5 2001/01/17 17:53:15 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Print.h,v 1.6 2006/01/09 14:58:16 dawes Exp $ */ #ifndef _XpPrint_H_ #define _XpPrint_H_ Index: xc/include/extensions/Printstr.h diff -u xc/include/extensions/Printstr.h:1.6 xc/include/extensions/Printstr.h:1.7 --- xc/include/extensions/Printstr.h:1.6 Thu Aug 23 08:46:11 2001 +++ xc/include/extensions/Printstr.h Fri Oct 14 11:15:54 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Printstr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ +/* $XFree86: xc/include/extensions/Printstr.h,v 1.7 2005/10/14 15:15:54 tsi Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -43,7 +43,6 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/include/extensions/Printstr.h,v 1.6 2001/08/23 12:46:11 alanh Exp $ */ #ifndef _XpPrintstr_H_ @@ -764,7 +763,7 @@ int imageRes; } XpContextRec, *XpContextPtr; -#include "fontstruct.h" /* FontResolutionPtr */ +#include /* FontResolutionPtr */ extern Bool XpAllocateContextPrivate(int, unsigned); extern FontResolutionPtr XpGetClientResolutions(ClientPtr, int *); Index: xc/include/extensions/XEVI.h diff -u xc/include/extensions/XEVI.h:3.5 xc/include/extensions/XEVI.h:3.6 --- xc/include/extensions/XEVI.h:3.5 Mon Nov 17 17:20:02 2003 +++ xc/include/extensions/XEVI.h Mon Jan 9 09:58:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XEVI.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this @@ -21,7 +20,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XEVI.h,v 3.5 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XEVI.h,v 3.6 2006/01/09 14:58:16 dawes Exp $ */ #ifndef _XEVI_H_ #define _XEVI_H_ Index: xc/include/extensions/XEVIstr.h diff -u xc/include/extensions/XEVIstr.h:3.5 xc/include/extensions/XEVIstr.h:3.6 --- xc/include/extensions/XEVIstr.h:3.5 Tue Jul 31 20:44:35 2001 +++ xc/include/extensions/XEVIstr.h Mon Jan 9 09:58:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XEVIstr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this @@ -21,7 +20,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XEVIstr.h,v 3.5 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/XEVIstr.h,v 3.6 2006/01/09 14:58:16 dawes Exp $ */ #ifndef _EVISTR_H_ #define _EVISTR_H_ Index: xc/include/extensions/XI.h diff -u xc/include/extensions/XI.h:1.5 xc/include/extensions/XI.h:1.6 --- xc/include/extensions/XI.h:1.5 Fri Dec 14 14:53:28 2001 +++ xc/include/extensions/XI.h Mon Jan 9 09:58:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XI.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XI.h,v 1.5 2001/12/14 19:53:28 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XI.h,v 1.6 2006/01/09 14:58:16 dawes Exp $ */ /* Definitions used by the server, library and client */ Index: xc/include/extensions/XIproto.h diff -u xc/include/extensions/XIproto.h:1.5 xc/include/extensions/XIproto.h:1.6 --- xc/include/extensions/XIproto.h:1.5 Fri Dec 14 14:53:28 2001 +++ xc/include/extensions/XIproto.h Mon Jan 9 09:58:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XIproto.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XIproto.h,v 1.5 2001/12/14 19:53:28 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XIproto.h,v 1.6 2006/01/09 14:58:17 dawes Exp $ */ #ifndef _XIPROTO_H #define _XIPROTO_H Index: xc/include/extensions/XKB.h diff -u xc/include/extensions/XKB.h:1.6 xc/include/extensions/XKB.h:1.7 --- xc/include/extensions/XKB.h:1.6 Mon Dec 22 12:48:02 2003 +++ xc/include/extensions/XKB.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKB.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKB.h,v 1.6 2003/12/22 17:48:02 tsi Exp $ */ +/* $XFree86: xc/include/extensions/XKB.h,v 1.7 2006/01/09 14:58:17 dawes Exp $ */ #ifndef _XKB_H_ #define _XKB_H_ Index: xc/include/extensions/XKBgeom.h diff -u xc/include/extensions/XKBgeom.h:3.10 xc/include/extensions/XKBgeom.h:3.11 --- xc/include/extensions/XKBgeom.h:3.10 Mon Nov 17 17:20:02 2003 +++ xc/include/extensions/XKBgeom.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBgeom.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.10 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.11 2006/01/09 14:58:17 dawes Exp $ */ #ifndef _XKBGEOM_H_ #define _XKBGEOM_H_ Index: xc/include/extensions/XKBproto.h diff -u xc/include/extensions/XKBproto.h:3.3 xc/include/extensions/XKBproto.h:3.4 --- xc/include/extensions/XKBproto.h:3.3 Wed Jan 17 12:53:18 2001 +++ xc/include/extensions/XKBproto.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XKBproto.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ +/* $XFree86: xc/include/extensions/XKBproto.h,v 3.4 2006/01/09 14:58:17 dawes Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. Index: xc/include/extensions/XKBsrv.h diff -u xc/include/extensions/XKBsrv.h:3.23 xc/include/extensions/XKBsrv.h:3.24 --- xc/include/extensions/XKBsrv.h:3.23 Mon Nov 17 17:20:02 2003 +++ xc/include/extensions/XKBsrv.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBsrv.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.23 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.24 2006/01/09 14:58:17 dawes Exp $ */ #ifndef _XKBSRV_H_ #define _XKBSRV_H_ Index: xc/include/extensions/XKBstr.h diff -u xc/include/extensions/XKBstr.h:3.2 xc/include/extensions/XKBstr.h:3.3 --- xc/include/extensions/XKBstr.h:3.2 Wed Jan 17 12:53:18 2001 +++ xc/include/extensions/XKBstr.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XKBstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ +/* $XFree86: xc/include/extensions/XKBstr.h,v 3.3 2006/01/09 14:58:17 dawes Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. Index: xc/include/extensions/XLbx.h diff -u xc/include/extensions/XLbx.h:1.4 xc/include/extensions/XLbx.h:1.5 --- xc/include/extensions/XLbx.h:1.4 Mon Nov 17 17:20:02 2003 +++ xc/include/extensions/XLbx.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XLbx.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* * Copyright 1992 Network Computing Devices * @@ -20,7 +19,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/include/extensions/XLbx.h,v 1.4 2003/11/17 22:20:02 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XLbx.h,v 1.5 2006/01/09 14:58:17 dawes Exp $ */ #ifndef _XLBX_H_ #define _XLBX_H_ Index: xc/include/extensions/XShm.h diff -u xc/include/extensions/XShm.h:1.12 xc/include/extensions/XShm.h:1.14 --- xc/include/extensions/XShm.h:1.12 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/XShm.h Sun Feb 19 10:51:13 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/XShm.h,v 1.12 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XShm.h,v 1.14 2006/02/19 15:51:13 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,8 +27,6 @@ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ -/* $Xorg: XShm.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ - #ifndef _XSHM_H_ #define _XSHM_H_ @@ -155,6 +153,9 @@ extern void ShmRegisterFbFuncs( ScreenPtr /* pScreen */ ); +extern void ShmRegisterMiFuncs( + ScreenPtr /* pScreen */ +); #endif Index: xc/include/extensions/XTest.h diff -u xc/include/extensions/XTest.h:3.4 xc/include/extensions/XTest.h:3.5 --- xc/include/extensions/XTest.h:3.4 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/XTest.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XTest.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/XTest.h,v 3.4 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XTest.h,v 3.5 2006/01/09 14:58:17 dawes Exp $ */ #ifndef _XTEST_H_ #define _XTEST_H_ Index: xc/include/extensions/Xag.h diff -u xc/include/extensions/Xag.h:1.6 xc/include/extensions/Xag.h:1.7 --- xc/include/extensions/Xag.h:1.6 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/Xag.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Xag.h,v 1.6 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Xag.h,v 1.7 2006/01/09 14:58:17 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -24,7 +24,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: Xag.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */ #ifndef _XAG_H_ #define _XAG_H_ Index: xc/include/extensions/Xagsrv.h diff -u xc/include/extensions/Xagsrv.h:1.6 xc/include/extensions/Xagsrv.h:1.7 --- xc/include/extensions/Xagsrv.h:1.6 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/Xagsrv.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Xagsrv.h,v 1.6 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Xagsrv.h,v 1.7 2006/01/09 14:58:17 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -24,7 +24,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: Xagsrv.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ #ifndef _XAGSRV_H_ #define _XAGSRV_H_ Index: xc/include/extensions/Xagstr.h diff -u xc/include/extensions/Xagstr.h:1.5 xc/include/extensions/Xagstr.h:1.6 --- xc/include/extensions/Xagstr.h:1.5 Mon Dec 17 15:52:24 2001 +++ xc/include/extensions/Xagstr.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/Xagstr.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Xagstr.h,v 1.6 2006/01/09 14:58:17 dawes Exp $ */ /* Copyright 1996, 1998, 2001 The Open Group @@ -24,7 +24,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: Xagstr.h,v 1.6 2001/02/09 02:03:24 xorgcvs Exp $ */ #ifndef _XAGSTR_H_ /* { */ #define _XAGSTR_H_ Index: xc/include/extensions/Xcup.h diff -u xc/include/extensions/Xcup.h:3.6 xc/include/extensions/Xcup.h:3.7 --- xc/include/extensions/Xcup.h:3.6 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/Xcup.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xcup.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/Xcup.h,v 3.6 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Xcup.h,v 3.7 2006/01/09 14:58:17 dawes Exp $ */ #ifndef _XCUP_H_ #define _XCUP_H_ Index: xc/include/extensions/Xcupstr.h diff -u xc/include/extensions/Xcupstr.h:3.6 xc/include/extensions/Xcupstr.h:3.7 --- xc/include/extensions/Xcupstr.h:3.6 Fri Dec 14 14:53:28 2001 +++ xc/include/extensions/Xcupstr.h Mon Jan 9 09:58:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xcupstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/Xcupstr.h,v 3.6 2001/12/14 19:53:28 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Xcupstr.h,v 3.7 2006/01/09 14:58:17 dawes Exp $ */ #ifndef _XCUPSTR_H_ /* { */ #define _XCUPSTR_H_ Index: xc/include/extensions/Xdbe.h diff -u xc/include/extensions/Xdbe.h:3.3 xc/include/extensions/Xdbe.h:3.4 --- xc/include/extensions/Xdbe.h:3.3 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/Xdbe.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xdbe.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /****************************************************************************** * * Copyright (c) 1994, 1995 Hewlett-Packard Company @@ -30,7 +29,7 @@ * Header file for Xlib-related DBE * *****************************************************************************/ -/* $XFree86: xc/include/extensions/Xdbe.h,v 3.3 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/Xdbe.h,v 3.4 2006/01/09 14:58:17 dawes Exp $ */ #ifndef XDBE_H #define XDBE_H Index: xc/include/extensions/Xdbeproto.h diff -u xc/include/extensions/Xdbeproto.h:3.1 xc/include/extensions/Xdbeproto.h:3.2 --- xc/include/extensions/Xdbeproto.h:3.1 Wed Jan 17 12:53:20 2001 +++ xc/include/extensions/Xdbeproto.h Wed Dec 28 17:30:39 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Xdbeproto.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ +/* $XFree86: xc/include/extensions/Xdbeproto.h,v 3.2 2005/12/28 22:30:39 tsi Exp $ */ /****************************************************************************** * * Copyright (c) 1994, 1995 Hewlett-Packard Company @@ -37,6 +37,8 @@ /* INCLUDES */ +#include +#include /* DEFINES */ Index: xc/include/extensions/bigreqstr.h diff -u xc/include/extensions/bigreqstr.h:1.3 xc/include/extensions/bigreqstr.h:1.4 --- xc/include/extensions/bigreqstr.h:1.3 Tue Jul 15 21:38:24 2003 +++ xc/include/extensions/bigreqstr.h Mon Jan 9 09:58:17 2006 @@ -1,4 +1,3 @@ -/* $Xorg: bigreqstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/bigreqstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86: xc/include/extensions/bigreqstr.h,v 1.4 2006/01/09 14:58:17 dawes Exp $ */ #ifndef _BIGREQSTR_H_ #define _BIGREQSTR_H_ Index: xc/include/extensions/dpms.h diff -u xc/include/extensions/dpms.h:3.5 xc/include/extensions/dpms.h:3.6 --- xc/include/extensions/dpms.h:3.5 Wed Jan 17 12:53:20 2001 +++ xc/include/extensions/dpms.h Mon Jan 9 09:58:18 2006 @@ -1,4 +1,3 @@ -/* $Xorg: dpms.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. @@ -26,7 +25,7 @@ Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/dpms.h,v 3.5 2001/01/17 17:53:20 dawes Exp $ */ +/* $XFree86: xc/include/extensions/dpms.h,v 3.6 2006/01/09 14:58:18 dawes Exp $ */ /* * HISTORY Index: xc/include/extensions/dpmsstr.h diff -u xc/include/extensions/dpmsstr.h:3.4 xc/include/extensions/dpmsstr.h:3.5 --- xc/include/extensions/dpmsstr.h:3.4 Tue Jul 15 21:38:24 2003 +++ xc/include/extensions/dpmsstr.h Mon Jan 9 09:58:18 2006 @@ -1,4 +1,3 @@ -/* $Xorg: dpmsstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. @@ -26,7 +25,7 @@ Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/dpmsstr.h,v 3.4 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86: xc/include/extensions/dpmsstr.h,v 3.5 2006/01/09 14:58:18 dawes Exp $ */ /* * HISTORY Index: xc/include/extensions/extutil.h diff -u xc/include/extensions/extutil.h:1.10 xc/include/extensions/extutil.h:1.11 --- xc/include/extensions/extutil.h:1.10 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/extutil.h Mon Jan 9 09:58:18 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: extutil.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -31,7 +30,7 @@ * protocol extensions. THESE INTERFACES ARE NOT PART OF THE X STANDARD AND * ARE SUBJECT TO CHANGE! */ -/* $XFree86: xc/include/extensions/extutil.h,v 1.10 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/extutil.h,v 1.11 2006/01/09 14:58:18 dawes Exp $ */ #ifndef _EXTUTIL_H_ #define _EXTUTIL_H_ Index: xc/include/extensions/fontcache.h diff -u xc/include/extensions/fontcache.h:1.4 xc/include/extensions/fontcache.h:1.5 --- xc/include/extensions/fontcache.h:1.4 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/fontcache.h Mon Jan 9 09:58:18 2006 @@ -25,9 +25,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Id: fontcache.h,v 1.6 1999/01/31 12:41:32 akiyama Exp $ */ -/* $XFree86: xc/include/extensions/fontcache.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/fontcache.h,v 1.5 2006/01/09 14:58:18 dawes Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ Index: xc/include/extensions/fontcacheP.h diff -u xc/include/extensions/fontcacheP.h:1.5 xc/include/extensions/fontcacheP.h:1.6 --- xc/include/extensions/fontcacheP.h:1.5 Tue Jul 31 20:44:35 2001 +++ xc/include/extensions/fontcacheP.h Mon Jan 9 09:58:18 2006 @@ -24,9 +24,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Id: fontcacheP.h,v 1.6 1999/01/31 12:43:53 akiyama Exp $ */ -/* $XFree86: xc/include/extensions/fontcacheP.h,v 1.5 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/fontcacheP.h,v 1.6 2006/01/09 14:58:18 dawes Exp $ */ #ifndef _FONTCACHEP_H_ #define _FONTCACHEP_H_ Index: xc/include/extensions/fontcachstr.h diff -u xc/include/extensions/fontcachstr.h:1.3 xc/include/extensions/fontcachstr.h:1.4 --- xc/include/extensions/fontcachstr.h:1.3 Tue Jul 31 20:44:35 2001 +++ xc/include/extensions/fontcachstr.h Mon Jan 9 09:58:18 2006 @@ -25,9 +25,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Id: fontcachstr.h,v 1.7 1999/01/31 14:58:40 akiyama Exp $ */ -/* $XFree86: xc/include/extensions/fontcachstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/fontcachstr.h,v 1.4 2006/01/09 14:58:18 dawes Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ Index: xc/include/extensions/lbxbuf.h diff -u xc/include/extensions/lbxbuf.h:1.4 xc/include/extensions/lbxbuf.h:1.5 --- xc/include/extensions/lbxbuf.h:1.4 Wed Dec 19 16:37:29 2001 +++ xc/include/extensions/lbxbuf.h Mon Jan 9 09:58:18 2006 @@ -1,4 +1,4 @@ -/* $Xorg: lbxbuf.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ +/* $XFree86: xc/include/extensions/lbxbuf.h,v 1.5 2006/01/09 14:58:18 dawes Exp $ */ /* * Copyright 1988, 1989, 1990, 1994 Network Computing Devices, Inc. * Index: xc/include/extensions/lbxbufstr.h diff -u xc/include/extensions/lbxbufstr.h:1.2 xc/include/extensions/lbxbufstr.h:1.3 --- xc/include/extensions/lbxbufstr.h:1.2 Tue Jul 31 20:44:35 2001 +++ xc/include/extensions/lbxbufstr.h Mon Jan 9 09:58:18 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lbxbufstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* * Copyright 1988, 1989, 1990, 1994 Network Computing Devices, Inc. * @@ -22,7 +21,7 @@ * SOFTWARE. * */ -/* $XFree86: xc/include/extensions/lbxbufstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/lbxbufstr.h,v 1.3 2006/01/09 14:58:18 dawes Exp $ */ #ifndef _BUFFERSTR_H_ #define _BUFFERSTR_H_ Index: xc/include/extensions/lbxdeltastr.h diff -u xc/include/extensions/lbxdeltastr.h:1.3 xc/include/extensions/lbxdeltastr.h:1.4 --- xc/include/extensions/lbxdeltastr.h:1.3 Wed Jan 17 12:53:21 2001 +++ xc/include/extensions/lbxdeltastr.h Mon Jan 9 09:58:18 2006 @@ -1,4 +1,4 @@ -/* $Xorg: lbxdeltastr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ +/* $XFree86: xc/include/extensions/lbxdeltastr.h,v 1.4 2006/01/09 14:58:18 dawes Exp $ */ /* * Copyright 1993 Network Computing Devices * Index: xc/include/extensions/lbximage.h diff -u xc/include/extensions/lbximage.h:1.5 xc/include/extensions/lbximage.h:1.6 --- xc/include/extensions/lbximage.h:1.5 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/lbximage.h Mon Jan 9 09:58:18 2006 @@ -1,5 +1,3 @@ -/* $Xorg: lbximage.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ - /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. ******************************************************************************/ -/* $XFree86: xc/include/extensions/lbximage.h,v 1.5 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/lbximage.h,v 1.6 2006/01/09 14:58:18 dawes Exp $ */ #ifndef _LBX_IMAGE_H_ #define _LBX_IMAGE_H_ Index: xc/include/extensions/lbxopts.h diff -u xc/include/extensions/lbxopts.h:1.6 xc/include/extensions/lbxopts.h:1.7 --- xc/include/extensions/lbxopts.h:1.6 Sat Oct 27 23:32:26 2001 +++ xc/include/extensions/lbxopts.h Mon Jan 9 09:58:18 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lbxopts.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* * Copyright 1994 Network Computing Devices, Inc. * @@ -21,7 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/include/extensions/lbxopts.h,v 1.6 2001/10/28 03:32:26 tsi Exp $ */ +/* $XFree86: xc/include/extensions/lbxopts.h,v 1.7 2006/01/09 14:58:18 dawes Exp $ */ #ifndef _LBX_OPTS_H_ #define _LBX_OPTS_H_ Index: xc/include/extensions/lbxstr.h diff -u xc/include/extensions/lbxstr.h:1.3 xc/include/extensions/lbxstr.h:1.4 --- xc/include/extensions/lbxstr.h:1.3 Fri Nov 23 14:21:30 2001 +++ xc/include/extensions/lbxstr.h Mon Jan 9 09:58:18 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lbxstr.h,v 1.4 2001/02/13 20:14:04 pookie Exp $ */ /* * Copyright 1992 Network Computing Devices * @@ -20,7 +19,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/include/extensions/lbxstr.h,v 1.3 2001/11/23 19:21:30 dawes Exp $ */ +/* $XFree86: xc/include/extensions/lbxstr.h,v 1.4 2006/01/09 14:58:18 dawes Exp $ */ #ifndef _LBXSTR_H_ #define _LBXSTR_H_ Index: xc/include/extensions/lbxzlib.h diff -u xc/include/extensions/lbxzlib.h:1.3 xc/include/extensions/lbxzlib.h:1.4 --- xc/include/extensions/lbxzlib.h:1.3 Wed Jan 17 12:53:21 2001 +++ xc/include/extensions/lbxzlib.h Mon Jan 9 09:58:18 2006 @@ -1,4 +1,4 @@ -/* $Xorg: lbxzlib.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ +/* $XFree86: xc/include/extensions/lbxzlib.h,v 1.4 2006/01/09 14:58:18 dawes Exp $ */ /* * Copyright 1993 Network Computing Devices * Index: xc/include/extensions/mitmiscstr.h diff -u xc/include/extensions/mitmiscstr.h:1.3 xc/include/extensions/mitmiscstr.h:1.4 --- xc/include/extensions/mitmiscstr.h:1.3 Tue Jul 15 21:38:24 2003 +++ xc/include/extensions/mitmiscstr.h Fri Oct 14 11:15:54 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/mitmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86: xc/include/extensions/mitmiscstr.h,v 1.4 2005/10/14 15:15:54 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,12 +27,10 @@ /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */ -/* $Xorg: mitmiscstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ - #ifndef _MITMISCSTR_H_ #define _MITMISCSTR_H_ -#include "MITMisc.h" +#include #define MITMISCNAME "MIT-SUNDRY-NONSTANDARD" Index: xc/include/extensions/multibuf.h diff -u xc/include/extensions/multibuf.h:3.5 xc/include/extensions/multibuf.h:3.6 --- xc/include/extensions/multibuf.h:3.5 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/multibuf.h Sun Mar 27 21:50:58 2005 @@ -1,5 +1,4 @@ /* - * $Xorg: multibuf.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/multibuf.h,v 3.5 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/multibuf.h,v 3.6 2005/03/28 02:50:58 dawes Exp $ */ #ifndef _MULTIBUF_H_ #define _MULTIBUF_H_ @@ -274,16 +273,19 @@ #include "scrnintstr.h" -typedef Bool (* mbInitFunc)(); - struct _mbufScreen; /* declared in multibufst.h */ +struct _mbufWindow; + +typedef Bool (* mbInitFunc)(ScreenPtr pScreen, struct _mbufScreen *pMBScreen); +typedef void (*mbufCopyBufferBitsFunc)(struct _mbufWindow *pMBWindow, + int srcBufferNum, int dstBufferNum); +typedef void (*mbufDrawSelectPlaneFunc)(ScreenPtr pScreen, + DevUnion selectPlane, RegionPtr prgn, + long bufferNum); extern void RegisterMultibufferInit( ScreenPtr /* pScreen */, - Bool (* /* bufMultibufferInit */)( - ScreenPtr /* pScreen */, - struct _mbufScreen * /* pMBScreen */ - ) + mbInitFunc /* bufMultibufferInit */ ); struct xMbufBufferInfo; /* declared in multibufst.h */ @@ -294,8 +296,8 @@ struct xMbufBufferInfo * /* pInfo */, DevUnion * /* frameBuffer */, DevUnion /* selectPlane */, - void (* /* CopyBufferBitsFunc */ )(), - void (* /* DrawSelectPlaneFunc */ )() + mbufCopyBufferBitsFunc /* CopyBufferBitsFunc */, + mbufDrawSelectPlaneFunc /* DrawSelectPlaneFunc */ ); extern int CreateImageBuffers ( Index: xc/include/extensions/multibufst.h diff -u xc/include/extensions/multibufst.h:3.9 xc/include/extensions/multibufst.h:3.11 --- xc/include/extensions/multibufst.h:3.9 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/multibufst.h Fri Oct 14 11:15:54 2005 @@ -1,5 +1,4 @@ /* - * $Xorg: multibufst.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/multibufst.h,v 3.9 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/multibufst.h,v 3.11 2005/10/14 15:15:54 tsi Exp $ */ #ifndef _MULTIBUFST_H_ #define _MULTIBUFST_H_ @@ -33,7 +32,7 @@ * Protocol requests constants and alignment values */ -#include "multibuf.h" +#include #ifdef _MULTIBUF_SERVER_ #include "inputstr.h" #endif @@ -532,11 +531,13 @@ unsigned short /* height */, Bool /* exposures */ ); - Bool (* ChangeMBufferAttributes)( /* pMBWindow, vmask */ - /* FIXME */ + Bool (* ChangeMBufferAttributes)( + mbufWindowPtr /* pMBWindow */, + unsigned long /* vmask */ ); - Bool (* ChangeBufferAttributes)( /* pMBBuffer, vmask */ - /* FIXME */ + Bool (* ChangeBufferAttributes)( + mbufBufferPtr /* pMBBuffer */, + unsigned long /* vmask */ ); void (* DeleteBufferDrawable)( DrawablePtr /* pDrawable */ @@ -590,8 +591,8 @@ RegionRec unionRgn; /* Regions gained by backBuffer */ Bool rgnChanged; /* TRUE if "backBuffer" needs to be updated */ - void (* CopyBufferBits)(); /* pMBWindow, srcBufferNum, dstBufferNum */ - void (* DrawSelectPlane)(); /* pScreen, selectPlane, pRegion, bufferNum */ + mbufCopyBufferBitsFunc CopyBufferBits; + mbufDrawSelectPlaneFunc DrawSelectPlane; /* Pointers to wrapped functions */ PostValidateTreeProcPtr PostValidateTree; /* pParent, pChild, kind */ Index: xc/include/extensions/panoramiXext.h diff -u xc/include/extensions/panoramiXext.h:3.7 xc/include/extensions/panoramiXext.h:3.8 --- xc/include/extensions/panoramiXext.h:3.7 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/panoramiXext.h Mon Jan 9 09:58:18 2006 @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXext.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -26,7 +25,7 @@ /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.7 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.8 2006/01/09 14:58:18 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ Index: xc/include/extensions/panoramiXproto.h diff -u xc/include/extensions/panoramiXproto.h:3.6 xc/include/extensions/panoramiXproto.h:3.7 --- xc/include/extensions/panoramiXproto.h:3.6 Wed Jan 17 12:53:22 2001 +++ xc/include/extensions/panoramiXproto.h Mon Jan 9 09:58:18 2006 @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXproto.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -23,7 +22,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.7 2006/01/09 14:58:18 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ Index: xc/include/extensions/record.h diff -u xc/include/extensions/record.h:1.2 xc/include/extensions/record.h:1.3 --- xc/include/extensions/record.h:1.2 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/record.h Mon Jan 9 09:58:18 2006 @@ -1,7 +1,3 @@ -/* -$Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ -*/ - /*************************************************************************** * Copyright 1995 Network Computing Devices * @@ -21,7 +17,7 @@ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86: xc/include/extensions/record.h,v 1.2 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/record.h,v 1.3 2006/01/09 14:58:18 dawes Exp $ */ #ifndef _RECORD_H_ #define _RECORD_H_ Index: xc/include/extensions/recordstr.h diff -u xc/include/extensions/recordstr.h:1.2 xc/include/extensions/recordstr.h:1.3 --- xc/include/extensions/recordstr.h:1.2 Tue Jul 31 20:44:35 2001 +++ xc/include/extensions/recordstr.h Mon Jan 9 09:58:18 2006 @@ -1,10 +1,3 @@ -/* -#ifndef lint -$Xorg: recordstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ -static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; -#endif -*/ - /*************************************************************************** * Copyright 1995 Network Computing Devices * @@ -24,7 +17,7 @@ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **************************************************************************/ -/* $XFree86: xc/include/extensions/recordstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/recordstr.h,v 1.3 2006/01/09 14:58:18 dawes Exp $ */ #ifndef _RECORDSTR_H_ #define _RECORDSTR_H_ Index: xc/include/extensions/saver.h diff -u xc/include/extensions/saver.h:3.0 xc/include/extensions/saver.h:3.1 --- xc/include/extensions/saver.h:3.0 Tue Jun 28 08:18:36 1994 +++ xc/include/extensions/saver.h Mon Jan 9 09:58:18 2006 @@ -1,5 +1,5 @@ +/* $XFree86: xc/include/extensions/saver.h,v 3.1 2006/01/09 14:58:18 dawes Exp $ */ /* - * $XConsortium: saver.h,v 1.5 94/04/17 20:59:33 rws Exp $ * Copyright (c) 1992 X Consortium Index: xc/include/extensions/saverproto.h diff -u xc/include/extensions/saverproto.h:3.2 xc/include/extensions/saverproto.h:3.3 --- xc/include/extensions/saverproto.h:3.2 Mon Sep 16 14:05:19 2002 +++ xc/include/extensions/saverproto.h Mon Jan 9 09:58:18 2006 @@ -1,5 +1,4 @@ /* - * $XConsortium: saverproto.h,v 1.5 94/04/17 20:59:33 keith Exp $ * Copyright (c) 1992 X Consortium @@ -26,7 +25,7 @@ * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/include/extensions/saverproto.h,v 3.2 2002/09/16 18:05:19 eich Exp $ */ +/* $XFree86: xc/include/extensions/saverproto.h,v 3.3 2006/01/09 14:58:18 dawes Exp $ */ #ifndef _SAVERPROTO_H_ #define _SAVERPROTO_H_ Index: xc/include/extensions/scrnsaver.h diff -u xc/include/extensions/scrnsaver.h:3.1 xc/include/extensions/scrnsaver.h:3.2 --- xc/include/extensions/scrnsaver.h:3.1 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/scrnsaver.h Mon Jan 9 09:58:19 2006 @@ -1,5 +1,4 @@ /* - * $XConsortium: scrnsaver.h,v 1.6 94/04/17 20:59:34 keith Exp $ * Copyright (c) 1992 X Consortium @@ -26,7 +25,7 @@ * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/include/extensions/scrnsaver.h,v 3.1 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/scrnsaver.h,v 3.2 2006/01/09 14:58:19 dawes Exp $ */ #ifndef _SCRNSAVER_H_ #define _SCRNSAVER_H_ Index: xc/include/extensions/security.h diff -u xc/include/extensions/security.h:1.4 xc/include/extensions/security.h:1.5 --- xc/include/extensions/security.h:1.4 Thu Nov 7 19:46:27 2002 +++ xc/include/extensions/security.h Mon Jan 9 09:58:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: security.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -24,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/security.h,v 1.4 2002/11/08 00:46:27 alanh Exp $ */ +/* $XFree86: xc/include/extensions/security.h,v 1.5 2006/01/09 14:58:19 dawes Exp $ */ #ifndef _SECURITY_H #define _SECURITY_H Index: xc/include/extensions/securstr.h diff -u xc/include/extensions/securstr.h:1.3 xc/include/extensions/securstr.h:1.4 --- xc/include/extensions/securstr.h:1.3 Fri Dec 14 14:53:29 2001 +++ xc/include/extensions/securstr.h Mon Jan 9 09:58:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: securstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -24,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/securstr.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */ +/* $XFree86: xc/include/extensions/securstr.h,v 1.4 2006/01/09 14:58:19 dawes Exp $ */ #ifndef _SECURSTR_H #define _SECURSTR_H Index: xc/include/extensions/shape.h diff -u xc/include/extensions/shape.h:1.4 xc/include/extensions/shape.h:1.5 --- xc/include/extensions/shape.h:1.4 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/shape.h Mon Jan 9 09:58:19 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/shape.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/shape.h,v 1.5 2006/01/09 14:58:19 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,8 +25,6 @@ ********************************************************/ -/* $Xorg: shape.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ - #ifndef _SHAPE_H_ #define _SHAPE_H_ Index: xc/include/extensions/shapestr.h diff -u xc/include/extensions/shapestr.h:1.2 xc/include/extensions/shapestr.h:1.3 --- xc/include/extensions/shapestr.h:1.2 Fri Dec 14 14:53:29 2001 +++ xc/include/extensions/shapestr.h Fri Oct 14 11:15:54 2005 @@ -24,7 +24,7 @@ ********************************************************/ -/* $Xorg: shapestr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ +/* $XFree86: xc/include/extensions/shapestr.h,v 1.3 2005/10/14 15:15:54 tsi Exp $ */ #ifndef _SHAPESTR_H_ #define _SHAPESTR_H_ @@ -34,7 +34,7 @@ * These would really be in SHAPE's X.h and Xproto.h equivalents */ -#include "shape.h" +#include #define Window CARD32 #define Time CARD32 Index: xc/include/extensions/shmstr.h diff -u xc/include/extensions/shmstr.h:3.4 xc/include/extensions/shmstr.h:3.6 --- xc/include/extensions/shmstr.h:3.4 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/shmstr.h Sun Feb 19 10:51:13 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/shmstr.h,v 3.4 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/shmstr.h,v 3.6 2006/02/19 15:51:13 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -30,9 +30,7 @@ #ifndef _SHMSTR_H_ #define _SHMSTR_H_ -/* $Xorg: shmstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ - -#include "XShm.h" +#include #define ShmSeg CARD32 #define Drawable CARD32 @@ -72,6 +70,10 @@ PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS); void (* PutImage)(XSHM_PUT_IMAGE_ARGS); } ShmFuncs, *ShmFuncsPtr; + +extern void ShmRegisterFuncs( + ScreenPtr /*pScreen*/, + ShmFuncsPtr /*funcs*/); #endif typedef struct _ShmQueryVersion { Index: xc/include/extensions/sync.h diff -u xc/include/extensions/sync.h:1.5 xc/include/extensions/sync.h:1.6 --- xc/include/extensions/sync.h:1.5 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/sync.h Mon Jan 9 09:58:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: sync.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ /* Copyright 1991, 1993, 1994, 1998 The Open Group @@ -48,7 +47,7 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/sync.h,v 1.5 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/sync.h,v 1.6 2006/01/09 14:58:19 dawes Exp $ */ #ifndef _SYNC_H_ #define _SYNC_H_ Index: xc/include/extensions/syncstr.h diff -u xc/include/extensions/syncstr.h:1.4 xc/include/extensions/syncstr.h:1.6 --- xc/include/extensions/syncstr.h:1.4 Mon Nov 17 17:20:03 2003 +++ xc/include/extensions/syncstr.h Fri Oct 14 11:15:54 2005 @@ -1,4 +1,3 @@ -/* $Xorg: syncstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ /* Copyright 1991, 1993, 1994, 1998 The Open Group @@ -48,12 +47,12 @@ PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/extensions/syncstr.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/syncstr.h,v 1.6 2005/10/14 15:15:54 tsi Exp $ */ #ifndef _SYNCSTR_H_ #define _SYNCSTR_H_ -#include "sync.h" +#include #ifndef _SYNC_OS @@ -389,21 +388,18 @@ XSyncCounterUnrestricted } SyncCounterType; +typedef void (*SyncQueryValueProcPtr)(pointer pCounter, CARD64 *freshvalue); +typedef void (*SyncBracketValuesProcPtr)(pointer pCounter, CARD64 *lessthan, + CARD64 *greaterthan); + typedef struct _SysCounterInfo { char *name; CARD64 resolution; CARD64 bracket_greater; CARD64 bracket_less; SyncCounterType counterType; /* how can this counter change */ - void (*QueryValue)( - pointer /*pCounter*/, - CARD64 * /*freshvalue*/ -); - void (*BracketValues)( - pointer /*pCounter*/, - CARD64 * /*lessthan*/, - CARD64 * /*greaterthan*/ -); + SyncQueryValueProcPtr QueryValue; + SyncBracketValuesProcPtr BracketValues; } SysCounterInfo; Index: xc/include/extensions/xcmiscstr.h diff -u xc/include/extensions/xcmiscstr.h:1.3 xc/include/extensions/xcmiscstr.h:1.4 --- xc/include/extensions/xcmiscstr.h:1.3 Tue Jul 15 21:38:24 2003 +++ xc/include/extensions/xcmiscstr.h Mon Jan 9 09:58:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xcmiscstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/extensions/xcmiscstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xcmiscstr.h,v 1.4 2006/01/09 14:58:19 dawes Exp $ */ #ifndef _XCMISCSTR_H_ #define _XCMISCSTR_H_ Index: xc/include/extensions/xf86bigfont.h diff -u xc/include/extensions/xf86bigfont.h:1.2 xc/include/extensions/xf86bigfont.h:1.3 --- xc/include/extensions/xf86bigfont.h:1.2 Tue Jul 31 20:44:35 2001 +++ xc/include/extensions/xf86bigfont.h Fri Oct 14 11:15:54 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/xf86bigfont.h,v 1.3 2005/10/14 15:15:54 tsi Exp $ */ /* * Declarations for the BIGFONT extension. * @@ -24,7 +24,7 @@ _XFUNCPROTOBEGIN -#include "font.h" +#include extern void XFree86BigfontExtensionInit(void); extern void XF86BigfontFreeFontShm(FontPtr); Index: xc/include/extensions/xf86vmode.h diff -u xc/include/extensions/xf86vmode.h:3.31 xc/include/extensions/xf86vmode.h:3.32 --- xc/include/extensions/xf86vmode.h:3.31 Sat Dec 21 19:46:50 2002 +++ xc/include/extensions/xf86vmode.h Mon Jan 9 09:58:19 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.31 2002/12/22 00:46:50 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.32 2006/01/09 14:58:19 dawes Exp $ */ /* Copyright 1995 Kaleb S. KEITHLEY @@ -28,7 +28,6 @@ from Kaleb S. KEITHLEY */ -/* $Xorg: xf86vmode.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ Index: xc/include/extensions/xf86vmstr.h diff -u xc/include/extensions/xf86vmstr.h:3.28 xc/include/extensions/xf86vmstr.h:3.29 --- xc/include/extensions/xf86vmstr.h:3.28 Sat Dec 21 19:46:50 2002 +++ xc/include/extensions/xf86vmstr.h Mon Jan 9 09:58:19 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.28 2002/12/22 00:46:50 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.29 2006/01/09 14:58:19 dawes Exp $ */ /* Copyright 1995 Kaleb S. KEITHLEY @@ -28,7 +28,6 @@ from Kaleb S. KEITHLEY */ -/* $Xorg: xf86vmstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ Index: xc/include/extensions/xtestext1.h diff -u xc/include/extensions/xtestext1.h:1.4 xc/include/extensions/xtestext1.h:1.5 --- xc/include/extensions/xtestext1.h:1.4 Wed Jan 26 21:35:20 2005 +++ xc/include/extensions/xtestext1.h Mon Mar 28 23:00:30 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/include/extensions/xtestext1.h,v 1.5 2005/03/29 04:00:30 tsi Exp $ */ /* * xtestext1.h * Index: xc/include/extensions/xteststr.h diff -u xc/include/extensions/xteststr.h:1.2 xc/include/extensions/xteststr.h:1.3 --- xc/include/extensions/xteststr.h:1.2 Fri Dec 14 14:53:29 2001 +++ xc/include/extensions/xteststr.h Mon Jan 9 09:58:19 2006 @@ -1,4 +1,4 @@ -/* $Xorg: xteststr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ +/* $XFree86: xc/include/extensions/xteststr.h,v 1.3 2006/01/09 14:58:19 dawes Exp $ */ /* Copyright 1992, 1998 The Open Group Index: xc/include/extensions/xtrapddmi.h diff -u xc/include/extensions/xtrapddmi.h:1.1 xc/include/extensions/xtrapddmi.h:removed --- xc/include/extensions/xtrapddmi.h:1.1 Fri Nov 2 18:29:26 2001 +++ xc/include/extensions/xtrapddmi.h Tue May 9 21:54:51 2006 @@ -1,115 +0,0 @@ -/* $XFree86: xc/include/extensions/xtrapddmi.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */ - -#ifndef __XTRAPDDMI__ -#define __XTRAPDDMI__ - -/***************************************************************************** -Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -*****************************************************************************/ -/* - * - * CONTRIBUTORS: - * - * Dick Annicchiarico - * Robert Chesler - * Dan Coutu - * Gene Durso - * Marc Evans - * Alan Jamison - * Mark Henry - * Ken Miller - * - * DESCRIPTION: - * This header file is used by the XTrap server extension only - * (not used by clients or the XTrap Toolkit). Information - * contained herein should *not* be visible to clients (xtrapdi.h - * is used for this). The name is historical. - */ -#include -#include -#include "dix.h" - -#ifndef MIN -# define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef MAX -# define MAX(a,b) ((a) > (b) ? (a) : (b)) -#endif - -#define XETrapNumEvents 1L /* constants used for AddExtension */ - -/* Other constants used within the extension code */ -#define XETrapMinRepSize 32L /* Minimum number of longs */ - -/* This structure will be globally declared to provide storage to hold - * the various extension wide configuration information. Allocated on - * a per-client basis. - */ -typedef struct -{ - ClientPtr client; /* Multi-client support and error handling */ - xXTrapGetCurReply cur; /* Struct of Miscellaneous state info */ - xXTrapGetStatsReply *stats; /* Pointer to stat's, malloc'd if requested */ - CARD32 last_input_time B32; /* last timestamp from input event */ - CARD16 protocol B16; /* current communication protocol */ -} XETrapEnv; - -#define XETrapSetHeaderEvent(phdr) ((phdr)->type = 0x1L) -#define XETrapSetHeaderRequest(phdr) ((phdr)->type = 0x2L) -#define XETrapSetHeaderSpecial(phdr) ((phdr)->type = 0x3L) -#define XETrapSetHeaderCursor(phdr) ((phdr)->type = 0x4L) -#define XETrapSetHeaderReply(phdr) ((phdr)->type = 0x5L) - -#ifndef vaxc -#define globaldef -#define globalref extern -#endif - -/* Extension platform identifier (conditionally defined) */ -#if ( defined (__osf__) && defined(__alpha) ) -# define XETrapPlatform PF_DECOSF1 -#endif -#ifdef ultrix -# define XETrapPlatform PF_DECUltrix -#endif -#ifdef vms -#ifdef VAXELN -# define XETrapPlatform PF_DECELN -#else -# define XETrapPlatform PF_DECVMS -#endif -#endif -#ifdef VT1000 -# define XETrapPlatform PF_DECVT1000 -#endif -#ifdef VXT -# define XETrapPlatform PF_DECXTerm -#endif -#ifdef PC -# define XETrapPlatform PF_IBMAT -#endif -#ifdef sun -# define XETrapPlatform PF_SunSparc -#endif -#ifndef XETrapPlatform -# define XETrapPlatform PF_Other -#endif /* XETrapPlatform */ - -#endif /* __XTRAPDDMI__ */ Index: xc/include/extensions/xtrapdi.h diff -u xc/include/extensions/xtrapdi.h:1.1 xc/include/extensions/xtrapdi.h:1.2 --- xc/include/extensions/xtrapdi.h:1.1 Fri Nov 2 18:29:26 2001 +++ xc/include/extensions/xtrapdi.h Thu Mar 24 21:22:51 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xtrapdi.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xtrapdi.h,v 1.2 2005/03/25 02:22:51 dawes Exp $ */ #ifndef __XTRAPDI__ #define __XTRAPDI__ @@ -83,9 +83,6 @@ # define False 0L #endif -typedef int (*int_function)(); -typedef void (*void_function)(); - /* This is used as flags to indicate desired request traps * Note: This has been padded to a CARD32 to keep structure aligned */ Index: xc/include/extensions/xtraplib.h diff -u xc/include/extensions/xtraplib.h:1.1 xc/include/extensions/xtraplib.h:1.3 --- xc/include/extensions/xtraplib.h:1.1 Fri Nov 2 18:29:26 2001 +++ xc/include/extensions/xtraplib.h Tue Mar 29 13:17:00 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xtraplib.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xtraplib.h,v 1.3 2005/03/29 18:17:00 tsi Exp $ */ #ifndef __XTRAPLIB__ #define __XTRAPLIB__ @@ -52,9 +52,14 @@ #include #include +struct _XETC; + +typedef void (*XETrapCBProc)(struct _XETC *tc, XETrapDatum *pdatum, + BYTE *userp); + typedef struct /* Callback structure */ { - void_function func; + XETrapCBProc func; BYTE *data; } XETrapCB; Index: xc/include/extensions/xtraplibp.h diff -u xc/include/extensions/xtraplibp.h:1.1 xc/include/extensions/xtraplibp.h:1.2 --- xc/include/extensions/xtraplibp.h:1.1 Fri Nov 2 18:29:26 2001 +++ xc/include/extensions/xtraplibp.h Thu Mar 24 21:22:51 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xtraplibp.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xtraplibp.h,v 1.2 2005/03/25 02:22:51 dawes Exp $ */ #ifndef __XTRAPLIBP__ #define __XTRAPLIBP__ @@ -75,11 +75,11 @@ int XEGetStatisticsRequest (XETC *tc , XETrapGetStatsRep *ret ); /* XECallBcks.c */ -int XEAddRequestCB (XETC *tc , CARD8 req , void_function func , BYTE *data ); -int XEAddRequestCBs (XETC *tc , ReqFlags req_flags , void_function func , +int XEAddRequestCB (XETC *tc , CARD8 req , XETrapCBProc func , BYTE *data ); +int XEAddRequestCBs (XETC *tc , ReqFlags req_flags , XETrapCBProc func , BYTE *data ); -int XEAddEventCB (XETC *tc , CARD8 evt , void_function func , BYTE *data ); -int XEAddEventCBs (XETC *tc , EventFlags evt_flags , void_function func , +int XEAddEventCB (XETC *tc , CARD8 evt , XETrapCBProc func , BYTE *data ); +int XEAddEventCBs (XETC *tc , EventFlags evt_flags , XETrapCBProc func , BYTE *data ); /* The following seem to never be used. Perhaps they should be removed */ @@ -101,6 +101,8 @@ int XETrapAppWhileLoop (XtAppContext app , XETC *tc , Bool *done ); int XETrapWaitForSomething (XtAppContext app ); Boolean (*XETrapSetEventHandler(XETC *tc, CARD32 id, Boolean (*pfunc)(XETrapDataEvent *event, XETC *tc))) (XETrapDataEvent *event, XETC *tc); +Boolean (*XETrapGetEventHandler(XETC *tc, CARD32 id))(XETrapDataEvent *event, XETC *tc); + /* XEPrInfo.c */ void XEPrintRelease (FILE *ofp , XETrapGetAvailRep *pavail ); Index: xc/include/extensions/xtrapproto.h diff -u xc/include/extensions/xtrapproto.h:1.2 xc/include/extensions/xtrapproto.h:removed --- xc/include/extensions/xtrapproto.h:1.2 Fri Feb 22 16:32:51 2002 +++ xc/include/extensions/xtrapproto.h Tue May 9 21:54:51 2006 @@ -1,168 +0,0 @@ -/* $XFree86: xc/include/extensions/xtrapproto.h,v 1.2 2002/02/22 21:32:51 dawes Exp $ */ - -#ifndef __XTRAPPROTO__ -#define __XTRAPPROTO__ - -/***************************************************************************** -Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -*****************************************************************************/ -/* - * - * CONTRIBUTORS: - * - * Dick Annicchiarico - * Robert Chesler - * Dan Coutu - * Gene Durso - * Marc Evans - * Alan Jamison - * Mark Henry - * Ken Miller - * - * DESCRIPTION: - * This header file contains the function prototypes for extension - * routines sorted by module (globally defined routines *only*). - */ -#ifndef Bool -# define Bool int -#endif -/* xtrapdi.c */ -int XETrapDestroyEnv (pointer value , XID id ); -void XETrapCloseDown ( ExtensionEntry *extEntry ); -Bool XETrapRedirectDevices (void ); -void DEC_XTRAPInit (void ); -int XETrapCreateEnv (ClientPtr client ); -int XETrapDispatch (ClientPtr client ); -int sXETrapDispatch (ClientPtr client ); -int XETrapReset (xXTrapReq *request , ClientPtr client ); -int XETrapGetAvailable (xXTrapGetReq *request , ClientPtr client ); -int XETrapGetCurrent (xXTrapReq *request , ClientPtr client ); -int XETrapGetStatistics (xXTrapReq *request , ClientPtr client ); -int XETrapConfig (xXTrapConfigReq *request , ClientPtr client ); -int XETrapStartTrap (xXTrapReq *request , ClientPtr client ); -int XETrapStopTrap (xXTrapReq *request , ClientPtr client ); -int XETrapGetVersion (xXTrapGetReq *request , ClientPtr client ); -int XETrapGetLastInpTime (xXTrapReq *request , ClientPtr client ); -int XETrapRequestVector (ClientPtr client ); -int XETrapKeyboard (xEvent *x_event , DevicePtr keybd , int count ); -#ifndef VECTORED_EVENTS -int XETrapPointer (xEvent *x_event , DevicePtr ptrdev , int count ); -#else -int XETrapEventVector (ClientPtr client , xEvent *x_event ); -#endif -void XETrapStampAndMail (xEvent *x_event ); -void sReplyXTrapDispatch (ClientPtr client , int size , char *reply ); -int XETrapWriteXLib (XETrapEnv *penv , BYTE *data , CARD32 nbytes ); - -/* xtrapddmi.c */ -void XETrapPlatformSetup (void ); -int XETrapSimulateXEvent (xXTrapInputReq *request , ClientPtr client ); - -/* xtrapdiswap.c */ -int sXETrapReset (xXTrapReq *request , ClientPtr client ); -int sXETrapGetAvailable (xXTrapGetReq *request , ClientPtr client ); -int sXETrapConfig (xXTrapConfigReq *request , ClientPtr client ); -int sXETrapStartTrap (xXTrapReq *request , ClientPtr client ); -int sXETrapStopTrap (xXTrapReq *request , ClientPtr client ); -int sXETrapGetCurrent (xXTrapReq *request , ClientPtr client ); -int sXETrapGetStatistics (xXTrapReq *request , ClientPtr client ); -int sXETrapSimulateXEvent (xXTrapInputReq *request , ClientPtr client ); -int sXETrapGetVersion (xXTrapGetReq *request , ClientPtr client ); -int sXETrapGetLastInpTime (xXTrapReq *request , ClientPtr client ); -void sReplyXETrapGetAvail (ClientPtr client , int size , char *reply ); -void sReplyXETrapGetVers (ClientPtr client , int size , char *reply ); -void sReplyXETrapGetLITim (ClientPtr client , int size , char *reply ); -void sReplyXETrapGetCur (ClientPtr client , int size , char *reply ); -void sReplyXETrapGetStats (ClientPtr client , int size , char *reply ); -void sXETrapHeader (XETrapHeader *hdr ); -void XETSwSimpleReq (xReq *data ); -void XETSwResourceReq (xResourceReq *data ); -void XETSwCreateWindow (xCreateWindowReq *data , ClientPtr client ); -void XETSwChangeWindowAttributes (xChangeWindowAttributesReq *data , ClientPtr client ); -void XETSwReparentWindow (xReparentWindowReq *data ); -void XETSwConfigureWindow (xConfigureWindowReq *data , ClientPtr client ); -void XETSwInternAtom (xInternAtomReq *data ); -void XETSwChangeProperty (xChangePropertyReq *data ); -void XETSwDeleteProperty (xDeletePropertyReq *data ); -void XETSwGetProperty (xGetPropertyReq *data ); -void XETSwSetSelectionOwner (xSetSelectionOwnerReq *data ); -void XETSwConvertSelection (xConvertSelectionReq *data ); -void XETSwSendEvent (xSendEventReq *data ); -void XETSwGrabPointer (xGrabPointerReq *data ); -void XETSwGrabButton (xGrabButtonReq *data ); -void XETSwUngrabButton (xUngrabButtonReq *data ); -void XETSwChangeActivePointerGrab (xChangeActivePointerGrabReq *data ); -void XETSwGrabKeyboard (xGrabKeyboardReq *data ); -void XETSwGrabKey (xGrabKeyReq *data ); -void XETSwUngrabKey (xUngrabKeyReq *data ); -void XETSwGetMotionEvents (xGetMotionEventsReq *data ); -void XETSwTranslateCoords (xTranslateCoordsReq *data ); -void XETSwWarpPointer (xWarpPointerReq *data ); -void XETSwSetInputFocus (xSetInputFocusReq *data ); -void XETSwOpenFont (xOpenFontReq *data ); -void XETSwListFonts (xListFontsReq *data ); -void XETSwListFontsWithInfo (xListFontsWithInfoReq *data ); -void XETSwSetFontPath (xSetFontPathReq *data ); -void XETSwCreatePixmap (xCreatePixmapReq *data ); -void XETSwCreateGC (xCreateGCReq *data , ClientPtr client ); -void XETSwChangeGC (xChangeGCReq *data , ClientPtr client ); -void XETSwCopyGC (xCopyGCReq *data ); -void XETSwSetDashes (xSetDashesReq *data ); -void XETSwSetClipRectangles (xSetClipRectanglesReq *data , ClientPtr client ); -void XETSwClearToBackground (xClearAreaReq *data ); -void XETSwCopyArea (xCopyAreaReq *data ); -void XETSwCopyPlane (xCopyPlaneReq *data ); -void XETSwPoly (xPolyPointReq *data , ClientPtr client ); -void XETSwFillPoly (xFillPolyReq *data , ClientPtr client ); -void XETSwPutImage (xPutImageReq *data ); -void XETSwGetImage (xGetImageReq *data ); -void XETSwPolyText (xPolyTextReq *data ); -void XETSwImageText (xImageTextReq *data ); -void XETSwCreateColormap (xCreateColormapReq *data ); -void XETSwCopyColormapAndFree (xCopyColormapAndFreeReq *data ); -void XETSwAllocColor (xAllocColorReq *data ); -void XETSwAllocNamedColor (xAllocNamedColorReq *data ); -void XETSwAllocColorCells (xAllocColorCellsReq *data ); -void XETSwAllocColorPlanes (xAllocColorPlanesReq *data ); -void XETSwFreeColors (xFreeColorsReq *data , ClientPtr client ); -void XETSwStoreColors (xStoreColorsReq *data , ClientPtr client ); -void XETSwStoreNamedColor (xStoreNamedColorReq *data ); -void XETSwQueryColors (xQueryColorsReq *data , ClientPtr client ); -void XETSwLookupColor (xLookupColorReq *data ); -void XETSwCreateCursor (xCreateCursorReq *data ); -void XETSwCreateGlyphCursor (xCreateGlyphCursorReq *data ); -void XETSwRecolorCursor (xRecolorCursorReq *data ); -void XETSwQueryBestSize (xQueryBestSizeReq *data ); -void XETSwQueryExtension (xQueryExtensionReq *data ); -void XETSwChangeKeyboardMapping (xChangeKeyboardMappingReq *data ); -void XETSwChangeKeyboardControl (xChangeKeyboardControlReq *data , ClientPtr client ); -void XETSwChangePointerControl (xChangePointerControlReq *data ); -void XETSwSetScreenSaver (xSetScreenSaverReq *data ); -void XETSwChangeHosts (xChangeHostsReq *data ); -void XETSwRotateProperties (xRotatePropertiesReq *data , ClientPtr client ); -void XETSwNoOperation (xReq *data ); -#ifdef vms -void SwapLongs (long *list , unsigned long count ); -void SwapShorts (short *list , unsigned long count ); -int SwapColorItem (xColorItem *pItem ); -#endif /* vms */ - - -#endif /* __XTRAPPROTO__ */ Index: xc/include/fonts/FS.h diff -u xc/include/fonts/FS.h:1.10 xc/include/fonts/FS.h:1.11 --- xc/include/fonts/FS.h:1.10 Fri Jul 18 11:53:24 2003 +++ xc/include/fonts/FS.h Mon Jan 9 09:58:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: FS.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ - /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -50,7 +48,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/fonts/FS.h,v 1.10 2003/07/18 15:53:24 tsi Exp $ */ +/* $XFree86: xc/include/fonts/FS.h,v 1.11 2006/01/09 14:58:20 dawes Exp $ */ #ifndef _FS_H_ #define _FS_H_ Index: xc/include/fonts/FSproto.h diff -u xc/include/fonts/FSproto.h:1.3 xc/include/fonts/FSproto.h:1.4 --- xc/include/fonts/FSproto.h:1.3 Fri Dec 14 14:53:31 2001 +++ xc/include/fonts/FSproto.h Mon Jan 9 09:58:20 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FSproto.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group @@ -43,7 +42,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/include/fonts/FSproto.h,v 1.3 2001/12/14 19:53:31 dawes Exp $ */ +/* $XFree86: xc/include/fonts/FSproto.h,v 1.4 2006/01/09 14:58:20 dawes Exp $ */ #ifndef _FS_PROTO_H_ #define _FS_PROTO_H_ Index: xc/include/fonts/Imakefile diff -u xc/include/fonts/Imakefile:3.8 xc/include/fonts/Imakefile:3.9 --- xc/include/fonts/Imakefile:3.8 Mon Aug 27 13:40:57 2001 +++ xc/include/fonts/Imakefile Fri Oct 14 11:15:54 2005 @@ -1,11 +1,7 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $ +XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.9 2005/10/14 15:15:54 tsi Exp $ - - - -XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.8 2001/08/27 17:40:57 dawes Exp $ - - HEADERS = FS.h FSproto.h fsmasks.h + HEADERS = FS.h FSproto.h fsmasks.h \ + font.h fontproto.h fontstruct.h all:: Index: xc/include/fonts/font.h diff -u xc/include/fonts/font.h:3.5 xc/include/fonts/font.h:3.7 --- xc/include/fonts/font.h:3.5 Wed Jan 17 12:53:26 2001 +++ xc/include/fonts/font.h Mon Jan 9 09:58:20 2006 @@ -1,4 +1,4 @@ -/* $Xorg: font.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ +/* $XFree86: xc/include/fonts/font.h,v 3.7 2006/01/09 14:58:20 dawes Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,14 +21,12 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/fonts/font.h,v 3.5 2001/01/17 17:53:26 dawes Exp $ */ -/* $NCDXorg: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */ #ifndef FONT_H #define FONT_H #ifndef BitmapFormatByteOrderMask -#include "fsmasks.h" +#include #endif /* data structures */ Index: xc/include/fonts/fontstruct.h diff -u xc/include/fonts/fontstruct.h:3.4 xc/include/fonts/fontstruct.h:3.5 --- xc/include/fonts/fontstruct.h:3.4 Wed Jan 17 12:53:26 2001 +++ xc/include/fonts/fontstruct.h Fri Oct 14 11:15:54 2005 @@ -1,4 +1,4 @@ -/* $Xorg: fontstruct.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ +/* $XFree86: xc/include/fonts/fontstruct.h,v 3.5 2005/10/14 15:15:54 tsi Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,13 +21,12 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/fonts/fontstruct.h,v 3.4 2001/01/17 17:53:26 dawes Exp $ */ #ifndef FONTSTR_H #define FONTSTR_H #include -#include "font.h" +#include #include #include @@ -290,6 +289,6 @@ (pi)->ink_maxbounds.characterWidth) #define FONT_MAX_WIDTH(pi) (FONT_MAX_RIGHT(pi) - FONT_MIN_LEFT(pi)) -#include "fontproto.h" +#include #endif /* FONTSTR_H */ Index: xc/include/fonts/fsmasks.h diff -u xc/include/fonts/fsmasks.h:1.2 xc/include/fonts/fsmasks.h:1.3 --- xc/include/fonts/fsmasks.h:1.2 Fri Dec 14 14:53:31 2001 +++ xc/include/fonts/fsmasks.h Mon Jan 9 09:58:20 2006 @@ -1,4 +1,4 @@ -/* $Xorg: fsmasks.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ +/* $XFree86: xc/include/fonts/fsmasks.h,v 1.3 2006/01/09 14:58:20 dawes Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation Index: xc/lib/Imakefile diff -u xc/lib/Imakefile:3.81 xc/lib/Imakefile:3.83 --- xc/lib/Imakefile:3.81 Mon Feb 28 00:09:33 2005 +++ xc/lib/Imakefile Fri Feb 17 13:01:14 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Imakefile,v 3.81 2005/02/28 05:09:33 dawes Exp $ +XCOMM $XFree86: xc/lib/Imakefile,v 3.83 2006/02/17 18:01:14 dawes Exp $ /* * Copyright (c) 1994-2005 by The XFree86 Project, Inc. * All rights reserved. @@ -49,23 +49,19 @@ #define IHaveSubdirs #define PassCDebugFlags -#if BuildLibraries || BuildServer || BuildClients +#if NeedXTrans XTRANSLIB = xtrans #endif -#if BuildXaw6 && BuildLibraries +#if BuildXaw6 XAW6LIBDIR = Xaw6 #endif -#ifndef NeedBerklib -#define NeedBerklib NO -#endif - #if NeedBerklib BERKDIR = Xbsd #endif -#if BuildXKBfilelib +#if BuildXKBfilelib || BuildServer XKBLIBDIR = xkbfile #endif @@ -73,7 +69,7 @@ XKBUILIBDIR = xkbui #endif -#if BuildThreadStubLibrary && BuildLibraries +#if BuildThreadStubLibrary THRSTUBLIBDIR = XThrStub #endif @@ -185,15 +181,15 @@ XF86EXTLIBS = $(XF86MISCLIBDIR) $(XF86VMLIBDIR) \ $(XF86DGALIBDIR) $(XF86RUSHLIBDIR) -#if BuildLBX && (BuildLibraries || BuildServer || BuildClients) +#if BuildLbxUtilLibrary LBXUTILDIR = lbxutil #endif -#if (BuildLBX || GzipFontCompression) && !HasZlib +#if BuildZlib ZLIBDIR = zlib #endif -#if defined(XFree86Version) && !HasPosixRegex +#if BuildRegexLib REGEXDIR = regex #endif @@ -205,11 +201,11 @@ FONTCACHELIBDIR = Xfontcache #endif -#if BuildServer || BuildClients || BuildLibraries +#if BuildServer || BuildClients || BuildLibraries || BuildFontLib FONTSUBDIR = font #endif -#if BuildFontEncLib +#if BuildFontEncLib || BuildServer FONTENCSUBDIR = fontenc #endif @@ -221,7 +217,7 @@ XDMCPLIBDIR = Xdmcp #endif -#if BuildX11Lib +#if BuildX11Lib || BuildServer X11LIBDIR = X11 #endif @@ -229,16 +225,43 @@ XEXTLIBDIR = Xext #endif -#if BuildLibraries +#if BuildXawLib +XAWLIBDIR = Xaw +#endif + +#if BuildOldXLib OLDXLIBDIR = oldX +#endif + +#if BuildICELib ICELIBDIR = ICE +#endif + +#if BuildSMLib SMLIBDIR = SM +#endif + +#if BuildXtLib XTLIBDIR = Xt +#endif + +#if BuildXmuLib XMULIBDIR = Xmu +#endif + +#if BuildXmuuLib XMUULIBDIR = Xmuu +#endif + +#if BuildXpmLib XPMLIBDIR = Xpm -XAWLIBDIR = Xaw +#endif + +#if BuildXtstLib XTSTLIBDIR = Xtst +#endif + +#if BuildFSLib FSLIBDIR = FS #endif Index: xc/lib/FS/FSClServ.c diff -u xc/lib/FS/FSClServ.c:1.5 xc/lib/FS/FSClServ.c:1.6 --- xc/lib/FS/FSClServ.c:1.5 Fri Dec 14 14:53:32 2001 +++ xc/lib/FS/FSClServ.c Tue Mar 22 22:11:22 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSClServ.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSClServ.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSClServ.c,v 1.5 2001/12/14 19:53:32 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSClServ.c,v 1.6 2005/03/23 03:11:22 dawes Exp $ */ /* @@ -55,11 +53,8 @@ #include "FSlib.h" #include "FSlibint.h" -extern FSServer *_FSHeadOfServerList; - int -FSCloseServer(svr) - FSServer *svr; +FSCloseServer(FSServer *svr) { _FSExtension *ext; FSServer **sv = &_FSHeadOfServerList; Index: xc/lib/FS/FSCloseFt.c diff -u xc/lib/FS/FSCloseFt.c:1.2 xc/lib/FS/FSCloseFt.c:1.3 --- xc/lib/FS/FSCloseFt.c:1.2 Fri Dec 14 14:53:32 2001 +++ xc/lib/FS/FSCloseFt.c Tue Mar 22 22:11:22 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSCloseFt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSCloseFt.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,6 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +/* $XFree86: xc/lib/FS/FSCloseFt.c,v 1.3 2005/03/23 03:11:22 dawes Exp $ */ /* @@ -55,9 +54,7 @@ int -FSCloseFont(svr, fid) - FSServer *svr; - Font fid; +FSCloseFont(FSServer *svr, Font fid) { fsResourceReq *req; Index: xc/lib/FS/FSConnServ.c diff -u xc/lib/FS/FSConnServ.c:3.11 xc/lib/FS/FSConnServ.c:3.12 --- xc/lib/FS/FSConnServ.c:3.11 Fri Dec 14 14:53:32 2001 +++ xc/lib/FS/FSConnServ.c Tue Mar 22 22:11:22 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSConnServ.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,6 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +/* $XFree86: xc/lib/FS/FSConnServ.c,v 3.12 2005/03/23 03:11:22 dawes Exp $ */ /* @@ -50,7 +49,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/FS/FSConnServ.c,v 3.11 2001/12/14 19:53:32 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSConnServ.c,v 3.12 2005/03/23 03:11:22 dawes Exp $ */ #include #include "FSlibint.h" @@ -76,8 +75,7 @@ #define FS_CONNECTION_RETRIES 5 XtransConnInfo -_FSConnectServer(server_name) - char *server_name; +_FSConnectServer(char *server_name) { XtransConnInfo trans_conn = NULL; /* transport connection object */ int retry, connect_stat; @@ -132,9 +130,7 @@ */ void -_FSDisconnectServer(trans_conn) - XtransConnInfo trans_conn; - +_FSDisconnectServer(XtransConnInfo trans_conn) { (void) _FSTransClose(trans_conn); } @@ -146,8 +142,8 @@ * 2) if the connection can be read, must enqueue events and handle errors, * until the connection is writable. */ -void _FSWaitForWritable(svr) - FSServer *svr; +void +_FSWaitForWritable(FSServer *svr) { fd_set r_mask; fd_set w_mask; @@ -209,8 +205,8 @@ } -void _FSWaitForReadable(svr) - FSServer *svr; +void +_FSWaitForReadable(FSServer *svr) { fd_set r_mask; int result; @@ -224,9 +220,8 @@ } while (result <= 0); } -void _FSSendClientPrefix(svr, client) - FSServer *svr; - fsConnClientPrefix *client; +void +_FSSendClientPrefix(FSServer *svr, fsConnClientPrefix *client) { struct iovec iovarray[5], *iov = iovarray; Index: xc/lib/FS/FSErrDis.c diff -u xc/lib/FS/FSErrDis.c:1.2 xc/lib/FS/FSErrDis.c:1.3 --- xc/lib/FS/FSErrDis.c:1.2 Fri Dec 14 14:53:32 2001 +++ xc/lib/FS/FSErrDis.c Tue Mar 22 22:11:22 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSErrDis.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSErrDis.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,6 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +/* $XFree86: xc/lib/FS/FSErrDis.c,v 1.3 2005/03/23 03:11:22 dawes Exp $ */ /* @@ -73,13 +72,9 @@ /* ARGSUSED */ -int FSGetErrorDatabaseText(svr, name, type, defaultp, buffer, nbytes) - register char *name, - *type; - char *defaultp; - FSServer *svr; - char *buffer; - int nbytes; +int +FSGetErrorDatabaseText(FSServer *svr, char *name, char *type, char *defaultp, + char *buffer, int nbytes) { if (nbytes == 0) return 0; @@ -89,11 +84,8 @@ return 1; } -int FSGetErrorText(svr, code, buffer, nbytes) - register int code; - register FSServer *svr; - char *buffer; - int nbytes; +int +FSGetErrorText(FSServer *svr, int code, char *buffer, int nbytes) { char *defaultp = NULL; Index: xc/lib/FS/FSErrHndlr.c diff -u xc/lib/FS/FSErrHndlr.c:1.5 xc/lib/FS/FSErrHndlr.c:1.6 --- xc/lib/FS/FSErrHndlr.c:1.5 Fri Dec 14 14:53:32 2001 +++ xc/lib/FS/FSErrHndlr.c Tue Mar 22 22:11:22 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSErrHndlr.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSErrHndlr.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSErrHndlr.c,v 1.5 2001/12/14 19:53:32 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSErrHndlr.c,v 1.6 2005/03/23 03:11:22 dawes Exp $ */ /* Index: xc/lib/FS/FSFlush.c diff -u xc/lib/FS/FSFlush.c:1.2 xc/lib/FS/FSFlush.c:1.3 --- xc/lib/FS/FSFlush.c:1.2 Fri Dec 14 14:53:32 2001 +++ xc/lib/FS/FSFlush.c Tue Mar 22 22:11:22 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSFlush.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSFlush.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,6 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +/* $XFree86: xc/lib/FS/FSFlush.c,v 1.3 2005/03/23 03:11:22 dawes Exp $ */ /* @@ -52,8 +51,8 @@ */ #include "FSlibint.h" -int FSFlush(svr) - FSServer *svr; +int +FSFlush(FSServer *svr) { _FSFlush(svr); return 1; Index: xc/lib/FS/FSFontInfo.c diff -u xc/lib/FS/FSFontInfo.c:1.6 xc/lib/FS/FSFontInfo.c:1.7 --- xc/lib/FS/FSFontInfo.c:1.6 Mon Dec 22 12:48:02 2003 +++ xc/lib/FS/FSFontInfo.c Tue Mar 22 22:11:22 2005 @@ -1,4 +1,3 @@ -/* $Xorg: FSFontInfo.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -23,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSFontInfo.c,v 1.6 2003/12/22 17:48:02 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSFontInfo.c,v 1.7 2005/03/23 03:11:22 dawes Exp $ */ /* @@ -52,16 +51,10 @@ */ #include "FSlibint.h" -char ** -FSListFontsWithXInfo(svr, pattern, maxNames, count, info, pprops, offsets, prop_data) - FSServer *svr; - char *pattern; - int maxNames; - int *count; - FSXFontInfoHeader ***info; - FSPropInfo ***pprops; - FSPropOffset ***offsets; - unsigned char ***prop_data; +char ** +FSListFontsWithXInfo(FSServer *svr, char *pattern, int maxNames, int *count, + FSXFontInfoHeader ***info, FSPropInfo ***pprops, + FSPropOffset ***offsets, unsigned char ***prop_data) { long nbytes; int i, Index: xc/lib/FS/FSFtNames.c diff -u xc/lib/FS/FSFtNames.c:1.7 xc/lib/FS/FSFtNames.c:1.8 --- xc/lib/FS/FSFtNames.c:1.7 Mon Dec 22 12:48:02 2003 +++ xc/lib/FS/FSFtNames.c Tue Mar 22 22:11:22 2005 @@ -1,4 +1,3 @@ -/* $Xorg: FSFtNames.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -23,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSFtNames.c,v 1.7 2003/12/22 17:48:02 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSFtNames.c,v 1.8 2005/03/23 03:11:22 dawes Exp $ */ /* @@ -53,12 +52,8 @@ #include "FSlibint.h" -char ** -FSListFonts(svr, pattern, maxNames, actualCount) - FSServer *svr; - char *pattern; - int maxNames; - int *actualCount; +char ** +FSListFonts(FSServer *svr, char *pattern, int maxNames, int *actualCount) { long nbytes; int i, @@ -117,8 +112,8 @@ } -int FSFreeFontNames(list) - char **list; +int +FSFreeFontNames(char **list) { if (list) { FSfree(list[0] - 1); Index: xc/lib/FS/FSGetCats.c diff -u xc/lib/FS/FSGetCats.c:1.8 xc/lib/FS/FSGetCats.c:1.9 --- xc/lib/FS/FSGetCats.c:1.8 Thu Dec 30 21:56:03 2004 +++ xc/lib/FS/FSGetCats.c Tue Mar 22 22:11:22 2005 @@ -1,4 +1,3 @@ -/* $Xorg: FSGetCats.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -23,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSGetCats.c,v 1.8 2004/12/31 02:56:03 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSGetCats.c,v 1.9 2005/03/23 03:11:22 dawes Exp $ */ /* @@ -53,10 +52,8 @@ #include "FSlibint.h" -char ** -FSGetCatalogues(svr, num) - FSServer *svr; - int *num; +char ** +FSGetCatalogues(FSServer *svr, int *num) { fsGetCataloguesReply rep; char **list; Index: xc/lib/FS/FSListCats.c diff -u xc/lib/FS/FSListCats.c:1.7 xc/lib/FS/FSListCats.c:1.8 --- xc/lib/FS/FSListCats.c:1.7 Mon Dec 22 12:48:02 2003 +++ xc/lib/FS/FSListCats.c Tue Mar 22 22:11:23 2005 @@ -1,4 +1,3 @@ -/* $Xorg: FSListCats.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -23,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSListCats.c,v 1.7 2003/12/22 17:48:02 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSListCats.c,v 1.8 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -53,12 +52,8 @@ #include "FSlibint.h" -char ** -FSListCatalogues(svr, pattern, maxNames, actualCount) - FSServer *svr; - char *pattern; - int maxNames; - int *actualCount; +char ** +FSListCatalogues(FSServer *svr, char *pattern, int maxNames, int *actualCount) { long nbytes; int i, @@ -118,8 +113,8 @@ } -int FSFreeCatalogues(list) - char **list; +int +FSFreeCatalogues(char **list) { if (list) { FSfree(list[0] - 1); Index: xc/lib/FS/FSListExt.c diff -u xc/lib/FS/FSListExt.c:1.8 xc/lib/FS/FSListExt.c:1.9 --- xc/lib/FS/FSListExt.c:1.8 Thu Dec 30 21:56:03 2004 +++ xc/lib/FS/FSListExt.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSListExt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSListExt.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSListExt.c,v 1.8 2004/12/31 02:56:03 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSListExt.c,v 1.9 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -54,10 +52,8 @@ #include "FSlibint.h" -char ** -FSListExtensions(svr, next) - FSServer *svr; - int *next; +char ** +FSListExtensions(FSServer *svr, int *next) { fsListExtensionsReply rep; char **list; @@ -113,8 +109,8 @@ } -int FSFreeExtensionList(list) - char **list; +int +FSFreeExtensionList(char **list) { if (list != NULL) { FSfree(list[0] - 1); Index: xc/lib/FS/FSMisc.c diff -u xc/lib/FS/FSMisc.c:1.2 xc/lib/FS/FSMisc.c:1.3 --- xc/lib/FS/FSMisc.c:1.2 Fri Dec 14 14:53:32 2001 +++ xc/lib/FS/FSMisc.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSMisc.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSMisc.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,6 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +/* $XFree86: xc/lib/FS/FSMisc.c,v 1.3 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -54,8 +53,7 @@ #include "FSlibint.h" long -FSMaxRequestSize(svr) - FSServer *svr; +FSMaxRequestSize(FSServer *svr) { return svr->max_request_size; } Index: xc/lib/FS/FSNextEv.c diff -u xc/lib/FS/FSNextEv.c:1.2 xc/lib/FS/FSNextEv.c:1.3 --- xc/lib/FS/FSNextEv.c:1.2 Fri Dec 14 14:53:32 2001 +++ xc/lib/FS/FSNextEv.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSNextEv.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSNextEv.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,6 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +/* $XFree86: xc/lib/FS/FSNextEv.c,v 1.3 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -53,11 +52,8 @@ #include "FSlibint.h" -extern _FSQEvent *_FSqfree; - -int FSNextEvent(svr, event) - FSServer *svr; - FSEvent *event; +int +FSNextEvent(FSServer *svr, FSEvent *event) { _FSQEvent *qelt; Index: xc/lib/FS/FSOpenFont.c diff -u xc/lib/FS/FSOpenFont.c:1.7 xc/lib/FS/FSOpenFont.c:1.8 --- xc/lib/FS/FSOpenFont.c:1.7 Mon Dec 22 12:48:02 2003 +++ xc/lib/FS/FSOpenFont.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSOpenFont.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSOpenFont.c,v 1.7 2003/12/22 17:48:02 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSOpenFont.c,v 1.8 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -55,12 +53,8 @@ #include "FSlibint.h" Font -FSOpenBitmapFont(svr, hint, fmask, name, otherid) - FSServer *svr; - FSBitmapFormat hint; - FSBitmapFormatMask fmask; - char *name; - Font *otherid; +FSOpenBitmapFont(FSServer *svr, FSBitmapFormat hint, FSBitmapFormatMask fmask, + char *name, Font *otherid) { unsigned int nbytes; fsOpenBitmapFontReq *req; Index: xc/lib/FS/FSOpenServ.c diff -u xc/lib/FS/FSOpenServ.c:1.10 xc/lib/FS/FSOpenServ.c:1.11 --- xc/lib/FS/FSOpenServ.c:1.10 Thu Dec 30 21:56:03 2004 +++ xc/lib/FS/FSOpenServ.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSOpenServ.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSOpenServ.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSOpenServ.c,v 1.10 2004/12/31 02:56:03 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSOpenServ.c,v 1.11 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -70,8 +68,8 @@ FSServer *_FSHeadOfServerList = NULL; -void _FSFreeServerStructure(svr) - FSServer *svr; +void +_FSFreeServerStructure(FSServer *svr) { if (svr->server_name) FSfree(svr->server_name); @@ -84,10 +82,8 @@ FSfree((char *) svr); } -static -void OutOfMemory(svr, setup) - FSServer *svr; - char *setup; +static void +OutOfMemory(FSServer *svr, char *setup) { _FSDisconnectServer(svr->trans_conn); @@ -101,9 +97,8 @@ * to it */ -FSServer * -FSOpenServer(server) - char *server; +FSServer * +FSOpenServer(char *server) { FSServer *svr; int i; Index: xc/lib/FS/FSQGlyphs.c diff -u xc/lib/FS/FSQGlyphs.c:1.6 xc/lib/FS/FSQGlyphs.c:1.7 --- xc/lib/FS/FSQGlyphs.c:1.6 Mon Dec 22 12:48:02 2003 +++ xc/lib/FS/FSQGlyphs.c Tue Mar 22 22:11:23 2005 @@ -1,4 +1,3 @@ -/* $Xorg: FSQGlyphs.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -23,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSQGlyphs.c,v 1.6 2003/12/22 17:48:02 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSQGlyphs.c,v 1.7 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -54,15 +53,9 @@ #include "FSlibint.h" int -FSQueryXBitmaps8(svr, fid, format, range_type, str, str_len, offsets, glyphdata) - FSServer *svr; - Font fid; - FSBitmapFormat format; - Bool range_type; - unsigned char *str; - unsigned long str_len; - FSOffset **offsets; - unsigned char **glyphdata; +FSQueryXBitmaps8(FSServer *svr, Font fid, FSBitmapFormat format, + Bool range_type, unsigned char *str, unsigned long str_len, + FSOffset **offsets, unsigned char **glyphdata) { fsQueryXBitmaps8Req *req; fsQueryXBitmaps8Reply reply; @@ -123,16 +116,9 @@ } int -FSQueryXBitmaps16(svr, fid, format, range_type, str, str_len, - offsets, glyphdata) - FSServer *svr; - Font fid; - FSBitmapFormat format; - Bool range_type; - FSChar2b *str; - unsigned long str_len; - FSOffset **offsets; - unsigned char **glyphdata; +FSQueryXBitmaps16(FSServer *svr, Font fid, FSBitmapFormat format, + Bool range_type, FSChar2b *str, unsigned long str_len, + FSOffset **offsets, unsigned char **glyphdata) { fsQueryXBitmaps16Req *req; fsQueryXBitmaps16Reply reply; Index: xc/lib/FS/FSQXExt.c diff -u xc/lib/FS/FSQXExt.c:1.8 xc/lib/FS/FSQXExt.c:1.9 --- xc/lib/FS/FSQXExt.c:1.8 Mon Dec 22 12:48:02 2003 +++ xc/lib/FS/FSQXExt.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSQXExt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSQXExt.c,v 1.8 2003/12/22 17:48:02 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSQXExt.c,v 1.9 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -66,13 +64,8 @@ } int -FSQueryXExtents8(svr, fid, range_type, str, str_len, extents) - FSServer *svr; - Font fid; - Bool range_type; - unsigned char *str; - unsigned long str_len; - FSXCharInfo **extents; +FSQueryXExtents8(FSServer *svr, Font fid, Bool range_type, unsigned char *str, + unsigned long str_len, FSXCharInfo **extents) { fsQueryXExtents8Req *req; fsQueryXExtents8Reply reply; @@ -112,13 +105,8 @@ } int -FSQueryXExtents16(svr, fid, range_type, str, str_len, extents) - FSServer *svr; - Font fid; - Bool range_type; - FSChar2b *str; - unsigned long str_len; - FSXCharInfo **extents; +FSQueryXExtents16(FSServer *svr, Font fid, Bool range_type, FSChar2b *str, + unsigned long str_len, FSXCharInfo **extents) { fsQueryXExtents16Req *req; fsQueryXExtents16Reply reply; Index: xc/lib/FS/FSQXInfo.c diff -u xc/lib/FS/FSQXInfo.c:1.6 xc/lib/FS/FSQXInfo.c:1.7 --- xc/lib/FS/FSQXInfo.c:1.6 Mon Dec 22 12:48:02 2003 +++ xc/lib/FS/FSQXInfo.c Tue Mar 22 22:11:23 2005 @@ -1,4 +1,3 @@ -/* $Xorg: FSQXInfo.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -23,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSQXInfo.c,v 1.6 2003/12/22 17:48:02 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSQXInfo.c,v 1.7 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -59,13 +58,9 @@ */ int -FSQueryXInfo(svr, fid, info, props, offsets, prop_data) - FSServer *svr; - Font fid; - FSXFontInfoHeader *info; - FSPropInfo *props; - FSPropOffset **offsets; - unsigned char **prop_data; +FSQueryXInfo(FSServer *svr, Font fid, FSXFontInfoHeader *info, + FSPropInfo *props, FSPropOffset **offsets, + unsigned char **prop_data) { fsQueryXInfoReq *req; fsQueryXInfoReply reply; Index: xc/lib/FS/FSQuExt.c diff -u xc/lib/FS/FSQuExt.c:1.2 xc/lib/FS/FSQuExt.c:1.3 --- xc/lib/FS/FSQuExt.c:1.2 Fri Dec 14 14:53:33 2001 +++ xc/lib/FS/FSQuExt.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSQuExt.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,6 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +/* $XFree86: xc/lib/FS/FSQuExt.c,v 1.3 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -54,12 +53,8 @@ #include "FSlibint.h" Bool -FSQueryExtension(svr, name, major_opcode, first_event, first_error) - FSServer *svr; - char *name; - int *major_opcode; - int *first_event; - int *first_error; +FSQueryExtension(FSServer *svr, char *name, int *major_opcode, + int *first_event, int *first_error) { fsQueryExtensionReply rep; fsQueryExtensionReq *req; Index: xc/lib/FS/FSServName.c diff -u xc/lib/FS/FSServName.c:1.4 xc/lib/FS/FSServName.c:1.6 --- xc/lib/FS/FSServName.c:1.4 Fri Dec 14 14:53:33 2001 +++ xc/lib/FS/FSServName.c Thu Mar 24 21:22:51 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSServName.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSServName.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSServName.c,v 1.4 2001/12/14 19:53:33 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSServName.c,v 1.6 2005/03/25 02:22:51 dawes Exp $ */ /* @@ -55,10 +53,10 @@ #include #include #include +#include "FSlib.h" -char * -FSServerName(server) - char *server; +char * +FSServerName(char *server) { char *s; Index: xc/lib/FS/FSSetCats.c diff -u xc/lib/FS/FSSetCats.c:1.5 xc/lib/FS/FSSetCats.c:1.6 --- xc/lib/FS/FSSetCats.c:1.5 Fri Dec 14 14:53:33 2001 +++ xc/lib/FS/FSSetCats.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSSetCats.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSFlush.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSSetCats.c,v 1.5 2001/12/14 19:53:33 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSSetCats.c,v 1.6 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -55,10 +53,7 @@ #include "FSlibint.h" int -FSSetCatalogues(svr, num, cats) - FSServer *svr; - int num; - char **cats; +FSSetCatalogues(FSServer *svr, int num, char **cats) { int nbytes; fsSetCataloguesReq *req; Index: xc/lib/FS/FSSync.c diff -u xc/lib/FS/FSSync.c:1.2 xc/lib/FS/FSSync.c:1.3 --- xc/lib/FS/FSSync.c:1.2 Fri Dec 14 14:53:33 2001 +++ xc/lib/FS/FSSync.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSSync.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,6 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +/* $XFree86: xc/lib/FS/FSSync.c,v 1.3 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -53,13 +52,10 @@ #include "FSlibint.h" -extern _FSQEvent *_FSqfree; - /* synchronize with errors and events */ -int FSSync(svr, discard) - FSServer *svr; - Bool discard; +int +FSSync(FSServer *svr, Bool discard) { fsListExtensionsReply rep; fsReq *req; Index: xc/lib/FS/FSSynchro.c diff -u xc/lib/FS/FSSynchro.c:1.5 xc/lib/FS/FSSynchro.c:1.6 --- xc/lib/FS/FSSynchro.c:1.5 Fri Dec 14 14:53:33 2001 +++ xc/lib/FS/FSSynchro.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSSynchro.c,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSSynchro.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSSynchro.c,v 1.5 2001/12/14 19:53:33 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSSynchro.c,v 1.6 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -76,9 +74,7 @@ } FSSyncHandler -FSSetAfterFunction(svr, func) - FSServer *svr; - FSSyncHandler func; +FSSetAfterFunction(FSServer *svr, FSSyncHandler func) { FSSyncHandler temp; Index: xc/lib/FS/FSlib.h diff -u xc/lib/FS/FSlib.h:1.7 xc/lib/FS/FSlib.h:1.8 --- xc/lib/FS/FSlib.h:1.7 Wed Dec 19 16:37:29 2001 +++ xc/lib/FS/FSlib.h Mon Jan 9 09:58:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: FSlib.h,v 1.5 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,7 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/FS/FSlib.h,v 1.7 2001/12/19 21:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSlib.h,v 1.8 2006/01/09 14:58:20 dawes Exp $ */ /* Index: xc/lib/FS/FSlibInt.c diff -u xc/lib/FS/FSlibInt.c:3.11 xc/lib/FS/FSlibInt.c:3.12 --- xc/lib/FS/FSlibInt.c:3.11 Fri May 23 10:38:26 2003 +++ xc/lib/FS/FSlibInt.c Tue Mar 22 22:11:23 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSlibInt.c,v 1.5 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -24,6 +22,7 @@ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ +/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.12 2005/03/23 03:11:23 dawes Exp $ */ /* @@ -50,7 +49,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.11 2003/05/23 14:38:26 tsi Exp $ */ +/* $XFree86: xc/lib/FS/FSlibInt.c,v 3.12 2005/03/23 03:11:23 dawes Exp $ */ /* * FSlibInt.c - Internal support routines for the C subroutine @@ -128,8 +127,7 @@ * This routine may have to be reworked if int < long. */ void -_FSFlush(svr) - register FSServer *svr; +_FSFlush(FSServer *svr) { register long size, todo; @@ -174,9 +172,7 @@ } int -_FSEventsQueued(svr, mode) - register FSServer *svr; - int mode; +_FSEventsQueued(FSServer *svr, int mode) { register BytesReadable_t len; BytesReadable_t pend; @@ -213,8 +209,7 @@ * then read as many events as possible (but at least 1) and enqueue them */ void -_FSReadEvents(svr) - register FSServer *svr; +_FSReadEvents(FSServer *svr) { char buf[BUFSIZE]; BytesReadable_t pend_not_register; /* because can't "&" a register @@ -271,10 +266,7 @@ * reads. This routine may have to be reworked if int < long. */ void -_FSRead(svr, data, size) - register FSServer *svr; - register char *data; - register long size; +_FSRead(FSServer *svr, char *data, long size) { register long bytes_read; #if defined(SVR4) && defined(i386) @@ -346,11 +338,7 @@ * */ static void -_doFSRead32(svr, data, size, packbuffer) - register FSServer *svr; - register long *data; - register long size; - register char *packbuffer; +_doFSRead32(FSServer *svr, long *data, long size, char *packbuffer) { long *lpack, *lp; @@ -378,10 +366,7 @@ } void -_FSRead32(svr, data, len) - FSServer *svr; - long *data; - long len; +_FSRead32(FSServer *svr, long *data, long len) { char packbuffer[PACKBUFFERSIZE]; unsigned nwords = (PACKBUFFERSIZE >> 2); /* bytes to CARD32 */ @@ -400,11 +385,7 @@ * */ static void -_doFSRead16(svr, data, size, packbuffer) - register FSServer *svr; - register short *data; - register long size; - char *packbuffer; +_doFSRead16(FSServer *svr, short *data, long size, char *packbuffer) { long *lpack, *lp; @@ -432,10 +413,7 @@ } void -_FSRead16(svr, data, len) - FSServer *svr; - short *data; - long len; +_FSRead16(FSServer *svr, short *data, long len) { char packbuffer[PACKBUFFERSIZE]; unsigned nwords = (PACKBUFFERSIZE >> 1); /* bytes to CARD16 */ @@ -447,10 +425,7 @@ } void -_FSRead16Pad(svr, data, size) - FSServer *svr; - short *data; - long size; +_FSRead16Pad(FSServer *svr, short *data, long size) { int slop = (size & 3); short slopbuf[3]; @@ -470,10 +445,7 @@ * bytes. This routine may have to be reworked if int < long. */ void -_FSReadPad(svr, data, size) - register FSServer *svr; - register char *data; - register long size; +_FSReadPad(FSServer *svr, char *data, long size) { register long bytes_read; struct iovec iov[2]; @@ -535,10 +507,7 @@ * This routine may have to be reworked if int < long; */ void -_FSSend(svr, data, size) - register FSServer *svr; - char *data; - register long size; +_FSSend(FSServer *svr, char *data, long size) { struct iovec iov[3]; static char pad[3] = {0, 0, 0}; @@ -630,8 +599,7 @@ * follow the rules. */ FSID -_FSAllocID(svr) - register FSServer *svr; +_FSAllocID(FSServer *svr) { return (svr->resource_base + (svr->resource_id++ << svr->resource_shift)); } @@ -648,9 +616,7 @@ */ unsigned long -_FSSetLastRequestRead(svr, rep) - register FSServer *svr; - register fsGenericReply *rep; +_FSSetLastRequestRead(FSServer *svr, fsGenericReply *rep) { register unsigned long newseq, lastseq; @@ -680,15 +646,13 @@ * we may encounter. */ Status -_FSReply(svr, rep, extra, discard) - register FSServer *svr; - register fsReply *rep; - int extra; /* number of 32-bit words expected after the - * reply */ - Bool discard; /* should I discard data followind "extra" - * words? */ +_FSReply(FSServer *svr, fsReply *rep, int extra, Bool discard) { /* + * extra: number of 32-bit words expected after the reply. + * discard: should I discard data following "extra" words? + */ + /* * Pull out the serial number now, so that (currently illegal) requests * generated by an error handler don't confuse us. */ @@ -804,9 +768,7 @@ /* Read and discard "n" 8-bit bytes of data */ void -_FSEatData(svr, n) - FSServer *svr; - register unsigned long n; +_FSEatData(FSServer *svr, unsigned long n) { #define SCRATCHSIZE 2048 char buf[SCRATCHSIZE]; @@ -824,9 +786,7 @@ /* Read and discard "n" 32-bit words. */ static void -_EatData32(svr, n) - FSServer *svr; - unsigned long n; +_EatData32(FSServer *svr, unsigned long n) { _FSEatData(svr, n << 2); } @@ -838,9 +798,7 @@ * is pointer motion hints.... */ void -_FSEnq(svr, event) - register FSServer *svr; - register fsEvent *event; +_FSEnq(FSServer *svr, fsEvent *event) { register _FSQEvent *qelt; @@ -877,11 +835,7 @@ /*ARGSUSED*/ Bool -_FSUnknownWireEvent(svr, re, event) - register FSServer *svr; /* pointer to display structure */ - register FSEvent *re; /* pointer to where event should be - * reformatted */ - register fsEvent *event; /* wire protocol event */ +_FSUnknownWireEvent(FSServer *svr, FSEvent *re, fsEvent *event) { #ifdef notdef @@ -895,11 +849,7 @@ /*ARGSUSED*/ Status -_FSUnknownNativeEvent(svr, re, event) - register FSServer *svr; /* pointer to display structure */ - register FSEvent *re; /* pointer to where event should be - * reformatted */ - register fsEvent *event; /* wire protocol event */ +_FSUnknownNativeEvent(FSServer *svr, FSEvent *re, fsEvent *event) { #ifdef notdef @@ -915,11 +865,7 @@ * reformat a wire event into an FSEvent structure of the right type. */ Bool -_FSWireToEvent(svr, re, event) - register FSServer *svr; /* pointer to display structure */ - register FSEvent *re; /* pointer to where event should be - * reformatted */ - register fsEvent *event; /* wire protocol event */ +_FSWireToEvent(FSServer *svr, FSEvent *re, fsEvent *event) { re->type = event->type & 0x7f; @@ -941,8 +887,7 @@ static char * -_SysErrorMsg(n) - int n; +_SysErrorMsg(int n) { char *s = strerror(n); @@ -954,8 +899,7 @@ * when an X internal system error is encountered. */ int -_FSDefaultIOError(svr) - FSServer *svr; +_FSDefaultIOError(FSServer *svr) { (void) fprintf(stderr, "FSIO: fatal IO error %d (%s) on font server \"%s\"\r\n", @@ -984,9 +928,7 @@ * FS_Error packet is encountered in the input stream. */ int -_FSError(svr, rep) - FSServer *svr; - fsError *rep; +_FSError(FSServer *svr, fsError *rep) { FSErrorEvent event; @@ -1009,10 +951,7 @@ } int -_FSPrintDefaultError(svr, event, fp) - FSServer *svr; - FSErrorEvent *event; - FILE *fp; +_FSPrintDefaultError(FSServer *svr, FSErrorEvent *event, FILE *fp) { char buffer[BUFSIZ]; char mesg[BUFSIZ]; @@ -1067,9 +1006,7 @@ } int -_FSDefaultError(svr, event) - FSServer *svr; - FSErrorEvent *event; +_FSDefaultError(FSServer *svr, FSErrorEvent *event) { if (_FSPrintDefaultError(svr, event, stderr) == 0) return 0; @@ -1086,10 +1023,8 @@ * Xlib routine for scratch space. It is reallocated from the same place * each time, unless the library needs a large scratch space. */ -char * -_FSAllocScratch(svr, nbytes) - register FSServer *svr; - unsigned long nbytes; +char * +_FSAllocScratch(FSServer *svr, unsigned long nbytes) { if (nbytes > svr->scratch_length) { if (svr->scratch_buffer != NULL) @@ -1101,26 +1036,21 @@ } int -FSFree(data) - char *data; +FSFree(char *data) { FSfree(data); return 1; } unsigned char * -FSMalloc(size) - unsigned size; +FSMalloc(unsigned size) { return (unsigned char *) FSmalloc(size); } #ifdef DataRoutineIsProcedure void -Data(svr, data, len) - FSServer *svr; - char *data; - long len; +Data(FSServer *svr, char *data, long len) { if (svr->bufptr + (len) <= svr->bufmax) { bcopy(data, svr->bufptr, (int) len); @@ -1148,11 +1078,7 @@ */ static void -doData16(svr, data, len, packbuffer) - register FSServer *svr; - short *data; - unsigned len; - char *packbuffer; +doData16(FSServer *svr, short *data, unsigned len, char *packbuffer) { long *lp, *lpack; @@ -1186,10 +1112,7 @@ } void -Data16(svr, data, len) - FSServer *svr; - short *data; - unsigned len; +Data16(FSServer *svr, short *data, unsigned len) { char packbuffer[PACKBUFFERSIZE]; unsigned nwords = (PACKBUFFERSIZE >> 1); /* bytes to CARD16 */ @@ -1209,11 +1132,7 @@ */ static -doData32(svr, data, len, packbuffer) - register FSServer *svr; - long *data; - unsigned len; - char *packbuffer; +doData32(FSServer *svr, long *data, unsigned len, char *packbuffer) { long *lp, *lpack; @@ -1247,10 +1166,7 @@ } void -Data32(svr, data, len) - FSServer *svr; - short *data; - unsigned len; +Data32(FSServer *svr, short *data, unsigned len) { char packbuffer[PACKBUFFERSIZE]; unsigned nwords = (PACKBUFFERSIZE >> 2); /* bytes to CARD32 */ @@ -1311,9 +1227,7 @@ * _FSGetHostname - similar to gethostname but allows special processing. */ int -_FSGetHostname(buf, maxlen) - char *buf; - int maxlen; +_FSGetHostname(char *buf, int maxlen) { int len; @@ -1343,8 +1257,8 @@ /* * This is not always a macro. */ -_FSANYSET(src) - long *src; +int +_FSANYSET(long src) { int i; Index: xc/lib/FS/FSlibint.h diff -u xc/lib/FS/FSlibint.h:3.9 xc/lib/FS/FSlibint.h:3.11 --- xc/lib/FS/FSlibint.h:3.9 Mon Sep 1 16:50:09 2003 +++ xc/lib/FS/FSlibint.h Fri Oct 14 11:15:54 2005 @@ -1,5 +1,3 @@ -/* $Xorg: FSlibint.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -50,7 +48,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/FS/FSlibint.h,v 3.9 2003/09/01 20:50:09 herrb Exp $ */ +/* $XFree86: xc/lib/FS/FSlibint.h,v 3.11 2005/10/14 15:15:54 tsi Exp $ */ /* * FSlib internal decls @@ -72,7 +70,7 @@ #endif /* USG */ #include "FSlib.h" -#include "FSproto.h" +#include #include "FSlibos.h" #include #include @@ -116,6 +114,9 @@ extern FSErrorHandler FSSetErrorHandler ( FSErrorHandler handler ); extern FSIOErrorHandler FSSetIOErrorHandler ( FSIOErrorHandler handler ); +extern FSServer *_FSHeadOfServerList; +extern _FSQEvent *_FSqfree; + #ifndef BUFSIZE #define BUFSIZE 2048 /* FS output buffer size. */ #endif Index: xc/lib/FS/FSlibos.h diff -u xc/lib/FS/FSlibos.h:3.12 xc/lib/FS/FSlibos.h:3.13 --- xc/lib/FS/FSlibos.h:3.12 Sat Apr 3 17:26:20 2004 +++ xc/lib/FS/FSlibos.h Mon Jan 9 09:58:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: FSlibos.h,v 1.4 2001/02/09 02:03:25 xorgcvs Exp $ */ - /* @(#)FSlibos.h 4.1 91/05/02 * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -50,7 +48,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/FS/FSlibos.h,v 3.12 2004/04/03 22:26:20 dawes Exp $ */ +/* $XFree86: xc/lib/FS/FSlibos.h,v 3.13 2006/01/09 14:58:21 dawes Exp $ */ /* * FSlib networking & os include file Index: xc/lib/FS/Imakefile diff -u xc/lib/FS/Imakefile:3.7 xc/lib/FS/Imakefile:3.8 --- xc/lib/FS/Imakefile:3.7 Sun Apr 4 22:33:08 2004 +++ xc/lib/FS/Imakefile Fri Oct 14 11:15:54 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:44:07 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/FS/Imakefile,v 3.7 2004/04/05 02:33:08 dawes Exp $ +XCOMM $XFree86: xc/lib/FS/Imakefile,v 3.8 2005/10/14 15:15:54 tsi Exp $ #define DoNormalLib NormalLibFS #define DoSharedLib SharedLibFS @@ -23,8 +18,6 @@ HEADERS = FSlib.h -INCLUDES = -I$(FONTINCSRC) - SRCS = FSClServ.c FSCloseFt.c FSConnServ.c FSErrDis.c FSErrHndlr.c \ FSFlush.c FSFontInfo.c FSFtNames.c FSGetCats.c FSListCats.c \ FSListExt.c FSMisc.c FSNextEv.c FSOpenFont.c FSOpenServ.c \ Index: xc/lib/GL/GL/GL-def.cpp diff -u xc/lib/GL/GL/GL-def.cpp:1.3 xc/lib/GL/GL/GL-def.cpp:1.4 --- xc/lib/GL/GL/GL-def.cpp:1.3 Tue Nov 11 19:10:24 2003 +++ xc/lib/GL/GL/GL-def.cpp Sat Apr 8 14:30:24 2006 @@ -491,5 +491,9 @@ _glapi_get_proc_address _glapi_set_warning_func #endif +#ifdef HAS_THREADS + _glapi_DispatchTSD + _glapi_get_dispatch +#endif -/* $XFree86: xc/lib/GL/GL/GL-def.cpp,v 1.3 2003/11/12 00:10:24 dawes Exp $ */ +/* $XFree86: xc/lib/GL/GL/GL-def.cpp,v 1.4 2006/04/08 18:30:24 dawes Exp $ */ Index: xc/lib/GL/apple/Imakefile diff -u xc/lib/GL/apple/Imakefile:1.8 xc/lib/GL/apple/Imakefile:1.9 --- xc/lib/GL/apple/Imakefile:1.8 Mon Feb 28 22:48:49 2005 +++ xc/lib/GL/apple/Imakefile Fri Oct 14 11:15:55 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/apple/Imakefile,v 1.8 2005/03/01 03:48:49 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/apple/Imakefile,v 1.9 2005/10/14 15:15:55 tsi Exp $ #include @@ -21,8 +21,7 @@ DRI_SRCS = dri_glx.c dri_driver.c dri_dispatch.c x-hash.c x-list.c DRI_OBJS = dri_glx.o dri_driver.o dri_dispatch.o x-hash.o x-list.o - DRI_INCS = -I. -I$(GLXLIBSRC)/glx -I$(INCLUDESRC) -I$(INCLUDESRC)/GL \ - -I$(XINCLUDESRC) -I$(SERVERSRC)/GL/dri -I$(XPINCDIR) \ + DRI_INCS = -I$(GLXLIBSRC)/glx -I$(SERVERSRC)/GL/dri -I$(XPINCDIR) \ -I$(MESASRCDIR)/include -I$(MESASRCDIR)/src/mesa/glapi \ -I$(GLXLIBSRC)/include @@ -30,10 +29,10 @@ DEFINES = $(ALLOC_DEFINES) GlxDefines $(GLX_DEFS) -DXP_NO_X_HEADERS=1 \ -DOSVERSION=OSMajorVersion*100+OSMinorVersion - INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) -I$(XF86OSSRC) \ + INCLUDES = -I$(XF86OSSRC) \ -I$(DRMINCLUDESDIR) -I$(DRI_INCS) -F$(AS)/Frameworks SRCS = appledri.c $(DRI_SRCS) - OBJS = appledri.o $(DRI_OBJS) + OBJS = appledri.o $(DRI_OBJS) /* We won't require this to run when building normally, just for updating. Also, don't give it any dependences so make doesn't attempt to rebuild Index: xc/lib/GL/apple/appledri.c diff -u xc/lib/GL/apple/appledri.c:1.1 xc/lib/GL/apple/appledri.c:1.2 --- xc/lib/GL/apple/appledri.c:1.1 Sun Jun 29 21:45:10 2003 +++ xc/lib/GL/apple/appledri.c Fri Oct 14 11:15:55 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/apple/appledri.c,v 1.1 2003/06/30 01:45:10 torrey Exp $ */ +/* $XFree86: xc/lib/GL/apple/appledri.c,v 1.2 2005/10/14 15:15:55 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -43,7 +43,7 @@ #include #include "appledristr.h" #include -#include "extutil.h" +#include #include static XExtensionInfo _appledri_info_data; Index: xc/lib/GL/apple/build-dispatch diff -u xc/lib/GL/apple/build-dispatch:1.2 xc/lib/GL/apple/build-dispatch:1.3 --- xc/lib/GL/apple/build-dispatch:1.2 Sun Oct 12 20:30:53 2003 +++ xc/lib/GL/apple/build-dispatch Mon Jan 9 09:58:21 2006 @@ -4,8 +4,7 @@ ;; build-dispatch -;; $Id: build-dispatch,v 1.11 2003/02/17 20:05:41 jharper Exp $ -;; $XFree86: xc/lib/GL/apple/build-dispatch,v 1.2 2003/10/13 00:30:53 torrey Exp $ +;; $XFree86: xc/lib/GL/apple/build-dispatch,v 1.3 2006/01/09 14:58:21 dawes Exp $ ;; Copyright (c) 2002 Apple Computer, Inc. All rights reserved. Index: xc/lib/GL/apple/dri_dispatch.c diff -u xc/lib/GL/apple/dri_dispatch.c:1.5 xc/lib/GL/apple/dri_dispatch.c:1.7 --- xc/lib/GL/apple/dri_dispatch.c:1.5 Fri Dec 10 12:47:24 2004 +++ xc/lib/GL/apple/dri_dispatch.c Mon Jan 9 09:58:21 2006 @@ -1,5 +1,4 @@ /* dri_dispatch.c - $Id: dri_dispatch.c,v 1.13 2003/07/23 17:58:02 jharper Exp $ Copyright (c) 2002 Apple Computer, Inc. All rights reserved. Copyright (c) Torrey T. Lyons. All rights reserved. @@ -28,7 +27,7 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/lib/GL/apple/dri_dispatch.c,v 1.5 2004/12/10 17:47:24 alanh Exp $ */ +/* $XFree86: xc/lib/GL/apple/dri_dispatch.c,v 1.7 2006/01/09 14:58:21 dawes Exp $ */ #include #include @@ -46,7 +45,7 @@ #include "glapitable.h" #include "glxclient.h" -#include +#include #include #ifdef __GNUC__ Index: xc/lib/GL/apple/dri_dispatch.defs diff -u xc/lib/GL/apple/dri_dispatch.defs:1.7 xc/lib/GL/apple/dri_dispatch.defs:1.8 --- xc/lib/GL/apple/dri_dispatch.defs:1.7 Fri Dec 10 12:47:24 2004 +++ xc/lib/GL/apple/dri_dispatch.defs Mon Jan 9 09:58:21 2006 @@ -2,8 +2,7 @@ ;; dri_dispatch.defs -;; $Id: dri_dispatch.defs,v 1.9 2003/02/17 20:05:41 jharper Exp $ -;; $XFree86: xc/lib/GL/apple/dri_dispatch.defs,v 1.7 2004/12/10 17:47:24 alanh Exp $ +;; $XFree86: xc/lib/GL/apple/dri_dispatch.defs,v 1.8 2006/01/09 14:58:21 dawes Exp $ ;; Copyright (c) 2002 Apple Computer, Inc. All rights reserved. ;; Copyright (c) 2003-2004 Torrey T. Lyons. All rights reserved. Index: xc/lib/GL/apple/dri_dispatch.h diff -u xc/lib/GL/apple/dri_dispatch.h:1.7 xc/lib/GL/apple/dri_dispatch.h:1.8 --- xc/lib/GL/apple/dri_dispatch.h:1.7 Fri Dec 10 12:47:24 2004 +++ xc/lib/GL/apple/dri_dispatch.h Mon Jan 9 09:58:21 2006 @@ -1,6 +1,5 @@ /* dri_dispatch.h -- built automatically, DO NOT EDIT - $Id$ - $XFree86: xc/lib/GL/apple/dri_dispatch.h,v 1.7 2004/12/10 17:47:24 alanh Exp $ */ + $XFree86: xc/lib/GL/apple/dri_dispatch.h,v 1.8 2006/01/09 14:58:21 dawes Exp $ */ /* Actually, this file has been edited to add necessary dependencies on the version of Mac OS X. Someday the Index: xc/lib/GL/apple/dri_driver.c diff -u xc/lib/GL/apple/dri_driver.c:1.4 xc/lib/GL/apple/dri_driver.c:1.5 --- xc/lib/GL/apple/dri_driver.c:1.4 Fri Dec 10 12:47:24 2004 +++ xc/lib/GL/apple/dri_driver.c Fri Oct 14 11:15:55 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/apple/dri_driver.c,v 1.4 2004/12/10 17:47:24 alanh Exp $ */ +/* $XFree86: xc/lib/GL/apple/dri_driver.c,v 1.5 2005/10/14 15:15:55 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -63,7 +63,7 @@ #include #include #include -#include "extutil.h" +#include #include "glxclient.h" #include "appledri.h" #include "dri_driver.h" Index: xc/lib/GL/apple/dri_driver.h diff -u xc/lib/GL/apple/dri_driver.h:1.2 xc/lib/GL/apple/dri_driver.h:1.3 --- xc/lib/GL/apple/dri_driver.h:1.2 Thu Oct 30 21:22:12 2003 +++ xc/lib/GL/apple/dri_driver.h Fri Oct 14 11:15:55 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/apple/dri_driver.h,v 1.2 2003/10/31 02:22:12 torrey Exp $ */ +/* $XFree86: xc/lib/GL/apple/dri_driver.h,v 1.3 2005/10/14 15:15:55 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -37,7 +37,7 @@ #define _DRI_DRIVER_H_ #include "Xplugin.h" -#include "Xthreads.h" +#include #include #include #include Index: xc/lib/GL/apple/dri_glx.c diff -u xc/lib/GL/apple/dri_glx.c:1.3 xc/lib/GL/apple/dri_glx.c:1.4 --- xc/lib/GL/apple/dri_glx.c:1.3 Fri Dec 10 12:47:24 2004 +++ xc/lib/GL/apple/dri_glx.c Fri Oct 14 11:15:55 2005 @@ -26,7 +26,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/lib/GL/apple/dri_glx.c,v 1.3 2004/12/10 17:47:24 alanh Exp $ */ +/* $XFree86: xc/lib/GL/apple/dri_glx.c,v 1.4 2005/10/14 15:15:55 tsi Exp $ */ /* * Authors: @@ -40,7 +40,7 @@ #include #include #include -#include "extutil.h" +#include #include "glxclient.h" #include "appledri.h" #include Index: xc/lib/GL/dri/drm/Imakefile diff -u xc/lib/GL/dri/drm/Imakefile:1.29 xc/lib/GL/dri/drm/Imakefile:1.30 --- xc/lib/GL/dri/drm/Imakefile:1.29 Mon Feb 28 22:48:49 2005 +++ xc/lib/GL/dri/drm/Imakefile Fri Oct 14 11:15:55 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/dri/drm/Imakefile,v 1.29 2005/03/01 03:48:49 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/dri/drm/Imakefile,v 1.30 2005/10/14 15:15:55 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -57,8 +57,7 @@ #endif DEFINES = $(ALLOC_DEFINES) - INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(XF86OSSRC)/$(OS_SUBDIR)/drm \ + INCLUDES = -I$(XF86OSSRC)/$(OS_SUBDIR)/drm \ -I$(XF86OSSRC) -I$(DRMINCLUDESDIR) SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o Index: xc/lib/GL/glx/Imakefile diff -u xc/lib/GL/glx/Imakefile:1.31 xc/lib/GL/glx/Imakefile:1.35 --- xc/lib/GL/glx/Imakefile:1.31 Mon Feb 28 22:48:49 2005 +++ xc/lib/GL/glx/Imakefile Sun Feb 19 19:14:35 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.31 2005/03/01 03:48:49 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.35 2006/02/20 00:14:35 dawes Exp $ XCOMM The contents of this file are subject to the GLX Public License Version 1.0 XCOMM (the "License"). You may not use this file except in compliance with the XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc., @@ -119,7 +119,6 @@ single2.c \ singlepix.c \ vertarr.c \ - xfont.c \ glx_pbuffer.c \ glx_query.c \ glx_texture_compression.c @@ -146,7 +145,6 @@ single2.o \ singlepix.o \ vertarr.o \ - xfont.o \ glx_pbuffer.o \ glx_query.o \ glx_texture_compression.o @@ -162,8 +160,8 @@ #endif #if BuildXF86DRI - DRI_SRCS = dri_glx.c XF86dri.c - DRI_OBJS = dri_glx.o XF86dri.o + DRI_SRCS = dri_glx.c XF86dri.c xfont.c + DRI_OBJS = dri_glx.o XF86dri.o xfont.o DRI_INCS = -I$(SERVERSRC)/GL/dri #if defined(i386Architecture) && MesaUseX86Asm @@ -180,17 +178,25 @@ #if GlxBuiltInXMesa XMESA_DEFINES = -DGLX_BUILT_IN_XMESA #endif + +#ifdef XFree86Version + X_INCS = -I$(XF86OSSRC) +#endif #endif #if defined(DarwinArchitecture) || defined(OS2Architecture) || \ -defined(LynxOSArchitecture) + defined(LynxOSArchitecture) ALIAS_DEFINES = -DGLX_ALIAS_UNSUPPORTED #endif #if defined(DarwinArchitecture) && BuildAppleDRI - DRI_SRCS = XF86dri.c - DRI_OBJS = XF86dri.o + DRI_SRCS = XF86dri.c xfont.c + DRI_OBJS = XF86dri.o xfont.o DRI_INCS = -I$(SERVERSRC)/GL/dri + +#ifdef XFree86Version + X_INCS = -I$(XF86OSSRC) +#endif #endif SRCS = $(GLX_SRCS) $(ASM_SRCS) $(DRI_SRCS) @@ -198,17 +204,13 @@ DEFINES = $(GLX_DEFS) $(ASM_DEFS) $(XMESA_DEFINES) $(ALIAS_DEFINES) \ $(THREADS_DEFINES) - INCLUDES = -I$(XINCLUDESRC) \ - -I$(MESASRCDIR)/include \ - -I$(EXTINCSRC) \ + INCLUDES = -I$(MESASRCDIR)/include \ -I$(GLXLIBSRC)/glx \ -I$(MESASRCDIR)/src/mesa/main \ -I$(MESASRCDIR)/src/mesa/glapi \ -I$(MESASRCDIR)/src/mesa/drivers/x11 \ -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(XF86OSSRC) \ - -I$(DRMINCLUDESDIR) \ - $(DRI_INCS) + -I$(DRMINCLUDESDIR) $(DRI_INCS) $(X_INCS) #include Index: xc/lib/GL/glx/XF86dri.c diff -u xc/lib/GL/glx/XF86dri.c:1.1 xc/lib/GL/glx/XF86dri.c:1.3 --- xc/lib/GL/glx/XF86dri.c:1.1 Fri Dec 10 11:06:56 2004 +++ xc/lib/GL/glx/XF86dri.c Fri Oct 14 11:15:55 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/XF86dri.c,v 1.1 2004/12/10 16:06:56 alanh Exp $ */ +/* $XFree86: xc/lib/GL/glx/XF86dri.c,v 1.3 2005/10/14 15:15:55 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -41,7 +41,7 @@ #include #include "xf86dristr.h" #include -#include "extutil.h" +#include static XExtensionInfo _xf86dri_info_data; static XExtensionInfo *xf86dri_info = &_xf86dri_info_data; @@ -588,26 +588,25 @@ return True; } -Bool XF86DRIOpenFullScreen(dpy, screen, drawable) - Display* dpy; - int screen; - Drawable drawable; +/* + * These two functions and the underlying X protocol are deprecated. + */ +Bool XF86DRIOpenFullScreen(Display *dpy, int screen, Drawable drawable); + +Bool +XF86DRIOpenFullScreen(Display *dpy, int screen, Drawable drawable) { - /* This function and the underlying X protocol are deprecated. - */ (void) dpy; (void) screen; (void) drawable; return False; } -Bool XF86DRICloseFullScreen(dpy, screen, drawable) - Display* dpy; - int screen; - Drawable drawable; +Bool XF86DRICloseFullScreen(Display *dpy, int screen, Drawable drawable); + +Bool +XF86DRICloseFullScreen(Display *dpy, int screen, Drawable drawable) { - /* This function and the underlying X protocol are deprecated. - */ (void) dpy; (void) screen; (void) drawable; Index: xc/lib/GL/glx/dispatch.c diff -u xc/lib/GL/glx/dispatch.c:1.5 xc/lib/GL/glx/dispatch.c:1.6 --- xc/lib/GL/glx/dispatch.c:1.5 Sun Jun 29 21:45:10 2003 +++ xc/lib/GL/glx/dispatch.c Fri Feb 17 22:31:36 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/dispatch.c,v 1.5 2003/06/30 01:45:10 torrey Exp $ */ +/* $XFree86: xc/lib/GL/glx/dispatch.c,v 1.6 2006/02/18 03:31:36 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -34,6 +34,7 @@ #ifndef GLX_USE_APPLEGL +#define GL_GLEXT_PROTOTYPES #include #include "glapi.h" #include "glapitable.h" Index: xc/lib/GL/glx/dri_glx.c diff -u xc/lib/GL/glx/dri_glx.c:1.1 xc/lib/GL/glx/dri_glx.c:1.2 --- xc/lib/GL/glx/dri_glx.c:1.1 Fri Dec 10 11:06:56 2004 +++ xc/lib/GL/glx/dri_glx.c Fri Oct 14 11:15:55 2005 @@ -24,7 +24,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/lib/GL/glx/dri_glx.c,v 1.1 2004/12/10 16:06:56 alanh Exp $ */ +/* $XFree86: xc/lib/GL/glx/dri_glx.c,v 1.2 2005/10/14 15:15:55 tsi Exp $ */ /* * Authors: @@ -38,7 +38,7 @@ #include #include #include -#include "extutil.h" +#include #include "glxclient.h" #include "xf86dri.h" #include "sarea.h" Index: xc/lib/GL/glx/dri_glx.h diff -u xc/lib/GL/glx/dri_glx.h:1.1 xc/lib/GL/glx/dri_glx.h:1.2 --- xc/lib/GL/glx/dri_glx.h:1.1 Fri Dec 10 11:06:56 2004 +++ xc/lib/GL/glx/dri_glx.h Mon Mar 28 23:00:30 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/glx/dri_glx.h,v 1.2 2005/03/29 04:00:30 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. Index: xc/lib/GL/glx/glx_pbuffer.c diff -u xc/lib/GL/glx/glx_pbuffer.c:1.3 xc/lib/GL/glx/glx_pbuffer.c:1.4 --- xc/lib/GL/glx/glx_pbuffer.c:1.3 Fri Dec 17 11:38:03 2004 +++ xc/lib/GL/glx/glx_pbuffer.c Fri Oct 14 11:15:55 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/glx_pbuffer.c,v 1.3 2004/12/17 16:38:03 tsi Exp $ */ +/* $XFree86: xc/lib/GL/glx/glx_pbuffer.c,v 1.4 2005/10/14 15:15:55 tsi Exp $ */ /* * (C) Copyright IBM Corporation 2004 * All Rights Reserved. @@ -31,8 +31,8 @@ */ #include "glxclient.h" -#include -#include +#include +#include #include #include #include "glapi.h" Index: xc/lib/GL/glx/glx_query.c diff -u xc/lib/GL/glx/glx_query.c:1.1 xc/lib/GL/glx/glx_query.c:1.2 --- xc/lib/GL/glx/glx_query.c:1.1 Fri Dec 10 11:06:56 2004 +++ xc/lib/GL/glx/glx_query.c Mon Mar 28 23:00:30 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/glx/glx_query.c,v 1.2 2005/03/29 04:00:30 tsi Exp $ */ /* * (C) Copyright IBM Corporation 2004 * All Rights Reserved. Index: xc/lib/GL/glx/glx_texture_compression.c diff -u xc/lib/GL/glx/glx_texture_compression.c:1.1 xc/lib/GL/glx/glx_texture_compression.c:1.2 --- xc/lib/GL/glx/glx_texture_compression.c:1.1 Fri Dec 10 11:06:56 2004 +++ xc/lib/GL/glx/glx_texture_compression.c Mon Mar 28 23:00:30 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/GL/glx/glx_texture_compression.c,v 1.2 2005/03/29 04:00:30 tsi Exp $ */ /* * (C) Copyright IBM Corporation 2004 * All Rights Reserved. Index: xc/lib/GL/glx/glxclient.h diff -u xc/lib/GL/glx/glxclient.h:1.25 xc/lib/GL/glx/glxclient.h:1.26 --- xc/lib/GL/glx/glxclient.h:1.25 Fri Dec 10 11:06:56 2004 +++ xc/lib/GL/glx/glxclient.h Fri Oct 14 11:15:55 2005 @@ -31,7 +31,7 @@ ** published by SGI, but has not been independently verified as being ** compliant with the OpenGL(R) version 1.2.1 Specification. */ -/* $XFree86: xc/lib/GL/glx/glxclient.h,v 1.25 2004/12/10 16:06:56 alanh Exp $ */ +/* $XFree86: xc/lib/GL/glx/glxclient.h,v 1.26 2005/10/14 15:15:55 tsi Exp $ */ /** * \file glxclient.h @@ -63,7 +63,7 @@ #include "indirect.h" #endif #ifdef XTHREADS -#include "Xthreads.h" +#include #endif #ifdef GLX_BUILT_IN_XMESA #include "realglx.h" /* just silences prototype warnings */ Index: xc/lib/GL/glx/glxcmds.c diff -u xc/lib/GL/glx/glxcmds.c:1.36 xc/lib/GL/glx/glxcmds.c:1.38 --- xc/lib/GL/glx/glxcmds.c:1.36 Fri Dec 17 11:38:03 2004 +++ xc/lib/GL/glx/glxcmds.c Fri Oct 14 11:15:55 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/glxcmds.c,v 1.36 2004/12/17 16:38:03 tsi Exp $ */ +/* $XFree86: xc/lib/GL/glx/glxcmds.c,v 1.38 2005/10/14 15:15:55 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -40,14 +40,14 @@ */ #include "glxclient.h" -#include -#include +#include +#include #include #include #include "glapi.h" #ifdef GLX_DIRECT_RENDERING #include "indirect_init.h" -#include +#include #endif #include "glxextensions.h" #include "glcontextmodes.h" @@ -1821,7 +1821,7 @@ /* ** GLX_MESA_swap_control */ -GLint GLX_PREFIX(glXSwapIntervalMESA)(unsigned interval) +int GLX_PREFIX(glXSwapIntervalMESA)(unsigned interval) { #ifdef GLX_DIRECT_RENDERING GLXContext gc = __glXGetCurrentContext(); @@ -1853,7 +1853,7 @@ return GLX_BAD_CONTEXT; } -GLint GLX_PREFIX(glXGetSwapIntervalMESA)( void ) +int GLX_PREFIX(glXGetSwapIntervalMESA)( void ) { #ifdef GLX_DIRECT_RENDERING GLXContext gc = __glXGetCurrentContext(); @@ -1883,7 +1883,7 @@ ** GLX_MESA_swap_frame_usage */ -GLint GLX_PREFIX(glXBeginFrameTrackingMESA)(Display *dpy, GLXDrawable drawable) +int GLX_PREFIX(glXBeginFrameTrackingMESA)(Display *dpy, GLXDrawable drawable) { int status = GLX_BAD_CONTEXT; #ifdef GLX_DIRECT_RENDERING @@ -1903,7 +1903,7 @@ } -GLint GLX_PREFIX(glXEndFrameTrackingMESA)(Display *dpy, GLXDrawable drawable) +int GLX_PREFIX(glXEndFrameTrackingMESA)(Display *dpy, GLXDrawable drawable) { int status = GLX_BAD_CONTEXT; #ifdef GLX_DIRECT_RENDERING @@ -1923,8 +1923,8 @@ } -GLint GLX_PREFIX(glXGetFrameUsageMESA)(Display *dpy, GLXDrawable drawable, - GLfloat *usage) +int GLX_PREFIX(glXGetFrameUsageMESA)(Display *dpy, GLXDrawable drawable, + float *usage) { int status = GLX_BAD_CONTEXT; #ifdef GLX_DIRECT_RENDERING @@ -1950,9 +1950,9 @@ } -GLint GLX_PREFIX(glXQueryFrameTrackingMESA)(Display *dpy, GLXDrawable drawable, +int GLX_PREFIX(glXQueryFrameTrackingMESA)(Display *dpy, GLXDrawable drawable, int64_t *sbc, int64_t *missedFrames, - GLfloat *lastMissedUsage) + float *lastMissedUsage) { int status = GLX_BAD_CONTEXT; #ifdef GLX_DIRECT_RENDERING Index: xc/lib/GL/glx/glxext.c diff -u xc/lib/GL/glx/glxext.c:1.28 xc/lib/GL/glx/glxext.c:1.30 --- xc/lib/GL/glx/glxext.c:1.28 Mon Dec 13 17:40:54 2004 +++ xc/lib/GL/glx/glxext.c Fri Oct 14 11:15:55 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/GL/glx/glxext.c,v 1.28 2004/12/13 22:40:54 tsi Exp $ */ +/* $XFree86: xc/lib/GL/glx/glxext.c,v 1.30 2005/10/14 15:15:55 tsi Exp $ */ /* ** License Applicability. Except to the extent portions of this file are @@ -46,13 +46,13 @@ #include "packrender.h" #include -#include -#include +#include +#include #include #include "indirect_init.h" #include "glapi.h" #ifdef XTHREADS -#include "Xthreads.h" +#include #endif #include "glxextensions.h" #include "glcontextmodes.h" @@ -194,7 +194,9 @@ */ int __glXCloseDisplay(Display *dpy, XExtCodes *codes); +#ifdef GLX_DIRECT_RENDERING static GLboolean FillInVisuals( __GLXscreenConfigs * psc ); +#endif /************************************************************************/ @@ -363,6 +365,7 @@ return GL_TRUE; } +#ifdef GLX_DIRECT_RENDERING /** * Determine if a \c __GLcontextModes structure has the right mojo to be @@ -469,6 +472,7 @@ return (glx_visual_count != 0); } +#endif /* GLX_DIRECT_RENDERING */ void __glXInitializeVisualConfigFromTags( __GLcontextModes *config, int count, @@ -1516,10 +1520,10 @@ } +#ifdef GLX_DIRECT_RENDERING static Bool BindContextWrapper( Display *dpy, GLXContext gc, GLXDrawable draw, GLXDrawable read ) { -#ifdef GLX_DIRECT_RENDERING if ( gc->driContext.bindContext3 != NULL ) { return (*gc->driContext.bindContext3)(dpy, gc->screen, draw, read, & gc->driContext); @@ -1528,15 +1532,11 @@ return (*gc->driContext.bindContext2)(dpy, gc->screen, draw, read, gc); } -#else - return GL_FALSE; -#endif } static Bool UnbindContextWrapper( Display *dpy, GLXContext gc ) { -#ifdef GLX_DIRECT_RENDERING if ( gc->driContext.unbindContext3 != NULL ) { return (*gc->driContext.unbindContext3)(dpy, gc->screen, gc->currentDrawable, @@ -1548,10 +1548,8 @@ gc->currentDrawable, gc->currentReadable, gc); } -#else - return GL_FALSE; -#endif } +#endif /* Index: xc/lib/GL/glx/glxextensions.c diff -u xc/lib/GL/glx/glxextensions.c:1.6 xc/lib/GL/glx/glxextensions.c:1.7 --- xc/lib/GL/glx/glxextensions.c:1.6 Fri Dec 10 12:47:24 2004 +++ xc/lib/GL/glx/glxextensions.c Fri Oct 14 11:15:55 2005 @@ -27,11 +27,11 @@ * * \author Ian Romanick */ -/* $XFree86: xc/lib/GL/glx/glxextensions.c,v 1.6 2004/12/10 17:47:24 alanh Exp $ */ +/* $XFree86: xc/lib/GL/glx/glxextensions.c,v 1.7 2005/10/14 15:15:55 tsi Exp $ */ #include "glxclient.h" -#include -#include +#include +#include #include #include "glapi.h" #include "glxextensions.h" Index: xc/lib/GL/mesa/Imakefile diff -u xc/lib/GL/mesa/Imakefile:1.3 xc/lib/GL/mesa/Imakefile:1.4 --- xc/lib/GL/mesa/Imakefile:1.3 Fri Dec 10 11:06:57 2004 +++ xc/lib/GL/mesa/Imakefile Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/Imakefile,v 1.3 2004/12/10 16:06:57 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/Imakefile,v 1.4 2005/10/14 15:15:56 tsi Exp $ #include @@ -97,8 +97,7 @@ DEFINES = $(ALLOC_DEFINES) GlxDefines \ $(MESA_ASM_DEFINES) $(MATH_DEFINES) - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(GLXLIBSRC)/dri \ + INCLUDES = -I$(GLXLIBSRC)/dri \ -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include #define IHaveSubdirs Index: xc/lib/GL/mesa/array_cache/Imakefile diff -u xc/lib/GL/mesa/array_cache/Imakefile:1.1 xc/lib/GL/mesa/array_cache/Imakefile:1.2 --- xc/lib/GL/mesa/array_cache/Imakefile:1.1 Thu Apr 8 06:07:34 2004 +++ xc/lib/GL/mesa/array_cache/Imakefile Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/array_cache/Imakefile,v 1.1 2004/04/08 10:07:34 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/array_cache/Imakefile,v 1.2 2005/10/14 15:15:56 tsi Exp $ #include @@ -39,7 +39,7 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ @@ -48,7 +48,7 @@ -I$(MESASRCDIR)/src/mesa/math \ -I$(MESASRCDIR)/src/mesa \ -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) + -I../../../include INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) SRCS = $(MESA_AC_SRCS) Index: xc/lib/GL/mesa/drivers/dri/common/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/common/Imakefile:1.4 xc/lib/GL/mesa/drivers/dri/common/Imakefile:1.6 --- xc/lib/GL/mesa/drivers/dri/common/Imakefile:1.4 Tue Oct 19 00:27:49 2004 +++ xc/lib/GL/mesa/drivers/dri/common/Imakefile Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/common/Imakefile,v 1.4 2004/10/19 04:27:49 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/common/Imakefile,v 1.6 2005/10/14 15:15:56 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -75,11 +75,12 @@ #include "Imakefile.inc" DEFINES = $(ALLOC_DEFINES) $(COMMON_DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(COMMON_X_INCLUDES) $(COMMON_MESA_INCLUDES) \ - $(COMMON_DRI_INCLUDES) $(EXPATINCLUDES) + INCLUDES = $(COMMON_MESA_INCLUDES) $(COMMON_DRI_INCLUDES) $(EXPATINCLUDES) SRCS = $(COMMONSRCS) OBJS = $(COMMONOBJS) + + DEPEND_DEFINES = DependDefines -DGET_PROGRAM_NAME #include Index: xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc:1.4 xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc:1.5 --- xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc:1.4 Mon Feb 28 22:48:49 2005 +++ xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc,v 1.4 2005/03/01 03:48:49 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc,v 1.5 2005/10/14 15:15:56 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri @@ -19,7 +19,6 @@ #if BuildXF86DRI COMMON_DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) COMMON_DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -37,7 +36,6 @@ -I$(MESADRVSRCDIR)/common \ -I$(MESADRVSRCDIR)/../common \ -I$(MESASRCDIR)/include - COMMON_X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) COMMONSRCS = $(MESADRVCOMMONBUILDDIR)mm.c \ $(MESADRVCOMMONBUILDDIR)utils.c \ Index: xc/lib/GL/mesa/drivers/dri/ffb/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/ffb/Imakefile:1.5 xc/lib/GL/mesa/drivers/dri/ffb/Imakefile:1.6 --- xc/lib/GL/mesa/drivers/dri/ffb/Imakefile:1.5 Fri Dec 10 11:06:57 2004 +++ xc/lib/GL/mesa/drivers/dri/ffb/Imakefile Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/ffb/Imakefile,v 1.5 2004/12/10 16:06:57 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/ffb/Imakefile,v 1.6 2005/10/14 15:15:56 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -83,8 +83,7 @@ #include "Imakefile.inc" DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) \ - -I$(XF86DRIVERSRC)/sunffb + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) -I$(XF86DRIVERSRC)/sunffb DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ Index: xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc:1.4 xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc:1.5 --- xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc:1.4 Mon Feb 28 22:48:49 2005 +++ xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc,v 1.4 2005/03/01 03:48:49 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc,v 1.5 2005/10/14 15:15:56 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri @@ -18,7 +18,6 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -34,7 +33,6 @@ -I$(MESASRCDIR)/include \ -I$(MESADRVSRCDIR)/common \ -I$(MESADRVSRCDIR)/ffb - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) FFBSRCS = $(MESADRVFFBBUILDDIR)ffb_bitmap.c \ $(MESADRVFFBBUILDDIR)ffb_clear.c \ Index: xc/lib/GL/mesa/drivers/dri/gamma/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/gamma/Imakefile:1.7 xc/lib/GL/mesa/drivers/dri/gamma/Imakefile:1.8 --- xc/lib/GL/mesa/drivers/dri/gamma/Imakefile:1.7 Mon Dec 20 17:52:38 2004 +++ xc/lib/GL/mesa/drivers/dri/gamma/Imakefile Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/gamma/Imakefile,v 1.7 2004/12/20 22:52:38 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/gamma/Imakefile,v 1.8 2005/10/14 15:15:56 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -84,7 +84,7 @@ DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ Index: xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc:1.4 xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc:1.5 --- xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc:1.4 Mon Feb 28 22:48:49 2005 +++ xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc,v 1.4 2005/03/01 03:48:49 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc,v 1.5 2005/10/14 15:15:56 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri @@ -18,7 +18,6 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -35,8 +34,6 @@ -I$(MESASRCDIR)/include \ -I$(MESADRVSRCDIR)/common \ -I$(MESADRVSRCDIR)/gamma - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) - GAMMASRCS = $(MESADRVGAMMABUILDDIR)gamma_context.c \ $(MESADRVGAMMABUILDDIR)gamma_dd.c \ Index: xc/lib/GL/mesa/drivers/dri/i810/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/i810/Imakefile:1.7 xc/lib/GL/mesa/drivers/dri/i810/Imakefile:1.8 --- xc/lib/GL/mesa/drivers/dri/i810/Imakefile:1.7 Mon Dec 20 17:52:38 2004 +++ xc/lib/GL/mesa/drivers/dri/i810/Imakefile Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i810/Imakefile,v 1.7 2004/12/20 22:52:38 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i810/Imakefile,v 1.8 2005/10/14 15:15:56 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -84,7 +84,7 @@ DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ Index: xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc:1.4 xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc:1.5 --- xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc:1.4 Mon Feb 28 22:48:49 2005 +++ xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc,v 1.4 2005/03/01 03:48:49 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc,v 1.5 2005/10/14 15:15:56 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri @@ -18,7 +18,6 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -35,7 +34,6 @@ -I$(MESASRCDIR)/include \ -I$(MESADRVSRCDIR)/common \ -I$(MESADRVSRCDIR)/i810 - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) I810SRCS = $(MESADRVI810BUILDDIR)i810context.c \ $(MESADRVI810BUILDDIR)i810ioctl.c \ Index: xc/lib/GL/mesa/drivers/dri/i915/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/i915/Imakefile:1.4 xc/lib/GL/mesa/drivers/dri/i915/Imakefile:1.5 --- xc/lib/GL/mesa/drivers/dri/i915/Imakefile:1.4 Fri Dec 10 13:09:48 2004 +++ xc/lib/GL/mesa/drivers/dri/i915/Imakefile Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i915/Imakefile,v 1.4 2004/12/10 18:09:48 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i915/Imakefile,v 1.5 2005/10/14 15:15:56 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -81,7 +81,7 @@ DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ Index: xc/lib/GL/mesa/drivers/dri/i915/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/i915/Imakefile.inc:1.4 xc/lib/GL/mesa/drivers/dri/i915/Imakefile.inc:1.5 --- xc/lib/GL/mesa/drivers/dri/i915/Imakefile.inc:1.4 Mon Feb 28 22:48:50 2005 +++ xc/lib/GL/mesa/drivers/dri/i915/Imakefile.inc Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i915/Imakefile.inc,v 1.4 2005/03/01 03:48:50 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/i915/Imakefile.inc,v 1.5 2005/10/14 15:15:56 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri @@ -18,10 +18,7 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ - -I$(INCLUDESRC) \ - -I$(INCLUDESRC)/GL \ -I$(GLXLIBSRC)/dri \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -38,7 +35,6 @@ -I$(MESASRCDIR)/src/mesa/shader \ -I$(MESASRCDIR)/include \ -I$(MESADRVSRCDIR)/common - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) I915SRCS = $(MESADRVI915BUILDDIR)i830_metaops.c \ $(MESADRVI915BUILDDIR)i830_context.c \ Index: xc/lib/GL/mesa/drivers/dri/mga/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/mga/Imakefile:1.7 xc/lib/GL/mesa/drivers/dri/mga/Imakefile:1.8 --- xc/lib/GL/mesa/drivers/dri/mga/Imakefile:1.7 Mon Dec 20 17:52:39 2004 +++ xc/lib/GL/mesa/drivers/dri/mga/Imakefile Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/mga/Imakefile,v 1.7 2004/12/20 22:52:39 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/mga/Imakefile,v 1.8 2005/10/14 15:15:56 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -85,7 +85,7 @@ DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ Index: xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc:1.4 xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc:1.5 --- xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc:1.4 Mon Feb 28 22:48:50 2005 +++ xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc Fri Oct 14 11:15:56 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc,v 1.4 2005/03/01 03:48:50 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc,v 1.5 2005/10/14 15:15:56 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/src/drv @@ -18,7 +18,6 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -34,7 +33,6 @@ -I$(MESASRCDIR)/include \ -I$(MESADRVSRCDIR)/common \ -I$(MESADRVSRCDIR)/mga - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) MGASRCS = $(MESADRVMGABUILDDIR)mgadd.c \ $(MESADRVMGABUILDDIR)mgarender.c \ Index: xc/lib/GL/mesa/drivers/dri/r128/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/r128/Imakefile:1.7 xc/lib/GL/mesa/drivers/dri/r128/Imakefile:1.8 --- xc/lib/GL/mesa/drivers/dri/r128/Imakefile:1.7 Mon Dec 20 17:52:39 2004 +++ xc/lib/GL/mesa/drivers/dri/r128/Imakefile Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r128/Imakefile,v 1.7 2004/12/20 22:52:39 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r128/Imakefile,v 1.8 2005/10/14 15:15:57 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -84,7 +84,7 @@ DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ Index: xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc:1.5 xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc:1.6 --- xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc:1.5 Mon Feb 28 22:48:50 2005 +++ xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc,v 1.5 2005/03/01 03:48:50 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc,v 1.6 2005/10/14 15:15:57 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri @@ -18,7 +18,6 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -36,7 +35,6 @@ -I$(MESASRCDIR)/include \ -I$(MESADRVSRCDIR)/common \ -I$(MESADRVSRCDIR)/r128 - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) R128SRCS = $(MESADRVR128BUILDDIR)r128_context.c \ $(MESADRVR128BUILDDIR)r128_dd.c \ Index: xc/lib/GL/mesa/drivers/dri/r200/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/r200/Imakefile:1.7 xc/lib/GL/mesa/drivers/dri/r200/Imakefile:1.8 --- xc/lib/GL/mesa/drivers/dri/r200/Imakefile:1.7 Mon Dec 20 17:52:39 2004 +++ xc/lib/GL/mesa/drivers/dri/r200/Imakefile Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r200/Imakefile,v 1.7 2004/12/20 22:52:39 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r200/Imakefile,v 1.8 2005/10/14 15:15:57 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -83,7 +83,7 @@ #include "Imakefile.inc" DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ Index: xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc:1.4 xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc:1.5 --- xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc:1.4 Mon Feb 28 22:48:50 2005 +++ xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc,v 1.4 2005/03/01 03:48:50 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc,v 1.5 2005/10/14 15:15:57 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri @@ -18,7 +18,6 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -36,7 +35,6 @@ -I$(MESASRCDIR)/include \ -I$(MESADRVSRCDIR)/common \ -I$(MESADRVSRCDIR)/r200 - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) R200SRCS = $(MESADRVR200BUILDDIR)r200_context.c \ $(MESADRVR200BUILDDIR)r200_sanity.c \ Index: xc/lib/GL/mesa/drivers/dri/radeon/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/radeon/Imakefile:1.7 xc/lib/GL/mesa/drivers/dri/radeon/Imakefile:1.8 --- xc/lib/GL/mesa/drivers/dri/radeon/Imakefile:1.7 Mon Dec 20 17:52:39 2004 +++ xc/lib/GL/mesa/drivers/dri/radeon/Imakefile Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/radeon/Imakefile,v 1.7 2004/12/20 22:52:39 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/radeon/Imakefile,v 1.8 2005/10/14 15:15:57 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -83,7 +83,7 @@ #include "Imakefile.inc" DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ Index: xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc:1.4 xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc:1.5 --- xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc:1.4 Mon Feb 28 22:48:50 2005 +++ xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc,v 1.4 2005/03/01 03:48:50 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc,v 1.5 2005/10/14 15:15:57 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri @@ -18,7 +18,6 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -36,7 +35,6 @@ -I$(MESASRCDIR)/include \ -I$(MESADRVSRCDIR)/common \ -I$(MESADRVSRCDIR)/radeon - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) RADEONSRCS = $(MESADRVRADEONBUILDDIR)radeon_context.c \ $(MESADRVRADEONBUILDDIR)radeon_compat.c \ Index: xc/lib/GL/mesa/drivers/dri/sis/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/sis/Imakefile:1.7 xc/lib/GL/mesa/drivers/dri/sis/Imakefile:1.8 --- xc/lib/GL/mesa/drivers/dri/sis/Imakefile:1.7 Mon Dec 20 17:52:39 2004 +++ xc/lib/GL/mesa/drivers/dri/sis/Imakefile Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/sis/Imakefile,v 1.7 2004/12/20 22:52:39 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/sis/Imakefile,v 1.8 2005/10/14 15:15:57 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -87,7 +87,7 @@ DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) \ $(DEBUG_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ Index: xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc:1.4 xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc:1.5 --- xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc:1.4 Mon Feb 28 22:48:50 2005 +++ xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc,v 1.4 2005/03/01 03:48:50 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/sis/Imakefile.inc,v 1.5 2005/10/14 15:15:57 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri @@ -18,7 +18,6 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines $(SIS_DEFINES) -DX_BYTE_ORDER=$(X_BYTE_ORDER) DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -35,7 +34,6 @@ -I$(MESASRCDIR)/include \ -I$(MESADRVSRCDIR)/common \ -I$(MESADRVSRCDIR)/sis - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) #if 0 DEBUG_SRC = $(MESADRVSISBUILDDIR)sis_debug.c Index: xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile diff -u xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile:1.7 xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile:1.8 --- xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile:1.7 Mon Dec 20 17:52:39 2004 +++ xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile,v 1.7 2004/12/20 22:52:39 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile,v 1.8 2005/10/14 15:15:57 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. @@ -83,7 +83,7 @@ #include "Imakefile.inc" DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \ $(GLXLIBSRC)/dri/drm/xf86drmHash.o \ Index: xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc diff -u xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc:1.4 xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc:1.5 --- xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc:1.4 Mon Feb 28 22:48:50 2005 +++ xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc,v 1.4 2005/03/01 03:48:50 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc,v 1.5 2005/10/14 15:15:57 tsi Exp $ #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri @@ -18,7 +18,6 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ -I$(GLXLIBSRC)/glx \ -I$(GLXLIBSRC)/include \ -I$(SERVERSRC)/GL/dri \ @@ -35,7 +34,6 @@ -I$(MESASRCDIR)/include \ -I$(MESADRVSRCDIR)/common \ -I$(MESADRVSRCDIR)/tdfx - X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) TDFXSRCS = $(MESADRVTDFXBUILDDIR)tdfx_context.c \ $(MESADRVTDFXBUILDDIR)tdfx_dd.c \ Index: xc/lib/GL/mesa/drivers/osmesa/Imakefile diff -u xc/lib/GL/mesa/drivers/osmesa/Imakefile:1.8 xc/lib/GL/mesa/drivers/osmesa/Imakefile:1.10 --- xc/lib/GL/mesa/drivers/osmesa/Imakefile:1.8 Fri Feb 4 21:01:39 2005 +++ xc/lib/GL/mesa/drivers/osmesa/Imakefile Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/osmesa/Imakefile,v 1.8 2005/02/05 02:01:39 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/osmesa/Imakefile,v 1.10 2005/10/14 15:15:57 tsi Exp $ /* * Copyright (c) 2000-2005 by The XFree86 Project, Inc. @@ -87,8 +87,7 @@ -I$(MESASRCDIR)/include DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) - INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) $(MESA_INCLUDES) \ - $(DRI_INCLUDES) -I$(GLXLIBSRC)/include + INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) -I$(GLXLIBSRC)/include MESAOBJS = $(COREMESAOBJS) $(MESA_ASM_OBJS) MESAEOBJS = $(COREMESAEOBJS) $(MESA_ASM_EOBJS) @@ -113,7 +112,7 @@ #ifdef SharedOSMesaReqs REQUIREDLIBS = SharedOSMesaReqs -#elif !GlxUseBuiltInDRIDriver +#elif !BuildXF86DRI || !GlxUseBuiltInDRIDriver REQUIREDLIBS = $(LDPRELIB) $(GLXLIB) #endif Index: xc/lib/GL/mesa/drivers/x11/Imakefile diff -u xc/lib/GL/mesa/drivers/x11/Imakefile:1.3 xc/lib/GL/mesa/drivers/x11/Imakefile:1.4 --- xc/lib/GL/mesa/drivers/x11/Imakefile:1.3 Thu Apr 22 09:58:40 2004 +++ xc/lib/GL/mesa/drivers/x11/Imakefile Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/drivers/x11/Imakefile,v 1.3 2004/04/22 13:58:40 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/drivers/x11/Imakefile,v 1.4 2005/10/14 15:15:57 tsi Exp $ #include @@ -38,13 +38,13 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif MESA_INCLUDES = -I$(MESASRCDIR)/src \ -I$(MESASRCDIR)/src/X \ -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) + -I../../../include INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) Index: xc/lib/GL/mesa/main/Imakefile diff -u xc/lib/GL/mesa/main/Imakefile:1.2 xc/lib/GL/mesa/main/Imakefile:1.3 --- xc/lib/GL/mesa/main/Imakefile:1.2 Fri Dec 10 11:06:58 2004 +++ xc/lib/GL/mesa/main/Imakefile Fri Oct 14 11:15:57 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/main/Imakefile,v 1.2 2004/12/10 16:06:58 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/main/Imakefile,v 1.3 2005/10/14 15:15:57 tsi Exp $ #include @@ -42,8 +42,7 @@ DEFINES = $(ALLOC_DEFINES) GlxDefines \ $(MESA_ASM_DEFINES) $(MATH_DEFINES) - INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC) */ -I$(XINCLUDESRC) \ - -I$(MESASRCDIR)/src/mesa/glapi \ + INCLUDES = -I$(MESASRCDIR)/src/mesa/glapi \ -I$(MESASRCDIR)/src/mesa/math \ -I$(MESASRCDIR)/src/mesa/main \ -I$(MESASRCDIR)/src/mesa/shader \ Index: xc/lib/GL/mesa/math/Imakefile diff -u xc/lib/GL/mesa/math/Imakefile:1.1 xc/lib/GL/mesa/math/Imakefile:1.2 --- xc/lib/GL/mesa/math/Imakefile:1.1 Thu Apr 8 06:07:36 2004 +++ xc/lib/GL/mesa/math/Imakefile Fri Oct 14 11:15:58 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/math/Imakefile,v 1.1 2004/04/08 10:07:36 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/math/Imakefile,v 1.2 2005/10/14 15:15:58 tsi Exp $ #include @@ -40,7 +40,7 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif #if defined(i386Architecture) && MesaUseX86Asm @@ -76,7 +76,7 @@ -I$(MESASRCDIR)/src/mesa \ -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) + -I../../../include DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) Index: xc/lib/GL/mesa/shader/Imakefile diff -u xc/lib/GL/mesa/shader/Imakefile:1.2 xc/lib/GL/mesa/shader/Imakefile:1.3 --- xc/lib/GL/mesa/shader/Imakefile:1.2 Fri Dec 10 13:21:57 2004 +++ xc/lib/GL/mesa/shader/Imakefile Fri Oct 14 11:15:58 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/shader/Imakefile,v 1.2 2004/12/10 18:21:57 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/shader/Imakefile,v 1.3 2005/10/14 15:15:58 tsi Exp $ #include @@ -40,7 +40,7 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif #if defined(i386Architecture) && MesaUseX86Asm @@ -78,7 +78,7 @@ -I$(MESASRCDIR)/src/mesa/shader \ -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) + -I../../../include DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) Index: xc/lib/GL/mesa/sparc/Imakefile diff -u xc/lib/GL/mesa/sparc/Imakefile:1.3 xc/lib/GL/mesa/sparc/Imakefile:1.4 --- xc/lib/GL/mesa/sparc/Imakefile:1.3 Fri Apr 23 16:50:23 2004 +++ xc/lib/GL/mesa/sparc/Imakefile Fri Oct 14 11:15:58 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/sparc/Imakefile,v 1.3 2004/04/23 20:50:23 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/sparc/Imakefile,v 1.4 2005/10/14 15:15:58 tsi Exp $ /* * Need both shared and unshared Mesa objects in the following cases: @@ -34,8 +34,7 @@ #include "Imakefile.inc" DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES) - INCLUDES = -I$(INCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/src/mesa/sparc \ + INCLUDES = -I$(MESASRCDIR)/src/mesa/sparc \ -I$(MESASRCDIR)/src/mesa \ -I$(MESASRCDIR)/src/mesa/glapi \ -I$(MESASRCDIR)/src/mesa/main \ Index: xc/lib/GL/mesa/swrast/Imakefile diff -u xc/lib/GL/mesa/swrast/Imakefile:1.3 xc/lib/GL/mesa/swrast/Imakefile:1.4 --- xc/lib/GL/mesa/swrast/Imakefile:1.3 Sun Feb 6 18:48:15 2005 +++ xc/lib/GL/mesa/swrast/Imakefile Fri Oct 14 11:15:58 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/swrast/Imakefile,v 1.3 2005/02/06 23:48:15 dawes Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/swrast/Imakefile,v 1.4 2005/10/14 15:15:58 tsi Exp $ #include @@ -40,7 +40,7 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif #if defined(i386Architecture) && MesaUseX86Asm @@ -79,7 +79,7 @@ -I$(MESASRCDIR)/src/mesa/shader \ -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) + -I../../../include DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) Index: xc/lib/GL/mesa/swrast_setup/Imakefile diff -u xc/lib/GL/mesa/swrast_setup/Imakefile:1.1 xc/lib/GL/mesa/swrast_setup/Imakefile:1.2 --- xc/lib/GL/mesa/swrast_setup/Imakefile:1.1 Thu Apr 8 06:08:00 2004 +++ xc/lib/GL/mesa/swrast_setup/Imakefile Fri Oct 14 11:15:58 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/swrast_setup/Imakefile,v 1.1 2004/04/08 10:08:00 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/swrast_setup/Imakefile,v 1.2 2005/10/14 15:15:58 tsi Exp $ #include @@ -39,7 +39,7 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif #if defined(i386Architecture) && MesaUseX86Asm @@ -77,7 +77,7 @@ -I$(MESASRCDIR)/src/mesa/swrast_setup \ -I$(MESASRCDIR)/src/mesa/tnl \ -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) + -I../../../include DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) Index: xc/lib/GL/mesa/tnl/Imakefile diff -u xc/lib/GL/mesa/tnl/Imakefile:1.2 xc/lib/GL/mesa/tnl/Imakefile:1.3 --- xc/lib/GL/mesa/tnl/Imakefile:1.2 Fri Dec 10 11:06:58 2004 +++ xc/lib/GL/mesa/tnl/Imakefile Fri Oct 14 11:15:58 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/tnl/Imakefile,v 1.2 2004/12/10 16:06:58 alanh Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/tnl/Imakefile,v 1.3 2005/10/14 15:15:58 tsi Exp $ #include @@ -40,7 +40,7 @@ #if BuildXF86DRI DRI_DEFINES = GlxDefines DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri + -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri #endif #if defined(i386Architecture) && MesaUseX86Asm @@ -80,7 +80,7 @@ -I$(MESASRCDIR)/src/mesa/swrast_setup \ -I$(MESASRCDIR)/src/mesa/tnl \ -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) + -I../../../include DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) Index: xc/lib/GL/mesa/x86/Imakefile diff -u xc/lib/GL/mesa/x86/Imakefile:1.2 xc/lib/GL/mesa/x86/Imakefile:1.3 --- xc/lib/GL/mesa/x86/Imakefile:1.2 Thu Apr 22 09:58:41 2004 +++ xc/lib/GL/mesa/x86/Imakefile Fri Oct 14 11:15:58 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GL/mesa/x86/Imakefile,v 1.2 2004/04/22 13:58:41 tsi Exp $ +XCOMM $XFree86: xc/lib/GL/mesa/x86/Imakefile,v 1.3 2005/10/14 15:15:58 tsi Exp $ /* * Need both shared and unshared Mesa objects in the following cases: @@ -34,7 +34,7 @@ #include "Imakefile.inc" DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES) - INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC)*/ -I$(MESASRCDIR)/src/mesa \ + INCLUDES = -I$(MESASRCDIR)/src/mesa \ -I$(MESASRCDIR)/include \ -I$(GLXLIBSRC)/include \ -I$(MESASRCDIR)/src/mesa/main \ Index: xc/lib/GLU/libnurbs/interface/Imakefile diff -u xc/lib/GLU/libnurbs/interface/Imakefile:1.3 xc/lib/GLU/libnurbs/interface/Imakefile:1.4 --- xc/lib/GLU/libnurbs/interface/Imakefile:1.3 Mon Jan 15 19:39:24 2001 +++ xc/lib/GLU/libnurbs/interface/Imakefile Fri Oct 14 11:15:58 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GLU/libnurbs/interface/Imakefile,v 1.3 2001/01/16 00:39:24 dawes Exp $ +XCOMM $XFree86: xc/lib/GLU/libnurbs/interface/Imakefile,v 1.4 2005/10/14 15:15:58 tsi Exp $ XCOMM License Applicability. Except to the extent portions of this file are XCOMM made subject to an alternative license as permitted in the SGI Free @@ -65,12 +65,9 @@ insurfeval.o INCLUDES = \ - -I. \ -I../internals \ -I../nurbtess \ - -I../../include \ - -I$(TOP)/include \ - -I$(TOP)/include/GL + -I../../include DEFINES = \ -DLIBRARYBUILD \ Index: xc/lib/GLU/libnurbs/internals/Imakefile diff -u xc/lib/GLU/libnurbs/internals/Imakefile:1.12 xc/lib/GLU/libnurbs/internals/Imakefile:1.13 --- xc/lib/GLU/libnurbs/internals/Imakefile:1.12 Thu Oct 23 17:30:04 2003 +++ xc/lib/GLU/libnurbs/internals/Imakefile Fri Oct 14 11:15:58 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GLU/libnurbs/internals/Imakefile,v 1.12 2003/10/23 21:30:04 tsi Exp $ +XCOMM $XFree86: xc/lib/GLU/libnurbs/internals/Imakefile,v 1.13 2005/10/14 15:15:58 tsi Exp $ XCOMM License Applicability. Except to the extent portions of this file are XCOMM made subject to an alternative license as permitted in the SGI Free @@ -139,9 +139,7 @@ INCLUDES = \ -I../nurbtess \ -I../../libutil \ - -I../../include \ - -I$(TOP)/include \ - -I$(TOP)/include/GL + -I../../include #if defined(SGIArchitecture) OSDEFINES = -D_SCO_DS Index: xc/lib/GLU/libnurbs/nurbtess/Imakefile diff -u xc/lib/GLU/libnurbs/nurbtess/Imakefile:1.3 xc/lib/GLU/libnurbs/nurbtess/Imakefile:1.4 --- xc/lib/GLU/libnurbs/nurbtess/Imakefile:1.3 Mon Jan 15 19:39:25 2001 +++ xc/lib/GLU/libnurbs/nurbtess/Imakefile Fri Oct 14 11:15:58 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GLU/libnurbs/nurbtess/Imakefile,v 1.3 2001/01/16 00:39:25 dawes Exp $ +XCOMM $XFree86: xc/lib/GLU/libnurbs/nurbtess/Imakefile,v 1.4 2005/10/14 15:15:58 tsi Exp $ XCOMM License Applicability. Except to the extent portions of this file are XCOMM made subject to an alternative license as permitted in the SGI Free @@ -86,9 +86,7 @@ INCLUDES = \ -I../internals \ - -I../../include \ - -I$(TOP)/include \ - -I$(TOP)/include/GL + -I../../include DEFINES = \ -DLIBRARYBUILD \ Index: xc/lib/GLU/libtess/Imakefile diff -u xc/lib/GLU/libtess/Imakefile:1.2 xc/lib/GLU/libtess/Imakefile:1.3 --- xc/lib/GLU/libtess/Imakefile:1.2 Mon Jan 15 19:39:25 2001 +++ xc/lib/GLU/libtess/Imakefile Fri Oct 14 11:15:59 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GLU/libtess/Imakefile,v 1.2 2001/01/16 00:39:25 dawes Exp $ +XCOMM $XFree86: xc/lib/GLU/libtess/Imakefile,v 1.3 2005/10/14 15:15:59 tsi Exp $ XCOMM License Applicability. Except to the extent portions of this file are XCOMM made subject to an alternative license as permitted in the SGI Free @@ -65,9 +65,7 @@ tessmono.o INCLUDES = \ - -I../include \ - -I$(TOP)/include \ - -I$(TOP)/include/GL + -I../include DEFINES = \ -DNDEBUG Index: xc/lib/GLU/libutil/Imakefile diff -u xc/lib/GLU/libutil/Imakefile:1.2 xc/lib/GLU/libutil/Imakefile:1.3 --- xc/lib/GLU/libutil/Imakefile:1.2 Mon Jan 15 19:39:26 2001 +++ xc/lib/GLU/libutil/Imakefile Fri Oct 14 11:15:59 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/GLU/libutil/Imakefile,v 1.2 2001/01/16 00:39:26 dawes Exp $ +XCOMM $XFree86: xc/lib/GLU/libutil/Imakefile,v 1.3 2005/10/14 15:15:59 tsi Exp $ XCOMM License Applicability. Except to the extent portions of this file are XCOMM made subject to an alternative license as permitted in the SGI Free @@ -57,9 +57,7 @@ registry.o INCLUDES = \ - -I../include \ - -I$(TOP)/include \ - -I$(TOP)/include/GL + -I../include DEFINES = \ -DNDEBUG Index: xc/lib/GLw/Imakefile diff -u xc/lib/GLw/Imakefile:1.4 xc/lib/GLw/Imakefile:1.5 --- xc/lib/GLw/Imakefile:1.4 Fri Feb 13 18:58:29 2004 +++ xc/lib/GLw/Imakefile Fri Oct 14 11:15:59 2005 @@ -45,7 +45,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -XCOMM $XFree86: xc/lib/GLw/Imakefile,v 1.4 2004/02/13 23:58:29 dawes Exp $ +XCOMM $XFree86: xc/lib/GLw/Imakefile,v 1.5 2005/10/14 15:15:59 tsi Exp $ XCOMM XCOMM Imakefile for GLw library - lots of modifications for XFree86 by @@ -79,7 +79,7 @@ GLWSRCDIR = $(OGLSAMPLESRCDIR)/main/gfx/lib/glw -INCLUDES = $(MOTIF_INCLUDES) -I. +INCLUDES = $(MOTIF_INCLUDES) LOCAL_LDFLAGS = $(MOTIF_LDFLAGS) Index: xc/lib/ICE/ICE-def.cpp diff -u xc/lib/ICE/ICE-def.cpp:1.5 xc/lib/ICE/ICE-def.cpp:1.6 --- xc/lib/ICE/ICE-def.cpp:1.5 Wed Apr 18 12:13:18 2001 +++ xc/lib/ICE/ICE-def.cpp Mon Jan 9 09:58:21 2006 @@ -70,5 +70,4 @@ _IceTransRead _IceTransWrite -/* $Xorg: ICE-def.cpp,v 1.3 2000/08/21 16:42:31 coskrey Exp $ */ -/* $XFree86: xc/lib/ICE/ICE-def.cpp,v 1.5 2001/04/18 16:13:18 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICE-def.cpp,v 1.6 2006/01/09 14:58:21 dawes Exp $ */ Index: xc/lib/ICE/ICE.h diff -u xc/lib/ICE/ICE.h:1.2 xc/lib/ICE/ICE.h:1.3 --- xc/lib/ICE/ICE.h:1.2 Fri Dec 14 14:53:35 2001 +++ xc/lib/ICE/ICE.h Mon Jan 9 09:58:21 2006 @@ -1,4 +1,4 @@ -/* $Xorg: ICE.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ +/* $XFree86: xc/lib/ICE/ICE.h,v 1.3 2006/01/09 14:58:21 dawes Exp $ */ /****************************************************************************** Index: xc/lib/ICE/ICEconn.h diff -u xc/lib/ICE/ICEconn.h:1.2 xc/lib/ICE/ICEconn.h:1.3 --- xc/lib/ICE/ICEconn.h:1.2 Fri Dec 14 14:53:35 2001 +++ xc/lib/ICE/ICEconn.h Mon Jan 9 09:58:21 2006 @@ -1,4 +1,4 @@ -/* $Xorg: ICEconn.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ +/* $XFree86: xc/lib/ICE/ICEconn.h,v 1.3 2006/01/09 14:58:21 dawes Exp $ */ /****************************************************************************** Index: xc/lib/ICE/ICElib.h diff -u xc/lib/ICE/ICElib.h:3.5 xc/lib/ICE/ICElib.h:3.6 --- xc/lib/ICE/ICElib.h:3.5 Mon Nov 17 17:20:05 2003 +++ xc/lib/ICE/ICElib.h Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: ICElib.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,7 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICElib.h,v 3.5 2003/11/17 22:20:05 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICElib.h,v 3.6 2005/03/23 03:11:24 dawes Exp $ */ #ifndef _ICELIB_H_ #define _ICELIB_H_ @@ -425,6 +424,17 @@ IceConn /* iceConn */ ); +/* libSM uses these. */ +extern IcePoAuthStatus _IcePoMagicCookie1Proc(IceConn iceConn, + IcePointer *authStatePtr, Bool cleanUp, Bool swap, int authDataLen, + IcePointer authData, int *replyDataLenRet, IcePointer *replyDataRet, + char **errorStringRet); + +extern IcePaAuthStatus _IcePaMagicCookie1Proc(IceConn iceConn, + IcePointer *authStatePtr, Bool swap, int authDataLen, + IcePointer authData, int *replyDataLenRet, IcePointer *replyDataRet, + char **errorStringRet); + _XFUNCPROTOEND #endif /* _ICELIB_H_ */ Index: xc/lib/ICE/ICElibint.h diff -u xc/lib/ICE/ICElibint.h:1.7 xc/lib/ICE/ICElibint.h:1.8 --- xc/lib/ICE/ICElibint.h:1.7 Mon Nov 17 17:20:05 2003 +++ xc/lib/ICE/ICElibint.h Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: ICElibint.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,7 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.7 2003/11/17 22:20:05 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICElibint.h,v 1.8 2005/03/23 03:11:24 dawes Exp $ */ #ifndef _ICELIBINT_H_ #define _ICELIBINT_H_ @@ -37,6 +36,7 @@ #include #include #include +#include "ICEutil.h" #include #include @@ -407,6 +407,8 @@ extern IceErrorHandler _IceErrorHandler; extern IceIOErrorHandler _IceIOErrorHandler; +extern int _IcePaAuthDataEntryCount; +extern IceAuthDataEntry _IcePaAuthDataEntries[]; extern void _IceErrorBadMajor ( IceConn /* iceConn */, @@ -534,4 +536,14 @@ int * /* indices_ret */ ); +extern void _IceDefaultErrorHandler(IceConn iceConn, Bool swap, + int offendingMinorOpcode, unsigned long offendingSequence, + int errorClass, int severity, IcePointer values); + +extern void _IceDefaultIOErrorHandler(IceConn iceConn); + +extern void _IceProcessCoreMessage(IceConn iceConn, int opcode, + unsigned long length, Bool swap, IceReplyWaitInfo *replyWait, + Bool *replyReadyRet, Bool *connectionClosedRet); + #endif /* _ICELIBINT_H_ */ Index: xc/lib/ICE/ICEmsg.h diff -u xc/lib/ICE/ICEmsg.h:1.7 xc/lib/ICE/ICEmsg.h:1.8 --- xc/lib/ICE/ICEmsg.h:1.7 Tue Oct 26 18:10:17 2004 +++ xc/lib/ICE/ICEmsg.h Mon Jan 9 09:58:21 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ICEmsg.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,7 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.7 2004/10/26 22:10:17 tsi Exp $ */ +/* $XFree86: xc/lib/ICE/ICEmsg.h,v 1.8 2006/01/09 14:58:21 dawes Exp $ */ #ifndef _ICEMSG_H_ #define _ICEMSG_H_ Index: xc/lib/ICE/ICEproto.h diff -u xc/lib/ICE/ICEproto.h:1.2 xc/lib/ICE/ICEproto.h:1.3 --- xc/lib/ICE/ICEproto.h:1.2 Fri Dec 14 14:53:35 2001 +++ xc/lib/ICE/ICEproto.h Mon Jan 9 09:58:21 2006 @@ -1,4 +1,4 @@ -/* $Xorg: ICEproto.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ +/* $XFree86: xc/lib/ICE/ICEproto.h,v 1.3 2006/01/09 14:58:21 dawes Exp $ */ /****************************************************************************** Index: xc/lib/ICE/ICEutil.h diff -u xc/lib/ICE/ICEutil.h:1.5 xc/lib/ICE/ICEutil.h:1.6 --- xc/lib/ICE/ICEutil.h:1.5 Mon Nov 17 17:20:05 2003 +++ xc/lib/ICE/ICEutil.h Mon Jan 9 09:58:21 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ICEutil.h,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,7 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.5 2003/11/17 22:20:05 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/ICEutil.h,v 1.6 2006/01/09 14:58:21 dawes Exp $ */ #ifndef _ICEUTIL_H_ #define _ICEUTIL_H_ Index: xc/lib/ICE/Imakefile diff -u xc/lib/ICE/Imakefile:3.7 xc/lib/ICE/Imakefile:3.8 --- xc/lib/ICE/Imakefile:3.7 Sun Apr 4 22:33:11 2004 +++ xc/lib/ICE/Imakefile Mon Jan 9 09:58:21 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:44:11 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/ICE/Imakefile,v 3.7 2004/04/05 02:33:11 dawes Exp $ +XCOMM $XFree86: xc/lib/ICE/Imakefile,v 3.8 2006/01/09 14:58:21 dawes Exp $ #define DoNormalLib NormalLibICE #define DoSharedLib SharedLibICE Index: xc/lib/ICE/accept.c diff -u xc/lib/ICE/accept.c:1.2 xc/lib/ICE/accept.c:1.3 --- xc/lib/ICE/accept.c:1.2 Fri Dec 14 14:53:35 2001 +++ xc/lib/ICE/accept.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: accept.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,6 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/accept.c,v 1.3 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" @@ -33,11 +33,7 @@ IceConn -IceAcceptConnection (listenObj, statusRet) - -IceListenObj listenObj; -IceAcceptStatus *statusRet; - +IceAcceptConnection(IceListenObj listenObj, IceAcceptStatus *statusRet) { IceConn iceConn; XtransConnInfo newconn; Index: xc/lib/ICE/authutil.c diff -u xc/lib/ICE/authutil.c:3.10 xc/lib/ICE/authutil.c:3.11 --- xc/lib/ICE/authutil.c:3.10 Wed Nov 26 16:48:18 2003 +++ xc/lib/ICE/authutil.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: authutil.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,7 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/authutil.c,v 3.10 2003/11/26 21:48:18 herrb Exp $ */ +/* $XFree86: xc/lib/ICE/authutil.c,v 3.11 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" @@ -51,15 +50,16 @@ #endif #endif -static Status read_short (); -static Status read_string (); -static Status read_counted_string (); -static Status write_short (); -static Status write_string (); -static Status write_counted_string (); +static Status read_short (FILE *file, unsigned short *shortp); +static Status read_string(FILE *file, char **stringp); +static Status read_counted_string(FILE *file, unsigned short *countp, + char **stringp); +static Status write_short(FILE *file, unsigned short s); +static Status write_string(FILE *file, char *string); +static Status write_counted_string(FILE *file, unsigned short count, + char *string); - /* * The following routines are for manipulating the .ICEauthority file * These are utility functions - they are not part of the standard @@ -67,8 +67,7 @@ */ char * -IceAuthFileName () - +IceAuthFileName() { static char slashDotICEauthority[] = "/.ICEauthority"; char *name; @@ -134,15 +133,8 @@ } - int -IceLockAuthFile (file_name, retries, timeout, dead) - -char *file_name; -int retries; -int timeout; -long dead; - +IceLockAuthFile(char *file_name, int retries, int timeout, long dead) { char creat_name[1025], link_name[1025]; struct stat statb; @@ -211,12 +203,8 @@ } - void -IceUnlockAuthFile (file_name) - -char *file_name; - +IceUnlockAuthFile(char *file_name) { #ifndef WIN32 char creat_name[1025]; @@ -240,12 +228,8 @@ } - IceAuthFileEntry * -IceReadAuthFileEntry (auth_file) - -FILE *auth_file; - +IceReadAuthFileEntry(FILE *auth_file) { IceAuthFileEntry local; IceAuthFileEntry *ret; @@ -292,12 +276,8 @@ } - void -IceFreeAuthFileEntry (auth) - -IceAuthFileEntry *auth; - +IceFreeAuthFileEntry(IceAuthFileEntry *auth) { if (auth) { @@ -311,13 +291,8 @@ } - Status -IceWriteAuthFileEntry (auth_file, auth) - -FILE *auth_file; -IceAuthFileEntry *auth; - +IceWriteAuthFileEntry(FILE *auth_file, IceAuthFileEntry *auth) { if (!write_string (auth_file, auth->protocol_name)) return (0); @@ -340,14 +315,8 @@ } - IceAuthFileEntry * -IceGetAuthFileEntry (protocol_name, network_id, auth_name) - -char *protocol_name; -char *network_id; -char *auth_name; - +IceGetAuthFileEntry(char *protocol_name, char *network_id, char *auth_name) { FILE *auth_file; char *filename; @@ -383,17 +352,12 @@ } - /* * local routines */ static Status -read_short (file, shortp) - -FILE *file; -unsigned short *shortp; - +read_short (FILE *file, unsigned short *shortp) { unsigned char file_short[2]; @@ -406,11 +370,7 @@ static Status -read_string (file, stringp) - -FILE *file; -char **stringp; - +read_string(FILE *file, char **stringp) { unsigned short len; char *data; @@ -441,12 +401,7 @@ static Status -read_counted_string (file, countp, stringp) - -FILE *file; -unsigned short *countp; -char **stringp; - +read_counted_string(FILE *file, unsigned short *countp, char **stringp) { unsigned short len; char *data; @@ -480,11 +435,7 @@ static Status -write_short (file, s) - -FILE *file; -unsigned short s; - +write_short(FILE *file, unsigned short s) { unsigned char file_short[2]; @@ -499,11 +450,7 @@ static Status -write_string (file, string) - -FILE *file; -char *string; - +write_string(FILE *file, char *string) { unsigned short count = strlen (string); @@ -518,12 +465,7 @@ static Status -write_counted_string (file, count, string) - -FILE *file; -unsigned short count; -char *string; - +write_counted_string(FILE *file, unsigned short count, char *string) { if (!write_short (file, count)) return (0); Index: xc/lib/ICE/connect.c diff -u xc/lib/ICE/connect.c:3.10 xc/lib/ICE/connect.c:3.11 --- xc/lib/ICE/connect.c:3.10 Mon Dec 2 16:50:29 2002 +++ xc/lib/ICE/connect.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: connect.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,28 +25,22 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/connect.c,v 3.10 2002/12/02 21:50:29 tsi Exp $ */ +/* $XFree86: xc/lib/ICE/connect.c,v 3.11 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" #include #include "globals.h" -static XtransConnInfo ConnectToPeer(); +static XtransConnInfo ConnectToPeer(char *networkIdsList, + char **actualConnectionRet); #define Strstr strstr - -IceConn -IceOpenConnection (networkIdsList, context, mustAuthenticate, majorOpcodeCheck, - errorLength, errorStringRet) - -char *networkIdsList; -IcePointer context; -Bool mustAuthenticate; -int majorOpcodeCheck; -int errorLength; -char *errorStringRet; +IceConn +IceOpenConnection(char *networkIdsList, IcePointer context, + Bool mustAuthenticate, int majorOpcodeCheck, + int errorLength, char *errorStringRet) { IceConn iceConn; int extra, i, j; @@ -426,18 +419,13 @@ } - IcePointer -IceGetConnectionContext (iceConn) - -IceConn iceConn; - +IceGetConnectionContext(IceConn iceConn) { return (iceConn->context); } - /* ------------------------------------------------------------------------- * * local routines * * ------------------------------------------------------------------------- */ @@ -446,11 +434,7 @@ static XtransConnInfo -ConnectToPeer (networkIdsList, actualConnectionRet) - -char *networkIdsList; -char **actualConnectionRet; - +ConnectToPeer(char *networkIdsList, char **actualConnectionRet) { char addrbuf[256]; char* address; Index: xc/lib/ICE/error.c diff -u xc/lib/ICE/error.c:1.6 xc/lib/ICE/error.c:1.7 --- xc/lib/ICE/error.c:1.6 Fri Dec 14 14:53:35 2001 +++ xc/lib/ICE/error.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: error.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,7 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/error.c,v 1.6 2001/12/14 19:53:35 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/error.c,v 1.7 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" @@ -36,13 +35,8 @@ void -_IceErrorBadMinor (iceConn, majorOpcode, offendingMinor, severity) - -IceConn iceConn; -int majorOpcode; -int offendingMinor; -int severity; - +_IceErrorBadMinor(IceConn iceConn, int majorOpcode, int offendingMinor, + int severity) { IceErrorHeader (iceConn, majorOpcode, offendingMinor, @@ -56,13 +50,8 @@ void -_IceErrorBadState (iceConn, majorOpcode, offendingMinor, severity) - -IceConn iceConn; -int majorOpcode; -int offendingMinor; -int severity; - +_IceErrorBadState(IceConn iceConn, int majorOpcode, int offendingMinor, + int severity) { IceErrorHeader (iceConn, majorOpcode, offendingMinor, @@ -76,13 +65,8 @@ void -_IceErrorBadLength (iceConn, majorOpcode, offendingMinor, severity) - -IceConn iceConn; -int majorOpcode; -int offendingMinor; -int severity; - +_IceErrorBadLength(IceConn iceConn, int majorOpcode, int offendingMinor, + int severity) { IceErrorHeader (iceConn, majorOpcode, offendingMinor, @@ -96,15 +80,8 @@ void -_IceErrorBadValue (iceConn, majorOpcode, offendingMinor, offset, length, value) - -IceConn iceConn; -int majorOpcode; -int offendingMinor; -int offset; -int length; /* in bytes */ -IcePointer value; - +_IceErrorBadValue(IceConn iceConn, int majorOpcode, int offendingMinor, + int offset, int length, IcePointer value) { IceErrorHeader (iceConn, majorOpcode, offendingMinor, @@ -125,11 +102,7 @@ void -_IceErrorNoAuthentication (iceConn, offendingMinor) - -IceConn iceConn; -int offendingMinor; - +_IceErrorNoAuthentication(IceConn iceConn, int offendingMinor) { int severity = (offendingMinor == ICE_ConnectionSetup) ? IceFatalToConnection : IceFatalToProtocol; @@ -146,11 +119,7 @@ void -_IceErrorNoVersion (iceConn, offendingMinor) - -IceConn iceConn; -int offendingMinor; - +_IceErrorNoVersion(IceConn iceConn, int offendingMinor) { int severity = (offendingMinor == ICE_ConnectionSetup) ? IceFatalToConnection : IceFatalToProtocol; @@ -167,12 +136,7 @@ void -_IceErrorSetupFailed (iceConn, offendingMinor, reason) - -IceConn iceConn; -int offendingMinor; -char *reason; - +_IceErrorSetupFailed(IceConn iceConn, int offendingMinor, char *reason) { char *pBuf, *pStart; int bytes; @@ -199,12 +163,8 @@ void -_IceErrorAuthenticationRejected (iceConn, offendingMinor, reason) - -IceConn iceConn; -int offendingMinor; -char *reason; - +_IceErrorAuthenticationRejected(IceConn iceConn, int offendingMinor, + char *reason) { char *pBuf, *pStart; int bytes; @@ -229,12 +189,7 @@ void -_IceErrorAuthenticationFailed (iceConn, offendingMinor, reason) - -IceConn iceConn; -int offendingMinor; -char *reason; - +_IceErrorAuthenticationFailed(IceConn iceConn, int offendingMinor, char *reason) { char *pBuf, *pStart; int bytes; @@ -259,11 +214,7 @@ void -_IceErrorProtocolDuplicate (iceConn, protocolName) - -IceConn iceConn; -char *protocolName; - +_IceErrorProtocolDuplicate(IceConn iceConn, char *protocolName) { char *pBuf, *pStart; int bytes; @@ -288,11 +239,7 @@ void -_IceErrorMajorOpcodeDuplicate (iceConn, majorOpcode) - -IceConn iceConn; -int majorOpcode; - +_IceErrorMajorOpcodeDuplicate(IceConn iceConn, int majorOpcode) { char mOp = (char) majorOpcode; @@ -309,11 +256,7 @@ void -_IceErrorUnknownProtocol (iceConn, protocolName) - -IceConn iceConn; -char *protocolName; - +_IceErrorUnknownProtocol(IceConn iceConn, char *protocolName) { char *pBuf, *pStart; int bytes; @@ -338,13 +281,8 @@ void -_IceErrorBadMajor (iceConn, offendingMajor, offendingMinor, severity) - -IceConn iceConn; -int offendingMajor; -int offendingMinor; -int severity; - +_IceErrorBadMajor(IceConn iceConn, int offendingMajor, int offendingMinor, + int severity) { char maj = (char) offendingMajor; @@ -360,23 +298,14 @@ } - /* * Default error handler. */ void -_IceDefaultErrorHandler (iceConn, swap, - offendingMinorOpcode, offendingSequence, errorClass, severity, values) - -IceConn iceConn; -Bool swap; -int offendingMinorOpcode; -unsigned long offendingSequence; -int errorClass; -int severity; -IcePointer values; - +_IceDefaultErrorHandler(IceConn iceConn, Bool swap, int offendingMinorOpcode, + unsigned long offendingSequence, int errorClass, + int severity, IcePointer values) { char *str; char *pData = (char *) values; @@ -570,7 +499,6 @@ } - /* * This procedure sets the ICE error handler to be the specified * routine. If NULL is passed in the default error handler is restored. @@ -578,10 +506,7 @@ */ IceErrorHandler -IceSetErrorHandler (handler) - -IceErrorHandler handler; - +IceSetErrorHandler(IceErrorHandler handler) { IceErrorHandler oldHandler = _IceErrorHandler; @@ -594,16 +519,12 @@ } - /* * Default IO error handler. */ void -_IceDefaultIOErrorHandler (iceConn) - -IceConn iceConn; - +_IceDefaultIOErrorHandler(IceConn iceConn) { fprintf (stderr, "ICE default IO error handler doing an exit(), pid = %ld, errno = %d\n", @@ -613,7 +534,6 @@ } - /* * This procedure sets the ICE fatal I/O error handler to be the * specified routine. If NULL is passed in the default error @@ -622,10 +542,7 @@ */ IceIOErrorHandler -IceSetIOErrorHandler (handler) - -IceIOErrorHandler handler; - +IceSetIOErrorHandler(IceIOErrorHandler handler) { IceIOErrorHandler oldHandler = _IceIOErrorHandler; Index: xc/lib/ICE/getauth.c diff -u xc/lib/ICE/getauth.c:1.3 xc/lib/ICE/getauth.c:1.4 --- xc/lib/ICE/getauth.c:1.3 Fri Dec 14 14:53:35 2001 +++ xc/lib/ICE/getauth.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: getauth.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,18 +25,15 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/getauth.c,v 1.3 2001/12/14 19:53:35 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/getauth.c,v 1.4 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" #include -static Bool auth_valid (); +static Bool auth_valid(char *auth_name, int num_auth_names, char **auth_names, + int *index_ret); -extern int _IcePaAuthDataEntryCount; -extern IceAuthDataEntry _IcePaAuthDataEntries[]; - - /* * The functions in this file are not a standard part of ICElib. * @@ -56,15 +52,8 @@ */ void -_IceGetPoAuthData (protocolName, networkId, authName, - authDataLenRet, authDataRet) - -char *protocolName; -char *networkId; -char *authName; -unsigned short *authDataLenRet; -char **authDataRet; - +_IceGetPoAuthData(char *protocolName, char *networkId, char *authName, + unsigned short *authDataLenRet, char **authDataRet) { IceAuthFileEntry *entry; @@ -87,17 +76,9 @@ } - void -_IceGetPaAuthData (protocolName, networkId, authName, - authDataLenRet, authDataRet) - -char *protocolName; -char *networkId; -char *authName; -unsigned short *authDataLenRet; -char **authDataRet; - +_IceGetPaAuthData(char *protocolName, char *networkId, char *authName, + unsigned short *authDataLenRet, char **authDataRet) { IceAuthDataEntry *entry = NULL; int found = 0; @@ -128,18 +109,10 @@ } - void -_IceGetPoValidAuthIndices (protocol_name, network_id, - num_auth_names, auth_names, num_indices_ret, indices_ret) - -char *protocol_name; -char *network_id; -int num_auth_names; -char **auth_names; -int *num_indices_ret; -int *indices_ret; /* in/out arg */ - +_IceGetPoValidAuthIndices(char *protocol_name, char *network_id, + int num_auth_names, char **auth_names, + int *num_indices_ret, int *indices_ret) { FILE *auth_file; char *filename; @@ -189,18 +162,10 @@ } - void -_IceGetPaValidAuthIndices (protocol_name, network_id, - num_auth_names, auth_names, num_indices_ret, indices_ret) - -char *protocol_name; -char *network_id; -int num_auth_names; -char **auth_names; -int *num_indices_ret; -int *indices_ret; /* in/out arg */ - +_IceGetPaValidAuthIndices(char *protocol_name, char *network_id, + int num_auth_names, char **auth_names, + int *num_indices_ret, int *indices_ret) { int index_ret; int i, j; @@ -235,19 +200,13 @@ } - /* * local routines */ static Bool -auth_valid (auth_name, num_auth_names, auth_names, index_ret) - -char *auth_name; -int num_auth_names; -char **auth_names; -int *index_ret; - +auth_valid(char *auth_name, int num_auth_names, char **auth_names, + int *index_ret) { /* * Check if auth_name is in auth_names. Return index. Index: xc/lib/ICE/globals.h diff -u xc/lib/ICE/globals.h:1.5 xc/lib/ICE/globals.h:1.6 --- xc/lib/ICE/globals.h:1.5 Fri May 31 14:45:41 2002 +++ xc/lib/ICE/globals.h Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: globals.h,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,15 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/globals.h,v 1.5 2002/05/31 18:45:41 dawes Exp $ */ - -extern void _IceDefaultErrorHandler (); -extern void _IceDefaultIOErrorHandler (); - -extern IcePoAuthStatus _IcePoMagicCookie1Proc (); -extern IcePaAuthStatus _IcePaMagicCookie1Proc (); - -extern void _IceProcessCoreMessage (); +/* $XFree86: xc/lib/ICE/globals.h,v 1.6 2005/03/23 03:11:24 dawes Exp $ */ #ifndef __UNIXOS2__ IceConn _IceConnectionObjs[256]; Index: xc/lib/ICE/iceauth.c diff -u xc/lib/ICE/iceauth.c:3.6 xc/lib/ICE/iceauth.c:3.7 --- xc/lib/ICE/iceauth.c:3.6 Fri May 31 14:45:41 2002 +++ xc/lib/ICE/iceauth.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: iceauth.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,7 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/iceauth.c,v 3.6 2002/05/31 18:45:41 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/iceauth.c,v 3.7 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" @@ -35,7 +34,7 @@ #include #define Time_t time_t -static int binaryEqual (); +static int binaryEqual(char *a, char *b, unsigned len); static int was_called_state; @@ -44,12 +43,8 @@ * the SI. It is not part of standard ICElib. */ - char * -IceGenerateMagicCookie (len) - -int len; - +IceGenerateMagicCookie(int len) { char *auth; long ldata[2]; @@ -89,21 +84,11 @@ } - IcePoAuthStatus -_IcePoMagicCookie1Proc (iceConn, authStatePtr, cleanUp, swap, - authDataLen, authData, replyDataLenRet, replyDataRet, errorStringRet) - -IceConn iceConn; -IcePointer *authStatePtr; -Bool cleanUp; -Bool swap; -int authDataLen; -IcePointer authData; -int *replyDataLenRet; -IcePointer *replyDataRet; -char **errorStringRet; - +_IcePoMagicCookie1Proc(IceConn iceConn, IcePointer *authStatePtr, Bool cleanUp, + Bool swap, int authDataLen, IcePointer authData, + int *replyDataLenRet, IcePointer *replyDataRet, + char **errorStringRet) { if (cleanUp) { @@ -171,18 +156,10 @@ IcePaAuthStatus -_IcePaMagicCookie1Proc (iceConn, authStatePtr, swap, - authDataLen, authData, replyDataLenRet, replyDataRet, errorStringRet) - -IceConn iceConn; -IcePointer *authStatePtr; -Bool swap; -int authDataLen; -IcePointer authData; -int *replyDataLenRet; -IcePointer *replyDataRet; -char **errorStringRet; - +_IcePaMagicCookie1Proc(IceConn iceConn, IcePointer *authStatePtr, Bool swap, + int authDataLen, IcePointer authData, + int *replyDataLenRet, IcePointer *replyDataRet, + char **errorStringRet) { *errorStringRet = NULL; *replyDataLenRet = 0; @@ -256,17 +233,12 @@ } - /* * local routines */ static int -binaryEqual (a, b, len) - -register char *a, *b; -register unsigned len; - +binaryEqual(char *a, char *b, unsigned len) { while (len--) if (*a++ != *b++) Index: xc/lib/ICE/listen.c diff -u xc/lib/ICE/listen.c:1.2 xc/lib/ICE/listen.c:1.3 --- xc/lib/ICE/listen.c:1.2 Fri Dec 14 14:53:36 2001 +++ xc/lib/ICE/listen.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: listen.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,21 +25,16 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/listen.c,v 1.3 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" #include #include - Status -IceListenForConnections (countRet, listenObjsRet, errorLength, errorStringRet) - -int *countRet; -IceListenObj **listenObjsRet; -int errorLength; -char *errorStringRet; - +IceListenForConnections(int *countRet, IceListenObj **listenObjsRet, + int errorLength, char *errorStringRet) { struct _IceListenObj *listenObjs; char *networkId; @@ -154,23 +148,15 @@ } - int -IceGetListenConnectionNumber (listenObj) - -IceListenObj listenObj; - +IceGetListenConnectionNumber(IceListenObj listenObj) { return (_IceTransGetConnectionNumber (listenObj->trans_conn)); } - char * -IceGetListenConnectionString (listenObj) - -IceListenObj listenObj; - +IceGetListenConnectionString(IceListenObj listenObj) { char *networkId; @@ -183,13 +169,8 @@ } - char * -IceComposeNetworkIdList (count, listenObjs) - -int count; -IceListenObj *listenObjs; - +IceComposeNetworkIdList(int count, IceListenObj *listenObjs) { char *list; int len = 0; @@ -241,13 +222,8 @@ } - void -IceFreeListenObjs (count, listenObjs) - -int count; -IceListenObj *listenObjs; - +IceFreeListenObjs(int count, IceListenObj *listenObjs) { int i; @@ -262,7 +238,6 @@ } - /* * Allow host based authentication for the ICE Connection Setup. * Do not confuse with the host based authentication callbacks that @@ -270,11 +245,8 @@ */ void -IceSetHostBasedAuthProc (listenObj, hostBasedAuthProc) - -IceListenObj listenObj; -IceHostBasedAuthProc hostBasedAuthProc; - +IceSetHostBasedAuthProc(IceListenObj listenObj, + IceHostBasedAuthProc hostBasedAuthProc) { listenObj->host_based_auth_proc = hostBasedAuthProc; } Index: xc/lib/ICE/listenwk.c diff -u xc/lib/ICE/listenwk.c:1.4 xc/lib/ICE/listenwk.c:1.5 --- xc/lib/ICE/listenwk.c:1.4 Fri Dec 14 14:53:36 2001 +++ xc/lib/ICE/listenwk.c Tue Mar 22 22:11:24 2005 @@ -1,5 +1,3 @@ -/* $Xorg: listenwk.c,v 1.5 2001/02/09 02:03:26 xorgcvs Exp $ */ - /* Copyright 1996, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/ICE/listenwk.c,v 1.4 2001/12/14 19:53:36 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/listenwk.c,v 1.5 2005/03/23 03:11:24 dawes Exp $ */ /* Author: Ralph Mor, X Consortium */ @@ -35,16 +33,10 @@ #include #include - Status -IceListenForWellKnownConnections (port, countRet, listenObjsRet, errorLength, errorStringRet) - -char *port; -int *countRet; -IceListenObj **listenObjsRet; -int errorLength; -char *errorStringRet; - +IceListenForWellKnownConnections(char *port, int *countRet, + IceListenObj **listenObjsRet, + int errorLength, char *errorStringRet) { struct _IceListenObj *listenObjs; char *networkId; Index: xc/lib/ICE/locking.c diff -u xc/lib/ICE/locking.c:1.2 xc/lib/ICE/locking.c:1.3 --- xc/lib/ICE/locking.c:1.2 Fri Dec 14 14:53:36 2001 +++ xc/lib/ICE/locking.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: locking.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,6 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/locking.c,v 1.3 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" @@ -37,28 +37,21 @@ Status -IceInitThreads () - +IceInitThreads() { return (0); } void -IceAppLockConn (iceConn) - -IceConn iceConn; - +IceAppLockConn(IceConn iceConn) { IceLockConn (iceConn); } void -IceAppUnlockConn (iceConn) - -IceConn iceConn; - +IceAppUnlockConn(IceConn iceConn) { IceUnlockConn (iceConn); } Index: xc/lib/ICE/misc.c diff -u xc/lib/ICE/misc.c:1.4 xc/lib/ICE/misc.c:1.5 --- xc/lib/ICE/misc.c:1.4 Fri Dec 14 14:53:36 2001 +++ xc/lib/ICE/misc.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: misc.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,7 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/misc.c,v 1.4 2001/12/14 19:53:36 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/misc.c,v 1.5 2005/03/23 03:11:24 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ @@ -40,17 +39,12 @@ #include #endif - /* * scratch buffer */ char * -IceAllocScratch (iceConn, size) - -IceConn iceConn; -unsigned long size; - +IceAllocScratch(IceConn iceConn, unsigned long size) { if (!iceConn->scratch || size > iceConn->scratch_size) { @@ -65,16 +59,12 @@ } - /* * Output/Input buffer functions */ int -IceFlush (iceConn) - -IceConn iceConn; - +IceFlush(IceConn iceConn) { _IceWrite (iceConn, (unsigned long) (iceConn->outbufptr - iceConn->outbuf), @@ -86,45 +76,32 @@ int -IceGetOutBufSize (iceConn) - -IceConn iceConn; - +IceGetOutBufSize(IceConn iceConn) { return (iceConn->outbufmax - iceConn->outbuf); } int -IceGetInBufSize (iceConn) - -IceConn iceConn; - +IceGetInBufSize(IceConn iceConn) { return (iceConn->inbufmax - iceConn->inbuf); } - /* * informational functions */ IceConnectStatus -IceConnectionStatus (iceConn) - -IceConn iceConn; - +IceConnectionStatus(IceConn iceConn) { return (iceConn->connection_status); } char * -IceVendor (iceConn) - -IceConn iceConn; - +IceVendor(IceConn iceConn) { char *string = (char *) malloc (strlen (iceConn->vendor) + 1); @@ -136,10 +113,7 @@ char * -IceRelease (iceConn) - -IceConn iceConn; - +IceRelease(IceConn iceConn) { char *string = (char *) malloc (strlen (iceConn->release) + 1); @@ -151,40 +125,28 @@ int -IceProtocolVersion (iceConn) - -IceConn iceConn; - +IceProtocolVersion(IceConn iceConn) { return (_IceVersions[iceConn->my_ice_version_index].major_version); } int -IceProtocolRevision (iceConn) - -IceConn iceConn; - +IceProtocolRevision(IceConn iceConn) { return (_IceVersions[iceConn->my_ice_version_index].minor_version); } int -IceConnectionNumber (iceConn) - -IceConn iceConn; - +IceConnectionNumber(IceConn iceConn) { return (_IceTransGetConnectionNumber (iceConn->trans_conn)); } char * -IceConnectionString (iceConn) - -IceConn iceConn; - +IceConnectionString(IceConn iceConn) { if (iceConn->connection_string) { @@ -202,36 +164,26 @@ unsigned long -IceLastSentSequenceNumber (iceConn) - -IceConn iceConn; - +IceLastSentSequenceNumber(IceConn iceConn) { return (iceConn->send_sequence); } unsigned long -IceLastReceivedSequenceNumber (iceConn) - -IceConn iceConn; - +IceLastReceivedSequenceNumber(IceConn iceConn) { return (iceConn->receive_sequence); } Bool -IceSwapping (iceConn) - -IceConn iceConn; - +IceSwapping(IceConn iceConn) { return (iceConn->swap); } - /* * Read "n" bytes from a connection. * @@ -240,12 +192,7 @@ */ Status -_IceRead (iceConn, nbytes, ptr) - -register IceConn iceConn; -unsigned long nbytes; -register char *ptr; - +_IceRead(IceConn iceConn, unsigned long nbytes, char *ptr) { register unsigned long nleft; @@ -332,7 +279,6 @@ } - /* * If we read a message header with a bad major or minor opcode, * we need to advance to the end of the message. This way, the next @@ -340,11 +286,7 @@ */ void -_IceReadSkip (iceConn, nbytes) - -register IceConn iceConn; -register unsigned long nbytes; - +_IceReadSkip(IceConn iceConn, unsigned long nbytes) { char temp[512]; @@ -358,18 +300,12 @@ } - /* * Write "n" bytes to a connection. */ void -_IceWrite (iceConn, nbytes, ptr) - -register IceConn iceConn; -unsigned long nbytes; -register char *ptr; - +_IceWrite(IceConn iceConn, unsigned long nbytes, char *ptr) { register unsigned long nleft; @@ -440,12 +376,8 @@ #ifdef WORD64 -IceWriteData16 (iceConn, nbytes, data) - -IceConn iceConn; -unsigned long nbytes; -short *data; - +void +IceWriteData16(IceConn iceConn, unsigned long nbytes, short *data) { int numShorts = nbytes / 2; int index = 0; @@ -471,12 +403,8 @@ } -IceWriteData32 (iceConn, nbytes, data) - -IceConn iceConn; -unsigned long nbytes; -int *data; - +void +IceWriteData32(IceConn iceConn, unsigned long nbytes, int *data) { int numLongs = nbytes / 4; int index = 0; @@ -502,25 +430,15 @@ } -IceReadData16 (iceConn, swap, nbytes, data) - -IceConn iceConn; -Bool swap; -unsigned long nbytes; -short *data; - +void +IceReadData16(IceConn iceConn, Bool swap, unsigned long nbytes, short *data) { /* NOT IMPLEMENTED YET */ } -IceReadData32 (iceConn, swap, nbytes, data) - -IceConn iceConn; -Bool swap; -unsigned long nbytes; -int *data; - +void +IceReadData32(IceConn iceConn, Bool swap, unsigned long nbytes, int *data) { /* NOT IMPLEMENTED YET */ } @@ -528,14 +446,8 @@ #endif /* WORD64 */ - void -_IceAddOpcodeMapping (iceConn, hisOpcode, myOpcode) - -IceConn iceConn; -int hisOpcode; -int myOpcode; - +_IceAddOpcodeMapping(IceConn iceConn, int hisOpcode, int myOpcode) { if (hisOpcode <= 0 || hisOpcode > 255) { @@ -612,12 +524,8 @@ } - char * -_IceGetPeerName (iceConn) - -IceConn iceConn; - +_IceGetPeerName(IceConn iceConn) { return (_IceTransGetPeerNetworkId (iceConn->trans_conn)); } Index: xc/lib/ICE/ping.c diff -u xc/lib/ICE/ping.c:1.2 xc/lib/ICE/ping.c:1.3 --- xc/lib/ICE/ping.c:1.2 Fri Dec 14 14:53:36 2001 +++ xc/lib/ICE/ping.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: ping.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,17 +25,13 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/ping.c,v 1.3 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" Status -IcePing (iceConn, pingReplyProc, clientData) - -IceConn iceConn; -IcePingReplyProc pingReplyProc; -IcePointer clientData; - +IcePing(IceConn iceConn, IcePingReplyProc pingReplyProc, IcePointer clientData) { _IcePingWait *newping = (_IcePingWait *) malloc (sizeof (_IcePingWait)); _IcePingWait *ptr = iceConn->ping_waits; Index: xc/lib/ICE/process.c diff -u xc/lib/ICE/process.c:3.11 xc/lib/ICE/process.c:3.12 --- xc/lib/ICE/process.c:3.11 Sat Oct 23 11:29:25 2004 +++ xc/lib/ICE/process.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: process.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,7 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/process.c,v 3.11 2004/10/23 15:29:25 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/process.c,v 3.12 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" @@ -65,7 +64,6 @@ IceDisposeCompleteMessage (_iceConn, _pStart);\ return (0) - /* * IceProcessMessages: * @@ -121,12 +119,8 @@ */ IceProcessMessagesStatus -IceProcessMessages (iceConn, replyWait, replyReadyRet) - -IceConn iceConn; -IceReplyWaitInfo *replyWait; -Bool *replyReadyRet; - +IceProcessMessages(IceConn iceConn, IceReplyWaitInfo *replyWait, + Bool *replyReadyRet) { iceMsg *header; Bool replyReady = False; @@ -368,15 +362,9 @@ } - static void -AuthRequired (iceConn, authIndex, authDataLen, authData) - -IceConn iceConn; -int authIndex; -int authDataLen; -IcePointer authData; - +AuthRequired(IceConn iceConn, int authIndex, int authDataLen, + IcePointer authData) { iceAuthRequiredMsg *pMsg; @@ -396,14 +384,8 @@ } - static void -AuthReply (iceConn, authDataLen, authData) - -IceConn iceConn; -int authDataLen; -IcePointer authData; - +AuthReply(IceConn iceConn, int authDataLen, IcePointer authData) { iceAuthReplyMsg *pMsg; @@ -422,14 +404,8 @@ } - static void -AuthNextPhase (iceConn, authDataLen, authData) - -IceConn iceConn; -int authDataLen; -IcePointer authData; - +AuthNextPhase(IceConn iceConn, int authDataLen, IcePointer authData) { iceAuthNextPhaseMsg *pMsg; @@ -448,13 +424,8 @@ } - static void -AcceptConnection (iceConn, versionIndex) - -IceConn iceConn; -int versionIndex; - +AcceptConnection(IceConn iceConn, int versionIndex) { iceConnectionReplyMsg *pMsg; char *pData; @@ -477,17 +448,9 @@ } - static void -AcceptProtocol (iceConn, hisOpcode, myOpcode, versionIndex, vendor, release) - -IceConn iceConn; -int hisOpcode; -int myOpcode; -int versionIndex; -char *vendor; -char *release; - +AcceptProtocol(IceConn iceConn, int hisOpcode, int myOpcode, int versionIndex, + char *vendor, char *release) { iceProtocolReplyMsg *pMsg; char *pData; @@ -518,27 +481,17 @@ } - static void -PingReply (iceConn) - -IceConn iceConn; - +PingReply(IceConn iceConn) { IceSimpleMessage (iceConn, 0, ICE_PingReply); IceFlush (iceConn); } - static Bool -ProcessError (iceConn, length, swap, replyWait) - -IceConn iceConn; -unsigned long length; -Bool swap; -IceReplyWaitInfo *replyWait; - +ProcessError(IceConn iceConn, unsigned long length, Bool swap, + IceReplyWaitInfo *replyWait) { int invokeHandler = 0; Bool errorReturned = False; @@ -804,14 +757,8 @@ } - static int -ProcessConnectionSetup (iceConn, length, swap) - -IceConn iceConn; -unsigned long length; -Bool swap; - +ProcessConnectionSetup(IceConn iceConn, unsigned long length, Bool swap) { iceConnectionSetupMsg *message; int myVersionCount, hisVersionCount; @@ -1059,15 +1006,9 @@ } - static Bool -ProcessAuthRequired (iceConn, length, swap, replyWait) - -IceConn iceConn; -unsigned long length; -Bool swap; -IceReplyWaitInfo *replyWait; - +ProcessAuthRequired(IceConn iceConn, unsigned long length, Bool swap, + IceReplyWaitInfo *replyWait) { iceAuthRequiredMsg *message; int authDataLen; @@ -1254,14 +1195,8 @@ } - static int -ProcessAuthReply (iceConn, length, swap) - -IceConn iceConn; -unsigned long length; -Bool swap; - +ProcessAuthReply(IceConn iceConn, unsigned long length, Bool swap) { iceAuthReplyMsg *message; int replyDataLen; @@ -1550,15 +1485,9 @@ } - static Bool -ProcessAuthNextPhase (iceConn, length, swap, replyWait) - -IceConn iceConn; -unsigned long length; -Bool swap; -IceReplyWaitInfo *replyWait; - +ProcessAuthNextPhase(IceConn iceConn, unsigned long length, Bool swap, + IceReplyWaitInfo *replyWait) { iceAuthNextPhaseMsg *message; int authDataLen; @@ -1683,15 +1612,9 @@ } - static Bool -ProcessConnectionReply (iceConn, length, swap, replyWait) - -IceConn iceConn; -unsigned long length; -Bool swap; -IceReplyWaitInfo *replyWait; - +ProcessConnectionReply(IceConn iceConn, unsigned long length, Bool swap, + IceReplyWaitInfo *replyWait) { iceConnectionReplyMsg *message; char *pData, *pStart, *pEnd; @@ -1786,14 +1709,8 @@ } - static int -ProcessProtocolSetup (iceConn, length, swap) - -IceConn iceConn; -unsigned long length; -Bool swap; - +ProcessProtocolSetup(IceConn iceConn, unsigned long length, Bool swap) { iceProtocolSetupMsg *message; _IcePaProtocol *myProtocol; @@ -2184,15 +2101,9 @@ } - static Bool -ProcessProtocolReply (iceConn, length, swap, replyWait) - -IceConn iceConn; -unsigned long length; -Bool swap; -IceReplyWaitInfo *replyWait; - +ProcessProtocolReply(IceConn iceConn, unsigned long length, Bool swap, + IceReplyWaitInfo *replyWait) { iceProtocolReplyMsg *message; char *pData, *pStart, *pEnd; @@ -2299,13 +2210,8 @@ } - static int -ProcessPing (iceConn, length) - -IceConn iceConn; -unsigned long length; - +ProcessPing(IceConn iceConn, unsigned long length) { CHECK_SIZE_MATCH (iceConn, ICE_Ping, length, SIZEOF (icePingMsg), IceFatalToConnection, 0); @@ -2316,13 +2222,8 @@ } - static int -ProcessPingReply (iceConn, length) - -IceConn iceConn; -unsigned long length; - +ProcessPingReply(IceConn iceConn, unsigned long length) { CHECK_SIZE_MATCH (iceConn, ICE_PingReply, length, SIZEOF (icePingReplyMsg), IceFatalToConnection, 0); @@ -2346,14 +2247,9 @@ } - static int -ProcessWantToClose (iceConn, length, connectionClosedRet) - -IceConn iceConn; -unsigned long length; -Bool *connectionClosedRet; - +ProcessWantToClose(IceConn iceConn, unsigned long length, + Bool *connectionClosedRet) { *connectionClosedRet = False; @@ -2406,13 +2302,8 @@ } - static int -ProcessNoClose (iceConn, length) - -IceConn iceConn; -unsigned long length; - +ProcessNoClose(IceConn iceConn, unsigned long length) { CHECK_SIZE_MATCH (iceConn, ICE_NoClose, length, SIZEOF (iceNoCloseMsg), IceFatalToConnection, 0); @@ -2435,19 +2326,10 @@ } - void -_IceProcessCoreMessage (iceConn, opcode, length, swap, - replyWait, replyReadyRet, connectionClosedRet) - -IceConn iceConn; -int opcode; -unsigned long length; -Bool swap; -IceReplyWaitInfo *replyWait; -Bool *replyReadyRet; -Bool *connectionClosedRet; - +_IceProcessCoreMessage(IceConn iceConn, int opcode, unsigned long length, + Bool swap, IceReplyWaitInfo *replyWait, + Bool *replyReadyRet, Bool *connectionClosedRet) { Bool replyReady = False; Index: xc/lib/ICE/protosetup.c diff -u xc/lib/ICE/protosetup.c:1.3 xc/lib/ICE/protosetup.c:1.4 --- xc/lib/ICE/protosetup.c:1.3 Fri Dec 14 14:53:36 2001 +++ xc/lib/ICE/protosetup.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: protosetup.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,28 +25,17 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/protosetup.c,v 1.3 2001/12/14 19:53:36 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/protosetup.c,v 1.4 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" IceProtocolSetupStatus -IceProtocolSetup (iceConn, myOpcode, clientData, mustAuthenticate, - majorVersionRet, minorVersionRet, vendorRet, releaseRet, - errorLength, errorStringRet) - -IceConn iceConn; -int myOpcode; -IcePointer clientData; -Bool mustAuthenticate; -int *majorVersionRet; -int *minorVersionRet; -char **vendorRet; -char **releaseRet; -int errorLength; -char *errorStringRet; - +IceProtocolSetup(IceConn iceConn, int myOpcode, IcePointer clientData, + Bool mustAuthenticate, int *majorVersionRet, + int *minorVersionRet, char **vendorRet, char **releaseRet, + int errorLength, char *errorStringRet) { iceProtocolSetupMsg *pMsg; char *pData; Index: xc/lib/ICE/register.c diff -u xc/lib/ICE/register.c:1.2 xc/lib/ICE/register.c:1.3 --- xc/lib/ICE/register.c:1.2 Fri Dec 14 14:53:36 2001 +++ xc/lib/ICE/register.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: register.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,24 +25,17 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/register.c,v 1.3 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" int -IceRegisterForProtocolSetup (protocolName, vendor, release, - versionCount, versionRecs, authCount, authNames, authProcs, IOErrorProc) - -char *protocolName; -char *vendor; -char *release; -int versionCount; -IcePoVersionRec *versionRecs; -int authCount; -char **authNames; -IcePoAuthProc *authProcs; -IceIOErrorProc IOErrorProc; - +IceRegisterForProtocolSetup(char *protocolName, char *vendor, char *release, + int versionCount, IcePoVersionRec *versionRecs, + int authCount, char **authNames, + IcePoAuthProc *authProcs, + IceIOErrorProc IOErrorProc) { _IcePoProtocol *p; int opcodeRet, i; @@ -135,26 +127,15 @@ } - int -IceRegisterForProtocolReply (protocolName, vendor, release, - versionCount, versionRecs, authCount, authNames, authProcs, - hostBasedAuthProc, protocolSetupProc, protocolActivateProc, - IOErrorProc) - -char *protocolName; -char *vendor; -char *release; -int versionCount; -IcePaVersionRec *versionRecs; -int authCount; -char **authNames; -IcePaAuthProc *authProcs; -IceHostBasedAuthProc hostBasedAuthProc; -IceProtocolSetupProc protocolSetupProc; -IceProtocolActivateProc protocolActivateProc; -IceIOErrorProc IOErrorProc; - +IceRegisterForProtocolReply(char *protocolName, char *vendor, char *release, + int versionCount, IcePaVersionRec *versionRecs, + int authCount, char **authNames, + IcePaAuthProc *authProcs, + IceHostBasedAuthProc hostBasedAuthProc, + IceProtocolSetupProc protocolSetupProc, + IceProtocolActivateProc protocolActivateProc, + IceIOErrorProc IOErrorProc) { _IcePaProtocol *p; int opcodeRet, i; Index: xc/lib/ICE/replywait.c diff -u xc/lib/ICE/replywait.c:1.2 xc/lib/ICE/replywait.c:1.3 --- xc/lib/ICE/replywait.c:1.2 Fri Dec 14 14:53:36 2001 +++ xc/lib/ICE/replywait.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: replywait.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,17 +25,14 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/replywait.c,v 1.3 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" void -_IceAddReplyWait (iceConn, replyWait) - -IceConn iceConn; -IceReplyWaitInfo *replyWait; - +_IceAddReplyWait(IceConn iceConn, IceReplyWaitInfo *replyWait) { /* * Add this replyWait to the end of the list (only if the @@ -72,13 +68,8 @@ } - IceReplyWaitInfo * -_IceSearchReplyWaits (iceConn, majorOpcode) - -IceConn iceConn; -int majorOpcode; - +_IceSearchReplyWaits(IceConn iceConn, int majorOpcode) { /* * Return the first replyWait in the list with the given majorOpcode @@ -96,13 +87,8 @@ } - void -_IceSetReplyReady (iceConn, replyWait) - -IceConn iceConn; -IceReplyWaitInfo *replyWait; - +_IceSetReplyReady(IceConn iceConn, IceReplyWaitInfo *replyWait) { /* * The replyWait specified has a reply ready. @@ -118,13 +104,8 @@ } - Bool -_IceCheckReplyReady (iceConn, replyWait) - -IceConn iceConn; -IceReplyWaitInfo *replyWait; - +_IceCheckReplyReady(IceConn iceConn, IceReplyWaitInfo *replyWait) { _IceSavedReplyWait *savedReplyWait = iceConn->saved_reply_waits; _IceSavedReplyWait *prev = NULL; Index: xc/lib/ICE/setauth.c diff -u xc/lib/ICE/setauth.c:1.5 xc/lib/ICE/setauth.c:1.6 --- xc/lib/ICE/setauth.c:1.5 Fri May 31 14:45:41 2002 +++ xc/lib/ICE/setauth.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: setauth.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,13 +25,12 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/setauth.c,v 1.5 2002/05/31 18:45:41 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/setauth.c,v 1.6 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" #include - /* * IceSetPaAuthData is not a standard part of ICElib, it is specific * to the sample implementation. @@ -57,11 +55,7 @@ void -IceSetPaAuthData (numEntries, entries) - -int numEntries; -IceAuthDataEntry *entries; - +IceSetPaAuthData(int numEntries, IceAuthDataEntry *entries) { /* * _IcePaAuthDataEntries should really be a linked list. Index: xc/lib/ICE/shutdown.c diff -u xc/lib/ICE/shutdown.c:3.4 xc/lib/ICE/shutdown.c:3.5 --- xc/lib/ICE/shutdown.c:3.4 Fri Dec 14 14:53:36 2001 +++ xc/lib/ICE/shutdown.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: shutdown.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,7 +25,7 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/lib/ICE/shutdown.c,v 3.4 2001/12/14 19:53:36 dawes Exp $ */ +/* $XFree86: xc/lib/ICE/shutdown.c,v 3.5 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" @@ -34,11 +33,7 @@ Status -IceProtocolShutdown (iceConn, majorOpcode) - -IceConn iceConn; -int majorOpcode; - +IceProtocolShutdown(IceConn iceConn, int majorOpcode) { if (iceConn->proto_ref_count == 0 || iceConn->process_msg_info == NULL || majorOpcode < 1 || majorOpcode > _IceLastMajorOpcode) @@ -82,35 +77,22 @@ } - void -IceSetShutdownNegotiation (iceConn, negotiate) - -IceConn iceConn; -Bool negotiate; - +IceSetShutdownNegotiation(IceConn iceConn, Bool negotiate) { iceConn->skip_want_to_close = negotiate ? False : True; } - Bool -IceCheckShutdownNegotiation (iceConn) - -IceConn iceConn; - +IceCheckShutdownNegotiation(IceConn iceConn) { return (iceConn->skip_want_to_close ? False : True); } - IceCloseStatus -IceCloseConnection (iceConn) - -IceConn iceConn; - +IceCloseConnection(IceConn iceConn) { int refCountReachedZero; IceCloseStatus status; @@ -248,12 +230,8 @@ } - void -_IceFreeConnection (iceConn) - -IceConn iceConn; - +_IceFreeConnection(IceConn iceConn) { if (iceConn->listen_obj == NULL) { Index: xc/lib/ICE/watch.c diff -u xc/lib/ICE/watch.c:1.2 xc/lib/ICE/watch.c:1.3 --- xc/lib/ICE/watch.c:1.2 Fri Dec 14 14:53:36 2001 +++ xc/lib/ICE/watch.c Tue Mar 22 22:11:24 2005 @@ -1,4 +1,3 @@ -/* $Xorg: watch.c,v 1.4 2001/02/09 02:03:26 xorgcvs Exp $ */ /****************************************************************************** @@ -26,17 +25,14 @@ Author: Ralph Mor, X Consortium ******************************************************************************/ +/* $XFree86: xc/lib/ICE/watch.c,v 1.3 2005/03/23 03:11:24 dawes Exp $ */ #include #include "ICElibint.h" Status -IceAddConnectionWatch (watchProc, clientData) - -IceWatchProc watchProc; -IcePointer clientData; - +IceAddConnectionWatch(IceWatchProc watchProc, IcePointer clientData) { /* * watchProc will be called each time an ICE connection is @@ -89,13 +85,8 @@ } - void -IceRemoveConnectionWatch (watchProc, clientData) - -IceWatchProc watchProc; -IcePointer clientData; - +IceRemoveConnectionWatch(IceWatchProc watchProc, IcePointer clientData) { _IceWatchProc *currWatchProc = _IceWatchProcs; _IceWatchProc *prevWatchProc = NULL; @@ -130,12 +121,8 @@ } - void -_IceConnectionOpened (iceConn) - -IceConn iceConn; - +_IceConnectionOpened(IceConn iceConn) { _IceWatchProc *watchProc = _IceWatchProcs; @@ -165,12 +152,8 @@ } - void -_IceConnectionClosed (iceConn) - -IceConn iceConn; - +_IceConnectionClosed(IceConn iceConn) { _IceWatchProc *watchProc = _IceWatchProcs; Index: xc/lib/SM/Imakefile diff -u xc/lib/SM/Imakefile:1.5 xc/lib/SM/Imakefile:1.6 --- xc/lib/SM/Imakefile:1.5 Sun Apr 4 22:33:11 2004 +++ xc/lib/SM/Imakefile Mon Jan 9 09:58:22 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:44:28 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/SM/Imakefile,v 1.5 2004/04/05 02:33:11 dawes Exp $ +XCOMM $XFree86: xc/lib/SM/Imakefile,v 1.6 2006/01/09 14:58:22 dawes Exp $ #define DoNormalLib NormalLibSM #define DoSharedLib SharedLibSM Index: xc/lib/SM/SM-def.cpp diff -u xc/lib/SM/SM-def.cpp:1.1.1.3 xc/lib/SM/SM-def.cpp:1.2 --- xc/lib/SM/SM-def.cpp:1.1.1.3 Tue Jan 16 17:06:52 2001 +++ xc/lib/SM/SM-def.cpp Mon Jan 9 09:58:22 2006 @@ -38,4 +38,4 @@ SmsSaveYourselfPhase2 SmsSetErrorHandler SmsShutdownCancelled -/* $Xorg: SM-def.cpp,v 1.3 2000/08/17 19:44:28 cpqbld Exp $ */ +/* $XFree86: xc/lib/SM/SM-def.cpp,v 1.2 2006/01/09 14:58:22 dawes Exp $ */ Index: xc/lib/SM/SM.h diff -u xc/lib/SM/SM.h:1.2 xc/lib/SM/SM.h:1.3 --- xc/lib/SM/SM.h:1.2 Fri Dec 14 14:53:55 2001 +++ xc/lib/SM/SM.h Mon Jan 9 09:58:22 2006 @@ -1,5 +1,4 @@ -/* $Xorg: SM.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/SM/SM.h,v 1.3 2006/01/09 14:58:22 dawes Exp $ */ /* Copyright 1993, 1998 The Open Group Index: xc/lib/SM/SMlib.h diff -u xc/lib/SM/SMlib.h:1.3 xc/lib/SM/SMlib.h:1.4 --- xc/lib/SM/SMlib.h:1.3 Mon Nov 17 17:20:06 2003 +++ xc/lib/SM/SMlib.h Mon Jan 9 09:58:22 2006 @@ -1,5 +1,4 @@ -/* $Xorg: SMlib.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/SM/SMlib.h,v 1.4 2006/01/09 14:58:22 dawes Exp $ */ /* Copyright 1993, 1998 The Open Group Index: xc/lib/SM/SMlibint.h diff -u xc/lib/SM/SMlibint.h:1.5 xc/lib/SM/SMlibint.h:1.6 --- xc/lib/SM/SMlibint.h:1.5 Thu Dec 30 21:56:03 2004 +++ xc/lib/SM/SMlibint.h Tue Mar 22 22:11:25 2005 @@ -1,5 +1,3 @@ -/* $Xorg: SMlibint.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ - /* Copyright 1993, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/SMlibint.h,v 1.5 2004/12/31 02:56:03 tsi Exp $ */ +/* $XFree86: xc/lib/SM/SMlibint.h,v 1.6 2005/03/23 03:11:25 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium @@ -516,4 +514,20 @@ extern SmcErrorHandler _SmcErrorHandler; extern SmsErrorHandler _SmsErrorHandler; +extern void _SmcDefaultErrorHandler(SmcConn smcConn, Bool swap, + int offendingMinorOpcode, unsigned long offendingSequence, + int errorClass, int severity, SmPointer values); + +extern void _SmsDefaultErrorHandler(SmsConn smsConn, Bool swap, + int offendingMinorOpcode, unsigned long offendingSequence, + int errorClass, int severity, SmPointer values); + +extern void _SmcProcessMessage(IceConn iceConn, IcePointer clientData, + int opcode, unsigned long length, Bool swap, + IceReplyWaitInfo *replyWait, Bool *replyReadyRet); + +extern void _SmsProcessMessage(IceConn iceConn, IcePointer clientData, + int opcode, unsigned long length, Bool swap); + + #endif /* _SMLIBINT_H_ */ Index: xc/lib/SM/SMproto.h diff -u xc/lib/SM/SMproto.h:1.2 xc/lib/SM/SMproto.h:1.3 --- xc/lib/SM/SMproto.h:1.2 Fri Dec 14 14:53:55 2001 +++ xc/lib/SM/SMproto.h Mon Jan 9 09:58:22 2006 @@ -1,5 +1,4 @@ -/* $Xorg: SMproto.h,v 1.5 2001/02/09 02:03:30 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/SM/SMproto.h,v 1.3 2006/01/09 14:58:22 dawes Exp $ */ /* Copyright 1993, 1998 The Open Group Index: xc/lib/SM/globals.h diff -u xc/lib/SM/globals.h:1.5 xc/lib/SM/globals.h:1.6 --- xc/lib/SM/globals.h:1.5 Fri May 31 14:45:41 2002 +++ xc/lib/SM/globals.h Tue Mar 22 22:11:25 2005 @@ -1,5 +1,3 @@ -/* $Xorg: globals.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ - /* Copyright 1993, 1998 The Open Group @@ -25,21 +23,12 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/globals.h,v 1.5 2002/05/31 18:45:41 dawes Exp $ */ +/* $XFree86: xc/lib/SM/globals.h,v 1.6 2005/03/23 03:11:25 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium */ -extern void _SmcDefaultErrorHandler (); -extern void _SmsDefaultErrorHandler (); - -extern IcePoAuthStatus _IcePoMagicCookie1Proc (); -extern IcePaAuthStatus _IcePaMagicCookie1Proc (); - -extern void _SmcProcessMessage (); -extern void _SmsProcessMessage (); - int _SmcOpcode = 0; int _SmsOpcode = 0; Index: xc/lib/SM/sm_auth.c diff -u xc/lib/SM/sm_auth.c:1.4 xc/lib/SM/sm_auth.c:1.5 --- xc/lib/SM/sm_auth.c:1.4 Thu Oct 23 17:38:22 2003 +++ xc/lib/SM/sm_auth.c Tue Mar 22 22:11:25 2005 @@ -1,5 +1,3 @@ -/* $Xorg: sm_auth.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ - /* Copyright 1993, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/sm_auth.c,v 1.4 2003/10/23 21:38:22 tsi Exp $ */ +/* $XFree86: xc/lib/SM/sm_auth.c,v 1.5 2005/03/23 03:11:25 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium Index: xc/lib/SM/sm_client.c diff -u xc/lib/SM/sm_client.c:1.4 xc/lib/SM/sm_client.c:1.5 --- xc/lib/SM/sm_client.c:1.4 Thu Dec 30 21:56:03 2004 +++ xc/lib/SM/sm_client.c Tue Mar 22 22:11:25 2005 @@ -1,6 +1,4 @@ -/* $XFree86: xc/lib/SM/sm_client.c,v 1.4 2004/12/31 02:56:03 tsi Exp $ */ -/* $Xorg: sm_client.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/SM/sm_client.c,v 1.5 2005/03/23 03:11:25 dawes Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -35,25 +33,14 @@ #include "SMlibint.h" #include "globals.h" -static void set_callbacks(); +static void set_callbacks(SmcConn smcConn, unsigned long mask, + SmcCallbacks *callbacks); - SmcConn -SmcOpenConnection (networkIdsList, context, - xsmpMajorRev, xsmpMinorRev, mask, callbacks, - previousId, clientIdRet, errorLength, errorStringRet) - -char *networkIdsList; -SmPointer context; -int xsmpMajorRev; -int xsmpMinorRev; -unsigned long mask; -SmcCallbacks *callbacks; -char *previousId; -char **clientIdRet; -int errorLength; -char *errorStringRet; - +SmcOpenConnection(char *networkIdsList, SmPointer context, int xsmpMajorRev, + int xsmpMinorRev, unsigned long mask, + SmcCallbacks *callbacks, char *previousId, + char **clientIdRet, int errorLength, char *errorStringRet) { SmcConn smcConn; IceConn iceConn; @@ -264,14 +251,8 @@ } - SmcCloseStatus -SmcCloseConnection (smcConn, count, reasonMsgs) - -SmcConn smcConn; -int count; -char **reasonMsgs; - +SmcCloseConnection(SmcConn smcConn, int count, char **reasonMsgs) { IceConn iceConn = smcConn->iceConn; smCloseConnectionMsg *pMsg; @@ -337,27 +318,15 @@ } - void -SmcModifyCallbacks (smcConn, mask, callbacks) - -SmcConn smcConn; -unsigned long mask; -SmcCallbacks *callbacks; - +SmcModifyCallbacks(SmcConn smcConn, unsigned long mask, SmcCallbacks *callbacks) { set_callbacks (smcConn, mask, callbacks); } - void -SmcSetProperties (smcConn, numProps, props) - -SmcConn smcConn; -int numProps; -SmProp **props; - +SmcSetProperties(SmcConn smcConn, int numProps, SmProp **props) { IceConn iceConn = smcConn->iceConn; smSetPropertiesMsg *pMsg; @@ -380,14 +349,8 @@ } - void -SmcDeleteProperties (smcConn, numProps, propNames) - -SmcConn smcConn; -int numProps; -char **propNames; - +SmcDeleteProperties(SmcConn smcConn, int numProps, char **propNames) { IceConn iceConn = smcConn->iceConn; smDeletePropertiesMsg *pMsg; @@ -413,14 +376,9 @@ } - Status -SmcGetProperties (smcConn, propReplyProc, clientData) - -SmcConn smcConn; -SmcPropReplyProc propReplyProc; -SmPointer clientData; - +SmcGetProperties(SmcConn smcConn, SmcPropReplyProc propReplyProc, + SmPointer clientData) { IceConn iceConn = smcConn->iceConn; _SmcPropReplyWait *wait, *ptr; @@ -451,15 +409,9 @@ } - Status -SmcInteractRequest (smcConn, dialogType, interactProc, clientData) - -SmcConn smcConn; -int dialogType; -SmcInteractProc interactProc; -SmPointer clientData; - +SmcInteractRequest(SmcConn smcConn, int dialogType, + SmcInteractProc interactProc, SmPointer clientData) { IceConn iceConn = smcConn->iceConn; smInteractRequestMsg *pMsg; @@ -495,13 +447,8 @@ } - void -SmcInteractDone (smcConn, cancelShutdown) - -SmcConn smcConn; -Bool cancelShutdown; - +SmcInteractDone(SmcConn smcConn, Bool cancelShutdown) { IceConn iceConn = smcConn->iceConn; smInteractDoneMsg *pMsg; @@ -515,18 +462,9 @@ } - void -SmcRequestSaveYourself (smcConn, saveType, shutdown, interactStyle, - fast, global) - -SmcConn smcConn; -int saveType; -Bool shutdown; -int interactStyle; -Bool fast; -Bool global; - +SmcRequestSaveYourself(SmcConn smcConn, int saveType, Bool shutdown, + int interactStyle, Bool fast, Bool global) { IceConn iceConn = smcConn->iceConn; smSaveYourselfRequestMsg *pMsg; @@ -544,14 +482,10 @@ } - Status -SmcRequestSaveYourselfPhase2 (smcConn, saveYourselfPhase2Proc, clientData) - -SmcConn smcConn; -SmcSaveYourselfPhase2Proc saveYourselfPhase2Proc; -SmPointer clientData; - +SmcRequestSaveYourselfPhase2(SmcConn smcConn, + SmcSaveYourselfPhase2Proc saveYourselfPhase2Proc, + SmPointer clientData) { IceConn iceConn = smcConn->iceConn; _SmcPhase2Wait *wait; @@ -579,13 +513,8 @@ } - void -SmcSaveYourselfDone (smcConn, success) - -SmcConn smcConn; -Bool success; - +SmcSaveYourselfDone(SmcConn smcConn, Bool success) { IceConn iceConn = smcConn->iceConn; smSaveYourselfDoneMsg *pMsg; @@ -599,14 +528,8 @@ } - static void -set_callbacks (smcConn, mask, callbacks) - -SmcConn smcConn; -unsigned long mask; -SmcCallbacks *callbacks; - +set_callbacks(SmcConn smcConn, unsigned long mask, SmcCallbacks *callbacks) { if (mask & SmcSaveYourselfProcMask) { Index: xc/lib/SM/sm_error.c diff -u xc/lib/SM/sm_error.c:1.3 xc/lib/SM/sm_error.c:1.4 --- xc/lib/SM/sm_error.c:1.3 Fri Dec 14 14:53:55 2001 +++ xc/lib/SM/sm_error.c Tue Mar 22 22:11:25 2005 @@ -1,5 +1,3 @@ -/* $Xorg: sm_error.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ - /* Copyright 1993, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/sm_error.c,v 1.3 2001/12/14 19:53:55 dawes Exp $ */ +/* $XFree86: xc/lib/SM/sm_error.c,v 1.4 2005/03/23 03:11:25 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium @@ -36,24 +34,14 @@ #include - /* * Default Smc error handler. */ void -_SmcDefaultErrorHandler (smcConn, swap, - offendingMinorOpcode, offendingSequence, - errorClass, severity, values) - -SmcConn smcConn; -Bool swap; -int offendingMinorOpcode; -unsigned long offendingSequence; -int errorClass; -int severity; -SmPointer values; - +_SmcDefaultErrorHandler(SmcConn smcConn, Bool swap, int offendingMinorOpcode, + unsigned long offendingSequence, int errorClass, + int severity, SmPointer values) { char *pData = (char *) values; char *str; @@ -168,24 +156,14 @@ } - /* * Default Sms error handler. */ void -_SmsDefaultErrorHandler (smsConn, swap, - offendingMinorOpcode, offendingSequence, - errorClass, severity, values) - -SmsConn smsConn; -Bool swap; -int offendingMinorOpcode; -unsigned long offendingSequence; -int errorClass; -int severity; -SmPointer values; - +_SmsDefaultErrorHandler(SmsConn smsConn, Bool swap, int offendingMinorOpcode, + unsigned long offendingSequence, int errorClass, + int severity, SmPointer values) { char *pData = (char *) values; char *str; @@ -290,7 +268,6 @@ } - /* * This procedure sets the Smc error handler to be the specified * routine. If NULL is passed in the default error handler is restored. @@ -298,10 +275,7 @@ */ SmcErrorHandler -SmcSetErrorHandler (handler) - -SmcErrorHandler handler; - +SmcSetErrorHandler(SmcErrorHandler handler) { SmcErrorHandler oldHandler = _SmcErrorHandler; @@ -314,7 +288,6 @@ } - /* * This procedure sets the Sms error handler to be the specified * routine. If NULL is passed in the default error handler is restored. @@ -322,10 +295,7 @@ */ SmsErrorHandler -SmsSetErrorHandler (handler) - -SmsErrorHandler handler; - +SmsSetErrorHandler(SmsErrorHandler handler) { SmsErrorHandler oldHandler = _SmsErrorHandler; Index: xc/lib/SM/sm_genid.c diff -u xc/lib/SM/sm_genid.c:3.18 xc/lib/SM/sm_genid.c:3.19 --- xc/lib/SM/sm_genid.c:3.18 Mon Jan 19 22:36:27 2004 +++ xc/lib/SM/sm_genid.c Tue Mar 22 22:11:25 2005 @@ -1,4 +1,3 @@ -/* $Xorg: sm_genid.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -25,7 +24,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/sm_genid.c,v 3.18 2004/01/20 03:36:27 dawes Exp $ */ +/* $XFree86: xc/lib/SM/sm_genid.c,v 3.19 2005/03/23 03:11:25 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium @@ -113,10 +112,8 @@ }; - char * -SmsGenerateClientID (smsConn) - SmsConn smsConn; +SmsGenerateClientID(SmsConn smsConn) { #if defined(TCPCONN) || defined(STREAMSCONN) char hostname[256]; Index: xc/lib/SM/sm_manager.c diff -u xc/lib/SM/sm_manager.c:1.3 xc/lib/SM/sm_manager.c:1.4 --- xc/lib/SM/sm_manager.c:1.3 Tue Jan 6 23:28:02 2004 +++ xc/lib/SM/sm_manager.c Tue Mar 22 22:11:25 2005 @@ -1,5 +1,3 @@ -/* $Xorg: sm_manager.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ - /* Copyright 1993, 1998 The Open Group @@ -25,6 +23,7 @@ in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/SM/sm_manager.c,v 1.4 2005/03/23 03:11:25 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium @@ -38,19 +37,15 @@ #undef shutdown #endif - -Status -SmsInitialize (vendor, release, newClientProc, managerData, - hostBasedAuthProc, errorLength, errorStringRet) - -char *vendor; -char *release; -SmsNewClientProc newClientProc; -SmPointer managerData; -IceHostBasedAuthProc hostBasedAuthProc; -int errorLength; -char *errorStringRet; +static Status _SmsProtocolSetupProc(IceConn iceConn, int majorVersion, + int minorVersion, char *vendor, + char *release, IcePointer *clientDataRet, + char **failureReasonRet); +Status +SmsInitialize(char *vendor, char *release, SmsNewClientProc newClientProc, + SmPointer managerData, IceHostBasedAuthProc hostBasedAuthProc, + int errorLength, char *errorStringRet) { if (errorStringRet && errorLength > 0) *errorStringRet = '\0'; @@ -65,8 +60,6 @@ if (!_SmsOpcode) { - Status _SmsProtocolSetupProc (); - if ((_SmsOpcode = IceRegisterForProtocolReply ("XSMP", vendor, release, _SmVersionCount, _SmsVersions, _SmAuthCount, _SmAuthNames, _SmsAuthProcs, hostBasedAuthProc, @@ -92,20 +85,10 @@ } - -Status -_SmsProtocolSetupProc (iceConn, - majorVersion, minorVersion, vendor, release, - clientDataRet, failureReasonRet) - -IceConn iceConn; -int majorVersion; -int minorVersion; -char *vendor; -char *release; -IcePointer *clientDataRet; -char **failureReasonRet; - +static Status +_SmsProtocolSetupProc(IceConn iceConn, int majorVersion, int minorVersion, + char *vendor, char *release, IcePointer *clientDataRet, + char **failureReasonRet) { SmsConn smsConn; unsigned long mask; @@ -165,24 +148,15 @@ } - char * -SmsClientHostName (smsConn) - -SmsConn smsConn; - +SmsClientHostName(SmsConn smsConn) { return (_IceTransGetPeerNetworkId (smsConn->iceConn->trans_conn)); } - Status -SmsRegisterClientReply (smsConn, clientId) - -SmsConn smsConn; -char *clientId; - +SmsRegisterClientReply(SmsConn smsConn, char *clientId) { IceConn iceConn = smsConn->iceConn; int extra; @@ -210,16 +184,9 @@ } - void -SmsSaveYourself (smsConn, saveType, shutdown, interactStyle, fast) - -SmsConn smsConn; -int saveType; -Bool shutdown; -int interactStyle; -Bool fast; - +SmsSaveYourself(SmsConn smsConn, int saveType, Bool shutdown, + int interactStyle, Bool fast) { IceConn iceConn = smsConn->iceConn; smSaveYourselfMsg *pMsg; @@ -253,12 +220,8 @@ } - void -SmsSaveYourselfPhase2 (smsConn) - -SmsConn smsConn; - +SmsSaveYourselfPhase2(SmsConn smsConn) { IceConn iceConn = smsConn->iceConn; @@ -267,12 +230,8 @@ } - void -SmsInteract (smsConn) - -SmsConn smsConn; - +SmsInteract(SmsConn smsConn) { IceConn iceConn = smsConn->iceConn; @@ -283,12 +242,8 @@ } - void -SmsDie (smsConn) - -SmsConn smsConn; - +SmsDie(SmsConn smsConn) { IceConn iceConn = smsConn->iceConn; @@ -297,12 +252,8 @@ } - void -SmsSaveComplete (smsConn) - -SmsConn smsConn; - +SmsSaveComplete(SmsConn smsConn) { IceConn iceConn = smsConn->iceConn; @@ -311,12 +262,8 @@ } - void -SmsShutdownCancelled (smsConn) - -SmsConn smsConn; - +SmsShutdownCancelled(SmsConn smsConn) { IceConn iceConn = smsConn->iceConn; @@ -327,14 +274,8 @@ } - void -SmsReturnProperties (smsConn, numProps, props) - -SmsConn smsConn; -int numProps; -SmProp **props; - +SmsReturnProperties(SmsConn smsConn, int numProps, SmProp **props) { IceConn iceConn = smsConn->iceConn; int bytes; @@ -357,12 +298,8 @@ } - void -SmsCleanUp (smsConn) - -SmsConn smsConn; - +SmsCleanUp(SmsConn smsConn) { IceProtocolShutdown (smsConn->iceConn, _SmsOpcode); Index: xc/lib/SM/sm_misc.c diff -u xc/lib/SM/sm_misc.c:1.2 xc/lib/SM/sm_misc.c:1.3 --- xc/lib/SM/sm_misc.c:1.2 Fri Dec 14 14:53:55 2001 +++ xc/lib/SM/sm_misc.c Tue Mar 22 22:11:25 2005 @@ -1,5 +1,3 @@ -/* $Xorg: sm_misc.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ - /* Copyright 1993, 1998 The Open Group @@ -25,6 +23,7 @@ in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/SM/sm_misc.c,v 1.3 2005/03/23 03:11:25 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium @@ -39,10 +38,7 @@ */ void -SmFreeProperty (prop) - -SmProp *prop; - +SmFreeProperty(SmProp *prop) { if (prop) { @@ -70,11 +66,7 @@ */ void -SmFreeReasons (count, reasonMsgs) - -int count; -char **reasonMsgs; - +SmFreeReasons(int count, char **reasonMsgs) { if (reasonMsgs) { @@ -88,36 +80,26 @@ } - /* * Smc informational functions */ int -SmcProtocolVersion (smcConn) - -SmcConn smcConn; - +SmcProtocolVersion(SmcConn smcConn) { return (smcConn->proto_major_version); } int -SmcProtocolRevision (smcConn) - -SmcConn smcConn; - +SmcProtocolRevision(SmcConn smcConn) { return (smcConn->proto_minor_version); } char * -SmcVendor (smcConn) - -SmcConn smcConn; - +SmcVendor(SmcConn smcConn) { char *string = (char *) malloc (strlen (smcConn->vendor) + 1); @@ -128,10 +110,7 @@ char * -SmcRelease (smcConn) - -SmcConn smcConn; - +SmcRelease(SmcConn smcConn) { char *string = (char *) malloc (strlen (smcConn->release) + 1); @@ -142,10 +121,7 @@ char * -SmcClientID (smcConn) - -SmcConn smcConn; - +SmcClientID(SmcConn smcConn) { char *clientId = (char *) malloc (strlen (smcConn->client_id) + 1); @@ -156,45 +132,32 @@ IceConn -SmcGetIceConnection (smcConn) - -SmcConn smcConn; - +SmcGetIceConnection(SmcConn smcConn) { return (smcConn->iceConn); } - /* * Sms informational functions */ int -SmsProtocolVersion (smsConn) - -SmsConn smsConn; - +SmsProtocolVersion(SmsConn smsConn) { return (smsConn->proto_major_version); } int -SmsProtocolRevision (smsConn) - -SmsConn smsConn; - +SmsProtocolRevision(SmsConn smsConn) { return (smsConn->proto_minor_version); } char * -SmsClientID (smsConn) - -SmsConn smsConn; - +SmsClientID(SmsConn smsConn) { char *clientId = (char *) malloc (strlen (smsConn->client_id) + 1); @@ -205,10 +168,7 @@ IceConn -SmsGetIceConnection (smsConn) - -SmsConn smsConn; - +SmsGetIceConnection(SmsConn smsConn) { return (smsConn->iceConn); } Index: xc/lib/SM/sm_process.c diff -u xc/lib/SM/sm_process.c:1.3 xc/lib/SM/sm_process.c:1.4 --- xc/lib/SM/sm_process.c:1.3 Tue May 27 18:26:25 2003 +++ xc/lib/SM/sm_process.c Tue Mar 22 22:11:25 2005 @@ -1,5 +1,3 @@ -/* $Xorg: sm_process.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ - /* Copyright 1993, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/sm_process.c,v 1.3 2003/05/27 22:26:25 tsi Exp $ */ +/* $XFree86: xc/lib/SM/sm_process.c,v 1.4 2005/03/23 03:11:25 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium @@ -63,19 +61,10 @@ } - void -_SmcProcessMessage (iceConn, clientData, opcode, - length, swap, replyWait, replyReadyRet) - -IceConn iceConn; -IcePointer clientData; -int opcode; -unsigned long length; -Bool swap; -IceReplyWaitInfo *replyWait; -Bool *replyReadyRet; - +_SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode, + unsigned long length, Bool swap, + IceReplyWaitInfo *replyWait, Bool *replyReadyRet) { SmcConn smcConn = (SmcConn) clientData; @@ -418,16 +407,9 @@ } - void -_SmsProcessMessage (iceConn, clientData, opcode, length, swap) - -IceConn iceConn; -IcePointer clientData; -int opcode; -unsigned long length; -Bool swap; - +_SmsProcessMessage(IceConn iceConn, IcePointer clientData, int opcode, + unsigned long length, Bool swap) { SmsConn smsConn = (SmsConn) clientData; Index: xc/lib/X11/AddDIC.c diff -u xc/lib/X11/AddDIC.c:1.2 xc/lib/X11/AddDIC.c:1.3 --- xc/lib/X11/AddDIC.c:1.2 Sun Apr 13 15:22:14 2003 +++ xc/lib/X11/AddDIC.c Mon Jan 9 09:58:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AddDIC.c,v 1.3 2000/08/17 19:44:29 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/AddDIC.c,v 1.2 2003/04/13 19:22:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/AddDIC.c,v 1.3 2006/01/09 14:58:22 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/AddSF.c diff -u xc/lib/X11/AddSF.c:1.2 xc/lib/X11/AddSF.c:1.3 --- xc/lib/X11/AddSF.c:1.2 Sun Apr 13 15:22:14 2003 +++ xc/lib/X11/AddSF.c Mon Jan 9 09:58:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AddSF.c,v 1.3 2000/08/17 19:44:29 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/AddSF.c,v 1.2 2003/04/13 19:22:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/AddSF.c,v 1.3 2006/01/09 14:58:22 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/AllCells.c diff -u xc/lib/X11/AllCells.c:1.2 xc/lib/X11/AllCells.c:1.3 --- xc/lib/X11/AllCells.c:1.2 Fri Dec 14 14:53:56 2001 +++ xc/lib/X11/AllCells.c Mon Jan 9 09:58:22 2006 @@ -1,4 +1,4 @@ -/* $Xorg: AllCells.c,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/AllCells.c,v 1.3 2006/01/09 14:58:22 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/AllPlanes.c diff -u xc/lib/X11/AllPlanes.c:1.4 xc/lib/X11/AllPlanes.c:1.5 --- xc/lib/X11/AllPlanes.c:1.4 Fri Dec 14 14:53:56 2001 +++ xc/lib/X11/AllPlanes.c Mon Jan 9 09:58:22 2006 @@ -1,4 +1,3 @@ -/* $Xorg: AllPlanes.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/AllPlanes.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/AllPlanes.c,v 1.5 2006/01/09 14:58:22 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/AllowEv.c diff -u xc/lib/X11/AllowEv.c:1.4 xc/lib/X11/AllowEv.c:1.5 --- xc/lib/X11/AllowEv.c:1.4 Fri Dec 14 14:53:56 2001 +++ xc/lib/X11/AllowEv.c Mon Jan 9 09:58:22 2006 @@ -1,4 +1,3 @@ -/* $Xorg: AllowEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/AllowEv.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/AllowEv.c,v 1.5 2006/01/09 14:58:22 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/AutoRep.c diff -u xc/lib/X11/AutoRep.c:1.4 xc/lib/X11/AutoRep.c:1.5 --- xc/lib/X11/AutoRep.c:1.4 Fri Dec 14 14:53:56 2001 +++ xc/lib/X11/AutoRep.c Mon Jan 9 09:58:22 2006 @@ -1,4 +1,3 @@ -/* $Xorg: AutoRep.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/AutoRep.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/AutoRep.c,v 1.5 2006/01/09 14:58:22 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Backgnd.c diff -u xc/lib/X11/Backgnd.c:1.4 xc/lib/X11/Backgnd.c:1.5 --- xc/lib/X11/Backgnd.c:1.4 Fri Dec 14 14:53:56 2001 +++ xc/lib/X11/Backgnd.c Mon Jan 9 09:58:22 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Backgnd.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Backgnd.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Backgnd.c,v 1.5 2006/01/09 14:58:22 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/BdrWidth.c diff -u xc/lib/X11/BdrWidth.c:1.4 xc/lib/X11/BdrWidth.c:1.5 --- xc/lib/X11/BdrWidth.c:1.4 Fri Dec 14 14:53:56 2001 +++ xc/lib/X11/BdrWidth.c Mon Jan 9 09:58:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: BdrWidth.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/BdrWidth.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/BdrWidth.c,v 1.5 2006/01/09 14:58:22 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Bell.c diff -u xc/lib/X11/Bell.c:1.4 xc/lib/X11/Bell.c:1.5 --- xc/lib/X11/Bell.c:1.4 Fri Dec 14 14:53:56 2001 +++ xc/lib/X11/Bell.c Mon Jan 9 09:58:22 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Bell.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Bell.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Bell.c,v 1.5 2006/01/09 14:58:22 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Border.c diff -u xc/lib/X11/Border.c:1.4 xc/lib/X11/Border.c:1.5 --- xc/lib/X11/Border.c:1.4 Fri Dec 14 14:53:56 2001 +++ xc/lib/X11/Border.c Mon Jan 9 09:58:22 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Border.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Border.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Border.c,v 1.5 2006/01/09 14:58:22 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/CCC.c diff -u xc/lib/X11/CCC.c:1.5 xc/lib/X11/CCC.c:1.6 --- xc/lib/X11/CCC.c:1.5 Sun Apr 13 15:22:14 2003 +++ xc/lib/X11/CCC.c Mon Jan 9 09:58:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CCC.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -33,7 +31,7 @@ * * */ -/* $XFree86: xc/lib/X11/CCC.c,v 1.5 2003/04/13 19:22:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CCC.c,v 1.6 2006/01/09 14:58:22 dawes Exp $ */ /* Index: xc/lib/X11/ChAccCon.c diff -u xc/lib/X11/ChAccCon.c:1.4 xc/lib/X11/ChAccCon.c:1.5 --- xc/lib/X11/ChAccCon.c:1.4 Fri Dec 14 14:53:56 2001 +++ xc/lib/X11/ChAccCon.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChAccCon.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChAccCon.c,v 1.4 2001/12/14 19:53:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChAccCon.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ChActPGb.c diff -u xc/lib/X11/ChActPGb.c:1.4 xc/lib/X11/ChActPGb.c:1.5 --- xc/lib/X11/ChActPGb.c:1.4 Fri Dec 14 14:53:57 2001 +++ xc/lib/X11/ChActPGb.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChActPGb.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChActPGb.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChActPGb.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ChClMode.c diff -u xc/lib/X11/ChClMode.c:1.4 xc/lib/X11/ChClMode.c:1.5 --- xc/lib/X11/ChClMode.c:1.4 Fri Dec 14 14:53:57 2001 +++ xc/lib/X11/ChClMode.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChClMode.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChClMode.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChClMode.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ChCmap.c diff -u xc/lib/X11/ChCmap.c:1.4 xc/lib/X11/ChCmap.c:1.5 --- xc/lib/X11/ChCmap.c:1.4 Fri Dec 14 14:53:57 2001 +++ xc/lib/X11/ChCmap.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChCmap.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChCmap.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChCmap.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ChGC.c diff -u xc/lib/X11/ChGC.c:1.5 xc/lib/X11/ChGC.c:1.6 --- xc/lib/X11/ChGC.c:1.5 Sun Apr 13 15:22:14 2003 +++ xc/lib/X11/ChGC.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChGC.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChGC.c,v 1.5 2003/04/13 19:22:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChGC.c,v 1.6 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" #include "Cr.h" Index: xc/lib/X11/ChKeyCon.c diff -u xc/lib/X11/ChKeyCon.c:1.4 xc/lib/X11/ChKeyCon.c:1.5 --- xc/lib/X11/ChKeyCon.c:1.4 Fri Dec 14 14:53:57 2001 +++ xc/lib/X11/ChKeyCon.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChKeyCon.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChKeyCon.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChKeyCon.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ChPntCon.c diff -u xc/lib/X11/ChPntCon.c:1.4 xc/lib/X11/ChPntCon.c:1.5 --- xc/lib/X11/ChPntCon.c:1.4 Fri Dec 14 14:53:57 2001 +++ xc/lib/X11/ChPntCon.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChPntCon.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChPntCon.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChPntCon.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ChProp.c diff -u xc/lib/X11/ChProp.c:1.5 xc/lib/X11/ChProp.c:1.6 --- xc/lib/X11/ChProp.c:1.5 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/ChProp.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChProp.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChProp.c,v 1.5 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChProp.c,v 1.6 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ChSaveSet.c diff -u xc/lib/X11/ChSaveSet.c:1.4 xc/lib/X11/ChSaveSet.c:1.5 --- xc/lib/X11/ChSaveSet.c:1.4 Fri Dec 14 14:53:57 2001 +++ xc/lib/X11/ChSaveSet.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChSaveSet.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChSaveSet.c,v 1.4 2001/12/14 19:53:57 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChSaveSet.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ChWAttrs.c diff -u xc/lib/X11/ChWAttrs.c:1.5 xc/lib/X11/ChWAttrs.c:1.6 --- xc/lib/X11/ChWAttrs.c:1.5 Sun Apr 13 15:22:14 2003 +++ xc/lib/X11/ChWAttrs.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChWAttrs.c,v 1.5 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChWAttrs.c,v 1.5 2003/04/13 19:22:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChWAttrs.c,v 1.6 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ChWindow.c diff -u xc/lib/X11/ChWindow.c:1.6 xc/lib/X11/ChWindow.c:1.7 --- xc/lib/X11/ChWindow.c:1.6 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/ChWindow.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChWindow.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChWindow.c,v 1.6 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChWindow.c,v 1.7 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ChkIfEv.c diff -u xc/lib/X11/ChkIfEv.c:1.3 xc/lib/X11/ChkIfEv.c:1.4 --- xc/lib/X11/ChkIfEv.c:1.3 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/ChkIfEv.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChkIfEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChkIfEv.c,v 1.3 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChkIfEv.c,v 1.4 2006/01/09 14:58:23 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/ChkMaskEv.c diff -u xc/lib/X11/ChkMaskEv.c:3.6 xc/lib/X11/ChkMaskEv.c:3.7 --- xc/lib/X11/ChkMaskEv.c:3.6 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/ChkMaskEv.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChkMaskEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChkMaskEv.c,v 3.6 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChkMaskEv.c,v 3.7 2006/01/09 14:58:23 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/ChkTypEv.c diff -u xc/lib/X11/ChkTypEv.c:1.3 xc/lib/X11/ChkTypEv.c:1.4 --- xc/lib/X11/ChkTypEv.c:1.3 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/ChkTypEv.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChkTypEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChkTypEv.c,v 1.3 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChkTypEv.c,v 1.4 2006/01/09 14:58:23 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/ChkTypWEv.c diff -u xc/lib/X11/ChkTypWEv.c:1.3 xc/lib/X11/ChkTypWEv.c:1.4 --- xc/lib/X11/ChkTypWEv.c:1.3 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/ChkTypWEv.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChkTypWEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChkTypWEv.c,v 1.3 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChkTypWEv.c,v 1.4 2006/01/09 14:58:23 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/ChkWinEv.c diff -u xc/lib/X11/ChkWinEv.c:3.6 xc/lib/X11/ChkWinEv.c:3.7 --- xc/lib/X11/ChkWinEv.c:3.6 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/ChkWinEv.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ChkWinEv.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ChkWinEv.c,v 3.6 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ChkWinEv.c,v 3.7 2006/01/09 14:58:23 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/CirWin.c diff -u xc/lib/X11/CirWin.c:1.4 xc/lib/X11/CirWin.c:1.5 --- xc/lib/X11/CirWin.c:1.4 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/CirWin.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CirWin.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CirWin.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CirWin.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/CirWinDn.c diff -u xc/lib/X11/CirWinDn.c:1.4 xc/lib/X11/CirWinDn.c:1.5 --- xc/lib/X11/CirWinDn.c:1.4 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/CirWinDn.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CirWinDn.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CirWinDn.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CirWinDn.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/CirWinUp.c diff -u xc/lib/X11/CirWinUp.c:1.4 xc/lib/X11/CirWinUp.c:1.5 --- xc/lib/X11/CirWinUp.c:1.4 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/CirWinUp.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CirWinUp.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CirWinUp.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CirWinUp.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ClDisplay.c diff -u xc/lib/X11/ClDisplay.c:1.5 xc/lib/X11/ClDisplay.c:1.6 --- xc/lib/X11/ClDisplay.c:1.5 Sun Apr 13 15:22:14 2003 +++ xc/lib/X11/ClDisplay.c Mon Jan 9 09:58:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ClDisplay.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ - /* Copyright 1985, 1990, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/ClDisplay.c,v 1.5 2003/04/13 19:22:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ClDisplay.c,v 1.6 2006/01/09 14:58:23 dawes Exp $ */ #include #include "Xlib.h" Index: xc/lib/X11/Clear.c diff -u xc/lib/X11/Clear.c:1.4 xc/lib/X11/Clear.c:1.5 --- xc/lib/X11/Clear.c:1.4 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/Clear.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Clear.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Clear.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Clear.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ClearArea.c diff -u xc/lib/X11/ClearArea.c:1.4 xc/lib/X11/ClearArea.c:1.5 --- xc/lib/X11/ClearArea.c:1.4 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/ClearArea.c Mon Jan 9 09:58:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ClearArea.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ClearArea.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ClearArea.c,v 1.5 2006/01/09 14:58:23 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ConfWind.c diff -u xc/lib/X11/ConfWind.c:1.4 xc/lib/X11/ConfWind.c:1.5 --- xc/lib/X11/ConfWind.c:1.4 Fri Dec 14 14:53:58 2001 +++ xc/lib/X11/ConfWind.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ConfWind.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ConfWind.c,v 1.4 2001/12/14 19:53:58 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ConfWind.c,v 1.5 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ConnDis.c diff -u xc/lib/X11/ConnDis.c:3.32 xc/lib/X11/ConnDis.c:3.34 --- xc/lib/X11/ConnDis.c:3.32 Wed Jun 23 22:21:15 2004 +++ xc/lib/X11/ConnDis.c Sun Feb 19 19:14:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ConnDis.c,v 3.32 2004/06/24 02:21:15 tsi Exp $ */ +/* $XFree86: xc/lib/X11/ConnDis.c,v 3.34 2006/02/20 00:14:35 dawes Exp $ */ /* * This file contains operating system dependencies. @@ -701,11 +700,7 @@ * Create a credential that we can send to the X server. */ static int -auth_ezencode(servername, window, cred_out, len) - char *servername; - int window; - char *cred_out; - int *len; +auth_ezencode(char *servername, int window, char *cred_out, int *len) { AUTH *a; XDR xdr; Index: xc/lib/X11/Context.c diff -u xc/lib/X11/Context.c:1.6 xc/lib/X11/Context.c:1.7 --- xc/lib/X11/Context.c:1.6 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/Context.c Mon Jan 9 09:58:24 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Context.c,v 1.5 2001/02/09 02:03:31 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard, @@ -50,7 +48,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/Context.c,v 1.6 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Context.c,v 1.7 2006/01/09 14:58:24 dawes Exp $ */ /* This module implements a simple sparse array. Index: xc/lib/X11/ConvSel.c diff -u xc/lib/X11/ConvSel.c:1.4 xc/lib/X11/ConvSel.c:1.5 --- xc/lib/X11/ConvSel.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/ConvSel.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ConvSel.c,v 1.4 2001/02/09 02:03:31 xorgcvs Exp $ */ /* Copyright 1986,1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ConvSel.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ConvSel.c,v 1.5 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/CopyArea.c diff -u xc/lib/X11/CopyArea.c:1.4 xc/lib/X11/CopyArea.c:1.5 --- xc/lib/X11/CopyArea.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/CopyArea.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CopyArea.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CopyArea.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CopyArea.c,v 1.5 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/CopyCmap.c diff -u xc/lib/X11/CopyCmap.c:1.4 xc/lib/X11/CopyCmap.c:1.5 --- xc/lib/X11/CopyCmap.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/CopyCmap.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CopyCmap.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CopyCmap.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CopyCmap.c,v 1.5 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/CopyGC.c diff -u xc/lib/X11/CopyGC.c:1.4 xc/lib/X11/CopyGC.c:1.5 --- xc/lib/X11/CopyGC.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/CopyGC.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CopyGC.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CopyGC.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CopyGC.c,v 1.5 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/CopyPlane.c diff -u xc/lib/X11/CopyPlane.c:1.4 xc/lib/X11/CopyPlane.c:1.5 --- xc/lib/X11/CopyPlane.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/CopyPlane.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CopyPlane.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CopyPlane.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CopyPlane.c,v 1.5 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/CrBFData.c diff -u xc/lib/X11/CrBFData.c:1.3 xc/lib/X11/CrBFData.c:1.4 --- xc/lib/X11/CrBFData.c:1.3 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/CrBFData.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CrBFData.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CrBFData.c,v 1.3 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CrBFData.c,v 1.4 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlib.h" Index: xc/lib/X11/CrCmap.c diff -u xc/lib/X11/CrCmap.c:1.5 xc/lib/X11/CrCmap.c:1.6 --- xc/lib/X11/CrCmap.c:1.5 Sun Apr 13 15:22:14 2003 +++ xc/lib/X11/CrCmap.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CrCmap.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CrCmap.c,v 1.5 2003/04/13 19:22:14 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CrCmap.c,v 1.6 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/CrCursor.c diff -u xc/lib/X11/CrCursor.c:1.4 xc/lib/X11/CrCursor.c:1.5 --- xc/lib/X11/CrCursor.c:1.4 Sat Nov 23 14:27:48 2002 +++ xc/lib/X11/CrCursor.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CrCursor.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CrCursor.c,v 1.4 2002/11/23 19:27:48 tsi Exp $ */ +/* $XFree86: xc/lib/X11/CrCursor.c,v 1.5 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/CrGC.c diff -u xc/lib/X11/CrGC.c:3.7 xc/lib/X11/CrGC.c:3.8 --- xc/lib/X11/CrGC.c:3.7 Sun Apr 13 15:22:15 2003 +++ xc/lib/X11/CrGC.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CrGC.c,v 1.5 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CrGC.c,v 3.7 2003/04/13 19:22:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CrGC.c,v 3.8 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" #include "Cr.h" Index: xc/lib/X11/CrGlCur.c diff -u xc/lib/X11/CrGlCur.c:1.8 xc/lib/X11/CrGlCur.c:1.9 --- xc/lib/X11/CrGlCur.c:1.8 Tue Jan 13 14:08:04 2004 +++ xc/lib/X11/CrGlCur.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CrGlCur.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CrGlCur.c,v 1.8 2004/01/13 19:08:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CrGlCur.c,v 1.9 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/CrPFBData.c diff -u xc/lib/X11/CrPFBData.c:1.2 xc/lib/X11/CrPFBData.c:1.3 --- xc/lib/X11/CrPFBData.c:1.2 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/CrPFBData.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,4 @@ -/* $Xorg: CrPFBData.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/CrPFBData.c,v 1.3 2006/01/09 14:58:24 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/lib/X11/CrPixmap.c diff -u xc/lib/X11/CrPixmap.c:1.4 xc/lib/X11/CrPixmap.c:1.5 --- xc/lib/X11/CrPixmap.c:1.4 Sat Nov 23 14:27:49 2002 +++ xc/lib/X11/CrPixmap.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CrPixmap.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/CrPixmap.c,v 1.4 2002/11/23 19:27:49 tsi Exp $ */ +/* $XFree86: xc/lib/X11/CrPixmap.c,v 1.5 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/CrWindow.c diff -u xc/lib/X11/CrWindow.c:1.2 xc/lib/X11/CrWindow.c:1.3 --- xc/lib/X11/CrWindow.c:1.2 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/CrWindow.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,4 @@ -/* $Xorg: CrWindow.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/CrWindow.c,v 1.3 2006/01/09 14:58:24 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/Cursor.c diff -u xc/lib/X11/Cursor.c:1.4 xc/lib/X11/Cursor.c:1.5 --- xc/lib/X11/Cursor.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/Cursor.c Mon Jan 9 09:58:24 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Cursor.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Cursor.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Cursor.c,v 1.5 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */ Index: xc/lib/X11/CvColW.c diff -u xc/lib/X11/CvColW.c:1.4 xc/lib/X11/CvColW.c:1.5 --- xc/lib/X11/CvColW.c:1.4 Sun Apr 13 15:22:15 2003 +++ xc/lib/X11/CvColW.c Mon Jan 9 09:58:24 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CvColW.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -33,7 +31,7 @@ * * */ -/* $XFree86: xc/lib/X11/CvColW.c,v 1.4 2003/04/13 19:22:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CvColW.c,v 1.5 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/CvCols.c diff -u xc/lib/X11/CvCols.c:1.5 xc/lib/X11/CvCols.c:1.6 --- xc/lib/X11/CvCols.c:1.5 Sun Nov 2 22:46:26 2003 +++ xc/lib/X11/CvCols.c Mon Jan 9 09:58:24 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CvCols.c,v 1.3 2000/08/17 19:44:32 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -33,7 +31,7 @@ * * */ -/* $XFree86: xc/lib/X11/CvCols.c,v 1.5 2003/11/03 03:46:26 dawes Exp $ */ +/* $XFree86: xc/lib/X11/CvCols.c,v 1.6 2006/01/09 14:58:24 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/DefCursor.c diff -u xc/lib/X11/DefCursor.c:1.4 xc/lib/X11/DefCursor.c:1.5 --- xc/lib/X11/DefCursor.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DefCursor.c Mon Jan 9 09:58:25 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DefCursor.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986,1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DefCursor.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DefCursor.c,v 1.5 2006/01/09 14:58:25 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/DelProp.c diff -u xc/lib/X11/DelProp.c:1.4 xc/lib/X11/DelProp.c:1.5 --- xc/lib/X11/DelProp.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DelProp.c Mon Jan 9 09:58:25 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DelProp.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DelProp.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DelProp.c,v 1.5 2006/01/09 14:58:25 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Depths.c diff -u xc/lib/X11/Depths.c:1.2 xc/lib/X11/Depths.c:1.3 --- xc/lib/X11/Depths.c:1.2 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/Depths.c Mon Jan 9 09:58:25 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Depths.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/Depths.c,v 1.3 2006/01/09 14:58:25 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group Index: xc/lib/X11/DestSubs.c diff -u xc/lib/X11/DestSubs.c:1.4 xc/lib/X11/DestSubs.c:1.5 --- xc/lib/X11/DestSubs.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DestSubs.c Mon Jan 9 09:58:25 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DestSubs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DestSubs.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DestSubs.c,v 1.5 2006/01/09 14:58:25 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/DestWind.c diff -u xc/lib/X11/DestWind.c:1.4 xc/lib/X11/DestWind.c:1.5 --- xc/lib/X11/DestWind.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DestWind.c Mon Jan 9 09:58:25 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DestWind.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DestWind.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DestWind.c,v 1.5 2006/01/09 14:58:25 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/DisName.c diff -u xc/lib/X11/DisName.c:1.3 xc/lib/X11/DisName.c:1.4 --- xc/lib/X11/DisName.c:1.3 Sun Apr 13 15:22:15 2003 +++ xc/lib/X11/DisName.c Mon Jan 9 09:58:25 2006 @@ -1,5 +1,3 @@ -/* $Xorg: DisName.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/DisName.c,v 1.3 2003/04/13 19:22:15 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DisName.c,v 1.4 2006/01/09 14:58:25 dawes Exp $ */ /* XDisplayName.c */ /* Index: xc/lib/X11/DrArc.c diff -u xc/lib/X11/DrArc.c:1.4 xc/lib/X11/DrArc.c:1.5 --- xc/lib/X11/DrArc.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DrArc.c Mon Jan 9 09:58:25 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DrArc.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrArc.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrArc.c,v 1.5 2006/01/09 14:58:25 dawes Exp $ */ /* Note to future maintainers: XDrawArc does NOT batch successive PolyArc requests into a single request like XDrawLine, XDrawPoint, etc. Index: xc/lib/X11/DrArcs.c diff -u xc/lib/X11/DrArcs.c:1.4 xc/lib/X11/DrArcs.c:1.5 --- xc/lib/X11/DrArcs.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DrArcs.c Mon Jan 9 09:58:25 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DrArcs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrArcs.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrArcs.c,v 1.5 2006/01/09 14:58:25 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/DrLine.c diff -u xc/lib/X11/DrLine.c:1.4 xc/lib/X11/DrLine.c:1.5 --- xc/lib/X11/DrLine.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DrLine.c Mon Jan 9 09:58:25 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DrLine.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrLine.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrLine.c,v 1.5 2006/01/09 14:58:25 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/DrLines.c diff -u xc/lib/X11/DrLines.c:1.4 xc/lib/X11/DrLines.c:1.5 --- xc/lib/X11/DrLines.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DrLines.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DrLines.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrLines.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrLines.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/DrPoint.c diff -u xc/lib/X11/DrPoint.c:1.4 xc/lib/X11/DrPoint.c:1.5 --- xc/lib/X11/DrPoint.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DrPoint.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DrPoint.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrPoint.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrPoint.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/DrPoints.c diff -u xc/lib/X11/DrPoints.c:1.4 xc/lib/X11/DrPoints.c:1.5 --- xc/lib/X11/DrPoints.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DrPoints.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DrPoints.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrPoints.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrPoints.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/DrRect.c diff -u xc/lib/X11/DrRect.c:1.4 xc/lib/X11/DrRect.c:1.5 --- xc/lib/X11/DrRect.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DrRect.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DrRect.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrRect.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrRect.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/DrRects.c diff -u xc/lib/X11/DrRects.c:1.4 xc/lib/X11/DrRects.c:1.5 --- xc/lib/X11/DrRects.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DrRects.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DrRects.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrRects.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrRects.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/DrSegs.c diff -u xc/lib/X11/DrSegs.c:1.4 xc/lib/X11/DrSegs.c:1.5 --- xc/lib/X11/DrSegs.c:1.4 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/DrSegs.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DrSegs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/DrSegs.c,v 1.4 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/DrSegs.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ErrDes.c diff -u xc/lib/X11/ErrDes.c:3.12 xc/lib/X11/ErrDes.c:3.13 --- xc/lib/X11/ErrDes.c:3.12 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/ErrDes.c Mon Jan 9 09:58:26 2006 @@ -1,7 +1,3 @@ -/* - * $Xorg: ErrDes.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ - */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -48,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/ErrDes.c,v 3.12 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ErrDes.c,v 3.13 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" #include Index: xc/lib/X11/ErrHndlr.c diff -u xc/lib/X11/ErrHndlr.c:1.7 xc/lib/X11/ErrHndlr.c:1.8 --- xc/lib/X11/ErrHndlr.c:1.7 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/ErrHndlr.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ErrHndlr.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ErrHndlr.c,v 1.7 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ErrHndlr.c,v 1.8 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/EvToWire.c diff -u xc/lib/X11/EvToWire.c:1.5 xc/lib/X11/EvToWire.c:1.6 --- xc/lib/X11/EvToWire.c:1.5 Fri Dec 14 14:53:59 2001 +++ xc/lib/X11/EvToWire.c Mon Jan 9 09:58:26 2006 @@ -1,5 +1,3 @@ -/* $Xorg: EvToWire.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ - /* Copyright 1985, 1986, 1987, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/EvToWire.c,v 1.5 2001/12/14 19:53:59 dawes Exp $ */ +/* $XFree86: xc/lib/X11/EvToWire.c,v 1.6 2006/01/09 14:58:26 dawes Exp $ */ /* * XEvToWire.c - Internal support routines for the C subroutine Index: xc/lib/X11/FSSaver.c diff -u xc/lib/X11/FSSaver.c:1.4 xc/lib/X11/FSSaver.c:1.5 --- xc/lib/X11/FSSaver.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FSSaver.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FSSaver.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FSSaver.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FSSaver.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/FSWrap.c diff -u xc/lib/X11/FSWrap.c:1.9 xc/lib/X11/FSWrap.c:1.10 --- xc/lib/X11/FSWrap.c:1.9 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/FSWrap.c Mon Jan 9 09:58:26 2006 @@ -1,5 +1,3 @@ -/* $Xorg: FSWrap.c,v 1.5 2001/02/09 02:03:32 xorgcvs Exp $ */ - /* * Copyright 1991 by the Open Software Foundation * Copyright 1993 by the TOSHIBA Corp. @@ -56,7 +54,7 @@ */ -/* $XFree86: xc/lib/X11/FSWrap.c,v 1.9 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FSWrap.c,v 1.10 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/FetchName.c diff -u xc/lib/X11/FetchName.c:1.2 xc/lib/X11/FetchName.c:1.3 --- xc/lib/X11/FetchName.c:1.2 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FetchName.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,4 @@ -/* $Xorg: FetchName.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/FetchName.c,v 1.3 2006/01/09 14:58:26 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/FillArc.c diff -u xc/lib/X11/FillArc.c:1.4 xc/lib/X11/FillArc.c:1.5 --- xc/lib/X11/FillArc.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FillArc.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FillArc.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FillArc.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FillArc.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/FillArcs.c diff -u xc/lib/X11/FillArcs.c:1.4 xc/lib/X11/FillArcs.c:1.5 --- xc/lib/X11/FillArcs.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FillArcs.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FillArcs.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FillArcs.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FillArcs.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/FillPoly.c diff -u xc/lib/X11/FillPoly.c:1.4 xc/lib/X11/FillPoly.c:1.5 --- xc/lib/X11/FillPoly.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FillPoly.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FillPoly.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FillPoly.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FillPoly.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/FillRct.c diff -u xc/lib/X11/FillRct.c:1.4 xc/lib/X11/FillRct.c:1.5 --- xc/lib/X11/FillRct.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FillRct.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FillRct.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FillRct.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FillRct.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/FillRcts.c diff -u xc/lib/X11/FillRcts.c:1.4 xc/lib/X11/FillRcts.c:1.5 --- xc/lib/X11/FillRcts.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FillRcts.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FillRcts.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FillRcts.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FillRcts.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/FilterEv.c diff -u xc/lib/X11/FilterEv.c:3.5 xc/lib/X11/FilterEv.c:3.6 --- xc/lib/X11/FilterEv.c:3.5 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FilterEv.c Mon Jan 9 09:58:26 2006 @@ -1,5 +1,3 @@ -/* $Xorg: FilterEv.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ - /* * Copyright 1990, 1991 by OMRON Corporation * @@ -53,7 +51,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/FilterEv.c,v 3.5 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FilterEv.c,v 3.6 2006/01/09 14:58:26 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/Flush.c diff -u xc/lib/X11/Flush.c:1.4 xc/lib/X11/Flush.c:1.5 --- xc/lib/X11/Flush.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/Flush.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Flush.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Flush.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Flush.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Font.c diff -u xc/lib/X11/Font.c:1.18 xc/lib/X11/Font.c:1.19 --- xc/lib/X11/Font.c:1.18 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/Font.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Font.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -27,7 +26,7 @@ authorization from the X Consortium and the XFree86 Project. */ -/* $XFree86: xc/lib/X11/Font.c,v 1.18 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Font.c,v 1.19 2006/01/09 14:58:26 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/FontInfo.c diff -u xc/lib/X11/FontInfo.c:1.7 xc/lib/X11/FontInfo.c:1.8 --- xc/lib/X11/FontInfo.c:1.7 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/FontInfo.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FontInfo.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FontInfo.c,v 1.7 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FontInfo.c,v 1.8 2006/01/09 14:58:26 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/FontNames.c diff -u xc/lib/X11/FontNames.c:1.7 xc/lib/X11/FontNames.c:1.8 --- xc/lib/X11/FontNames.c:1.7 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/FontNames.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FontNames.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -25,7 +24,7 @@ */ -/* $XFree86: xc/lib/X11/FontNames.c,v 1.7 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FontNames.c,v 1.8 2006/01/09 14:58:26 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/FreeCmap.c diff -u xc/lib/X11/FreeCmap.c:1.5 xc/lib/X11/FreeCmap.c:1.6 --- xc/lib/X11/FreeCmap.c:1.5 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/FreeCmap.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FreeCmap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreeCmap.c,v 1.5 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreeCmap.c,v 1.6 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlib.h" #include "Xlibint.h" Index: xc/lib/X11/FreeCols.c diff -u xc/lib/X11/FreeCols.c:1.4 xc/lib/X11/FreeCols.c:1.5 --- xc/lib/X11/FreeCols.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FreeCols.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FreeCols.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreeCols.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreeCols.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/FreeCurs.c diff -u xc/lib/X11/FreeCurs.c:1.4 xc/lib/X11/FreeCurs.c:1.5 --- xc/lib/X11/FreeCurs.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FreeCurs.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FreeCurs.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreeCurs.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreeCurs.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/FreeEData.c diff -u xc/lib/X11/FreeEData.c:1.4 xc/lib/X11/FreeEData.c:1.5 --- xc/lib/X11/FreeEData.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FreeEData.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FreeEData.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreeEData.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreeEData.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/FreeGC.c diff -u xc/lib/X11/FreeGC.c:1.5 xc/lib/X11/FreeGC.c:1.6 --- xc/lib/X11/FreeGC.c:1.5 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FreeGC.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FreeGC.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreeGC.c,v 1.5 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreeGC.c,v 1.6 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/FreePix.c diff -u xc/lib/X11/FreePix.c:1.4 xc/lib/X11/FreePix.c:1.5 --- xc/lib/X11/FreePix.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/FreePix.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: FreePix.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/FreePix.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/FreePix.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/GCMisc.c diff -u xc/lib/X11/GCMisc.c:1.4 xc/lib/X11/GCMisc.c:1.5 --- xc/lib/X11/GCMisc.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/GCMisc.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GCMisc.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GCMisc.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GCMisc.c,v 1.5 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Geom.c diff -u xc/lib/X11/Geom.c:1.3 xc/lib/X11/Geom.c:1.4 --- xc/lib/X11/Geom.c:1.3 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/Geom.c Mon Jan 9 09:58:26 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Geom.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ - /* Copyright 1985, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/Geom.c,v 1.3 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Geom.c,v 1.4 2006/01/09 14:58:26 dawes Exp $ */ #include "Xlibint.h" #include "Xutil.h" Index: xc/lib/X11/GetAtomNm.c diff -u xc/lib/X11/GetAtomNm.c:3.5 xc/lib/X11/GetAtomNm.c:3.6 --- xc/lib/X11/GetAtomNm.c:3.5 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/GetAtomNm.c Mon Jan 9 09:58:26 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetAtomNm.c,v 1.5 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetAtomNm.c,v 3.5 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetAtomNm.c,v 3.6 2006/01/09 14:58:26 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/GetColor.c diff -u xc/lib/X11/GetColor.c:1.7 xc/lib/X11/GetColor.c:1.8 --- xc/lib/X11/GetColor.c:1.7 Mon Nov 17 17:20:06 2003 +++ xc/lib/X11/GetColor.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetColor.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetColor.c,v 1.7 2003/11/17 22:20:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetColor.c,v 1.8 2006/01/09 14:58:27 dawes Exp $ */ #define NEED_REPLIES #include Index: xc/lib/X11/GetDflt.c diff -u xc/lib/X11/GetDflt.c:3.24 xc/lib/X11/GetDflt.c:3.25 --- xc/lib/X11/GetDflt.c:3.24 Tue Mar 30 05:34:05 2004 +++ xc/lib/X11/GetDflt.c Mon Jan 9 09:58:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: GetDflt.c,v 1.6 2001/02/09 02:03:33 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/GetDflt.c,v 3.24 2004/03/30 10:34:05 eich Exp $ */ +/* $XFree86: xc/lib/X11/GetDflt.c,v 3.25 2006/01/09 14:58:27 dawes Exp $ */ #include "Xlibint.h" #include Index: xc/lib/X11/GetFPath.c diff -u xc/lib/X11/GetFPath.c:1.4 xc/lib/X11/GetFPath.c:1.5 --- xc/lib/X11/GetFPath.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/GetFPath.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetFPath.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetFPath.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetFPath.c,v 1.5 2006/01/09 14:58:27 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/GetFProp.c diff -u xc/lib/X11/GetFProp.c:1.2 xc/lib/X11/GetFProp.c:1.3 --- xc/lib/X11/GetFProp.c:1.2 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/GetFProp.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,4 @@ -/* $Xorg: GetFProp.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/GetFProp.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/GetGCVals.c diff -u xc/lib/X11/GetGCVals.c:1.2 xc/lib/X11/GetGCVals.c:1.3 --- xc/lib/X11/GetGCVals.c:1.2 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/GetGCVals.c Mon Jan 9 09:58:27 2006 @@ -1,5 +1,4 @@ -/* $Xorg: GetGCVals.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/GetGCVals.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group Index: xc/lib/X11/GetGeom.c diff -u xc/lib/X11/GetGeom.c:1.2 xc/lib/X11/GetGeom.c:1.3 --- xc/lib/X11/GetGeom.c:1.2 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/GetGeom.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,4 @@ -/* $Xorg: GetGeom.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/GetGeom.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/GetHColor.c diff -u xc/lib/X11/GetHColor.c:1.2 xc/lib/X11/GetHColor.c:1.3 --- xc/lib/X11/GetHColor.c:1.2 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/GetHColor.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,4 @@ -/* $Xorg: GetHColor.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/GetHColor.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/GetHints.c diff -u xc/lib/X11/GetHints.c:1.4 xc/lib/X11/GetHints.c:1.5 --- xc/lib/X11/GetHints.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/GetHints.c Mon Jan 9 09:58:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: GetHints.c,v 1.5 2001/02/09 02:03:33 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/GetHints.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetHints.c,v 1.5 2006/01/09 14:58:27 dawes Exp $ */ #include #include Index: xc/lib/X11/GetIFocus.c diff -u xc/lib/X11/GetIFocus.c:1.4 xc/lib/X11/GetIFocus.c:1.5 --- xc/lib/X11/GetIFocus.c:1.4 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/GetIFocus.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetIFocus.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetIFocus.c,v 1.4 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetIFocus.c,v 1.5 2006/01/09 14:58:27 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/GetImage.c diff -u xc/lib/X11/GetImage.c:1.5 xc/lib/X11/GetImage.c:1.6 --- xc/lib/X11/GetImage.c:1.5 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/GetImage.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetImage.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetImage.c,v 1.5 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetImage.c,v 1.6 2006/01/09 14:58:27 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/GetKCnt.c diff -u xc/lib/X11/GetKCnt.c:1.6 xc/lib/X11/GetKCnt.c:1.7 --- xc/lib/X11/GetKCnt.c:1.6 Fri Dec 14 14:54:00 2001 +++ xc/lib/X11/GetKCnt.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetKCnt.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetKCnt.c,v 1.6 2001/12/14 19:54:00 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetKCnt.c,v 1.7 2006/01/09 14:58:27 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/GetMoEv.c diff -u xc/lib/X11/GetMoEv.c:1.2 xc/lib/X11/GetMoEv.c:1.3 --- xc/lib/X11/GetMoEv.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetMoEv.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,4 @@ -/* $Xorg: GetMoEv.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/GetMoEv.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/GetNrmHint.c diff -u xc/lib/X11/GetNrmHint.c:1.2 xc/lib/X11/GetNrmHint.c:1.3 --- xc/lib/X11/GetNrmHint.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetNrmHint.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,4 @@ -/* $Xorg: GetNrmHint.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/GetNrmHint.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca, Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, Index: xc/lib/X11/GetPCnt.c diff -u xc/lib/X11/GetPCnt.c:1.4 xc/lib/X11/GetPCnt.c:1.5 --- xc/lib/X11/GetPCnt.c:1.4 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetPCnt.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetPCnt.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetPCnt.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetPCnt.c,v 1.5 2006/01/09 14:58:27 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/GetPntMap.c diff -u xc/lib/X11/GetPntMap.c:1.7 xc/lib/X11/GetPntMap.c:1.8 --- xc/lib/X11/GetPntMap.c:1.7 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/GetPntMap.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetPntMap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -25,7 +24,7 @@ */ -/* $XFree86: xc/lib/X11/GetPntMap.c,v 1.7 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetPntMap.c,v 1.8 2006/01/09 14:58:27 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/GetProp.c diff -u xc/lib/X11/GetProp.c:1.6 xc/lib/X11/GetProp.c:1.7 --- xc/lib/X11/GetProp.c:1.6 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetProp.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetProp.c,v 1.5 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetProp.c,v 1.6 2001/12/14 19:54:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetProp.c,v 1.7 2006/01/09 14:58:27 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/GetRGBCMap.c diff -u xc/lib/X11/GetRGBCMap.c:1.2 xc/lib/X11/GetRGBCMap.c:1.3 --- xc/lib/X11/GetRGBCMap.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetRGBCMap.c Mon Jan 9 09:58:27 2006 @@ -1,5 +1,4 @@ -/* $Xorg: GetRGBCMap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/GetRGBCMap.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/lib/X11/GetSOwner.c diff -u xc/lib/X11/GetSOwner.c:1.2 xc/lib/X11/GetSOwner.c:1.3 --- xc/lib/X11/GetSOwner.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetSOwner.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,4 @@ -/* $Xorg: GetSOwner.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/GetSOwner.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/GetSSaver.c diff -u xc/lib/X11/GetSSaver.c:1.4 xc/lib/X11/GetSSaver.c:1.5 --- xc/lib/X11/GetSSaver.c:1.4 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetSSaver.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetSSaver.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetSSaver.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetSSaver.c,v 1.5 2006/01/09 14:58:27 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/GetStCmap.c diff -u xc/lib/X11/GetStCmap.c:1.2 xc/lib/X11/GetStCmap.c:1.3 --- xc/lib/X11/GetStCmap.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetStCmap.c Mon Jan 9 09:58:27 2006 @@ -1,5 +1,4 @@ -/* $Xorg: GetStCmap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/GetStCmap.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group Index: xc/lib/X11/GetTxtProp.c diff -u xc/lib/X11/GetTxtProp.c:1.2 xc/lib/X11/GetTxtProp.c:1.3 --- xc/lib/X11/GetTxtProp.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetTxtProp.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,4 @@ -/* $Xorg: GetTxtProp.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/GetTxtProp.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca., Index: xc/lib/X11/GetWAttrs.c diff -u xc/lib/X11/GetWAttrs.c:1.3 xc/lib/X11/GetWAttrs.c:1.4 --- xc/lib/X11/GetWAttrs.c:1.3 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/GetWAttrs.c Mon Jan 9 09:58:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetWAttrs.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GetWAttrs.c,v 1.3 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GetWAttrs.c,v 1.4 2006/01/09 14:58:27 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/GetWMCMapW.c diff -u xc/lib/X11/GetWMCMapW.c:1.2 xc/lib/X11/GetWMCMapW.c:1.3 --- xc/lib/X11/GetWMCMapW.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetWMCMapW.c Mon Jan 9 09:58:27 2006 @@ -1,5 +1,4 @@ -/* $Xorg: GetWMCMapW.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/GetWMCMapW.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group Index: xc/lib/X11/GetWMProto.c diff -u xc/lib/X11/GetWMProto.c:1.2 xc/lib/X11/GetWMProto.c:1.3 --- xc/lib/X11/GetWMProto.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GetWMProto.c Mon Jan 9 09:58:27 2006 @@ -1,5 +1,4 @@ -/* $Xorg: GetWMProto.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/GetWMProto.c,v 1.3 2006/01/09 14:58:27 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group Index: xc/lib/X11/GrButton.c diff -u xc/lib/X11/GrButton.c:1.4 xc/lib/X11/GrButton.c:1.5 --- xc/lib/X11/GrButton.c:1.4 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GrButton.c Mon Jan 9 09:58:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GrButton.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GrButton.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GrButton.c,v 1.5 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/GrKey.c diff -u xc/lib/X11/GrKey.c:1.4 xc/lib/X11/GrKey.c:1.5 --- xc/lib/X11/GrKey.c:1.4 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GrKey.c Mon Jan 9 09:58:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GrKey.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GrKey.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GrKey.c,v 1.5 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/GrKeybd.c diff -u xc/lib/X11/GrKeybd.c:1.2 xc/lib/X11/GrKeybd.c:1.3 --- xc/lib/X11/GrKeybd.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GrKeybd.c Mon Jan 9 09:58:28 2006 @@ -1,4 +1,4 @@ -/* $Xorg: GrKeybd.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/GrKeybd.c,v 1.3 2006/01/09 14:58:28 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/GrPointer.c diff -u xc/lib/X11/GrPointer.c:1.2 xc/lib/X11/GrPointer.c:1.3 --- xc/lib/X11/GrPointer.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GrPointer.c Mon Jan 9 09:58:28 2006 @@ -1,4 +1,4 @@ -/* $Xorg: GrPointer.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/GrPointer.c,v 1.3 2006/01/09 14:58:28 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/GrServer.c diff -u xc/lib/X11/GrServer.c:1.4 xc/lib/X11/GrServer.c:1.5 --- xc/lib/X11/GrServer.c:1.4 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/GrServer.c Mon Jan 9 09:58:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GrServer.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/GrServer.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/GrServer.c,v 1.5 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/HVC.c diff -u xc/lib/X11/HVC.c:1.4 xc/lib/X11/HVC.c:1.5 --- xc/lib/X11/HVC.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/HVC.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -47,7 +45,7 @@ * DOCUMENTATION * "TekColor Color Management System, System Implementor's Manual" */ -/* $XFree86: xc/lib/X11/HVC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/HVC.c,v 1.5 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/HVCGcC.c diff -u xc/lib/X11/HVCGcC.c:1.4 xc/lib/X11/HVCGcC.c:1.5 --- xc/lib/X11/HVCGcC.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/HVCGcC.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HVCGcC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -43,7 +41,7 @@ * Source for XcmsTekHVCClipC() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/HVCGcC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/HVCGcC.c,v 1.5 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/HVCGcV.c diff -u xc/lib/X11/HVCGcV.c:1.4 xc/lib/X11/HVCGcV.c:1.5 --- xc/lib/X11/HVCGcV.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/HVCGcV.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HVCGcV.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -43,7 +41,7 @@ * Source for XcmsTekHVCClipV() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/HVCGcV.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/HVCGcV.c,v 1.5 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/HVCGcVC.c diff -u xc/lib/X11/HVCGcVC.c:1.4 xc/lib/X11/HVCGcVC.c:1.5 --- xc/lib/X11/HVCGcVC.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/HVCGcVC.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HVCGcVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -43,7 +41,7 @@ * Source for XcmsTekHVCClipVC() gamut * compression function. */ -/* $XFree86: xc/lib/X11/HVCGcVC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/HVCGcVC.c,v 1.5 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/HVCMnV.c diff -u xc/lib/X11/HVCMnV.c:1.2 xc/lib/X11/HVCMnV.c:1.3 --- xc/lib/X11/HVCMnV.c:1.2 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/HVCMnV.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HVCMnV.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -43,7 +41,7 @@ * Source for XcmsTekHVCQueryMinV gamut boundary querying routine. * */ -/* $XFree86: xc/lib/X11/HVCMnV.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/HVCMnV.c,v 1.3 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/HVCMxC.c diff -u xc/lib/X11/HVCMxC.c:1.5 xc/lib/X11/HVCMxC.c:1.6 --- xc/lib/X11/HVCMxC.c:1.5 Tue Jul 15 21:38:26 2003 +++ xc/lib/X11/HVCMxC.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HVCMxC.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -44,7 +42,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/HVCMxC.c,v 1.5 2003/07/16 01:38:26 dawes Exp $ */ +/* $XFree86: xc/lib/X11/HVCMxC.c,v 1.6 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/HVCMxV.c diff -u xc/lib/X11/HVCMxV.c:1.5 xc/lib/X11/HVCMxV.c:1.6 --- xc/lib/X11/HVCMxV.c:1.5 Tue Jul 15 21:38:26 2003 +++ xc/lib/X11/HVCMxV.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HVCMxV.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -44,7 +42,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/HVCMxV.c,v 1.5 2003/07/16 01:38:26 dawes Exp $ */ +/* $XFree86: xc/lib/X11/HVCMxV.c,v 1.6 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/HVCMxVC.c diff -u xc/lib/X11/HVCMxVC.c:1.2 xc/lib/X11/HVCMxVC.c:1.3 --- xc/lib/X11/HVCMxVC.c:1.2 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/HVCMxVC.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HVCMxVC.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -44,7 +42,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/HVCMxVC.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/HVCMxVC.c,v 1.3 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/HVCMxVs.c diff -u xc/lib/X11/HVCMxVs.c:1.4 xc/lib/X11/HVCMxVs.c:1.5 --- xc/lib/X11/HVCMxVs.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/HVCMxVs.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HVCMxVs.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -43,7 +41,7 @@ * Source for the XcmsTekHVCQueryMaxVSamples() gamut boundary * querying routine. */ -/* $XFree86: xc/lib/X11/HVCMxVs.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/HVCMxVs.c,v 1.5 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/HVCWpAj.c diff -u xc/lib/X11/HVCWpAj.c:1.2 xc/lib/X11/HVCWpAj.c:1.3 --- xc/lib/X11/HVCWpAj.c:1.2 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/HVCWpAj.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HVCWpAj.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -44,7 +42,7 @@ * adjustment of color specifications in the TekHVC color * space. */ -/* $XFree86: xc/lib/X11/HVCWpAj.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/HVCWpAj.c,v 1.3 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/Host.c diff -u xc/lib/X11/Host.c:1.4 xc/lib/X11/Host.c:1.5 --- xc/lib/X11/Host.c:1.4 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/Host.c Mon Jan 9 09:58:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Host.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Host.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Host.c,v 1.5 2006/01/09 14:58:28 dawes Exp $ */ /* this might be rightly reguarded an os dependent file */ Index: xc/lib/X11/ICWrap.c diff -u xc/lib/X11/ICWrap.c:1.11 xc/lib/X11/ICWrap.c:1.12 --- xc/lib/X11/ICWrap.c:1.11 Sun Jan 4 13:44:46 2004 +++ xc/lib/X11/ICWrap.c Mon Jan 9 09:58:28 2006 @@ -1,8 +1,4 @@ /* - * $Xorg: ICWrap.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ - */ - -/* * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation, * and Nippon Telegraph and Telephone Corporation * Copyright 1991 by the Open Software Foundation @@ -64,7 +60,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/ICWrap.c,v 1.11 2004/01/04 18:44:46 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ICWrap.c,v 1.12 2006/01/09 14:58:28 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/IMWrap.c diff -u xc/lib/X11/IMWrap.c:3.9 xc/lib/X11/IMWrap.c:3.10 --- xc/lib/X11/IMWrap.c:3.9 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/IMWrap.c Mon Jan 9 09:58:28 2006 @@ -1,8 +1,4 @@ /* - * $Xorg: IMWrap.c,v 1.3 2000/08/17 19:44:37 cpqbld Exp $ - */ - -/* * Copyright 1991 by the Open Software Foundation * Copyright 1993, 1994 by the Sony Corporation * @@ -57,7 +53,7 @@ */ -/* $XFree86: xc/lib/X11/IMWrap.c,v 3.9 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/IMWrap.c,v 3.10 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/Iconify.c diff -u xc/lib/X11/Iconify.c:1.2 xc/lib/X11/Iconify.c:1.3 --- xc/lib/X11/Iconify.c:1.2 Fri Dec 14 14:54:01 2001 +++ xc/lib/X11/Iconify.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,4 @@ -/* $Xorg: Iconify.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/Iconify.c,v 1.3 2006/01/09 14:58:28 dawes Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca. Index: xc/lib/X11/IdOfPr.c diff -u xc/lib/X11/IdOfPr.c:1.2 xc/lib/X11/IdOfPr.c:1.3 --- xc/lib/X11/IdOfPr.c:1.2 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/IdOfPr.c Mon Jan 9 09:58:28 2006 @@ -1,5 +1,3 @@ -/* $Xorg: IdOfPr.c,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/IdOfPr.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/IdOfPr.c,v 1.3 2006/01/09 14:58:28 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/IfEvent.c diff -u xc/lib/X11/IfEvent.c:1.5 xc/lib/X11/IfEvent.c:1.6 --- xc/lib/X11/IfEvent.c:1.5 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/IfEvent.c Mon Jan 9 09:58:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: IfEvent.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/IfEvent.c,v 1.5 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/IfEvent.c,v 1.6 2006/01/09 14:58:28 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/ImText.c diff -u xc/lib/X11/ImText.c:1.5 xc/lib/X11/ImText.c:1.6 --- xc/lib/X11/ImText.c:1.5 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/ImText.c Mon Jan 9 09:58:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ImText.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ImText.c,v 1.5 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ImText.c,v 1.6 2006/01/09 14:58:29 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/ImText16.c diff -u xc/lib/X11/ImText16.c:1.5 xc/lib/X11/ImText16.c:1.6 --- xc/lib/X11/ImText16.c:1.5 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/ImText16.c Mon Jan 9 09:58:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ImText16.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ImText16.c,v 1.5 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ImText16.c,v 1.6 2006/01/09 14:58:29 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/ImUtil.c diff -u xc/lib/X11/ImUtil.c:3.13 xc/lib/X11/ImUtil.c:3.14 --- xc/lib/X11/ImUtil.c:3.13 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/ImUtil.c Mon Jan 9 09:58:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ImUtil.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ImUtil.c,v 3.13 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ImUtil.c,v 3.14 2006/01/09 14:58:29 dawes Exp $ */ #include #include Index: xc/lib/X11/Imakefile diff -u xc/lib/X11/Imakefile:3.57 xc/lib/X11/Imakefile:3.59 --- xc/lib/X11/Imakefile:3.57 Tue Dec 28 18:50:47 2004 +++ xc/lib/X11/Imakefile Fri Feb 17 13:01:15 2006 @@ -1,20 +1,15 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:44:38 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.57 2004/12/28 23:50:47 dawes Exp $ - +XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.59 2006/02/17 18:01:15 dawes Exp $ HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \ Xcms.h Xlocale.h XKBlib.h -#if BuildServersOnly && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer +#if (BuildServersOnly || !BuildX11Lib) && !XnestServer && !BuildGLXLibrary && !BuildClients && !XdmxServer all:: depend:: +#define IncSubdir X11 BuildIncludes($(HEADERS),IncSubdir,..) #else @@ -137,7 +132,7 @@ #endif DEFINES = $(MALLOC_DEFINES) $(LIB_DEFINES) $(MISC_DEFINES)\ $(POSTLOCALELIBDEFINES) - OPEN_DEFINES = -I$(EXTINCSRC) $(K5INCL) $(K5DEFS) + OPEN_DEFINES = $(K5INCL) $(K5DEFS) DEPEND_DEFINES = $(OPEN_DEFINES) $(TRANS_INCLUDES) $(CONN_DEFINES) $(THREADS_DEFINES) DependDefines AUTHOBJS = AuDispose.o AuGetBest.o AuFileName.o AuRead.o AUTHSRCS = AuDispose.c AuGetBest.c AuFileName.c AuRead.c Index: xc/lib/X11/InitExt.c diff -u xc/lib/X11/InitExt.c:1.8 xc/lib/X11/InitExt.c:1.9 --- xc/lib/X11/InitExt.c:1.8 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/InitExt.c Mon Jan 9 09:58:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: InitExt.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/InitExt.c,v 1.8 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/InitExt.c,v 1.9 2006/01/09 14:58:29 dawes Exp $ */ #include #include Index: xc/lib/X11/InsCmap.c diff -u xc/lib/X11/InsCmap.c:1.4 xc/lib/X11/InsCmap.c:1.5 --- xc/lib/X11/InsCmap.c:1.4 Fri Dec 14 14:54:02 2001 +++ xc/lib/X11/InsCmap.c Mon Jan 9 09:58:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: InsCmap.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/InsCmap.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/InsCmap.c,v 1.5 2006/01/09 14:58:29 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/IntAtom.c diff -u xc/lib/X11/IntAtom.c:1.7 xc/lib/X11/IntAtom.c:1.8 --- xc/lib/X11/IntAtom.c:1.7 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/IntAtom.c Mon Jan 9 09:58:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: IntAtom.c,v 1.5 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1990, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/IntAtom.c,v 1.7 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/IntAtom.c,v 1.8 2006/01/09 14:58:29 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/KeyBind.c diff -u xc/lib/X11/KeyBind.c:1.9 xc/lib/X11/KeyBind.c:1.10 --- xc/lib/X11/KeyBind.c:1.9 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/KeyBind.c Mon Jan 9 09:58:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: KeyBind.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/KeyBind.c,v 1.9 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/KeyBind.c,v 1.10 2006/01/09 14:58:29 dawes Exp $ */ /* Beware, here be monsters (still under construction... - JG */ Index: xc/lib/X11/KeysymStr.c diff -u xc/lib/X11/KeysymStr.c:3.10 xc/lib/X11/KeysymStr.c:3.11 --- xc/lib/X11/KeysymStr.c:3.10 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/KeysymStr.c Mon Jan 9 09:58:29 2006 @@ -1,5 +1,3 @@ -/* $Xorg: KeysymStr.c,v 1.5 2001/02/09 02:03:34 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/KeysymStr.c,v 3.10 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/KeysymStr.c,v 3.11 2006/01/09 14:58:29 dawes Exp $ */ #include "Xlibint.h" #include Index: xc/lib/X11/KillCl.c diff -u xc/lib/X11/KillCl.c:1.4 xc/lib/X11/KillCl.c:1.5 --- xc/lib/X11/KillCl.c:1.4 Fri Dec 14 14:54:02 2001 +++ xc/lib/X11/KillCl.c Mon Jan 9 09:58:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: KillCl.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/KillCl.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/KillCl.c,v 1.5 2006/01/09 14:58:29 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/LRGB.c diff -u xc/lib/X11/LRGB.c:3.7 xc/lib/X11/LRGB.c:3.8 --- xc/lib/X11/LRGB.c:3.7 Sun Nov 2 22:46:26 2003 +++ xc/lib/X11/LRGB.c Mon Jan 9 09:58:29 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LRGB.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -35,7 +33,7 @@ * 4. RGB intensity to CIE XYZ * */ -/* $XFree86: xc/lib/X11/LRGB.c,v 3.7 2003/11/03 03:46:26 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LRGB.c,v 3.8 2006/01/09 14:58:29 dawes Exp $ */ #include #include Index: xc/lib/X11/Lab.c diff -u xc/lib/X11/Lab.c:1.4 xc/lib/X11/Lab.c:1.5 --- xc/lib/X11/Lab.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/Lab.c Mon Jan 9 09:58:29 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Lab.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -36,7 +34,7 @@ * * Note that the range for L* is 0 to 1. */ -/* $XFree86: xc/lib/X11/Lab.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Lab.c,v 1.5 2006/01/09 14:58:29 dawes Exp $ */ #include Index: xc/lib/X11/LabGcC.c diff -u xc/lib/X11/LabGcC.c:1.4 xc/lib/X11/LabGcC.c:1.5 --- xc/lib/X11/LabGcC.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/LabGcC.c Mon Jan 9 09:58:29 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LabGcC.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -30,7 +28,7 @@ * Source for XcmsCIELabClipuv() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/LabGcC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LabGcC.c,v 1.5 2006/01/09 14:58:29 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LabGcL.c diff -u xc/lib/X11/LabGcL.c:1.4 xc/lib/X11/LabGcL.c:1.5 --- xc/lib/X11/LabGcL.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/LabGcL.c Mon Jan 9 09:58:29 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LabGcL.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -30,7 +28,7 @@ * Source for XcmsCIELabClipL() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/LabGcL.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LabGcL.c,v 1.5 2006/01/09 14:58:29 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LabGcLC.c diff -u xc/lib/X11/LabGcLC.c:1.4 xc/lib/X11/LabGcLC.c:1.5 --- xc/lib/X11/LabGcLC.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/LabGcLC.c Mon Jan 9 09:58:29 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LabGcLC.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -30,7 +28,7 @@ * Source for XcmsCIELabClipLab() gamut * compression function. */ -/* $XFree86: xc/lib/X11/LabGcLC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LabGcLC.c,v 1.5 2006/01/09 14:58:29 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LabMnL.c diff -u xc/lib/X11/LabMnL.c:1.4 xc/lib/X11/LabMnL.c:1.5 --- xc/lib/X11/LabMnL.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/LabMnL.c Mon Jan 9 09:58:29 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LabMnL.c,v 1.3 2000/08/17 19:44:39 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -31,7 +29,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LabMnL.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LabMnL.c,v 1.5 2006/01/09 14:58:29 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LabMxC.c diff -u xc/lib/X11/LabMxC.c:1.4 xc/lib/X11/LabMxC.c:1.5 --- xc/lib/X11/LabMxC.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/LabMxC.c Mon Jan 9 09:58:29 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LabMxC.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -33,7 +31,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LabMxC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LabMxC.c,v 1.5 2006/01/09 14:58:29 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LabMxL.c diff -u xc/lib/X11/LabMxL.c:1.4 xc/lib/X11/LabMxL.c:1.5 --- xc/lib/X11/LabMxL.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/LabMxL.c Mon Jan 9 09:58:30 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LabMxL.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -31,7 +29,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LabMxL.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LabMxL.c,v 1.5 2006/01/09 14:58:30 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LabMxLC.c diff -u xc/lib/X11/LabMxLC.c:1.2 xc/lib/X11/LabMxLC.c:1.3 --- xc/lib/X11/LabMxLC.c:1.2 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/LabMxLC.c Mon Jan 9 09:58:30 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LabMxLC.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -38,7 +36,7 @@ * Fred W. Billmeyer & Max Saltzman, "Principles of Color * Technology", John Wily & Sons, Inc, 1981. */ -/* $XFree86: xc/lib/X11/LabMxLC.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LabMxLC.c,v 1.3 2006/01/09 14:58:30 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LabWpAj.c diff -u xc/lib/X11/LabWpAj.c:1.2 xc/lib/X11/LabWpAj.c:1.3 --- xc/lib/X11/LabWpAj.c:1.2 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/LabWpAj.c Mon Jan 9 09:58:30 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LabWpAj.c,v 1.3 2000/08/17 19:44:40 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * adjustment of color specifications in the CIE L*a*b* color * space. */ -/* $XFree86: xc/lib/X11/LabWpAj.c,v 1.2 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LabWpAj.c,v 1.3 2006/01/09 14:58:30 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LiHosts.c diff -u xc/lib/X11/LiHosts.c:1.5 xc/lib/X11/LiHosts.c:1.6 --- xc/lib/X11/LiHosts.c:1.5 Fri Dec 14 14:54:02 2001 +++ xc/lib/X11/LiHosts.c Mon Jan 9 09:58:30 2006 @@ -1,4 +1,4 @@ -/* $Xorg: LiHosts.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/LiHosts.c,v 1.6 2006/01/09 14:58:30 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/LiICmaps.c diff -u xc/lib/X11/LiICmaps.c:1.4 xc/lib/X11/LiICmaps.c:1.5 --- xc/lib/X11/LiICmaps.c:1.4 Fri Dec 14 14:54:02 2001 +++ xc/lib/X11/LiICmaps.c Mon Jan 9 09:58:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: LiICmaps.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/LiICmaps.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LiICmaps.c,v 1.5 2006/01/09 14:58:30 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/LiProps.c diff -u xc/lib/X11/LiProps.c:1.4 xc/lib/X11/LiProps.c:1.5 --- xc/lib/X11/LiProps.c:1.4 Fri Dec 14 14:54:02 2001 +++ xc/lib/X11/LiProps.c Mon Jan 9 09:58:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: LiProps.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/LiProps.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LiProps.c,v 1.5 2006/01/09 14:58:30 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/ListExt.c diff -u xc/lib/X11/ListExt.c:1.4 xc/lib/X11/ListExt.c:1.5 --- xc/lib/X11/ListExt.c:1.4 Fri Dec 14 14:54:02 2001 +++ xc/lib/X11/ListExt.c Mon Jan 9 09:58:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ListExt.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ListExt.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ListExt.c,v 1.5 2006/01/09 14:58:30 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/LoadFont.c diff -u xc/lib/X11/LoadFont.c:1.5 xc/lib/X11/LoadFont.c:1.6 --- xc/lib/X11/LoadFont.c:1.5 Mon Nov 17 17:20:07 2003 +++ xc/lib/X11/LoadFont.c Mon Jan 9 09:58:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: LoadFont.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/LoadFont.c,v 1.5 2003/11/17 22:20:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LoadFont.c,v 1.6 2006/01/09 14:58:30 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/LockDis.c diff -u xc/lib/X11/LockDis.c:1.3 xc/lib/X11/LockDis.c:1.4 --- xc/lib/X11/LockDis.c:1.3 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/LockDis.c Mon Jan 9 09:58:30 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LockDis.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ - /* Copyright 1993, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/LockDis.c,v 1.3 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LockDis.c,v 1.4 2006/01/09 14:58:30 dawes Exp $ */ /* * Author: Stephen Gildea, MIT X Consortium Index: xc/lib/X11/LookupCol.c diff -u xc/lib/X11/LookupCol.c:1.7 xc/lib/X11/LookupCol.c:1.8 --- xc/lib/X11/LookupCol.c:1.7 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/LookupCol.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: LookupCol.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/LookupCol.c,v 1.7 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LookupCol.c,v 1.8 2006/01/09 14:58:31 dawes Exp $ */ #define NEED_REPLIES #include Index: xc/lib/X11/LowerWin.c diff -u xc/lib/X11/LowerWin.c:1.4 xc/lib/X11/LowerWin.c:1.5 --- xc/lib/X11/LowerWin.c:1.4 Fri Dec 14 14:54:02 2001 +++ xc/lib/X11/LowerWin.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: LowerWin.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/LowerWin.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LowerWin.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Luv.c diff -u xc/lib/X11/Luv.c:1.4 xc/lib/X11/Luv.c:1.5 --- xc/lib/X11/Luv.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/Luv.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Luv.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -38,7 +36,7 @@ * Fred W. Billmeyer & Max Saltzman, "Principles of Color * Technology", John Wily & Sons, Inc, 1981. */ -/* $XFree86: xc/lib/X11/Luv.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Luv.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include #include "Xlibint.h" Index: xc/lib/X11/LuvGcC.c diff -u xc/lib/X11/LuvGcC.c:1.4 xc/lib/X11/LuvGcC.c:1.5 --- xc/lib/X11/LuvGcC.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/LuvGcC.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LuvGcC.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -30,7 +28,7 @@ * Source for XcmsCIELuvClipuv() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/LuvGcC.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LuvGcC.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LuvGcL.c diff -u xc/lib/X11/LuvGcL.c:1.4 xc/lib/X11/LuvGcL.c:1.5 --- xc/lib/X11/LuvGcL.c:1.4 Sun Apr 13 15:22:16 2003 +++ xc/lib/X11/LuvGcL.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LuvGcL.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -30,7 +28,7 @@ * Source for XcmsCIELuvClipL() gamut compression routine. * */ -/* $XFree86: xc/lib/X11/LuvGcL.c,v 1.4 2003/04/13 19:22:16 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LuvGcL.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LuvGcLC.c diff -u xc/lib/X11/LuvGcLC.c:1.4 xc/lib/X11/LuvGcLC.c:1.5 --- xc/lib/X11/LuvGcLC.c:1.4 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/LuvGcLC.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LuvGcLC.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -30,7 +28,7 @@ * Source for XcmsCIELuvClipLuv() gamut * compression function. */ -/* $XFree86: xc/lib/X11/LuvGcLC.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LuvGcLC.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LuvMnL.c diff -u xc/lib/X11/LuvMnL.c:1.4 xc/lib/X11/LuvMnL.c:1.5 --- xc/lib/X11/LuvMnL.c:1.4 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/LuvMnL.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LuvMnL.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -31,7 +29,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LuvMnL.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LuvMnL.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LuvMxC.c diff -u xc/lib/X11/LuvMxC.c:1.4 xc/lib/X11/LuvMxC.c:1.5 --- xc/lib/X11/LuvMxC.c:1.4 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/LuvMxC.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LuvMxC.c,v 1.3 2000/08/17 19:44:41 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -33,7 +31,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LuvMxC.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LuvMxC.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LuvMxL.c diff -u xc/lib/X11/LuvMxL.c:1.4 xc/lib/X11/LuvMxL.c:1.5 --- xc/lib/X11/LuvMxL.c:1.4 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/LuvMxL.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LuvMxL.c,v 1.3 2000/08/17 19:44:45 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -31,7 +29,7 @@ * querying routine. * */ -/* $XFree86: xc/lib/X11/LuvMxL.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LuvMxL.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LuvMxLC.c diff -u xc/lib/X11/LuvMxLC.c:1.2 xc/lib/X11/LuvMxLC.c:1.3 --- xc/lib/X11/LuvMxLC.c:1.2 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/LuvMxLC.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LuvMxLC.c,v 1.3 2000/08/17 19:44:45 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -38,7 +36,7 @@ * Fred W. Billmeyer & Max Saltzman, "Principles of Color * Technology", John Wily & Sons, Inc, 1981. */ -/* $XFree86: xc/lib/X11/LuvMxLC.c,v 1.2 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LuvMxLC.c,v 1.3 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/LuvWpAj.c diff -u xc/lib/X11/LuvWpAj.c:1.2 xc/lib/X11/LuvWpAj.c:1.3 --- xc/lib/X11/LuvWpAj.c:1.2 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/LuvWpAj.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LuvWpAj.c,v 1.3 2000/08/17 19:44:45 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * adjustment of color specifications in the CIE CIELuv.color * space. */ -/* $XFree86: xc/lib/X11/LuvWpAj.c,v 1.2 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/LuvWpAj.c,v 1.3 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/Macros.c diff -u xc/lib/X11/Macros.c:1.5 xc/lib/X11/Macros.c:1.6 --- xc/lib/X11/Macros.c:1.5 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/Macros.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Macros.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Macros.c,v 1.5 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Macros.c,v 1.6 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #define XUTIL_DEFINE_FUNCTIONS Index: xc/lib/X11/MapRaised.c diff -u xc/lib/X11/MapRaised.c:1.4 xc/lib/X11/MapRaised.c:1.5 --- xc/lib/X11/MapRaised.c:1.4 Fri Dec 14 14:54:02 2001 +++ xc/lib/X11/MapRaised.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: MapRaised.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/MapRaised.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/MapRaised.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/MapSubs.c diff -u xc/lib/X11/MapSubs.c:1.4 xc/lib/X11/MapSubs.c:1.5 --- xc/lib/X11/MapSubs.c:1.4 Fri Dec 14 14:54:02 2001 +++ xc/lib/X11/MapSubs.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: MapSubs.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/MapSubs.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/MapSubs.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/MapWindow.c diff -u xc/lib/X11/MapWindow.c:1.4 xc/lib/X11/MapWindow.c:1.5 --- xc/lib/X11/MapWindow.c:1.4 Fri Dec 14 14:54:02 2001 +++ xc/lib/X11/MapWindow.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: MapWindow.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/MapWindow.c,v 1.4 2001/12/14 19:54:02 dawes Exp $ */ +/* $XFree86: xc/lib/X11/MapWindow.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/MaskEvent.c diff -u xc/lib/X11/MaskEvent.c:3.6 xc/lib/X11/MaskEvent.c:3.7 --- xc/lib/X11/MaskEvent.c:3.6 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/MaskEvent.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: MaskEvent.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/MaskEvent.c,v 3.6 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/MaskEvent.c,v 3.7 2006/01/09 14:58:31 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/Misc.c diff -u xc/lib/X11/Misc.c:1.4 xc/lib/X11/Misc.c:1.5 --- xc/lib/X11/Misc.c:1.4 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/Misc.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Misc.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1988, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Misc.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Misc.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ModMap.c diff -u xc/lib/X11/ModMap.c:1.5 xc/lib/X11/ModMap.c:1.6 --- xc/lib/X11/ModMap.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/ModMap.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ModMap.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ModMap.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ModMap.c,v 1.6 2006/01/09 14:58:31 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/MoveWin.c diff -u xc/lib/X11/MoveWin.c:1.4 xc/lib/X11/MoveWin.c:1.5 --- xc/lib/X11/MoveWin.c:1.4 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/MoveWin.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: MoveWin.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/MoveWin.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/MoveWin.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/NextEvent.c diff -u xc/lib/X11/NextEvent.c:1.4 xc/lib/X11/NextEvent.c:1.5 --- xc/lib/X11/NextEvent.c:1.4 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/NextEvent.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: NextEvent.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/NextEvent.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/NextEvent.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/OCWrap.c diff -u xc/lib/X11/OCWrap.c:1.4 xc/lib/X11/OCWrap.c:1.5 --- xc/lib/X11/OCWrap.c:1.4 Wed Jul 25 11:04:44 2001 +++ xc/lib/X11/OCWrap.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: OCWrap.c,v 1.4 2000/08/17 19:44:47 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/OCWrap.c,v 1.4 2001/07/25 15:04:44 dawes Exp $ */ +/* $XFree86: xc/lib/X11/OCWrap.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/OMWrap.c diff -u xc/lib/X11/OMWrap.c:1.5 xc/lib/X11/OMWrap.c:1.6 --- xc/lib/X11/OMWrap.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/OMWrap.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: OMWrap.c,v 1.4 2000/08/17 19:44:47 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/OMWrap.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/OMWrap.c,v 1.6 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/OfCCC.c diff -u xc/lib/X11/OfCCC.c:1.1.1.2 xc/lib/X11/OfCCC.c:1.2 --- xc/lib/X11/OfCCC.c:1.1.1.2 Tue Jan 16 17:07:55 2001 +++ xc/lib/X11/OfCCC.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,4 @@ -/* $Xorg: OfCCC.c,v 1.3 2000/08/17 19:44:47 cpqbld Exp $ */ - +/* $XFree86: xc/lib/X11/OfCCC.c,v 1.2 2006/01/09 14:58:31 dawes Exp $ */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved Index: xc/lib/X11/OpenDis.c diff -u xc/lib/X11/OpenDis.c:3.18 xc/lib/X11/OpenDis.c:3.19 --- xc/lib/X11/OpenDis.c:3.18 Tue Mar 30 05:34:05 2004 +++ xc/lib/X11/OpenDis.c Fri Oct 14 11:15:59 2005 @@ -1,4 +1,4 @@ -/* $Xorg: OpenDis.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/OpenDis.c,v 3.19 2005/10/14 15:15:59 tsi Exp $ */ /* Copyright 1985, 1986, 1998 The Open Group @@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/OpenDis.c,v 3.18 2004/03/30 10:34:05 eich Exp $ */ #define NEED_REPLIES #define NEED_EVENTS @@ -32,7 +31,7 @@ #include #include #include -#include "bigreqstr.h" +#include #include #include "Xintconn.h" Index: xc/lib/X11/ParseCmd.c diff -u xc/lib/X11/ParseCmd.c:1.6 xc/lib/X11/ParseCmd.c:1.7 --- xc/lib/X11/ParseCmd.c:1.6 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/ParseCmd.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ParseCmd.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/ParseCmd.c,v 1.6 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ParseCmd.c,v 1.7 2006/01/09 14:58:31 dawes Exp $ */ /* XrmParseCommand() Index: xc/lib/X11/ParseCol.c diff -u xc/lib/X11/ParseCol.c:1.7 xc/lib/X11/ParseCol.c:1.8 --- xc/lib/X11/ParseCol.c:1.7 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/ParseCol.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ParseCol.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ParseCol.c,v 1.7 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ParseCol.c,v 1.8 2006/01/09 14:58:31 dawes Exp $ */ #define NEED_REPLIES #include Index: xc/lib/X11/ParseGeom.c diff -u xc/lib/X11/ParseGeom.c:1.4 xc/lib/X11/ParseGeom.c:1.5 --- xc/lib/X11/ParseGeom.c:1.4 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/ParseGeom.c Mon Jan 9 09:58:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ParseGeom.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ - /* Copyright 1985, 1986, 1987,1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/ParseGeom.c,v 1.4 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ParseGeom.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #include "Xlibint.h" #include "Xutil.h" Index: xc/lib/X11/PeekEvent.c diff -u xc/lib/X11/PeekEvent.c:1.4 xc/lib/X11/PeekEvent.c:1.5 --- xc/lib/X11/PeekEvent.c:1.4 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/PeekEvent.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PeekEvent.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PeekEvent.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PeekEvent.c,v 1.5 2006/01/09 14:58:31 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/PeekIfEv.c diff -u xc/lib/X11/PeekIfEv.c:1.5 xc/lib/X11/PeekIfEv.c:1.6 --- xc/lib/X11/PeekIfEv.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/PeekIfEv.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PeekIfEv.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PeekIfEv.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PeekIfEv.c,v 1.6 2006/01/09 14:58:31 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/Pending.c diff -u xc/lib/X11/Pending.c:1.2 xc/lib/X11/Pending.c:1.3 --- xc/lib/X11/Pending.c:1.2 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/Pending.c Mon Jan 9 09:58:31 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Pending.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/Pending.c,v 1.3 2006/01/09 14:58:31 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/PixFormats.c diff -u xc/lib/X11/PixFormats.c:1.2 xc/lib/X11/PixFormats.c:1.3 --- xc/lib/X11/PixFormats.c:1.2 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/PixFormats.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PixFormats.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/PixFormats.c,v 1.3 2006/01/09 14:58:32 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group Index: xc/lib/X11/PmapBgnd.c diff -u xc/lib/X11/PmapBgnd.c:1.4 xc/lib/X11/PmapBgnd.c:1.5 --- xc/lib/X11/PmapBgnd.c:1.4 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/PmapBgnd.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PmapBgnd.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PmapBgnd.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PmapBgnd.c,v 1.5 2006/01/09 14:58:32 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/PmapBord.c diff -u xc/lib/X11/PmapBord.c:1.4 xc/lib/X11/PmapBord.c:1.5 --- xc/lib/X11/PmapBord.c:1.4 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/PmapBord.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PmapBord.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PmapBord.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PmapBord.c,v 1.5 2006/01/09 14:58:32 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/PolyReg.c diff -u xc/lib/X11/PolyReg.c:1.7 xc/lib/X11/PolyReg.c:1.8 --- xc/lib/X11/PolyReg.c:1.7 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/PolyReg.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PolyReg.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /************************************************************************ Copyright 1987, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ************************************************************************/ -/* $XFree86: xc/lib/X11/PolyReg.c,v 1.7 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PolyReg.c,v 1.8 2006/01/09 14:58:32 dawes Exp $ */ #define LARGE_COORDINATE 1000000 #define SMALL_COORDINATE -LARGE_COORDINATE Index: xc/lib/X11/PolyTxt.c diff -u xc/lib/X11/PolyTxt.c:3.6 xc/lib/X11/PolyTxt.c:3.7 --- xc/lib/X11/PolyTxt.c:3.6 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/PolyTxt.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PolyTxt.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PolyTxt.c,v 3.6 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PolyTxt.c,v 3.7 2006/01/09 14:58:32 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/PolyTxt16.c diff -u xc/lib/X11/PolyTxt16.c:1.5 xc/lib/X11/PolyTxt16.c:1.6 --- xc/lib/X11/PolyTxt16.c:1.5 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/PolyTxt16.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PolyTxt16.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PolyTxt16.c,v 1.5 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PolyTxt16.c,v 1.6 2006/01/09 14:58:32 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/PrOfId.c diff -u xc/lib/X11/PrOfId.c:1.2 xc/lib/X11/PrOfId.c:1.3 --- xc/lib/X11/PrOfId.c:1.2 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/PrOfId.c Mon Jan 9 09:58:32 2006 @@ -1,5 +1,3 @@ -/* $Xorg: PrOfId.c,v 1.3 2000/08/17 19:44:48 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/PrOfId.c,v 1.2 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PrOfId.c,v 1.3 2006/01/09 14:58:32 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/PropAlloc.c diff -u xc/lib/X11/PropAlloc.c:1.4 xc/lib/X11/PropAlloc.c:1.5 --- xc/lib/X11/PropAlloc.c:1.4 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/PropAlloc.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PropAlloc.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PropAlloc.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PropAlloc.c,v 1.5 2006/01/09 14:58:32 dawes Exp $ */ #include "Xlibint.h" #include "Xutil.h" Index: xc/lib/X11/PutBEvent.c diff -u xc/lib/X11/PutBEvent.c:1.4 xc/lib/X11/PutBEvent.c:1.5 --- xc/lib/X11/PutBEvent.c:1.4 Fri Dec 14 14:54:03 2001 +++ xc/lib/X11/PutBEvent.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PutBEvent.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/PutBEvent.c,v 1.4 2001/12/14 19:54:03 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PutBEvent.c,v 1.5 2006/01/09 14:58:32 dawes Exp $ */ /* XPutBackEvent puts an event back at the head of the queue. */ #define NEED_EVENTS Index: xc/lib/X11/PutImage.c diff -u xc/lib/X11/PutImage.c:3.12 xc/lib/X11/PutImage.c:3.13 --- xc/lib/X11/PutImage.c:3.12 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/PutImage.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PutImage.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/PutImage.c,v 3.12 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/PutImage.c,v 3.13 2006/01/09 14:58:32 dawes Exp $ */ #include "Xlibint.h" #include "Xutil.h" Index: xc/lib/X11/QBlack.c diff -u xc/lib/X11/QBlack.c:1.1.1.2 xc/lib/X11/QBlack.c:1.2 --- xc/lib/X11/QBlack.c:1.1.1.2 Tue Jan 16 17:08:00 2001 +++ xc/lib/X11/QBlack.c Mon Jan 9 09:58:32 2006 @@ -1,5 +1,4 @@ -/* $Xorg: QBlack.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */ - +/* $XFree86: xc/lib/X11/QBlack.c,v 1.2 2006/01/09 14:58:32 dawes Exp $ */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved Index: xc/lib/X11/QBlue.c diff -u xc/lib/X11/QBlue.c:1.1.1.2 xc/lib/X11/QBlue.c:1.2 --- xc/lib/X11/QBlue.c:1.1.1.2 Tue Jan 16 17:08:00 2001 +++ xc/lib/X11/QBlue.c Mon Jan 9 09:58:32 2006 @@ -1,5 +1,4 @@ -/* $Xorg: QBlue.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */ - +/* $XFree86: xc/lib/X11/QBlue.c,v 1.2 2006/01/09 14:58:32 dawes Exp $ */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved Index: xc/lib/X11/QGreen.c diff -u xc/lib/X11/QGreen.c:1.1.1.2 xc/lib/X11/QGreen.c:1.2 --- xc/lib/X11/QGreen.c:1.1.1.2 Tue Jan 16 17:08:00 2001 +++ xc/lib/X11/QGreen.c Mon Jan 9 09:58:32 2006 @@ -1,5 +1,4 @@ -/* $Xorg: QGreen.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */ - +/* $XFree86: xc/lib/X11/QGreen.c,v 1.2 2006/01/09 14:58:32 dawes Exp $ */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved Index: xc/lib/X11/QRed.c diff -u xc/lib/X11/QRed.c:1.1.1.2 xc/lib/X11/QRed.c:1.2 --- xc/lib/X11/QRed.c:1.1.1.2 Tue Jan 16 17:08:01 2001 +++ xc/lib/X11/QRed.c Mon Jan 9 09:58:32 2006 @@ -1,5 +1,4 @@ -/* $Xorg: QRed.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */ - +/* $XFree86: xc/lib/X11/QRed.c,v 1.2 2006/01/09 14:58:32 dawes Exp $ */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved Index: xc/lib/X11/QWhite.c diff -u xc/lib/X11/QWhite.c:1.1.1.2 xc/lib/X11/QWhite.c:1.2 --- xc/lib/X11/QWhite.c:1.1.1.2 Tue Jan 16 17:08:01 2001 +++ xc/lib/X11/QWhite.c Mon Jan 9 09:58:32 2006 @@ -1,5 +1,4 @@ -/* $Xorg: QWhite.c,v 1.3 2000/08/17 19:44:49 cpqbld Exp $ */ - +/* $XFree86: xc/lib/X11/QWhite.c,v 1.2 2006/01/09 14:58:32 dawes Exp $ */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved Index: xc/lib/X11/QuBest.c diff -u xc/lib/X11/QuBest.c:1.2 xc/lib/X11/QuBest.c:1.3 --- xc/lib/X11/QuBest.c:1.2 Fri Dec 14 14:54:04 2001 +++ xc/lib/X11/QuBest.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,4 @@ -/* $Xorg: QuBest.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/QuBest.c,v 1.3 2006/01/09 14:58:32 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/QuCol.c diff -u xc/lib/X11/QuCol.c:1.4 xc/lib/X11/QuCol.c:1.5 --- xc/lib/X11/QuCol.c:1.4 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/QuCol.c Mon Jan 9 09:58:32 2006 @@ -1,5 +1,3 @@ -/* $Xorg: QuCol.c,v 1.3 2000/08/17 19:44:50 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/QuCol.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuCol.c,v 1.5 2006/01/09 14:58:32 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/QuColor.c diff -u xc/lib/X11/QuColor.c:1.4 xc/lib/X11/QuColor.c:1.5 --- xc/lib/X11/QuColor.c:1.4 Fri Dec 14 14:54:04 2001 +++ xc/lib/X11/QuColor.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: QuColor.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuColor.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuColor.c,v 1.5 2006/01/09 14:58:32 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/QuColors.c diff -u xc/lib/X11/QuColors.c:1.4 xc/lib/X11/QuColors.c:1.5 --- xc/lib/X11/QuColors.c:1.4 Fri Dec 14 14:54:04 2001 +++ xc/lib/X11/QuColors.c Mon Jan 9 09:58:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: QuColors.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuColors.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuColors.c,v 1.5 2006/01/09 14:58:32 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/QuCols.c diff -u xc/lib/X11/QuCols.c:1.4 xc/lib/X11/QuCols.c:1.5 --- xc/lib/X11/QuCols.c:1.4 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/QuCols.c Mon Jan 9 09:58:33 2006 @@ -1,5 +1,3 @@ -/* $Xorg: QuCols.c,v 1.3 2000/08/17 19:44:50 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/QuCols.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuCols.c,v 1.5 2006/01/09 14:58:33 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/QuCurShp.c diff -u xc/lib/X11/QuCurShp.c:1.2 xc/lib/X11/QuCurShp.c:1.3 --- xc/lib/X11/QuCurShp.c:1.2 Fri Dec 14 14:54:04 2001 +++ xc/lib/X11/QuCurShp.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,4 @@ -/* $Xorg: QuCurShp.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/QuCurShp.c,v 1.3 2006/01/09 14:58:33 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/QuExt.c diff -u xc/lib/X11/QuExt.c:1.3 xc/lib/X11/QuExt.c:1.4 --- xc/lib/X11/QuExt.c:1.3 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/QuExt.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: QuExt.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuExt.c,v 1.3 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuExt.c,v 1.4 2006/01/09 14:58:33 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/QuKeybd.c diff -u xc/lib/X11/QuKeybd.c:1.4 xc/lib/X11/QuKeybd.c:1.5 --- xc/lib/X11/QuKeybd.c:1.4 Fri Dec 14 14:54:04 2001 +++ xc/lib/X11/QuKeybd.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: QuKeybd.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuKeybd.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuKeybd.c,v 1.5 2006/01/09 14:58:33 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/QuPntr.c diff -u xc/lib/X11/QuPntr.c:1.2 xc/lib/X11/QuPntr.c:1.3 --- xc/lib/X11/QuPntr.c:1.2 Fri Dec 14 14:54:04 2001 +++ xc/lib/X11/QuPntr.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,4 @@ -/* $Xorg: QuPntr.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/QuPntr.c,v 1.3 2006/01/09 14:58:33 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/QuStipShp.c diff -u xc/lib/X11/QuStipShp.c:1.2 xc/lib/X11/QuStipShp.c:1.3 --- xc/lib/X11/QuStipShp.c:1.2 Fri Dec 14 14:54:04 2001 +++ xc/lib/X11/QuStipShp.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,4 @@ -/* $Xorg: QuStipShp.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/QuStipShp.c,v 1.3 2006/01/09 14:58:33 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/QuTextE16.c diff -u xc/lib/X11/QuTextE16.c:1.5 xc/lib/X11/QuTextE16.c:1.6 --- xc/lib/X11/QuTextE16.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/QuTextE16.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: QuTextE16.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuTextE16.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuTextE16.c,v 1.6 2006/01/09 14:58:33 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/QuTextExt.c diff -u xc/lib/X11/QuTextExt.c:1.5 xc/lib/X11/QuTextExt.c:1.6 --- xc/lib/X11/QuTextExt.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/QuTextExt.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: QuTextExt.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuTextExt.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuTextExt.c,v 1.6 2006/01/09 14:58:33 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/QuTileShp.c diff -u xc/lib/X11/QuTileShp.c:1.2 xc/lib/X11/QuTileShp.c:1.3 --- xc/lib/X11/QuTileShp.c:1.2 Fri Dec 14 14:54:04 2001 +++ xc/lib/X11/QuTileShp.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,4 @@ -/* $Xorg: QuTileShp.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/QuTileShp.c,v 1.3 2006/01/09 14:58:33 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/QuTree.c diff -u xc/lib/X11/QuTree.c:1.6 xc/lib/X11/QuTree.c:1.7 --- xc/lib/X11/QuTree.c:1.6 Fri Dec 14 14:54:04 2001 +++ xc/lib/X11/QuTree.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: QuTree.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/QuTree.c,v 1.6 2001/12/14 19:54:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/QuTree.c,v 1.7 2006/01/09 14:58:33 dawes Exp $ */ #define NEED_REPLIES #include "Xlibint.h" Index: xc/lib/X11/Quarks.c diff -u xc/lib/X11/Quarks.c:1.7 xc/lib/X11/Quarks.c:1.8 --- xc/lib/X11/Quarks.c:1.7 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/Quarks.c Mon Jan 9 09:58:33 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Quarks.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard, @@ -49,7 +47,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/Quarks.c,v 1.7 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Quarks.c,v 1.8 2006/01/09 14:58:33 dawes Exp $ */ #include "Xlibint.h" #include Index: xc/lib/X11/RaiseWin.c diff -u xc/lib/X11/RaiseWin.c:1.4 xc/lib/X11/RaiseWin.c:1.5 --- xc/lib/X11/RaiseWin.c:1.4 Fri Dec 14 14:54:04 2001 +++ xc/lib/X11/RaiseWin.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: RaiseWin.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RaiseWin.c,v 1.4 2001/12/14 19:54:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RaiseWin.c,v 1.5 2006/01/09 14:58:33 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/RdBitF.c diff -u xc/lib/X11/RdBitF.c:3.7 xc/lib/X11/RdBitF.c:3.8 --- xc/lib/X11/RdBitF.c:3.7 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/RdBitF.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: RdBitF.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/RdBitF.c,v 3.7 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RdBitF.c,v 3.8 2006/01/09 14:58:33 dawes Exp $ */ /* * Code to read bitmaps from disk files. Interprets Index: xc/lib/X11/RecolorC.c diff -u xc/lib/X11/RecolorC.c:1.4 xc/lib/X11/RecolorC.c:1.5 --- xc/lib/X11/RecolorC.c:1.4 Fri Dec 14 14:54:05 2001 +++ xc/lib/X11/RecolorC.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: RecolorC.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RecolorC.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RecolorC.c,v 1.5 2006/01/09 14:58:33 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ReconfWM.c diff -u xc/lib/X11/ReconfWM.c:1.2 xc/lib/X11/ReconfWM.c:1.3 --- xc/lib/X11/ReconfWM.c:1.2 Fri Dec 14 14:54:05 2001 +++ xc/lib/X11/ReconfWM.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,4 @@ -/* $Xorg: ReconfWM.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/ReconfWM.c,v 1.3 2006/01/09 14:58:33 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/ReconfWin.c diff -u xc/lib/X11/ReconfWin.c:1.4 xc/lib/X11/ReconfWin.c:1.5 --- xc/lib/X11/ReconfWin.c:1.4 Fri Dec 14 14:54:05 2001 +++ xc/lib/X11/ReconfWin.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ReconfWin.c,v 1.4 2001/02/09 02:03:35 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/ReconfWin.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */ +/* $XFree86: xc/lib/X11/ReconfWin.c,v 1.5 2006/01/09 14:58:33 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Region.c diff -u xc/lib/X11/Region.c:1.10 xc/lib/X11/Region.c:1.11 --- xc/lib/X11/Region.c:1.10 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/Region.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Region.c,v 1.6 2001/02/09 02:03:35 xorgcvs Exp $ */ /************************************************************************ Copyright 1987, 1988, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ************************************************************************/ -/* $XFree86: xc/lib/X11/Region.c,v 1.10 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Region.c,v 1.11 2006/01/09 14:58:33 dawes Exp $ */ /* * The functions in this file implement the Region abstraction, similar to one * used in the X11 sample server. A Region is simply an area, as the name Index: xc/lib/X11/RegstFlt.c diff -u xc/lib/X11/RegstFlt.c:1.6 xc/lib/X11/RegstFlt.c:1.7 --- xc/lib/X11/RegstFlt.c:1.6 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/RegstFlt.c Mon Jan 9 09:58:33 2006 @@ -1,5 +1,3 @@ -/* $Xorg: RegstFlt.c,v 1.5 2001/02/09 02:03:35 xorgcvs Exp $ */ - /* * Copyright 1990, 1991 by OMRON Corporation * @@ -52,7 +50,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/RegstFlt.c,v 1.6 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RegstFlt.c,v 1.7 2006/01/09 14:58:33 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/RepWindow.c diff -u xc/lib/X11/RepWindow.c:1.4 xc/lib/X11/RepWindow.c:1.5 --- xc/lib/X11/RepWindow.c:1.4 Fri Dec 14 14:54:05 2001 +++ xc/lib/X11/RepWindow.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: RepWindow.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RepWindow.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RepWindow.c,v 1.5 2006/01/09 14:58:33 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/RestackWs.c diff -u xc/lib/X11/RestackWs.c:1.4 xc/lib/X11/RestackWs.c:1.5 --- xc/lib/X11/RestackWs.c:1.4 Fri Dec 14 14:54:05 2001 +++ xc/lib/X11/RestackWs.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: RestackWs.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RestackWs.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RestackWs.c,v 1.5 2006/01/09 14:58:33 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/RotProp.c diff -u xc/lib/X11/RotProp.c:1.4 xc/lib/X11/RotProp.c:1.5 --- xc/lib/X11/RotProp.c:1.4 Fri Dec 14 14:54:05 2001 +++ xc/lib/X11/RotProp.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: RotProp.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/RotProp.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */ +/* $XFree86: xc/lib/X11/RotProp.c,v 1.5 2006/01/09 14:58:33 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/ScrResStr.c diff -u xc/lib/X11/ScrResStr.c:1.2 xc/lib/X11/ScrResStr.c:1.3 --- xc/lib/X11/ScrResStr.c:1.2 Fri Dec 14 14:54:05 2001 +++ xc/lib/X11/ScrResStr.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,4 @@ -/* $Xorg: ScrResStr.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/ScrResStr.c,v 1.3 2006/01/09 14:58:33 dawes Exp $ */ /* Copyright 1991, 1998 The Open Group Index: xc/lib/X11/SelInput.c diff -u xc/lib/X11/SelInput.c:1.4 xc/lib/X11/SelInput.c:1.5 --- xc/lib/X11/SelInput.c:1.4 Fri Dec 14 14:54:05 2001 +++ xc/lib/X11/SelInput.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SelInput.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SelInput.c,v 1.4 2001/12/14 19:54:05 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SelInput.c,v 1.5 2006/01/09 14:58:33 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SendEvent.c diff -u xc/lib/X11/SendEvent.c:1.5 xc/lib/X11/SendEvent.c:1.6 --- xc/lib/X11/SendEvent.c:1.5 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/SendEvent.c Mon Jan 9 09:58:33 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SendEvent.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SendEvent.c,v 1.5 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SendEvent.c,v 1.6 2006/01/09 14:58:33 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/SetBack.c diff -u xc/lib/X11/SetBack.c:1.4 xc/lib/X11/SetBack.c:1.5 --- xc/lib/X11/SetBack.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetBack.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetBack.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetBack.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetBack.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetCCC.c diff -u xc/lib/X11/SetCCC.c:1.2 xc/lib/X11/SetCCC.c:1.3 --- xc/lib/X11/SetCCC.c:1.2 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/SetCCC.c Mon Jan 9 09:58:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: SetCCC.c,v 1.3 2000/08/17 19:44:52 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -33,7 +31,7 @@ * * */ -/* $XFree86: xc/lib/X11/SetCCC.c,v 1.2 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetCCC.c,v 1.3 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" #include "Xcms.h" Index: xc/lib/X11/SetCRects.c diff -u xc/lib/X11/SetCRects.c:1.5 xc/lib/X11/SetCRects.c:1.6 --- xc/lib/X11/SetCRects.c:1.5 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/SetCRects.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetCRects.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetCRects.c,v 1.5 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetCRects.c,v 1.6 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetClMask.c diff -u xc/lib/X11/SetClMask.c:1.4 xc/lib/X11/SetClMask.c:1.5 --- xc/lib/X11/SetClMask.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetClMask.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetClMask.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetClMask.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetClMask.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetClOrig.c diff -u xc/lib/X11/SetClOrig.c:1.4 xc/lib/X11/SetClOrig.c:1.5 --- xc/lib/X11/SetClOrig.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetClOrig.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetClOrig.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetClOrig.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetClOrig.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetDashes.c diff -u xc/lib/X11/SetDashes.c:1.5 xc/lib/X11/SetDashes.c:1.6 --- xc/lib/X11/SetDashes.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/SetDashes.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetDashes.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetDashes.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetDashes.c,v 1.6 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetFPath.c diff -u xc/lib/X11/SetFPath.c:1.6 xc/lib/X11/SetFPath.c:1.7 --- xc/lib/X11/SetFPath.c:1.6 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetFPath.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetFPath.c,v 1.5 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetFPath.c,v 1.6 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetFPath.c,v 1.7 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetFont.c diff -u xc/lib/X11/SetFont.c:1.4 xc/lib/X11/SetFont.c:1.5 --- xc/lib/X11/SetFont.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetFont.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetFont.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetFont.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetFont.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetFore.c diff -u xc/lib/X11/SetFore.c:1.4 xc/lib/X11/SetFore.c:1.5 --- xc/lib/X11/SetFore.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetFore.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetFore.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetFore.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetFore.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetFunc.c diff -u xc/lib/X11/SetFunc.c:1.4 xc/lib/X11/SetFunc.c:1.5 --- xc/lib/X11/SetFunc.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetFunc.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetFunc.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetFunc.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetFunc.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetGetCols.c diff -u xc/lib/X11/SetGetCols.c:1.2 xc/lib/X11/SetGetCols.c:1.3 --- xc/lib/X11/SetGetCols.c:1.2 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/SetGetCols.c Mon Jan 9 09:58:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: SetGetCols.c,v 1.3 2000/08/17 19:44:54 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/SetGetCols.c,v 1.2 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetGetCols.c,v 1.3 2006/01/09 14:58:34 dawes Exp $ */ /* * EXTERNAL INCLUDES Index: xc/lib/X11/SetHints.c diff -u xc/lib/X11/SetHints.c:1.5 xc/lib/X11/SetHints.c:1.6 --- xc/lib/X11/SetHints.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/SetHints.c Mon Jan 9 09:58:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: SetHints.c,v 1.5 2001/02/09 02:03:36 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/SetHints.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetHints.c,v 1.6 2006/01/09 14:58:34 dawes Exp $ */ #include #include Index: xc/lib/X11/SetIFocus.c diff -u xc/lib/X11/SetIFocus.c:1.4 xc/lib/X11/SetIFocus.c:1.5 --- xc/lib/X11/SetIFocus.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetIFocus.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetIFocus.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetIFocus.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetIFocus.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetLStyle.c diff -u xc/lib/X11/SetLStyle.c:1.4 xc/lib/X11/SetLStyle.c:1.5 --- xc/lib/X11/SetLStyle.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetLStyle.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetLStyle.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetLStyle.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetLStyle.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetLocale.c diff -u xc/lib/X11/SetLocale.c:3.21 xc/lib/X11/SetLocale.c:3.22 --- xc/lib/X11/SetLocale.c:3.21 Tue Feb 10 19:30:44 2004 +++ xc/lib/X11/SetLocale.c Mon Jan 9 09:58:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ - /* * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation, * and Nippon Telegraph and Telephone Corporation @@ -55,7 +53,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/SetLocale.c,v 3.21 2004/02/11 00:30:44 torrey Exp $ */ +/* $XFree86: xc/lib/X11/SetLocale.c,v 3.22 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/SetNrmHint.c diff -u xc/lib/X11/SetNrmHint.c:1.2 xc/lib/X11/SetNrmHint.c:1.3 --- xc/lib/X11/SetNrmHint.c:1.2 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetNrmHint.c Mon Jan 9 09:58:34 2006 @@ -1,5 +1,4 @@ -/* $Xorg: SetNrmHint.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/SetNrmHint.c,v 1.3 2006/01/09 14:58:34 dawes Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca, Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, Index: xc/lib/X11/SetPMask.c diff -u xc/lib/X11/SetPMask.c:1.4 xc/lib/X11/SetPMask.c:1.5 --- xc/lib/X11/SetPMask.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetPMask.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetPMask.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetPMask.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetPMask.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetPntMap.c diff -u xc/lib/X11/SetPntMap.c:1.5 xc/lib/X11/SetPntMap.c:1.6 --- xc/lib/X11/SetPntMap.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/SetPntMap.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetPntMap.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetPntMap.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetPntMap.c,v 1.6 2006/01/09 14:58:34 dawes Exp $ */ #define NEED_REPLIES Index: xc/lib/X11/SetRGBCMap.c diff -u xc/lib/X11/SetRGBCMap.c:1.2 xc/lib/X11/SetRGBCMap.c:1.3 --- xc/lib/X11/SetRGBCMap.c:1.2 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetRGBCMap.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,4 @@ -/* $Xorg: SetRGBCMap.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/SetRGBCMap.c,v 1.3 2006/01/09 14:58:34 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group Index: xc/lib/X11/SetSOwner.c diff -u xc/lib/X11/SetSOwner.c:1.4 xc/lib/X11/SetSOwner.c:1.5 --- xc/lib/X11/SetSOwner.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetSOwner.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetSOwner.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetSOwner.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetSOwner.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetSSaver.c diff -u xc/lib/X11/SetSSaver.c:1.4 xc/lib/X11/SetSSaver.c:1.5 --- xc/lib/X11/SetSSaver.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetSSaver.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetSSaver.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetSSaver.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetSSaver.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetStCmap.c diff -u xc/lib/X11/SetStCmap.c:1.2 xc/lib/X11/SetStCmap.c:1.3 --- xc/lib/X11/SetStCmap.c:1.2 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetStCmap.c Mon Jan 9 09:58:34 2006 @@ -1,5 +1,4 @@ -/* $Xorg: SetStCmap.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/SetStCmap.c,v 1.3 2006/01/09 14:58:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group Index: xc/lib/X11/SetState.c diff -u xc/lib/X11/SetState.c:1.4 xc/lib/X11/SetState.c:1.5 --- xc/lib/X11/SetState.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetState.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetState.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetState.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetState.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetStip.c diff -u xc/lib/X11/SetStip.c:1.4 xc/lib/X11/SetStip.c:1.5 --- xc/lib/X11/SetStip.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetStip.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetStip.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetStip.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetStip.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetTSOrig.c diff -u xc/lib/X11/SetTSOrig.c:1.4 xc/lib/X11/SetTSOrig.c:1.5 --- xc/lib/X11/SetTSOrig.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetTSOrig.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetTSOrig.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetTSOrig.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetTSOrig.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetTile.c diff -u xc/lib/X11/SetTile.c:1.4 xc/lib/X11/SetTile.c:1.5 --- xc/lib/X11/SetTile.c:1.4 Fri Dec 14 14:54:06 2001 +++ xc/lib/X11/SetTile.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,3 @@ -/* $Xorg: SetTile.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/SetTile.c,v 1.4 2001/12/14 19:54:06 dawes Exp $ */ +/* $XFree86: xc/lib/X11/SetTile.c,v 1.5 2006/01/09 14:58:34 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/SetTxtProp.c diff -u xc/lib/X11/SetTxtProp.c:1.2 xc/lib/X11/SetTxtProp.c:1.3 --- xc/lib/X11/SetTxtProp.c:1.2 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/SetTxtProp.c Mon Jan 9 09:58:34 2006 @@ -1,4 +1,4 @@ -/* $Xorg: SetTxtProp.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/SetTxtProp.c,v 1.3 2006/01/09 14:58:34 dawes Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca. Index: xc/lib/X11/SetWMCMapW.c diff -u xc/lib/X11/SetWMCMapW.c:1.2 xc/lib/X11/SetWMCMapW.c:1.3 --- xc/lib/X11/SetWMCMapW.c:1.2 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/SetWMCMapW.c Mon Jan 9 09:58:34 2006 @@ -1,5 +1,4 @@ -/* $Xorg: SetWMCMapW.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/SetWMCMapW.c,v 1.3 2006/01/09 14:58:34 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group Index: xc/lib/X11/SetWMProto.c diff -u xc/lib/X11/SetWMProto.c:1.2 xc/lib/X11/SetWMProto.c:1.3 --- xc/lib/X11/SetWMProto.c:1.2 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/SetWMProto.c Mon Jan 9 09:58:35 2006 @@ -1,5 +1,4 @@ -/* $Xorg: SetWMProto.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/SetWMProto.c,v 1.3 2006/01/09 14:58:35 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group Index: xc/lib/X11/StBytes.c diff -u xc/lib/X11/StBytes.c:1.5 xc/lib/X11/StBytes.c:1.6 --- xc/lib/X11/StBytes.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/StBytes.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: StBytes.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StBytes.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StBytes.c,v 1.6 2006/01/09 14:58:35 dawes Exp $ */ #include #include Index: xc/lib/X11/StCol.c diff -u xc/lib/X11/StCol.c:1.4 xc/lib/X11/StCol.c:1.5 --- xc/lib/X11/StCol.c:1.4 Sun Apr 13 15:22:17 2003 +++ xc/lib/X11/StCol.c Mon Jan 9 09:58:35 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StCol.c,v 1.3 2000/08/17 19:44:55 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/StCol.c,v 1.4 2003/04/13 19:22:17 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StCol.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/StColor.c diff -u xc/lib/X11/StColor.c:1.4 xc/lib/X11/StColor.c:1.5 --- xc/lib/X11/StColor.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/StColor.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: StColor.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StColor.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StColor.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/StColors.c diff -u xc/lib/X11/StColors.c:1.4 xc/lib/X11/StColors.c:1.5 --- xc/lib/X11/StColors.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/StColors.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: StColors.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StColors.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StColors.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/StCols.c diff -u xc/lib/X11/StCols.c:1.4 xc/lib/X11/StCols.c:1.5 --- xc/lib/X11/StCols.c:1.4 Sun Apr 13 15:22:18 2003 +++ xc/lib/X11/StCols.c Mon Jan 9 09:58:35 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StCols.c,v 1.3 2000/08/17 19:44:56 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/StCols.c,v 1.4 2003/04/13 19:22:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StCols.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/StNColor.c diff -u xc/lib/X11/StNColor.c:1.6 xc/lib/X11/StNColor.c:1.7 --- xc/lib/X11/StNColor.c:1.6 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/StNColor.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: StNColor.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StNColor.c,v 1.6 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StNColor.c,v 1.7 2006/01/09 14:58:35 dawes Exp $ */ #include #include "Xlibint.h" Index: xc/lib/X11/StName.c diff -u xc/lib/X11/StName.c:1.5 xc/lib/X11/StName.c:1.6 --- xc/lib/X11/StName.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/StName.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: StName.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StName.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StName.c,v 1.6 2006/01/09 14:58:35 dawes Exp $ */ #include #include Index: xc/lib/X11/StrKeysym.c diff -u xc/lib/X11/StrKeysym.c:3.8 xc/lib/X11/StrKeysym.c:3.9 --- xc/lib/X11/StrKeysym.c:3.8 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/StrKeysym.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: StrKeysym.c,v 1.5 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1990, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/StrKeysym.c,v 3.8 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/StrKeysym.c,v 3.9 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" #include Index: xc/lib/X11/StrToText.c diff -u xc/lib/X11/StrToText.c:1.2 xc/lib/X11/StrToText.c:1.3 --- xc/lib/X11/StrToText.c:1.2 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/StrToText.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,4 @@ -/* $Xorg: StrToText.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/StrToText.c,v 1.3 2006/01/09 14:58:35 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group Index: xc/lib/X11/Sync.c diff -u xc/lib/X11/Sync.c:1.4 xc/lib/X11/Sync.c:1.5 --- xc/lib/X11/Sync.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/Sync.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Sync.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Sync.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Sync.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS Index: xc/lib/X11/Synchro.c diff -u xc/lib/X11/Synchro.c:1.4 xc/lib/X11/Synchro.c:1.5 --- xc/lib/X11/Synchro.c:1.4 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/Synchro.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Synchro.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Synchro.c,v 1.4 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Synchro.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Text.c diff -u xc/lib/X11/Text.c:1.5 xc/lib/X11/Text.c:1.6 --- xc/lib/X11/Text.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/Text.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Text.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Text.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Text.c,v 1.6 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Text16.c diff -u xc/lib/X11/Text16.c:1.6 xc/lib/X11/Text16.c:1.7 --- xc/lib/X11/Text16.c:1.6 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/Text16.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Text16.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Text16.c,v 1.6 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Text16.c,v 1.7 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/TextExt.c diff -u xc/lib/X11/TextExt.c:1.5 xc/lib/X11/TextExt.c:1.6 --- xc/lib/X11/TextExt.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/TextExt.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: TextExt.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/TextExt.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/TextExt.c,v 1.6 2006/01/09 14:58:35 dawes Exp $ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint Index: xc/lib/X11/TextExt16.c diff -u xc/lib/X11/TextExt16.c:1.5 xc/lib/X11/TextExt16.c:1.6 --- xc/lib/X11/TextExt16.c:1.5 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/TextExt16.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: TextExt16.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/TextExt16.c,v 1.5 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/TextExt16.c,v 1.6 2006/01/09 14:58:35 dawes Exp $ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint Index: xc/lib/X11/TextToStr.c diff -u xc/lib/X11/TextToStr.c:1.5 xc/lib/X11/TextToStr.c:1.6 --- xc/lib/X11/TextToStr.c:1.5 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/TextToStr.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: TextToStr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ */ -/* $XFree86: xc/lib/X11/TextToStr.c,v 1.5 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/TextToStr.c,v 1.6 2006/01/09 14:58:35 dawes Exp $ */ #include #include Index: xc/lib/X11/TrCoords.c diff -u xc/lib/X11/TrCoords.c:1.2 xc/lib/X11/TrCoords.c:1.3 --- xc/lib/X11/TrCoords.c:1.2 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/TrCoords.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,4 @@ -/* $Xorg: TrCoords.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/TrCoords.c,v 1.3 2006/01/09 14:58:35 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/UNDEFINED.c diff -u xc/lib/X11/UNDEFINED.c:1.2 xc/lib/X11/UNDEFINED.c:1.3 --- xc/lib/X11/UNDEFINED.c:1.2 Sun Apr 13 15:22:18 2003 +++ xc/lib/X11/UNDEFINED.c Mon Jan 9 09:58:35 2006 @@ -1,5 +1,3 @@ -/* $Xorg: UNDEFINED.c,v 1.3 2000/08/17 19:44:57 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -33,7 +31,7 @@ * * */ -/* $XFree86: xc/lib/X11/UNDEFINED.c,v 1.2 2003/04/13 19:22:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UNDEFINED.c,v 1.3 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/UndefCurs.c diff -u xc/lib/X11/UndefCurs.c:1.4 xc/lib/X11/UndefCurs.c:1.5 --- xc/lib/X11/UndefCurs.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/UndefCurs.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: UndefCurs.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UndefCurs.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UndefCurs.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/UngrabBut.c diff -u xc/lib/X11/UngrabBut.c:1.4 xc/lib/X11/UngrabBut.c:1.5 --- xc/lib/X11/UngrabBut.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/UngrabBut.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: UngrabBut.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UngrabBut.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UngrabBut.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/UngrabKbd.c diff -u xc/lib/X11/UngrabKbd.c:1.4 xc/lib/X11/UngrabKbd.c:1.5 --- xc/lib/X11/UngrabKbd.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/UngrabKbd.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: UngrabKbd.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UngrabKbd.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UngrabKbd.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/UngrabKey.c diff -u xc/lib/X11/UngrabKey.c:1.4 xc/lib/X11/UngrabKey.c:1.5 --- xc/lib/X11/UngrabKey.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/UngrabKey.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: UngrabKey.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UngrabKey.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UngrabKey.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/UngrabPtr.c diff -u xc/lib/X11/UngrabPtr.c:1.4 xc/lib/X11/UngrabPtr.c:1.5 --- xc/lib/X11/UngrabPtr.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/UngrabPtr.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: UngrabPtr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UngrabPtr.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UngrabPtr.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/UngrabSvr.c diff -u xc/lib/X11/UngrabSvr.c:1.4 xc/lib/X11/UngrabSvr.c:1.5 --- xc/lib/X11/UngrabSvr.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/UngrabSvr.c Mon Jan 9 09:58:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: UngrabSvr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UngrabSvr.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UngrabSvr.c,v 1.5 2006/01/09 14:58:35 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/UninsCmap.c diff -u xc/lib/X11/UninsCmap.c:1.4 xc/lib/X11/UninsCmap.c:1.5 --- xc/lib/X11/UninsCmap.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/UninsCmap.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: UninsCmap.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UninsCmap.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UninsCmap.c,v 1.5 2006/01/09 14:58:36 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/UnldFont.c diff -u xc/lib/X11/UnldFont.c:1.6 xc/lib/X11/UnldFont.c:1.7 --- xc/lib/X11/UnldFont.c:1.6 Wed Dec 19 10:37:57 2001 +++ xc/lib/X11/UnldFont.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: UnldFont.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UnldFont.c,v 1.6 2001/12/19 15:37:57 tsi Exp $ */ +/* $XFree86: xc/lib/X11/UnldFont.c,v 1.7 2006/01/09 14:58:36 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/UnmapSubs.c diff -u xc/lib/X11/UnmapSubs.c:1.4 xc/lib/X11/UnmapSubs.c:1.5 --- xc/lib/X11/UnmapSubs.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/UnmapSubs.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: UnmapSubs.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UnmapSubs.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UnmapSubs.c,v 1.5 2006/01/09 14:58:36 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/UnmapWin.c diff -u xc/lib/X11/UnmapWin.c:1.4 xc/lib/X11/UnmapWin.c:1.5 --- xc/lib/X11/UnmapWin.c:1.4 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/UnmapWin.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: UnmapWin.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/UnmapWin.c,v 1.4 2001/12/14 19:54:07 dawes Exp $ */ +/* $XFree86: xc/lib/X11/UnmapWin.c,v 1.5 2006/01/09 14:58:36 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/VisUtil.c diff -u xc/lib/X11/VisUtil.c:1.2 xc/lib/X11/VisUtil.c:1.3 --- xc/lib/X11/VisUtil.c:1.2 Fri Dec 14 14:54:07 2001 +++ xc/lib/X11/VisUtil.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,4 @@ -/* $Xorg: VisUtil.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/VisUtil.c,v 1.3 2006/01/09 14:58:36 dawes Exp $ */ /* Copyright 1986, 1998 The Open Group Index: xc/lib/X11/WMGeom.c diff -u xc/lib/X11/WMGeom.c:1.4 xc/lib/X11/WMGeom.c:1.5 --- xc/lib/X11/WMGeom.c:1.4 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/WMGeom.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: WMGeom.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/WMGeom.c,v 1.4 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WMGeom.c,v 1.5 2006/01/09 14:58:36 dawes Exp $ */ #include "Xlibint.h" #include "Xutil.h" Index: xc/lib/X11/WMProps.c diff -u xc/lib/X11/WMProps.c:3.7 xc/lib/X11/WMProps.c:3.8 --- xc/lib/X11/WMProps.c:3.7 Fri May 31 14:45:41 2002 +++ xc/lib/X11/WMProps.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: WMProps.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1987, 1988, 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/WMProps.c,v 3.7 2002/05/31 18:45:41 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WMProps.c,v 3.8 2006/01/09 14:58:36 dawes Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca., Index: xc/lib/X11/WarpPtr.c diff -u xc/lib/X11/WarpPtr.c:1.4 xc/lib/X11/WarpPtr.c:1.5 --- xc/lib/X11/WarpPtr.c:1.4 Fri Dec 14 14:54:08 2001 +++ xc/lib/X11/WarpPtr.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: WarpPtr.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/WarpPtr.c,v 1.4 2001/12/14 19:54:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WarpPtr.c,v 1.5 2006/01/09 14:58:36 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/WinEvent.c diff -u xc/lib/X11/WinEvent.c:3.6 xc/lib/X11/WinEvent.c:3.7 --- xc/lib/X11/WinEvent.c:3.6 Fri Dec 14 14:54:08 2001 +++ xc/lib/X11/WinEvent.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: WinEvent.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1985, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/WinEvent.c,v 3.6 2001/12/14 19:54:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WinEvent.c,v 3.7 2006/01/09 14:58:36 dawes Exp $ */ #define NEED_EVENTS #include "Xlibint.h" Index: xc/lib/X11/Window.c diff -u xc/lib/X11/Window.c:1.5 xc/lib/X11/Window.c:1.6 --- xc/lib/X11/Window.c:1.5 Sun Apr 13 15:22:18 2003 +++ xc/lib/X11/Window.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Window.c,v 1.5 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Window.c,v 1.5 2003/04/13 19:22:18 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Window.c,v 1.6 2006/01/09 14:58:36 dawes Exp $ */ #include "Xlibint.h" Index: xc/lib/X11/Withdraw.c diff -u xc/lib/X11/Withdraw.c:1.2 xc/lib/X11/Withdraw.c:1.3 --- xc/lib/X11/Withdraw.c:1.2 Fri Dec 14 14:54:08 2001 +++ xc/lib/X11/Withdraw.c Mon Jan 9 09:58:36 2006 @@ -1,5 +1,4 @@ -/* $Xorg: Withdraw.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/Withdraw.c,v 1.3 2006/01/09 14:58:36 dawes Exp $ */ /*********************************************************** Copyright 1988 by Wyse Technology, Inc., San Jose, Ca., Index: xc/lib/X11/WrBitF.c diff -u xc/lib/X11/WrBitF.c:3.7 xc/lib/X11/WrBitF.c:3.8 --- xc/lib/X11/WrBitF.c:3.7 Mon Nov 17 17:20:08 2003 +++ xc/lib/X11/WrBitF.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: WrBitF.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/WrBitF.c,v 3.7 2003/11/17 22:20:08 dawes Exp $ */ +/* $XFree86: xc/lib/X11/WrBitF.c,v 3.8 2006/01/09 14:58:36 dawes Exp $ */ #include "Xlibint.h" #include Index: xc/lib/X11/X11-def.cpp diff -u xc/lib/X11/X11-def.cpp:1.16 xc/lib/X11/X11-def.cpp:1.17 --- xc/lib/X11/X11-def.cpp:1.16 Wed May 5 21:17:29 2004 +++ xc/lib/X11/X11-def.cpp Mon Jan 9 09:58:36 2006 @@ -1194,5 +1194,4 @@ __XOS2RedirRoot1 #endif -/* $Xorg: X11-def.cpp,v 1.3 2000/08/17 19:44:59 cpqbld Exp $ */ -/* $XFree86: xc/lib/X11/X11-def.cpp,v 1.16 2004/05/06 01:17:29 dawes Exp $ */ +/* $XFree86: xc/lib/X11/X11-def.cpp,v 1.17 2006/01/09 14:58:36 dawes Exp $ */ Index: xc/lib/X11/XErrorDB diff -u xc/lib/X11/XErrorDB:3.41 xc/lib/X11/XErrorDB:3.43 --- xc/lib/X11/XErrorDB:3.41 Sat Dec 21 19:46:50 2002 +++ xc/lib/X11/XErrorDB Fri Mar 17 17:05:04 2006 @@ -1,4 +1,3 @@ -! $Xorg: XErrorDB,v 1.3 2000/08/17 19:44:59 cpqbld Exp $ ! Copyright 1993, 1995, 1998 The Open Group ! Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +22,7 @@ ! other dealings in this Software without prior written authorization ! from The Open Group. ! -! $XFree86: xc/lib/X11/XErrorDB,v 3.41 2002/12/22 00:46:50 dawes Exp $ +! $XFree86: xc/lib/X11/XErrorDB,v 3.43 2006/03/17 22:05:04 dawes Exp $ ! ! these are used in XGetErrorMessage. XlibMessage.XError: X Error of failed request @@ -774,45 +773,45 @@ XRequest.XINERAMA.4: XINERAMAIsActive XRequest.XINERAMA.5: XINERAMAQueryScreens ! XF86Rush extension, not a standard spec -Xrequest.XFree86-Rush.0: XF86RushQueryVersion -Xrequest.XFree86-Rush.1: XF86RushLockPixmap -Xrequest.XFree86-Rush.2: XF86RushUnlockPixmap -Xrequest.XFree86-Rush.3: XF86RushUnlockAllPixmaps -Xrequest.XFree86-Rush.4: XF86RushGetCopyMode -Xrequest.XFree86-Rush.5: XF86RushSetCopyMode -Xrequest.XFree86-Rush.6: XF86RushGetPixelStride -Xrequest.XFree86-Rush.7: XF86RushSetPixelStride -Xrequest.XFree86-Rush.8: XF86RushOverlayPixmap -Xrequest.XFree86-Rush.9: XF86RushStatusRegOffset -Xrequest.XFree86-Rush.10: XF86RushAT3DEnableRegs -Xrequest.XFree86-Rush.11: XF86RushAT3DDisableRegs +XRequest.XFree86-Rush.0: XF86RushQueryVersion +XRequest.XFree86-Rush.1: XF86RushLockPixmap +XRequest.XFree86-Rush.2: XF86RushUnlockPixmap +XRequest.XFree86-Rush.3: XF86RushUnlockAllPixmaps +XRequest.XFree86-Rush.4: XF86RushGetCopyMode +XRequest.XFree86-Rush.5: XF86RushSetCopyMode +XRequest.XFree86-Rush.6: XF86RushGetPixelStride +XRequest.XFree86-Rush.7: XF86RushSetPixelStride +XRequest.XFree86-Rush.8: XF86RushOverlayPixmap +XRequest.XFree86-Rush.9: XF86RushStatusRegOffset +XRequest.XFree86-Rush.10: XF86RushAT3DEnableRegs +XRequest.XFree86-Rush.11: XF86RushAT3DDisableRegs ! XVideo -Xrequest.XVideo.0: XvQueryExtension -Xrequest.XVideo.1: XvQueryAdaptors -Xrequest.XVideo.2: XvQueryEncodings -Xrequest.XVideo.3: XvGrabPort -Xrequest.XVideo.4: XvUngrabPort -Xrequest.XVideo.5: XvPutVideo -Xrequest.XVideo.6: XvPutStill -Xrequest.XVideo.7: XvGetVideo -Xrequest.XVideo.8: XvGetStill -Xrequest.XVideo.9: XvStopVideo -Xrequest.XVideo.10: XvSelectVideoNotify -Xrequest.XVideo.11: XvSelectPortNotify -Xrequest.XVideo.12: XvQueryBestSize -Xrequest.XVideo.13: XvSetPortAttribute -Xrequest.XVideo.14: XvGetPortAttribute -Xrequest.XVideo.15: XvQueryPortAttributes -Xrequest.XVideo.16: XvListImageFormats -Xrequest.XVideo.17: XvQueryImageAttributes -Xrequest.XVideo.18: XvPutImage -Xrequest.XVideo.19: XvShmPutImage +XRequest.XVideo.0: XvQueryExtension +XRequest.XVideo.1: XvQueryAdaptors +XRequest.XVideo.2: XvQueryEncodings +XRequest.XVideo.3: XvGrabPort +XRequest.XVideo.4: XvUngrabPort +XRequest.XVideo.5: XvPutVideo +XRequest.XVideo.6: XvPutStill +XRequest.XVideo.7: XvGetVideo +XRequest.XVideo.8: XvGetStill +XRequest.XVideo.9: XvStopVideo +XRequest.XVideo.10: XvSelectVideoNotify +XRequest.XVideo.11: XvSelectPortNotify +XRequest.XVideo.12: XvQueryBestSize +XRequest.XVideo.13: XvSetPortAttribute +XRequest.XVideo.14: XvGetPortAttribute +XRequest.XVideo.15: XvQueryPortAttributes +XRequest.XVideo.16: XvListImageFormats +XRequest.XVideo.17: XvQueryImageAttributes +XRequest.XVideo.18: XvPutImage +XRequest.XVideo.19: XvShmPutImage XProtoError.XVideo.0: XvBadPort XProtoError.XVideo.1: XvBadEncoding XProtoError.XVideo.2: XvBadControl ! XFree86-Bigfont -Xrequest.XFree86-Bigfont.0: XF86BigfontQueryVersion -Xrequest.XFree86-Bigfont.1: XF86BigfontQueryFont +XRequest.XFree86-Bigfont.0: XF86BigfontQueryVersion +XRequest.XFree86-Bigfont.1: XF86BigfontQueryFont ! Adobe-DPS-Extension, not a standard XRequest.Adobe-DPS-Extension.1: PSInit XRequest.Adobe-DPS-Extension.2: PSCreateContext Index: xc/lib/X11/XKB.c diff -u xc/lib/X11/XKB.c:1.10 xc/lib/X11/XKB.c:1.11 --- xc/lib/X11/XKB.c:1.10 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKB.c Mon Jan 9 09:58:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKB.c,v 1.3 2000/08/17 19:44:59 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKB.c,v 1.10 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKB.c,v 1.11 2006/01/09 14:58:36 dawes Exp $ */ #include #define NEED_REPLIES Index: xc/lib/X11/XKBAlloc.c diff -u xc/lib/X11/XKBAlloc.c:3.6 xc/lib/X11/XKBAlloc.c:3.7 --- xc/lib/X11/XKBAlloc.c:3.6 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBAlloc.c Fri Oct 14 11:15:59 2005 @@ -1,4 +1,4 @@ -/* $Xorg: XKBAlloc.c,v 1.4 2000/08/17 19:44:59 cpqbld Exp $ */ +/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.7 2005/10/14 15:15:59 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBAlloc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */ #ifndef XKB_IN_SERVER @@ -40,14 +39,14 @@ #else #include -#include "X.h" +#include #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" -#include "XKBgeom.h" +#include +#include #endif /* XKB_IN_SERVER */ Index: xc/lib/X11/XKBBell.c diff -u xc/lib/X11/XKBBell.c:1.2 xc/lib/X11/XKBBell.c:1.3 --- xc/lib/X11/XKBBell.c:1.2 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBBell.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBBell.c,v 1.3 2000/08/17 19:45:00 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBBell.c,v 1.2 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBBell.c,v 1.3 2006/01/09 14:58:37 dawes Exp $ */ #include #define NEED_REPLIES Index: xc/lib/X11/XKBBind.c diff -u xc/lib/X11/XKBBind.c:3.20 xc/lib/X11/XKBBind.c:3.21 --- xc/lib/X11/XKBBind.c:3.20 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBBind.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBBind.c,v 1.4 2001/02/09 02:03:37 xorgcvs Exp $ */ /* Copyright 1985, 1987, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/XKBBind.c,v 3.20 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBBind.c,v 3.21 2006/01/09 14:58:37 dawes Exp $ */ /* the new monsters ate the old ones */ Index: xc/lib/X11/XKBCompat.c diff -u xc/lib/X11/XKBCompat.c:3.2 xc/lib/X11/XKBCompat.c:3.3 --- xc/lib/X11/XKBCompat.c:3.2 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBCompat.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBCompat.c,v 1.3 2000/08/17 19:45:00 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBCompat.c,v 3.2 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBCompat.c,v 3.3 2006/01/09 14:58:37 dawes Exp $ */ #include #define NEED_REPLIES Index: xc/lib/X11/XKBCtrls.c diff -u xc/lib/X11/XKBCtrls.c:1.5 xc/lib/X11/XKBCtrls.c:1.6 --- xc/lib/X11/XKBCtrls.c:1.5 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBCtrls.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBCtrls.c,v 1.3 2000/08/17 19:45:00 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBCtrls.c,v 1.5 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBCtrls.c,v 1.6 2006/01/09 14:58:37 dawes Exp $ */ #include #define NEED_REPLIES Index: xc/lib/X11/XKBCvt.c diff -u xc/lib/X11/XKBCvt.c:3.35 xc/lib/X11/XKBCvt.c:3.36 --- xc/lib/X11/XKBCvt.c:3.35 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBCvt.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBCvt.c,v 1.5 2001/02/09 02:03:38 xorgcvs Exp $ */ /* Copyright 1988, 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.35 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBCvt.c,v 3.36 2006/01/09 14:58:37 dawes Exp $ */ #include #include Index: xc/lib/X11/XKBExtDev.c diff -u xc/lib/X11/XKBExtDev.c:3.5 xc/lib/X11/XKBExtDev.c:3.6 --- xc/lib/X11/XKBExtDev.c:3.5 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBExtDev.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBExtDev.c,v 1.3 2000/08/17 19:45:01 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBExtDev.c,v 3.5 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBExtDev.c,v 3.6 2006/01/09 14:58:37 dawes Exp $ */ #include #define NEED_REPLIES Index: xc/lib/X11/XKBGAlloc.c diff -u xc/lib/X11/XKBGAlloc.c:3.5 xc/lib/X11/XKBGAlloc.c:3.6 --- xc/lib/X11/XKBGAlloc.c:3.5 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBGAlloc.c Fri Oct 14 11:15:59 2005 @@ -1,4 +1,4 @@ -/* $Xorg: XKBGAlloc.c,v 1.3 2000/08/17 19:45:01 cpqbld Exp $ */ +/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.6 2005/10/14 15:15:59 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBGAlloc.c,v 3.5 2003/11/17 22:20:09 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES @@ -40,12 +39,12 @@ #else #include -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "inputstr.h" -#include "XKBsrv.h" -#include "XKBgeom.h" +#include +#include #endif /* XKB_IN_SERVER */ Index: xc/lib/X11/XKBGeom.c diff -u xc/lib/X11/XKBGeom.c:1.6 xc/lib/X11/XKBGeom.c:1.7 --- xc/lib/X11/XKBGeom.c:1.6 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBGeom.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBGeom.c,v 1.4 2000/08/17 19:45:01 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBGeom.c,v 1.6 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBGeom.c,v 1.7 2006/01/09 14:58:37 dawes Exp $ */ #ifdef DEBUG #include Index: xc/lib/X11/XKBGetByName.c diff -u xc/lib/X11/XKBGetByName.c:1.2 xc/lib/X11/XKBGetByName.c:1.3 --- xc/lib/X11/XKBGetByName.c:1.2 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBGetByName.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBGetByName.c,v 1.3 2000/08/17 19:45:02 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBGetByName.c,v 1.2 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBGetByName.c,v 1.3 2006/01/09 14:58:37 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS Index: xc/lib/X11/XKBGetMap.c diff -u xc/lib/X11/XKBGetMap.c:1.10 xc/lib/X11/XKBGetMap.c:1.11 --- xc/lib/X11/XKBGetMap.c:1.10 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBGetMap.c Tue Jun 14 21:02:07 2005 @@ -1,4 +1,3 @@ -/* $Xorg: XKBGetMap.c,v 1.4 2000/08/17 19:45:02 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -25,7 +24,55 @@ ********************************************************/ -/* $XFree86: xc/lib/X11/XKBGetMap.c,v 1.10 2003/11/17 22:20:09 dawes Exp $ */ +/* + * Copyright (c) 2005 by The XFree86 Project, Inc. + * Copyright (c) 2005 by Michal Maruska. + * 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* $XFree86: xc/lib/X11/XKBGetMap.c,v 1.11 2005/06/15 01:02:07 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS @@ -150,6 +197,7 @@ register int i; XkbClientMapPtr map; + if (rep->totalSyms > 0) { map= xkb->map; if (map->key_sym_map==NULL) { register int offset; @@ -236,7 +284,8 @@ oldMap->width = newMap->width; } } - return Success; + } + return Success; } static Status @@ -249,7 +298,9 @@ Status ret = Success; if ( (nKeyActs=rep->nKeyActs)>0 ) { +#if 0 XkbSymMapPtr symMap; +#endif if (nKeyActs < sizeof numDescBuf) numDesc = numDescBuf; else numDesc = Xmalloc (nKeyActs * sizeof(CARD8)); @@ -263,8 +314,19 @@ ret = BadLength; goto done; } +#if 0 + /* + * mmc: This probably should check that the number of actions & + * keysyms is the same for each keycode. + * But for now it doesn't, so I disable it. + */ symMap = &info->map->key_sym_map[rep->firstKeyAct]; - for (i=0;i<(int)rep->nKeyActs;i++,symMap++) { +#endif + for (i=0;i<(int)rep->nKeyActs;i++ +#if 0 + ,symMap++ +#endif + ) { if (numDesc[i]==0) { info->server->key_acts[i+rep->firstKeyAct]= 0; } @@ -478,7 +540,7 @@ } extraData= (int)(rep->length*4); extraData-= (SIZEOF(xkbGetMapReply)-SIZEOF(xGenericReply)); - if (rep->length) { + if (extraData) { XkbReadBufferRec buf; int left; if (_XkbInitReadBuffer(dpy,&buf,extraData)) { @@ -683,6 +745,8 @@ req = _XkbGetGetMapReq(dpy, xkb); req->virtualMods = which; + /* mmc: We want this information, so the mask must be set! */ + req->partial = XkbVirtualModsMask; status= _XkbHandleGetMapReply(dpy, xkb); UnlockDisplay(dpy); @@ -740,6 +804,7 @@ req = _XkbGetGetMapReq(dpy, xkb); req->firstModMapKey = first; req->nModMapKeys = num; + req->partial = XkbModifierMapMask; /* mmc: Once again (see above). */ if ((xkb!=NULL) && (xkb->map!=NULL) && (xkb->map->modmap!=NULL)) { if ((num>0)&&(first>=xkb->min_key_code)&&(first+num<=xkb->max_key_code)) bzero(&xkb->map->modmap[first],num); @@ -767,9 +832,10 @@ LockDisplay(dpy); req = _XkbGetGetMapReq(dpy, xkb); + req->partial = XkbVirtualModMapMask; req->firstVModMapKey = first; req->nVModMapKeys = num; - if ((xkb!=NULL) && (xkb->map!=NULL) && (xkb->map->modmap!=NULL)) { + if ((xkb!=NULL) && (xkb->server!=NULL) && (xkb->server->vmodmap!=NULL)) { if ((num>0)&&(first>=xkb->min_key_code)&&(first+num<=xkb->max_key_code)) bzero(&xkb->server->vmodmap[first],num*sizeof(unsigned short)); } Index: xc/lib/X11/XKBList.c diff -u xc/lib/X11/XKBList.c:1.2 xc/lib/X11/XKBList.c:1.3 --- xc/lib/X11/XKBList.c:1.2 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBList.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBList.c,v 1.3 2000/08/17 19:45:02 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBList.c,v 1.2 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBList.c,v 1.3 2006/01/09 14:58:37 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS Index: xc/lib/X11/XKBMAlloc.c diff -u xc/lib/X11/XKBMAlloc.c:3.12 xc/lib/X11/XKBMAlloc.c:3.14 --- xc/lib/X11/XKBMAlloc.c:3.12 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBMAlloc.c Fri Oct 14 11:15:59 2005 @@ -1,4 +1,3 @@ -/* $Xorg: XKBMAlloc.c,v 1.4 2000/08/17 19:45:02 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,55 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.12 2003/11/17 22:20:09 dawes Exp $ */ +/* + * Copyright (c) 2005 by The XFree86 Project, Inc. + * Copyright (c) 2005 by Michal Maruska. + * 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* $XFree86: xc/lib/X11/XKBMAlloc.c,v 3.14 2005/10/14 15:15:59 tsi Exp $ */ #ifndef XKB_IN_SERVER @@ -39,15 +86,15 @@ #else #include -#include "X.h" +#include #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #endif /* XKB_IN_SERVER */ @@ -363,7 +410,7 @@ Status XkbResizeKeyType( XkbDescPtr xkb, int type_ndx, - int map_count, + int map_count, /* number of mappings: modifier-set -> level */ Bool want_preserve, int new_num_lvls) { @@ -596,6 +643,7 @@ int nCopy; nCopy= nKeySyms= XkbKeyNumSyms(xkb,i); + /* i could invert these following 2 IFs: */ if ((nKeySyms==0)&&(i!=key)) continue; if (i==key) @@ -610,6 +658,25 @@ _XkbFree(xkb->map->syms); xkb->map->syms = newSyms; xkb->map->num_syms = nSyms; + + + /* + * mmc: We grow the table when needed, and never shrink it. + * So i decided to test & shrink here: + */ + + if (xkb->map->size_syms > 2 * xkb->map->num_syms + 64) { +#ifdef XKB_IN_SERVER +#ifdef DEBUG + ErrorF("%s: reduction! %d ->%d\n", __FUNCTION__, xkb->map->size_syms, 2 * xkb->map->num_syms + 64); +#endif +#endif + xkb->map->size_syms = 2 * xkb->map->num_syms + 64; + /* xkb->map->num_syms remains! */ + /* todo: if this fails....!! hopefully never, we just shrink. */ + xkb->map->syms = _XkbTypedRealloc(xkb->map->syms, xkb->map->size_syms, + KeySym); + } return &xkb->map->syms[xkb->map->key_sym_map[key].offset]; } @@ -702,7 +769,7 @@ if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, XkbVirtualModMapMask,minKC, - &changes->map.first_modmap_key, + &changes->map.first_vmodmap_key, &changes->map.num_vmodmap_keys); } } @@ -732,7 +799,7 @@ _XkbFree(prev_key_sym_map); return BadAlloc; } - bzero((char *)&xkb->map->key_sym_map[xkb->max_key_code], + bzero((char *)&xkb->map->key_sym_map[xkb->max_key_code+1], tmp*sizeof(XkbSymMapRec)); if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, @@ -750,7 +817,7 @@ _XkbFree(prev_modmap); return BadAlloc; } - bzero((char *)&xkb->map->modmap[xkb->max_key_code],tmp); + bzero((char *)&xkb->map->modmap[xkb->max_key_code + 1],tmp); if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, XkbModifierMapMask,maxKC, @@ -769,7 +836,7 @@ _XkbFree(prev_behaviors); return BadAlloc; } - bzero((char *)&xkb->server->behaviors[xkb->max_key_code], + bzero((char *)&xkb->server->behaviors[xkb->max_key_code +1], tmp*sizeof(XkbBehavior)); if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, @@ -787,7 +854,7 @@ _XkbFree(prev_key_acts); return BadAlloc; } - bzero((char *)&xkb->server->key_acts[xkb->max_key_code], + bzero((char *)&xkb->server->key_acts[xkb->max_key_code + 1], tmp*sizeof(unsigned short)); if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, @@ -805,15 +872,34 @@ _XkbFree(prev_vmodmap); return BadAlloc; } - bzero((char *)&xkb->server->vmodmap[xkb->max_key_code], + bzero((char *)&xkb->server->vmodmap[xkb->max_key_code + 1], tmp*sizeof(unsigned short)); if (changes) { changes->map.changed= _ExtendRange(changes->map.changed, XkbVirtualModMapMask,maxKC, - &changes->map.first_modmap_key, + &changes->map.first_vmodmap_key, &changes->map.num_vmodmap_keys); } } + /* mmc: We have to resize server->explicit too. */ + if (xkb->server->explicit) { + unsigned char *prev_explicit = xkb->server->explicit; + xkb->server->explicit= _XkbTypedRealloc(xkb->server->explicit, + (maxKC+1),unsigned char); + if (!xkb->server->explicit) { + _XkbFree(prev_explicit); + return BadAlloc; + } + bzero((char *)&xkb->server->explicit[xkb->max_key_code + 1], + tmp*sizeof(unsigned char)); + if (changes) { + changes->map.changed= _ExtendRange(changes->map.changed, + XkbExplicitComponentsMask,maxKC, + /* ???? */ + &changes->map.first_key_explicit, + &changes->map.num_key_explicit); + } + } } if ((xkb->names)&&(xkb->names->keys)) { XkbKeyNameRec *prev_keys = xkb->names->keys; @@ -824,7 +910,7 @@ _XkbFree(prev_keys); return BadAlloc; } - bzero((char *)&xkb->names->keys[xkb->max_key_code], + bzero((char *)&xkb->names->keys[xkb->max_key_code +1], tmp*sizeof(XkbKeyNameRec)); if (changes) { changes->names.changed= _ExtendRange(changes->names.changed, @@ -885,6 +971,25 @@ _XkbFree(xkb->server->acts); xkb->server->acts = newActs; xkb->server->num_acts= nActs; + + /* + * mmc: Again (see above for keysyms), we grow the table when needed, + * and never shrink it. So i decided to test & shrink here: + */ + if (xkb->server->size_acts > 2 * xkb->server->num_acts + 64) { +#ifdef XKB_IN_SERVER +#ifdef DEBUG + ErrorF("%s: reduction! %d ->%d\n", __FUNCTION__, + xkb->server->size_acts, 2 * xkb->server->num_acts + 64); +#endif +#endif + xkb->server->size_acts = 2 * xkb->server->num_acts + 64; + + /* xkb->server->num_acts remains! */ + /* fixme: if this fails....! */ + xkb->server->acts = _XkbTypedRealloc(xkb->server->acts, + xkb->server->size_acts, XkbAction); + } return &xkb->server->acts[xkb->server->key_acts[key]]; } Index: xc/lib/X11/XKBMisc.c diff -u xc/lib/X11/XKBMisc.c:3.6 xc/lib/X11/XKBMisc.c:3.7 --- xc/lib/X11/XKBMisc.c:3.6 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBMisc.c Fri Oct 14 11:15:59 2005 @@ -1,4 +1,4 @@ -/* $Xorg: XKBMisc.c,v 1.4 2000/08/17 19:45:02 cpqbld Exp $ */ +/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.7 2005/10/14 15:15:59 tsi Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */ #ifndef XKB_IN_SERVER @@ -39,15 +38,15 @@ #else #include -#include "X.h" +#include #define NEED_EVENTS #define NEED_REPLIES -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #endif /* XKB_IN_SERVER */ Index: xc/lib/X11/XKBNames.c diff -u xc/lib/X11/XKBNames.c:1.6 xc/lib/X11/XKBNames.c:1.7 --- xc/lib/X11/XKBNames.c:1.6 Mon Nov 17 17:20:09 2003 +++ xc/lib/X11/XKBNames.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBNames.c,v 1.3 2000/08/17 19:45:02 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBNames.c,v 1.6 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBNames.c,v 1.7 2006/01/09 14:58:37 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS Index: xc/lib/X11/XKBRdBuf.c diff -u xc/lib/X11/XKBRdBuf.c:1.3 xc/lib/X11/XKBRdBuf.c:1.4 --- xc/lib/X11/XKBRdBuf.c:1.3 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XKBRdBuf.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBRdBuf.c,v 1.3 2000/08/17 19:45:02 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBRdBuf.c,v 1.3 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBRdBuf.c,v 1.4 2006/01/09 14:58:37 dawes Exp $ */ #include #define NEED_REPLIES Index: xc/lib/X11/XKBSetGeom.c diff -u xc/lib/X11/XKBSetGeom.c:3.6 xc/lib/X11/XKBSetGeom.c:3.7 --- xc/lib/X11/XKBSetGeom.c:3.6 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XKBSetGeom.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBSetGeom.c,v 1.3 2000/08/17 19:45:03 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBSetGeom.c,v 3.6 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBSetGeom.c,v 3.7 2006/01/09 14:58:37 dawes Exp $ */ #ifdef DEBUG #include Index: xc/lib/X11/XKBSetMap.c diff -u xc/lib/X11/XKBSetMap.c:3.3 xc/lib/X11/XKBSetMap.c:3.4 --- xc/lib/X11/XKBSetMap.c:3.3 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XKBSetMap.c Mon Jan 9 09:58:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBSetMap.c,v 1.4 2000/08/17 19:45:03 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBSetMap.c,v 3.3 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBSetMap.c,v 3.4 2006/01/09 14:58:37 dawes Exp $ */ #include #define NEED_REPLIES Index: xc/lib/X11/XKBUse.c diff -u xc/lib/X11/XKBUse.c:3.8 xc/lib/X11/XKBUse.c:3.9 --- xc/lib/X11/XKBUse.c:3.8 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XKBUse.c Tue Jun 14 21:02:07 2005 @@ -1,4 +1,3 @@ -/* $Xorg: XKBUse.c,v 1.3 2000/08/17 19:45:03 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,55 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBUse.c,v 3.8 2003/11/17 22:20:10 dawes Exp $ */ +/* + * Copyright (c) 2005 by The XFree86 Project, Inc. + * Copyright (c) 2005 by Michal Maruska. + * 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* $XFree86: xc/lib/X11/XKBUse.c,v 3.9 2005/06/15 01:02:07 dawes Exp $ */ #include #include @@ -204,6 +251,10 @@ return; } +/* + * mmc: Rewrite xbk event, possibly to a core X event. + * EVENT is on wire (xkb event). RE is where we transfer to (X event). + */ static Bool wire_to_event(Display *dpy,XEvent *re,xEvent *event) { @@ -304,8 +355,14 @@ ev->request = MappingKeyboard; ev->count = mn->nKeySyms; _XkbNoteCoreMapChanges(&xkbi->changes,ev,XKB_XLIB_MAP_MASK); - if (xkbi->changes.changed) - xkbi->flags|= XkbMapPending; + if (xkbi->changes.changed) { + /* + * If types change, we need to reload all, othewise, + * _maybe_ only ... + */ + xkbi->flags|= XkbMapPending | + ((mn->nTypes != 0)?0:XkbXlibNewKeyboard); + } return True; } } Index: xc/lib/X11/XKBleds.c diff -u xc/lib/X11/XKBleds.c:1.5 xc/lib/X11/XKBleds.c:1.6 --- xc/lib/X11/XKBleds.c:1.5 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XKBleds.c Mon Jan 9 09:58:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBleds.c,v 1.3 2000/08/17 19:45:03 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBleds.c,v 1.5 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBleds.c,v 1.6 2006/01/09 14:58:38 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS Index: xc/lib/X11/XKBlib.h diff -u xc/lib/X11/XKBlib.h:3.6 xc/lib/X11/XKBlib.h:3.7 --- xc/lib/X11/XKBlib.h:3.6 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XKBlib.h Mon Jan 9 09:58:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBlib.h,v 1.6 2000/08/17 19:45:03 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBlib.h,v 3.6 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBlib.h,v 3.7 2006/01/09 14:58:38 dawes Exp $ */ #ifndef _XKBLIB_H_ #define _XKBLIB_H_ Index: xc/lib/X11/XKBlibint.h diff -u xc/lib/X11/XKBlibint.h:3.6 xc/lib/X11/XKBlibint.h:3.7 --- xc/lib/X11/XKBlibint.h:3.6 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XKBlibint.h Mon Jan 9 09:58:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKBlibint.h,v 1.3 2000/08/17 19:45:04 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/X11/XKBlibint.h,v 3.6 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBlibint.h,v 3.7 2006/01/09 14:58:38 dawes Exp $ */ #ifndef _XKBLIBINT_H_ #define _XKBLIBINT_H_ Index: xc/lib/X11/XKeysymDB diff -u xc/lib/X11/XKeysymDB:3.17 xc/lib/X11/XKeysymDB:3.18 --- xc/lib/X11/XKeysymDB:3.17 Fri Feb 14 17:02:26 2003 +++ xc/lib/X11/XKeysymDB Mon Jan 9 09:58:38 2006 @@ -1,4 +1,3 @@ -! $Xorg: XKeysymDB,v 1.3 2000/08/17 19:45:04 cpqbld Exp $ ! Copyright 1993 Massachusetts Institute of Technology ! ! Permission to use, copy, modify, distribute, and sell this software and @@ -11,7 +10,7 @@ ! suitability of this software for any purpose. It is provided "as is" ! without express or implied warranty. ! -! $XFree86: xc/lib/X11/XKeysymDB,v 3.17 2003/02/14 22:02:26 dawes Exp $ +! $XFree86: xc/lib/X11/XKeysymDB,v 3.18 2006/01/09 14:58:38 dawes Exp $ hpmute_acute :100000A8 hpmute_grave :100000A9 Index: xc/lib/X11/XRGB.c diff -u xc/lib/X11/XRGB.c:3.4 xc/lib/X11/XRGB.c:3.5 --- xc/lib/X11/XRGB.c:3.4 Sun Apr 13 15:22:19 2003 +++ xc/lib/X11/XRGB.c Mon Jan 9 09:58:38 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XRGB.c,v 1.3 2000/08/17 19:45:04 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -33,7 +31,7 @@ * * */ -/* $XFree86: xc/lib/X11/XRGB.c,v 3.4 2003/04/13 19:22:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XRGB.c,v 3.5 2006/01/09 14:58:38 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/XYZ.c diff -u xc/lib/X11/XYZ.c:1.4 xc/lib/X11/XYZ.c:1.5 --- xc/lib/X11/XYZ.c:1.4 Sun Apr 13 15:22:19 2003 +++ xc/lib/X11/XYZ.c Mon Jan 9 09:58:38 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XYZ.c,v 1.3 2000/08/17 19:45:04 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -33,7 +31,7 @@ * * */ -/* $XFree86: xc/lib/X11/XYZ.c,v 1.4 2003/04/13 19:22:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XYZ.c,v 1.5 2006/01/09 14:58:38 dawes Exp $ */ #include #include "Xlibint.h" Index: xc/lib/X11/Xaixlcint.h diff -u xc/lib/X11/Xaixlcint.h:3.1 xc/lib/X11/Xaixlcint.h:3.2 --- xc/lib/X11/Xaixlcint.h:3.1 Wed Jan 17 14:41:49 2001 +++ xc/lib/X11/Xaixlcint.h Mon Jan 9 09:58:38 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Xaixlcint.h,v 1.3 2000/08/17 19:45:04 cpqbld Exp $ */ +/* $XFree86: xc/lib/X11/Xaixlcint.h,v 3.2 2006/01/09 14:58:38 dawes Exp $ */ /* * * Copyright IBM Corporation 1993 Index: xc/lib/X11/Xatomtype.h diff -u xc/lib/X11/Xatomtype.h:1.2 xc/lib/X11/Xatomtype.h:1.3 --- xc/lib/X11/Xatomtype.h:1.2 Fri Dec 14 14:54:08 2001 +++ xc/lib/X11/Xatomtype.h Mon Jan 9 09:58:38 2006 @@ -1,5 +1,4 @@ -/* $Xorg: Xatomtype.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/X11/Xatomtype.h,v 1.3 2006/01/09 14:58:38 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group Index: xc/lib/X11/Xcms.h diff -u xc/lib/X11/Xcms.h:1.8 xc/lib/X11/Xcms.h:1.9 --- xc/lib/X11/Xcms.h:1.8 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/Xcms.h Mon Jan 9 09:58:38 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xcms.h,v 1.6 2000/08/17 19:45:04 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -27,7 +25,7 @@ * DESCRIPTION * Public include file for X Color Management System */ -/* $XFree86: xc/lib/X11/Xcms.h,v 1.8 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xcms.h,v 1.9 2006/01/09 14:58:38 dawes Exp $ */ #ifndef _XCMS_H_ #define _XCMS_H_ Index: xc/lib/X11/Xcmsint.h diff -u xc/lib/X11/Xcmsint.h:3.4 xc/lib/X11/Xcmsint.h:3.5 --- xc/lib/X11/Xcmsint.h:3.4 Sun Apr 13 15:22:19 2003 +++ xc/lib/X11/Xcmsint.h Mon Jan 9 09:58:38 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xcmsint.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -29,7 +27,7 @@ * (i.e., for API internal use only) * */ -/* $XFree86: xc/lib/X11/Xcmsint.h,v 3.4 2003/04/13 19:22:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xcmsint.h,v 3.5 2006/01/09 14:58:38 dawes Exp $ */ #ifndef _XCMSINT_H_ #define _XCMSINT_H_ Index: xc/lib/X11/XimImSw.h diff -u xc/lib/X11/XimImSw.h:1.2 xc/lib/X11/XimImSw.h:1.3 --- xc/lib/X11/XimImSw.h:1.2 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XimImSw.h Mon Jan 9 09:58:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XimImSw.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED @@ -26,7 +25,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/XimImSw.h,v 1.2 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XimImSw.h,v 1.3 2006/01/09 14:58:38 dawes Exp $ */ #ifndef _XIMIMSW_H #define _XIMIMSW_H Index: xc/lib/X11/XimProto.h diff -u xc/lib/X11/XimProto.h:1.1.1.3 xc/lib/X11/XimProto.h:1.2 --- xc/lib/X11/XimProto.h:1.1.1.3 Tue Jan 16 17:09:38 2001 +++ xc/lib/X11/XimProto.h Mon Jan 9 09:58:38 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XimProto.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */ +/* $XFree86: xc/lib/X11/XimProto.h,v 1.2 2006/01/09 14:58:38 dawes Exp $ */ /****************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED Index: xc/lib/X11/XimThai.h diff -u xc/lib/X11/XimThai.h:1.6 xc/lib/X11/XimThai.h:1.7 --- xc/lib/X11/XimThai.h:1.6 Wed Apr 16 22:39:56 2003 +++ xc/lib/X11/XimThai.h Mon Jan 9 09:58:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XimThai.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */ /*********************************************************** Copyright 1993, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/XimThai.h,v 1.6 2003/04/17 02:39:56 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XimThai.h,v 1.7 2006/01/09 14:58:38 dawes Exp $ */ /* **++ Index: xc/lib/X11/XimTrInt.h diff -u xc/lib/X11/XimTrInt.h:1.2 xc/lib/X11/XimTrInt.h:1.3 --- xc/lib/X11/XimTrInt.h:1.2 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XimTrInt.h Mon Jan 9 09:58:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XimTrInt.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */ /****************************************************************** Copyright 1992 by Sun Microsystems, Inc. @@ -28,7 +27,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/XimTrInt.h,v 1.2 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XimTrInt.h,v 1.3 2006/01/09 14:58:38 dawes Exp $ */ #ifndef _XIMTRINT_H #define _XIMTRINT_H Index: xc/lib/X11/XimTrX.h diff -u xc/lib/X11/XimTrX.h:1.2 xc/lib/X11/XimTrX.h:1.3 --- xc/lib/X11/XimTrX.h:1.2 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XimTrX.h Mon Jan 9 09:58:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XimTrX.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */ /****************************************************************** Copyright 1992 by Sun Microsystems, Inc. @@ -28,7 +27,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/XimTrX.h,v 1.2 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XimTrX.h,v 1.3 2006/01/09 14:58:39 dawes Exp $ */ #ifndef _XIMTRX_H #define _XIMTRX_H Index: xc/lib/X11/XimTrans.h diff -u xc/lib/X11/XimTrans.h:1.4 xc/lib/X11/XimTrans.h:1.5 --- xc/lib/X11/XimTrans.h:1.4 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XimTrans.h Mon Jan 9 09:58:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XimTrans.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */ /****************************************************************** Copyright 1992 by Sun Microsystems, Inc. @@ -28,7 +27,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/XimTrans.h,v 1.4 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XimTrans.h,v 1.5 2006/01/09 14:58:39 dawes Exp $ */ #ifndef _XIMTRANS_H #define _XIMTRANS_H Index: xc/lib/X11/Ximint.h diff -u xc/lib/X11/Ximint.h:3.14 xc/lib/X11/Ximint.h:3.15 --- xc/lib/X11/Ximint.h:3.14 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/Ximint.h Mon Jan 9 09:58:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Ximint.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED @@ -30,7 +29,7 @@ makoto@sm.sony.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/Ximint.h,v 3.14 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Ximint.h,v 3.15 2006/01/09 14:58:39 dawes Exp $ */ #ifndef _XIMINT_H #define _XIMINT_H Index: xc/lib/X11/XimintL.h diff -u xc/lib/X11/XimintL.h:1.7 xc/lib/X11/XimintL.h:1.8 --- xc/lib/X11/XimintL.h:1.7 Wed Jan 17 14:41:49 2001 +++ xc/lib/X11/XimintL.h Mon Jan 9 09:58:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XimintL.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */ /****************************************************************** Copyright 1991, 1992, 1993, 1994 by FUJITSU LIMITED @@ -32,7 +31,7 @@ frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/XimintL.h,v 1.7 2001/01/17 19:41:49 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XimintL.h,v 1.8 2006/01/09 14:58:39 dawes Exp $ */ #ifndef _XIMINTL_H #define _XIMINTL_H Index: xc/lib/X11/XimintP.h diff -u xc/lib/X11/XimintP.h:1.8 xc/lib/X11/XimintP.h:1.9 --- xc/lib/X11/XimintP.h:1.8 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XimintP.h Mon Jan 9 09:58:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XimintP.h,v 1.3 2000/08/17 19:45:05 cpqbld Exp $ */ /****************************************************************** Copyright 1991, 1992 by Sun Microsystems, Inc. @@ -35,7 +34,7 @@ miyamoto@jrd.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/XimintP.h,v 1.8 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XimintP.h,v 1.9 2006/01/09 14:58:39 dawes Exp $ */ #ifndef _XIMINTP_H #define _XIMINTP_H Index: xc/lib/X11/XlcGeneric.h diff -u xc/lib/X11/XlcGeneric.h:1.5 xc/lib/X11/XlcGeneric.h:1.6 --- xc/lib/X11/XlcGeneric.h:1.5 Sun Apr 13 15:22:19 2003 +++ xc/lib/X11/XlcGeneric.h Mon Jan 9 09:58:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XlcGeneric.h,v 1.3 2000/08/17 19:45:06 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -31,7 +30,7 @@ * Modifier: Takanori Tateno FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/XlcGeneric.h,v 1.5 2003/04/13 19:22:19 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XlcGeneric.h,v 1.6 2006/01/09 14:58:39 dawes Exp $ */ #ifndef _XLCGENERIC_H_ #define _XLCGENERIC_H_ Index: xc/lib/X11/XlcPubI.h diff -u xc/lib/X11/XlcPubI.h:3.15 xc/lib/X11/XlcPubI.h:3.16 --- xc/lib/X11/XlcPubI.h:3.15 Tue Feb 10 19:30:44 2004 +++ xc/lib/X11/XlcPubI.h Mon Jan 9 09:58:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XlcPubI.h,v 1.4 2000/12/12 12:44:05 coskrey Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.15 2004/02/11 00:30:44 torrey Exp $ */ +/* $XFree86: xc/lib/X11/XlcPubI.h,v 3.16 2006/01/09 14:58:39 dawes Exp $ */ #ifndef _XLCPUBLICI_H_ #define _XLCPUBLICI_H_ Index: xc/lib/X11/XlcPublic.h diff -u xc/lib/X11/XlcPublic.h:1.12 xc/lib/X11/XlcPublic.h:1.13 --- xc/lib/X11/XlcPublic.h:1.12 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XlcPublic.h Mon Jan 9 09:58:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XlcPublic.h,v 1.3 2000/08/17 19:45:06 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -31,7 +30,7 @@ * Modifier: Takanori Tateno FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/XlcPublic.h,v 1.12 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XlcPublic.h,v 1.13 2006/01/09 14:58:39 dawes Exp $ */ /* * Most of this API is documented in i18n/Framework.PS */ Index: xc/lib/X11/Xlcint.h diff -u xc/lib/X11/Xlcint.h:3.17 xc/lib/X11/Xlcint.h:3.18 --- xc/lib/X11/Xlcint.h:3.17 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/Xlcint.h Mon Jan 9 09:58:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xlcint.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/Xlcint.h,v 3.17 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xlcint.h,v 3.18 2006/01/09 14:58:39 dawes Exp $ */ /* * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation, Index: xc/lib/X11/Xlib.h diff -u xc/lib/X11/Xlib.h:3.27 xc/lib/X11/Xlib.h:3.29 --- xc/lib/X11/Xlib.h:3.27 Sat Apr 3 17:26:20 2004 +++ xc/lib/X11/Xlib.h Tue Feb 7 16:23:58 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1987, 1991, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/Xlib.h,v 3.27 2004/04/03 22:26:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xlib.h,v 3.29 2006/02/07 21:23:58 dawes Exp $ */ /* @@ -198,14 +197,12 @@ /* * Data structure for retrieving info about pixmap formats. */ - typedef struct { int depth; int bits_per_pixel; int scanline_pad; } XPixmapFormatValues; - /* * Data structure for setting graphics context. */ @@ -241,7 +238,6 @@ * Graphics context. The contents of this structure are implementation * dependent. A GC should be treated as opaque by application code. */ - typedef struct _XGC #ifdef XLIB_ILLEGAL_ACCESS { @@ -366,9 +362,7 @@ /* * Data structure for host setting; getting routines. - * */ - typedef struct { int family; /* for example FamilyInternet */ int length; /* length of address, in bytes */ @@ -459,9 +453,7 @@ short angle1, angle2; } XArc; - /* Data structure for XChangeKeyboardControl */ - typedef struct { int key_click_percent; int bell_percent; @@ -474,9 +466,8 @@ } XKeyboardControl; /* Data structure for XGetKeyboardControl */ - typedef struct { - int key_click_percent; + int key_click_percent; int bell_percent; unsigned int bell_pitch, bell_duration; unsigned long led_mask; @@ -485,17 +476,15 @@ } XKeyboardState; /* Data structure for XGetMotionEvents. */ - typedef struct { - Time time; + Time time; short x, y; } XTimeCoord; /* Data structure for X{Set,Get}ModifierMapping */ - typedef struct { - int max_keypermod; /* The server's max # of keys per modifier */ - KeyCode *modifiermap; /* An 8 by max_keypermod array of modifiers */ + int max_keypermod; /* The server's max # of keys per modifier */ + KeyCode *modifiermap; /* An 8 by max_keypermod array of modifiers */ } XModifierKeymap; @@ -1015,8 +1004,8 @@ } XCharStruct; /* - * To allow arbitrary information with fonts, there are additional properties - * returned. + * To allow arbitrary information with fonts, there are additional + * properties returned. */ typedef struct { Atom name; @@ -1064,13 +1053,14 @@ Font font; /* font to print it in, None don't change */ } XTextItem16; - -typedef union { Display *display; - GC gc; - Visual *visual; - Screen *screen; - ScreenFormat *pixmap_format; - XFontStruct *font; } XEDataObject; +typedef union { + Display *display; + GC gc; + Visual *visual; + Screen *screen; + ScreenFormat *pixmap_format; + XFontStruct *font; +} XEDataObject; typedef struct { XRectangle max_ink_extent; Index: xc/lib/X11/XlibAsync.c diff -u xc/lib/X11/XlibAsync.c:1.2 xc/lib/X11/XlibAsync.c:1.3 --- xc/lib/X11/XlibAsync.c:1.2 Fri Dec 14 14:54:09 2001 +++ xc/lib/X11/XlibAsync.c Mon Jan 9 09:58:39 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XlibAsync.c,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/XlibAsync.c,v 1.3 2006/01/09 14:58:39 dawes Exp $ */ /* Copyright 1992, 1998 The Open Group Index: xc/lib/X11/XlibInt.c diff -u xc/lib/X11/XlibInt.c:3.39 xc/lib/X11/XlibInt.c:3.40 --- xc/lib/X11/XlibInt.c:3.39 Mon Nov 17 17:20:10 2003 +++ xc/lib/X11/XlibInt.c Mon Jan 9 09:58:39 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XlibInt.c,v 1.8 2001/02/09 02:03:38 xorgcvs Exp $ */ /* Copyright 1985, 1986, 1987, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/XlibInt.c,v 3.39 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XlibInt.c,v 3.40 2006/01/09 14:58:39 dawes Exp $ */ /* * XlibInt.c - Internal support routines for the C subroutine Index: xc/lib/X11/Xlibint.h diff -u xc/lib/X11/Xlibint.h:3.29 xc/lib/X11/Xlibint.h:3.30 --- xc/lib/X11/Xlibint.h:3.29 Tue Mar 30 05:34:05 2004 +++ xc/lib/X11/Xlibint.h Mon Jan 9 09:58:39 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xlibint.h,v 1.5 2001/02/09 02:03:38 xorgcvs Exp $ */ - /* Copyright 1984, 1985, 1987, 1989, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/Xlibint.h,v 3.29 2004/03/30 10:34:05 eich Exp $ */ +/* $XFree86: xc/lib/X11/Xlibint.h,v 3.30 2006/01/09 14:58:39 dawes Exp $ */ #ifndef _XLIBINT_H_ #define _XLIBINT_H_ 1 Index: xc/lib/X11/Xlocale.h diff -u xc/lib/X11/Xlocale.h:1.5 xc/lib/X11/Xlocale.h:1.6 --- xc/lib/X11/Xlocale.h:1.5 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/Xlocale.h Mon Jan 9 09:58:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xlocale.h,v 1.4 2001/02/09 02:03:38 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/Xlocale.h,v 1.5 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xlocale.h,v 1.6 2006/01/09 14:58:40 dawes Exp $ */ #ifndef _XLOCALE_H_ #define _XLOCALE_H_ Index: xc/lib/X11/XomGeneric.h diff -u xc/lib/X11/XomGeneric.h:1.6 xc/lib/X11/XomGeneric.h:1.7 --- xc/lib/X11/XomGeneric.h:1.6 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/XomGeneric.h Mon Jan 9 09:58:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XomGeneric.h,v 1.3 2000/08/17 19:45:08 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -31,7 +30,7 @@ * Modifier: Takanori Tateno FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/XomGeneric.h,v 1.6 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XomGeneric.h,v 1.7 2006/01/09 14:58:40 dawes Exp $ */ #ifndef _XOMGENERIC_H_ #define _XOMGENERIC_H_ Index: xc/lib/X11/Xresource.h diff -u xc/lib/X11/Xresource.h:3.9 xc/lib/X11/Xresource.h:3.10 --- xc/lib/X11/Xresource.h:3.9 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/Xresource.h Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xresource.h,v 1.7 2001/02/09 02:03:39 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/Xresource.h,v 3.9 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xresource.h,v 3.10 2006/01/09 14:58:40 dawes Exp $ */ #ifndef _XRESOURCE_H_ #define _XRESOURCE_H_ Index: xc/lib/X11/Xrm.c diff -u xc/lib/X11/Xrm.c:3.24 xc/lib/X11/Xrm.c:3.25 --- xc/lib/X11/Xrm.c:3.24 Tue Mar 30 05:34:05 2004 +++ xc/lib/X11/Xrm.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xrm.c,v 1.7 2001/02/09 02:03:39 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard @@ -49,7 +47,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/Xrm.c,v 3.24 2004/03/30 10:34:05 eich Exp $ */ +/* $XFree86: xc/lib/X11/Xrm.c,v 3.25 2006/01/09 14:58:40 dawes Exp $ */ #include #include Index: xc/lib/X11/XrmI.h diff -u xc/lib/X11/XrmI.h:1.5 xc/lib/X11/XrmI.h:1.6 --- xc/lib/X11/XrmI.h:1.5 Fri Dec 14 14:54:10 2001 +++ xc/lib/X11/XrmI.h Mon Jan 9 09:58:40 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XrmI.h,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/XrmI.h,v 1.6 2006/01/09 14:58:40 dawes Exp $ */ /* Copyright 1990, 1998 The Open Group Index: xc/lib/X11/Xutil.h diff -u xc/lib/X11/Xutil.h:3.7 xc/lib/X11/Xutil.h:3.8 --- xc/lib/X11/Xutil.h:3.7 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/Xutil.h Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xutil.h,v 1.8 2001/02/09 02:03:39 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/Xutil.h,v 3.7 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Xutil.h,v 3.8 2006/01/09 14:58:40 dawes Exp $ */ #ifndef _XUTIL_H_ #define _XUTIL_H_ Index: xc/lib/X11/cmsAllCol.c diff -u xc/lib/X11/cmsAllCol.c:1.4 xc/lib/X11/cmsAllCol.c:1.5 --- xc/lib/X11/cmsAllCol.c:1.4 Sun Apr 13 15:22:20 2003 +++ xc/lib/X11/cmsAllCol.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: cmsAllCol.c,v 1.3 2000/08/17 19:45:08 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsAllCol.c,v 1.4 2003/04/13 19:22:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsAllCol.c,v 1.5 2006/01/09 14:58:40 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/cmsAllNCol.c diff -u xc/lib/X11/cmsAllNCol.c:1.5 xc/lib/X11/cmsAllNCol.c:1.6 --- xc/lib/X11/cmsAllNCol.c:1.5 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/cmsAllNCol.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: cmsAllNCol.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsAllNCol.c,v 1.5 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsAllNCol.c,v 1.6 2006/01/09 14:58:40 dawes Exp $ */ #define NEED_REPLIES #include Index: xc/lib/X11/cmsCmap.c diff -u xc/lib/X11/cmsCmap.c:3.2 xc/lib/X11/cmsCmap.c:3.3 --- xc/lib/X11/cmsCmap.c:3.2 Sun Apr 13 15:22:20 2003 +++ xc/lib/X11/cmsCmap.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: cmsCmap.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -33,7 +31,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsCmap.c,v 3.2 2003/04/13 19:22:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsCmap.c,v 3.3 2006/01/09 14:58:40 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES Index: xc/lib/X11/cmsColNm.c diff -u xc/lib/X11/cmsColNm.c:3.12 xc/lib/X11/cmsColNm.c:3.13 --- xc/lib/X11/cmsColNm.c:3.12 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/cmsColNm.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: cmsColNm.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -31,7 +29,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsColNm.c,v 3.12 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsColNm.c,v 3.13 2006/01/09 14:58:40 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/cmsGlobls.c diff -u xc/lib/X11/cmsGlobls.c:1.5 xc/lib/X11/cmsGlobls.c:1.6 --- xc/lib/X11/cmsGlobls.c:1.5 Sun Apr 13 15:22:20 2003 +++ xc/lib/X11/cmsGlobls.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/*$Xorg: cmsGlobls.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsGlobls.c,v 1.5 2003/04/13 19:22:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsGlobls.c,v 1.6 2006/01/09 14:58:40 dawes Exp $ */ #include "Xlibint.h" #include "Xcmsint.h" Index: xc/lib/X11/cmsInt.c diff -u xc/lib/X11/cmsInt.c:1.5 xc/lib/X11/cmsInt.c:1.6 --- xc/lib/X11/cmsInt.c:1.5 Wed Apr 16 22:06:31 2003 +++ xc/lib/X11/cmsInt.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: cmsInt.c,v 1.4 2000/08/17 19:45:09 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -34,7 +32,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsInt.c,v 1.5 2003/04/17 02:06:31 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsInt.c,v 1.6 2006/01/09 14:58:40 dawes Exp $ */ /* #define NEED_EVENTS */ #include Index: xc/lib/X11/cmsLkCol.c diff -u xc/lib/X11/cmsLkCol.c:1.6 xc/lib/X11/cmsLkCol.c:1.7 --- xc/lib/X11/cmsLkCol.c:1.6 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/cmsLkCol.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: cmsLkCol.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -32,7 +30,7 @@ * * */ -/* $XFree86: xc/lib/X11/cmsLkCol.c,v 1.6 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsLkCol.c,v 1.7 2006/01/09 14:58:40 dawes Exp $ */ #define NEED_REPLIES #include Index: xc/lib/X11/cmsMath.c diff -u xc/lib/X11/cmsMath.c:3.5 xc/lib/X11/cmsMath.c:3.6 --- xc/lib/X11/cmsMath.c:3.5 Fri Dec 14 14:54:10 2001 +++ xc/lib/X11/cmsMath.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: cmsMath.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/cmsMath.c,v 3.5 2001/12/14 19:54:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsMath.c,v 3.6 2006/01/09 14:58:40 dawes Exp $ */ /* * Stephen Gildea, MIT X Consortium, January 1991 Index: xc/lib/X11/cmsProp.c diff -u xc/lib/X11/cmsProp.c:1.2 xc/lib/X11/cmsProp.c:1.3 --- xc/lib/X11/cmsProp.c:1.2 Sun Apr 13 15:22:20 2003 +++ xc/lib/X11/cmsProp.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: cmsProp.c,v 1.3 2000/08/17 19:45:10 cpqbld Exp $ */ - /* * * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. @@ -31,7 +29,7 @@ * This utility routines for manipulating properties. * */ -/* $XFree86: xc/lib/X11/cmsProp.c,v 1.2 2003/04/13 19:22:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsProp.c,v 1.3 2006/01/09 14:58:40 dawes Exp $ */ #include #include "Xlibint.h" Index: xc/lib/X11/cmsTrig.c diff -u xc/lib/X11/cmsTrig.c:3.9 xc/lib/X11/cmsTrig.c:3.10 --- xc/lib/X11/cmsTrig.c:3.9 Sun Apr 13 15:22:20 2003 +++ xc/lib/X11/cmsTrig.c Mon Jan 9 09:58:40 2006 @@ -1,5 +1,3 @@ -/* $Xorg: cmsTrig.c,v 1.3 2000/08/17 19:45:10 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -24,7 +22,7 @@ * CONNECTION WITH THE USE OR THE PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/X11/cmsTrig.c,v 3.9 2003/04/13 19:22:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/cmsTrig.c,v 3.10 2006/01/09 14:58:40 dawes Exp $ */ /* * It should be pointed out that for simplicity's sake, the * environment parameters are defined as floating point constants, Index: xc/lib/X11/cursorfont.h diff -u xc/lib/X11/cursorfont.h:1.2 xc/lib/X11/cursorfont.h:1.3 --- xc/lib/X11/cursorfont.h:1.2 Fri Dec 14 14:54:10 2001 +++ xc/lib/X11/cursorfont.h Mon Jan 9 09:58:40 2006 @@ -1,4 +1,4 @@ -/* $Xorg: cursorfont.h,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/cursorfont.h,v 1.3 2006/01/09 14:58:40 dawes Exp $ */ /* Copyright 1987, 1998 The Open Group Index: xc/lib/X11/evtomask.c diff -u xc/lib/X11/evtomask.c:3.5 xc/lib/X11/evtomask.c:3.6 --- xc/lib/X11/evtomask.c:3.5 Fri Dec 14 14:54:10 2001 +++ xc/lib/X11/evtomask.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: evtomask.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/evtomask.c,v 3.5 2001/12/14 19:54:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/evtomask.c,v 3.6 2006/01/09 14:58:41 dawes Exp $ */ #include Index: xc/lib/X11/globals.c diff -u xc/lib/X11/globals.c:3.5 xc/lib/X11/globals.c:3.6 --- xc/lib/X11/globals.c:3.5 Fri Dec 14 14:54:10 2001 +++ xc/lib/X11/globals.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: globals.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/globals.c,v 3.5 2001/12/14 19:54:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/globals.c,v 3.6 2006/01/09 14:58:41 dawes Exp $ */ /* * Index: xc/lib/X11/imCallbk.c diff -u xc/lib/X11/imCallbk.c:3.10 xc/lib/X11/imCallbk.c:3.11 --- xc/lib/X11/imCallbk.c:3.10 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/imCallbk.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imCallbk.c,v 1.4 2000/08/17 19:45:10 cpqbld Exp $ */ /*********************************************************************** Copyright 1993 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1994 by FUJITSU LIMITED @@ -32,7 +31,7 @@ makoto@sm.sony.co.jp ***********************************************************************/ -/* $XFree86: xc/lib/X11/imCallbk.c,v 3.10 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imCallbk.c,v 3.11 2006/01/09 14:58:41 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/imConv.c diff -u xc/lib/X11/imConv.c:1.33 xc/lib/X11/imConv.c:1.34 --- xc/lib/X11/imConv.c:1.33 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/imConv.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $TOG: imConv.c /main/20 1998/06/17 15:46:41 kaleb $ */ /****************************************************************** Copyright 1991, 1992 by Fuji Xerox Co.,Ltd. @@ -33,7 +32,7 @@ ******************************************************************/ /* 2000 Modifier: Ivan Pascal The XFree86 Project. */ -/* $XFree86: xc/lib/X11/imConv.c,v 1.33 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imConv.c,v 1.34 2006/01/09 14:58:41 dawes Exp $ */ #define NEED_EVENTS #include Index: xc/lib/X11/imDefFlt.c diff -u xc/lib/X11/imDefFlt.c:1.5 xc/lib/X11/imDefFlt.c:1.6 --- xc/lib/X11/imDefFlt.c:1.5 Sun Apr 13 15:22:20 2003 +++ xc/lib/X11/imDefFlt.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imDefFlt.c,v 1.4 2000/08/17 19:45:11 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED @@ -26,7 +25,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDefFlt.c,v 1.5 2003/04/13 19:22:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imDefFlt.c,v 1.6 2006/01/09 14:58:41 dawes Exp $ */ #include #define NEED_EVENTS Index: xc/lib/X11/imDefIc.c diff -u xc/lib/X11/imDefIc.c:3.10 xc/lib/X11/imDefIc.c:3.11 --- xc/lib/X11/imDefIc.c:3.10 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/imDefIc.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imDefIc.c,v 1.5 2000/08/17 19:45:11 cpqbld Exp $ */ /****************************************************************** Copyright 1991, 1992 by Sun Microsystems, Inc. @@ -28,7 +27,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDefIc.c,v 3.10 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imDefIc.c,v 3.11 2006/01/09 14:58:41 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/imDefIm.c diff -u xc/lib/X11/imDefIm.c:1.16 xc/lib/X11/imDefIm.c:1.17 --- xc/lib/X11/imDefIm.c:1.16 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/imDefIm.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imDefIm.c,v 1.5 2000/08/17 19:45:12 cpqbld Exp $ */ /****************************************************************** Copyright 1990, 1991, 1992 by Sun Microsystems, Inc. Copyright 1992, 1993, 1994 by FUJITSU LIMITED @@ -31,7 +30,7 @@ makoto@sm.sony.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDefIm.c,v 1.16 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imDefIm.c,v 1.17 2006/01/09 14:58:41 dawes Exp $ */ #include #define NEED_EVENTS Index: xc/lib/X11/imDefLkup.c diff -u xc/lib/X11/imDefLkup.c:3.12 xc/lib/X11/imDefLkup.c:3.13 --- xc/lib/X11/imDefLkup.c:3.12 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/imDefLkup.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imDefLkup.c,v 1.3 2000/08/17 19:45:12 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED @@ -26,7 +25,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDefLkup.c,v 3.12 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imDefLkup.c,v 3.13 2006/01/09 14:58:41 dawes Exp $ */ #include #define NEED_EVENTS Index: xc/lib/X11/imDispch.c diff -u xc/lib/X11/imDispch.c:1.5 xc/lib/X11/imDispch.c:1.6 --- xc/lib/X11/imDispch.c:1.5 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/imDispch.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imDispch.c,v 1.3 2000/08/17 19:45:12 cpqbld Exp $ */ /****************************************************************** Copyright 1993, 1994 by FUJITSU LIMITED @@ -26,7 +25,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imDispch.c,v 1.5 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imDispch.c,v 1.6 2006/01/09 14:58:41 dawes Exp $ */ #include #include "Xlibint.h" Index: xc/lib/X11/imEvToWire.c diff -u xc/lib/X11/imEvToWire.c:1.2 xc/lib/X11/imEvToWire.c:1.3 --- xc/lib/X11/imEvToWire.c:1.2 Sun Apr 13 15:22:20 2003 +++ xc/lib/X11/imEvToWire.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imEvToWire.c,v 1.3 2000/08/17 19:45:12 cpqbld Exp $ */ /*********************************************************** Copyright 1993 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -21,7 +20,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/imEvToWire.c,v 1.2 2003/04/13 19:22:20 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imEvToWire.c,v 1.3 2006/01/09 14:58:41 dawes Exp $ */ #define NEED_EVENTS #include Index: xc/lib/X11/imExten.c diff -u xc/lib/X11/imExten.c:1.5 xc/lib/X11/imExten.c:1.6 --- xc/lib/X11/imExten.c:1.5 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/imExten.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imExten.c,v 1.3 2000/08/17 19:45:12 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED @@ -26,7 +25,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imExten.c,v 1.5 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imExten.c,v 1.6 2006/01/09 14:58:41 dawes Exp $ */ #include #define NEED_EVENTS Index: xc/lib/X11/imImSw.c diff -u xc/lib/X11/imImSw.c:1.4 xc/lib/X11/imImSw.c:1.5 --- xc/lib/X11/imImSw.c:1.4 Sun Apr 13 15:22:21 2003 +++ xc/lib/X11/imImSw.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imImSw.c,v 1.3 2000/08/17 19:45:12 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED @@ -32,7 +31,7 @@ frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/imImSw.c,v 1.4 2003/04/13 19:22:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imImSw.c,v 1.5 2006/01/09 14:58:41 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/imInsClbk.c diff -u xc/lib/X11/imInsClbk.c:3.4 xc/lib/X11/imInsClbk.c:3.5 --- xc/lib/X11/imInsClbk.c:3.4 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/imInsClbk.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imInsClbk.c,v 1.3 2000/08/17 19:45:13 cpqbld Exp $ */ /****************************************************************** Copyright 1993, 1994 by Sony Corporation @@ -26,7 +25,7 @@ makoto@sm.sony.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imInsClbk.c,v 3.4 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imInsClbk.c,v 3.5 2006/01/09 14:58:41 dawes Exp $ */ #include #define NEED_EVENTS Index: xc/lib/X11/imInt.c diff -u xc/lib/X11/imInt.c:3.13 xc/lib/X11/imInt.c:3.14 --- xc/lib/X11/imInt.c:3.13 Mon Nov 17 17:20:11 2003 +++ xc/lib/X11/imInt.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imInt.c,v 1.8 2000/08/17 19:45:13 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED @@ -26,7 +25,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imInt.c,v 3.13 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imInt.c,v 3.14 2006/01/09 14:58:41 dawes Exp $ */ #include #include Index: xc/lib/X11/imLcFlt.c diff -u xc/lib/X11/imLcFlt.c:1.1.1.4 xc/lib/X11/imLcFlt.c:1.2 --- xc/lib/X11/imLcFlt.c:1.1.1.4 Tue Jan 16 17:11:30 2001 +++ xc/lib/X11/imLcFlt.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,4 @@ -/* $Xorg: imLcFlt.c,v 1.3 2000/08/17 19:45:13 cpqbld Exp $ */ +/* $XFree86: xc/lib/X11/imLcFlt.c,v 1.2 2006/01/09 14:58:41 dawes Exp $ */ /****************************************************************** Copyright 1992 by Fuji Xerox Co., Ltd. Index: xc/lib/X11/imLcGIc.c diff -u xc/lib/X11/imLcGIc.c:1.1.1.2 xc/lib/X11/imLcGIc.c:1.2 --- xc/lib/X11/imLcGIc.c:1.1.1.2 Tue Jan 16 17:11:32 2001 +++ xc/lib/X11/imLcGIc.c Mon Jan 9 09:58:41 2006 @@ -1,4 +1,4 @@ -/* $Xorg: imLcGIc.c,v 1.3 2000/08/17 19:45:13 cpqbld Exp $ */ +/* $XFree86: xc/lib/X11/imLcGIc.c,v 1.2 2006/01/09 14:58:41 dawes Exp $ */ /****************************************************************** Copyright 1992,1993, 1994 by FUJITSU LIMITED Index: xc/lib/X11/imLcIc.c diff -u xc/lib/X11/imLcIc.c:1.5 xc/lib/X11/imLcIc.c:1.6 --- xc/lib/X11/imLcIc.c:1.5 Sun Apr 13 15:22:21 2003 +++ xc/lib/X11/imLcIc.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imLcIc.c,v 1.3 2000/08/17 19:45:13 cpqbld Exp $ */ /****************************************************************** Copyright 1992,1993, 1994 by FUJITSU LIMITED @@ -26,7 +25,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imLcIc.c,v 1.5 2003/04/13 19:22:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imLcIc.c,v 1.6 2006/01/09 14:58:42 dawes Exp $ */ #include #include Index: xc/lib/X11/imLcIm.c diff -u xc/lib/X11/imLcIm.c:1.13 xc/lib/X11/imLcIm.c:1.14 --- xc/lib/X11/imLcIm.c:1.13 Tue Jan 6 08:49:27 2004 +++ xc/lib/X11/imLcIm.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imLcIm.c,v 1.3 2000/08/17 19:45:14 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED @@ -32,7 +31,7 @@ frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/imLcIm.c,v 1.13 2004/01/06 13:49:27 pascal Exp $ */ +/* $XFree86: xc/lib/X11/imLcIm.c,v 1.14 2006/01/09 14:58:42 dawes Exp $ */ #include /* Index: xc/lib/X11/imLcLkup.c diff -u xc/lib/X11/imLcLkup.c:3.9 xc/lib/X11/imLcLkup.c:3.10 --- xc/lib/X11/imLcLkup.c:3.9 Tue Jul 8 11:39:47 2003 +++ xc/lib/X11/imLcLkup.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imLcLkup.c,v 1.3 2000/08/17 19:45:14 cpqbld Exp $ */ /****************************************************************** Copyright 1992 by Fuji Xerox Co., Ltd. @@ -29,7 +28,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imLcLkup.c,v 3.9 2003/07/08 15:39:47 tsi Exp $ */ +/* $XFree86: xc/lib/X11/imLcLkup.c,v 3.10 2006/01/09 14:58:42 dawes Exp $ */ #include #include Index: xc/lib/X11/imLcPrs.c diff -u xc/lib/X11/imLcPrs.c:1.11 xc/lib/X11/imLcPrs.c:1.12 --- xc/lib/X11/imLcPrs.c:1.11 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/imLcPrs.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imLcPrs.c,v 1.3 2000/08/17 19:45:14 cpqbld Exp $ */ /****************************************************************** Copyright 1992 by Oki Technosystems Laboratory, Inc. @@ -30,7 +29,7 @@ ******************************************************************/ -/* $XFree86: xc/lib/X11/imLcPrs.c,v 1.11 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imLcPrs.c,v 1.12 2006/01/09 14:58:42 dawes Exp $ */ #include #include Index: xc/lib/X11/imLcSIc.c diff -u xc/lib/X11/imLcSIc.c:1.1.1.2 xc/lib/X11/imLcSIc.c:1.2 --- xc/lib/X11/imLcSIc.c:1.1.1.2 Tue Jan 16 17:11:39 2001 +++ xc/lib/X11/imLcSIc.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,4 @@ -/* $Xorg: imLcSIc.c,v 1.3 2000/08/17 19:45:14 cpqbld Exp $ */ +/* $XFree86: xc/lib/X11/imLcSIc.c,v 1.2 2006/01/09 14:58:42 dawes Exp $ */ /****************************************************************** Copyright 1990, 1991, 1992, 1993, 1994 by FUJITSU LIMITED Index: xc/lib/X11/imRm.c diff -u xc/lib/X11/imRm.c:3.13 xc/lib/X11/imRm.c:3.14 --- xc/lib/X11/imRm.c:3.13 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/imRm.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imRm.c,v 1.4 2000/08/17 19:45:14 cpqbld Exp $ */ /****************************************************************** Copyright 1990, 1991, 1992,1993, 1994 by FUJITSU LIMITED @@ -30,7 +29,7 @@ makoto@sm.sony.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imRm.c,v 3.13 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imRm.c,v 3.14 2006/01/09 14:58:42 dawes Exp $ */ #include #include Index: xc/lib/X11/imRmAttr.c diff -u xc/lib/X11/imRmAttr.c:1.8 xc/lib/X11/imRmAttr.c:1.9 --- xc/lib/X11/imRmAttr.c:1.8 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/imRmAttr.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imRmAttr.c,v 1.4 2000/08/17 19:45:15 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED @@ -26,7 +25,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imRmAttr.c,v 1.8 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imRmAttr.c,v 1.9 2006/01/09 14:58:42 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/imThaiFlt.c diff -u xc/lib/X11/imThaiFlt.c:3.23 xc/lib/X11/imThaiFlt.c:3.24 --- xc/lib/X11/imThaiFlt.c:3.23 Tue Dec 30 20:18:42 2003 +++ xc/lib/X11/imThaiFlt.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imThaiFlt.c,v 1.5 2001/02/09 02:03:39 xorgcvs Exp $ */ /*********************************************************** Copyright 1993, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.23 2003/12/31 01:18:42 tsi Exp $ */ +/* $XFree86: xc/lib/X11/imThaiFlt.c,v 3.24 2006/01/09 14:58:42 dawes Exp $ */ /* **++ Index: xc/lib/X11/imThaiIc.c diff -u xc/lib/X11/imThaiIc.c:1.5 xc/lib/X11/imThaiIc.c:1.6 --- xc/lib/X11/imThaiIc.c:1.5 Sun Apr 13 15:22:21 2003 +++ xc/lib/X11/imThaiIc.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imThaiIc.c,v 1.3 2000/08/17 19:45:15 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED @@ -32,7 +31,7 @@ frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/imThaiIc.c,v 1.5 2003/04/13 19:22:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imThaiIc.c,v 1.6 2006/01/09 14:58:42 dawes Exp $ */ #include #include Index: xc/lib/X11/imThaiIm.c diff -u xc/lib/X11/imThaiIm.c:1.8 xc/lib/X11/imThaiIm.c:1.9 --- xc/lib/X11/imThaiIm.c:1.8 Fri Sep 20 22:46:04 2002 +++ xc/lib/X11/imThaiIm.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imThaiIm.c,v 1.3 2000/08/17 19:45:15 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED @@ -32,7 +31,7 @@ frankyling@hgrd01.enet.dec.com ******************************************************************/ -/* $XFree86: xc/lib/X11/imThaiIm.c,v 1.8 2002/09/21 02:46:04 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imThaiIm.c,v 1.9 2006/01/09 14:58:42 dawes Exp $ */ #include #include Index: xc/lib/X11/imTrX.c diff -u xc/lib/X11/imTrX.c:1.4 xc/lib/X11/imTrX.c:1.5 --- xc/lib/X11/imTrX.c:1.4 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/imTrX.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imTrX.c,v 1.4 2000/08/17 19:45:15 cpqbld Exp $ */ /****************************************************************** Copyright 1992 by Sun Microsystems, Inc. @@ -28,7 +27,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imTrX.c,v 1.4 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imTrX.c,v 1.5 2006/01/09 14:58:42 dawes Exp $ */ #include #include Index: xc/lib/X11/imTrans.c diff -u xc/lib/X11/imTrans.c:1.4 xc/lib/X11/imTrans.c:1.5 --- xc/lib/X11/imTrans.c:1.4 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/imTrans.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imTrans.c,v 1.3 2000/08/17 19:45:16 cpqbld Exp $ */ /****************************************************************** Copyright 1992 by Sun Microsystems, Inc. @@ -28,7 +27,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imTrans.c,v 1.4 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imTrans.c,v 1.5 2006/01/09 14:58:42 dawes Exp $ */ #include #include Index: xc/lib/X11/imTransR.c diff -u xc/lib/X11/imTransR.c:3.7 xc/lib/X11/imTransR.c:3.8 --- xc/lib/X11/imTransR.c:3.7 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/imTransR.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: imTransR.c,v 1.4 2000/08/17 19:45:16 cpqbld Exp $ */ /****************************************************************** Copyright 1992 by Sun Microsystems, Inc. @@ -28,7 +27,7 @@ fujiwara@a80.tech.yk.fujitsu.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imTransR.c,v 3.7 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imTransR.c,v 3.8 2006/01/09 14:58:42 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/jump_funcs diff -u xc/lib/X11/jump_funcs:3.11 xc/lib/X11/jump_funcs:3.12 --- xc/lib/X11/jump_funcs:3.11 Wed Jan 17 14:41:52 2001 +++ xc/lib/X11/jump_funcs Mon Jan 9 09:58:42 2006 @@ -1,9 +1,4 @@ -# $Xorg: jump_funcs,v 1.3 2000/08/17 19:45:16 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/lib/X11/jump_funcs,v 3.11 2001/01/17 19:41:52 dawes Exp $ +# $XFree86: xc/lib/X11/jump_funcs,v 3.12 2006/01/09 14:58:42 dawes Exp $ # 00000000 T _XSaveContext libX11 Context 00000000 T _XFindContext libX11 Context Index: xc/lib/X11/jump_ignore diff -u xc/lib/X11/jump_ignore:3.11 xc/lib/X11/jump_ignore:3.12 --- xc/lib/X11/jump_ignore:3.11 Wed Jan 17 14:41:52 2001 +++ xc/lib/X11/jump_ignore Mon Jan 9 09:58:42 2006 @@ -1,9 +1,4 @@ -# $Xorg: jump_ignore,v 1.3 2000/08/17 19:45:16 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/lib/X11/jump_ignore,v 3.11 2001/01/17 19:41:52 dawes Exp $ +# $XFree86: xc/lib/X11/jump_ignore,v 3.12 2006/01/09 14:58:42 dawes Exp $ # jump_ignore 00000000 T __XlcAddCT libX11 lcCT 00000000 T __XKeycodeToKeysym libX11 KeyBind Index: xc/lib/X11/jump_vars diff -u xc/lib/X11/jump_vars:3.2 xc/lib/X11/jump_vars:3.3 --- xc/lib/X11/jump_vars:3.2 Wed Jan 17 14:41:53 2001 +++ xc/lib/X11/jump_vars Mon Jan 9 09:58:42 2006 @@ -1,9 +1,4 @@ -# $Xorg: jump_vars,v 1.3 2000/08/17 19:45:16 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/lib/X11/jump_vars,v 3.2 2001/01/17 19:41:53 dawes Exp $ +# $XFree86: xc/lib/X11/jump_vars,v 3.3 2006/01/09 14:58:42 dawes Exp $ # 00008000 K __XkeyTable libX11 XStrKeysym 00000100 K __Xevent_to_mask libX11 evtomask Index: xc/lib/X11/lcCT.c diff -u xc/lib/X11/lcCT.c:3.28 xc/lib/X11/lcCT.c:3.29 --- xc/lib/X11/lcCT.c:3.28 Mon Aug 4 06:32:20 2003 +++ xc/lib/X11/lcCT.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcCT.c,v 1.4 2000/08/17 19:45:16 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -36,7 +35,7 @@ * Modifier: Ivan Pascal The XFree86 Project * Modifier: Bruno Haible The XFree86 Project */ -/* $XFree86: xc/lib/X11/lcCT.c,v 3.28 2003/08/04 10:32:20 eich Exp $ */ +/* $XFree86: xc/lib/X11/lcCT.c,v 3.29 2006/01/09 14:58:42 dawes Exp $ */ #include "Xlibint.h" #include "XlcPubI.h" Index: xc/lib/X11/lcCharSet.c diff -u xc/lib/X11/lcCharSet.c:3.9 xc/lib/X11/lcCharSet.c:3.10 --- xc/lib/X11/lcCharSet.c:3.9 Wed Jul 25 11:04:45 2001 +++ xc/lib/X11/lcCharSet.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcCharSet.c,v 1.3 2000/08/17 19:45:16 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcCharSet.c,v 3.9 2001/07/25 15:04:45 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcCharSet.c,v 3.10 2006/01/09 14:58:42 dawes Exp $ */ #include #include "Xlibint.h" Index: xc/lib/X11/lcConv.c diff -u xc/lib/X11/lcConv.c:1.6 xc/lib/X11/lcConv.c:1.7 --- xc/lib/X11/lcConv.c:1.6 Wed Jan 17 14:41:53 2001 +++ xc/lib/X11/lcConv.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcConv.c,v 1.4 2000/08/17 19:45:17 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcConv.c,v 1.6 2001/01/17 19:41:53 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcConv.c,v 1.7 2006/01/09 14:58:42 dawes Exp $ */ #include "Xlibint.h" #include "XlcPubI.h" Index: xc/lib/X11/lcDB.c diff -u xc/lib/X11/lcDB.c:3.16 xc/lib/X11/lcDB.c:3.17 --- xc/lib/X11/lcDB.c:3.16 Tue May 27 18:26:26 2003 +++ xc/lib/X11/lcDB.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcDB.c,v 1.6 2000/08/17 19:45:17 cpqbld Exp $ */ /* * * Copyright IBM Corporation 1993 @@ -28,7 +27,7 @@ * This is source code modified by FUJITSU LIMITED under the Joint * Development Agreement for the CDE/Motif PST. */ -/* $XFree86: xc/lib/X11/lcDB.c,v 3.16 2003/05/27 22:26:26 tsi Exp $ */ +/* $XFree86: xc/lib/X11/lcDB.c,v 3.17 2006/01/09 14:58:42 dawes Exp $ */ Index: xc/lib/X11/lcDefConv.c diff -u xc/lib/X11/lcDefConv.c:1.7 xc/lib/X11/lcDefConv.c:1.8 --- xc/lib/X11/lcDefConv.c:1.7 Wed Jul 25 11:04:45 2001 +++ xc/lib/X11/lcDefConv.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcDefConv.c,v 1.3 2000/08/17 19:45:17 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -27,7 +26,7 @@ * 2000 * Modifier: Ivan Pascal The XFree86 Project */ -/* $XFree86: xc/lib/X11/lcDefConv.c,v 1.7 2001/07/25 15:04:45 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcDefConv.c,v 1.8 2006/01/09 14:58:42 dawes Exp $ */ /* * The default locale loader. Index: xc/lib/X11/lcDynamic.c diff -u xc/lib/X11/lcDynamic.c:1.5 xc/lib/X11/lcDynamic.c:1.6 --- xc/lib/X11/lcDynamic.c:1.5 Fri Dec 14 14:54:10 2001 +++ xc/lib/X11/lcDynamic.c Mon Jan 9 09:58:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcDynamic.c,v 1.4 2001/02/09 02:03:39 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -32,7 +31,7 @@ * Modifier: Takanori Tateno FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/lcDynamic.c,v 1.5 2001/12/14 19:54:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcDynamic.c,v 1.6 2006/01/09 14:58:42 dawes Exp $ */ /* * A dynamically loaded locale. Index: xc/lib/X11/lcEuc.c diff -u xc/lib/X11/lcEuc.c:3.13 xc/lib/X11/lcEuc.c:3.14 --- xc/lib/X11/lcEuc.c:3.13 Fri Aug 22 09:29:16 2003 +++ xc/lib/X11/lcEuc.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcEuc.c,v 1.3 2000/08/17 19:45:17 cpqbld Exp $ */ /****************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED @@ -30,7 +29,7 @@ Yoshiyuki Segawa (segawa@ossi.com) *****************************************************************/ -/* $XFree86: xc/lib/X11/lcEuc.c,v 3.13 2003/08/22 13:29:16 pascal Exp $ */ +/* $XFree86: xc/lib/X11/lcEuc.c,v 3.14 2006/01/09 14:58:43 dawes Exp $ */ /* * An EUC locale. Index: xc/lib/X11/lcFile.c diff -u xc/lib/X11/lcFile.c:3.33 xc/lib/X11/lcFile.c:3.34 --- xc/lib/X11/lcFile.c:3.33 Tue Jul 15 21:38:26 2003 +++ xc/lib/X11/lcFile.c Sun Mar 27 21:50:59 2005 @@ -1,4 +1,3 @@ -/* $Xorg: lcFile.c,v 1.5 2000/12/12 12:44:05 coskrey Exp $ */ /* * * Copyright IBM Corporation 1993 @@ -23,7 +22,7 @@ * SOFTWARE. * */ -/* $XFree86: xc/lib/X11/lcFile.c,v 3.33 2003/07/16 01:38:26 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcFile.c,v 3.34 2005/03/28 02:50:59 dawes Exp $ */ #include #include @@ -31,11 +30,22 @@ #include "Xlibint.h" #include "XlcPubI.h" #include -#if 0 -#include /* in theory delivers getresuid/gid prototypes, - * in practice only the Linux syscall wrapper is there. */ -#endif +#ifdef HASGETRESUID +# include +# if !defined(__GLIBC_PREREQ) +# define _NEED_GETRESUID_PROTO +# else +# if !__GLIBC_PREREQ(2,3) +# define _NEED_GETRESUID_PROTO +# endif +# endif +# ifdef _NEED_GETRESUID_PROTO + extern int getresuid(uid_t *, uid_t *, uid_t *); + extern int getresgid(gid_t *, gid_t *, gid_t *); +# undef _NEED_GETRESUID_PROTO +# endif +#endif /************************************************************************/ Index: xc/lib/X11/lcGenConv.c diff -u xc/lib/X11/lcGenConv.c:3.28 xc/lib/X11/lcGenConv.c:3.29 --- xc/lib/X11/lcGenConv.c:3.28 Tue May 27 18:26:26 2003 +++ xc/lib/X11/lcGenConv.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcGenConv.c,v 1.5 2000/08/17 19:45:17 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -35,7 +34,7 @@ * 2000 * Modifier: Ivan Pascal The XFree86 Project */ -/* $XFree86: xc/lib/X11/lcGenConv.c,v 3.28 2003/05/27 22:26:26 tsi Exp $ */ +/* $XFree86: xc/lib/X11/lcGenConv.c,v 3.29 2006/01/09 14:58:43 dawes Exp $ */ /* * A generic locale loader for all kinds of ISO-2022 based codesets. Index: xc/lib/X11/lcGeneric.c diff -u xc/lib/X11/lcGeneric.c:3.20 xc/lib/X11/lcGeneric.c:3.21 --- xc/lib/X11/lcGeneric.c:3.20 Tue Sep 23 22:43:12 2003 +++ xc/lib/X11/lcGeneric.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcGeneric.c,v 1.7 2000/12/12 12:44:05 coskrey Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -28,7 +27,7 @@ * This is source code modified by FUJITSU LIMITED under the Joint * Development Agreement for the CDE/Motif PST. */ -/* $XFree86: xc/lib/X11/lcGeneric.c,v 3.20 2003/09/24 02:43:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcGeneric.c,v 3.21 2006/01/09 14:58:43 dawes Exp $ */ #include #include "Xlibint.h" Index: xc/lib/X11/lcInit.c diff -u xc/lib/X11/lcInit.c:3.10 xc/lib/X11/lcInit.c:3.11 --- xc/lib/X11/lcInit.c:3.10 Fri Nov 1 08:43:31 2002 +++ xc/lib/X11/lcInit.c Mon Jan 9 09:58:43 2006 @@ -41,7 +41,6 @@ Sun Microsystems, Inc. or its licensors is granted. */ -/* $Xorg: lcInit.c,v 1.4 2000/12/12 12:44:05 coskrey Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -74,7 +73,7 @@ * Modifier: Masayoshi Shimamura FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/lcInit.c,v 3.10 2002/11/01 13:43:31 alanh Exp $ */ +/* $XFree86: xc/lib/X11/lcInit.c,v 3.11 2006/01/09 14:58:43 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/lcJis.c diff -u xc/lib/X11/lcJis.c:1.10 xc/lib/X11/lcJis.c:1.11 --- xc/lib/X11/lcJis.c:1.10 Sun Jan 19 23:05:31 2003 +++ xc/lib/X11/lcJis.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcJis.c,v 1.3 2000/08/17 19:45:18 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcJis.c,v 1.10 2003/01/20 04:05:31 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcJis.c,v 1.11 2006/01/09 14:58:43 dawes Exp $ */ /* * A Japanese JIS locale. Index: xc/lib/X11/lcPrTxt.c diff -u xc/lib/X11/lcPrTxt.c:1.10 xc/lib/X11/lcPrTxt.c:1.11 --- xc/lib/X11/lcPrTxt.c:1.10 Thu May 29 09:22:51 2003 +++ xc/lib/X11/lcPrTxt.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcPrTxt.c,v 1.3 2000/08/17 19:45:18 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.10 2003/05/29 13:22:51 pascal Exp $ */ +/* $XFree86: xc/lib/X11/lcPrTxt.c,v 1.11 2006/01/09 14:58:43 dawes Exp $ */ #include "Xlibint.h" #include "XlcPubI.h" Index: xc/lib/X11/lcPubWrap.c diff -u xc/lib/X11/lcPubWrap.c:1.5 xc/lib/X11/lcPubWrap.c:1.6 --- xc/lib/X11/lcPubWrap.c:1.5 Wed Jul 25 11:04:45 2001 +++ xc/lib/X11/lcPubWrap.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcPubWrap.c,v 1.3 2000/08/17 19:45:18 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcPubWrap.c,v 1.5 2001/07/25 15:04:45 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcPubWrap.c,v 1.6 2006/01/09 14:58:43 dawes Exp $ */ #include "Xlibint.h" #include "XlcPubI.h" Index: xc/lib/X11/lcPublic.c diff -u xc/lib/X11/lcPublic.c:1.12 xc/lib/X11/lcPublic.c:1.13 --- xc/lib/X11/lcPublic.c:1.12 Sun Apr 13 15:22:21 2003 +++ xc/lib/X11/lcPublic.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcPublic.c,v 1.4 2000/12/12 12:44:05 coskrey Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcPublic.c,v 1.12 2003/04/13 19:22:21 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcPublic.c,v 1.13 2006/01/09 14:58:43 dawes Exp $ */ #include #include "Xlibint.h" Index: xc/lib/X11/lcRM.c diff -u xc/lib/X11/lcRM.c:1.5 xc/lib/X11/lcRM.c:1.6 --- xc/lib/X11/lcRM.c:1.5 Wed Jan 17 14:41:55 2001 +++ xc/lib/X11/lcRM.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcRM.c,v 1.3 2000/08/17 19:45:19 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -24,7 +23,7 @@ * mopi@osa.ilab.toshiba.co.jp * Bug fixes: Bruno Haible XFree86 Inc. */ -/* $XFree86: xc/lib/X11/lcRM.c,v 1.5 2001/01/17 19:41:55 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcRM.c,v 1.6 2006/01/09 14:58:43 dawes Exp $ */ #include "Xlibint.h" #include "XlcPubI.h" Index: xc/lib/X11/lcSjis.c diff -u xc/lib/X11/lcSjis.c:3.10 xc/lib/X11/lcSjis.c:3.11 --- xc/lib/X11/lcSjis.c:3.10 Sun Jan 19 23:05:31 2003 +++ xc/lib/X11/lcSjis.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcSjis.c,v 1.3 2000/08/17 19:45:19 cpqbld Exp $ */ /**************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED @@ -35,7 +34,7 @@ makoto@sm.sony.co.jp *****************************************************************/ -/* $XFree86: xc/lib/X11/lcSjis.c,v 3.10 2003/01/20 04:05:31 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcSjis.c,v 3.11 2006/01/09 14:58:43 dawes Exp $ */ /* * A Japanese SJIS locale. Index: xc/lib/X11/lcStd.c diff -u xc/lib/X11/lcStd.c:1.7 xc/lib/X11/lcStd.c:1.8 --- xc/lib/X11/lcStd.c:1.7 Wed Apr 16 22:06:32 2003 +++ xc/lib/X11/lcStd.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcStd.c,v 1.4 2000/08/17 19:45:20 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcStd.c,v 1.7 2003/04/17 02:06:32 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcStd.c,v 1.8 2006/01/09 14:58:43 dawes Exp $ */ #include "Xlibint.h" #include "XlcPubI.h" Index: xc/lib/X11/lcTxtPr.c diff -u xc/lib/X11/lcTxtPr.c:3.4 xc/lib/X11/lcTxtPr.c:3.5 --- xc/lib/X11/lcTxtPr.c:3.4 Sat Oct 27 23:32:35 2001 +++ xc/lib/X11/lcTxtPr.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcTxtPr.c,v 1.3 2000/08/17 19:45:20 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/lcTxtPr.c,v 3.4 2001/10/28 03:32:35 tsi Exp $ */ +/* $XFree86: xc/lib/X11/lcTxtPr.c,v 3.5 2006/01/09 14:58:43 dawes Exp $ */ #include "Xlibint.h" #include "XlcPubI.h" Index: xc/lib/X11/lcUTF8.c diff -u xc/lib/X11/lcUTF8.c:1.17 xc/lib/X11/lcUTF8.c:1.18 --- xc/lib/X11/lcUTF8.c:1.17 Thu Mar 25 21:06:45 2004 +++ xc/lib/X11/lcUTF8.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $TOG: $ */ /****************************************************************** Copyright 1993 by SunSoft, Inc. @@ -24,7 +23,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/lcUTF8.c,v 1.17 2004/03/26 02:06:45 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcUTF8.c,v 1.18 2006/01/09 14:58:43 dawes Exp $ */ /* * This file contains: Index: xc/lib/X11/lcUTF8Load.c diff -u xc/lib/X11/lcUTF8Load.c:1.1 xc/lib/X11/lcUTF8Load.c:1.2 --- xc/lib/X11/lcUTF8Load.c:1.1 Fri Nov 16 09:40:46 2001 +++ xc/lib/X11/lcUTF8Load.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $TOG: $ */ /****************************************************************** Copyright 1993 by SunSoft, Inc. @@ -24,7 +23,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/X11/lcUTF8Load.c,v 1.1 2001/11/16 14:40:46 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcUTF8Load.c,v 1.2 2006/01/09 14:58:43 dawes Exp $ */ /* * This file contains the UTF-8 locale loader. Index: xc/lib/X11/lcUtil.c diff -u xc/lib/X11/lcUtil.c:1.4 xc/lib/X11/lcUtil.c:1.5 --- xc/lib/X11/lcUtil.c:1.4 Wed Jan 17 14:41:55 2001 +++ xc/lib/X11/lcUtil.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcUtil.c,v 1.3 2000/08/17 19:45:20 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -24,7 +23,7 @@ * mopi@osa.ilab.toshiba.co.jp * Bug fixes: Bruno Haible XFree86 Inc. */ -/* $XFree86: xc/lib/X11/lcUtil.c,v 1.4 2001/01/17 19:41:55 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcUtil.c,v 1.5 2006/01/09 14:58:43 dawes Exp $ */ #include #include "XlcPublic.h" Index: xc/lib/X11/lcWrap.c diff -u xc/lib/X11/lcWrap.c:3.16 xc/lib/X11/lcWrap.c:3.17 --- xc/lib/X11/lcWrap.c:3.16 Wed Apr 16 22:06:32 2003 +++ xc/lib/X11/lcWrap.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lcWrap.c,v 1.6 2001/02/09 02:03:39 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -53,7 +52,7 @@ * * Katsuhisa Yano TOSHIBA Corp. */ -/* $XFree86: xc/lib/X11/lcWrap.c,v 3.16 2003/04/17 02:06:32 dawes Exp $ */ +/* $XFree86: xc/lib/X11/lcWrap.c,v 3.17 2006/01/09 14:58:43 dawes Exp $ */ #include #include "Xlibint.h" Index: xc/lib/X11/libX11.elist diff -u xc/lib/X11/libX11.elist:1.1.1.2 xc/lib/X11/libX11.elist:1.2 --- xc/lib/X11/libX11.elist:1.1.1.2 Tue Jan 16 17:12:58 2001 +++ xc/lib/X11/libX11.elist Mon Jan 9 09:58:43 2006 @@ -1,4 +1,4 @@ -/* $Xorg: libX11.elist,v 1.3 2000/08/17 19:45:20 cpqbld Exp $ */ +/* $XFree86: xc/lib/X11/libX11.elist,v 1.2 2006/01/09 14:58:43 dawes Exp $ */ /************************************************************************* * Export list for libX11 Index: xc/lib/X11/locking.c diff -u xc/lib/X11/locking.c:1.6 xc/lib/X11/locking.c:1.7 --- xc/lib/X11/locking.c:1.6 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/locking.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: locking.c,v 1.5 2001/02/09 02:03:40 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/locking.c,v 1.6 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/locking.c,v 1.7 2006/01/09 14:58:43 dawes Exp $ */ /* * Author: Stephen Gildea, MIT X Consortium Index: xc/lib/X11/locking.h diff -u xc/lib/X11/locking.h:1.5 xc/lib/X11/locking.h:1.6 --- xc/lib/X11/locking.h:1.5 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/locking.h Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: locking.h,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/locking.h,v 1.5 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/locking.h,v 1.6 2006/01/09 14:58:43 dawes Exp $ */ /* * Author: Stephen Gildea, MIT X Consortium Index: xc/lib/X11/mbWMProps.c diff -u xc/lib/X11/mbWMProps.c:1.6 xc/lib/X11/mbWMProps.c:1.7 --- xc/lib/X11/mbWMProps.c:1.6 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/mbWMProps.c Mon Jan 9 09:58:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mbWMProps.c,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/mbWMProps.c,v 1.6 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/mbWMProps.c,v 1.7 2006/01/09 14:58:43 dawes Exp $ */ #include #include Index: xc/lib/X11/mbWrap.c diff -u xc/lib/X11/mbWrap.c:1.7 xc/lib/X11/mbWrap.c:1.8 --- xc/lib/X11/mbWrap.c:1.7 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/mbWrap.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mbWrap.c,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -50,7 +49,7 @@ * * M. Collins OSF */ -/* $XFree86: xc/lib/X11/mbWrap.c,v 1.7 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/mbWrap.c,v 1.8 2006/01/09 14:58:44 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/omDefault.c diff -u xc/lib/X11/omDefault.c:1.7 xc/lib/X11/omDefault.c:1.8 --- xc/lib/X11/omDefault.c:1.7 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/omDefault.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: omDefault.c,v 1.3 2000/08/17 19:45:21 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -28,7 +27,7 @@ * This is source code modified by FUJITSU LIMITED under the Joint * Development Agreement for the CDE/Motif PST. */ -/* $XFree86: xc/lib/X11/omDefault.c,v 1.7 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/omDefault.c,v 1.8 2006/01/09 14:58:44 dawes Exp $ */ #include "Xlibint.h" #include "XomGeneric.h" Index: xc/lib/X11/omGeneric.c diff -u xc/lib/X11/omGeneric.c:3.28 xc/lib/X11/omGeneric.c:3.29 --- xc/lib/X11/omGeneric.c:3.28 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/omGeneric.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: omGeneric.c,v 1.6 2000/08/17 19:45:21 cpqbld Exp $ */ /* #define FONTDEBUG */ /* * Copyright 1992, 1993 by TOSHIBA Corp. @@ -32,7 +31,7 @@ * Modifier: Takanori Tateno FUJITSU LIMITED * */ -/* $XFree86: xc/lib/X11/omGeneric.c,v 3.28 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/omGeneric.c,v 3.29 2006/01/09 14:58:44 dawes Exp $ */ /* * Fixed the algorithms in parse_fontname() and parse_fontdata() Index: xc/lib/X11/omImText.c diff -u xc/lib/X11/omImText.c:1.6 xc/lib/X11/omImText.c:1.7 --- xc/lib/X11/omImText.c:1.6 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/omImText.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: omImText.c,v 1.3 2000/08/17 19:45:22 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omImText.c,v 1.6 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/omImText.c,v 1.7 2006/01/09 14:58:44 dawes Exp $ */ #include "Xlibint.h" #include "XomGeneric.h" Index: xc/lib/X11/omText.c diff -u xc/lib/X11/omText.c:1.10 xc/lib/X11/omText.c:1.11 --- xc/lib/X11/omText.c:1.10 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/omText.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: omText.c,v 1.3 2000/08/17 19:45:22 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omText.c,v 1.10 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/omText.c,v 1.11 2006/01/09 14:58:44 dawes Exp $ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint Index: xc/lib/X11/omTextEsc.c diff -u xc/lib/X11/omTextEsc.c:1.7 xc/lib/X11/omTextEsc.c:1.8 --- xc/lib/X11/omTextEsc.c:1.7 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/omTextEsc.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: omTextEsc.c,v 1.3 2000/08/17 19:45:22 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omTextEsc.c,v 1.7 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/omTextEsc.c,v 1.8 2006/01/09 14:58:44 dawes Exp $ */ /* * Copyright 1995 by FUJITSU LIMITED * This is source code modified by FUJITSU LIMITED under the Joint Index: xc/lib/X11/omTextExt.c diff -u xc/lib/X11/omTextExt.c:1.6 xc/lib/X11/omTextExt.c:1.7 --- xc/lib/X11/omTextExt.c:1.6 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/omTextExt.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: omTextExt.c,v 1.3 2000/08/17 19:45:22 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omTextExt.c,v 1.6 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/omTextExt.c,v 1.7 2006/01/09 14:58:44 dawes Exp $ */ #include "Xlibint.h" #include "XomGeneric.h" Index: xc/lib/X11/omTextPer.c diff -u xc/lib/X11/omTextPer.c:1.7 xc/lib/X11/omTextPer.c:1.8 --- xc/lib/X11/omTextPer.c:1.7 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/omTextPer.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: omTextPer.c,v 1.3 2000/08/17 19:45:22 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -23,7 +22,7 @@ * Author: Katsuhisa Yano TOSHIBA Corp. * mopi@osa.ilab.toshiba.co.jp */ -/* $XFree86: xc/lib/X11/omTextPer.c,v 1.7 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/omTextPer.c,v 1.8 2006/01/09 14:58:44 dawes Exp $ */ #include "Xlibint.h" #include "XomGeneric.h" Index: xc/lib/X11/omXChar.c diff -u xc/lib/X11/omXChar.c:1.7 xc/lib/X11/omXChar.c:1.8 --- xc/lib/X11/omXChar.c:1.7 Tue May 27 18:26:27 2003 +++ xc/lib/X11/omXChar.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: omXChar.c,v 1.3 2000/08/17 19:45:23 cpqbld Exp $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * @@ -34,7 +33,7 @@ /* * Modifiers: Jeff Walls, Paul Anderson (HEWLETT-PACKARD) */ -/* $XFree86: xc/lib/X11/omXChar.c,v 1.7 2003/05/27 22:26:27 tsi Exp $ */ +/* $XFree86: xc/lib/X11/omXChar.c,v 1.8 2006/01/09 14:58:44 dawes Exp $ */ #include "Xlibint.h" #include "XlcPublic.h" Index: xc/lib/X11/poly.h diff -u xc/lib/X11/poly.h:1.2 xc/lib/X11/poly.h:1.3 --- xc/lib/X11/poly.h:1.2 Fri Dec 14 14:54:10 2001 +++ xc/lib/X11/poly.h Mon Jan 9 09:58:44 2006 @@ -1,4 +1,4 @@ -/* $Xorg: poly.h,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/poly.h,v 1.3 2006/01/09 14:58:44 dawes Exp $ */ /************************************************************************ Copyright 1987, 1998 The Open Group Index: xc/lib/X11/region.h diff -u xc/lib/X11/region.h:1.2 xc/lib/X11/region.h:1.3 --- xc/lib/X11/region.h:1.2 Fri Dec 14 14:54:10 2001 +++ xc/lib/X11/region.h Mon Jan 9 09:58:44 2006 @@ -1,4 +1,4 @@ -/* $Xorg: region.h,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */ +/* $XFree86: xc/lib/X11/region.h,v 1.3 2006/01/09 14:58:44 dawes Exp $ */ /************************************************************************ Copyright 1987, 1998 The Open Group Index: xc/lib/X11/udcInf.c diff -u xc/lib/X11/udcInf.c:1.7 xc/lib/X11/udcInf.c:1.8 --- xc/lib/X11/udcInf.c:1.7 Fri Dec 14 14:54:11 2001 +++ xc/lib/X11/udcInf.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: udcInf.c,v 1.7 2001/02/09 02:03:40 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -33,7 +32,7 @@ * */ -/* $XFree86: xc/lib/X11/udcInf.c,v 1.7 2001/12/14 19:54:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/udcInf.c,v 1.8 2006/01/09 14:58:44 dawes Exp $ */ #include #include Index: xc/lib/X11/utf8WMProps.c diff -u xc/lib/X11/utf8WMProps.c:1.3 xc/lib/X11/utf8WMProps.c:1.4 --- xc/lib/X11/utf8WMProps.c:1.3 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/utf8WMProps.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $TOG: mbWMProps.c /main/6 1998/02/06 17:44:24 kaleb $ */ /* Copyright 1991, 1998 The Open Group @@ -48,7 +47,7 @@ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE * OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/X11/utf8WMProps.c,v 1.3 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/utf8WMProps.c,v 1.4 2006/01/09 14:58:44 dawes Exp $ */ #include #include Index: xc/lib/X11/utf8Wrap.c diff -u xc/lib/X11/utf8Wrap.c:1.4 xc/lib/X11/utf8Wrap.c:1.5 --- xc/lib/X11/utf8Wrap.c:1.4 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/utf8Wrap.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $TOG: mbWrap.c /main/7 1998/02/06 17:44:30 kaleb $ */ /* Copyright 1991, 1998 The Open Group @@ -72,7 +71,7 @@ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE * OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/X11/utf8Wrap.c,v 1.4 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/utf8Wrap.c,v 1.5 2006/01/09 14:58:44 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/uvY.c diff -u xc/lib/X11/uvY.c:1.4 xc/lib/X11/uvY.c:1.5 --- xc/lib/X11/uvY.c:1.4 Sun Apr 13 15:22:22 2003 +++ xc/lib/X11/uvY.c Mon Jan 9 09:58:44 2006 @@ -1,5 +1,3 @@ -/* $Xorg: uvY.c,v 1.3 2000/08/17 19:45:23 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -35,7 +33,7 @@ * DOCUMENTATION * "TekColor Color Management System, System Implementor's Manual" */ -/* $XFree86: xc/lib/X11/uvY.c,v 1.4 2003/04/13 19:22:22 dawes Exp $ */ +/* $XFree86: xc/lib/X11/uvY.c,v 1.5 2006/01/09 14:58:44 dawes Exp $ */ #include #include "Xlibint.h" Index: xc/lib/X11/wcWrap.c diff -u xc/lib/X11/wcWrap.c:1.7 xc/lib/X11/wcWrap.c:1.8 --- xc/lib/X11/wcWrap.c:1.7 Mon Nov 17 17:20:12 2003 +++ xc/lib/X11/wcWrap.c Mon Jan 9 09:58:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: wcWrap.c,v 1.4 2001/02/09 02:03:40 xorgcvs Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -51,7 +50,7 @@ * * M. Collins OSF */ -/* $XFree86: xc/lib/X11/wcWrap.c,v 1.7 2003/11/17 22:20:12 dawes Exp $ */ +/* $XFree86: xc/lib/X11/wcWrap.c,v 1.8 2006/01/09 14:58:44 dawes Exp $ */ #include "Xlibint.h" #include "Xlcint.h" Index: xc/lib/X11/xyY.c diff -u xc/lib/X11/xyY.c:1.4 xc/lib/X11/xyY.c:1.5 --- xc/lib/X11/xyY.c:1.4 Sun Apr 13 15:22:22 2003 +++ xc/lib/X11/xyY.c Mon Jan 9 09:58:44 2006 @@ -1,5 +1,3 @@ -/* $Xorg: xyY.c,v 1.3 2000/08/17 19:45:23 cpqbld Exp $ */ - /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved @@ -34,7 +32,7 @@ * DOCUMENTATION * "TekColor Color Management System, System Implementor's Manual" */ -/* $XFree86: xc/lib/X11/xyY.c,v 1.4 2003/04/13 19:22:22 dawes Exp $ */ +/* $XFree86: xc/lib/X11/xyY.c,v 1.5 2006/01/09 14:58:44 dawes Exp $ */ #include #include Index: xc/lib/X11/util/makekeys.c diff -u xc/lib/X11/util/makekeys.c:3.8 xc/lib/X11/util/makekeys.c:3.9 --- xc/lib/X11/util/makekeys.c:3.8 Sun Jan 16 22:07:41 2005 +++ xc/lib/X11/util/makekeys.c Mon Jan 9 09:58:59 2006 @@ -1,4 +1,3 @@ -/* $Xorg: makekeys.c,v 1.5 2001/02/09 02:03:40 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/X11/util/makekeys.c,v 3.8 2005/01/17 03:07:41 tsi Exp $ */ +/* $XFree86: xc/lib/X11/util/makekeys.c,v 3.9 2006/01/09 14:58:59 dawes Exp $ */ /* Constructs hash tables for XStringToKeysym and XKeysymToString. */ Index: xc/lib/X11/xlibi18n/im/Imakefile diff -u xc/lib/X11/xlibi18n/im/Imakefile:1.1 xc/lib/X11/xlibi18n/im/Imakefile:1.2 --- xc/lib/X11/xlibi18n/im/Imakefile:1.1 Thu Nov 15 19:52:29 2001 +++ xc/lib/X11/xlibi18n/im/Imakefile Mon Jan 9 09:58:59 2006 @@ -1,4 +1,5 @@ -XCOMM $XConsortium: Imakefile,v 1.27 94/04/07 15:01:48 rws Exp $ +XCOMM $XFree86: xc/lib/X11/xlibi18n/im/Imakefile,v 1.2 2006/01/09 14:58:59 dawes Exp $ + #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" Index: xc/lib/X11/xlibi18n/im/ximcp/Imakefile diff -u xc/lib/X11/xlibi18n/im/ximcp/Imakefile:1.5 xc/lib/X11/xlibi18n/im/ximcp/Imakefile:1.6 --- xc/lib/X11/xlibi18n/im/ximcp/Imakefile:1.5 Mon May 31 20:16:56 2004 +++ xc/lib/X11/xlibi18n/im/ximcp/Imakefile Tue Mar 29 12:38:11 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/X11/xlibi18n/im/ximcp/Imakefile,v 1.5 2004/06/01 00:16:56 dawes Exp $ +XCOMM $XFree86: xc/lib/X11/xlibi18n/im/ximcp/Imakefile,v 1.6 2005/03/29 17:38:11 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -55,7 +55,14 @@ imRm.c imRmAttr.c \ imThaiFlt.c imThaiIc.c imThaiIm.c \ imTrX.c imTransR.c imTrans.c - OBJS = ${SRCS:.c=.o} + OBJS = imCallbk.o imDefFlt.o imDefIc.o \ + imDefIm.o imDefLkup.o imDispch.o imEvToWire.o \ + imExten.o imImSw.o imInsClbk.o imInt.o \ + imLcFlt.o imLcGIc.o imLcIc.o imLcIm.o imLcLkup.o \ + imLcPrs.o imLcSIc.o \ + imRm.o imRmAttr.o \ + imThaiFlt.o imThaiIc.o imThaiIm.o \ + imTrX.o imTransR.o imTrans.o CONN_DEFINES = ConnectionFlags XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT @@ -98,4 +105,4 @@ SpecialCLibObjectRule(imConv,$(ICONFIGFILES),$(XKB_DEFINES)) #endif - +DependTarget() Index: xc/lib/X11/xlibi18n/lc/Imakefile diff -u xc/lib/X11/xlibi18n/lc/Imakefile:1.1 xc/lib/X11/xlibi18n/lc/Imakefile:1.2 --- xc/lib/X11/xlibi18n/lc/Imakefile:1.1 Thu Nov 15 19:52:29 2001 +++ xc/lib/X11/xlibi18n/lc/Imakefile Mon Jan 9 09:58:59 2006 @@ -1,4 +1,5 @@ -XCOMM $XConsortium: Imakefile,v 1.27 94/04/07 15:01:48 rws Exp $ +XCOMM $XFree86: xc/lib/X11/xlibi18n/lc/Imakefile,v 1.2 2006/01/09 14:58:59 dawes Exp $ + #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" Index: xc/lib/X11/xlibi18n/lc/Utf8/Imakefile diff -u xc/lib/X11/xlibi18n/lc/Utf8/Imakefile:1.5 xc/lib/X11/xlibi18n/lc/Utf8/Imakefile:1.6 --- xc/lib/X11/xlibi18n/lc/Utf8/Imakefile:1.5 Mon May 31 20:16:56 2004 +++ xc/lib/X11/xlibi18n/lc/Utf8/Imakefile Tue Mar 29 12:38:11 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/X11/xlibi18n/lc/Utf8/Imakefile,v 1.5 2004/06/01 00:16:56 dawes Exp $ +XCOMM $XFree86: xc/lib/X11/xlibi18n/lc/Utf8/Imakefile,v 1.6 2005/03/29 17:38:11 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -49,7 +49,7 @@ EXTRA_INCLUDES = -I../../.. XI18NLIBNAME = xlibi18n SRCS = lcUTF8Load.c - OBJS = ${SRCS:.c=.o} + OBJS = lcUTF8Load.o REQUIREDLIBS = SharedXlibi18nReqs LinkSourceFile(lcUTF8Load.c, ../../..) @@ -58,3 +58,4 @@ #include "../../Xi18nLib.conf" +DependTarget() Index: xc/lib/X11/xlibi18n/lc/def/Imakefile diff -u xc/lib/X11/xlibi18n/lc/def/Imakefile:1.5 xc/lib/X11/xlibi18n/lc/def/Imakefile:1.7 --- xc/lib/X11/xlibi18n/lc/def/Imakefile:1.5 Mon May 31 20:16:56 2004 +++ xc/lib/X11/xlibi18n/lc/def/Imakefile Sat Dec 31 12:12:33 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/X11/xlibi18n/lc/def/Imakefile,v 1.5 2004/06/01 00:16:56 dawes Exp $ +XCOMM $XFree86: xc/lib/X11/xlibi18n/lc/def/Imakefile,v 1.7 2005/12/31 17:12:33 dawes Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -46,13 +46,11 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $XOZ$ */ - EXTRA_INCLUDES = -I../../.. XI18NLIBNAME = xlcDef SRCS = lcDefConv.c - OBJS = ${SRCS:.c=.o} + OBJS = lcDefConv.o REQUIREDLIBS = SharedXlibi18nReqs LinkSourceFile(lcDefConv.c, ../../..) @@ -61,3 +59,4 @@ #include "../../Xi18nLib.conf" +DependTarget() Index: xc/lib/X11/xlibi18n/lc/gen/Imakefile diff -u xc/lib/X11/xlibi18n/lc/gen/Imakefile:1.5 xc/lib/X11/xlibi18n/lc/gen/Imakefile:1.6 --- xc/lib/X11/xlibi18n/lc/gen/Imakefile:1.5 Mon May 31 20:16:56 2004 +++ xc/lib/X11/xlibi18n/lc/gen/Imakefile Tue Mar 29 12:38:11 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/X11/xlibi18n/lc/gen/Imakefile,v 1.5 2004/06/01 00:16:56 dawes Exp $ +XCOMM $XFree86: xc/lib/X11/xlibi18n/lc/gen/Imakefile,v 1.6 2005/03/29 17:38:11 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -49,7 +49,7 @@ EXTRA_INCLUDES = -I../../.. XI18NLIBNAME = xlibi18n SRCS = lcGenConv.c - OBJS = ${SRCS:.c=.o} + OBJS = lcGenConv.o REQUIREDLIBS = SharedXlibi18nReqs LinkSourceFile(lcGenConv.c, ../../..) @@ -58,3 +58,4 @@ #include "../../Xi18nLib.conf" +DependTarget() Index: xc/lib/X11/xlibi18n/lc/xlocale/Imakefile diff -u xc/lib/X11/xlibi18n/lc/xlocale/Imakefile:1.5 xc/lib/X11/xlibi18n/lc/xlocale/Imakefile:1.6 --- xc/lib/X11/xlibi18n/lc/xlocale/Imakefile:1.5 Mon May 31 20:16:57 2004 +++ xc/lib/X11/xlibi18n/lc/xlocale/Imakefile Tue Mar 29 12:38:11 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/X11/xlibi18n/lc/xlocale/Imakefile,v 1.5 2004/06/01 00:16:57 dawes Exp $ +XCOMM $XFree86: xc/lib/X11/xlibi18n/lc/xlocale/Imakefile,v 1.6 2005/03/29 17:38:11 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -49,7 +49,7 @@ EXTRA_INCLUDES = -I../../.. XI18NLIBNAME = xlocale SRCS = lcEuc.c lcSjis.c lcJis.c - OBJS = ${SRCS:.c=.o} + OBJS = lcEuc.o lcSjis.o lcJis.o REQUIREDLIBS = SharedXlibi18nReqs LinkSourceFile(lcEuc.c, ../../..) @@ -60,3 +60,4 @@ #include "../../Xi18nLib.conf" +DependTarget() Index: xc/lib/X11/xlibi18n/om/Imakefile diff -u xc/lib/X11/xlibi18n/om/Imakefile:1.1 xc/lib/X11/xlibi18n/om/Imakefile:1.2 --- xc/lib/X11/xlibi18n/om/Imakefile:1.1 Thu Nov 15 19:52:30 2001 +++ xc/lib/X11/xlibi18n/om/Imakefile Mon Jan 9 09:59:00 2006 @@ -1,4 +1,5 @@ -XCOMM $XConsortium: Imakefile,v 1.27 94/04/07 15:01:48 rws Exp $ +XCOMM $XFree86: xc/lib/X11/xlibi18n/om/Imakefile,v 1.2 2006/01/09 14:59:00 dawes Exp $ + #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" Index: xc/lib/X11/xlibi18n/om/generic/Imakefile diff -u xc/lib/X11/xlibi18n/om/generic/Imakefile:1.5 xc/lib/X11/xlibi18n/om/generic/Imakefile:1.6 --- xc/lib/X11/xlibi18n/om/generic/Imakefile:1.5 Mon May 31 20:16:57 2004 +++ xc/lib/X11/xlibi18n/om/generic/Imakefile Tue Mar 29 12:38:12 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/X11/xlibi18n/om/generic/Imakefile,v 1.5 2004/06/01 00:16:57 dawes Exp $ +XCOMM $XFree86: xc/lib/X11/xlibi18n/om/generic/Imakefile,v 1.6 2005/03/29 17:38:12 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -49,8 +49,8 @@ EXTRA_INCLUDES = -I../../.. SRCS = omDefault.c omGeneric.c omImText.c omText.c \ omTextEsc.c omTextExt.c omTextPer.c omXChar.c - - OBJS = ${SRCS:.c=.o} + OBJS = omDefault.o omGeneric.o omImText.o omText.o \ + omTextEsc.o omTextExt.o omTextPer.o omXChar.o REQUIREDLIBS = SharedXlibi18nReqs LinkSourceFile(omDefault.c, ../../..) @@ -66,3 +66,4 @@ #include "../../Xi18nLib.conf" +DependTarget() Index: xc/lib/XThrStub/Imakefile diff -u xc/lib/XThrStub/Imakefile:3.4 xc/lib/XThrStub/Imakefile:3.5 --- xc/lib/XThrStub/Imakefile:3.4 Wed Mar 2 22:32:17 2005 +++ xc/lib/XThrStub/Imakefile Tue Mar 29 13:17:00 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/XThrStub/Imakefile,v 3.4 2005/03/03 03:32:17 dawes Exp $ +XCOMM $XFree86: xc/lib/XThrStub/Imakefile,v 3.5 2005/03/29 18:17:00 tsi Exp $ #define DoNormalLib NormalLibXThrStub #define DoSharedLib SharedLibXThrStub #define DoExtraLib ExtraLibXThrStub @@ -14,10 +14,8 @@ REQUIREDLIBS = SharedXThrStubReqs #endif -#if NeedUIThrStubs || (defined(ThrStubsForCompat) && ThrStubsForCompat) STUBSRCS = UIThrStubs.c STUBOBJS = UIThrStubs.o -#endif #if Malloc0ReturnsNull ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL Index: xc/lib/XThrStub/UIThrStubs.c diff -u xc/lib/XThrStub/UIThrStubs.c:3.6 xc/lib/XThrStub/UIThrStubs.c:3.8 --- xc/lib/XThrStub/UIThrStubs.c:3.6 Mon May 31 20:16:57 2004 +++ xc/lib/XThrStub/UIThrStubs.c Tue Mar 29 13:17:00 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/XThrStub/UIThrStubs.c,v 3.6 2004/06/01 00:16:57 dawes Exp $ + * $XFree86: xc/lib/XThrStub/UIThrStubs.c,v 3.8 2005/03/29 18:17:00 tsi Exp $ * * Copyright (c) 1995 David E. Wexelblat. All rights reserved * @@ -143,9 +143,13 @@ #pragma weak tis_cond_signal = _Xthr_zero_stub_ #pragma weak tis_cond_broadcast = _Xthr_zero_stub_ #else +#ifdef sgi +#include +#else #include +#endif typedef pthread_t xthread_t; -#if __GNUC__ >= 3 +#if defined(__GNUC__) && (__GNUC__ >= 3) xthread_t pthread_self() __attribute__ ((weak, alias ("_Xthr_self_stub_"))); int pthread_mutex_init() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); int pthread_mutex_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); @@ -157,8 +161,12 @@ int pthread_cond_signal() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); int pthread_cond_broadcast() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); int pthread_key_create() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -void *pthread_getspecific() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); +void *pthread_getspecific() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); int pthread_setspecific() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); +#if defined(_DECTHREADS_) || defined(linux) +/* See Xthreads.h! */ +int pthread_equal() __attribute__ ((weak, alias ("_Xthr_equal_stub_"))); +#endif /* _DECTHREADS_ || linux */ #else /* __GNUC__ */ #pragma weak pthread_self = _Xthr_self_stub_ #pragma weak pthread_mutex_init = _Xthr_zero_stub_ @@ -174,11 +182,13 @@ #pragma weak pthread_key_create = _Xthr_zero_stub_ #pragma weak pthread_getspecific = _Xthr_zero_stub_ #pragma weak pthread_setspecific = _Xthr_zero_stub_ -#endif /* __GNUC__ */ #if defined(_DECTHREADS_) || defined(linux) #pragma weak pthread_equal = _Xthr_equal_stub_ /* See Xthreads.h! */ +#endif /* _DECTHREADS_ || linux */ +#endif /* __GNUC__ */ +#if defined(_DECTHREADS_) || defined(linux) int -_Xthr_equal_stub_() +_Xthr_equal_stub_(xthread_t a, xthread_t b) { return(1); } @@ -188,7 +198,9 @@ #endif /* SVR4 */ #endif /* CTHREADS */ -static xthread_t + +xthread_t _Xthr_self_stub_(void); +xthread_t _Xthr_self_stub_(void) { static xthread_t _X_no_thread_id; @@ -196,8 +208,10 @@ return(_X_no_thread_id); /* defined by */ } -static int +int _Xthr_zero_stub_(void); +int _Xthr_zero_stub_(void) { return(0); } + Index: xc/lib/XTrap/Imakefile diff -u xc/lib/XTrap/Imakefile:1.1 xc/lib/XTrap/Imakefile:1.2 --- xc/lib/XTrap/Imakefile:1.1 Fri Nov 2 18:29:27 2001 +++ xc/lib/XTrap/Imakefile Fri Oct 14 11:15:59 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/XTrap/Imakefile,v 1.1 2001/11/02 23:29:27 dawes Exp $ +XCOMM $XFree86: xc/lib/XTrap/Imakefile,v 1.2 2005/10/14 15:15:59 tsi Exp $ #define DoNormalLib NormalLibXTrap #define DoSharedLib SharedLibXTrap @@ -15,7 +15,7 @@ #endif XCOMM wish this weren't necessary, but need xlib and xt internals... -INCLUDES=-I$(TOP)/include -I$(TOOLKITSRC) +INCLUDES=-I$(TOOLKITSRC) SRCS = XECallBcks.c XEConTxt.c XEDsptch.c XEPrInfo.c \ Index: xc/lib/XTrap/XECallBcks.c diff -u xc/lib/XTrap/XECallBcks.c:1.1 xc/lib/XTrap/XECallBcks.c:1.2 --- xc/lib/XTrap/XECallBcks.c:1.1 Fri Nov 2 18:29:27 2001 +++ xc/lib/XTrap/XECallBcks.c Thu Mar 24 21:22:52 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/XTrap/XECallBcks.c,v 1.1 2001/11/02 23:29:27 dawes Exp $ */ +/* $XFree86: xc/lib/XTrap/XECallBcks.c,v 1.2 2005/03/25 02:22:52 dawes Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA @@ -43,7 +43,7 @@ #include #include -int XEAddRequestCB(XETC *tc, CARD8 req, void_function func, BYTE *data) +int XEAddRequestCB(XETC *tc, CARD8 req, XETrapCBProc func, BYTE *data) { if (!tc->values.req_cb) { /* This is the first time for this particular TC, need to malloc */ @@ -60,7 +60,7 @@ return(True); } -int XEAddRequestCBs(XETC *tc, ReqFlags req_flags, void_function func, +int XEAddRequestCBs(XETC *tc, ReqFlags req_flags, XETrapCBProc func, BYTE *data) { int i; @@ -76,7 +76,7 @@ return(status); } -int XEAddEventCB(XETC *tc, CARD8 evt, void_function func, BYTE *data) +int XEAddEventCB(XETC *tc, CARD8 evt, XETrapCBProc func, BYTE *data) { if (!tc->values.evt_cb) { /* This is the first time for this particular TC, need to malloc */ @@ -93,7 +93,7 @@ return(True); } -int XEAddEventCBs(XETC *tc, EventFlags evt_flags, void_function func, +int XEAddEventCBs(XETC *tc, EventFlags evt_flags, XETrapCBProc func, BYTE *data) { int i; @@ -115,7 +115,7 @@ { /* We gotta problem! CB struct not allocated! */ return; } - tc->values.req_cb[req].func = (void_function)NULL; + tc->values.req_cb[req].func = (XETrapCBProc)NULL; tc->values.req_cb[req].data = (BYTE *)NULL; return; } @@ -147,7 +147,7 @@ { /* We gotta problem! CB struct not allocated! */ return; } - tc->values.evt_cb[evt].func = (void_function)NULL; + tc->values.evt_cb[evt].func = (XETrapCBProc)NULL; tc->values.evt_cb[evt].data = (BYTE *)NULL; return; } Index: xc/lib/XTrap/XEDsptch.c diff -u xc/lib/XTrap/XEDsptch.c:1.1 xc/lib/XTrap/XEDsptch.c:1.2 --- xc/lib/XTrap/XEDsptch.c:1.1 Fri Nov 2 18:29:27 2001 +++ xc/lib/XTrap/XEDsptch.c Thu Mar 24 21:22:52 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/XTrap/XEDsptch.c,v 1.1 2001/11/02 23:29:27 dawes Exp $ */ +/* $XFree86: xc/lib/XTrap/XEDsptch.c,v 1.2 2005/03/25 02:22:52 dawes Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA @@ -41,7 +41,7 @@ static void XETrapDispatchCB(XETC *tc, XETrapDatum *pdatum) { - void_function pfunc = NULL; + XETrapCBProc pfunc = NULL; BYTE *userp = NULL; /* Need to deal with Delta Timestamps here before calling client CB */ Index: xc/lib/Xau/AuDispose.c diff -u xc/lib/Xau/AuDispose.c:1.5 xc/lib/Xau/AuDispose.c:1.6 --- xc/lib/Xau/AuDispose.c:1.5 Fri Dec 14 14:54:36 2001 +++ xc/lib/Xau/AuDispose.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AuDispose.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuDispose.c,v 1.5 2001/12/14 19:54:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuDispose.c,v 1.6 2006/01/09 14:59:00 dawes Exp $ */ #include #include Index: xc/lib/Xau/AuFileName.c diff -u xc/lib/Xau/AuFileName.c:3.7 xc/lib/Xau/AuFileName.c:3.8 --- xc/lib/Xau/AuFileName.c:3.7 Fri Dec 14 14:54:36 2001 +++ xc/lib/Xau/AuFileName.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AuFileName.c,v 1.5 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuFileName.c,v 3.7 2001/12/14 19:54:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuFileName.c,v 3.8 2006/01/09 14:59:00 dawes Exp $ */ #include #include Index: xc/lib/Xau/AuGetAddr.c diff -u xc/lib/Xau/AuGetAddr.c:1.6 xc/lib/Xau/AuGetAddr.c:1.7 --- xc/lib/Xau/AuGetAddr.c:1.6 Mon Nov 17 17:20:21 2003 +++ xc/lib/Xau/AuGetAddr.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AuGetAddr.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.6 2003/11/17 22:20:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuGetAddr.c,v 1.7 2006/01/09 14:59:00 dawes Exp $ */ #include #include Index: xc/lib/Xau/AuGetBest.c diff -u xc/lib/Xau/AuGetBest.c:1.8 xc/lib/Xau/AuGetBest.c:1.9 --- xc/lib/Xau/AuGetBest.c:1.8 Mon Nov 17 17:20:21 2003 +++ xc/lib/Xau/AuGetBest.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AuGetBest.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.8 2003/11/17 22:20:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuGetBest.c,v 1.9 2006/01/09 14:59:00 dawes Exp $ */ #include #include Index: xc/lib/Xau/AuLock.c diff -u xc/lib/Xau/AuLock.c:3.7 xc/lib/Xau/AuLock.c:3.8 --- xc/lib/Xau/AuLock.c:3.7 Mon Nov 17 17:20:21 2003 +++ xc/lib/Xau/AuLock.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AuLock.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuLock.c,v 3.7 2003/11/17 22:20:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuLock.c,v 3.8 2006/01/09 14:59:00 dawes Exp $ */ #include #include Index: xc/lib/Xau/AuRead.c diff -u xc/lib/Xau/AuRead.c:1.6 xc/lib/Xau/AuRead.c:1.7 --- xc/lib/Xau/AuRead.c:1.6 Fri Dec 14 14:54:36 2001 +++ xc/lib/Xau/AuRead.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AuRead.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuRead.c,v 1.6 2001/12/14 19:54:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuRead.c,v 1.7 2006/01/09 14:59:00 dawes Exp $ */ #include #include Index: xc/lib/Xau/AuUnlock.c diff -u xc/lib/Xau/AuUnlock.c:1.5 xc/lib/Xau/AuUnlock.c:1.6 --- xc/lib/Xau/AuUnlock.c:1.5 Mon Nov 17 17:20:21 2003 +++ xc/lib/Xau/AuUnlock.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AuUnlock.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.5 2003/11/17 22:20:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuUnlock.c,v 1.6 2006/01/09 14:59:00 dawes Exp $ */ #include #include Index: xc/lib/Xau/AuWrite.c diff -u xc/lib/Xau/AuWrite.c:1.4 xc/lib/Xau/AuWrite.c:1.5 --- xc/lib/Xau/AuWrite.c:1.4 Fri Dec 14 14:54:36 2001 +++ xc/lib/Xau/AuWrite.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AuWrite.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xau/AuWrite.c,v 1.4 2001/12/14 19:54:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/AuWrite.c,v 1.5 2006/01/09 14:59:00 dawes Exp $ */ #include Index: xc/lib/Xau/Autest.c diff -u xc/lib/Xau/Autest.c:1.2 xc/lib/Xau/Autest.c:1.3 --- xc/lib/Xau/Autest.c:1.2 Fri Dec 14 14:54:36 2001 +++ xc/lib/Xau/Autest.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,4 @@ -/* $Xorg: Autest.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/Xau/Autest.c,v 1.3 2006/01/09 14:59:00 dawes Exp $ */ /* Copyright 1988, 1998 The Open Group Index: xc/lib/Xau/Imakefile diff -u xc/lib/Xau/Imakefile:3.7 xc/lib/Xau/Imakefile:3.8 --- xc/lib/Xau/Imakefile:3.7 Sun Apr 4 22:33:12 2004 +++ xc/lib/Xau/Imakefile Mon Jan 9 09:59:00 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:29 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.7 2004/04/05 02:33:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xau/Imakefile,v 3.8 2006/01/09 14:59:00 dawes Exp $ #define DoNormalLib NormalLibXau #define DoSharedLib SharedLibXau Index: xc/lib/Xau/Xauth.h diff -u xc/lib/Xau/Xauth.h:1.6 xc/lib/Xau/Xauth.h:1.7 --- xc/lib/Xau/Xauth.h:1.6 Mon Nov 17 17:20:21 2003 +++ xc/lib/Xau/Xauth.h Mon Jan 9 09:59:00 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xauth.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xau/Xauth.h,v 1.6 2003/11/17 22:20:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xau/Xauth.h,v 1.7 2006/01/09 14:59:00 dawes Exp $ */ #ifndef _Xauth_h #define _Xauth_h Index: xc/lib/Xau/k5encode.c diff -u xc/lib/Xau/k5encode.c:1.2 xc/lib/Xau/k5encode.c:1.3 --- xc/lib/Xau/k5encode.c:1.2 Fri Dec 14 14:54:36 2001 +++ xc/lib/Xau/k5encode.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,4 @@ -/* $Xorg: k5encode.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/Xau/k5encode.c,v 1.3 2006/01/09 14:59:00 dawes Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group Index: xc/lib/Xaw/AllWidgets.c diff -u xc/lib/Xaw/AllWidgets.c:1.4 xc/lib/Xaw/AllWidgets.c:1.5 --- xc/lib/Xaw/AllWidgets.c:1.4 Fri Dec 14 14:54:38 2001 +++ xc/lib/Xaw/AllWidgets.c Mon Jan 9 09:59:00 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AllWidgets.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright (c) 1991, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/AllWidgets.c,v 1.4 2001/12/14 19:54:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AllWidgets.c,v 1.5 2006/01/09 14:59:00 dawes Exp $ */ #include #include Index: xc/lib/Xaw/AllWidgets.h diff -u xc/lib/Xaw/AllWidgets.h:1.2 xc/lib/Xaw/AllWidgets.h:1.3 --- xc/lib/Xaw/AllWidgets.h:1.2 Fri Dec 14 14:54:38 2001 +++ xc/lib/Xaw/AllWidgets.h Mon Jan 9 09:59:01 2006 @@ -1,5 +1,5 @@ +/* $XFree86: xc/lib/Xaw/AllWidgets.h,v 1.3 2006/01/09 14:59:01 dawes Exp $ */ /* - * $Xorg: AllWidgets.h,v 1.5 2001/02/09 02:03:42 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group Index: xc/lib/Xaw/AsciiSink.c diff -u xc/lib/Xaw/AsciiSink.c:1.28 xc/lib/Xaw/AsciiSink.c:1.29 --- xc/lib/Xaw/AsciiSink.c:1.28 Sat Sep 7 22:29:47 2002 +++ xc/lib/Xaw/AsciiSink.c Thu Dec 22 12:52:10 2005 @@ -1,4 +1,4 @@ -/* $Xorg: AsciiSink.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.29 2005/12/22 17:52:10 tsi Exp $ */ /*********************************************************** @@ -27,15 +27,15 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. - All Rights Reserved + All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -46,7 +46,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.c,v 1.28 2002/09/08 02:29:47 paulo Exp $ */ #include #include @@ -331,7 +330,7 @@ * | #### | * | #### | * | #### | - * |### | + * |### | * #### | * | | * @@ -369,7 +368,7 @@ c = ' '; } if (font->per_char && - (c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2)) + (c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2)) rbearing = font->per_char[c - font->min_char_or_byte2].rbearing - font->per_char[c - font->min_char_or_byte2].width; if (rbearing > 0) { @@ -405,7 +404,7 @@ c = ' '; } if (font->per_char && - (c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2)) + (c >= font->min_char_or_byte2 && c <= font->max_char_or_byte2)) lbearing = font->per_char[c - font->min_char_or_byte2].lbearing; if (lbearing < 0) { paint = XtNew(XawTextPaintStruct); @@ -1303,14 +1302,13 @@ fheight = font->ascent + font->descent; if (state == XawisOn) { if (ctx->text.hasfocus) - XFillRectangle(XtDisplay(ctx), XtWindow(ctx), - sink->ascii_sink.xorgc, x, y, - width + 1, fheight + 1); + XFillRectangle(XtDisplay(ctx), XtWindow(ctx), + sink->ascii_sink.xorgc, x, y, + width + 1, fheight + 1); else XDrawRectangle(XtDisplay(ctx), XtWindow(ctx), sink->ascii_sink.xorgc, x, y, width, fheight); - } else _XawTextSinkClearToBackground(w, x, y, Index: xc/lib/Xaw/AsciiSink.h diff -u xc/lib/Xaw/AsciiSink.h:1.6 xc/lib/Xaw/AsciiSink.h:1.7 --- xc/lib/Xaw/AsciiSink.h:1.6 Fri Dec 14 14:54:38 2001 +++ xc/lib/Xaw/AsciiSink.h Mon Jan 9 09:59:01 2006 @@ -1,7 +1,3 @@ -/* - * $Xorg: AsciiSink.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ - */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -48,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.6 2001/12/14 19:54:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSink.h,v 1.7 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawAsciiSink_h #define _XawAsciiSink_h Index: xc/lib/Xaw/AsciiSinkP.h diff -u xc/lib/Xaw/AsciiSinkP.h:1.10 xc/lib/Xaw/AsciiSinkP.h:1.11 --- xc/lib/Xaw/AsciiSinkP.h:1.10 Fri Dec 14 14:54:38 2001 +++ xc/lib/Xaw/AsciiSinkP.h Mon Jan 9 09:59:01 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: AsciiSinkP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.10 2001/12/14 19:54:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSinkP.h,v 1.11 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawAsciiSinkP_h #define _XawAsciiSinkP_h Index: xc/lib/Xaw/AsciiSrc.c diff -u xc/lib/Xaw/AsciiSrc.c:1.34 xc/lib/Xaw/AsciiSrc.c:1.35 --- xc/lib/Xaw/AsciiSrc.c:1.34 Thu Nov 21 11:22:52 2002 +++ xc/lib/Xaw/AsciiSrc.c Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AsciiSrc.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.34 2002/11/21 16:22:52 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.c,v 1.35 2006/01/09 14:59:01 dawes Exp $ */ /* * AsciiSrc.c - AsciiSrc object. (For use with the text widget). Index: xc/lib/Xaw/AsciiSrc.h diff -u xc/lib/Xaw/AsciiSrc.h:1.8 xc/lib/Xaw/AsciiSrc.h:1.9 --- xc/lib/Xaw/AsciiSrc.h:1.8 Fri Dec 14 14:54:38 2001 +++ xc/lib/Xaw/AsciiSrc.h Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AsciiSrc.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/AsciiSrc.h,v 1.8 2001/12/14 19:54:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrc.h,v 1.9 2006/01/09 14:59:01 dawes Exp $ */ /* Index: xc/lib/Xaw/AsciiSrcP.h diff -u xc/lib/Xaw/AsciiSrcP.h:1.9 xc/lib/Xaw/AsciiSrcP.h:1.10 --- xc/lib/Xaw/AsciiSrcP.h:1.9 Fri Dec 14 14:54:38 2001 +++ xc/lib/Xaw/AsciiSrcP.h Mon Jan 9 09:59:01 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: AsciiSrcP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.9 2001/12/14 19:54:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiSrcP.h,v 1.10 2006/01/09 14:59:01 dawes Exp $ */ /* * AsciiSrcP.h - Private Header for Ascii Text Source. Index: xc/lib/Xaw/AsciiText.c diff -u xc/lib/Xaw/AsciiText.c:3.10 xc/lib/Xaw/AsciiText.c:3.11 --- xc/lib/Xaw/AsciiText.c:3.10 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/AsciiText.c Thu Dec 22 12:52:10 2005 @@ -1,4 +1,4 @@ -/* $Xorg: AsciiText.c,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.11 2005/12/22 17:52:10 tsi Exp $ */ /* @@ -27,15 +27,15 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. - All Rights Reserved + All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -46,18 +46,17 @@ SOFTWARE. */ -/* $XFree86: xc/lib/Xaw/AsciiText.c,v 3.10 2001/12/14 19:54:39 dawes Exp $ */ /* * AsciiText.c - Source code for AsciiText Widget * - * This Widget is intended to be used as a simple front end to the + * This Widget is intended to be used as a simple front end to the * text widget with an ascii source and ascii sink attached to it * * Date: June 29, 1989 * * By: Chris D. Peterson - * MIT X Consortium + * MIT X Consortium * kit@expo.lcs.mit.edu */ @@ -265,8 +264,6 @@ int i; int tabs[TAB_COUNT], tab; - MultiSinkObject sink; - /* superclass Initialize can't set the following, * as it didn't know the source or sink when it was called */ @@ -314,7 +311,7 @@ for (i = 0, tab = 0; i < TAB_COUNT; i++) tabs[i] = (tab += 8); - + XawTextSinkSetTabs(w->text.sink, TAB_COUNT, tabs); XawTextDisableRedisplay(cnew); @@ -326,6 +323,7 @@ if (w->simple.international == True) { Arg list[4]; Cardinal ac = 0; + MultiSinkObject sink; sink = (MultiSinkObject)w->text.sink; XtSetArg(list[ac], XtNfontSet, sink->multi_sink.fontset); ac++; @@ -336,7 +334,7 @@ } } -static void +static void XawAsciiDestroy(Widget w) { AsciiWidget ascii = (AsciiWidget)w; Index: xc/lib/Xaw/AsciiText.h diff -u xc/lib/Xaw/AsciiText.h:1.6 xc/lib/Xaw/AsciiText.h:1.7 --- xc/lib/Xaw/AsciiText.h:1.6 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/AsciiText.h Thu Dec 22 12:52:10 2005 @@ -1,6 +1,4 @@ -/* - * $Xorg: AsciiText.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ - */ +/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.7 2005/12/22 17:52:10 tsi Exp $ */ /*********************************************************** @@ -29,15 +27,15 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. - All Rights Reserved + All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -48,18 +46,17 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiText.h,v 1.6 2001/12/14 19:54:39 dawes Exp $ */ /* * AsciiText.h - Public header file for AsciiText Widget * - * This Widget is intended to be used as a simple front end to the + * This Widget is intended to be used as a simple front end to the * text widget with an ascii source and ascii sink attached to it * * Date: June 29, 1989 * * By: Chris D. Peterson - * MIT X Consortium + * MIT X Consortium * kit@expo.lcs.mit.edu */ #ifndef _AsciiText_h @@ -87,7 +84,7 @@ foreground Foreground Pixel Black height Height Dimension font height insertPosition TextPosition int 0 - international International Boolean false + international International Boolean False leftMargin Margin Position 2 mappedWhenManaged MappedWhenManaged Boolean True resize Resize XawTextResizeMode XawtextResizeNever @@ -110,7 +107,7 @@ */ typedef struct _AsciiTextClassRec *AsciiTextWidgetClass; -typedef struct _AsciiRec *AsciiWidget; +typedef struct _AsciiRec *AsciiWidget; extern WidgetClass asciiTextWidgetClass; Index: xc/lib/Xaw/AsciiTextP.h diff -u xc/lib/Xaw/AsciiTextP.h:1.9 xc/lib/Xaw/AsciiTextP.h:1.10 --- xc/lib/Xaw/AsciiTextP.h:1.9 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/AsciiTextP.h Mon Jan 9 09:59:01 2006 @@ -1,7 +1,3 @@ -/* - * $Xorg: AsciiTextP.h,v 1.4 2001/02/09 02:03:42 xorgcvs Exp $ - */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -48,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.9 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/AsciiTextP.h,v 1.10 2006/01/09 14:59:01 dawes Exp $ */ /* * AsciiText.c - Private header file for AsciiText Widget. Index: xc/lib/Xaw/Box.c diff -u xc/lib/Xaw/Box.c:1.15 xc/lib/Xaw/Box.c:1.16 --- xc/lib/Xaw/Box.c:1.15 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/Box.c Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Box.c,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.c,v 1.15 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Box.c,v 1.16 2006/01/09 14:59:01 dawes Exp $ */ #include #include Index: xc/lib/Xaw/Box.h diff -u xc/lib/Xaw/Box.h:1.8 xc/lib/Xaw/Box.h:1.9 --- xc/lib/Xaw/Box.h:1.8 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/Box.h Mon Jan 9 09:59:01 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: Box.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Box.h,v 1.8 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Box.h,v 1.9 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawBox_h #define _XawBox_h Index: xc/lib/Xaw/BoxP.h diff -u xc/lib/Xaw/BoxP.h:1.11 xc/lib/Xaw/BoxP.h:1.12 --- xc/lib/Xaw/BoxP.h:1.11 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/BoxP.h Mon Jan 9 09:59:01 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: BoxP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.11 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/BoxP.h,v 1.12 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawBoxP_h #define _XawBoxP_h Index: xc/lib/Xaw/Cardinals.h diff -u xc/lib/Xaw/Cardinals.h:1.2 xc/lib/Xaw/Cardinals.h:1.3 --- xc/lib/Xaw/Cardinals.h:1.2 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/Cardinals.h Mon Jan 9 09:59:01 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Cardinals.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xaw/Cardinals.h,v 1.3 2006/01/09 14:59:01 dawes Exp $ */ /* Copyright 1985, 1986, 1987, 1998 The Open Group Index: xc/lib/Xaw/Command.c diff -u xc/lib/Xaw/Command.c:1.17 xc/lib/Xaw/Command.c:1.19 --- xc/lib/Xaw/Command.c:1.17 Mon Aug 4 06:32:20 2003 +++ xc/lib/Xaw/Command.c Tue Feb 7 17:02:25 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Command.c,v 1.5 2001/02/09 02:03:43 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.c,v 1.17 2003/08/04 10:32:20 eich Exp $ */ +/* $XFree86: xc/lib/Xaw/Command.c,v 1.19 2006/02/07 22:02:25 dawes Exp $ */ /* * Command.c - Command button widget @@ -332,7 +330,7 @@ return; XawCommandToggle(w); - cbw->command.set= True; + cbw->command.set = True; } /*ARGSUSED*/ Index: xc/lib/Xaw/Command.h diff -u xc/lib/Xaw/Command.h:1.6 xc/lib/Xaw/Command.h:1.7 --- xc/lib/Xaw/Command.h:1.6 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/Command.h Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Command.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Command.h,v 1.6 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Command.h,v 1.7 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawCommand_h #define _XawCommand_h Index: xc/lib/Xaw/CommandP.h diff -u xc/lib/Xaw/CommandP.h:1.8 xc/lib/Xaw/CommandP.h:1.9 --- xc/lib/Xaw/CommandP.h:1.8 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/CommandP.h Mon Jan 9 09:59:01 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: CommandP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.8 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/CommandP.h,v 1.9 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawCommandP_h #define _XawCommandP_h Index: xc/lib/Xaw/Dialog.c diff -u xc/lib/Xaw/Dialog.c:1.8 xc/lib/Xaw/Dialog.c:1.9 --- xc/lib/Xaw/Dialog.c:1.8 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/Dialog.c Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Dialog.c,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.8 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Dialog.c,v 1.9 2006/01/09 14:59:01 dawes Exp $ */ #include #include Index: xc/lib/Xaw/Dialog.h diff -u xc/lib/Xaw/Dialog.h:1.6 xc/lib/Xaw/Dialog.h:1.7 --- xc/lib/Xaw/Dialog.h:1.6 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/Dialog.h Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Dialog.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.6 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Dialog.h,v 1.7 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawDialog_h #define _XawDialog_h Index: xc/lib/Xaw/DialogP.h diff -u xc/lib/Xaw/DialogP.h:1.9 xc/lib/Xaw/DialogP.h:1.10 --- xc/lib/Xaw/DialogP.h:1.9 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/DialogP.h Mon Jan 9 09:59:01 2006 @@ -1,6 +1,3 @@ -/* $Xorg: DialogP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ - - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -47,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.9 2001/12/14 19:54:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/DialogP.h,v 1.10 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _DialogP_h #define _DialogP_h Index: xc/lib/Xaw/Form.c diff -u xc/lib/Xaw/Form.c:1.21 xc/lib/Xaw/Form.c:1.23 --- xc/lib/Xaw/Form.c:1.21 Fri Dec 14 14:54:39 2001 +++ xc/lib/Xaw/Form.c Thu Dec 22 12:52:10 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Form.c,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xaw/Form.c,v 1.23 2005/12/22 17:52:10 tsi Exp $ */ /*********************************************************** @@ -27,15 +27,15 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. - All Rights Reserved + All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -47,8 +47,6 @@ ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Form.c,v 1.21 2001/12/14 19:54:39 dawes Exp $ */ - #include #include #include @@ -449,6 +447,12 @@ { FormWidget fw = (FormWidget)cnew; + /* + * Get the size from the parent + */ + if (XtWidth(fw) == 0) XtWidth(fw) = XtWidth(XtParent(fw)); + if (XtHeight(fw) == 0) XtHeight(fw) = XtHeight(XtParent(fw)); + fw->form.old_width = fw->form.old_height = 0; fw->form.no_refigure = False; fw->form.needs_relayout = False; @@ -745,7 +749,7 @@ #ifndef OLDXAW x = TransformCoord(form->form.virtual_x, fw->form.old_width, - XtWidth(fw), form->form.left); + XtWidth(fw), form->form.left); y = TransformCoord(form->form.virtual_y, fw->form.old_height, XtHeight(fw), form->form.top); width = TransformCoord(form->form.virtual_x + Index: xc/lib/Xaw/Form.h diff -u xc/lib/Xaw/Form.h:1.9 xc/lib/Xaw/Form.h:1.10 --- xc/lib/Xaw/Form.h:1.9 Fri Dec 14 14:54:40 2001 +++ xc/lib/Xaw/Form.h Mon Jan 9 09:59:01 2006 @@ -1,6 +1,3 @@ -/* $Xorg: Form.h,v 1.5 2001/02/09 02:03:43 xorgcvs Exp $ */ - - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -47,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Form.h,v 1.9 2001/12/14 19:54:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Form.h,v 1.10 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawForm_h #define _XawForm_h Index: xc/lib/Xaw/FormP.h diff -u xc/lib/Xaw/FormP.h:1.14 xc/lib/Xaw/FormP.h:1.15 --- xc/lib/Xaw/FormP.h:1.14 Wed Dec 19 16:37:30 2001 +++ xc/lib/Xaw/FormP.h Thu Dec 22 12:52:10 2005 @@ -1,4 +1,4 @@ -/* $Xorg: FormP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xaw/FormP.h,v 1.15 2005/12/22 17:52:10 tsi Exp $ */ /*********************************************************** @@ -27,15 +27,15 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. - All Rights Reserved + All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -46,7 +46,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/FormP.h,v 1.14 2001/12/19 21:37:30 dawes Exp $ */ /* Form widget private definitions */ @@ -68,8 +67,8 @@ LayoutDone } LayoutState; -#define XtInheritLayout \ -((Boolean (*)(FormWidget, unsigned int, unsigned int, Bool))_XtInherit) +#define XtInheritLayout \ + ((Boolean (*)(FormWidget, unsigned int, unsigned int, Bool))_XtInherit) typedef struct { Boolean(*layout)(FormWidget, unsigned int, unsigned int, Bool); @@ -114,22 +113,20 @@ typedef struct _FormConstraintsPart { /* resources */ XtEdgeType top, bottom, left, right;/* where to drag edge on resize */ - int dx; /* desired horiz offset */ - int dy; /* desired vertical offset */ + int dx, dy; /* desired horizontal/vertical offset */ Widget horiz_base; /* measure dx from here if non-null */ Widget vert_base; /* measure dy from here if non-null */ Boolean allow_resize; /* True if child may request resize */ /* private */ - short virtual_width, virtual_height; + Dimension virtual_width, virtual_height; Position new_x, new_y; LayoutState layout_state; /* temporary layout state */ Boolean deferred_resize;/* was resized while no_refigure is set */ #ifndef OLDXAW - short virtual_x, virtual_y; + Position virtual_x, virtual_y; XtPointer pad[2]; /* leave some space for further optimizations - * in the form widget geometry - */ + * in the form widget geometry */ #endif } FormConstraintsPart; Index: xc/lib/Xaw/Grip.c diff -u xc/lib/Xaw/Grip.c:1.8 xc/lib/Xaw/Grip.c:1.9 --- xc/lib/Xaw/Grip.c:1.8 Fri Dec 14 14:54:40 2001 +++ xc/lib/Xaw/Grip.c Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Grip.c,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.c,v 1.8 2001/12/14 19:54:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Grip.c,v 1.9 2006/01/09 14:59:01 dawes Exp $ */ /* * Grip.c - Grip Widget (Used by Paned Widget) Index: xc/lib/Xaw/Grip.h diff -u xc/lib/Xaw/Grip.h:1.7 xc/lib/Xaw/Grip.h:1.8 --- xc/lib/Xaw/Grip.h:1.7 Fri Dec 14 14:54:40 2001 +++ xc/lib/Xaw/Grip.h Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Grip.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Grip.h,v 1.7 2001/12/14 19:54:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Grip.h,v 1.8 2006/01/09 14:59:01 dawes Exp $ */ /* * Grip.h - Public Definitions for Grip widget (used by VPane Widget) Index: xc/lib/Xaw/GripP.h diff -u xc/lib/Xaw/GripP.h:1.8 xc/lib/Xaw/GripP.h:1.9 --- xc/lib/Xaw/GripP.h:1.8 Fri Dec 14 14:54:40 2001 +++ xc/lib/Xaw/GripP.h Mon Jan 9 09:59:01 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: GripP.h,v 1.4 2001/02/09 02:03:43 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/GripP.h,v 1.8 2001/12/14 19:54:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/GripP.h,v 1.9 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawGripP_h #define _XawGripP_h Index: xc/lib/Xaw/Imakefile diff -u xc/lib/Xaw/Imakefile:1.12 xc/lib/Xaw/Imakefile:1.13 --- xc/lib/Xaw/Imakefile:1.12 Sun Apr 4 22:33:12 2004 +++ xc/lib/Xaw/Imakefile Mon Jan 9 09:59:01 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:33 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.12 2004/04/05 02:33:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xaw/Imakefile,v 1.13 2006/01/09 14:59:01 dawes Exp $ #define DoNormalLib NormalLibXaw #define DoSharedLib SharedLibXaw Index: xc/lib/Xaw/Label.c diff -u xc/lib/Xaw/Label.c:1.14 xc/lib/Xaw/Label.c:1.16 --- xc/lib/Xaw/Label.c:1.14 Mon Aug 4 06:32:20 2003 +++ xc/lib/Xaw/Label.c Tue Jan 24 23:32:08 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Label.c,v 1.5 2001/02/09 02:03:43 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.c,v 1.14 2003/08/04 10:32:20 eich Exp $ */ +/* $XFree86: xc/lib/Xaw/Label.c,v 1.16 2006/01/25 04:32:08 dawes Exp $ */ #include #include @@ -95,6 +93,37 @@ static void set_bitmap_info(LabelWidget); static void SetTextWidthAndHeight(LabelWidget); +#undef XawEncoding +#ifndef OLDXAW +#define XawEncoding(lw) ((lw)->simple.encoding) +#else +#define XawEncoding(lw) ((lw)->label.encoding) +#endif + +#undef XawDrawString +#define XawDrawString(lw, label, len) \ + ((XawEncoding(lw) == XtTextEncodingChar2b) ? \ + XDrawString16(XtDisplay(w), XtWindow(w), gc, \ + w->label.label_x, y, \ + (XChar2b*)label, len / 2) : \ + XDrawString(XtDisplay(w), XtWindow(w), gc, \ + w->label.label_x, y, label, len)) + +#undef XawTextWidth +#define XawTextWidth(lw, label, len) \ + ((XawEncoding(lw) == XtTextEncodingChar2b) ? \ + XTextWidth16(fs, (XChar2b*)label, len / 2) : \ + XTextWidth(fs, label, len)); + +#undef XawCharIndex +#define XawCharIndex(lw, label, c) \ + XtCharIndexEx(XawEncoding(lw), label, c) + +#undef XawStringLength +#define XawStringLength(lw, label) \ + XtStringLengthEx(XawEncoding(lw), label) + + /* * Initialization */ @@ -137,15 +166,6 @@ NULL }, { - XtNencoding, - XtCEncoding, - XtRUnsignedChar, - sizeof(unsigned char), - offset(label.encoding), - XtRImmediate, - (XtPointer)XawTextEncoding8bit - }, - { XtNjustify, XtCJustify, XtRJustify, @@ -304,7 +324,7 @@ ptr->byte2 = *str++; } - return (XTextWidth16(fs, buf2b, n)); + return XTextWidth16(fs, buf2b, n); } static void @@ -322,7 +342,8 @@ ptr->byte1 = *str++; ptr->byte2 = *str++; } - XDrawString16(dpy, d, gc, x, y, buf2b, n); + + return XDrawString16(dpy, d, gc, x, y, buf2b, n); } #define XTextWidth16 _XawLabelWidth16 @@ -335,13 +356,13 @@ static void SetTextWidthAndHeight(LabelWidget lw) { - XFontStruct *fs = lw->label.font; - char *nl; + unsigned int width, height, w; + char *nl, *label = lw->label.label; if (lw->label.pixmap != None) { + unsigned int bw, depth; Window root; int x, y; - unsigned int width, height, bw, depth; if (XGetGeometry(XtDisplay(lw), lw->label.pixmap, &root, &x, &y, &width, &height, &bw, &depth)) { @@ -351,89 +372,88 @@ return; } } + if (lw->simple.international == True) { XFontSet fset = lw->label.fontset; XFontSetExtents *ext = XExtentsOfFontSet(fset); - lw->label.label_height = ext->max_ink_extent.height; + height = ext->max_ink_extent.height; + width = 0; + if (lw->label.label == NULL) { lw->label.label_len = 0; - lw->label.label_width = 0; } - else if ((nl = index(lw->label.label, '\n')) != NULL) { - char *label; - + else if ((nl = XawCharIndex(lw, label, '\n')) != NULL) { lw->label.label_len = MULTI_LINE_LABEL; - lw->label.label_width = 0; - for (label = lw->label.label; nl != NULL; nl = index(label, '\n')) { - int width = XmbTextEscapement(fset, label, (int)(nl - label)); - - if (width > (int)lw->label.label_width) - lw->label.label_width = width; - label = nl + 1; - if (*label) - lw->label.label_height += ext->max_ink_extent.height; + + for (; nl != NULL; nl = XawCharIndex(lw, label, '\n')) { + w = XmbTextEscapement(fset, label, (int)(nl - label)); + width = XawMax(width, w); + + MOVE_FORWARD(XawEncoding(lw), label, nl); + + if (NOT_AT_EOL(XawEncoding(lw), label)) + height += ext->max_ink_extent.height; } - if (*label) { - int width = XmbTextEscapement(fset, label, strlen(label)); - if (width > (int)lw->label.label_width) - lw->label.label_width = width; + if (NOT_AT_EOL(XawEncoding(lw), label)) { + w = XmbTextEscapement(fset, label, XawStringLength(lw, label)); + width = XawMax(width, w); } } else { - lw->label.label_len = strlen(lw->label.label); - lw->label.label_width = - XmbTextEscapement(fset, lw->label.label, lw->label.label_len); + lw->label.label_len = XawStringLength(lw, label); + + width = XmbTextEscapement(fset, label, lw->label.label_len); } } else { - lw->label.label_height = fs->max_bounds.ascent + fs->max_bounds.descent; + XFontStruct *fs = lw->label.font; + + height = fs->max_bounds.ascent + fs->max_bounds.descent; + width = 0; + if (lw->label.label == NULL) { lw->label.label_len = 0; - lw->label.label_width = 0; } - else if ((nl = index(lw->label.label, '\n')) != NULL) { - char *label; - + else if ((nl = XawCharIndex(lw, label, '\n')) != NULL) { lw->label.label_len = MULTI_LINE_LABEL; - lw->label.label_width = 0; - for (label = lw->label.label; nl != NULL; nl = index(label, '\n')) { - int width; - if (lw->label.encoding) - width = XTextWidth16(fs, (TXT16*)label, (int)(nl - label) / 2); + for (; nl != NULL; nl = XawCharIndex(lw, label, '\n')) { + if (XawEncoding(lw) == XtTextEncodingChar2b) + w = XTextWidth16(fs, (TXT16*)label, (int)(nl - label) / 2); else - width = XTextWidth(fs, label, (int)(nl - label)); - if (width > (int)lw->label.label_width) - lw->label.label_width = width; - label = nl + 1; - if (*label) - lw->label.label_height += - fs->max_bounds.ascent + fs->max_bounds.descent; + w = XTextWidth(fs, label, (int)(nl - label)); + width = XawMax(width, w); + + MOVE_FORWARD(XawEncoding(lw), label, nl); + + if (NOT_AT_EOL(XawEncoding(lw), label)) + height += fs->max_bounds.ascent + fs->max_bounds.descent; } - if (*label) { - int width = XTextWidth(fs, label, strlen(label)); - if (lw->label.encoding) - width = XTextWidth16(fs, (TXT16*)label, strlen(label) / 2); + if (NOT_AT_EOL(XawEncoding(lw), label)) { + if (XawEncoding(lw) == XtTextEncodingChar2b) + w = XTextWidth16(fs, (TXT16*)label, + XawStringLength(lw, label) / 2); else - width = XTextWidth(fs, label, strlen(label)); - if (width > (int) lw->label.label_width) - lw->label.label_width = width; + w = XTextWidth(fs, label, XawStringLength(lw, label)); + width = XawMax(width, w); } } else { - lw->label.label_len = strlen(lw->label.label); - if (lw->label.encoding) - lw->label.label_width = - XTextWidth16(fs, (TXT16*)lw->label.label, - (int)lw->label.label_len / 2); + lw->label.label_len = XawStringLength(lw, label); + + if (XawEncoding(lw) == XtTextEncodingChar2b) + width = XTextWidth16(fs, (TXT16*)label, + (int)lw->label.label_len / 2); else - lw->label.label_width = - XTextWidth(fs, lw->label.label, (int)lw->label.label_len); + width = XTextWidth(fs, label, (int)lw->label.label_len); } } + + lw->label.label_height = height; + lw->label.label_width = width; } static void @@ -447,7 +467,7 @@ values.graphics_exposures = False; if (lw->simple.international == True) - /* Since Xmb/wcDrawString eats the font, I must use XtAllocateGC */ + /* Since Xmb/wcDrawString eats the font, I must use XtAllocateGC */ lw->label.normal_GC = XtAllocateGC((Widget)lw, 0, GCForeground | GCBackground | GCGraphicsExposures, @@ -481,12 +501,12 @@ GCTile | GCFillStyle | GCGraphicsExposures, &values, GCFont, 0); - else - lw->label.gray_GC = XtGetGC((Widget)lw, - GCForeground | GCBackground | - GCFont | GCTile | GCFillStyle | - GCGraphicsExposures, - &values); + else + lw->label.gray_GC = XtGetGC((Widget)lw, + GCForeground | GCBackground | + GCFont | GCTile | GCFillStyle | + GCGraphicsExposures, + &values); } static void @@ -531,7 +551,7 @@ if (lw->label.label == NULL) lw->label.label = XtNewString(lw->core.name); else - lw->label.label = XtNewString(lw->label.label); + lw->label.label = XtNewStringEx(XawEncoding(lw), lw->label.label); GetNormalGC(lw); GetGrayGC(lw); @@ -569,7 +589,7 @@ if (w->label.pixmap == None) { int len = w->label.label_len; - char *label = w->label.label; + char *nl, *label = w->label.label; Position y = w->label.label_y + w->label.font->max_bounds.ascent; Position ksy = w->label.label_y; @@ -586,47 +606,37 @@ ksy += XawAbs(ext->max_ink_extent.y); if (len == MULTI_LINE_LABEL) { - char *nl; - - while ((nl = index(label, '\n')) != NULL) { + while ((nl = XawCharIndex(w, label, '\n')) != NULL) { XmbDrawString(XtDisplay(w), XtWindow(w), w->label.fontset, gc, w->label.label_x, ksy, label, (int)(nl - label)); + ksy += ext->max_ink_extent.height; - label = nl + 1; + + MOVE_FORWARD(XawEncoding(w), label, nl); } - len = strlen(label); + len = XawStringLength(w, label); } + if (len) XmbDrawString(XtDisplay(w), XtWindow(w), w->label.fontset, gc, w->label.label_x, ksy, label, len); } else { if (len == MULTI_LINE_LABEL) { - char *nl; + while ((nl = XawCharIndex(w, label, '\n')) != NULL) { + XawDrawString(w, label, (nl - label)); - while ((nl = index(label, '\n')) != NULL) { - if (w->label.encoding) - XDrawString16(XtDisplay(gw), XtWindow(gw), gc, - w->label.label_x, y, - (TXT16*)label, (int)(nl - label) / 2); - else - XDrawString(XtDisplay(gw), XtWindow(gw), gc, - w->label.label_x, y, label, (int)(nl - label)); y += w->label.font->max_bounds.ascent + w->label.font->max_bounds.descent; - label = nl + 1; + + MOVE_FORWARD(XawEncoding(w), label, nl); } - len = strlen(label); - } - if (len) { - if (w->label.encoding) - XDrawString16(XtDisplay(gw), XtWindow(gw), gc, - w->label.label_x, y, (TXT16*)label, len / 2); - else - XDrawString(XtDisplay(gw), XtWindow(gw), gc, - w->label.label_x, y, label, len); + len = XawStringLength(w, label); } + + if (len) + XawDrawString(w, label, len); } } else if (w->label.label_len == 1) @@ -719,7 +729,7 @@ if (curlw->label.left_bitmap != newlw->label.left_bitmap) was_resized = True; - if (curlw->label.encoding != newlw->label.encoding) + if (XawEncoding(curlw) != XawEncoding(newlw)) was_resized = True; if (curlw->label.fontset != newlw->label.fontset && @@ -731,7 +741,8 @@ XtFree((char *)curlw->label.label); if (newlw->label.label != newlw->core.name) - newlw->label.label = XtNewString(newlw->label.label); + newlw->label.label = + XtNewStringEx(XawEncoding(newlw), newlw->label.label); was_resized = True; } Index: xc/lib/Xaw/Label.h diff -u xc/lib/Xaw/Label.h:1.7 xc/lib/Xaw/Label.h:1.9 --- xc/lib/Xaw/Label.h:1.7 Fri Dec 14 14:54:40 2001 +++ xc/lib/Xaw/Label.h Tue Jan 24 23:32:09 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Label.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Label.h,v 1.7 2001/12/14 19:54:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Label.h,v 1.9 2006/01/25 04:32:09 dawes Exp $ */ #ifndef _XawLabel_h #define _XawLabel_h @@ -68,7 +66,6 @@ cursor Cursor Cursor None cursorName Cursor String NULL destroyCallback Callback XtCallbackList NULL - encoding Encoding UnsignedChar XawTextEncoding8bit font Font XFontStruct* XtDefaultFont foreground Foreground Pixel XtDefaultForeground height Height Dimension text height @@ -89,13 +86,11 @@ */ -#define XawTextEncoding8bit 0 -#define XawTextEncodingChar2b 1 +#define XawTextEncoding8bit XtTextEncoding8bit +#define XawTextEncodingChar2b XtTextEncodingChar2b #define XtNleftBitmap "leftBitmap" #define XtCLeftBitmap "LeftBitmap" -#define XtNencoding "encoding" -#define XtCEncoding "Encoding" #ifndef XtNfontSet #define XtNfontSet "fontSet" Index: xc/lib/Xaw/LabelP.h diff -u xc/lib/Xaw/LabelP.h:1.8 xc/lib/Xaw/LabelP.h:1.10 --- xc/lib/Xaw/LabelP.h:1.8 Fri Dec 14 14:54:40 2001 +++ xc/lib/Xaw/LabelP.h Tue Jan 24 23:32:09 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: LabelP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.8 2001/12/14 19:54:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/LabelP.h,v 1.10 2006/01/25 04:32:09 dawes Exp $ */ #ifndef _XawLabelP_h #define _XawLabelP_h @@ -86,7 +81,7 @@ Dimension internal_height; Pixmap pixmap; Boolean resize; - unsigned char encoding; + unsigned char encoding; /* moved to simpleWidgetClass */ Pixmap left_bitmap; /* private state */ Index: xc/lib/Xaw/List.c diff -u xc/lib/Xaw/List.c:1.17 xc/lib/Xaw/List.c:1.18 --- xc/lib/Xaw/List.c:1.17 Fri Dec 14 14:54:40 2001 +++ xc/lib/Xaw/List.c Thu Dec 22 12:52:10 2005 @@ -1,4 +1,4 @@ -/* $Xorg: List.c,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xaw/List.c,v 1.18 2005/12/22 17:52:10 tsi Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -23,7 +23,6 @@ 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/lib/Xaw/List.c,v 1.17 2001/12/14 19:54:40 dawes Exp $ */ /* * List.c - List widget @@ -31,7 +30,7 @@ * This is a List widget. It allows the user to select an item in a list and * notifies the application through a callback function. * - * Created: 8/13/88 + * Created: 8/13/88 * By: Chris D. Peterson * MIT X Consortium */ @@ -81,7 +80,7 @@ static void PaintItemName(Widget, int); static void ResetList(Widget, Bool, Bool); -/* +/* * Actions */ static void Notify(Widget, XEvent*, String*, Cardinal*); @@ -91,7 +90,7 @@ /* * Initialization */ -static char defaultTranslations[] = +static char defaultTranslations[] = ":" "Set()\n" ":" "Notify()\n" ; @@ -337,7 +336,7 @@ else lw->list.revgc = XtGetGC(w, GCForeground | GCFont, &values); - values.tile = XmuCreateStippledPixmap(XtScreen(w), + values.tile = XmuCreateStippledPixmap(XtScreen(w), lw->list.foreground, lw->core.background_pixel, lw->core.depth); @@ -374,10 +373,10 @@ for (i = 0 ; i < lw->list.nitems; i++) { if (lw->simple.international == True) len = XmbTextEscapement(lw->list.fontset, lw->list.list[i], - strlen(lw->list.list[i])); + strlen(lw->list.list[i])); else len = XTextWidth(lw->list.font, lw->list.list[i], - strlen(lw->list.list[i])); + strlen(lw->list.list[i])); if (len > lw->list.longest) lw->list.longest = len; } @@ -466,7 +465,7 @@ } /*ARGSUSED*/ -static void +static void XawListInitialize(Widget temp1, Widget cnew, ArgList args, Cardinal *num_args) { ListWidget lw = (ListWidget)cnew; @@ -520,7 +519,7 @@ if (lw->list.vertical_cols) { one = lw->list.nrows * ((xloc - (int)lw->list.internal_width) - / lw->list.col_width); + / lw->list.col_width); another = (yloc - (int)lw->list.internal_height) / lw->list.row_height; /* If out of range, return minimum possible value */ if (another >= lw->list.nrows) { @@ -534,10 +533,10 @@ /* If in right margin handle things right */ another = (xloc - (int)lw->list.internal_width) / lw->list.col_width; if (another >= lw->list.ncols) { - another = lw->list.ncols - 1; + another = lw->list.ncols - 1; ret_val = OUT_OF_RANGE; } - } + } if (xloc < 0 || yloc < 0) ret_val = OUT_OF_RANGE; if (one < 0) @@ -596,8 +595,8 @@ ListWidget lw = (ListWidget)w; int mod_item; int things; - - if (item < ul || item > lr) + + if (item < ul || item > lr) return (False); if (lw->list.vertical_cols) things = lw->list.nrows; @@ -712,7 +711,7 @@ HighlightBackground(w, x, y, lw->list.normgc); } else { - if (XtIsSensitive(w)) + if (XtIsSensitive(w)) gc = lw->list.normgc; else gc = lw->list.graygc; @@ -727,7 +726,7 @@ lw->list.is_highlighted = item; } else { - if (XtIsSensitive(w)) + if (XtIsSensitive(w)) gc = lw->list.normgc; else gc = lw->list.graygc; @@ -755,7 +754,7 @@ XSetClipMask(XtDisplay(w), gc, None); } -static void +static void XawListRedisplay(Widget w, XEvent *event, Region region) { int item; /* an item to work with */ @@ -772,7 +771,7 @@ if (Superclass->core_class.expose) (Superclass->core_class.expose)(w, event, region); - + for (item = ul_item; item <= lr_item && item < lw->list.nitems; item++) if (ItemInRectangle(w, ul_item, lr_item, item)) PaintItemName(w, item); @@ -785,13 +784,13 @@ * w - the widget. * intended - what the parent intends to do with us. * requested - what we want to happen */ -static XtGeometryResult +static XtGeometryResult XawListQueryGeometry(Widget w, XtWidgetGeometry *intended, XtWidgetGeometry *requested) { Dimension new_width, new_height; Bool change, width_req, height_req; - + width_req = intended->request_mode & CWWidth; height_req = intended->request_mode & CWHeight; @@ -806,13 +805,13 @@ new_height = XtHeight(w); requested->request_mode = 0; - + /* * We only care about our height and width */ if (!width_req && !height_req) return (XtGeometryYes); - + change = Layout(w, !width_req, !height_req, &new_width, &new_height); requested->request_mode |= CWWidth; @@ -849,7 +848,7 @@ * width, height- the is the current width and height that we are going * we are going to layout the list widget to, * depending on xfree and yfree of course. - * + * * Return: * True if width or height have been changed */ static Bool @@ -873,7 +872,7 @@ of inter-column column_space 's as columns. There should thus be a half column_space margin on each side of each column...*/ width2 = lw->list.ncols * lw->list.col_width + - (lw->list.internal_width << 1); + (lw->list.internal_width << 1); change = True; } if (yfree) { @@ -944,7 +943,7 @@ while (1) { lw->list.nrows = ((lw->list.nitems - 1) / lw->list.ncols) + 1; width2 = lw->list.ncols * lw->list.col_width + - (lw->list.internal_width << 1); + (lw->list.internal_width << 1); height2 = lw->list.nrows * lw->list.row_height + (lw->list.internal_height << 1); if (width2 >= MaxSize && height2 >= MaxSize) @@ -980,7 +979,7 @@ /* * Find item and if out of range then unhighlight and return - * + * * If the current item is unhighlighted then the user has aborted the * notify, so unhighlight and return */ @@ -1010,7 +1009,7 @@ */ ret_value.string = lw->list.list[item]; ret_value.list_index = item; - + XtCallCallbacks(w, XtNcallback, (XtPointer)&ret_value); } @@ -1047,7 +1046,7 @@ * Set specified arguments into widget */ /*ARGSUSED*/ -static Boolean +static Boolean XawListSetValues(Widget current, Widget request, Widget cnew, ArgList args, Cardinal *num_args) { @@ -1138,7 +1137,7 @@ nl->list.highlight = NO_HIGHLIGHT; redraw = True; } - + return (redraw); } @@ -1147,7 +1146,7 @@ { ListWidget lw = (ListWidget)w; XGCValues values; - + XGetGCValues(XtDisplay(w), lw->list.graygc, GCTile, &values); XmuReleaseStippledPixmap(XtScreen(w), values.tile); XtReleaseGC(w, lw->list.graygc); @@ -1229,7 +1228,7 @@ XawListHighlight(Widget w, int item) { ListWidget lw = (ListWidget)w; - + if (XtIsSensitive(w)) { lw->list.highlight = item; if (lw->list.is_highlighted != NO_HIGHLIGHT) @@ -1254,8 +1253,10 @@ ListWidget lw = (ListWidget)w; XawListReturnStruct *ret_val; - ret_val = (XawListReturnStruct *)XtMalloc(sizeof(XawListReturnStruct)); - + ret_val = (XawListReturnStruct*) XtMalloc(sizeof(XawListReturnStruct)); + if (ret_val == NULL) + return NULL; + ret_val->list_index = lw->list.highlight; if (ret_val->list_index == XAW_LIST_NONE) ret_val->string = ""; Index: xc/lib/Xaw/List.h diff -u xc/lib/Xaw/List.h:1.8 xc/lib/Xaw/List.h:1.9 --- xc/lib/Xaw/List.h:1.8 Fri Dec 14 14:54:40 2001 +++ xc/lib/Xaw/List.h Thu Dec 22 12:52:11 2005 @@ -1,4 +1,4 @@ -/* $Xorg: List.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xaw/List.h,v 1.9 2005/12/22 17:52:11 tsi Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -23,14 +23,13 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/List.h,v 1.8 2001/12/14 19:54:40 dawes Exp $ */ /* This is the List widget, it is useful to display a list, without the - * overhead of having a widget for each item in the list. It allows + * overhead of having a widget for each item in the list. It allows * the user to select an item in a list and notifies the application through * a callback function. * - * Created: 8/13/88 + * Created: 8/13/88 * By: Chris D. Peterson * MIT X Consortium */ @@ -52,7 +51,7 @@ cursor Cursor Cursor left_ptr cursorName Cursor String NULL defaultColumns Columns int 2 **5 - destroyCallback Callback Pointer NULL + destroyCallback Callback Pointer NULL font Font XFontStruct* XtDefaultFont forceColumns Columns Boolean False **5 foreground Foreground Pixel XtDefaultForeground @@ -78,28 +77,28 @@ is set to the minimum size necessay to fit the entire list. If both Width and Height are zero then they are adjusted to fit the - entire list that is created width the number of default columns + entire list that is created width the number of default columns specified in the defaultColumns resource. **2 - This is an array of strings the specify elements of the list. - This resource must be specified. + This resource must be specified. (What good is a list widget without a list?? :-) **3 - Longest is the length of the widest string in pixels. **4 - If either of these values are zero (0) then the list widget calculates - the correct value. + the correct value. - (This allows you to make startup faster if you already have - this information calculated) + (This allows you to make startup faster if you already have + this information calculated) - NOTE: If the numberStrings value is zero the list must - be NULL terminated. + NOTE: If the numberStrings value is zero the list must + be NULL terminated. **5 - By setting the List.Columns resource you can force the application to - have a given number of columns. - - **6 - This returns the name and index of the item selected in an + have a given number of columns. + + **6 - This returns the name and index of the item selected in an XawListReturnStruct that is pointed to by the client_data in the CallbackProc. @@ -108,7 +107,7 @@ /* * Value returned when there are no highlighted objects */ -#define XAW_LIST_NONE -1 +#define XAW_LIST_NONE -1 #define XtCList "List" #define XtCSpacing "Spacing" @@ -127,7 +126,7 @@ #define XtNrowSpacing "rowSpacing" #define XtNverticalList "verticalList" #define XtNshowCurrent "showCurrent" - + #ifndef XtNfontSet #define XtNfontSet "fontSet" #endif @@ -164,7 +163,7 @@ * Changes the list being used and shown. * * Note: - * If nitems of longest are <= 0 then they will be caluculated + * If nitems of longest are <= 0 then they will be calculated * If nitems is <= 0 then the list needs to be NULL terminated */ void XawListChange Index: xc/lib/Xaw/ListP.h diff -u xc/lib/Xaw/ListP.h:1.9 xc/lib/Xaw/ListP.h:1.10 --- xc/lib/Xaw/ListP.h:1.9 Fri Dec 14 14:54:40 2001 +++ xc/lib/Xaw/ListP.h Thu Dec 22 12:52:11 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ListP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xaw/ListP.h,v 1.10 2005/12/22 17:52:11 tsi Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -23,14 +23,12 @@ 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/lib/Xaw/ListP.h,v 1.9 2001/12/14 19:54:40 dawes Exp $ */ - -/* +/* * This is a List widget. It allows the user to select an item in a list and * notifies the application through a callback function. * - * Created: 8/13/88 + * Created: 8/13/88 * By: Chris D. Peterson * MIT - Project Athena */ @@ -102,7 +100,7 @@ int selected; Boolean show_current; char pad1[(sizeof(XtPointer) - sizeof(Boolean)) + - (sizeof(XtPointer) - sizeof(int))]; + (sizeof(XtPointer) - sizeof(int))]; XtPointer pad2[2]; /* for future use and keep binary compatability */ #endif } ListPart; Index: xc/lib/Xaw/MenuButtoP.h diff -u xc/lib/Xaw/MenuButtoP.h:1.8 xc/lib/Xaw/MenuButtoP.h:1.9 --- xc/lib/Xaw/MenuButtoP.h:1.8 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/MenuButtoP.h Mon Jan 9 09:59:01 2006 @@ -1,4 +1,4 @@ -/* $Xorg: MenuButtoP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ +/* * Copyright 1989,1998 The Open Group @@ -22,7 +22,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/lib/Xaw/MenuButtoP.h,v 1.8 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButtoP.h,v 1.9 2006/01/09 14:59:01 dawes Exp $ */ /* * MenuButtonP.h - Private Header file for MenuButton widget. Index: xc/lib/Xaw/MenuButton.c diff -u xc/lib/Xaw/MenuButton.c:3.10 xc/lib/Xaw/MenuButton.c:3.11 --- xc/lib/Xaw/MenuButton.c:3.10 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/MenuButton.c Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: MenuButton.c,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ * */ -/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.10 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.c,v 3.11 2006/01/09 14:59:01 dawes Exp $ */ /* * MenuButton.c - Source code for MenuButton widget. Index: xc/lib/Xaw/MenuButton.h diff -u xc/lib/Xaw/MenuButton.h:1.6 xc/lib/Xaw/MenuButton.h:1.7 --- xc/lib/Xaw/MenuButton.h:1.6 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/MenuButton.h Mon Jan 9 09:59:01 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: MenuButton.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -23,7 +22,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/lib/Xaw/MenuButton.h,v 1.6 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MenuButton.h,v 1.7 2006/01/09 14:59:01 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xaw/MultiSink.c diff -u xc/lib/Xaw/MultiSink.c:1.20 xc/lib/Xaw/MultiSink.c:1.21 --- xc/lib/Xaw/MultiSink.c:1.20 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/MultiSink.c Thu Dec 22 12:52:11 2005 @@ -1,4 +1,4 @@ -/* $Xorg: MultiSink.c,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.21 2005/12/22 17:52:11 tsi Exp $ */ /* * Copyright 1991 by OMRON Corporation @@ -51,15 +51,15 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. - All Rights Reserved + All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -70,7 +70,6 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.c,v 1.20 2001/12/14 19:54:41 dawes Exp $ */ #include #include @@ -522,13 +521,14 @@ DisplayText(w, x, y - 1 - fheight, position, position + 1, True); } - else + else { XDrawRectangle(XtDisplay(ctx), XtWindow(ctx), sink->multi_sink.xorgc ? sink->multi_sink.xorgc : sink->multi_sink.normgc, x, y - 1 - fheight, CharWidth(sink, fontset, 0, *nchar) - 1, fheight - 1); + } } } @@ -662,7 +662,7 @@ values.clip_x_origin = (long)sink; values.clip_mask = None; values.graphics_exposures = False; - + values.foreground = sink->text_sink.foreground; values.background = sink->text_sink.background; Index: xc/lib/Xaw/MultiSink.h diff -u xc/lib/Xaw/MultiSink.h:1.6 xc/lib/Xaw/MultiSink.h:1.7 --- xc/lib/Xaw/MultiSink.h:1.6 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/MultiSink.h Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: MultiSink.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ - /* * Copyright 1991 by OMRON Corporation * @@ -70,7 +68,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.6 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSink.h,v 1.7 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawMultiSink_h #define _XawMultiSink_h Index: xc/lib/Xaw/MultiSinkP.h diff -u xc/lib/Xaw/MultiSinkP.h:1.9 xc/lib/Xaw/MultiSinkP.h:1.10 --- xc/lib/Xaw/MultiSinkP.h:1.9 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/MultiSinkP.h Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: MultiSinkP.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ - /* * Copyright 1991 by OMRON Corporation * @@ -71,7 +69,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.9 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSinkP.h,v 1.10 2006/01/09 14:59:01 dawes Exp $ */ #ifndef _XawMultiSinkP_h #define _XawMultiSinkP_h Index: xc/lib/Xaw/MultiSrc.c diff -u xc/lib/Xaw/MultiSrc.c:1.29 xc/lib/Xaw/MultiSrc.c:1.30 --- xc/lib/Xaw/MultiSrc.c:1.29 Fri Dec 6 11:19:57 2002 +++ xc/lib/Xaw/MultiSrc.c Mon Jan 9 09:59:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: MultiSrc.c,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ - /* * Copyright 1991 by OMRON Corporation * @@ -27,7 +25,7 @@ * * Much code taken from X11R3 String and Disk Sources. */ -/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.29 2002/12/06 16:19:57 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.c,v 1.30 2006/01/09 14:59:01 dawes Exp $ */ /* Index: xc/lib/Xaw/MultiSrc.h diff -u xc/lib/Xaw/MultiSrc.h:1.7 xc/lib/Xaw/MultiSrc.h:1.8 --- xc/lib/Xaw/MultiSrc.h:1.7 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/MultiSrc.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,3 @@ -/* $Xorg: MultiSrc.h,v 1.4 2001/02/09 02:03:44 xorgcvs Exp $ */ - /* * Copyright 1991 by OMRON Corporation * @@ -49,7 +47,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/MultiSrc.h,v 1.7 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrc.h,v 1.8 2006/01/09 14:59:02 dawes Exp $ */ /* * This file was modified from AsciiSrc.h. Index: xc/lib/Xaw/MultiSrcP.h diff -u xc/lib/Xaw/MultiSrcP.h:1.9 xc/lib/Xaw/MultiSrcP.h:1.10 --- xc/lib/Xaw/MultiSrcP.h:1.9 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/MultiSrcP.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,3 @@ -/* $Xorg: MultiSrcP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ - /* * Copyright 1991 by OMRON Corporation * @@ -71,7 +69,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.9 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/MultiSrcP.h,v 1.10 2006/01/09 14:59:02 dawes Exp $ */ /* * MultiSrcP.h - Private Header for Multi Text Source. Index: xc/lib/Xaw/Paned.c diff -u xc/lib/Xaw/Paned.c:1.12 xc/lib/Xaw/Paned.c:1.13 --- xc/lib/Xaw/Paned.c:1.12 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/Paned.c Mon Jan 9 09:59:02 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Paned.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.c,v 1.12 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Paned.c,v 1.13 2006/01/09 14:59:02 dawes Exp $ */ /* * Updated and significantly modified from the Athena VPaned Widget. Index: xc/lib/Xaw/Paned.h diff -u xc/lib/Xaw/Paned.h:1.7 xc/lib/Xaw/Paned.h:1.9 --- xc/lib/Xaw/Paned.h:1.7 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/Paned.h Tue Feb 7 17:02:25 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: Paned.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Paned.h,v 1.7 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Paned.h,v 1.9 2006/02/07 22:02:25 dawes Exp $ */ /* * Paned.h - Paned Composite Widget's public header file. @@ -83,7 +78,7 @@ gripIndent GripIndent Position 16 gripCursor Cursor Cursor ** horizontalGripCursol Cursor Cursor sb_h_double_arrow - horizontalBetweencursor Cursor Cursor sb_up_arrow + horizontalBetweenCursor Cursor Cursor sb_up_arrow internalBorderColor BorderColor Pixel XtDefaultForeground internalBorderWidth BorderWidth Position 1 leftCursor Cursor Cursor sb_left_arrow Index: xc/lib/Xaw/PanedP.h diff -u xc/lib/Xaw/PanedP.h:1.8 xc/lib/Xaw/PanedP.h:1.9 --- xc/lib/Xaw/PanedP.h:1.8 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/PanedP.h Mon Jan 9 09:59:02 2006 @@ -1,8 +1,5 @@ /*********************************************************** - $Xorg: PanedP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ - - Copyright 1987, 1988, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -47,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.8 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PanedP.h,v 1.9 2006/01/09 14:59:02 dawes Exp $ */ /* * Updated and significantly modified from the Athena VPaned Widget. Index: xc/lib/Xaw/Panner.c diff -u xc/lib/Xaw/Panner.c:3.9 xc/lib/Xaw/Panner.c:3.10 --- xc/lib/Xaw/Panner.c:3.9 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/Panner.c Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: Panner.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Panner.c,v 3.9 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Panner.c,v 3.10 2006/01/09 14:59:02 dawes Exp $ */ #include #include Index: xc/lib/Xaw/Panner.h diff -u xc/lib/Xaw/Panner.h:1.6 xc/lib/Xaw/Panner.h:1.7 --- xc/lib/Xaw/Panner.h:1.6 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/Panner.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: Panner.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Panner.h,v 1.6 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Panner.h,v 1.7 2006/01/09 14:59:02 dawes Exp $ */ #ifndef _XawPanner_h #define _XawPanner_h Index: xc/lib/Xaw/PannerP.h diff -u xc/lib/Xaw/PannerP.h:1.8 xc/lib/Xaw/PannerP.h:1.9 --- xc/lib/Xaw/PannerP.h:1.8 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/PannerP.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: PannerP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.8 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PannerP.h,v 1.9 2006/01/09 14:59:02 dawes Exp $ */ #ifndef _XawPannerP_h #define _XawPannerP_h Index: xc/lib/Xaw/Porthole.c diff -u xc/lib/Xaw/Porthole.c:1.7 xc/lib/Xaw/Porthole.c:1.8 --- xc/lib/Xaw/Porthole.c:1.7 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/Porthole.c Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: Porthole.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1990, 1994, 1998 The Open Group @@ -28,7 +27,7 @@ * This widget is a trivial clipping widget. It is typically used with a * panner or scrollbar to navigate. */ -/* $XFree86: xc/lib/Xaw/Porthole.c,v 1.7 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Porthole.c,v 1.8 2006/01/09 14:59:02 dawes Exp $ */ #include #include Index: xc/lib/Xaw/Porthole.h diff -u xc/lib/Xaw/Porthole.h:1.6 xc/lib/Xaw/Porthole.h:1.7 --- xc/lib/Xaw/Porthole.h:1.6 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/Porthole.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: Porthole.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Porthole.h,v 1.6 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Porthole.h,v 1.7 2006/01/09 14:59:02 dawes Exp $ */ #ifndef _XawPorthole_h #define _XawPorthole_h Index: xc/lib/Xaw/PortholeP.h diff -u xc/lib/Xaw/PortholeP.h:1.8 xc/lib/Xaw/PortholeP.h:1.9 --- xc/lib/Xaw/PortholeP.h:1.8 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/PortholeP.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: PortholeP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1990, 1994, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/PortholeP.h,v 1.8 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/PortholeP.h,v 1.9 2006/01/09 14:59:02 dawes Exp $ */ #ifndef _XawPortholeP_h #define _XawPortholeP_h Index: xc/lib/Xaw/Repeater.c diff -u xc/lib/Xaw/Repeater.c:1.7 xc/lib/Xaw/Repeater.c:1.8 --- xc/lib/Xaw/Repeater.c:1.7 Fri Dec 14 14:54:41 2001 +++ xc/lib/Xaw/Repeater.c Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: Repeater.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1990, 1994, 1998 The Open Group @@ -27,7 +26,7 @@ * * This widget is used for press-and-hold style buttons. */ -/* $XFree86: xc/lib/Xaw/Repeater.c,v 1.7 2001/12/14 19:54:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Repeater.c,v 1.8 2006/01/09 14:59:02 dawes Exp $ */ #include #include Index: xc/lib/Xaw/Repeater.h diff -u xc/lib/Xaw/Repeater.h:1.6 xc/lib/Xaw/Repeater.h:1.7 --- xc/lib/Xaw/Repeater.h:1.6 Fri Dec 14 14:54:42 2001 +++ xc/lib/Xaw/Repeater.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: Repeater.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/Repeater.h,v 1.6 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Repeater.h,v 1.7 2006/01/09 14:59:02 dawes Exp $ */ #ifndef _XawRepeater_h #define _XawRepeater_h Index: xc/lib/Xaw/RepeaterP.h diff -u xc/lib/Xaw/RepeaterP.h:1.8 xc/lib/Xaw/RepeaterP.h:1.9 --- xc/lib/Xaw/RepeaterP.h:1.8 Fri Dec 14 14:54:42 2001 +++ xc/lib/Xaw/RepeaterP.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: RepeaterP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/RepeaterP.h,v 1.8 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/RepeaterP.h,v 1.9 2006/01/09 14:59:02 dawes Exp $ */ #ifndef _XawRepeaterP_h #define _XawRepeaterP_h Index: xc/lib/Xaw/Reports.h diff -u xc/lib/Xaw/Reports.h:1.2 xc/lib/Xaw/Reports.h:1.3 --- xc/lib/Xaw/Reports.h:1.2 Fri Dec 14 14:54:42 2001 +++ xc/lib/Xaw/Reports.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,5 @@ +/* $XFree86: xc/lib/Xaw/Reports.h,v 1.3 2006/01/09 14:59:02 dawes Exp $ */ /* - * $Xorg: Reports.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group Index: xc/lib/Xaw/Scrollbar.c diff -u xc/lib/Xaw/Scrollbar.c:1.13 xc/lib/Xaw/Scrollbar.c:1.15 --- xc/lib/Xaw/Scrollbar.c:1.13 Fri Dec 14 14:54:42 2001 +++ xc/lib/Xaw/Scrollbar.c Wed Jan 11 19:58:01 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Scrollbar.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Scrollbar.c,v 1.13 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Scrollbar.c,v 1.15 2006/01/12 00:58:01 dawes Exp $ */ #include #include @@ -99,9 +97,11 @@ * Initialization */ static char defaultTranslations[] = +":" "StartScroll(Forward)\n" ":" "StartScroll(Forward)\n" ":" "StartScroll(Continuous) MoveThumb() NotifyThumb()\n" ":" "StartScroll(Backward)\n" +":" "StartScroll(Backward)\n" ":" "MoveThumb() NotifyThumb()\n" ":" "NotifyScroll(Proportional) EndScroll()\n"; Index: xc/lib/Xaw/Scrollbar.h diff -u xc/lib/Xaw/Scrollbar.h:1.7 xc/lib/Xaw/Scrollbar.h:1.8 --- xc/lib/Xaw/Scrollbar.h:1.7 Fri Dec 14 14:54:42 2001 +++ xc/lib/Xaw/Scrollbar.h Mon Jan 9 09:59:02 2006 @@ -1,6 +1,3 @@ -/* $Xorg: Scrollbar.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ - - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -47,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.7 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Scrollbar.h,v 1.8 2006/01/09 14:59:02 dawes Exp $ */ #ifndef _Scrollbar_h #define _Scrollbar_h Index: xc/lib/Xaw/ScrollbarP.h diff -u xc/lib/Xaw/ScrollbarP.h:1.8 xc/lib/Xaw/ScrollbarP.h:1.9 --- xc/lib/Xaw/ScrollbarP.h:1.8 Fri Dec 14 14:54:42 2001 +++ xc/lib/Xaw/ScrollbarP.h Mon Jan 9 09:59:02 2006 @@ -1,8 +1,3 @@ -/* - * $Xorg: ScrollbarP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ - */ - - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.8 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ScrollbarP.h,v 1.9 2006/01/09 14:59:02 dawes Exp $ */ #ifndef _ScrollbarP_h #define _ScrollbarP_h Index: xc/lib/Xaw/Simple.c diff -u xc/lib/Xaw/Simple.c:1.17 xc/lib/Xaw/Simple.c:1.21 --- xc/lib/Xaw/Simple.c:1.17 Fri Dec 14 14:54:42 2001 +++ xc/lib/Xaw/Simple.c Sun Feb 26 20:57:10 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Simple.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -47,7 +45,7 @@ ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.c,v 1.17 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Simple.c,v 1.21 2006/02/27 01:57:10 dawes Exp $ */ #include #include @@ -159,6 +157,15 @@ NULL }, { + XtNencoding, + XtCEncoding, + XtRUnsignedChar, + sizeof(unsigned char), + offset(encoding), + XtRImmediate, + (XtPointer)XtTextEncoding8bit + }, + { XtNtip, XtCTip, XtRString, @@ -167,6 +174,24 @@ XtRImmediate, NULL }, + { + XtNtipCallback, + XtCTipCallback, + XawRTipCallback, + sizeof(XtCallbackList), + offset(tipCallback), + XtRImmediate, + NULL + }, + { + XtNuserData, + XtCuserData, + XtRPointer, + sizeof(XtPointer), + offset(user_data), + XtRImmediate, + NULL + }, #endif #undef offset }; @@ -291,43 +316,44 @@ XawSimpleInitialize(Widget request, Widget cnew, ArgList args, Cardinal *num_args) { - SimpleWidget simple = (SimpleWidget)cnew; + SimpleWidget sw = (SimpleWidget) cnew; - if (simple->simple.tip) - simple->simple.tip = XtNewString(simple->simple.tip); + if (sw->simple.tip) + sw->simple.tip = XtNewStringEx(sw->simple.encoding, sw->simple.tip); } static void XawSimpleDestroy(Widget w) { - SimpleWidget simple = (SimpleWidget)w; + SimpleWidget sw = (SimpleWidget) w; - if (simple->simple.tip) - XtFree((XtPointer)simple->simple.tip); + if (sw->simple.tip) + XtFree((XtPointer)sw->simple.tip); } #endif static void XawSimpleRealize(Widget w, Mask *valueMask, XSetWindowAttributes *attributes) { + SimpleWidget sw = (SimpleWidget) w; #ifndef OLDXAW XawPixmap *pixmap; #endif Pixmap border_pixmap = CopyFromParent; - if (!XtIsSensitive(w)) + if (!XtIsSensitive(w)) { /* change border to gray; have to remember the old one, * so XtDestroyWidget deletes the proper one */ - if (((SimpleWidget)w)->simple.insensitive_border == None) - ((SimpleWidget)w)->simple.insensitive_border = + if (sw->simple.insensitive_border == None) + sw->simple.insensitive_border = XmuCreateStippledPixmap(XtScreen(w), w->core.border_pixel, w->core.background_pixel, w->core.depth); - border_pixmap = w->core.border_pixmap; + border_pixmap = w->core.border_pixmap; attributes->border_pixmap = - w->core.border_pixmap = ((SimpleWidget)w)->simple.insensitive_border; + w->core.border_pixmap = sw->simple.insensitive_border; *valueMask |= CWBorderPixmap; *valueMask &= ~CWBorderPixel; @@ -335,11 +361,11 @@ ConvertCursor(w); - if ((attributes->cursor = ((SimpleWidget)w)->simple.cursor) != None) + if ((attributes->cursor = sw->simple.cursor) != None) *valueMask |= CWCursor; - XtCreateWindow(w, InputOutput, (Visual *)CopyFromParent, - *valueMask, attributes); + XtCreateWindow(w, InputOutput, (Visual *)CopyFromParent, + *valueMask, attributes); if (!XtIsSensitive(w)) w->core.border_pixmap = border_pixmap; @@ -352,7 +378,7 @@ XawReshapeWidget(w, pixmap); } - if (((SimpleWidget)w)->simple.tip) + if (sw->simple.tip || sw->simple.tipCallback) XawTipEnable(w); #endif } @@ -370,21 +396,21 @@ static void ConvertCursor(Widget w) { - SimpleWidget simple = (SimpleWidget) w; + SimpleWidget sw = (SimpleWidget) w; XrmValue from, to; Cursor cursor = None; - if (simple->simple.cursor_name == NULL) + if (sw->simple.cursor_name == NULL) return; - from.addr = (XPointer)simple->simple.cursor_name; + from.addr = (XPointer)sw->simple.cursor_name; from.size = strlen((char *)from.addr) + 1; to.size = sizeof(Cursor); to.addr = (XPointer)&cursor; if (XtConvertAndStore(w, XtRString, &from, XtRColorCursor, &to)) - simple->simple.cursor = cursor; + sw->simple.cursor = cursor; else XtAppErrorMsg(XtWidgetToApplicationContext(w), "convertFailed","ConvertCursor","XawError", @@ -398,13 +424,18 @@ XawSimpleSetValues(Widget current, Widget request, Widget cnew, ArgList args, Cardinal *num_args) { - SimpleWidget s_old = (SimpleWidget)current; - SimpleWidget s_new = (SimpleWidget)cnew; + SimpleWidget s_old = (SimpleWidget) current; + SimpleWidget s_new = (SimpleWidget) cnew; Bool new_cursor = False; /* this disables user changes after creation */ s_new->simple.international = s_old->simple.international; +#ifndef OLDXAW + if (s_new->simple.international == True) + s_new->simple.encoding = XtTextEncodingMixed; +#endif + if (XtIsSensitive(current) != XtIsSensitive(cnew)) (*((SimpleWidgetClass)XtClass(cnew))->simple_class.change_sensitive) (cnew); @@ -448,12 +479,15 @@ if (s_old->simple.tip) XtFree((XtPointer)s_old->simple.tip); if (s_new->simple.tip) - s_new->simple.tip = XtNewString(s_new->simple.tip); + s_new->simple.tip = + XtNewStringEx(s_new->simple.encoding, s_new->simple.tip); } - if (s_old->simple.tip && !s_new->simple.tip) + if ((s_old->simple.tip && !s_new->simple.tip) || + (s_old->simple.tipCallback && !s_new->simple.tipCallback)) XawTipDisable(cnew); - else if (!s_old->simple.tip && s_new->simple.tip) + else if ((!s_old->simple.tip && s_new->simple.tip) || + (!s_old->simple.tipCallback && s_new->simple.tipCallback)) XawTipEnable(cnew); if (s_old->simple.display_list != s_new->simple.display_list) @@ -467,16 +501,18 @@ static void XawSimpleExpose(Widget w, XEvent *event, Region region) { - SimpleWidget xaw = (SimpleWidget)w; + SimpleWidget sw = (SimpleWidget) w; - if (xaw->simple.display_list) - XawRunDisplayList(w, xaw->simple.display_list, event, region); + if (sw->simple.display_list) + XawRunDisplayList(w, sw->simple.display_list, event, region); } #endif static Bool ChangeSensitive(Widget w) { + SimpleWidget sw = (SimpleWidget) w; + if (XtIsRealized(w)) { if (XtIsSensitive(w)) if (w->core.border_pixmap != XtUnspecifiedPixmap) @@ -486,14 +522,14 @@ XSetWindowBorder(XtDisplay(w), XtWindow(w), w->core.border_pixel); else { - if (((SimpleWidget)w)->simple.insensitive_border == None) - ((SimpleWidget)w)->simple.insensitive_border = + if (sw->simple.insensitive_border == None) + sw->simple.insensitive_border = XmuCreateStippledPixmap(XtScreen(w), w->core.border_pixel, w->core.background_pixel, w->core.depth); XSetWindowBorderPixmap(XtDisplay(w), XtWindow(w), - ((SimpleWidget)w)->simple.insensitive_border); + sw->simple.insensitive_border); } } Index: xc/lib/Xaw/Simple.h diff -u xc/lib/Xaw/Simple.h:1.9 xc/lib/Xaw/Simple.h:1.12 --- xc/lib/Xaw/Simple.h:1.9 Fri Dec 14 14:54:42 2001 +++ xc/lib/Xaw/Simple.h Sun Feb 26 20:57:10 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Simple.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Simple.h,v 1.9 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Simple.h,v 1.12 2006/02/27 01:57:10 dawes Exp $ */ #ifndef _Simple_h #define _Simple_h @@ -64,16 +62,20 @@ cursorName Cursor String NULL destroyCallback Callback Pointer NULL displayList DisplayList XawDisplayList* NULL + encoding Encoding UnsignedChar XtTextEncoding8bit height Height Dimension 0 insensitiveBorder Insensitive Pixmap Gray + international International Boolean False mappedWhenManaged MappedWhenManaged Boolean True pointerColor Foreground Pixel XtDefaultForeground pointerColorBackground Background Pixel XtDefaultBackground sensitive Sensitive Boolean True tip Tip String NULL + tipCallback Callback Pointer NULL width Width Dimension 0 x Position Position 0 y Position Position 0 + userData UserData Pointer NULL */ @@ -104,8 +106,26 @@ #define XawRDisplayList "XawDisplayList" #endif +#define XtNencoding "encoding" +#define XtCEncoding "Encoding" + #define XtNtip "tip" #define XtCTip "Tip" + +#ifndef XtNuserData +#define XtNuserData "userData" +#endif + +#ifndef XtCuserData +#define XtCuserData "UserData" +#endif + +#define XtNtipCallback "tipCallback" +#define XtCTipCallback "Callback" + +#ifndef XawRTipCallback +#define XawRTipCallback "XawTipCallback" +#endif #endif /* OLDXAW */ typedef struct _SimpleClassRec *SimpleWidgetClass; Index: xc/lib/Xaw/SimpleMenP.h diff -u xc/lib/Xaw/SimpleMenP.h:1.13 xc/lib/Xaw/SimpleMenP.h:1.14 --- xc/lib/Xaw/SimpleMenP.h:1.13 Fri Dec 14 14:54:42 2001 +++ xc/lib/Xaw/SimpleMenP.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: SimpleMenP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/SimpleMenP.h,v 1.13 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenP.h,v 1.14 2006/01/09 14:59:02 dawes Exp $ */ /* * SimpleMenuP.h - Private Header file for SimpleMenu widget. Index: xc/lib/Xaw/SimpleMenu.c diff -u xc/lib/Xaw/SimpleMenu.c:3.22 xc/lib/Xaw/SimpleMenu.c:3.23 --- xc/lib/Xaw/SimpleMenu.c:3.22 Fri Dec 14 14:54:42 2001 +++ xc/lib/Xaw/SimpleMenu.c Mon Jan 9 09:59:02 2006 @@ -1,5 +1,3 @@ -/* $Xorg: SimpleMenu.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -24,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/SimpleMenu.c,v 3.22 2001/12/14 19:54:42 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenu.c,v 3.23 2006/01/09 14:59:02 dawes Exp $ */ /* * SimpleMenu.c - Source code file for SimpleMenu widget. Index: xc/lib/Xaw/SimpleMenu.h diff -u xc/lib/Xaw/SimpleMenu.h:1.8 xc/lib/Xaw/SimpleMenu.h:1.9 --- xc/lib/Xaw/SimpleMenu.h:1.8 Fri Dec 14 14:54:43 2001 +++ xc/lib/Xaw/SimpleMenu.h Mon Jan 9 09:59:02 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: SimpleMenu.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SimpleMenu.h,v 1.8 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleMenu.h,v 1.9 2006/01/09 14:59:02 dawes Exp $ */ /* * SimpleMenu.h - Public Header file for SimpleMenu widget. Index: xc/lib/Xaw/SimpleP.h diff -u xc/lib/Xaw/SimpleP.h:1.13 xc/lib/Xaw/SimpleP.h:1.16 --- xc/lib/Xaw/SimpleP.h:1.13 Wed Dec 19 16:37:31 2001 +++ xc/lib/Xaw/SimpleP.h Sun Feb 26 20:57:10 2006 @@ -1,8 +1,5 @@ /*********************************************************** - $Xorg: SimpleP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ - - Copyright 1987, 1988, 1994, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -47,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.13 2001/12/19 21:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SimpleP.h,v 1.16 2006/02/27 01:57:10 dawes Exp $ */ #ifndef _SimpleP_h #define _SimpleP_h @@ -88,7 +85,12 @@ #ifndef OLDXAW XawDisplayList *display_list; String tip; - XtPointer pad[3]; /* for future use and keep binary compatability */ + XtCallbackList tipCallback; + unsigned char encoding; + XtPointer user_data; + + char pad[sizeof(XtPointer) - /* for future use and keep */ + sizeof(unsigned char)]; /* binary compatability */ #endif } SimplePart; Index: xc/lib/Xaw/Sme.c diff -u xc/lib/Xaw/Sme.c:1.7 xc/lib/Xaw/Sme.c:1.8 --- xc/lib/Xaw/Sme.c:1.7 Fri Dec 14 14:54:43 2001 +++ xc/lib/Xaw/Sme.c Mon Jan 9 09:59:02 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Sme.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -23,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/lib/Xaw/Sme.c,v 1.7 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Sme.c,v 1.8 2006/01/09 14:59:02 dawes Exp $ */ /* * Date: September 26, 1989 Index: xc/lib/Xaw/Sme.h diff -u xc/lib/Xaw/Sme.h:1.6 xc/lib/Xaw/Sme.h:1.8 --- xc/lib/Xaw/Sme.h:1.6 Fri Dec 14 14:54:43 2001 +++ xc/lib/Xaw/Sme.h Tue Feb 7 17:02:25 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: Sme.h,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -23,7 +22,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/lib/Xaw/Sme.h,v 1.6 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Sme.h,v 1.8 2006/02/07 22:02:25 dawes Exp $ */ /* * This is the public header file for the Athena Sme object. @@ -49,6 +48,7 @@ callback Callback Pointer NULL destroyCallback Callback Pointer NULL height Height Dimension 0 + international International Boolean False sensitive Sensitive Boolean True width Width Dimension 0 x Position Position 0 Index: xc/lib/Xaw/SmeBSB.c diff -u xc/lib/Xaw/SmeBSB.c:1.12 xc/lib/Xaw/SmeBSB.c:1.13 --- xc/lib/Xaw/SmeBSB.c:1.12 Fri Dec 14 14:54:43 2001 +++ xc/lib/Xaw/SmeBSB.c Mon Jan 9 09:59:03 2006 @@ -1,5 +1,3 @@ -/* $Xorg: SmeBSB.c,v 1.5 2001/02/09 02:03:45 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -24,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/SmeBSB.c,v 1.12 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSB.c,v 1.13 2006/01/09 14:59:03 dawes Exp $ */ /* * SmeBSB.c - Source code file for BSB Menu Entry object. Index: xc/lib/Xaw/SmeBSB.h diff -u xc/lib/Xaw/SmeBSB.h:1.7 xc/lib/Xaw/SmeBSB.h:1.8 --- xc/lib/Xaw/SmeBSB.h:1.7 Fri Dec 14 14:54:43 2001 +++ xc/lib/Xaw/SmeBSB.h Mon Jan 9 09:59:03 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: SmeBSB.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -23,7 +22,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/lib/Xaw/SmeBSB.h,v 1.7 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSB.h,v 1.8 2006/01/09 14:59:03 dawes Exp $ */ /* * SmeBSB.h - Public Header file for SmeBSB object. Index: xc/lib/Xaw/SmeBSBP.h diff -u xc/lib/Xaw/SmeBSBP.h:1.9 xc/lib/Xaw/SmeBSBP.h:1.10 --- xc/lib/Xaw/SmeBSBP.h:1.9 Fri Dec 14 14:54:43 2001 +++ xc/lib/Xaw/SmeBSBP.h Mon Jan 9 09:59:03 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: SmeBSBP.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeBSBP.h,v 1.9 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeBSBP.h,v 1.10 2006/01/09 14:59:03 dawes Exp $ */ #ifndef _XawSmeBSBP_h #define _XawSmeBSBP_h Index: xc/lib/Xaw/SmeLine.c diff -u xc/lib/Xaw/SmeLine.c:1.8 xc/lib/Xaw/SmeLine.c:1.9 --- xc/lib/Xaw/SmeLine.c:1.8 Fri Dec 14 14:54:43 2001 +++ xc/lib/Xaw/SmeLine.c Mon Jan 9 09:59:03 2006 @@ -1,5 +1,3 @@ -/* $Xorg: SmeLine.c,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeLine.c,v 1.8 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLine.c,v 1.9 2006/01/09 14:59:03 dawes Exp $ */ /* * Sme.c - Source code for the generic menu entry Index: xc/lib/Xaw/SmeLine.h diff -u xc/lib/Xaw/SmeLine.h:1.6 xc/lib/Xaw/SmeLine.h:1.7 --- xc/lib/Xaw/SmeLine.h:1.6 Fri Dec 14 14:54:43 2001 +++ xc/lib/Xaw/SmeLine.h Mon Jan 9 09:59:03 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: SmeLine.h,v 1.4 2001/02/09 02:03:45 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * */ -/* $XFree86: xc/lib/Xaw/SmeLine.h,v 1.6 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLine.h,v 1.7 2006/01/09 14:59:03 dawes Exp $ */ /* * This is the public header file for the Athena SmeLine object. Index: xc/lib/Xaw/SmeLineP.h diff -u xc/lib/Xaw/SmeLineP.h:1.8 xc/lib/Xaw/SmeLineP.h:1.9 --- xc/lib/Xaw/SmeLineP.h:1.8 Fri Dec 14 14:54:43 2001 +++ xc/lib/Xaw/SmeLineP.h Mon Jan 9 09:59:03 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: SmeLineP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -25,7 +24,7 @@ * * Author: Chris D. Peterson, MIT X Consortium */ -/* $XFree86: xc/lib/Xaw/SmeLineP.h,v 1.8 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeLineP.h,v 1.9 2006/01/09 14:59:03 dawes Exp $ */ #ifndef _XawSmeLineP_h #define _XawSmeLineP_h Index: xc/lib/Xaw/SmeP.h diff -u xc/lib/Xaw/SmeP.h:1.9 xc/lib/Xaw/SmeP.h:1.10 --- xc/lib/Xaw/SmeP.h:1.9 Wed Dec 19 16:37:31 2001 +++ xc/lib/Xaw/SmeP.h Mon Jan 9 09:59:03 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: SmeP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ * Copyright 1989, 1994, 1998 The Open Group @@ -23,7 +22,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/lib/Xaw/SmeP.h,v 1.9 2001/12/19 21:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/SmeP.h,v 1.10 2006/01/09 14:59:03 dawes Exp $ */ /* * This is the private header file for the Athena Sme object. Index: xc/lib/Xaw/StripCharP.h diff -u xc/lib/Xaw/StripCharP.h:1.8 xc/lib/Xaw/StripCharP.h:1.9 --- xc/lib/Xaw/StripCharP.h:1.8 Fri Dec 14 14:54:43 2001 +++ xc/lib/Xaw/StripCharP.h Mon Jan 9 09:59:03 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: StripCharP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.8 2001/12/14 19:54:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripCharP.h,v 1.9 2006/01/09 14:59:03 dawes Exp $ */ #ifndef _XawStripChartP_h #define _XawStripChartP_h Index: xc/lib/Xaw/StripChart.c diff -u xc/lib/Xaw/StripChart.c:1.8 xc/lib/Xaw/StripChart.c:1.9 --- xc/lib/Xaw/StripChart.c:1.8 Fri Dec 14 14:54:44 2001 +++ xc/lib/Xaw/StripChart.c Mon Jan 9 09:59:03 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StripChart.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.8 2001/12/14 19:54:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripChart.c,v 1.9 2006/01/09 14:59:03 dawes Exp $ */ #include #include Index: xc/lib/Xaw/StripChart.h diff -u xc/lib/Xaw/StripChart.h:1.6 xc/lib/Xaw/StripChart.h:1.7 --- xc/lib/Xaw/StripChart.h:1.6 Fri Dec 14 14:54:44 2001 +++ xc/lib/Xaw/StripChart.h Mon Jan 9 09:59:03 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StripChart.h,v 1.5 2001/02/09 02:03:46 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.6 2001/12/14 19:54:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/StripChart.h,v 1.7 2006/01/09 14:59:03 dawes Exp $ */ #ifndef _XawStripChart_h #define _XawStripChart_h Index: xc/lib/Xaw/Template.c diff -u xc/lib/Xaw/Template.c:1.9 xc/lib/Xaw/Template.c:1.10 --- xc/lib/Xaw/Template.c:1.9 Fri Dec 14 14:54:44 2001 +++ xc/lib/Xaw/Template.c Mon Jan 9 09:59:03 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Template.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ - /* Copyright 1987, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Template.c,v 1.9 2001/12/14 19:54:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Template.c,v 1.10 2006/01/09 14:59:03 dawes Exp $ */ #include #include Index: xc/lib/Xaw/Template.h diff -u xc/lib/Xaw/Template.h:1.6 xc/lib/Xaw/Template.h:1.7 --- xc/lib/Xaw/Template.h:1.6 Fri Dec 14 14:54:44 2001 +++ xc/lib/Xaw/Template.h Mon Jan 9 09:59:03 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Template.h,v 1.5 2001/02/09 02:03:46 xorgcvs Exp $ */ - /* Copyright 1987, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Template.h,v 1.6 2001/12/14 19:54:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Template.h,v 1.7 2006/01/09 14:59:03 dawes Exp $ */ #ifndef _Template_h #define _Template_h Index: xc/lib/Xaw/TemplateP.h diff -u xc/lib/Xaw/TemplateP.h:1.7 xc/lib/Xaw/TemplateP.h:1.8 --- xc/lib/Xaw/TemplateP.h:1.7 Fri Dec 14 14:54:44 2001 +++ xc/lib/Xaw/TemplateP.h Mon Jan 9 09:59:03 2006 @@ -1,5 +1,3 @@ -/* $Xorg: TemplateP.h,v 1.5 2001/02/09 02:03:46 xorgcvs Exp $ */ - /* Copyright 1987, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TemplateP.h,v 1.7 2001/12/14 19:54:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TemplateP.h,v 1.8 2006/01/09 14:59:03 dawes Exp $ */ #ifndef _TemplateP_h #define _TemplateP_h Index: xc/lib/Xaw/Text.c diff -u xc/lib/Xaw/Text.c:3.54 xc/lib/Xaw/Text.c:3.55 --- xc/lib/Xaw/Text.c:3.54 Mon Dec 22 12:48:04 2003 +++ xc/lib/Xaw/Text.c Mon Jan 9 09:59:03 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Text.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -74,7 +72,7 @@ * XFree86 Project. */ -/* $XFree86: xc/lib/Xaw/Text.c,v 3.54 2003/12/22 17:48:04 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.c,v 3.55 2006/01/09 14:59:03 dawes Exp $ */ #include #include Index: xc/lib/Xaw/Text.h diff -u xc/lib/Xaw/Text.h:1.15 xc/lib/Xaw/Text.h:1.16 --- xc/lib/Xaw/Text.h:1.15 Fri Dec 14 14:54:44 2001 +++ xc/lib/Xaw/Text.h Mon Jan 9 09:59:04 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Text.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Text.h,v 1.15 2001/12/14 19:54:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Text.h,v 1.16 2006/01/09 14:59:04 dawes Exp $ */ #ifndef _XawText_h #define _XawText_h Index: xc/lib/Xaw/TextAction.c diff -u xc/lib/Xaw/TextAction.c:3.48 xc/lib/Xaw/TextAction.c:3.49 --- xc/lib/Xaw/TextAction.c:3.48 Thu Jan 27 13:09:19 2005 +++ xc/lib/Xaw/TextAction.c Tue Feb 7 16:23:58 2006 @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.48 2005/01/27 18:09:19 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextAction.c,v 3.49 2006/02/07 21:23:58 dawes Exp $ */ #include #include @@ -2970,10 +2970,17 @@ TextEnterWindow(Widget w, XEvent *event, String *params, Cardinal *num_params) { TextWidget ctx = (TextWidget)w; + Bool display_caret = ctx->text.display_caret; if ((event->xcrossing.detail != NotifyInferior) && event->xcrossing.focus && !ctx->text.hasfocus) _XawImSetFocusValues(w, NULL, 0); + + if (display_caret) + StartAction(ctx, event); + ctx->text.hasfocus = TRUE; + if (display_caret) + EndAction(ctx); } /*ARGSUSED*/ @@ -2981,10 +2988,17 @@ TextLeaveWindow(Widget w, XEvent *event, String *params, Cardinal *num_params) { TextWidget ctx = (TextWidget)w; + Bool display_caret = ctx->text.display_caret; if ((event->xcrossing.detail != NotifyInferior) && event->xcrossing.focus && !ctx->text.hasfocus) _XawImUnsetFocus(w); + + if (display_caret) + StartAction(ctx, event); + ctx->text.hasfocus = FALSE; + if (display_caret) + EndAction(ctx); } /* Index: xc/lib/Xaw/TextP.h diff -u xc/lib/Xaw/TextP.h:3.22 xc/lib/Xaw/TextP.h:3.23 --- xc/lib/Xaw/TextP.h:3.22 Wed Dec 19 16:37:31 2001 +++ xc/lib/Xaw/TextP.h Mon Jan 9 09:59:04 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: TextP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextP.h,v 3.22 2001/12/19 21:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextP.h,v 3.23 2006/01/09 14:59:04 dawes Exp $ */ #ifndef _XawTextP_h #define _XawTextP_h Index: xc/lib/Xaw/TextPop.c diff -u xc/lib/Xaw/TextPop.c:1.21 xc/lib/Xaw/TextPop.c:1.22 --- xc/lib/Xaw/TextPop.c:1.21 Thu Oct 23 17:33:54 2003 +++ xc/lib/Xaw/TextPop.c Mon Jan 9 09:59:04 2006 @@ -1,5 +1,3 @@ -/* $Xorg: TextPop.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.21 2003/10/23 21:33:54 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/TextPop.c,v 1.22 2006/01/09 14:59:04 dawes Exp $ */ /* * This file is broken up into three sections one dealing with Index: xc/lib/Xaw/TextSink.c diff -u xc/lib/Xaw/TextSink.c:1.22 xc/lib/Xaw/TextSink.c:1.23 --- xc/lib/Xaw/TextSink.c:1.22 Thu Jan 22 22:57:58 2004 +++ xc/lib/Xaw/TextSink.c Mon Jan 9 09:59:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: TextSink.c,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.22 2004/01/23 03:57:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSink.c,v 1.23 2006/01/09 14:59:04 dawes Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. Index: xc/lib/Xaw/TextSink.h diff -u xc/lib/Xaw/TextSink.h:1.10 xc/lib/Xaw/TextSink.h:1.11 --- xc/lib/Xaw/TextSink.h:1.10 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/TextSink.h Mon Jan 9 09:59:04 2006 @@ -1,7 +1,3 @@ -/* - * $Xorg: TextSink.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ - */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -48,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.10 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSink.h,v 1.11 2006/01/09 14:59:04 dawes Exp $ */ #ifndef _XawTextSink_h #define _XawTextSink_h Index: xc/lib/Xaw/TextSinkP.h diff -u xc/lib/Xaw/TextSinkP.h:1.12 xc/lib/Xaw/TextSinkP.h:1.13 --- xc/lib/Xaw/TextSinkP.h:1.12 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/TextSinkP.h Mon Jan 9 09:59:04 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: TextSinkP.h,v 1.4 2001/02/09 02:03:46 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.12 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSinkP.h,v 1.13 2006/01/09 14:59:04 dawes Exp $ */ #ifndef _XawTextSinkP_h #define _XawTextSinkP_h Index: xc/lib/Xaw/TextSrc.c diff -u xc/lib/Xaw/TextSrc.c:1.35 xc/lib/Xaw/TextSrc.c:1.36 --- xc/lib/Xaw/TextSrc.c:1.35 Sat Oct 23 11:29:25 2004 +++ xc/lib/Xaw/TextSrc.c Mon Jan 9 09:59:04 2006 @@ -1,4 +1,3 @@ -/* $Xorg: TextSrc.c,v 1.5 2001/02/09 02:03:47 xorgcvs Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -25,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.35 2004/10/23 15:29:25 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.c,v 1.36 2006/01/09 14:59:04 dawes Exp $ */ /* * Author: Chris Peterson, MIT X Consortium. Index: xc/lib/Xaw/TextSrc.h diff -u xc/lib/Xaw/TextSrc.h:1.13 xc/lib/Xaw/TextSrc.h:1.14 --- xc/lib/Xaw/TextSrc.h:1.13 Sat Feb 9 21:40:08 2002 +++ xc/lib/Xaw/TextSrc.h Mon Jan 9 09:59:04 2006 @@ -1,7 +1,3 @@ -/* - * $Xorg: TextSrc.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ - */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -48,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.13 2002/02/10 02:40:08 paulo Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrc.h,v 1.14 2006/01/09 14:59:04 dawes Exp $ */ #ifndef _XawTextSrc_h #define _XawTextSrc_h Index: xc/lib/Xaw/TextSrcP.h diff -u xc/lib/Xaw/TextSrcP.h:1.15 xc/lib/Xaw/TextSrcP.h:1.16 --- xc/lib/Xaw/TextSrcP.h:1.15 Wed Dec 19 16:37:31 2001 +++ xc/lib/Xaw/TextSrcP.h Mon Jan 9 09:59:04 2006 @@ -1,8 +1,3 @@ -/* -* $Xorg: TextSrcP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ -*/ - - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -49,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.15 2001/12/19 21:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextSrcP.h,v 1.16 2006/01/09 14:59:04 dawes Exp $ */ #ifndef _XawTextSrcP_h #define _XawTextSrcP_h Index: xc/lib/Xaw/TextTr.c diff -u xc/lib/Xaw/TextTr.c:3.16 xc/lib/Xaw/TextTr.c:3.17 --- xc/lib/Xaw/TextTr.c:3.16 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/TextTr.c Mon Jan 9 09:59:04 2006 @@ -1,5 +1,3 @@ -/* $Xorg: TextTr.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ - /* Copyright 1991, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.16 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.17 2006/01/09 14:59:04 dawes Exp $ */ /* INTERNATIONALIZATION: Index: xc/lib/Xaw/Tip.c diff -u xc/lib/Xaw/Tip.c:1.5 xc/lib/Xaw/Tip.c:1.7 --- xc/lib/Xaw/Tip.c:1.5 Thu May 18 12:29:53 2000 +++ xc/lib/Xaw/Tip.c Tue Jan 24 23:32:09 2006 @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/Tip.c,v 1.5 2000/05/18 16:29:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tip.c,v 1.7 2006/01/25 04:32:09 dawes Exp $ */ #include #include @@ -308,6 +308,33 @@ *mask, attr); } +#undef XawEncoding +#define XawEncoding(tw) ((tw)->tip.encoding) + +#undef XawDrawString +#define XawDrawString(tw, label, len) \ + ((XawEncoding(tw) == XtTextEncodingChar2b) ? \ + XDrawString16(XtDisplay(w), XtWindow(w), gc, \ + tip->tip.left_margin, y, \ + (XChar2b*)label, len / 2) : \ + XDrawString(XtDisplay(w), XtWindow(w), gc, \ + tip->tip.left_margin, y, label, len)) + +#undef XawTextWidth +#define XawTextWidth(tw, label, len) \ + ((XawEncoding(tw) == XtTextEncodingChar2b) ? \ + XTextWidth16(fs, (XChar2b*)label, len / 2) : \ + XTextWidth(fs, label, len)); + +#undef XawCharIndex +#define XawCharIndex(tw, label, c) \ + XtCharIndexEx(XawEncoding(tw), label, c) + +#undef XawStringLength +#define XawStringLength(tw, label) \ + XtStringLengthEx(XawEncoding(tw), label) + + static void XawTipExpose(Widget w, XEvent *event, Region region) { @@ -326,40 +353,34 @@ ksy += XawAbs(ext->max_ink_extent.y); - while ((nl = index(label, '\n')) != NULL) { + while ((nl = XawCharIndex(tip, label, '\n')) != NULL) { XmbDrawString(XtDisplay(w), XtWindow(w), tip->tip.fontset, gc, tip->tip.left_margin, ksy, label, (int)(nl - label)); + ksy += ext->max_ink_extent.height; - label = nl + 1; + + MOVE_FORWARD(XawEncoding(tip), label, nl); } - len = strlen(label); + len = XawStringLength(tip, label); + if (len) XmbDrawString(XtDisplay(w), XtWindow(w), tip->tip.fontset, gc, tip->tip.left_margin, ksy, label, len); } else { - while ((nl = index(label, '\n')) != NULL) { - if (tip->tip.encoding) - XDrawString16(XtDisplay(w), XtWindow(w), gc, - tip->tip.left_margin, y, - (XChar2b*)label, (int)(nl - label) >> 1); - else - XDrawString(XtDisplay(w), XtWindow(w), gc, - tip->tip.left_margin, y, label, (int)(nl - label)); + while ((nl = XawCharIndex(tip, label, '\n')) != NULL) { + XawDrawString(tip, label, (nl - label)); + y += tip->tip.font->max_bounds.ascent + tip->tip.font->max_bounds.descent; - label = nl + 1; - } - len = strlen(label); - if (len) { - if (tip->tip.encoding) - XDrawString16(XtDisplay(w), XtWindow(w), gc, - tip->tip.left_margin, y, (XChar2b*)label, len >> 1); - else - XDrawString(XtDisplay(w), XtWindow(w), gc, - tip->tip.left_margin, y, label, len); + + MOVE_FORWARD(XawEncoding(tip), label, nl); } + len = XawStringLength(tip, label); + + if (len) + XawDrawString(tip, label, len); } } @@ -395,62 +416,68 @@ static void TipLayout(XawTipInfo *info) { - XFontStruct *fs = info->tip->tip.font; - int width = 0, height; + int width, height, w; char *nl, *label = info->tip->tip.label; + TipWidget tw = (TipWidget) info->tip; - if (info->tip->tip.international == True) { - XFontSet fset = info->tip->tip.fontset; + if (tw->tip.international == True) { + XFontSet fset = tw->tip.fontset; XFontSetExtents *ext = XExtentsOfFontSet(fset); height = ext->max_ink_extent.height; - if ((nl = index(label, '\n')) != NULL) { - /*CONSTCOND*/ - while (True) { - int w = XmbTextEscapement(fset, label, (int)(nl - label)); - - if (w > width) - width = w; - if (*nl == '\0') - break; - label = nl + 1; - if (*label) + width = 0; + + if ((nl = XawCharIndex(tw, label, '\n')) != NULL) { + for (; nl != NULL; nl = XawCharIndex(tw, label, '\n')) { + w = XmbTextEscapement(fset, label, (int)(nl - label)); + width = XawMax(width, w); + + MOVE_FORWARD(XawEncoding(tw), label, nl); + + if (NOT_AT_EOL(XawEncoding(tw), label)) height += ext->max_ink_extent.height; - if ((nl = index(label, '\n')) == NULL) - nl = index(label, '\0'); } + + if (NOT_AT_EOL(XawEncoding(tw), label)) { + w = XmbTextEscapement(fset, label, XawStringLength(tw, label)); + width = XawMax(width, w); + } + } + else { + width = XmbTextEscapement(fset, label, XawStringLength(tw, label)); } - else - width = XmbTextEscapement(fset, label, strlen(label)); } else { + XFontStruct *fs = tw->tip.font; + height = fs->max_bounds.ascent + fs->max_bounds.descent; - if ((nl = index(label, '\n')) != NULL) { - /*CONSTCOND*/ - while (True) { - int w = info->tip->tip.encoding ? - XTextWidth16(fs, (XChar2b*)label, (int)(nl - label) >> 1) : - XTextWidth(fs, label, (int)(nl - label)); - if (w > width) - width = w; - if (*nl == '\0') - break; - label = nl + 1; - if (*label) + width = 0; + + if ((nl = XawCharIndex(tw, label, '\n')) != NULL) { + for (; nl != NULL; nl = XawCharIndex(tw, label, '\n')) { + w = XawTextWidth(tw, label, (nl - label)); + width = XawMax(width, w); + + MOVE_FORWARD(XawEncoding(tw), label, nl); + + if (NOT_AT_EOL(XawEncoding(tw), label)) height += fs->max_bounds.ascent + fs->max_bounds.descent; - if ((nl = index(label, '\n')) == NULL) - nl = index(label, '\0'); } + + if (NOT_AT_EOL(XawEncoding(tw), label)) { + w = XawTextWidth(tw, label, XawStringLength(tw, label)); + width = XawMax(width, w); + } + } + else { + width = XawTextWidth(tw, label, XawStringLength(tw, label)); } - else - width = info->tip->tip.encoding ? - XTextWidth16(fs, (XChar2b*)label, strlen(label) >> 1) : - XTextWidth(fs, label, strlen(label)); - } - XtWidth(info->tip) = width + info->tip->tip.left_margin + - info->tip->tip.right_margin; - XtHeight(info->tip) = height + info->tip->tip.top_margin + - info->tip->tip.bottom_margin; + } + + XtWidth(tw) = width + info->tip->tip.left_margin + + info->tip->tip.right_margin; + XtHeight(tw) = height + info->tip->tip.top_margin + + info->tip->tip.bottom_margin; } #define DEFAULT_TIP_Y_OFFSET 12 @@ -552,15 +579,22 @@ TipTimeoutCallback(XtPointer closure, XtIntervalId *id) { XawTipInfo *info = (XawTipInfo*)closure; - Arg args[3]; + Arg args[4]; info->tip->tip.label = NULL; info->tip->tip.international = False; info->tip->tip.encoding = 0; + info->tip->tip.getLabelProc = NULL; XtSetArg(args[0], XtNtip, &info->tip->tip.label); XtSetArg(args[1], XtNinternational, &info->tip->tip.international); XtSetArg(args[2], XtNencoding, &info->tip->tip.encoding); - XtGetValues(info->widget, args, 3); + XtSetArg(args[3], XtNtipCallback, &info->tip->tip.getLabelProc); + XtGetValues(info->widget, args, 4); + + if (info->tip->tip.label == NULL && + info->tip->tip.getLabelProc != NULL) { + (info->tip->tip.getLabelProc) (info->widget, &info->tip->tip.label, NULL); + } if (info->tip->tip.label) { TipLayout(info); Index: xc/lib/Xaw/Tip.h diff -u xc/lib/Xaw/Tip.h:1.1 xc/lib/Xaw/Tip.h:1.2 --- xc/lib/Xaw/Tip.h:1.1 Sun Jun 27 10:07:35 1999 +++ xc/lib/Xaw/Tip.h Wed May 11 20:51:56 2005 @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/Tip.h,v 1.1 1999/06/27 14:07:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tip.h,v 1.2 2005/05/12 00:51:56 dawes Exp $ */ #ifndef _XawTip_h #define _XawTip_h @@ -75,14 +75,17 @@ #define XtNtimeout "timeout" #define XtNtopMargin "topMargin" #define XtNtip "tip" +#define XtNtipCallback "tipCallback" #define XawCDisplayList "DisplayList" #define XtCHorizontalMargins "HorizontalMargins" #define XtCTimeout "Timeout" #define XtCVerticalMargins "VerticalMargins" #define XtCTip "Tip" +#define XtCTipCallback "Callback" #define XawRDisplayList "XawDisplayList" +#define XawRTipCallback "XawTipCallback" /* * Public Functions @@ -104,7 +107,7 @@ /* * Function: - * XawTipEnable + * XawTipDisable * * Parameters: * w - widget Index: xc/lib/Xaw/TipP.h diff -u xc/lib/Xaw/TipP.h:1.1 xc/lib/Xaw/TipP.h:1.2 --- xc/lib/Xaw/TipP.h:1.1 Sun Jun 27 10:07:35 1999 +++ xc/lib/Xaw/TipP.h Wed May 11 20:51:56 2005 @@ -27,7 +27,7 @@ * Author: Paulo César Pereira de Andrade */ -/* $XFree86: xc/lib/Xaw/TipP.h,v 1.1 1999/06/27 14:07:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TipP.h,v 1.2 2005/05/12 00:51:56 dawes Exp $ */ #ifndef _XawTipP_h #define _XawTipP_h @@ -66,7 +66,8 @@ String label; Boolean international; unsigned char encoding; - XtPointer pad[4]; + XtCallbackProc getLabelProc; + XtPointer pad[3]; } TipPart; typedef struct _TipRec { Index: xc/lib/Xaw/Toggle.c diff -u xc/lib/Xaw/Toggle.c:1.9 xc/lib/Xaw/Toggle.c:1.10 --- xc/lib/Xaw/Toggle.c:1.9 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/Toggle.c Mon Jan 9 09:59:04 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Toggle.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/Toggle.c,v 1.9 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Toggle.c,v 1.10 2006/01/09 14:59:04 dawes Exp $ */ /* * Author: Chris D. Peterson Index: xc/lib/Xaw/Toggle.h diff -u xc/lib/Xaw/Toggle.h:1.6 xc/lib/Xaw/Toggle.h:1.7 --- xc/lib/Xaw/Toggle.h:1.6 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/Toggle.h Thu Dec 22 12:52:11 2005 @@ -1,6 +1,6 @@ +/* $XFree86: xc/lib/Xaw/Toggle.h,v 1.7 2005/12/22 17:52:11 tsi Exp $ */ /* - * $Xorg: Toggle.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ - * + Copyright 1989, 1994, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -23,7 +23,6 @@ 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/lib/Xaw/Toggle.h,v 1.6 2001/12/14 19:54:45 dawes Exp $ */ /* * ToggleP.h - Private definitions for Toggle widget @@ -31,7 +30,7 @@ * Author: Chris D. Peterson * MIT X Consortium * kit@expo.lcs.mit.edu - * + * * Date: January 12, 1989 */ @@ -75,7 +74,7 @@ + To use the toggle as a radio toggle button, set this resource to point to any other widget in the radio group. -++ This is the data returned from a call to XtToggleGetCurrent, by default +++ This is the data returned from a call to XawToggleGetCurrent, by default this is set to the name of toggle widget. */ @@ -107,7 +106,7 @@ */ _XFUNCPROTOBEGIN - + /* * Function: * XawToggleChangeRadioGroup Index: xc/lib/Xaw/ToggleP.h diff -u xc/lib/Xaw/ToggleP.h:1.8 xc/lib/Xaw/ToggleP.h:1.9 --- xc/lib/Xaw/ToggleP.h:1.8 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/ToggleP.h Mon Jan 9 09:59:04 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ToggleP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/ToggleP.h,v 1.8 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ToggleP.h,v 1.9 2006/01/09 14:59:04 dawes Exp $ */ /* * Author: Chris D. Peterson Index: xc/lib/Xaw/Tree.c diff -u xc/lib/Xaw/Tree.c:1.10 xc/lib/Xaw/Tree.c:1.16 --- xc/lib/Xaw/Tree.c:1.10 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/Tree.c Tue Jan 24 23:32:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Tree.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ - * Copyright 1990, 1994, 1998 The Open Group @@ -48,7 +46,7 @@ * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/Tree.c,v 1.10 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tree.c,v 1.16 2006/01/25 04:32:09 dawes Exp $ */ #include #include @@ -58,7 +56,11 @@ #include "Private.h" #define IsHorizontal(tw) ((tw)->tree.gravity == WestGravity || \ - (tw)->tree.gravity == EastGravity) + (tw)->tree.gravity == EastGravity || \ + (tw)->tree.gravity == NorthWestGravity || \ + (tw)->tree.gravity == NorthEastGravity || \ + (tw)->tree.gravity == SouthWestGravity || \ + (tw)->tree.gravity == SouthEastGravity) /* * Class Methods @@ -88,7 +90,7 @@ static GC get_tree_gc(TreeWidget); static void initialize_dimensions(Dimension**, int*, int); static void insert_node(Widget, Widget); -static void layout_tree(TreeWidget, Bool); +static void layout_tree(Widget, Bool); static void set_positions(TreeWidget, Widget, int); static void set_tree_size(TreeWidget, Bool, unsigned int, unsigned int); @@ -109,16 +111,20 @@ XtOffsetOf(TreeRec, tree.vpad), XtRImmediate, (XtPointer) 0 }, { XtNforeground, XtCForeground, XtRPixel, sizeof (Pixel), XtOffsetOf(TreeRec, tree.foreground), XtRString, - XtDefaultForeground}, + XtDefaultForeground }, { XtNlineWidth, XtCLineWidth, XtRDimension, sizeof (Dimension), XtOffsetOf(TreeRec, tree.line_width), XtRImmediate, (XtPointer) 0 }, { XtNgravity, XtCGravity, XtRGravity, sizeof (XtGravity), XtOffsetOf(TreeRec, tree.gravity), XtRImmediate, (XtPointer) WestGravity }, #ifndef OLDXAW - { XawNdisplayList, XawCDisplayList, XawRDisplayList, sizeof(XawDisplayList*), + { XawNdisplayList, XawCDisplayList, XawRDisplayList, + sizeof(XawDisplayList*), XtOffsetOf(TreeRec, tree.display_list), XtRImmediate, NULL }, + { XawNtreeConnType, XawCTreeConnType, XtRInt, sizeof (XawTreeConnType), + XtOffsetOf(TreeRec, tree.connection_type), XtRImmediate, + (XtPointer) XawTreeK }, #endif }; @@ -133,6 +139,11 @@ XtOffsetOf(TreeConstraintsRec, tree.gc), XtRImmediate, NULL }, }; +TreeExtensionClassPart treeExtensionClassPart = { + layout_tree, /* do_layout */ + {NULL, NULL, NULL, NULL}, /* padding */ + NULL, /* extension */ +}; TreeClassRec treeClassRec = { { @@ -189,8 +200,8 @@ NULL, /* extension */ }, { - /* Tree class fields */ - 0, /* ignore */ + /* tree_class fields */ + &treeExtensionClassPart, /* extension */ } }; @@ -318,7 +329,10 @@ check_gravity(TreeWidget tw, XtGravity grav) { switch (tw->tree.gravity) { - case WestGravity: case NorthGravity: case EastGravity: case SouthGravity: + case WestGravity: + case NorthGravity: + case EastGravity: + case SouthGravity: break; default: tw->tree.gravity = grav; @@ -406,7 +420,7 @@ ArgList args, Cardinal *num_args) { TreeConstraints tc = TREE_CONSTRAINT(cnew); - TreeWidget tw = (TreeWidget) cnew->core.parent; + TreeWidget tw = (TreeWidget) XtParent(cnew); /* * Initialize the widget to have no sub-nodes. @@ -424,10 +438,17 @@ * widget' sub-nodes list. Otherwise make it a sub-node of * the tree_root widget. */ - if (tc->tree.parent) - insert_node (tc->tree.parent, cnew); - else if (tw->tree.tree_root) - insert_node (tw->tree.tree_root, cnew); + if (tc->tree.parent) { + insert_node (tc->tree.parent, cnew); +#ifndef OLDXAW + tw->tree.needs_relayout = TRUE; +#endif + } else if (tw->tree.tree_root) { + insert_node (tw->tree.tree_root, cnew); +#ifndef OLDXAW + tw->tree.needs_relayout = TRUE; +#endif + } } @@ -470,8 +491,11 @@ if (cnew->tree.vpad != current->tree.vpad || cnew->tree.hpad != current->tree.hpad || +#ifndef OLDXAW + cnew->tree.connection_type != current->tree.connection_type || +#endif cnew->tree.gravity != current->tree.gravity) { - layout_tree (cnew, TRUE); + (TREE_CLASS_EXTENSION(cnew)->do_layout) (gnew, TRUE); redraw = FALSE; } return redraw; @@ -485,7 +509,7 @@ { TreeConstraints newc = TREE_CONSTRAINT(cnew); TreeConstraints curc = TREE_CONSTRAINT(current); - TreeWidget tw = (TreeWidget) cnew->core.parent; + TreeWidget tw = (TreeWidget) XtParent(cnew); /* * If the parent field has changed, remove the widget @@ -503,7 +527,7 @@ * compute new layout. */ if (XtIsRealized((Widget)tw)) - layout_tree (tw, FALSE); + (TREE_CLASS_EXTENSION(tw)->do_layout) ((Widget)tw, FALSE); } return False; } @@ -528,11 +552,11 @@ tw->tree.tree_root = NULL; } - delete_node (tc->tree.parent, (Widget) w); + delete_node (tc->tree.parent, w); for (i = 0; i< tc->tree.n_children; i++) insert_node (tc->tree.parent, tc->tree.children[i]); - layout_tree ((TreeWidget) (w->core.parent), FALSE); + (TREE_CLASS_EXTENSION(tw)->do_layout) ((Widget)tw, FALSE); } /* ARGSUSED */ @@ -540,8 +564,7 @@ XawTreeGeometryManager(Widget w, XtWidgetGeometry *request, XtWidgetGeometry *reply) { - - TreeWidget tw = (TreeWidget) w->core.parent; + TreeWidget tw = (TreeWidget) XtParent(w); /* * No position changes allowed!. @@ -561,24 +584,30 @@ if (request->request_mode & CWBorderWidth) w->core.border_width = request->border_width; - if (tw->tree.auto_reconfigure) layout_tree (tw, FALSE); + if (tw->tree.auto_reconfigure) + (TREE_CLASS_EXTENSION(tw)->do_layout) ((Widget)tw, FALSE); + return (XtGeometryYes); } static void XawTreeChangeManaged(Widget gw) { - layout_tree ((TreeWidget) gw, FALSE); + TreeWidget tw = (TreeWidget) gw; +#ifndef OLDXAW + if (tw->tree.needs_relayout == TRUE) +#endif + (TREE_CLASS_EXTENSION(tw)->do_layout) (gw, FALSE); } static void XawTreeDestroy(Widget gw) { - TreeWidget w = (TreeWidget) gw; + TreeWidget tw = (TreeWidget) gw; - XtReleaseGC (gw, w->tree.gc); - if (w->tree.largest) XtFree ((char *) w->tree.largest); + XtReleaseGC (gw, tw->tree.gc); + if (tw->tree.largest) XtFree ((char *) tw->tree.largest); } @@ -615,9 +644,13 @@ switch (tw->tree.gravity) { case WestGravity: + case NorthWestGravity: + case SouthWestGravity: srcx += child->core.width + child->core.border_width; /* fall through */ case EastGravity: + case NorthEastGravity: + case SouthEastGravity: srcy += child->core.height / 2; break; @@ -632,52 +665,86 @@ for (j = 0; j < tc->tree.n_children; j++) { Widget k = tc->tree.children[j]; GC gc = (tc->tree.gc ? tc->tree.gc : tw->tree.gc); + int dstx = 0, dsty = 0; +#ifndef OLDXAW + int msx = 0, mdx = 0, msy = 0, mdy = 0; +#endif switch (tw->tree.gravity) { case WestGravity: + case NorthWestGravity: + case SouthWestGravity: /* * right center to left center */ - XDrawLine (dpy, w, gc, srcx, srcy, - (int) k->core.x, - (k->core.y + ((int) k->core.border_width) + - ((int) k->core.height) / 2)); + dstx = (int) k->core.x; + dsty = (k->core.y + ((int) k->core.border_width) + + ((int) k->core.height) / 2); +#ifndef OLDXAW + mdx = msx = srcx + (dstx - srcx) / 2; + msy = srcy; + mdy = dsty; +#endif break; case NorthGravity: /* * bottom center to top center */ - XDrawLine (dpy, w, gc, srcx, srcy, - (k->core.x + ((int) k->core.border_width) + - ((int) k->core.width) / 2), - (int) k->core.y); + dstx = (k->core.x + ((int) k->core.border_width) + + ((int) k->core.width) / 2); + dsty = (int) k->core.y; +#ifndef OLDXAW + msx = srcx; + mdy = msy = srcy + (dsty - srcy) / 2; + mdx = dstx; +#endif break; case EastGravity: + case NorthEastGravity: + case SouthEastGravity: /* * left center to right center */ - XDrawLine (dpy, w, gc, srcx, srcy, - (k->core.x + - (((int) k->core.border_width) << 1) + - (int) k->core.width), - (k->core.y + ((int) k->core.border_width) + - ((int) k->core.height) / 2)); + dstx = (k->core.x + + (((int) k->core.border_width) << 1) + + (int) k->core.width); + dsty = (k->core.y + ((int) k->core.border_width) + + ((int) k->core.height) / 2); +#ifndef OLDXAW + mdx = msx = srcx + (dstx - srcx) / 2; + msy = srcy; + mdy = dsty; +#endif break; case SouthGravity: /* * top center to bottom center */ - XDrawLine (dpy, w, gc, srcx, srcy, - (k->core.x + ((int) k->core.border_width) + - ((int) k->core.width) / 2), - (k->core.y + - (((int) k->core.border_width) << 1) + - (int) k->core.height)); + dstx = (k->core.x + ((int) k->core.border_width) + + ((int) k->core.width) / 2); + dsty = (k->core.y + + (((int) k->core.border_width) << 1) + + (int) k->core.height); +#ifndef OLDXAW + msx = srcx; + mdy = msy = srcy + (dsty - srcy) / 2; + mdx = dstx; +#endif break; } + +#ifndef OLDXAW + if (tw->tree.connection_type == XawTreeE) { + XDrawLine (dpy, w, gc, srcx, srcy, msx, msy); + XDrawLine (dpy, w, gc, msx, msy, mdx, mdy); + XDrawLine (dpy, w, gc, mdx, mdy, dstx, dsty); + } + else +#endif + XDrawLine (dpy, w, gc, srcx, srcy, dstx, dsty); } } } @@ -803,6 +870,8 @@ */ switch (tw->tree.gravity) { case EastGravity: + case NorthEastGravity: + case SouthEastGravity: tc->tree.x = (((Position) tw->tree.maxwidth) - ((Position) w->core.width) - tc->tree.x); break; @@ -908,6 +977,20 @@ firstcc = TREE_CONSTRAINT (tc->tree.children[0]); lastcc = TREE_CONSTRAINT (child); + if (tree->tree.gravity == NorthWestGravity || + tree->tree.gravity == NorthEastGravity) { + tc->tree.x = x; + tc->tree.y = firstcc->tree.y; + return; + } + + if (tree->tree.gravity == SouthWestGravity || + tree->tree.gravity == SouthEastGravity) { + tc->tree.x = x; + tc->tree.y = lastcc->tree.y; + return; + } + /* Adjustments are disallowed if they result in a position above * or to the left of the originally requested position, because * this could collide with the position of the previous sibling. @@ -956,10 +1039,11 @@ } static void -layout_tree(TreeWidget tw, Bool insetvalues) +layout_tree(Widget w, Bool insetvalues) { int i; Dimension *dp; + TreeWidget tw = (TreeWidget) w; /* * Do a depth-first search computing the width and height of the bounding @@ -996,6 +1080,10 @@ if (XtIsRealized ((Widget) tw)) { XClearArea (XtDisplay(tw), XtWindow((Widget)tw), 0, 0, 0, 0, True); } + +#ifndef OLDXAW + tw->tree.needs_relayout = FALSE; +#endif } @@ -1009,6 +1097,6 @@ void XawTreeForceLayout(Widget tree) { - layout_tree ((TreeWidget) tree, FALSE); + (TREE_CLASS_EXTENSION(tree)->do_layout) (tree, FALSE); } Index: xc/lib/Xaw/Tree.h diff -u xc/lib/Xaw/Tree.h:1.7 xc/lib/Xaw/Tree.h:1.11 --- xc/lib/Xaw/Tree.h:1.7 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/Tree.h Sun Feb 19 20:01:37 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Tree.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ - * Copyright 1990, 1994, 1998 The Open Group @@ -48,7 +46,7 @@ * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/Tree.h,v 1.7 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Tree.h,v 1.11 2006/02/20 01:01:37 tsi Exp $ */ #ifndef _XawTree_h @@ -74,6 +72,7 @@ * hSpace HSpace Dimension 20 * lineWidth LineWidth Dimension 0 * vSpace VSpace Dimension 6 + * connectionType ConnectionType XawTreeConnType XawTreeK * * * Constraint Resources attached to children: @@ -119,7 +118,37 @@ #ifndef XawRDisplayList #define XawRDisplayList "XawDisplayList" #endif -#endif + +#define XawNtreeConnType "connectionType" +#define XawCTreeConnType "ConnectionType" + +#endif /* OLDXAW */ + + +typedef enum { + /* + * K-type: + * + * -[node]---[node] + * / + * [node]<--[node] + * \ + * -[node] + */ + XawTreeK, + + /* + * E-type: + * + * +-[node]---[node] + * | + * [node]-+-[node] + * | + * +-[node] + */ + XawTreeE +} XawTreeConnType; + /* external declarations */ extern WidgetClass treeWidgetClass; Index: xc/lib/Xaw/TreeP.h diff -u xc/lib/Xaw/TreeP.h:1.7 xc/lib/Xaw/TreeP.h:1.11 --- xc/lib/Xaw/TreeP.h:1.7 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/TreeP.h Tue Jan 24 23:32:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: TreeP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ - * Copyright 1990, 1998 The Open Group @@ -48,7 +46,7 @@ * additional blank space to make the structure of the graph easier to see * as well as to support vertical trees. */ -/* $XFree86: xc/lib/Xaw/TreeP.h,v 1.7 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/TreeP.h,v 1.11 2006/01/25 04:32:09 dawes Exp $ */ #ifndef _XawTreeP_h @@ -56,6 +54,15 @@ #include +typedef void (*TreeLayoutProc)(Widget, Bool); + +/* this structure is used to keep binary compatability */ +typedef struct { + TreeLayoutProc do_layout; + XtPointer pad[4]; + XtPointer extension; +} TreeExtensionClassPart; + typedef struct _TreeClassPart { XtPointer extension; } TreeClassPart; @@ -69,6 +76,7 @@ extern TreeClassRec treeClassRec; + typedef struct { /* fields available through resources */ Dimension hpad; /* hSpace/HSpace */ @@ -85,11 +93,14 @@ Dimension maxwidth, maxheight; /* for shrink wrapping */ #ifndef OLDXAW XawDisplayList *display_list; - XtPointer pad[4]; /* for future use and keep binary compatability */ + XawTreeConnType connection_type; /* connection type */ + Boolean needs_relayout; /* flag to save the performance */ + char pad[4 * sizeof(XtPointer) - + sizeof(XawTreeConnType) - + sizeof(Boolean)]; /* for future use and keep binary compatability */ #endif } TreePart; - typedef struct _TreeRec { CorePart core; CompositePart composite; @@ -131,11 +142,17 @@ #define TREE_CONSTRAINT(w) \ ((TreeConstraints)((w)->core.constraints)) +#define TREE_CLASS_PART(w) \ + (((TreeWidgetClass) XtClass(w))->tree_class) + +#define TREE_CLASS_EXTENSION(w) \ + ((TreeExtensionClassPart*) (TREE_CLASS_PART(w).extension)) + +#define XawInheritTreeLayout ((TreeLayoutProc) _XtInherit) + #define TREE_INITIAL_DEPTH 10 /* for allocating largest array */ #define TREE_HORIZONTAL_DEFAULT_SPACING 20 #define TREE_VERTICAL_DEFAULT_SPACING 6 #endif /* _XawTreeP_h */ - - Index: xc/lib/Xaw/Vendor.c diff -u xc/lib/Xaw/Vendor.c:1.9 xc/lib/Xaw/Vendor.c:1.10 --- xc/lib/Xaw/Vendor.c:1.9 Fri May 31 14:45:44 2002 +++ xc/lib/Xaw/Vendor.c Mon Jan 9 09:59:04 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Vendor.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.9 2002/05/31 18:45:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Vendor.c,v 1.10 2006/01/09 14:59:04 dawes Exp $ */ /* * This is a copy of Xt/Vendor.c with an additional ClassInitialize Index: xc/lib/Xaw/VendorEP.h diff -u xc/lib/Xaw/VendorEP.h:1.6 xc/lib/Xaw/VendorEP.h:1.7 --- xc/lib/Xaw/VendorEP.h:1.6 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/VendorEP.h Mon Jan 9 09:59:05 2006 @@ -1,5 +1,3 @@ -/* $Xorg: VendorEP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ - /* * Copyright 1991 by OMRON Corporation * @@ -51,7 +49,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/VendorEP.h,v 1.6 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/VendorEP.h,v 1.7 2006/01/09 14:59:05 dawes Exp $ */ #ifndef _VendorEP_h #define _VendorEP_h Index: xc/lib/Xaw/Viewport.c diff -u xc/lib/Xaw/Viewport.c:1.11 xc/lib/Xaw/Viewport.c:1.15 --- xc/lib/Xaw/Viewport.c:1.11 Fri Dec 14 14:54:45 2001 +++ xc/lib/Xaw/Viewport.c Thu Mar 16 16:51:18 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Viewport.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.11 2001/12/14 19:54:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Viewport.c,v 1.15 2006/03/16 21:51:18 dawes Exp $ */ #include #include @@ -330,7 +328,7 @@ clip_width = XtWidth(w); clip_height = XtHeight(w); - if (h_bar != NULL && XtWidth(w) > XtWidth(h_bar) + XtBorderWidth(h_bar)) + if (h_bar != NULL && XtWidth(w) > XtWidth(h_bar) + XtBorderWidth(h_bar)) clip_width -= XtWidth(h_bar) + XtBorderWidth(h_bar); if (v_bar != NULL && XtHeight(w) > XtHeight(v_bar) + XtBorderWidth(v_bar)) @@ -573,6 +571,7 @@ preferred.width = XtWidth(child); preferred.height = XtHeight(child); } + do { /* while intended != prev */ if (query) { (void)XtQueryGeometry(child, &intended, &preferred); @@ -594,13 +593,13 @@ preferred.width > clip_width) { \ if (!needshoriz) { \ Widget bar; \ - \ needshoriz = True; \ if ((bar = w->viewport.horiz_bar) == NULL) \ bar = CreateScrollbar(w, True); \ clip_height -= XtHeight(bar) + XtBorderWidth(bar); \ if (clip_height < 1) \ clip_height = 1; \ + intended.height = clip_height; \ } \ intended.width = preferred.width; \ } @@ -615,10 +614,12 @@ clip_width -= XtWidth(bar) + XtBorderWidth(bar); if (clip_width < 1) clip_width = 1; + intended.width = clip_width; CheckHoriz(); } intended.height = preferred.height; } + if (!w->viewport.allowhoriz || preferred.width < clip_width) { intended.width = clip_width; intended.request_mode |= CWWidth; @@ -680,21 +681,22 @@ } } else { - int bw = bar->core.border_width; + int bw = XtBorderWidth(bar); XtResizeWidget(bar, XtWidth(bar), clip_height, bw); XtMoveWidget(bar, - w->viewport.useright - ? XtWidth(w) - XtWidth(bar) - bw : -bw, - needshoriz && !w->viewport.usebottom - ? XtHeight(w->viewport.horiz_bar) : -bw); - XtSetMappedWhenManaged(bar, True); + w->viewport.useright + ? XtWidth(w) - XtWidth(bar) - bw : -bw, + needshoriz && !w->viewport.usebottom + ? XtHeight(w->viewport.horiz_bar) : -bw); + XtSetMappedWhenManaged(bar, True); } } if (child != NULL) { XtResizeWidget(child, intended.width, intended.height, 0); - MoveChild(w, needshoriz ? XtX(child) : 0, needsvert ? XtY(child) : 0); + MoveChild(w, needshoriz ? XtX(child) : 0, + needsvert ? XtY(child) : 0); } SendReport (w, XawPRAll); @@ -964,7 +966,7 @@ allowed.width = XtWidth(w); allowed.request_mode |= CWWidth; } - if (allowed.width > XtWidth(bar) + XtBorderWidth(bar)) + if (allowed.width > XtWidth(bar) + XtBorderWidth(bar)) allowed.width -= XtWidth(bar) + XtBorderWidth(bar); else allowed.width = 1; @@ -1097,3 +1099,27 @@ MoveChild (w, -x, -y); } + +void +XawViewportScrollHoriz(Widget gw, float percent) +{ + ViewportWidget w = (ViewportWidget) gw; + Widget child = w->viewport.child; + + if (child == NULL) + return; + + MoveChild(w, XtX(child) + percent * XtWidth(child), XtY(child)); +} + +void +XawViewportScrollVert(Widget gw, float percent) +{ + ViewportWidget w = (ViewportWidget) gw; + Widget child = w->viewport.child; + + if (child == NULL) + return; + + MoveChild(w, XtX(child), XtY(child) + percent * XtHeight(child)); +} Index: xc/lib/Xaw/Viewport.h diff -u xc/lib/Xaw/Viewport.h:1.7 xc/lib/Xaw/Viewport.h:1.9 --- xc/lib/Xaw/Viewport.h:1.7 Fri Dec 14 14:54:46 2001 +++ xc/lib/Xaw/Viewport.h Tue Jan 24 23:32:09 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Viewport.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ - /************************************************************ Copyright 1987, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.7 2001/12/14 19:54:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Viewport.h,v 1.9 2006/01/25 04:32:09 dawes Exp $ */ #ifndef _XawViewport_h #define _XawViewport_h @@ -116,6 +114,18 @@ #endif ); +void XawViewportScrollHoriz +( + Widget gw, + float percent + ); + +void XawViewportScrollVert +( + Widget gw, + float percent + ); + _XFUNCPROTOEND #endif /* _XawViewport_h */ Index: xc/lib/Xaw/ViewportP.h diff -u xc/lib/Xaw/ViewportP.h:1.8 xc/lib/Xaw/ViewportP.h:1.9 --- xc/lib/Xaw/ViewportP.h:1.8 Fri Dec 14 14:54:46 2001 +++ xc/lib/Xaw/ViewportP.h Mon Jan 9 09:59:05 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: ViewportP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ * Private declarations for ViewportWidgetClass */ @@ -49,7 +48,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.8 2001/12/14 19:54:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/ViewportP.h,v 1.9 2006/01/09 14:59:05 dawes Exp $ */ #ifndef _ViewportP_h #define _ViewportP_h Index: xc/lib/Xaw/Xaw-def.cpp diff -u xc/lib/Xaw/Xaw-def.cpp:1.4 xc/lib/Xaw/Xaw-def.cpp:1.5 --- xc/lib/Xaw/Xaw-def.cpp:1.4 Wed May 5 21:17:29 2004 +++ xc/lib/Xaw/Xaw-def.cpp Mon Jan 9 09:59:05 2006 @@ -152,5 +152,4 @@ XawTextSinkAddProperty XawTextLastPosition -/* $Xorg: Xaw-def.cpp,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ -/* $XFree86: xc/lib/Xaw/Xaw-def.cpp,v 1.4 2004/05/06 01:17:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/Xaw-def.cpp,v 1.5 2006/01/09 14:59:05 dawes Exp $ */ Index: xc/lib/Xaw/XawI18n.c diff -u xc/lib/Xaw/XawI18n.c:1.8 xc/lib/Xaw/XawI18n.c:1.9 --- xc/lib/Xaw/XawI18n.c:1.8 Fri Dec 14 14:54:46 2001 +++ xc/lib/Xaw/XawI18n.c Mon Jan 9 09:59:05 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XawI18n.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ - /* Copyright 1991 NCR Corporation - Dayton, Ohio, USA */ /* @@ -53,7 +51,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/XawI18n.c,v 1.8 2001/12/14 19:54:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.c,v 1.9 2006/01/09 14:59:05 dawes Exp $ */ #include #include "XawI18n.h" Index: xc/lib/Xaw/XawI18n.h diff -u xc/lib/Xaw/XawI18n.h:3.15 xc/lib/Xaw/XawI18n.h:3.16 --- xc/lib/Xaw/XawI18n.h:3.15 Thu Dec 18 21:05:38 2003 +++ xc/lib/Xaw/XawI18n.h Sun Mar 27 21:50:59 2005 @@ -1,5 +1,3 @@ -/* $Xorg: XawI18n.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ - /************************************************************ Copyright 1993, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.15 2003/12/19 02:05:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawI18n.h,v 3.16 2005/03/28 02:50:59 dawes Exp $ */ #ifdef HAS_WCTYPE_H #include @@ -114,8 +112,9 @@ #ifndef iswalnum #define iswalnum(c) _Xaw_iswalnum(c) +#endif + int _Xaw_iswalnum ( wchar_t c ); -#endif Index: xc/lib/Xaw/XawIm.c diff -u xc/lib/Xaw/XawIm.c:1.15 xc/lib/Xaw/XawIm.c:1.16 --- xc/lib/Xaw/XawIm.c:1.15 Tue May 27 18:26:38 2003 +++ xc/lib/Xaw/XawIm.c Mon Jan 9 09:59:05 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XawIm.c,v 1.6 2001/02/09 02:03:47 xorgcvs Exp $ */ - /* * Copyright 1991 by OMRON Corporation * @@ -52,7 +50,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/XawIm.c,v 1.15 2003/05/27 22:26:38 tsi Exp $ */ +/* $XFree86: xc/lib/Xaw/XawIm.c,v 1.16 2006/01/09 14:59:05 dawes Exp $ */ #include #include Index: xc/lib/Xaw/XawImP.h diff -u xc/lib/Xaw/XawImP.h:3.9 xc/lib/Xaw/XawImP.h:3.10 --- xc/lib/Xaw/XawImP.h:3.9 Fri Dec 14 14:54:46 2001 +++ xc/lib/Xaw/XawImP.h Mon Jan 9 09:59:05 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XawImP.h,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ - /* * Copyright 1991 by OMRON Corporation * @@ -51,7 +49,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xaw/XawImP.h,v 3.9 2001/12/14 19:54:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawImP.h,v 3.10 2006/01/09 14:59:05 dawes Exp $ */ #ifndef _XawImP_h #define _XawImP_h Index: xc/lib/Xaw/XawInit.c diff -u xc/lib/Xaw/XawInit.c:1.10 xc/lib/Xaw/XawInit.c:1.11 --- xc/lib/Xaw/XawInit.c:1.10 Fri Dec 14 14:54:46 2001 +++ xc/lib/Xaw/XawInit.c Mon Jan 9 09:59:05 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: XawInit.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ * Copyright 1989, 1998 The Open Group @@ -32,7 +31,7 @@ * call this routine from their ClassInitialize procs (this routine may be * used as the class init proc). */ -/* $XFree86: xc/lib/Xaw/XawInit.c,v 1.10 2001/12/14 19:54:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawInit.c,v 1.11 2006/01/09 14:59:05 dawes Exp $ */ #include #include Index: xc/lib/Xaw/XawInit.h diff -u xc/lib/Xaw/XawInit.h:1.13 xc/lib/Xaw/XawInit.h:1.14 --- xc/lib/Xaw/XawInit.h:1.13 Fri Dec 14 14:54:46 2001 +++ xc/lib/Xaw/XawInit.h Mon Jan 9 09:59:05 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XawInit.h,v 1.5 2001/02/09 02:03:47 xorgcvs Exp $ +/* * Copyright 1989, 1994, 1998 The Open Group @@ -22,7 +22,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/lib/Xaw/XawInit.h,v 1.13 2001/12/14 19:54:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw/XawInit.h,v 1.14 2006/01/09 14:59:05 dawes Exp $ */ #ifndef _XawInit_h #define _XawInit_h Index: xc/lib/Xaw/genlist.sh diff -u xc/lib/Xaw/genlist.sh:1.1.1.1 xc/lib/Xaw/genlist.sh:1.2 --- xc/lib/Xaw/genlist.sh:1.1.1.1 Wed Apr 27 03:08:31 1994 +++ xc/lib/Xaw/genlist.sh Mon Jan 9 09:59:05 2006 @@ -19,7 +19,7 @@ * This file is generated by the genlist.sh script and contains an array of * all the widgets in Athena widget set. * - * \$XConsortium\$ + * \$XFree86\$ */ #include #include Index: xc/lib/Xaw/jump_funcs diff -u xc/lib/Xaw/jump_funcs:3.3 xc/lib/Xaw/jump_funcs:3.4 --- xc/lib/Xaw/jump_funcs:3.3 Wed Jan 17 14:42:36 2001 +++ xc/lib/Xaw/jump_funcs Mon Jan 9 09:59:05 2006 @@ -1,9 +1,4 @@ -# $Xorg: jump_funcs,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/lib/Xaw/jump_funcs,v 3.3 2001/01/17 19:42:36 dawes Exp $ +# $XFree86: xc/lib/Xaw/jump_funcs,v 3.4 2006/01/09 14:59:05 dawes Exp $ # 00000000 T _XawAsciiSourceFreeString libXaw AsciiSrc 00000000 T _XawAsciiSave libXaw AsciiSrc Index: xc/lib/Xaw/jump_ignore diff -u xc/lib/Xaw/jump_ignore:3.2 xc/lib/Xaw/jump_ignore:3.3 --- xc/lib/Xaw/jump_ignore:3.2 Wed Jan 17 14:42:36 2001 +++ xc/lib/Xaw/jump_ignore Mon Jan 9 09:59:05 2006 @@ -1,7 +1,2 @@ -# $Xorg: jump_ignore,v 1.3 2000/08/17 19:45:45 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/lib/Xaw/jump_ignore,v 3.2 2001/01/17 19:42:36 dawes Exp $ +# $XFree86: xc/lib/Xaw/jump_ignore,v 3.3 2006/01/09 14:59:05 dawes Exp $ # jump_ignore Index: xc/lib/Xaw/jump_vars diff -u xc/lib/Xaw/jump_vars:3.2 xc/lib/Xaw/jump_vars:3.3 --- xc/lib/Xaw/jump_vars:3.2 Wed Jan 17 14:42:36 2001 +++ xc/lib/Xaw/jump_vars Mon Jan 9 09:59:05 2006 @@ -1,9 +1,4 @@ -# $Xorg: jump_vars,v 1.3 2000/08/17 19:45:45 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/lib/Xaw/jump_vars,v 3.2 2001/01/17 19:42:36 dawes Exp $ +# $XFree86: xc/lib/Xaw/jump_vars,v 3.3 2006/01/09 14:59:05 dawes Exp $ # 00001400 D _XawWidgetArray libXaw AllWidgets 00000004 D _XawWidgetCount libXaw AllWidgets Index: xc/lib/Xaw/sharedlib.c diff -u xc/lib/Xaw/sharedlib.c:1.2 xc/lib/Xaw/sharedlib.c:1.3 --- xc/lib/Xaw/sharedlib.c:1.2 Fri Dec 14 14:54:46 2001 +++ xc/lib/Xaw/sharedlib.c Mon Jan 9 09:59:05 2006 @@ -1,4 +1,4 @@ -/* $Xorg: sharedlib.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xaw/sharedlib.c,v 1.3 2006/01/09 14:59:05 dawes Exp $ */ /* Copyright 1991, 1994, 1998 The Open Group Index: xc/lib/Xaw6/Xaw-def.cpp diff -u xc/lib/Xaw6/Xaw-def.cpp:1.2 xc/lib/Xaw6/Xaw-def.cpp:1.3 --- xc/lib/Xaw6/Xaw-def.cpp:1.2 Wed May 5 21:17:29 2004 +++ xc/lib/Xaw6/Xaw-def.cpp Mon Jan 9 09:59:07 2006 @@ -134,5 +134,4 @@ XawViewportSetLocation XawWidgetArray XawWidgetCount -/* $Xorg: Xaw-def.cpp,v 1.3 2000/08/17 19:45:44 cpqbld Exp $ */ -/* $XFree86: xc/lib/Xaw6/Xaw-def.cpp,v 1.2 2004/05/06 01:17:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xaw6/Xaw-def.cpp,v 1.3 2006/01/09 14:59:07 dawes Exp $ */ Index: xc/lib/Xbsd/Berklib.c diff -u xc/lib/Xbsd/Berklib.c:3.10 xc/lib/Xbsd/Berklib.c:3.13 --- xc/lib/Xbsd/Berklib.c:3.10 Sat Apr 3 17:26:21 2004 +++ xc/lib/Xbsd/Berklib.c Mon Jan 9 09:59:08 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Berklib.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/Xbsd/Berklib.c,v 3.10 2004/04/03 22:26:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xbsd/Berklib.c,v 3.13 2006/01/09 14:59:08 dawes Exp $ */ /* @@ -52,7 +51,7 @@ #define WANT_RANDOM #endif -#if defined(SVR4) && !defined(__SCO__) +#if defined(SVR4) && !defined(__SCO__) && !defined(sgi) && !defined(sun) #define WANT_BFUNCS #define WANT_FFS #define WANT_RANDOM @@ -194,7 +193,7 @@ ffs(mask) unsigned int mask; { - register i; + register int i; if ( ! mask ) return 0; i = 1; Index: xc/lib/Xbsd/Imakefile diff -u xc/lib/Xbsd/Imakefile:3.3 xc/lib/Xbsd/Imakefile:3.4 --- xc/lib/Xbsd/Imakefile:3.3 Wed Jan 17 14:42:42 2001 +++ xc/lib/Xbsd/Imakefile Mon Jan 9 09:59:08 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:46 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/Xbsd/Imakefile,v 3.3 2001/01/17 19:42:42 dawes Exp $ +XCOMM $XFree86: xc/lib/Xbsd/Imakefile,v 3.4 2006/01/09 14:59:08 dawes Exp $ SRCS = Berklib.c OBJS = Berklib.o Index: xc/lib/Xcursor/Imakefile diff -u xc/lib/Xcursor/Imakefile:1.4 xc/lib/Xcursor/Imakefile:1.5 --- xc/lib/Xcursor/Imakefile:1.4 Fri Oct 31 15:49:04 2003 +++ xc/lib/Xcursor/Imakefile Tue Oct 25 12:58:48 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xcursor/Imakefile,v 1.4 2003/10/31 20:49:04 herrb Exp $ +XCOMM $XFree86: xc/lib/Xcursor/Imakefile,v 1.5 2005/10/25 16:58:48 dawes Exp $ #ifndef NormalLibXcursor #define NormalLibXcursor YES @@ -72,7 +72,7 @@ RemoveFile($@) sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@ -InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig) +InstallNonExecFile(xcursor.pc,$(PKGCONFIGDIR)) clean:: RemoveFile(xcursor.pc) Index: xc/lib/Xdmcp/A8Eq.c diff -u xc/lib/Xdmcp/A8Eq.c:1.2 xc/lib/Xdmcp/A8Eq.c:1.3 --- xc/lib/Xdmcp/A8Eq.c:1.2 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/A8Eq.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/A8Eq.c,v 1.3 2006/01/09 14:59:08 dawes Exp $ */ /* - * $Xorg: A8Eq.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/AA16.c diff -u xc/lib/Xdmcp/AA16.c:1.4 xc/lib/Xdmcp/AA16.c:1.5 --- xc/lib/Xdmcp/AA16.c:1.4 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/AA16.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: AA16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AA16.c,v 1.5 2006/01/09 14:59:08 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/AA32.c diff -u xc/lib/Xdmcp/AA32.c:1.4 xc/lib/Xdmcp/AA32.c:1.5 --- xc/lib/Xdmcp/AA32.c:1.4 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/AA32.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: AA32.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AA32.c,v 1.5 2006/01/09 14:59:08 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/AA8.c diff -u xc/lib/Xdmcp/AA8.c:1.4 xc/lib/Xdmcp/AA8.c:1.5 --- xc/lib/Xdmcp/AA8.c:1.4 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/AA8.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: AA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AA8.c,v 1.5 2006/01/09 14:59:08 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/Alloc.c diff -u xc/lib/Xdmcp/Alloc.c:3.5 xc/lib/Xdmcp/Alloc.c:3.6 --- xc/lib/Xdmcp/Alloc.c:3.5 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/Alloc.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Alloc.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.5 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Alloc.c,v 3.6 2006/01/09 14:59:08 dawes Exp $ */ /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */ Index: xc/lib/Xdmcp/AofA8.c diff -u xc/lib/Xdmcp/AofA8.c:1.4 xc/lib/Xdmcp/AofA8.c:1.5 --- xc/lib/Xdmcp/AofA8.c:1.4 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/AofA8.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: AofA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/AofA8.c,v 1.5 2006/01/09 14:59:08 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/CA8.c diff -u xc/lib/Xdmcp/CA8.c:1.2 xc/lib/Xdmcp/CA8.c:1.3 --- xc/lib/Xdmcp/CA8.c:1.2 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/CA8.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/CA8.c,v 1.3 2006/01/09 14:59:08 dawes Exp $ */ /* - * $Xorg: CA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/CmpKey.c diff -u xc/lib/Xdmcp/CmpKey.c:1.4 xc/lib/Xdmcp/CmpKey.c:1.5 --- xc/lib/Xdmcp/CmpKey.c:1.4 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/CmpKey.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: CmpKey.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/CmpKey.c,v 1.5 2006/01/09 14:59:08 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/DA16.c diff -u xc/lib/Xdmcp/DA16.c:1.6 xc/lib/Xdmcp/DA16.c:1.7 --- xc/lib/Xdmcp/DA16.c:1.6 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/DA16.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: DA16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.6 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/DA16.c,v 1.7 2006/01/09 14:59:08 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/DA32.c diff -u xc/lib/Xdmcp/DA32.c:1.5 xc/lib/Xdmcp/DA32.c:1.6 --- xc/lib/Xdmcp/DA32.c:1.5 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/DA32.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/DA32.c,v 1.6 2006/01/09 14:59:08 dawes Exp $ */ /* - * $Xorg: DA32.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/DA8.c diff -u xc/lib/Xdmcp/DA8.c:1.5 xc/lib/Xdmcp/DA8.c:1.6 --- xc/lib/Xdmcp/DA8.c:1.5 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/DA8.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/DA8.c,v 1.6 2006/01/09 14:59:08 dawes Exp $ */ /* - * $Xorg: DA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/DAofA8.c diff -u xc/lib/Xdmcp/DAofA8.c:1.5 xc/lib/Xdmcp/DAofA8.c:1.6 --- xc/lib/Xdmcp/DAofA8.c:1.5 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/DAofA8.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/DAofA8.c,v 1.6 2006/01/09 14:59:08 dawes Exp $ */ /* - * $Xorg: DAofA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/DecKey.c diff -u xc/lib/Xdmcp/DecKey.c:1.4 xc/lib/Xdmcp/DecKey.c:1.5 --- xc/lib/Xdmcp/DecKey.c:1.4 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/DecKey.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: DecKey.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/DecKey.c,v 1.5 2006/01/09 14:59:08 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/Fill.c diff -u xc/lib/Xdmcp/Fill.c:3.9 xc/lib/Xdmcp/Fill.c:3.10 --- xc/lib/Xdmcp/Fill.c:3.9 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/Fill.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Fill.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.9 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Fill.c,v 3.10 2006/01/09 14:59:08 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ Index: xc/lib/Xdmcp/Flush.c diff -u xc/lib/Xdmcp/Flush.c:3.8 xc/lib/Xdmcp/Flush.c:3.9 --- xc/lib/Xdmcp/Flush.c:3.8 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/Flush.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Flush.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.8 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Flush.c,v 3.9 2006/01/09 14:59:08 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ Index: xc/lib/Xdmcp/GenKey.c diff -u xc/lib/Xdmcp/GenKey.c:3.8 xc/lib/Xdmcp/GenKey.c:3.9 --- xc/lib/Xdmcp/GenKey.c:3.8 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/GenKey.c Mon Jan 9 09:59:08 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: GenKey.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.8 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/GenKey.c,v 3.9 2006/01/09 14:59:08 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/Imakefile diff -u xc/lib/Xdmcp/Imakefile:3.6 xc/lib/Xdmcp/Imakefile:3.7 --- xc/lib/Xdmcp/Imakefile:3.6 Sun Apr 4 22:33:12 2004 +++ xc/lib/Xdmcp/Imakefile Mon Jan 9 09:59:08 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:48 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.6 2004/04/05 02:33:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.7 2006/01/09 14:59:08 dawes Exp $ #define DoNormalLib NormalLibXdmcp #define DoSharedLib SharedLibXdmcp Index: xc/lib/Xdmcp/IncKey.c diff -u xc/lib/Xdmcp/IncKey.c:1.4 xc/lib/Xdmcp/IncKey.c:1.5 --- xc/lib/Xdmcp/IncKey.c:1.4 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/IncKey.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: IncKey.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.4 2001/12/14 19:54:54 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/IncKey.c,v 1.5 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/RA16.c diff -u xc/lib/Xdmcp/RA16.c:1.5 xc/lib/Xdmcp/RA16.c:1.6 --- xc/lib/Xdmcp/RA16.c:1.5 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/RA16.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/RA16.c,v 1.6 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: RA16.c,v 1.5 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/RA32.c diff -u xc/lib/Xdmcp/RA32.c:1.5 xc/lib/Xdmcp/RA32.c:1.6 --- xc/lib/Xdmcp/RA32.c:1.5 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/RA32.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/RA32.c,v 1.6 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: RA32.c,v 1.5 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/RA8.c diff -u xc/lib/Xdmcp/RA8.c:1.5 xc/lib/Xdmcp/RA8.c:1.6 --- xc/lib/Xdmcp/RA8.c:1.5 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/RA8.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/RA8.c,v 1.6 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: RA8.c,v 1.5 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/RAofA8.c diff -u xc/lib/Xdmcp/RAofA8.c:1.5 xc/lib/Xdmcp/RAofA8.c:1.6 --- xc/lib/Xdmcp/RAofA8.c:1.5 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/RAofA8.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/RAofA8.c,v 1.6 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: RAofA8.c,v 1.6 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/RC16.c diff -u xc/lib/Xdmcp/RC16.c:1.2 xc/lib/Xdmcp/RC16.c:1.3 --- xc/lib/Xdmcp/RC16.c:1.2 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/RC16.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/RC16.c,v 1.3 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: RC16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/RC32.c diff -u xc/lib/Xdmcp/RC32.c:1.2 xc/lib/Xdmcp/RC32.c:1.3 --- xc/lib/Xdmcp/RC32.c:1.2 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/RC32.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/RC32.c,v 1.3 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: RC32.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/RC8.c diff -u xc/lib/Xdmcp/RC8.c:1.2 xc/lib/Xdmcp/RC8.c:1.3 --- xc/lib/Xdmcp/RC8.c:1.2 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/RC8.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/RC8.c,v 1.3 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: RC8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/RHead.c diff -u xc/lib/Xdmcp/RHead.c:1.2 xc/lib/Xdmcp/RHead.c:1.3 --- xc/lib/Xdmcp/RHead.c:1.2 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/RHead.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/RHead.c,v 1.3 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: RHead.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/RR.c diff -u xc/lib/Xdmcp/RR.c:1.2 xc/lib/Xdmcp/RR.c:1.3 --- xc/lib/Xdmcp/RR.c:1.2 Fri Dec 14 14:54:54 2001 +++ xc/lib/Xdmcp/RR.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/RR.c,v 1.3 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: RR.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/RaA16.c diff -u xc/lib/Xdmcp/RaA16.c:1.4 xc/lib/Xdmcp/RaA16.c:1.5 --- xc/lib/Xdmcp/RaA16.c:1.4 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/RaA16.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: RaA16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaA16.c,v 1.5 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/RaA32.c diff -u xc/lib/Xdmcp/RaA32.c:1.4 xc/lib/Xdmcp/RaA32.c:1.5 --- xc/lib/Xdmcp/RaA32.c:1.4 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/RaA32.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: RaA32.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaA32.c,v 1.5 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/RaA8.c diff -u xc/lib/Xdmcp/RaA8.c:1.4 xc/lib/Xdmcp/RaA8.c:1.5 --- xc/lib/Xdmcp/RaA8.c:1.4 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/RaA8.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: RaA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaA8.c,v 1.5 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/RaAoA8.c diff -u xc/lib/Xdmcp/RaAoA8.c:1.4 xc/lib/Xdmcp/RaAoA8.c:1.5 --- xc/lib/Xdmcp/RaAoA8.c:1.4 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/RaAoA8.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: RaAoA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/RaAoA8.c,v 1.5 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/Unwrap.c diff -u xc/lib/Xdmcp/Unwrap.c:1.4 xc/lib/Xdmcp/Unwrap.c:1.5 --- xc/lib/Xdmcp/Unwrap.c:1.4 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/Unwrap.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Unwrap.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Unwrap.c,v 1.5 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/WA16.c diff -u xc/lib/Xdmcp/WA16.c:1.2 xc/lib/Xdmcp/WA16.c:1.3 --- xc/lib/Xdmcp/WA16.c:1.2 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/WA16.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/WA16.c,v 1.3 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: WA16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/WA32.c diff -u xc/lib/Xdmcp/WA32.c:1.2 xc/lib/Xdmcp/WA32.c:1.3 --- xc/lib/Xdmcp/WA32.c:1.2 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/WA32.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/WA32.c,v 1.3 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: WA32.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/WA8.c diff -u xc/lib/Xdmcp/WA8.c:1.2 xc/lib/Xdmcp/WA8.c:1.3 --- xc/lib/Xdmcp/WA8.c:1.2 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/WA8.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/WA8.c,v 1.3 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: WA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/WAofA8.c diff -u xc/lib/Xdmcp/WAofA8.c:1.2 xc/lib/Xdmcp/WAofA8.c:1.3 --- xc/lib/Xdmcp/WAofA8.c:1.2 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/WAofA8.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,5 @@ +/* $XFree86: xc/lib/Xdmcp/WAofA8.c,v 1.3 2006/01/09 14:59:09 dawes Exp $ */ /* - * $Xorg: WAofA8.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group Index: xc/lib/Xdmcp/WC16.c diff -u xc/lib/Xdmcp/WC16.c:1.5 xc/lib/Xdmcp/WC16.c:1.6 --- xc/lib/Xdmcp/WC16.c:1.5 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/WC16.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: WC16.c,v 1.4 2001/02/09 02:03:48 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.5 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC16.c,v 1.6 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/WC32.c diff -u xc/lib/Xdmcp/WC32.c:1.5 xc/lib/Xdmcp/WC32.c:1.6 --- xc/lib/Xdmcp/WC32.c:1.5 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/WC32.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: WC32.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -26,7 +24,7 @@ * * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.5 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC32.c,v 1.6 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/WC8.c diff -u xc/lib/Xdmcp/WC8.c:1.5 xc/lib/Xdmcp/WC8.c:1.6 --- xc/lib/Xdmcp/WC8.c:1.5 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/WC8.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: WC8.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.5 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/WC8.c,v 1.6 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/Whead.c diff -u xc/lib/Xdmcp/Whead.c:1.4 xc/lib/Xdmcp/Whead.c:1.5 --- xc/lib/Xdmcp/Whead.c:1.4 Fri Dec 14 14:54:55 2001 +++ xc/lib/Xdmcp/Whead.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Whead.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.4 2001/12/14 19:54:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Whead.c,v 1.5 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/Wrap.c diff -u xc/lib/Xdmcp/Wrap.c:1.4 xc/lib/Xdmcp/Wrap.c:1.5 --- xc/lib/Xdmcp/Wrap.c:1.4 Fri Dec 14 14:54:56 2001 +++ xc/lib/Xdmcp/Wrap.c Mon Jan 9 09:59:09 2006 @@ -1,6 +1,4 @@ /* - * $Xorg: Wrap.c,v 1.4 2001/02/09 02:03:49 xorgcvs Exp $ - * * Copyright 1989, 1998 The Open Group @@ -27,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.4 2001/12/14 19:54:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Wrap.c,v 1.5 2006/01/09 14:59:09 dawes Exp $ */ #include #include Index: xc/lib/Xdmcp/Wrap.h diff -u xc/lib/Xdmcp/Wrap.h:1.5 xc/lib/Xdmcp/Wrap.h:1.6 --- xc/lib/Xdmcp/Wrap.h:1.5 Wed Jun 9 14:30:56 2004 +++ xc/lib/Xdmcp/Wrap.h Mon Jan 9 09:59:09 2006 @@ -1,9 +1,8 @@ -/* $Xorg: Wrap.h,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ */ /* * header file for compatibility with something useful */ -/* $XFree86: xc/lib/Xdmcp/Wrap.h,v 1.5 2004/06/09 18:30:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Wrap.h,v 1.6 2006/01/09 14:59:09 dawes Exp $ */ typedef unsigned char auth_cblock[8]; /* block size */ Index: xc/lib/Xdmcp/Xdmcp.h diff -u xc/lib/Xdmcp/Xdmcp.h:3.8 xc/lib/Xdmcp/Xdmcp.h:3.9 --- xc/lib/Xdmcp/Xdmcp.h:3.8 Fri Nov 21 23:50:59 2003 +++ xc/lib/Xdmcp/Xdmcp.h Mon Jan 9 09:59:09 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xdmcp.h,v 1.7 2001/04/13 14:43:00 steve Exp $ */ /* * Copyright 1989 Network Computing Devices, Inc., Mountain View, California. * @@ -13,7 +12,7 @@ * without express or implied warranty. * */ -/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.8 2003/11/22 04:50:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.9 2006/01/09 14:59:09 dawes Exp $ */ #ifndef _XDMCP_H_ #define _XDMCP_H_ Index: xc/lib/Xext/DPMS.c diff -u xc/lib/Xext/DPMS.c:3.6 xc/lib/Xext/DPMS.c:3.7 --- xc/lib/Xext/DPMS.c:3.6 Tue Oct 15 22:19:22 2002 +++ xc/lib/Xext/DPMS.c Mon Jan 9 09:59:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DPMS.c,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. @@ -26,7 +25,7 @@ Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/lib/Xext/DPMS.c,v 3.6 2002/10/16 02:19:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xext/DPMS.c,v 3.7 2006/01/09 14:59:12 dawes Exp $ */ /* * HISTORY Index: xc/lib/Xext/Imakefile diff -u xc/lib/Xext/Imakefile:1.14 xc/lib/Xext/Imakefile:1.15 --- xc/lib/Xext/Imakefile:1.14 Sun Apr 4 22:33:12 2004 +++ xc/lib/Xext/Imakefile Mon Jan 9 09:59:12 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:50 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/Xext/Imakefile,v 1.14 2004/04/05 02:33:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xext/Imakefile,v 1.15 2006/01/09 14:59:12 dawes Exp $ #define DoNormalLib NormalLibXext #define DoSharedLib SharedLibXext Index: xc/lib/Xext/XSecurity.c diff -u xc/lib/Xext/XSecurity.c:1.6 xc/lib/Xext/XSecurity.c:1.7 --- xc/lib/Xext/XSecurity.c:1.6 Tue Oct 15 22:19:22 2002 +++ xc/lib/Xext/XSecurity.c Mon Jan 9 09:59:12 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XSecurity.c,v 1.6 2001/02/09 02:03:49 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -24,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xext/XSecurity.c,v 1.6 2002/10/16 02:19:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xext/XSecurity.c,v 1.7 2006/01/09 14:59:12 dawes Exp $ */ #include #include Index: xc/lib/Xext/Xext-def.cpp diff -u xc/lib/Xext/Xext-def.cpp:1.10 xc/lib/Xext/Xext-def.cpp:1.11 --- xc/lib/Xext/Xext-def.cpp:1.10 Wed May 5 21:17:29 2004 +++ xc/lib/Xext/Xext-def.cpp Mon Jan 9 09:59:12 2006 @@ -128,5 +128,4 @@ XeviQueryExtension XeviQueryVersion XeviGetVisualInfo -/* $Xorg: Xext-def.cpp,v 1.3 2000/08/17 19:45:53 cpqbld Exp $ */ -/* $XFree86: xc/lib/Xext/Xext-def.cpp,v 1.10 2004/05/06 01:17:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xext/Xext-def.cpp,v 1.11 2006/01/09 14:59:12 dawes Exp $ */ Index: xc/lib/Xfontcache/FontCache.c diff -u xc/lib/Xfontcache/FontCache.c:1.4 xc/lib/Xfontcache/FontCache.c:1.5 --- xc/lib/Xfontcache/FontCache.c:1.4 Wed Oct 15 18:05:14 2003 +++ xc/lib/Xfontcache/FontCache.c Mon Jan 9 09:59:12 2006 @@ -25,9 +25,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Id: FontCache.c,v 1.8 1999/01/31 12:52:49 akiyama Exp $ */ -/* $XFree86: xc/lib/Xfontcache/FontCache.c,v 1.4 2003/10/15 22:05:14 herrb Exp $ */ +/* $XFree86: xc/lib/Xfontcache/FontCache.c,v 1.5 2006/01/09 14:59:12 dawes Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ Index: xc/lib/Xfontcache/Imakefile diff -u xc/lib/Xfontcache/Imakefile:1.7 xc/lib/Xfontcache/Imakefile:1.8 --- xc/lib/Xfontcache/Imakefile:1.7 Sun Apr 4 22:33:12 2004 +++ xc/lib/Xfontcache/Imakefile Mon Jan 9 09:59:12 2006 @@ -1,8 +1,4 @@ -XCOMM Id: Imakefile,v 1.3 1999/01/31 12:54:33 akiyama Exp $ - - - -XCOMM $XFree86: xc/lib/Xfontcache/Imakefile,v 1.7 2004/04/05 02:33:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xfontcache/Imakefile,v 1.8 2006/01/09 14:59:12 dawes Exp $ #define DoNormalLib NormalLibXfontcache #define DoSharedLib SharedLibXfontcache Index: xc/lib/Xft/Imakefile diff -u xc/lib/Xft/Imakefile:1.30 xc/lib/Xft/Imakefile:1.32 --- xc/lib/Xft/Imakefile:1.30 Sun Apr 4 22:33:12 2004 +++ xc/lib/Xft/Imakefile Tue Oct 25 12:58:48 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xft/Imakefile,v 1.30 2004/04/05 02:33:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xft/Imakefile,v 1.32 2005/10/25 16:58:48 dawes Exp $ #define DoNormalLib NormalLibXft #define DoSharedLib SharedLibXft @@ -43,7 +43,7 @@ #if HasGcc2 || HasGcc3 WARNINGS=-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs #endif -INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(XBUILDINCDIR) $(WARNINGS) +INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(WARNINGS) DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES) -DXFREE86_FT2 XFT_REVISION=0 @@ -135,7 +135,7 @@ RemoveFile($@) sh config/config-subst $(SUBSTVARS) < xft.pc.in > $@ -InstallNonExecFile(xft.pc,$(USRLIBDIR)/pkgconfig) +InstallNonExecFile(xft.pc,$(PKGCONFIGDIR)) clean:: RemoveFile(xft.pc) Index: xc/lib/Xft/Xft-def.cpp diff -u xc/lib/Xft/Xft-def.cpp:1.8 xc/lib/Xft/Xft-def.cpp:1.9 --- xc/lib/Xft/Xft-def.cpp:1.8 Sun Feb 6 20:38:23 2005 +++ xc/lib/Xft/Xft-def.cpp Sat Apr 8 14:30:24 2006 @@ -45,5 +45,10 @@ XftTextExtents8 XftTextExtentsUtf8 XftXlfdParse +XftGlyphExtents +XftLockFace +XftUnlockFace +XftGlyphSpecRender +XftDrawGlyphSpec -/* $XFree86: xc/lib/Xft/Xft-def.cpp,v 1.8 2005/02/07 01:38:23 tsi Exp $ */ +/* $XFree86: xc/lib/Xft/Xft-def.cpp,v 1.9 2006/04/08 18:30:24 dawes Exp $ */ Index: xc/lib/Xft/xftfreetype.c diff -u xc/lib/Xft/xftfreetype.c:1.30 xc/lib/Xft/xftfreetype.c:1.31 --- xc/lib/Xft/xftfreetype.c:1.30 Wed Mar 26 15:43:51 2003 +++ xc/lib/Xft/xftfreetype.c Mon Mar 6 11:20:17 2006 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.30 2003/03/26 20:43:51 tsi Exp $ + * $XFree86: xc/lib/Xft/xftfreetype.c,v 1.31 2006/03/06 16:20:17 dawes Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -909,6 +909,9 @@ XftFontInfo info; XftFont *font; + if (!pattern) + return 0; + if (!XftFontInfoFill (dpy, pattern, &info)) return 0; Index: xc/lib/Xft1/Imakefile diff -u xc/lib/Xft1/Imakefile:1.15 xc/lib/Xft1/Imakefile:1.17 --- xc/lib/Xft1/Imakefile:1.15 Sun Apr 4 22:33:12 2004 +++ xc/lib/Xft1/Imakefile Tue Feb 7 19:49:12 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xft1/Imakefile,v 1.15 2004/04/05 02:33:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xft1/Imakefile,v 1.17 2006/02/08 00:49:12 dawes Exp $ XCOMM Allow for builds against old installed bits #ifdef UseInstalled @@ -89,7 +89,7 @@ XFTLIBDIR=XftLibDir -INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -I$(XBUILDINCDIR) +INCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) DEFINES=$(FREETYPE2DEFINES) $(RENDERDEFINES) -DXFREE86_FT2 #if UseFreetype2 @@ -99,7 +99,6 @@ REQUIREDLIBS=$(LDPRELIBS) $(XRENDERLIB) $(XLIB) $(FONTCONFIGLIB) $(EXPATLIB) $(FREETYPE2REQLIB) #if UseFreetype2 -FT_OLD = xftcache.c FT_HEADERS = XftFreetype.h FT_SRCS = xftfreetype.c xftglyphs.c xftrender.c xftdir.c FT_OBJS = xftfreetype.o xftglyphs.o xftrender.o xftdir.o @@ -107,8 +106,6 @@ HEADERS = Xft.h $(FT_HEADERS) -OLD = xftgram.c xftlex.c - SRCS = xftcfg.c xftcolor.c xftcore.c xftdbg.c xftdpy.c \ xftdraw.c xftextent.c xftfont.c xftfs.c\ xftinit.c xftlist.c xftmatch.c xftmatrix.c \ Index: xc/lib/Xft1/xftcache.c diff -u xc/lib/Xft1/xftcache.c:1.1.1.1 xc/lib/Xft1/xftcache.c:removed --- xc/lib/Xft1/xftcache.c:1.1.1.1 Thu Feb 14 20:26:15 2002 +++ xc/lib/Xft1/xftcache.c Tue May 9 21:55:17 2006 @@ -1,608 +0,0 @@ -/* - * $XFree86: xc/lib/Xft1/xftcache.c,v 1.1.1.1 2002/02/15 01:26:15 keithp Exp $ - * - * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "xftint.h" - -typedef struct _XftFileCacheEnt { - struct _XftFileCacheEnt *next; - unsigned int hash; - char *file; - int id; - time_t time; - char *name; - Bool referenced; -} XftFileCacheEnt; - -#define HASH_SIZE 509 - -typedef struct _XftFileCache { - XftFileCacheEnt *ents[HASH_SIZE]; - Bool updated; - int entries; - int referenced; -} XftFileCache; - -static XftFileCache _XftFileCache; - -static unsigned int -_XftFileCacheHash (char *string) -{ - unsigned int h = 0; - char c; - - while ((c = *string++)) - h = (h << 1) ^ c; - return h; -} - -char * -XftFileCacheFind (char *file, int id, int *count) -{ - XftFileCache *cache; - unsigned int hash; - char *match; - XftFileCacheEnt *c, *name; - int maxid; - struct stat statb; - - cache = &_XftFileCache; - match = file; - - hash = _XftFileCacheHash (match); - name = 0; - maxid = -1; - for (c = cache->ents[hash % HASH_SIZE]; c; c = c->next) - { - if (c->hash == hash && !strcmp (match, c->file)) - { - if (c->id > maxid) - maxid = c->id; - if (c->id == id) - { - if (stat (file, &statb) < 0) - { - if (_XftFontDebug () & XFT_DBG_CACHE) - printf (" file missing\n"); - return 0; - } - if (statb.st_mtime != c->time) - { - if (_XftFontDebug () & XFT_DBG_CACHE) - printf (" timestamp mismatch (was %d is %d)\n", - (int) c->time, (int) statb.st_mtime); - return 0; - } - if (!c->referenced) - { - cache->referenced++; - c->referenced = True; - } - name = c; - } - } - } - if (!name) - return 0; - *count = maxid + 1; - return name->name; -} - -/* - * Cache file syntax is quite simple: - * - * "file_name" id time "font_name" \n - */ - -static Bool -_XftFileCacheReadString (FILE *f, char *dest, int len) -{ - int c; - Bool escape; - - while ((c = getc (f)) != EOF) - if (c == '"') - break; - if (c == EOF) - return False; - if (len == 0) - return False; - - escape = False; - while ((c = getc (f)) != EOF) - { - if (!escape) - { - switch (c) { - case '"': - *dest++ = '\0'; - return True; - case '\\': - escape = True; - continue; - } - } - if (--len <= 1) - return False; - *dest++ = c; - escape = False; - } - return False; -} - -static Bool -_XftFileCacheReadUlong (FILE *f, unsigned long *dest) -{ - unsigned long t; - int c; - - while ((c = getc (f)) != EOF) - { - if (!isspace (c)) - break; - } - if (c == EOF) - return False; - t = 0; - for (;;) - { - if (c == EOF || isspace (c)) - break; - if (!isdigit (c)) - return False; - t = t * 10 + (c - '0'); - c = getc (f); - } - *dest = t; - return True; -} - -static Bool -_XftFileCacheReadInt (FILE *f, int *dest) -{ - unsigned long t; - Bool ret; - - ret = _XftFileCacheReadUlong (f, &t); - if (ret) - *dest = (int) t; - return ret; -} - -static Bool -_XftFileCacheReadTime (FILE *f, time_t *dest) -{ - unsigned long t; - Bool ret; - - ret = _XftFileCacheReadUlong (f, &t); - if (ret) - *dest = (time_t) t; - return ret; -} - -static Bool -_XftFileCacheAdd (XftFileCache *cache, - char *file, - int id, - time_t time, - char *name, - Bool replace) -{ - XftFileCacheEnt *c; - XftFileCacheEnt **prev, *old; - unsigned int hash; - - if (_XftFontDebug () & XFT_DBG_CACHE) - { - printf ("%s face %s/%d as %s\n", replace ? "Replace" : "Add", - file, id, name); - } - hash = _XftFileCacheHash (file); - for (prev = &cache->ents[hash % HASH_SIZE]; - (old = *prev); - prev = &(*prev)->next) - { - if (old->hash == hash && old->id == id && !strcmp (old->file, file)) - break; - } - if (*prev) - { - if (!replace) - return False; - - old = *prev; - if (old->referenced) - cache->referenced--; - *prev = old->next; - free (old); - cache->entries--; - } - - c = malloc (sizeof (XftFileCacheEnt) + - strlen (file) + 1 + - strlen (name) + 1); - if (!c) - return False; - c->next = *prev; - *prev = c; - c->hash = hash; - c->file = (char *) (c + 1); - c->id = id; - c->name = c->file + strlen (file) + 1; - strcpy (c->file, file); - c->time = time; - c->referenced = replace; - strcpy (c->name, name); - cache->entries++; - return True; -} - -void -XftFileCacheDispose (void) -{ - XftFileCache *cache; - XftFileCacheEnt *c, *next; - int h; - - cache = &_XftFileCache; - - for (h = 0; h < HASH_SIZE; h++) - { - for (c = cache->ents[h]; c; c = next) - { - next = c->next; - free (c); - } - cache->ents[h] = 0; - } - cache->entries = 0; - cache->referenced = 0; - cache->updated = False; -} - -void -XftFileCacheLoad (char *cache_file) -{ - XftFileCache *cache; - FILE *f; - char file[8192]; - int id; - time_t time; - char name[8192]; - - f = fopen (cache_file, "r"); - if (!f) - return; - - cache = &_XftFileCache; - - cache->updated = False; - while (_XftFileCacheReadString (f, file, sizeof (file)) && - _XftFileCacheReadInt (f, &id) && - _XftFileCacheReadTime (f, &time) && - _XftFileCacheReadString (f, name, sizeof (name))) - { - (void) _XftFileCacheAdd (cache, file, id, time, name, False); - } - fclose (f); -} - -Bool -XftFileCacheUpdate (char *file, int id, char *name) -{ - XftFileCache *cache; - char *match; - struct stat statb; - Bool ret; - - cache = &_XftFileCache; - match = file; - - if (stat (file, &statb) < 0) - return False; - ret = _XftFileCacheAdd (cache, match, id, - statb.st_mtime, name, True); - if (ret) - cache->updated = True; - return ret; -} - -static Bool -_XftFileCacheWriteString (FILE *f, char *string) -{ - char c; - - if (putc ('"', f) == EOF) - return False; - while ((c = *string++)) - { - switch (c) { - case '"': - case '\\': - if (putc ('\\', f) == EOF) - return False; - /* fall through */ - default: - if (putc (c, f) == EOF) - return False; - } - } - if (putc ('"', f) == EOF) - return False; - return True; -} - -static Bool -_XftFileCacheWriteUlong (FILE *f, unsigned long t) -{ - int pow; - unsigned long temp, digit; - - temp = t; - pow = 1; - while (temp >= 10) - { - temp /= 10; - pow *= 10; - } - temp = t; - while (pow) - { - digit = temp / pow; - if (putc ((char) digit + '0', f) == EOF) - return False; - temp = temp - pow * digit; - pow = pow / 10; - } - return True; -} - -static Bool -_XftFileCacheWriteInt (FILE *f, int i) -{ - return _XftFileCacheWriteUlong (f, (unsigned long) i); -} - -static Bool -_XftFileCacheWriteTime (FILE *f, time_t t) -{ - return _XftFileCacheWriteUlong (f, (unsigned long) t); -} - -Bool -XftFileCacheSave (char *cache_file) -{ - XftFileCache *cache; - char *lck; - char *tmp; - FILE *f; - int h; - XftFileCacheEnt *c; - - cache = &_XftFileCache; - - if (!cache->updated && cache->referenced == cache->entries) - return True; - - lck = malloc (strlen (cache_file)*2 + 4); - if (!lck) - goto bail0; - tmp = lck + strlen (cache_file) + 2; - strcpy (lck, cache_file); - strcat (lck, "L"); - strcpy (tmp, cache_file); - strcat (tmp, "T"); - if (link (lck, cache_file) < 0 && errno != ENOENT) - goto bail1; - if (access (tmp, F_OK) == 0) - goto bail2; - f = fopen (tmp, "w"); - if (!f) - goto bail2; - - for (h = 0; h < HASH_SIZE; h++) - { - for (c = cache->ents[h]; c; c = c->next) - { - if (!c->referenced) - continue; - if (!_XftFileCacheWriteString (f, c->file)) - goto bail4; - if (putc (' ', f) == EOF) - goto bail4; - if (!_XftFileCacheWriteInt (f, c->id)) - goto bail4; - if (putc (' ', f) == EOF) - goto bail4; - if (!_XftFileCacheWriteTime (f, c->time)) - goto bail4; - if (putc (' ', f) == EOF) - goto bail4; - if (!_XftFileCacheWriteString (f, c->name)) - goto bail4; - if (putc ('\n', f) == EOF) - goto bail4; - } - } - - if (fclose (f) == EOF) - goto bail3; - - if (rename (tmp, cache_file) < 0) - goto bail3; - - unlink (lck); - cache->updated = False; - return True; - -bail4: - fclose (f); -bail3: - unlink (tmp); -bail2: - unlink (lck); -bail1: - free (lck); -bail0: - return False; -} - -Bool -XftFileCacheReadDir (XftFontSet *set, const char *cache_file) -{ - XftPattern *font; - FILE *f; - char *path; - char *base; - char file[8192]; - int id; - char name[8192]; - Bool ret = False; - - if (_XftFontDebug () & XFT_DBG_CACHE) - { - printf ("XftFileCacheReadDir cache_file \"%s\"\n", cache_file); - } - - f = fopen (cache_file, "r"); - if (!f) - { - if (_XftFontDebug () & XFT_DBG_CACHE) - { - printf (" no cache file\n"); - } - goto bail0; - } - - base = strrchr (cache_file, '/'); - if (!base) - goto bail1; - base++; - path = malloc (base - cache_file + 8192 + 1); - if (!path) - goto bail1; - memcpy (path, cache_file, base - cache_file); - base = path + (base - cache_file); - - while (_XftFileCacheReadString (f, file, sizeof (file)) && - _XftFileCacheReadInt (f, &id) && - _XftFileCacheReadString (f, name, sizeof (name))) - { - font = XftNameParse (name); - if (font) - { - strcpy (base, file); - if (_XftFontDebug () & XFT_DBG_CACHEV) - { - printf (" dir cache file \"%s\"\n", file); - } - XftPatternAddString (font, XFT_FILE, path); - if (!XftFontSetAdd (set, font)) - goto bail2; - } - } - if (_XftFontDebug () & XFT_DBG_CACHE) - { - printf (" cache loaded\n"); - } - - ret = True; -bail2: - free (path); -bail1: - fclose (f); -bail0: - return ret; -} - -Bool -XftFileCacheWriteDir (XftFontSet *set, const char *cache_file) -{ - XftPattern *font; - FILE *f; - char name[8192]; - char *file, *base; - int n; - int id; - - if (_XftFontDebug () & XFT_DBG_CACHE) - printf ("XftFileCacheWriteDir cache_file \"%s\"\n", cache_file); - - f = fopen (cache_file, "w"); - if (!f) - { - if (_XftFontDebug () & XFT_DBG_CACHE) - printf (" can't create \"%s\"\n", cache_file); - goto bail0; - } - for (n = 0; n < set->nfont; n++) - { - font = set->fonts[n]; - if (XftPatternGetString (font, XFT_FILE, 0, &file) != XftResultMatch) - goto bail1; - base = strrchr (file, '/'); - if (base) - base = base + 1; - else - base = file; - if (XftPatternGetInteger (font, XFT_INDEX, 0, &id) != XftResultMatch) - goto bail1; - if (!XftNameUnparse (font, name, sizeof (name))) - goto bail1; - if (_XftFontDebug () & XFT_DBG_CACHEV) - printf (" write file \"%s\"\n", base); - if (!_XftFileCacheWriteString (f, base)) - goto bail1; - if (putc (' ', f) == EOF) - goto bail1; - if (!_XftFileCacheWriteInt (f, id)) - goto bail1; - if (putc (' ', f) == EOF) - goto bail1; - if (!_XftFileCacheWriteString (f, name)) - goto bail1; - if (putc ('\n', f) == EOF) - goto bail1; - } - if (fclose (f) == EOF) - goto bail0; - - if (_XftFontDebug () & XFT_DBG_CACHE) - printf (" cache written\n"); - return True; - -bail1: - fclose (f); -bail0: - unlink (cache_file); - return False; -} Index: xc/lib/Xft1/xftgram.y diff -u xc/lib/Xft1/xftgram.y:1.1.1.1 xc/lib/Xft1/xftgram.y:removed --- xc/lib/Xft1/xftgram.y:1.1.1.1 Thu Feb 14 20:26:16 2002 +++ xc/lib/Xft1/xftgram.y Tue May 9 21:55:17 2006 @@ -1,452 +0,0 @@ -/* - * $XFree86: xc/lib/Xft1/xftgram.y,v 1.1.1.1 2002/02/15 01:26:16 keithp Exp $ - * - * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -%{ - -#include -#include -#include "xftint.h" - -static XftMatrix matrix; - -%} - -%union { - int ival; - double dval; - char *sval; - XftExpr *eval; - XftPattern *pval; - XftValue vval; - XftEdit *Eval; - XftOp oval; - XftQual qval; - XftTest *tval; -} - -%token INTEGER -%token DOUBLE -%token STRING NAME -%token ANY ALL -%token DIR CACHE INCLUDE INCLUDEIF MATCH EDIT -%token TOK_TRUE TOK_FALSE TOK_NIL -%token EQUAL SEMI OS CS - -%type expr -%type value -%type field -%type edit -%type edits -%type eqop -%type qual -%type compare -%type tests test -%type number - -%right QUEST COLON -%left OROR -%left ANDAND -%left EQEQ NOTEQ -%left LESS LESSEQ MORE MOREEQ -%left PLUS MINUS -%left TIMES DIVIDE -%right NOT - -%% -configs : configs config - | - ; -config : DIR STRING - { XftConfigAddDir ($2); } - | CACHE STRING - { XftConfigSetCache ($2); } - | INCLUDE STRING - { XftConfigPushInput ($2, True); } - | INCLUDEIF STRING - { XftConfigPushInput ($2, False); } - | MATCH tests EDIT edits - { XftConfigAddEdit ($2, $4); } - ; -tests : test tests - { $1->next = $2; $$ = $1; } - | - { $$ = 0; } - ; -test : qual field compare value - { $$ = XftTestCreate ($1, $2, $3, $4); } - ; -qual : ANY - { $$ = XftQualAny; } - | ALL - { $$ = XftQualAll; } - | - { $$ = XftQualAny; } - ; -field : NAME - { - $$ = XftConfigSaveField ($1); - } - ; -compare : EQUAL - { $$ = XftOpEqual; } - | EQEQ - { $$ = XftOpEqual; } - | NOTEQ - { $$ = XftOpNotEqual; } - | LESS - { $$ = XftOpLess; } - | LESSEQ - { $$ = XftOpLessEqual; } - | MORE - { $$ = XftOpMore; } - | MOREEQ - { $$ = XftOpMoreEqual; } - ; -value : INTEGER - { - $$.type = XftTypeInteger; - $$.u.i = $1; - } - | DOUBLE - { - $$.type = XftTypeDouble; - $$.u.d = $1; - } - | STRING - { - $$.type = XftTypeString; - $$.u.s = $1; - } - | TOK_TRUE - { - $$.type = XftTypeBool; - $$.u.b = True; - } - | TOK_FALSE - { - $$.type = XftTypeBool; - $$.u.b = False; - } - | TOK_NIL - { - $$.type = XftTypeVoid; - } - | matrix - { - $$.type = XftTypeMatrix; - $$.u.m = &matrix; - } - ; -matrix : OS number number number number CS - { - matrix.xx = $2; - matrix.xy = $3; - matrix.yx = $4; - matrix.__REALLY_YY__ = $5; - } -number : INTEGER - { $$ = (double) $1; } - | DOUBLE - ; -edits : edit edits - { $1->next = $2; $$ = $1; } - | - { $$ = 0; } - ; -edit : field eqop expr SEMI - { $$ = XftEditCreate ($1, $2, $3); } - ; -eqop : EQUAL - { $$ = XftOpAssign; } - | PLUS EQUAL - { $$ = XftOpPrepend; } - | EQUAL PLUS - { $$ = XftOpAppend; } - ; -expr : INTEGER - { $$ = XftExprCreateInteger ($1); } - | DOUBLE - { $$ = XftExprCreateDouble ($1); } - | STRING - { $$ = XftExprCreateString ($1); } - | TOK_TRUE - { $$ = XftExprCreateBool (True); } - | TOK_FALSE - { $$ = XftExprCreateBool (False); } - | TOK_NIL - { $$ = XftExprCreateNil (); } - | matrix - { $$ = XftExprCreateMatrix (&matrix); } - | NAME - { $$ = XftExprCreateField ($1); } - | expr OROR expr - { $$ = XftExprCreateOp ($1, XftOpOr, $3); } - | expr ANDAND expr - { $$ = XftExprCreateOp ($1, XftOpAnd, $3); } - | expr EQEQ expr - { $$ = XftExprCreateOp ($1, XftOpEqual, $3); } - | expr NOTEQ expr - { $$ = XftExprCreateOp ($1, XftOpNotEqual, $3); } - | expr LESS expr - { $$ = XftExprCreateOp ($1, XftOpLess, $3); } - | expr LESSEQ expr - { $$ = XftExprCreateOp ($1, XftOpLessEqual, $3); } - | expr MORE expr - { $$ = XftExprCreateOp ($1, XftOpMore, $3); } - | expr MOREEQ expr - { $$ = XftExprCreateOp ($1, XftOpMoreEqual, $3); } - | expr PLUS expr - { $$ = XftExprCreateOp ($1, XftOpPlus, $3); } - | expr MINUS expr - { $$ = XftExprCreateOp ($1, XftOpMinus, $3); } - | expr TIMES expr - { $$ = XftExprCreateOp ($1, XftOpTimes, $3); } - | expr DIVIDE expr - { $$ = XftExprCreateOp ($1, XftOpDivide, $3); } - | NOT expr - { $$ = XftExprCreateOp ($2, XftOpNot, (XftExpr *) 0); } - | expr QUEST expr COLON expr - { $$ = XftExprCreateOp ($1, XftOpQuest, XftExprCreateOp ($3, XftOpQuest, $5)); } - ; -%% - -int -XftConfigwrap (void) -{ - return 1; -} - -void -XftConfigerror (char *fmt, ...) -{ - va_list args; - - fprintf (stderr, "\"%s\": line %d, ", XftConfigFile, XftConfigLineno); - va_start (args, fmt); - vfprintf (stderr, fmt, args); - va_end (args); - fprintf (stderr, "\n"); -} - -XftTest * -XftTestCreate (XftQual qual, const char *field, XftOp compare, XftValue value) -{ - XftTest *test = (XftTest *) malloc (sizeof (XftTest));; - - if (test) - { - test->next = 0; - test->qual = qual; - test->field = field; /* already saved in grammar */ - test->op = compare; - if (value.type == XftTypeString) - value.u.s = _XftSaveString (value.u.s); - else if (value.type == XftTypeMatrix) - value.u.m = _XftSaveMatrix (value.u.m); - test->value = value; - } - return test; -} - -XftExpr * -XftExprCreateInteger (int i) -{ - XftExpr *e = (XftExpr *) malloc (sizeof (XftExpr)); - - if (e) - { - e->op = XftOpInteger; - e->u.ival = i; - } - return e; -} - -XftExpr * -XftExprCreateDouble (double d) -{ - XftExpr *e = (XftExpr *) malloc (sizeof (XftExpr)); - - if (e) - { - e->op = XftOpDouble; - e->u.dval = d; - } - return e; -} - -XftExpr * -XftExprCreateString (const char *s) -{ - XftExpr *e = (XftExpr *) malloc (sizeof (XftExpr)); - - if (e) - { - e->op = XftOpString; - e->u.sval = _XftSaveString (s); - } - return e; -} - -XftExpr * -XftExprCreateMatrix (const XftMatrix *m) -{ - XftExpr *e = (XftExpr *) malloc (sizeof (XftExpr)); - - if (e) - { - e->op = XftOpMatrix; - e->u.mval = _XftSaveMatrix (m); - } - return e; -} - -XftExpr * -XftExprCreateBool (Bool b) -{ - XftExpr *e = (XftExpr *) malloc (sizeof (XftExpr)); - - if (e) - { - e->op = XftOpBool; - e->u.bval = b; - } - return e; -} - -XftExpr * -XftExprCreateNil (void) -{ - XftExpr *e = (XftExpr *) malloc (sizeof (XftExpr)); - - if (e) - { - e->op = XftOpNil; - } - return e; -} - -XftExpr * -XftExprCreateField (const char *field) -{ - XftExpr *e = (XftExpr *) malloc (sizeof (XftExpr)); - - if (e) - { - e->op = XftOpField; - e->u.field = _XftSaveString (field); - } - return e; -} - -XftExpr * -XftExprCreateOp (XftExpr *left, XftOp op, XftExpr *right) -{ - XftExpr *e = (XftExpr *) malloc (sizeof (XftExpr)); - - if (e) - { - e->op = op; - e->u.tree.left = left; - e->u.tree.right = right; - } - return e; -} - -void -XftExprDestroy (XftExpr *e) -{ - switch (e->op) { - case XftOpInteger: - break; - case XftOpDouble: - break; - case XftOpString: - free (e->u.sval); - break; - case XftOpMatrix: - free (e->u.mval); - break; - case XftOpBool: - break; - case XftOpField: - free (e->u.field); - break; - case XftOpAssign: - case XftOpPrepend: - case XftOpAppend: - break; - case XftOpOr: - case XftOpAnd: - case XftOpEqual: - case XftOpNotEqual: - case XftOpLess: - case XftOpLessEqual: - case XftOpMore: - case XftOpMoreEqual: - case XftOpPlus: - case XftOpMinus: - case XftOpTimes: - case XftOpDivide: - case XftOpQuest: - XftExprDestroy (e->u.tree.right); - /* fall through */ - case XftOpNot: - XftExprDestroy (e->u.tree.left); - break; - case XftOpNil: - break; - } - free (e); -} - -XftEdit * -XftEditCreate (const char *field, XftOp op, XftExpr *expr) -{ - XftEdit *e = (XftEdit *) malloc (sizeof (XftEdit)); - - if (e) - { - e->next = 0; - e->field = field; /* already saved in grammar */ - e->op = op; - e->expr = expr; - } - return e; -} - -void -XftEditDestroy (XftEdit *e) -{ - if (e->next) - XftEditDestroy (e->next); - free ((void *) e->field); - if (e->expr) - XftExprDestroy (e->expr); -} - -char * -XftConfigSaveField (const char *field) -{ - return _XftSaveString (field); -} Index: xc/lib/Xft1/xftlex.l diff -u xc/lib/Xft1/xftlex.l:1.1.1.1 xc/lib/Xft1/xftlex.l:removed --- xc/lib/Xft1/xftlex.l:1.1.1.1 Thu Feb 14 20:26:15 2002 +++ xc/lib/Xft1/xftlex.l Tue May 9 21:55:17 2006 @@ -1,275 +0,0 @@ -%{ -/* - * $XFree86: xc/lib/Xft1/xftlex.l,v 1.1.1.1 2002/02/15 01:26:15 keithp Exp $ - * - * Copyright (c) 2000 Keith Packard, member of The XFree86 Project, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#include "xftint.h" - -#include "xftgram.h" - -int XftConfigLineno; - -static void _XftConfigSkipComment (void); - -static void _XftConfigSkipLine (void); - -static int _XftConfigPopInput (void); - - -#define XFT_CONFIG_IN_DEEP 20 -FILE *XftConfigInStack[XFT_CONFIG_IN_DEEP]; -FILE **XftConfigInpt = XftConfigInStack + XFT_CONFIG_IN_DEEP; -FILE *XftConfigInput; -int XftConfigLinenos[XFT_CONFIG_IN_DEEP]; -int *XftConfigLinenopt = XftConfigLinenos + XFT_CONFIG_IN_DEEP; -char *XftConfigFile = ""; -char *XftConfigFileNames[XFT_CONFIG_IN_DEEP]; -char **XftConfigFileNamePt = XftConfigFileNames + XFT_CONFIG_IN_DEEP; -int XftConfigFiledeep = 0; - -#undef YY_INPUT - -#define YY_INPUT(buf,result,max_size) \ -{ \ - int c; \ - result = 0; \ - while (result < max_size) { \ - c = getc (XftConfigInput); \ - if (c < 0) { \ - c = _XftConfigPopInput (); \ - if (c < 0) \ - break; \ - } \ - buf[result++] = c; \ - if (c == '\n') \ - { \ - XftConfigLineno++; \ - break; \ - } \ - } \ -} - -#ifndef FLEX_SCANNER -#undef input -#undef unput -static int input (void) -{ - char buf[1]; - static int r = EOF; - - if (r == 0) - return 0; - YY_INPUT(buf, r, 1); - if (r == 0) - return EOF; - return buf[0]; -} - -static void unput (char c) -{ - if (!c || c == EOF) - return; - if (c == '\n') - XftConfigLineno--; - ungetc (c, XftConfigInput); -} -#endif - -%} -%% -"/\052" _XftConfigSkipComment(); -^# _XftConfigSkipLine(); -dir return DIR; -cache return CACHE; -include return INCLUDE; -includeif return INCLUDEIF; -match return MATCH; -edit return EDIT; -true return TOK_TRUE; -false return TOK_FALSE; -nil return TOK_NIL; -any return ANY; -all return ALL; -"=" return EQUAL; -":" return COLON; -";" return SEMI; -"+" return PLUS; -"-" return MINUS; -"*" return TIMES; -"/" return DIVIDE; -"!" return NOT; -"&&" return ANDAND; -"||" return OROR; -"<" return LESS; -"<=" return LESSEQ; -"==" return EQEQ; -">=" return MOREEQ; -">" return MORE; -"!=" return NOTEQ; -"?" return QUEST; -"[" return OS; -"]" return CS; -\"([^\n\"]|\\\")*\" { - yytext[yyleng - 1] = '\0'; - yylval.sval = yytext+1; - return STRING; - } -[0-9]+ { - yylval.ival = strtol (yytext, 0, 10); - return INTEGER; - } -(([0-9]+((\.[0-9]*(\{[0-9]+\})?)?))|(\.[0-9]+)|(\.[0-9]*\{[0-9]+\}))(([Ee][-+]?[0-9]+)?) { - yylval.dval = strtod (yytext, 0); - return DOUBLE; - } -[a-zA-Z][0-9a-zA-Z_]* { - if (XftNameConstant (yytext, &yylval.ival)) - return INTEGER; - yylval.sval = yytext; - return NAME; - } -. ; -"\n" ; -%% -static void -_XftConfigSkipComment (void) -{ - int c; - - c = input(); - for (;;) { - while (c != EOF && c != '*') - c = input(); - if (c == EOF) - return; - c = input(); - if (c == EOF || c == '/') - return; - } -} - -static void -_XftConfigSkipLine (void) -{ - int c; - - do { - c = input(); - } while (c != EOF && c != '\n'); - if (c == '\n') unput('\n'); -} - -Bool -XftConfigLexFile(char *s) -{ - FILE *f; - - f = fopen (s, "r"); - if (f == 0) - { - fprintf (stderr, "cannot open file \"%s\"\n", s); - return False; - } - ++XftConfigFiledeep; - XftConfigInput = f; - XftConfigFile = s; - return True; -} - -Bool -XftConfigPushInput (char *s, Bool complain) -{ - FILE *f; - char *t; - char *h; - - if (XftConfigInpt == XftConfigInStack) - { - (void) fprintf (stderr, "files nested too deeply\n"); - return False; - } - t = s; - if (*s == '~') - { - h = getenv ("HOME"); - if (h) - { - t = (char *) malloc (strlen (h) + strlen (s)); - if (t) - { - strcpy (t, h); - strcat (t, s+1); - } - else - t = s; - } - } - f = fopen (t, "r"); - if (t != s) - free (t); - if (f == 0) - { - if (complain) - (void) fprintf (stderr, "cannot open file %s\n", s); - return False; - } - ++XftConfigFiledeep; - *--XftConfigInpt = XftConfigInput; - *--XftConfigLinenopt = XftConfigLineno; - *--XftConfigFileNamePt = XftConfigFile; - XftConfigInput = f; - XftConfigLineno = 1; - XftConfigFile = _XftSaveString (s); - return True; -} - -static int -_XftConfigPopInput (void) -{ - int c; - - for (;;) - { - c = getc (XftConfigInput); - if (c >= 0) - return c; - fclose (XftConfigInput); - XftConfigInput = 0; - if (XftConfigInpt == XftConfigInStack + XFT_CONFIG_IN_DEEP) - return EOF; - XftConfigInput = *XftConfigInpt++; - XftConfigLineno = *XftConfigLinenopt++; - free (XftConfigFile); - XftConfigFile = *XftConfigFileNamePt++; - --XftConfigFiledeep; - } -} - -void -XftConfigLexDone (void) -{ -#ifdef FLEX_SCANNER - XftConfig_delete_buffer (XftConfig_current_buffer); -#endif -} Index: xc/lib/Xi/Imakefile diff -u xc/lib/Xi/Imakefile:1.6 xc/lib/Xi/Imakefile:1.7 --- xc/lib/Xi/Imakefile:1.6 Sun Apr 4 22:33:12 2004 +++ xc/lib/Xi/Imakefile Mon Jan 9 09:59:13 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:45:53 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/Xi/Imakefile,v 1.6 2004/04/05 02:33:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xi/Imakefile,v 1.7 2006/01/09 14:59:13 dawes Exp $ #define DoNormalLib NormalLibXi #define DoSharedLib SharedLibXi Index: xc/lib/Xi/XAllowDv.c diff -u xc/lib/Xi/XAllowDv.c:3.4 xc/lib/Xi/XAllowDv.c:3.5 --- xc/lib/Xi/XAllowDv.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XAllowDv.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XAllowDv.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XAllowDv.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XAllowDv.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XChgDCtl.c diff -u xc/lib/Xi/XChgDCtl.c:3.4 xc/lib/Xi/XChgDCtl.c:3.5 --- xc/lib/Xi/XChgDCtl.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XChgDCtl.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XChgDCtl.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgDCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgDCtl.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XChgFCtl.c diff -u xc/lib/Xi/XChgFCtl.c:3.4 xc/lib/Xi/XChgFCtl.c:3.5 --- xc/lib/Xi/XChgFCtl.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XChgFCtl.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XChgFCtl.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgFCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgFCtl.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XChgKMap.c diff -u xc/lib/Xi/XChgKMap.c:3.4 xc/lib/Xi/XChgKMap.c:3.5 --- xc/lib/Xi/XChgKMap.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XChgKMap.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XChgKMap.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XChgKbd.c diff -u xc/lib/Xi/XChgKbd.c:3.4 xc/lib/Xi/XChgKbd.c:3.5 --- xc/lib/Xi/XChgKbd.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XChgKbd.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XChgKbd.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgKbd.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgKbd.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XChgPnt.c diff -u xc/lib/Xi/XChgPnt.c:3.4 xc/lib/Xi/XChgPnt.c:3.5 --- xc/lib/Xi/XChgPnt.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XChgPnt.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XChgPnt.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgPnt.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgPnt.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XChgProp.c diff -u xc/lib/Xi/XChgProp.c:3.4 xc/lib/Xi/XChgProp.c:3.5 --- xc/lib/Xi/XChgProp.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XChgProp.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XChgProp.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgProp.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgProp.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XCloseDev.c diff -u xc/lib/Xi/XCloseDev.c:3.4 xc/lib/Xi/XCloseDev.c:3.5 --- xc/lib/Xi/XCloseDev.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XCloseDev.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XCloseDev.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XCloseDev.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XCloseDev.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XDevBell.c diff -u xc/lib/Xi/XDevBell.c:3.4 xc/lib/Xi/XDevBell.c:3.5 --- xc/lib/Xi/XDevBell.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XDevBell.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XDevBell.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XDevBell.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XDevBell.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XFreeLst.c diff -u xc/lib/Xi/XFreeLst.c:1.3 xc/lib/Xi/XFreeLst.c:1.4 --- xc/lib/Xi/XFreeLst.c:1.3 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XFreeLst.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XFreeLst.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XFreeLst.c,v 1.3 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XFreeLst.c,v 1.4 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGMotion.c diff -u xc/lib/Xi/XGMotion.c:3.4 xc/lib/Xi/XGMotion.c:3.5 --- xc/lib/Xi/XGMotion.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XGMotion.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGMotion.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGMotion.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGMotion.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGetBMap.c diff -u xc/lib/Xi/XGetBMap.c:3.4 xc/lib/Xi/XGetBMap.c:3.5 --- xc/lib/Xi/XGetBMap.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XGetBMap.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGetBMap.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetBMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetBMap.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGetDCtl.c diff -u xc/lib/Xi/XGetDCtl.c:3.4 xc/lib/Xi/XGetDCtl.c:3.5 --- xc/lib/Xi/XGetDCtl.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XGetDCtl.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGetDCtl.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetDCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetDCtl.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGetFCtl.c diff -u xc/lib/Xi/XGetFCtl.c:3.4 xc/lib/Xi/XGetFCtl.c:3.5 --- xc/lib/Xi/XGetFCtl.c:3.4 Tue Oct 15 20:37:28 2002 +++ xc/lib/Xi/XGetFCtl.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGetFCtl.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetFCtl.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetFCtl.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGetKMap.c diff -u xc/lib/Xi/XGetKMap.c:3.5 xc/lib/Xi/XGetKMap.c:3.6 --- xc/lib/Xi/XGetKMap.c:3.5 Mon Nov 17 17:20:21 2003 +++ xc/lib/Xi/XGetKMap.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGetKMap.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.5 2003/11/17 22:20:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetKMap.c,v 3.6 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGetMMap.c diff -u xc/lib/Xi/XGetMMap.c:3.4 xc/lib/Xi/XGetMMap.c:3.5 --- xc/lib/Xi/XGetMMap.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XGetMMap.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGetMMap.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetMMap.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetMMap.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGetProp.c diff -u xc/lib/Xi/XGetProp.c:3.4 xc/lib/Xi/XGetProp.c:3.5 --- xc/lib/Xi/XGetProp.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XGetProp.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGetProp.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetProp.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetProp.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGetVers.c diff -u xc/lib/Xi/XGetVers.c:3.7 xc/lib/Xi/XGetVers.c:3.8 --- xc/lib/Xi/XGetVers.c:3.7 Mon Nov 17 17:20:21 2003 +++ xc/lib/Xi/XGetVers.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGetVers.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.7 2003/11/17 22:20:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGetVers.c,v 3.8 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGrDvBut.c diff -u xc/lib/Xi/XGrDvBut.c:3.5 xc/lib/Xi/XGrDvBut.c:3.6 --- xc/lib/Xi/XGrDvBut.c:3.5 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XGrDvBut.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGrDvBut.c,v 1.4 2001/02/09 02:03:50 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGrDvBut.c,v 3.5 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGrDvBut.c,v 3.6 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGrDvKey.c diff -u xc/lib/Xi/XGrDvKey.c:3.4 xc/lib/Xi/XGrDvKey.c:3.5 --- xc/lib/Xi/XGrDvKey.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XGrDvKey.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGrDvKey.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGrDvKey.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGrabDev.c diff -u xc/lib/Xi/XGrabDev.c:3.4 xc/lib/Xi/XGrabDev.c:3.5 --- xc/lib/Xi/XGrabDev.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XGrabDev.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGrabDev.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGrabDev.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGrabDev.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGtFocus.c diff -u xc/lib/Xi/XGtFocus.c:3.4 xc/lib/Xi/XGtFocus.c:3.5 --- xc/lib/Xi/XGtFocus.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XGtFocus.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGtFocus.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGtFocus.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGtFocus.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XGtSelect.c diff -u xc/lib/Xi/XGtSelect.c:3.4 xc/lib/Xi/XGtSelect.c:3.5 --- xc/lib/Xi/XGtSelect.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XGtSelect.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XGtSelect.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XGtSelect.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XGtSelect.c,v 3.5 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XListDev.c diff -u xc/lib/Xi/XListDev.c:3.5 xc/lib/Xi/XListDev.c:3.6 --- xc/lib/Xi/XListDev.c:3.5 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XListDev.c Mon Jan 9 09:59:13 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XListDev.c,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XListDev.c,v 3.5 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XListDev.c,v 3.6 2006/01/09 14:59:13 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XOpenDev.c diff -u xc/lib/Xi/XOpenDev.c:3.4 xc/lib/Xi/XOpenDev.c:3.5 --- xc/lib/Xi/XOpenDev.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XOpenDev.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XOpenDev.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XOpenDev.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XOpenDev.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XQueryDv.c diff -u xc/lib/Xi/XQueryDv.c:3.4 xc/lib/Xi/XQueryDv.c:3.5 --- xc/lib/Xi/XQueryDv.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XQueryDv.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XQueryDv.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XQueryDv.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XQueryDv.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XSelect.c diff -u xc/lib/Xi/XSelect.c:3.4 xc/lib/Xi/XSelect.c:3.5 --- xc/lib/Xi/XSelect.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XSelect.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XSelect.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSelect.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSelect.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XSetBMap.c diff -u xc/lib/Xi/XSetBMap.c:3.4 xc/lib/Xi/XSetBMap.c:3.5 --- xc/lib/Xi/XSetBMap.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XSetBMap.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XSetBMap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetBMap.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetBMap.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XSetDVal.c diff -u xc/lib/Xi/XSetDVal.c:3.4 xc/lib/Xi/XSetDVal.c:3.5 --- xc/lib/Xi/XSetDVal.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XSetDVal.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XSetDVal.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetDVal.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetDVal.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XSetMMap.c diff -u xc/lib/Xi/XSetMMap.c:3.4 xc/lib/Xi/XSetMMap.c:3.5 --- xc/lib/Xi/XSetMMap.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XSetMMap.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XSetMMap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetMMap.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetMMap.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XSetMode.c diff -u xc/lib/Xi/XSetMode.c:3.4 xc/lib/Xi/XSetMode.c:3.5 --- xc/lib/Xi/XSetMode.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XSetMode.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XSetMode.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XSetMode.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XSetMode.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XStFocus.c diff -u xc/lib/Xi/XStFocus.c:3.4 xc/lib/Xi/XStFocus.c:3.5 --- xc/lib/Xi/XStFocus.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XStFocus.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XStFocus.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XStFocus.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XStFocus.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XUngrDev.c diff -u xc/lib/Xi/XUngrDev.c:3.4 xc/lib/Xi/XUngrDev.c:3.5 --- xc/lib/Xi/XUngrDev.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XUngrDev.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XUngrDev.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XUngrDev.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XUngrDev.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XUngrDvB.c diff -u xc/lib/Xi/XUngrDvB.c:3.4 xc/lib/Xi/XUngrDvB.c:3.5 --- xc/lib/Xi/XUngrDvB.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XUngrDvB.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XUngrDvB.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XUngrDvB.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XUngrDvB.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/XUngrDvK.c diff -u xc/lib/Xi/XUngrDvK.c:3.4 xc/lib/Xi/XUngrDvK.c:3.5 --- xc/lib/Xi/XUngrDvK.c:3.4 Tue Oct 15 20:37:29 2002 +++ xc/lib/Xi/XUngrDvK.c Mon Jan 9 09:59:14 2006 @@ -1,5 +1,3 @@ -/* $Xorg: XUngrDvK.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +43,7 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XUngrDvK.c,v 3.4 2002/10/16 00:37:29 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XUngrDvK.c,v 3.5 2006/01/09 14:59:14 dawes Exp $ */ /*********************************************************************** * Index: xc/lib/Xi/Xi-def.cpp diff -u xc/lib/Xi/Xi-def.cpp:1.1.1.3 xc/lib/Xi/Xi-def.cpp:1.2 --- xc/lib/Xi/Xi-def.cpp:1.1.1.3 Tue Jan 16 17:21:19 2001 +++ xc/lib/Xi/Xi-def.cpp Mon Jan 9 09:59:14 2006 @@ -46,4 +46,4 @@ _xibadevent _xibadmode _xidevicebusy -/* $Xorg: Xi-def.cpp,v 1.3 2000/08/17 19:45:58 cpqbld Exp $ */ +/* $XFree86: xc/lib/Xi/Xi-def.cpp,v 1.2 2006/01/09 14:59:14 dawes Exp $ */ Index: xc/lib/Xinerama/Xinerama.c diff -u xc/lib/Xinerama/Xinerama.c:1.4 xc/lib/Xinerama/Xinerama.c:1.5 --- xc/lib/Xinerama/Xinerama.c:1.4 Sat Apr 3 17:38:52 2004 +++ xc/lib/Xinerama/Xinerama.c Mon Jan 9 09:59:15 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XPanoramiX.c,v 1.4 2000/08/17 19:45:51 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -23,7 +22,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.4 2004/04/03 22:38:52 tsi Exp $ */ +/* $XFree86: xc/lib/Xinerama/Xinerama.c,v 1.5 2006/01/09 14:59:15 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES Index: xc/lib/Xmu/AllCmap.c diff -u xc/lib/Xmu/AllCmap.c:1.8 xc/lib/Xmu/AllCmap.c:1.9 --- xc/lib/Xmu/AllCmap.c:1.8 Fri Dec 14 14:55:32 2001 +++ xc/lib/Xmu/AllCmap.c Mon Jan 9 09:59:15 2006 @@ -1,5 +1,3 @@ -/* $Xorg: AllCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/AllCmap.c,v 1.8 2001/12/14 19:55:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/AllCmap.c,v 1.9 2006/01/09 14:59:15 dawes Exp $ */ #include #include Index: xc/lib/Xmu/Atoms.c diff -u xc/lib/Xmu/Atoms.c:3.8 xc/lib/Xmu/Atoms.c:3.9 --- xc/lib/Xmu/Atoms.c:3.8 Fri Dec 14 14:55:33 2001 +++ xc/lib/Xmu/Atoms.c Mon Jan 9 09:59:15 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Atoms.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Atoms.c,v 3.8 2001/12/14 19:55:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Atoms.c,v 3.9 2006/01/09 14:59:15 dawes Exp $ */ /* * This file contains routines to cache atoms, avoiding multiple Index: xc/lib/Xmu/Atoms.h diff -u xc/lib/Xmu/Atoms.h:1.7 xc/lib/Xmu/Atoms.h:1.8 --- xc/lib/Xmu/Atoms.h:1.7 Fri Dec 14 14:55:33 2001 +++ xc/lib/Xmu/Atoms.h Mon Jan 9 09:59:15 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Atoms.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Atoms.h,v 1.7 2001/12/14 19:55:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Atoms.h,v 1.8 2006/01/09 14:59:15 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/CharSet.h diff -u xc/lib/Xmu/CharSet.h:1.8 xc/lib/Xmu/CharSet.h:1.9 --- xc/lib/Xmu/CharSet.h:1.8 Fri Dec 14 14:55:33 2001 +++ xc/lib/Xmu/CharSet.h Mon Jan 9 09:59:15 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CharSet.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xmu/CharSet.h,v 1.8 2001/12/14 19:55:33 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CharSet.h,v 1.9 2006/01/09 14:59:15 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/ClientWin.c diff -u xc/lib/Xmu/ClientWin.c:1.8 xc/lib/Xmu/ClientWin.c:1.9 --- xc/lib/Xmu/ClientWin.c:1.8 Wed Nov 27 15:54:49 2002 +++ xc/lib/Xmu/ClientWin.c Mon Jan 9 09:59:15 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ClientWin.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ClientWin.c,v 1.8 2002/11/27 20:54:49 tsi Exp $ */ +/* $XFree86: xc/lib/Xmu/ClientWin.c,v 1.9 2006/01/09 14:59:15 dawes Exp $ */ #include #include Index: xc/lib/Xmu/CloseHook.c diff -u xc/lib/Xmu/CloseHook.c:3.6 xc/lib/Xmu/CloseHook.c:3.7 --- xc/lib/Xmu/CloseHook.c:3.6 Fri Dec 14 14:55:35 2001 +++ xc/lib/Xmu/CloseHook.c Mon Jan 9 09:59:15 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CloseHook.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -24,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CloseHook.c,v 3.6 2001/12/14 19:55:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CloseHook.c,v 3.7 2006/01/09 14:59:15 dawes Exp $ */ /* * CloseDisplayHook package - provide callback on XCloseDisplay Index: xc/lib/Xmu/CloseHook.h diff -u xc/lib/Xmu/CloseHook.h:1.7 xc/lib/Xmu/CloseHook.h:1.8 --- xc/lib/Xmu/CloseHook.h:1.7 Fri Dec 14 14:55:35 2001 +++ xc/lib/Xmu/CloseHook.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CloseHook.h,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CloseHook.h,v 1.7 2001/12/14 19:55:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CloseHook.h,v 1.8 2006/01/09 14:59:16 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/CmapAlloc.c diff -u xc/lib/Xmu/CmapAlloc.c:1.7 xc/lib/Xmu/CmapAlloc.c:1.8 --- xc/lib/Xmu/CmapAlloc.c:1.7 Fri Dec 14 14:55:35 2001 +++ xc/lib/Xmu/CmapAlloc.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CmapAlloc.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CmapAlloc.c,v 1.7 2001/12/14 19:55:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CmapAlloc.c,v 1.8 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium Index: xc/lib/Xmu/Converters.h diff -u xc/lib/Xmu/Converters.h:1.6 xc/lib/Xmu/Converters.h:1.7 --- xc/lib/Xmu/Converters.h:1.6 Fri Dec 14 14:55:35 2001 +++ xc/lib/Xmu/Converters.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Converters.h,v 1.5 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xmu/Converters.h,v 1.6 2001/12/14 19:55:35 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Converters.h,v 1.7 2006/01/09 14:59:16 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/CrCmap.c diff -u xc/lib/Xmu/CrCmap.c:3.7 xc/lib/Xmu/CrCmap.c:3.8 --- xc/lib/Xmu/CrCmap.c:3.7 Fri Dec 14 14:55:36 2001 +++ xc/lib/Xmu/CrCmap.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CrCmap.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CrCmap.c,v 3.7 2001/12/14 19:55:36 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CrCmap.c,v 3.8 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium Index: xc/lib/Xmu/CrPixFBit.c diff -u xc/lib/Xmu/CrPixFBit.c:1.7 xc/lib/Xmu/CrPixFBit.c:1.8 --- xc/lib/Xmu/CrPixFBit.c:1.7 Fri Dec 14 14:55:37 2001 +++ xc/lib/Xmu/CrPixFBit.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CrPixFBit.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CrPixFBit.c,v 1.7 2001/12/14 19:55:37 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CrPixFBit.c,v 1.8 2006/01/09 14:59:16 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the Index: xc/lib/Xmu/CurUtil.h diff -u xc/lib/Xmu/CurUtil.h:1.6 xc/lib/Xmu/CurUtil.h:1.7 --- xc/lib/Xmu/CurUtil.h:1.6 Fri Dec 14 14:55:38 2001 +++ xc/lib/Xmu/CurUtil.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CurUtil.h,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CurUtil.h,v 1.6 2001/12/14 19:55:38 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CurUtil.h,v 1.7 2006/01/09 14:59:16 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/CursorName.c diff -u xc/lib/Xmu/CursorName.c:3.8 xc/lib/Xmu/CursorName.c:3.9 --- xc/lib/Xmu/CursorName.c:3.8 Wed Sep 18 13:11:42 2002 +++ xc/lib/Xmu/CursorName.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CursorName.c,v 1.4 2001/02/09 02:03:51 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.8 2002/09/18 17:11:42 tsi Exp $ */ +/* $XFree86: xc/lib/Xmu/CursorName.c,v 3.9 2006/01/09 14:59:16 dawes Exp $ */ #include #include Index: xc/lib/Xmu/CvtCache.c diff -u xc/lib/Xmu/CvtCache.c:3.7 xc/lib/Xmu/CvtCache.c:3.8 --- xc/lib/Xmu/CvtCache.c:3.7 Fri Dec 14 14:55:39 2001 +++ xc/lib/Xmu/CvtCache.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CvtCache.c,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtCache.c,v 3.7 2001/12/14 19:55:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtCache.c,v 3.8 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium Index: xc/lib/Xmu/CvtCache.h diff -u xc/lib/Xmu/CvtCache.h:1.7 xc/lib/Xmu/CvtCache.h:1.8 --- xc/lib/Xmu/CvtCache.h:1.7 Fri Dec 14 14:55:39 2001 +++ xc/lib/Xmu/CvtCache.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CvtCache.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtCache.h,v 1.7 2001/12/14 19:55:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtCache.h,v 1.8 2006/01/09 14:59:16 dawes Exp $ */ /* * Public Interfaces Index: xc/lib/Xmu/CvtStdSel.c diff -u xc/lib/Xmu/CvtStdSel.c:3.20 xc/lib/Xmu/CvtStdSel.c:3.21 --- xc/lib/Xmu/CvtStdSel.c:3.20 Fri Dec 14 14:55:39 2001 +++ xc/lib/Xmu/CvtStdSel.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: CvtStdSel.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/CvtStdSel.c,v 3.20 2001/12/14 19:55:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/CvtStdSel.c,v 3.21 2006/01/09 14:59:16 dawes Exp $ */ /* * This file contains routines to handle common selection targets. Index: xc/lib/Xmu/DefErrMsg.c diff -u xc/lib/Xmu/DefErrMsg.c:1.8 xc/lib/Xmu/DefErrMsg.c:1.9 --- xc/lib/Xmu/DefErrMsg.c:1.8 Fri Dec 14 14:55:39 2001 +++ xc/lib/Xmu/DefErrMsg.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: DefErrMsg.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DefErrMsg.c,v 1.8 2001/12/14 19:55:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DefErrMsg.c,v 1.9 2006/01/09 14:59:16 dawes Exp $ */ #include #define NEED_EVENTS Index: xc/lib/Xmu/DelCmap.c diff -u xc/lib/Xmu/DelCmap.c:1.7 xc/lib/Xmu/DelCmap.c:1.8 --- xc/lib/Xmu/DelCmap.c:1.7 Fri Dec 14 14:55:40 2001 +++ xc/lib/Xmu/DelCmap.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: DelCmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DelCmap.c,v 1.7 2001/12/14 19:55:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DelCmap.c,v 1.8 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium Index: xc/lib/Xmu/DisplayQue.c diff -u xc/lib/Xmu/DisplayQue.c:3.5 xc/lib/Xmu/DisplayQue.c:3.6 --- xc/lib/Xmu/DisplayQue.c:3.5 Fri Dec 14 14:55:40 2001 +++ xc/lib/Xmu/DisplayQue.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: DisplayQue.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DisplayQue.c,v 3.5 2001/12/14 19:55:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DisplayQue.c,v 3.6 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium Index: xc/lib/Xmu/DisplayQue.h diff -u xc/lib/Xmu/DisplayQue.h:1.6 xc/lib/Xmu/DisplayQue.h:1.7 --- xc/lib/Xmu/DisplayQue.h:1.6 Fri Dec 14 14:55:40 2001 +++ xc/lib/Xmu/DisplayQue.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: DisplayQue.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DisplayQue.h,v 1.6 2001/12/14 19:55:40 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DisplayQue.h,v 1.7 2006/01/09 14:59:16 dawes Exp $ */ #ifndef _XMU_DISPLAYQUE_H_ #define _XMU_DISPLAYQUE_H_ Index: xc/lib/Xmu/Distinct.c diff -u xc/lib/Xmu/Distinct.c:3.6 xc/lib/Xmu/Distinct.c:3.7 --- xc/lib/Xmu/Distinct.c:3.6 Fri Dec 14 14:55:41 2001 +++ xc/lib/Xmu/Distinct.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Distinct.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Distinct.c,v 3.6 2001/12/14 19:55:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Distinct.c,v 3.7 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/Xmu/DrRndRect.c diff -u xc/lib/Xmu/DrRndRect.c:1.7 xc/lib/Xmu/DrRndRect.c:1.8 --- xc/lib/Xmu/DrRndRect.c:1.7 Fri Dec 14 14:55:41 2001 +++ xc/lib/Xmu/DrRndRect.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: DrRndRect.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DrRndRect.c,v 1.7 2001/12/14 19:55:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DrRndRect.c,v 1.8 2006/01/09 14:59:16 dawes Exp $ */ /* * XmuDrawRoundedRectangle, XmuFillRoundedRectangle Index: xc/lib/Xmu/DrawLogo.c diff -u xc/lib/Xmu/DrawLogo.c:1.8 xc/lib/Xmu/DrawLogo.c:1.9 --- xc/lib/Xmu/DrawLogo.c:1.8 Fri Dec 14 14:55:41 2001 +++ xc/lib/Xmu/DrawLogo.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: DrawLogo.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/DrawLogo.c,v 1.8 2001/12/14 19:55:41 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/DrawLogo.c,v 1.9 2006/01/09 14:59:16 dawes Exp $ */ #include #include Index: xc/lib/Xmu/Drawing.h diff -u xc/lib/Xmu/Drawing.h:1.7 xc/lib/Xmu/Drawing.h:1.8 --- xc/lib/Xmu/Drawing.h:1.7 Mon Nov 17 17:20:22 2003 +++ xc/lib/Xmu/Drawing.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Drawing.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Drawing.h,v 1.7 2003/11/17 22:20:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Drawing.h,v 1.8 2006/01/09 14:59:16 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/Editres.h diff -u xc/lib/Xmu/Editres.h:1.6 xc/lib/Xmu/Editres.h:1.7 --- xc/lib/Xmu/Editres.h:1.6 Fri Dec 14 14:55:43 2001 +++ xc/lib/Xmu/Editres.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Editres.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1991, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Editres.h,v 1.6 2001/12/14 19:55:43 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Editres.h,v 1.7 2006/01/09 14:59:16 dawes Exp $ */ #include Index: xc/lib/Xmu/EditresCom.c diff -u xc/lib/Xmu/EditresCom.c:1.22 xc/lib/Xmu/EditresCom.c:1.23 --- xc/lib/Xmu/EditresCom.c:1.22 Thu Jan 22 21:36:34 2004 +++ xc/lib/Xmu/EditresCom.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: EditresCom.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/EditresCom.c,v 1.22 2004/01/23 02:36:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/EditresCom.c,v 1.23 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Chris D. Peterson, Dave Sternlicht, MIT X Consortium Index: xc/lib/Xmu/EditresP.h diff -u xc/lib/Xmu/EditresP.h:1.6 xc/lib/Xmu/EditresP.h:1.7 --- xc/lib/Xmu/EditresP.h:1.6 Fri Dec 14 14:55:44 2001 +++ xc/lib/Xmu/EditresP.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: EditresP.h,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/EditresP.h,v 1.6 2001/12/14 19:55:44 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/EditresP.h,v 1.7 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Chris D. Peterson, MIT X Consortium Index: xc/lib/Xmu/Error.h diff -u xc/lib/Xmu/Error.h:1.6 xc/lib/Xmu/Error.h:1.7 --- xc/lib/Xmu/Error.h:1.6 Fri Dec 14 14:55:45 2001 +++ xc/lib/Xmu/Error.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Error.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Error.h,v 1.6 2001/12/14 19:55:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Error.h,v 1.7 2006/01/09 14:59:16 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/ExtAgent.c diff -u xc/lib/Xmu/ExtAgent.c:1.7 xc/lib/Xmu/ExtAgent.c:1.8 --- xc/lib/Xmu/ExtAgent.c:1.7 Fri Dec 14 14:55:45 2001 +++ xc/lib/Xmu/ExtAgent.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ExtAgent.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ExtAgent.c,v 1.7 2001/12/14 19:55:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ExtAgent.c,v 1.8 2006/01/09 14:59:16 dawes Exp $ */ #include #include Index: xc/lib/Xmu/ExtAgent.h diff -u xc/lib/Xmu/ExtAgent.h:1.6 xc/lib/Xmu/ExtAgent.h:1.7 --- xc/lib/Xmu/ExtAgent.h:1.6 Fri Dec 14 14:55:45 2001 +++ xc/lib/Xmu/ExtAgent.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ExtAgent.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1994,1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ExtAgent.h,v 1.6 2001/12/14 19:55:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ExtAgent.h,v 1.7 2006/01/09 14:59:16 dawes Exp $ */ #include #include Index: xc/lib/Xmu/FToCback.c diff -u xc/lib/Xmu/FToCback.c:1.7 xc/lib/Xmu/FToCback.c:1.8 --- xc/lib/Xmu/FToCback.c:1.7 Fri Dec 14 14:55:45 2001 +++ xc/lib/Xmu/FToCback.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: FToCback.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988,1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/FToCback.c,v 1.7 2001/12/14 19:55:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/FToCback.c,v 1.8 2006/01/09 14:59:16 dawes Exp $ */ #include #include Index: xc/lib/Xmu/GetHost.c diff -u xc/lib/Xmu/GetHost.c:3.8 xc/lib/Xmu/GetHost.c:3.9 --- xc/lib/Xmu/GetHost.c:3.8 Fri Dec 14 14:55:46 2001 +++ xc/lib/Xmu/GetHost.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: GetHost.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/GetHost.c,v 3.8 2001/12/14 19:55:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/GetHost.c,v 3.9 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium Index: xc/lib/Xmu/GrayPixmap.c diff -u xc/lib/Xmu/GrayPixmap.c:1.6 xc/lib/Xmu/GrayPixmap.c:1.7 --- xc/lib/Xmu/GrayPixmap.c:1.6 Fri Dec 14 14:55:46 2001 +++ xc/lib/Xmu/GrayPixmap.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: GrayPixmap.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.6 2001/12/14 19:55:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/GrayPixmap.c,v 1.7 2006/01/09 14:59:16 dawes Exp $ */ #include #include Index: xc/lib/Xmu/Imakefile diff -u xc/lib/Xmu/Imakefile:1.9 xc/lib/Xmu/Imakefile:1.10 --- xc/lib/Xmu/Imakefile:1.9 Sun Apr 4 22:33:12 2004 +++ xc/lib/Xmu/Imakefile Mon Jan 9 09:59:16 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:02 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/Xmu/Imakefile,v 1.9 2004/04/05 02:33:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xmu/Imakefile,v 1.10 2006/01/09 14:59:16 dawes Exp $ #define DoNormalLib NormalLibXmu #define DoSharedLib SharedLibXmu Index: xc/lib/Xmu/Initer.c diff -u xc/lib/Xmu/Initer.c:1.7 xc/lib/Xmu/Initer.c:1.8 --- xc/lib/Xmu/Initer.c:1.7 Fri Dec 14 14:55:46 2001 +++ xc/lib/Xmu/Initer.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Initer.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Initer.c,v 1.7 2001/12/14 19:55:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Initer.c,v 1.8 2006/01/09 14:59:16 dawes Exp $ */ /* Created By: Chris D. Peterson * MIT X Consortium Index: xc/lib/Xmu/Initer.h diff -u xc/lib/Xmu/Initer.h:1.6 xc/lib/Xmu/Initer.h:1.7 --- xc/lib/Xmu/Initer.h:1.6 Fri Dec 14 14:55:46 2001 +++ xc/lib/Xmu/Initer.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Initer.h,v 1.5 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Initer.h,v 1.6 2001/12/14 19:55:46 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Initer.h,v 1.7 2006/01/09 14:59:16 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/LocBitmap.c diff -u xc/lib/Xmu/LocBitmap.c:3.10 xc/lib/Xmu/LocBitmap.c:3.11 --- xc/lib/Xmu/LocBitmap.c:3.10 Fri May 31 14:45:45 2002 +++ xc/lib/Xmu/LocBitmap.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LocBitmap.c,v 1.7 2001/02/09 02:03:52 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/LocBitmap.c,v 3.10 2002/05/31 18:45:45 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/LocBitmap.c,v 3.11 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium Index: xc/lib/Xmu/Lookup.c diff -u xc/lib/Xmu/Lookup.c:3.8 xc/lib/Xmu/Lookup.c:3.9 --- xc/lib/Xmu/Lookup.c:3.8 Fri Dec 14 14:55:47 2001 +++ xc/lib/Xmu/Lookup.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Lookup.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Lookup.c,v 3.8 2001/12/14 19:55:47 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Lookup.c,v 3.9 2006/01/09 14:59:16 dawes Exp $ */ #include Index: xc/lib/Xmu/LookupCmap.c diff -u xc/lib/Xmu/LookupCmap.c:1.8 xc/lib/Xmu/LookupCmap.c:1.9 --- xc/lib/Xmu/LookupCmap.c:1.8 Fri Dec 14 14:55:47 2001 +++ xc/lib/Xmu/LookupCmap.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: LookupCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/LookupCmap.c,v 1.8 2001/12/14 19:55:47 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/LookupCmap.c,v 1.9 2006/01/09 14:59:16 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium Index: xc/lib/Xmu/Lower.c diff -u xc/lib/Xmu/Lower.c:1.13 xc/lib/Xmu/Lower.c:1.14 --- xc/lib/Xmu/Lower.c:1.13 Sun Feb 6 20:01:16 2005 +++ xc/lib/Xmu/Lower.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Lower.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xmu/Lower.c,v 1.13 2005/02/07 01:01:16 tsi Exp $ */ +/* $XFree86: xc/lib/Xmu/Lower.c,v 1.14 2006/01/09 14:59:16 dawes Exp $ */ #define XK_LATIN1 #include Index: xc/lib/Xmu/Misc.h diff -u xc/lib/Xmu/Misc.h:1.2 xc/lib/Xmu/Misc.h:1.3 --- xc/lib/Xmu/Misc.h:1.2 Fri Dec 14 14:55:48 2001 +++ xc/lib/Xmu/Misc.h Mon Jan 9 09:59:16 2006 @@ -1,5 +1,4 @@ -/* $Xorg: Misc.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/Xmu/Misc.h,v 1.3 2006/01/09 14:59:16 dawes Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xmu/RdBitF.c diff -u xc/lib/Xmu/RdBitF.c:3.14 xc/lib/Xmu/RdBitF.c:3.15 --- xc/lib/Xmu/RdBitF.c:3.14 Sat Oct 23 11:29:26 2004 +++ xc/lib/Xmu/RdBitF.c Mon Jan 9 09:59:16 2006 @@ -1,5 +1,3 @@ -/* $Xorg: RdBitF.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/RdBitF.c,v 3.14 2004/10/23 15:29:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/RdBitF.c,v 3.15 2006/01/09 14:59:16 dawes Exp $ */ /* * This file contains miscellaneous utility routines and is not part of the Index: xc/lib/Xmu/ScrOfWin.c diff -u xc/lib/Xmu/ScrOfWin.c:1.7 xc/lib/Xmu/ScrOfWin.c:1.8 --- xc/lib/Xmu/ScrOfWin.c:1.7 Fri Dec 14 14:55:48 2001 +++ xc/lib/Xmu/ScrOfWin.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ScrOfWin.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ScrOfWin.c,v 1.7 2001/12/14 19:55:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ScrOfWin.c,v 1.8 2006/01/09 14:59:17 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium Index: xc/lib/Xmu/ShapeWidg.c diff -u xc/lib/Xmu/ShapeWidg.c:1.8 xc/lib/Xmu/ShapeWidg.c:1.9 --- xc/lib/Xmu/ShapeWidg.c:1.8 Fri Dec 14 14:55:48 2001 +++ xc/lib/Xmu/ShapeWidg.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ShapeWidg.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/ShapeWidg.c,v 1.8 2001/12/14 19:55:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/ShapeWidg.c,v 1.9 2006/01/09 14:59:17 dawes Exp $ */ #include #include Index: xc/lib/Xmu/StdCmap.c diff -u xc/lib/Xmu/StdCmap.c:1.6 xc/lib/Xmu/StdCmap.c:1.7 --- xc/lib/Xmu/StdCmap.c:1.6 Fri Dec 14 14:55:48 2001 +++ xc/lib/Xmu/StdCmap.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StdCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.6 2001/12/14 19:55:48 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StdCmap.c,v 1.7 2006/01/09 14:59:17 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium Index: xc/lib/Xmu/StdCmap.h diff -u xc/lib/Xmu/StdCmap.h:1.9 xc/lib/Xmu/StdCmap.h:1.10 --- xc/lib/Xmu/StdCmap.h:1.9 Fri Dec 14 14:55:49 2001 +++ xc/lib/Xmu/StdCmap.h Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StdCmap.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StdCmap.h,v 1.9 2001/12/14 19:55:49 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StdCmap.h,v 1.10 2006/01/09 14:59:17 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/StdSel.h diff -u xc/lib/Xmu/StdSel.h:1.8 xc/lib/Xmu/StdSel.h:1.9 --- xc/lib/Xmu/StdSel.h:1.8 Fri Dec 14 14:55:50 2001 +++ xc/lib/Xmu/StdSel.h Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StdSel.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StdSel.h,v 1.8 2001/12/14 19:55:50 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StdSel.h,v 1.9 2006/01/09 14:59:17 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/StrToBS.c diff -u xc/lib/Xmu/StrToBS.c:1.7 xc/lib/Xmu/StrToBS.c:1.8 --- xc/lib/Xmu/StrToBS.c:1.7 Fri Dec 14 14:55:50 2001 +++ xc/lib/Xmu/StrToBS.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrToBS.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.7 2001/12/14 19:55:50 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToBS.c,v 1.8 2006/01/09 14:59:17 dawes Exp $ */ #include #include "Converters.h" Index: xc/lib/Xmu/StrToBmap.c diff -u xc/lib/Xmu/StrToBmap.c:1.6 xc/lib/Xmu/StrToBmap.c:1.7 --- xc/lib/Xmu/StrToBmap.c:1.6 Fri Dec 14 14:55:50 2001 +++ xc/lib/Xmu/StrToBmap.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrToBmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group @@ -49,7 +47,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.6 2001/12/14 19:55:50 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToBmap.c,v 1.7 2006/01/09 14:59:17 dawes Exp $ */ #include #include Index: xc/lib/Xmu/StrToCurs.c diff -u xc/lib/Xmu/StrToCurs.c:1.13 xc/lib/Xmu/StrToCurs.c:1.14 --- xc/lib/Xmu/StrToCurs.c:1.13 Sat Oct 23 11:29:26 2004 +++ xc/lib/Xmu/StrToCurs.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrToCurs.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1987, 1988, 1998 The Open Group @@ -50,7 +48,7 @@ ******************************************************************/ -/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.13 2004/10/23 15:29:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToCurs.c,v 1.14 2006/01/09 14:59:17 dawes Exp $ */ #include #include Index: xc/lib/Xmu/StrToGrav.c diff -u xc/lib/Xmu/StrToGrav.c:1.7 xc/lib/Xmu/StrToGrav.c:1.8 --- xc/lib/Xmu/StrToGrav.c:1.7 Fri Dec 14 14:55:52 2001 +++ xc/lib/Xmu/StrToGrav.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrToGrav.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToGrav.c,v 1.7 2001/12/14 19:55:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToGrav.c,v 1.8 2006/01/09 14:59:17 dawes Exp $ */ #include #include Index: xc/lib/Xmu/StrToJust.c diff -u xc/lib/Xmu/StrToJust.c:1.7 xc/lib/Xmu/StrToJust.c:1.8 --- xc/lib/Xmu/StrToJust.c:1.7 Fri Dec 14 14:55:52 2001 +++ xc/lib/Xmu/StrToJust.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrToJust.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.7 2001/12/14 19:55:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToJust.c,v 1.8 2006/01/09 14:59:17 dawes Exp $ */ #include #include Index: xc/lib/Xmu/StrToLong.c diff -u xc/lib/Xmu/StrToLong.c:1.9 xc/lib/Xmu/StrToLong.c:1.10 --- xc/lib/Xmu/StrToLong.c:1.9 Fri Dec 14 14:55:52 2001 +++ xc/lib/Xmu/StrToLong.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrToLong.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToLong.c,v 1.9 2001/12/14 19:55:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToLong.c,v 1.10 2006/01/09 14:59:17 dawes Exp $ */ #include #include Index: xc/lib/Xmu/StrToOrnt.c diff -u xc/lib/Xmu/StrToOrnt.c:1.7 xc/lib/Xmu/StrToOrnt.c:1.8 --- xc/lib/Xmu/StrToOrnt.c:1.7 Fri Dec 14 14:55:52 2001 +++ xc/lib/Xmu/StrToOrnt.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrToOrnt.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.7 2001/12/14 19:55:52 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToOrnt.c,v 1.8 2006/01/09 14:59:17 dawes Exp $ */ #include #include Index: xc/lib/Xmu/StrToShap.c diff -u xc/lib/Xmu/StrToShap.c:1.7 xc/lib/Xmu/StrToShap.c:1.8 --- xc/lib/Xmu/StrToShap.c:1.7 Fri Dec 14 14:55:53 2001 +++ xc/lib/Xmu/StrToShap.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrToShap.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToShap.c,v 1.7 2001/12/14 19:55:53 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToShap.c,v 1.8 2006/01/09 14:59:17 dawes Exp $ */ #include #include Index: xc/lib/Xmu/StrToWidg.c diff -u xc/lib/Xmu/StrToWidg.c:1.8 xc/lib/Xmu/StrToWidg.c:1.9 --- xc/lib/Xmu/StrToWidg.c:1.8 Sat Oct 23 11:29:26 2004 +++ xc/lib/Xmu/StrToWidg.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrToWidg.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/StrToWidg.c,v 1.8 2004/10/23 15:29:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/StrToWidg.c,v 1.9 2006/01/09 14:59:17 dawes Exp $ */ /* * XmuCvtStringToWidget Index: xc/lib/Xmu/SysUtil.h diff -u xc/lib/Xmu/SysUtil.h:1.10 xc/lib/Xmu/SysUtil.h:1.11 --- xc/lib/Xmu/SysUtil.h:1.10 Thu Jan 22 22:57:58 2004 +++ xc/lib/Xmu/SysUtil.h Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: SysUtil.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/SysUtil.h,v 1.10 2004/01/23 03:57:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/SysUtil.h,v 1.11 2006/01/09 14:59:17 dawes Exp $ */ #ifndef _SYSUTIL_H_ #define _SYSUTIL_H_ Index: xc/lib/Xmu/UpdMapHint.c diff -u xc/lib/Xmu/UpdMapHint.c:1.7 xc/lib/Xmu/UpdMapHint.c:1.8 --- xc/lib/Xmu/UpdMapHint.c:1.7 Fri Dec 14 14:55:55 2001 +++ xc/lib/Xmu/UpdMapHint.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: UpdMapHint.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/UpdMapHint.c,v 1.7 2001/12/14 19:55:55 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/UpdMapHint.c,v 1.8 2006/01/09 14:59:17 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium Index: xc/lib/Xmu/VisCmap.c diff -u xc/lib/Xmu/VisCmap.c:1.7 xc/lib/Xmu/VisCmap.c:1.8 --- xc/lib/Xmu/VisCmap.c:1.7 Fri Dec 14 14:55:56 2001 +++ xc/lib/Xmu/VisCmap.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: VisCmap.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/VisCmap.c,v 1.7 2001/12/14 19:55:56 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/VisCmap.c,v 1.8 2006/01/09 14:59:17 dawes Exp $ */ /* * Author: Donna Converse, MIT X Consortium Index: xc/lib/Xmu/WhitePoint.h diff -u xc/lib/Xmu/WhitePoint.h:1.2 xc/lib/Xmu/WhitePoint.h:1.3 --- xc/lib/Xmu/WhitePoint.h:1.2 Fri Dec 14 14:55:57 2001 +++ xc/lib/Xmu/WhitePoint.h Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: WhitePoint.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1991, 1994, 1998 The Open Group Index: xc/lib/Xmu/WidgetNode.c diff -u xc/lib/Xmu/WidgetNode.c:1.13 xc/lib/Xmu/WidgetNode.c:1.14 --- xc/lib/Xmu/WidgetNode.c:1.13 Tue Sep 24 14:55:21 2002 +++ xc/lib/Xmu/WidgetNode.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: WidgetNode.c,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.13 2002/09/24 18:55:21 alanh Exp $ */ +/* $XFree86: xc/lib/Xmu/WidgetNode.c,v 1.14 2006/01/09 14:59:17 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium Index: xc/lib/Xmu/WidgetNode.h diff -u xc/lib/Xmu/WidgetNode.h:1.6 xc/lib/Xmu/WidgetNode.h:1.7 --- xc/lib/Xmu/WidgetNode.h:1.6 Fri Dec 14 14:55:58 2001 +++ xc/lib/Xmu/WidgetNode.h Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: WidgetNode.h,v 1.5 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WidgetNode.h,v 1.6 2001/12/14 19:55:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/WidgetNode.h,v 1.7 2006/01/09 14:59:17 dawes Exp $ */ /* * Author: Jim Fulton, MIT X Consortium Index: xc/lib/Xmu/WinUtil.h diff -u xc/lib/Xmu/WinUtil.h:1.7 xc/lib/Xmu/WinUtil.h:1.8 --- xc/lib/Xmu/WinUtil.h:1.7 Fri Dec 14 14:55:58 2001 +++ xc/lib/Xmu/WinUtil.h Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: WinUtil.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/WinUtil.h,v 1.7 2001/12/14 19:55:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/WinUtil.h,v 1.8 2006/01/09 14:59:17 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/Xct.c diff -u xc/lib/Xmu/Xct.c:1.9 xc/lib/Xmu/Xct.c:1.10 --- xc/lib/Xmu/Xct.c:1.9 Fri Dec 14 14:55:58 2001 +++ xc/lib/Xmu/Xct.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xct.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Xct.c,v 1.9 2001/12/14 19:55:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Xct.c,v 1.10 2006/01/09 14:59:17 dawes Exp $ */ #include #include "Xct.h" Index: xc/lib/Xmu/Xct.h diff -u xc/lib/Xmu/Xct.h:1.7 xc/lib/Xmu/Xct.h:1.8 --- xc/lib/Xmu/Xct.h:1.7 Fri Dec 14 14:55:59 2001 +++ xc/lib/Xmu/Xct.h Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xct.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Xct.h,v 1.7 2001/12/14 19:55:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Xct.h,v 1.8 2006/01/09 14:59:17 dawes Exp $ */ #ifndef _Xct_h #define _Xct_h Index: xc/lib/Xmu/Xmu.h diff -u xc/lib/Xmu/Xmu.h:1.10 xc/lib/Xmu/Xmu.h:1.11 --- xc/lib/Xmu/Xmu.h:1.10 Thu Jan 22 22:57:58 2004 +++ xc/lib/Xmu/Xmu.h Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Xmu.h,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1988, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/Xmu.h,v 1.10 2004/01/23 03:57:58 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/Xmu.h,v 1.11 2006/01/09 14:59:17 dawes Exp $ */ /* * The interfaces described by this header file are for miscellaneous utilities Index: xc/lib/Xmu/sharedlib.c diff -u xc/lib/Xmu/sharedlib.c:3.5 xc/lib/Xmu/sharedlib.c:3.6 --- xc/lib/Xmu/sharedlib.c:3.5 Fri Dec 14 14:56:00 2001 +++ xc/lib/Xmu/sharedlib.c Mon Jan 9 09:59:17 2006 @@ -1,5 +1,3 @@ -/* $Xorg: sharedlib.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xmu/sharedlib.c,v 3.5 2001/12/14 19:56:00 dawes Exp $ */ +/* $XFree86: xc/lib/Xmu/sharedlib.c,v 3.6 2006/01/09 14:59:17 dawes Exp $ */ #if defined(SUNSHLIB) && !defined(SHAREDCODE) Index: xc/lib/Xp/Imakefile diff -u xc/lib/Xp/Imakefile:1.5 xc/lib/Xp/Imakefile:1.6 --- xc/lib/Xp/Imakefile:1.5 Sun Apr 4 22:33:12 2004 +++ xc/lib/Xp/Imakefile Mon Jan 9 09:59:19 2006 @@ -1,4 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:05 cpqbld Exp $ /****************************************************************************** ****************************************************************************** ** @@ -36,7 +35,7 @@ ** ****************************************************************************** *****************************************************************************/ -XCOMM $XFree86: xc/lib/Xp/Imakefile,v 1.5 2004/04/05 02:33:12 dawes Exp $ +XCOMM $XFree86: xc/lib/Xp/Imakefile,v 1.6 2006/01/09 14:59:19 dawes Exp $ #define DoNormalLib NormalLibXp Index: xc/lib/Xp/Xp-def.cpp diff -u xc/lib/Xp/Xp-def.cpp:1.3 xc/lib/Xp/Xp-def.cpp:1.4 --- xc/lib/Xp/Xp-def.cpp:1.3 Wed Jan 17 14:43:01 2001 +++ xc/lib/Xp/Xp-def.cpp Mon Jan 9 09:59:19 2006 @@ -38,5 +38,4 @@ XpStartDoc XpStartJob XpStartPage -/* $Xorg: Xp-def.cpp,v 1.3 2000/08/17 19:46:05 cpqbld Exp $ */ -/* $XFree86: xc/lib/Xp/Xp-def.cpp,v 1.3 2001/01/17 19:43:01 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/Xp-def.cpp,v 1.4 2006/01/09 14:59:19 dawes Exp $ */ Index: xc/lib/Xp/XpAttr.c diff -u xc/lib/Xp/XpAttr.c:1.7 xc/lib/Xp/XpAttr.c:1.8 --- xc/lib/Xp/XpAttr.c:1.7 Tue Oct 15 20:37:31 2002 +++ xc/lib/Xp/XpAttr.c Mon Jan 9 09:59:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XpAttr.c,v 1.4 2000/08/17 19:46:05 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpAttr.c,v 1.7 2002/10/16 00:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpAttr.c,v 1.8 2006/01/09 14:59:19 dawes Exp $ */ #define NEED_REPLIES Index: xc/lib/Xp/XpContext.c diff -u xc/lib/Xp/XpContext.c:1.7 xc/lib/Xp/XpContext.c:1.8 --- xc/lib/Xp/XpContext.c:1.7 Tue Oct 15 20:37:31 2002 +++ xc/lib/Xp/XpContext.c Mon Jan 9 09:59:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XpContext.c,v 1.4 2000/08/17 19:46:05 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpContext.c,v 1.7 2002/10/16 00:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpContext.c,v 1.8 2006/01/09 14:59:19 dawes Exp $ */ #define NEED_REPLIES Index: xc/lib/Xp/XpDoc.c diff -u xc/lib/Xp/XpDoc.c:1.4 xc/lib/Xp/XpDoc.c:1.5 --- xc/lib/Xp/XpDoc.c:1.4 Tue Oct 15 20:37:31 2002 +++ xc/lib/Xp/XpDoc.c Tue Mar 22 22:11:25 2005 @@ -1,4 +1,3 @@ -/* $Xorg: XpDoc.c,v 1.3 2000/08/17 19:46:06 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpDoc.c,v 1.4 2002/10/16 00:37:31 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpDoc.c,v 1.5 2005/03/23 03:11:25 dawes Exp $ */ #include #include @@ -45,7 +44,8 @@ XPContext context; } _XpDiscardDocRec; -static Bool _XpDiscardDoc(Display *dpy, XEvent *event, XPointer arg) +static Bool +_XpDiscardDoc(Display *dpy, XEvent *event, XPointer arg) { _XpDiscardDocRec *disrec = (_XpDiscardDocRec *) arg; Index: xc/lib/Xp/XpExtUtil.c diff -u xc/lib/Xp/XpExtUtil.c:1.9 xc/lib/Xp/XpExtUtil.c:1.10 --- xc/lib/Xp/XpExtUtil.c:1.9 Sat Oct 23 11:29:26 2004 +++ xc/lib/Xp/XpExtUtil.c Tue Mar 22 22:11:25 2005 @@ -1,4 +1,3 @@ -/* $Xorg: XpExtUtil.c,v 1.3 2000/08/17 19:46:06 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpExtUtil.c,v 1.9 2004/10/23 15:29:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpExtUtil.c,v 1.10 2005/03/23 03:11:25 dawes Exp $ */ #define NEED_EVENTS #define NEED_REPLIES @@ -51,26 +50,29 @@ static XExtensionInfo *xp_info = &xp_info_data; static /* const */ char *xp_extension_name = XP_PRINTNAME; -static int XpClose(); -static char *XpError(); -static Bool XpWireToEvent(); -static Status XpEventToWire(); +static int XpClose(Display *dpy, XExtCodes *codes); +static XEXT_ERROR_STRING_PROTO(XpError); +static Bool XpWireToEvent(Display *dpy, XEvent *re, xEvent *event); +static Status XpEventToWire(Display *dpy, XEvent *re, xEvent **event, + int *count); #define XpCheckExtension(dpy,i,val) \ XextCheckExtension (dpy, i, xp_extension_name, val) +typedef Status (*eventToWireProcPtr)(Display *, XEvent *, xEvent *); + static /* const */ XExtensionHooks xpprint_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ - NULL, /* flush_gc */ - NULL, /* free_gc */ - NULL, /* create_font */ - NULL, /* free_font */ - XpClose, /* close_display */ - XpWireToEvent, /* wire_to_event */ - XpEventToWire, /* event_to_wire */ - NULL, /* error */ - XpError, /* error_string */ + NULL, /* create_gc */ + NULL, /* copy_gc */ + NULL, /* flush_gc */ + NULL, /* free_gc */ + NULL, /* create_font */ + NULL, /* free_font */ + XpClose, /* close_display */ + XpWireToEvent, /* wire_to_event */ + (eventToWireProcPtr)XpEventToWire, /* event_to_wire */ + NULL, /* error */ + XpError, /* error_string */ }; typedef struct { @@ -114,9 +116,8 @@ * xpprintversions[version_index] shows which version *this* library is. */ -int XpCheckExtInitUnlocked(dpy, version_index) - register Display *dpy; - register int version_index; +int +XpCheckExtInitUnlocked(Display *dpy, int version_index) { XExtDisplayInfo *info = xp_find_display (dpy); @@ -172,9 +173,8 @@ return (0); } -int XpCheckExtInit(dpy, version_index) - register Display *dpy; - register int version_index; +int +XpCheckExtInit(Display *dpy, int version_index) { int retval; @@ -194,9 +194,7 @@ */ static int -XpClose (dpy, codes) - Display *dpy; - XExtCodes *codes; +XpClose(Display *dpy, XExtCodes *codes) { XExtDisplayInfo *info = xp_find_display (dpy); @@ -224,10 +222,7 @@ * Reformat a wire event into an XEvent structure of the right type. */ static Bool -XpWireToEvent (dpy, re, event) - Display *dpy; - XEvent *re; - xEvent *event; +XpWireToEvent(Display *dpy, XEvent *re, xEvent *event) { XExtDisplayInfo *info = xp_find_display (dpy); @@ -285,11 +280,7 @@ * Reformat an XEvent into a wire event. */ static Status -XpEventToWire(dpy, re, event, count) - register Display *dpy; /* pointer to display structure */ - register XEvent *re; /* pointer to client event */ - register xEvent **event; /* wire protocol event */ - register int *count; +XpEventToWire(Display *dpy, XEvent *re, xEvent **event, int *count) { XExtDisplayInfo *info = (XExtDisplayInfo *) xp_find_display (dpy); Index: xc/lib/Xp/XpExtUtil.h diff -u xc/lib/Xp/XpExtUtil.h:1.4 xc/lib/Xp/XpExtUtil.h:1.5 --- xc/lib/Xp/XpExtUtil.h:1.4 Mon Nov 17 17:20:22 2003 +++ xc/lib/Xp/XpExtUtil.h Tue Mar 22 22:11:25 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xp/XpExtUtil.h,v 1.4 2003/11/17 22:20:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpExtUtil.h,v 1.5 2005/03/23 03:11:25 dawes Exp $ */ /* * Copyright (C) 2000 The XFree86 Project, Inc. All Rights Reserved. * @@ -38,4 +38,7 @@ int /* version_index */ ); +extern int XpCheckExtInitUnlocked(Display *dpy, int version_index); + + #endif /* _XPEXTUTIL_H */ Index: xc/lib/Xp/XpExtVer.c diff -u xc/lib/Xp/XpExtVer.c:1.6 xc/lib/Xp/XpExtVer.c:1.7 --- xc/lib/Xp/XpExtVer.c:1.6 Fri Nov 21 00:13:21 2003 +++ xc/lib/Xp/XpExtVer.c Tue Mar 22 22:11:25 2005 @@ -1,4 +1,3 @@ -/* $Xorg: XpExtVer.c,v 1.4 2000/08/17 19:46:07 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpExtVer.c,v 1.6 2003/11/21 05:13:21 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpExtVer.c,v 1.7 2005/03/23 03:11:25 dawes Exp $ */ #define NEED_REPLIES @@ -61,13 +60,6 @@ } } -/* Prototype for |XpCheckExtInitUnlocked()| - * See XpExtUtil.c - same as |XpCheckExtInit()| but does not obtain the Xlib global lock */ -extern int XpCheckExtInitUnlocked( - register Display *dpy, - register int version_index -); - Status XpQueryVersion ( Display *dpy, Index: xc/lib/Xp/XpGetData.c diff -u xc/lib/Xp/XpGetData.c:1.5 xc/lib/Xp/XpGetData.c:1.7 --- xc/lib/Xp/XpGetData.c:1.5 Tue Oct 15 20:37:32 2002 +++ xc/lib/Xp/XpGetData.c Mon Jan 9 09:59:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XpGetData.c,v 1.4 2000/08/17 19:46:07 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpGetData.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpGetData.c,v 1.7 2006/01/09 14:59:19 dawes Exp $ */ #define NEED_REPLIES @@ -63,12 +62,8 @@ * XpGetDocumentData(). */ static Bool -_XpGetDocDataHandler(dpy, rep, buf, len, adata) - register Display *dpy; - register xReply *rep; - char *buf; - int len; - XPointer adata; +_XpGetDocDataHandler(Display *dpy, xReply *rep, char *buf, int len, + XPointer adata) { register _XpState *state; xPrintGetDocumentDataReply replbuf; Index: xc/lib/Xp/XpImageRes.c diff -u xc/lib/Xp/XpImageRes.c:1.5 xc/lib/Xp/XpImageRes.c:1.6 --- xc/lib/Xp/XpImageRes.c:1.5 Tue Oct 15 20:37:32 2002 +++ xc/lib/Xp/XpImageRes.c Mon Jan 9 09:59:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XpImageRes.c,v 1.4 2000/08/17 19:46:07 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpImageRes.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpImageRes.c,v 1.6 2006/01/09 14:59:19 dawes Exp $ */ #define NEED_REPLIES Index: xc/lib/Xp/XpInput.c diff -u xc/lib/Xp/XpInput.c:1.5 xc/lib/Xp/XpInput.c:1.6 --- xc/lib/Xp/XpInput.c:1.5 Tue Oct 15 20:37:32 2002 +++ xc/lib/Xp/XpInput.c Mon Jan 9 09:59:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XpInput.c,v 1.4 2000/08/17 19:46:07 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpInput.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpInput.c,v 1.6 2006/01/09 14:59:19 dawes Exp $ */ #define NEED_REPLIES Index: xc/lib/Xp/XpJob.c diff -u xc/lib/Xp/XpJob.c:1.6 xc/lib/Xp/XpJob.c:1.7 --- xc/lib/Xp/XpJob.c:1.6 Tue Oct 15 20:37:32 2002 +++ xc/lib/Xp/XpJob.c Tue Mar 22 22:11:25 2005 @@ -1,4 +1,3 @@ -/* $Xorg: XpJob.c,v 1.4 2000/08/17 19:46:07 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpJob.c,v 1.6 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpJob.c,v 1.7 2005/03/23 03:11:25 dawes Exp $ */ #if defined(sun) && defined(i386) && defined(SVR4) && !defined(__EXTENSIONS__) #define __EXTENSIONS__ @@ -58,7 +57,8 @@ XPContext context; } _XpDiscardJobRec; -static Bool _XpDiscardJob(Display *dpy, XEvent *event, XPointer arg) +static Bool +_XpDiscardJob(Display *dpy, XEvent *event, XPointer arg) { _XpDiscardJobRec *disrec = (_XpDiscardJobRec *) arg; Index: xc/lib/Xp/XpLocale.c diff -u xc/lib/Xp/XpLocale.c:1.5 xc/lib/Xp/XpLocale.c:1.6 --- xc/lib/Xp/XpLocale.c:1.5 Tue Oct 15 20:37:32 2002 +++ xc/lib/Xp/XpLocale.c Tue Mar 22 22:11:25 2005 @@ -1,4 +1,3 @@ -/* $Xorg: XpLocale.c,v 1.3 2000/08/17 19:46:07 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,11 +33,12 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpLocale.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpLocale.c,v 1.6 2005/03/23 03:11:25 dawes Exp $ */ #include #include #include "XpExtUtil.h" +#include "Xpint.h" #include @@ -50,17 +50,14 @@ char *_xp_hinter_desc = NULL; int _xp_hinter_init = 1; /* need to init */ - -extern char *_xpstrdup(); - - /****************************************************************************** * * THE DEFAULT LOCALE HINTER * * Make changes here only. */ -static char *_XpLocaleHinter() +static char * +_XpLocaleHinter(void) { #ifdef hpux char lbuf[ LC_BUFSIZ ]; @@ -177,7 +174,8 @@ * * If neither a hint or description exists, a NULL is returned. */ -char *XpGetLocaleNetString() +char * +XpGetLocaleNetString() { XPHinterProc locale_hinter; Index: xc/lib/Xp/XpNotifyPdm.c diff -u xc/lib/Xp/XpNotifyPdm.c:1.8 xc/lib/Xp/XpNotifyPdm.c:1.9 --- xc/lib/Xp/XpNotifyPdm.c:1.8 Mon Dec 22 12:48:04 2003 +++ xc/lib/Xp/XpNotifyPdm.c Tue Mar 22 22:11:25 2005 @@ -1,4 +1,3 @@ -/* $Xorg: XpNotifyPdm.c,v 1.4 2000/08/17 19:46:07 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -41,7 +40,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpNotifyPdm.c,v 1.8 2003/12/22 17:48:04 tsi Exp $ */ +/* $XFree86: xc/lib/Xp/XpNotifyPdm.c,v 1.9 2005/03/23 03:11:25 dawes Exp $ */ #include #include @@ -50,6 +49,7 @@ #include #include #include +#include "Xpint.h" /* * Alternate selection environment variables. @@ -65,7 +65,8 @@ /* * str_dup using Xmalloc */ -char *_xpstrdup(char * str) +char * +_xpstrdup(char * str) { int len; char *newstr; @@ -409,7 +410,8 @@ return( (Status) 1 ); } -Status XpSendAuth( Display *display, Window window ) +Status +XpSendAuth( Display *display, Window window ) { FILE *auth_file; Index: xc/lib/Xp/XpPage.c diff -u xc/lib/Xp/XpPage.c:1.5 xc/lib/Xp/XpPage.c:1.6 --- xc/lib/Xp/XpPage.c:1.5 Tue Oct 15 20:37:32 2002 +++ xc/lib/Xp/XpPage.c Tue Mar 22 22:11:26 2005 @@ -1,4 +1,3 @@ -/* $Xorg: XpPage.c,v 1.4 2001/03/06 13:59:02 pookie Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpPage.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpPage.c,v 1.6 2005/03/23 03:11:26 dawes Exp $ */ #include #include @@ -46,7 +45,8 @@ XPContext context; } _XpDiscardPageRec; -static Bool _XpDiscardPage(Display *dpy, XEvent *event, XPointer arg) +static Bool +_XpDiscardPage(Display *dpy, XEvent *event, XPointer arg) { _XpDiscardPageRec *disrec = (_XpDiscardPageRec *) arg; Index: xc/lib/Xp/XpPageDim.c diff -u xc/lib/Xp/XpPageDim.c:1.5 xc/lib/Xp/XpPageDim.c:1.6 --- xc/lib/Xp/XpPageDim.c:1.5 Tue Oct 15 20:37:32 2002 +++ xc/lib/Xp/XpPageDim.c Mon Jan 9 09:59:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XpPageDim.c,v 1.4 2000/08/17 19:46:07 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpPageDim.c,v 1.5 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpPageDim.c,v 1.6 2006/01/09 14:59:19 dawes Exp $ */ #define NEED_REPLIES Index: xc/lib/Xp/XpPrinter.c diff -u xc/lib/Xp/XpPrinter.c:1.9 xc/lib/Xp/XpPrinter.c:1.10 --- xc/lib/Xp/XpPrinter.c:1.9 Tue Oct 15 20:37:32 2002 +++ xc/lib/Xp/XpPrinter.c Mon Jan 9 09:59:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XpPrinter.c,v 1.4 2000/08/17 19:46:07 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpPrinter.c,v 1.9 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpPrinter.c,v 1.10 2006/01/09 14:59:19 dawes Exp $ */ #define NEED_REPLIES Index: xc/lib/Xp/XpPutData.c diff -u xc/lib/Xp/XpPutData.c:1.4 xc/lib/Xp/XpPutData.c:1.5 --- xc/lib/Xp/XpPutData.c:1.4 Tue Oct 15 20:37:32 2002 +++ xc/lib/Xp/XpPutData.c Mon Jan 9 09:59:19 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XpPutData.c,v 1.3 2000/08/17 19:46:07 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpPutData.c,v 1.4 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpPutData.c,v 1.5 2006/01/09 14:59:19 dawes Exp $ */ #include #include Index: xc/lib/Xp/XpScreens.c diff -u xc/lib/Xp/XpScreens.c:1.6 xc/lib/Xp/XpScreens.c:1.7 --- xc/lib/Xp/XpScreens.c:1.6 Tue Oct 15 20:37:32 2002 +++ xc/lib/Xp/XpScreens.c Mon Jan 9 09:59:20 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XpScreens.c,v 1.5 2000/08/17 19:46:08 cpqbld Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -34,7 +33,7 @@ ** ****************************************************************************** *****************************************************************************/ -/* $XFree86: xc/lib/Xp/XpScreens.c,v 1.6 2002/10/16 00:37:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xp/XpScreens.c,v 1.7 2006/01/09 14:59:20 dawes Exp $ */ #define NEED_REPLIES Index: xc/lib/Xp/Xpint.h diff -u /dev/null xc/lib/Xp/Xpint.h:1.1 --- /dev/null Tue May 9 21:55:19 2006 +++ xc/lib/Xp/Xpint.h Tue Mar 22 22:11:26 2005 @@ -0,0 +1,4 @@ +/* $XFree86: xc/lib/Xp/Xpint.h,v 1.1 2005/03/23 03:11:26 dawes Exp $ */ + +extern char *_xpstrdup(char *str); + Index: xc/lib/Xrandr/Imakefile diff -u xc/lib/Xrandr/Imakefile:1.2 xc/lib/Xrandr/Imakefile:1.3 --- xc/lib/Xrandr/Imakefile:1.2 Wed Oct 2 12:55:41 2002 +++ xc/lib/Xrandr/Imakefile Fri Oct 14 11:16:00 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xrandr/Imakefile,v 1.2 2002/10/02 16:55:41 keithp Exp $ +XCOMM $XFree86: xc/lib/Xrandr/Imakefile,v 1.3 2005/10/14 15:16:00 tsi Exp $ #define DoNormalLib NormalLibXrandr @@ -21,7 +21,6 @@ #endif DEFINES = $(ALLOC_DEFINES) - INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) SRCS = Xrandr.c OBJS = Xrandr.o LINTLIBS = $(LINTXLIB) Index: xc/lib/Xrandr/Xrandrint.h diff -u xc/lib/Xrandr/Xrandrint.h:1.4 xc/lib/Xrandr/Xrandrint.h:1.5 --- xc/lib/Xrandr/Xrandrint.h:1.4 Mon Oct 14 14:01:40 2002 +++ xc/lib/Xrandr/Xrandrint.h Fri Oct 14 11:16:00 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xrandr/Xrandrint.h,v 1.4 2002/10/14 18:01:40 keithp Exp $ + * $XFree86: xc/lib/Xrandr/Xrandrint.h,v 1.5 2005/10/14 15:16:00 tsi Exp $ * * * Copyright © 2000, Compaq Computer Corporation, @@ -32,11 +32,11 @@ #define NEED_REPLIES #include #include -#include "Xext.h" /* in ../include */ -#include "extutil.h" /* in ../include */ -#include "Xrandr.h" -#include "randr.h" -#include "randrproto.h" +#include +#include +#include +#include +#include extern XExtensionInfo XrandrExtensionInfo; extern char XrandrExtensionName[]; Index: xc/lib/Xrandr/test.c diff -u xc/lib/Xrandr/test.c:1.2 xc/lib/Xrandr/test.c:1.3 --- xc/lib/Xrandr/test.c:1.2 Mon Aug 6 17:46:03 2001 +++ xc/lib/Xrandr/test.c Fri Oct 14 11:16:00 2005 @@ -1,8 +1,8 @@ -/* $XFree86: xc/lib/Xrandr/test.c,v 1.2 2001/08/06 21:46:03 dawes Exp $ */ +/* $XFree86: xc/lib/Xrandr/test.c,v 1.3 2005/10/14 15:16:00 tsi Exp $ */ #include #include -#include "Xrandr.h" +#include main (int argc, char **argv) Index: xc/lib/Xrender/Imakefile diff -u xc/lib/Xrender/Imakefile:1.12 xc/lib/Xrender/Imakefile:1.13 --- xc/lib/Xrender/Imakefile:1.12 Sun Apr 4 22:33:13 2004 +++ xc/lib/Xrender/Imakefile Fri Oct 14 11:16:00 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/Xrender/Imakefile,v 1.12 2004/04/05 02:33:13 dawes Exp $ +XCOMM $XFree86: xc/lib/Xrender/Imakefile,v 1.13 2005/10/14 15:16:00 tsi Exp $ #ifdef UseInstalled @@ -99,9 +99,9 @@ DEFINES = $(ALLOC_DEFINES) #ifdef UseInstalled - INCLUDES = -I$(RENDERINCDIR) -I$(INCROOT)/X11 -I$(INCROOT)/X11/extensions + INCLUDES = -I$(RENDERINCDIR) #else - INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) + INCLUDES = -I$(XLIBSRC) #endif SRCS = Xrender.c \ Index: xc/lib/Xrender/Xrenderint.h diff -u xc/lib/Xrender/Xrenderint.h:1.4 xc/lib/Xrender/Xrenderint.h:1.5 --- xc/lib/Xrender/Xrenderint.h:1.4 Tue Nov 5 18:22:35 2002 +++ xc/lib/Xrender/Xrenderint.h Fri Oct 14 11:16:00 2005 @@ -1,5 +1,5 @@ /* - * $XFree86: xc/lib/Xrender/Xrenderint.h,v 1.4 2002/11/05 23:22:35 keithp Exp $ + * $XFree86: xc/lib/Xrender/Xrenderint.h,v 1.5 2005/10/14 15:16:00 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * @@ -30,10 +30,10 @@ #define NEED_REPLIES #include #include -#include "Xext.h" /* in ../include */ -#include "extutil.h" /* in ../include */ -#include "Xrender.h" -#include "renderproto.h" +#include +#include +#include +#include typedef struct { Visual *visual; Index: xc/lib/Xt/ActionHook.c diff -u xc/lib/Xt/ActionHook.c:1.4 xc/lib/Xt/ActionHook.c:1.5 --- xc/lib/Xt/ActionHook.c:1.4 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/ActionHook.c Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ActionHook.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /*LINTLIBRARY*/ /*********************************************************** @@ -60,7 +58,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/ActionHook.c,v 1.4 2004/05/05 00:07:02 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/ActionHook.c,v 1.5 2006/01/09 14:59:20 dawes Exp $ */ /* * Contains XtAppAddActionHook, XtRemoveActionHook Index: xc/lib/Xt/Alloc.c diff -u xc/lib/Xt/Alloc.c:1.11 xc/lib/Xt/Alloc.c:1.12 --- xc/lib/Xt/Alloc.c:1.11 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/Alloc.c Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Alloc.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Alloc.c,v 1.11 2004/05/05 00:07:02 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Alloc.c,v 1.12 2006/01/09 14:59:20 dawes Exp $ */ /* * X Toolkit Memory Allocation Routines Index: xc/lib/Xt/ArgList.c diff -u xc/lib/Xt/ArgList.c:1.6 xc/lib/Xt/ArgList.c:1.7 --- xc/lib/Xt/ArgList.c:1.6 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/ArgList.c Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ArgList.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xt/ArgList.c,v 1.7 2005/03/29 04:00:30 tsi Exp $ */ /*********************************************************** Index: xc/lib/Xt/Callback.c diff -u xc/lib/Xt/Callback.c:1.10 xc/lib/Xt/Callback.c:1.11 --- xc/lib/Xt/Callback.c:1.10 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/Callback.c Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Callback.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Callback.c,v 1.10 2004/05/05 00:07:02 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Callback.c,v 1.11 2006/01/09 14:59:20 dawes Exp $ */ #include "IntrinsicI.h" Index: xc/lib/Xt/CallbackI.h diff -u xc/lib/Xt/CallbackI.h:1.4 xc/lib/Xt/CallbackI.h:1.5 --- xc/lib/Xt/CallbackI.h:1.4 Fri Oct 24 11:47:35 2003 +++ xc/lib/Xt/CallbackI.h Mon Jan 9 09:59:20 2006 @@ -1,4 +1,3 @@ -/* $Xorg: CallbackI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -45,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/CallbackI.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */ +/* $XFree86: xc/lib/Xt/CallbackI.h,v 1.5 2006/01/09 14:59:20 dawes Exp $ */ /**************************************************************** * Index: xc/lib/Xt/ClickTime.c diff -u xc/lib/Xt/ClickTime.c:1.3 xc/lib/Xt/ClickTime.c:1.4 --- xc/lib/Xt/ClickTime.c:1.3 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/ClickTime.c Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ClickTime.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xt/ClickTime.c,v 1.4 2005/03/29 04:00:30 tsi Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Index: xc/lib/Xt/Composite.c diff -u xc/lib/Xt/Composite.c:1.7 xc/lib/Xt/Composite.c:1.8 --- xc/lib/Xt/Composite.c:1.7 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/Composite.c Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Composite.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Composite.c,v 1.7 2004/05/05 00:07:02 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Composite.c,v 1.8 2006/01/09 14:59:20 dawes Exp $ */ #define COMPOSITE #include "IntrinsicI.h" Index: xc/lib/Xt/Composite.h diff -u xc/lib/Xt/Composite.h:1.4 xc/lib/Xt/Composite.h:1.5 --- xc/lib/Xt/Composite.h:1.4 Fri Oct 24 11:47:35 2003 +++ xc/lib/Xt/Composite.h Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Composite.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Composite.h,v 1.4 2003/10/24 15:47:35 tsi Exp $ */ +/* $XFree86: xc/lib/Xt/Composite.h,v 1.5 2006/01/09 14:59:20 dawes Exp $ */ #ifndef _XtComposite_h #define _XtComposite_h Index: xc/lib/Xt/CompositeP.h diff -u xc/lib/Xt/CompositeP.h:1.2 xc/lib/Xt/CompositeP.h:1.3 --- xc/lib/Xt/CompositeP.h:1.2 Fri Dec 14 14:56:09 2001 +++ xc/lib/Xt/CompositeP.h Mon Jan 9 09:59:20 2006 @@ -1,5 +1,4 @@ -/* $Xorg: CompositeP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/Xt/CompositeP.h,v 1.3 2006/01/09 14:59:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xt/ConstrainP.h diff -u xc/lib/Xt/ConstrainP.h:1.2 xc/lib/Xt/ConstrainP.h:1.3 --- xc/lib/Xt/ConstrainP.h:1.2 Fri Dec 14 14:56:09 2001 +++ xc/lib/Xt/ConstrainP.h Mon Jan 9 09:59:20 2006 @@ -1,5 +1,4 @@ -/* $Xorg: ConstrainP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ -/* $oHeader: ConstrainP.h,v 1.2 88/08/18 15:54:15 asente Exp $ */ +/* $XFree86: xc/lib/Xt/ConstrainP.h,v 1.3 2006/01/09 14:59:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xt/Constraint.c diff -u xc/lib/Xt/Constraint.c:1.4 xc/lib/Xt/Constraint.c:1.5 --- xc/lib/Xt/Constraint.c:1.4 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/Constraint.c Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Constraint.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Constraint.c,v 1.4 2004/05/05 00:07:02 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Constraint.c,v 1.5 2006/01/09 14:59:20 dawes Exp $ */ #define CONSTRAINT #include "IntrinsicI.h" Index: xc/lib/Xt/Constraint.h diff -u xc/lib/Xt/Constraint.h:1.2 xc/lib/Xt/Constraint.h:1.3 --- xc/lib/Xt/Constraint.h:1.2 Fri Dec 14 14:56:09 2001 +++ xc/lib/Xt/Constraint.h Mon Jan 9 09:59:20 2006 @@ -1,5 +1,4 @@ -/* $Xorg: Constraint.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ -/* $oHeader: Constraint.h,v 1.2 88/08/18 15:54:18 asente Exp $ */ +/* $XFree86: xc/lib/Xt/Constraint.h,v 1.3 2006/01/09 14:59:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xt/Convert.c diff -u xc/lib/Xt/Convert.c:3.9 xc/lib/Xt/Convert.c:3.10 --- xc/lib/Xt/Convert.c:3.9 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/Convert.c Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Convert.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Convert.c,v 3.9 2004/05/05 00:07:02 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Convert.c,v 3.10 2006/01/09 14:59:20 dawes Exp $ */ /* Index: xc/lib/Xt/ConvertI.h diff -u xc/lib/Xt/ConvertI.h:1.4 xc/lib/Xt/ConvertI.h:1.5 --- xc/lib/Xt/ConvertI.h:1.4 Mon Apr 21 12:34:26 2003 +++ xc/lib/Xt/ConvertI.h Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ConvertI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.4 2003/04/21 16:34:26 herrb Exp $ */ +/* $XFree86: xc/lib/Xt/ConvertI.h,v 1.5 2006/01/09 14:59:20 dawes Exp $ */ /* Representation types */ Index: xc/lib/Xt/Converters.c diff -u xc/lib/Xt/Converters.c:3.16 xc/lib/Xt/Converters.c:3.18 --- xc/lib/Xt/Converters.c:3.16 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/Converters.c Wed Jan 11 19:58:02 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Converters.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Converters.c,v 3.16 2004/05/05 00:07:02 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Converters.c,v 3.18 2006/01/12 00:58:02 dawes Exp $ */ /* @@ -806,7 +804,7 @@ XrmValuePtr toVal, XtPointer *closure_ret) { - int ret; + int ret, nom, denom; float f, nan; #ifndef ISC /* On ISC this generates a core dump :-( at least with gs */ @@ -821,13 +819,20 @@ "String to Float conversion needs no extra arguments", (String *) NULL, (Cardinal *)NULL); - ret = sscanf (fromVal->addr, "%g", &f); - if (ret == 0) { - if (toVal->addr != NULL && toVal->size == sizeof nan) - *(float*)toVal->addr = nan; - XtDisplayStringConversionWarning (dpy, (char*) fromVal->addr, XtRFloat); - return False; - } + /* try fractional notation: nominator/denomimator, e.g. 1/2 */ + ret = sscanf (fromVal->addr, "%d/%d", &nom, &denom); + if (ret < 2 || denom == 0) { + /* try decimal notation: 3.141 */ + ret = sscanf (fromVal->addr, "%g", &f); + if (ret == 0) { + if (toVal->addr != NULL && toVal->size == sizeof nan) + *(float*)toVal->addr = nan; + XtDisplayStringConversionWarning (dpy, (char*) fromVal->addr, + XtRFloat); + return False; + } + } else + f = (float) nom / (float) denom; donestr(float, f, XtRFloat); } Index: xc/lib/Xt/Core.c diff -u xc/lib/Xt/Core.c:1.3 xc/lib/Xt/Core.c:1.4 --- xc/lib/Xt/Core.c:1.3 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/Core.c Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Core.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xt/Core.c,v 1.4 2005/03/29 04:00:30 tsi Exp $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Index: xc/lib/Xt/Core.h diff -u xc/lib/Xt/Core.h:1.2 xc/lib/Xt/Core.h:1.3 --- xc/lib/Xt/Core.h:1.2 Fri Dec 14 14:56:10 2001 +++ xc/lib/Xt/Core.h Mon Jan 9 09:59:20 2006 @@ -1,8 +1,4 @@ -/* -* $Xorg: Core.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ -* $oHeader: Core.h,v 1.2 88/08/18 15:54:32 asente Exp $ -*/ - +/* $XFree86: xc/lib/Xt/Core.h,v 1.3 2006/01/09 14:59:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xt/CoreP.h diff -u xc/lib/Xt/CoreP.h:1.2 xc/lib/Xt/CoreP.h:1.3 --- xc/lib/Xt/CoreP.h:1.2 Fri Dec 14 14:56:10 2001 +++ xc/lib/Xt/CoreP.h Mon Jan 9 09:59:20 2006 @@ -1,8 +1,4 @@ -/* -* $Xorg: CoreP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ -* $oHeader: CoreP.h,v 1.2 88/08/18 15:54:37 asente Exp $ -*/ - +/* $XFree86: xc/lib/Xt/CoreP.h,v 1.3 2006/01/09 14:59:20 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xt/Create.c diff -u xc/lib/Xt/Create.c:3.12 xc/lib/Xt/Create.c:3.13 --- xc/lib/Xt/Create.c:3.12 Tue May 4 20:07:02 2004 +++ xc/lib/Xt/Create.c Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Create.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Create.c,v 3.12 2004/05/05 00:07:02 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Create.c,v 3.13 2006/01/09 14:59:20 dawes Exp $ */ /* Index: xc/lib/Xt/Destroy.c diff -u xc/lib/Xt/Destroy.c:1.4 xc/lib/Xt/Destroy.c:1.5 --- xc/lib/Xt/Destroy.c:1.4 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Destroy.c Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Destroy.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Destroy.c,v 1.4 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Destroy.c,v 1.5 2006/01/09 14:59:20 dawes Exp $ */ #include "IntrinsicI.h" Index: xc/lib/Xt/Display.c diff -u xc/lib/Xt/Display.c:3.17 xc/lib/Xt/Display.c:3.18 --- xc/lib/Xt/Display.c:3.17 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Display.c Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Display.c,v 1.6 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Display.c,v 3.17 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Display.c,v 3.18 2006/01/09 14:59:20 dawes Exp $ */ /* Index: xc/lib/Xt/Error.c diff -u xc/lib/Xt/Error.c:3.15 xc/lib/Xt/Error.c:3.16 --- xc/lib/Xt/Error.c:3.15 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Error.c Mon Jan 9 09:59:20 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Error.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Error.c,v 3.15 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Error.c,v 3.16 2006/01/09 14:59:20 dawes Exp $ */ /* Index: xc/lib/Xt/Event.c diff -u xc/lib/Xt/Event.c:3.12 xc/lib/Xt/Event.c:3.13 --- xc/lib/Xt/Event.c:3.12 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Event.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Event.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Event.c,v 3.12 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Event.c,v 3.13 2006/01/09 14:59:21 dawes Exp $ */ #include "IntrinsicI.h" #include "Shell.h" Index: xc/lib/Xt/EventI.h diff -u xc/lib/Xt/EventI.h:1.5 xc/lib/Xt/EventI.h:1.6 --- xc/lib/Xt/EventI.h:1.5 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/EventI.h Mon Jan 9 09:59:21 2006 @@ -1,6 +1,3 @@ -/* $Xorg: EventI.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ -/* $oHeader: EventI.h,v 1.3 88/08/24 09:21:11 asente Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -47,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/EventI.h,v 1.5 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/EventI.h,v 1.6 2006/01/09 14:59:21 dawes Exp $ */ /* * Event.h - exported types and functions for toolkit event handler Index: xc/lib/Xt/EventUtil.c diff -u xc/lib/Xt/EventUtil.c:1.8 xc/lib/Xt/EventUtil.c:1.9 --- xc/lib/Xt/EventUtil.c:1.8 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/EventUtil.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: EventUtil.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ - /******************************************************** Copyright 1988 by Hewlett-Packard Company @@ -59,7 +57,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/EventUtil.c,v 1.8 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/EventUtil.c,v 1.9 2006/01/09 14:59:21 dawes Exp $ */ #include "IntrinsicI.h" #include "PassivGraI.h" Index: xc/lib/Xt/Functions.c diff -u xc/lib/Xt/Functions.c:1.6 xc/lib/Xt/Functions.c:1.8 --- xc/lib/Xt/Functions.c:1.6 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Functions.c Tue Jan 24 23:32:09 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Functions.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xt/Functions.c,v 1.8 2006/01/25 04:32:09 dawes Exp $ */ /* @@ -211,3 +211,85 @@ else return strcpy(__XtMalloc((unsigned)strlen(str) + 1), str); } + + +/* + * String manipulation functions + */ + +/* Allocates a new string. */ +char* XtNewStringEx(int encoding, char* string) +{ + size_t n; + char *p; + + if (string == NULL) + return NULL; + + if (encoding == XtTextEncodingChar2b) { + XChar2b *ptr; + + n = XtStringLengthEx(encoding, string) + sizeof(XChar2b); + ptr = (XChar2b*) XtMalloc(n); + if (ptr == NULL) + return NULL; + + p = (char*) memmove(ptr, string, n); + } else + p = XtNewString(string); + + return p; +} + +#define IS_CHAR(p, c) ((p)->byte1 == 0 && (p)->byte2 == c) +#define IS_NOT_CHAR(p, c) !IS_CHAR(p, c) +#define IS_NUL(p) IS_CHAR(p, 0) +#define IS_NOT_NUL(p) !IS_NUL(p) + +/* Returns an index of the character in the string, or NULL if not + * found. */ +char* XtCharIndexEx(int encoding, char* string, char c) +{ + char *p; + + if (string == NULL) + return NULL; + + if (encoding == XtTextEncodingChar2b) { + XChar2b *ptr = (XChar2b*) string; + + while (ptr != NULL && IS_NOT_NUL(ptr) && + IS_NOT_CHAR(ptr, c)) { + ptr++; + } + + if (ptr == NULL || IS_NUL(ptr)) + return NULL; + + p = (char*) ptr; + } else + p = index(string, c); + + return p; +} + +/* Returns a number of bytes in a string. */ +size_t XtStringLengthEx(int encoding, char* string) +{ + size_t n = 0; + + if (string == NULL) + return 0; + + if (encoding == XtTextEncodingChar2b) { + XChar2b *ptr = (XChar2b*) string; + + while (ptr != NULL && IS_NOT_NUL(ptr)) { + ptr++; + n += sizeof(XChar2b); + } + } else + n = strlen(string); + + return n; +} Index: xc/lib/Xt/GCManager.c diff -u xc/lib/Xt/GCManager.c:1.7 xc/lib/Xt/GCManager.c:1.8 --- xc/lib/Xt/GCManager.c:1.7 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/GCManager.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: GCManager.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/GCManager.c,v 1.7 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/GCManager.c,v 1.8 2006/01/09 14:59:21 dawes Exp $ */ #include "IntrinsicI.h" Index: xc/lib/Xt/Geometry.c diff -u xc/lib/Xt/Geometry.c:1.14 xc/lib/Xt/Geometry.c:1.15 --- xc/lib/Xt/Geometry.c:1.14 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Geometry.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Geometry.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Geometry.c,v 1.14 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Geometry.c,v 1.15 2006/01/09 14:59:21 dawes Exp $ */ #include "IntrinsicI.h" #include "ShellP.h" Index: xc/lib/Xt/GetActKey.c diff -u xc/lib/Xt/GetActKey.c:1.3 xc/lib/Xt/GetActKey.c:1.4 --- xc/lib/Xt/GetActKey.c:1.3 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/GetActKey.c Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: GetActKey.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xt/GetActKey.c,v 1.4 2005/03/29 04:00:30 tsi Exp $ */ /*LINTLIBRARY*/ Index: xc/lib/Xt/GetResList.c diff -u xc/lib/Xt/GetResList.c:3.7 xc/lib/Xt/GetResList.c:3.8 --- xc/lib/Xt/GetResList.c:3.7 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/GetResList.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: GetResList.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/GetResList.c,v 3.7 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/GetResList.c,v 3.8 2006/01/09 14:59:21 dawes Exp $ */ /* Index: xc/lib/Xt/GetValues.c diff -u xc/lib/Xt/GetValues.c:1.4 xc/lib/Xt/GetValues.c:1.5 --- xc/lib/Xt/GetValues.c:1.4 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/GetValues.c Mon Jan 9 09:59:21 2006 @@ -1,4 +1,3 @@ -/* $Xorg: GetValues.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ /*LINTLIBRARY*/ /*********************************************************** @@ -59,7 +58,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/GetValues.c,v 1.4 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/GetValues.c,v 1.5 2006/01/09 14:59:21 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" Index: xc/lib/Xt/HookObj.c diff -u xc/lib/Xt/HookObj.c:1.4 xc/lib/Xt/HookObj.c:1.5 --- xc/lib/Xt/HookObj.c:1.4 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/HookObj.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: HookObj.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/HookObj.c,v 1.4 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/HookObj.c,v 1.5 2006/01/09 14:59:21 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" Index: xc/lib/Xt/HookObjI.h diff -u xc/lib/Xt/HookObjI.h:1.2 xc/lib/Xt/HookObjI.h:1.3 --- xc/lib/Xt/HookObjI.h:1.2 Fri Dec 14 14:56:18 2001 +++ xc/lib/Xt/HookObjI.h Mon Jan 9 09:59:21 2006 @@ -1,5 +1,4 @@ -/* $Xorg: HookObjI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/Xt/HookObjI.h,v 1.3 2006/01/09 14:59:21 dawes Exp $ */ /* Copyright 1994, 1998 The Open Group Index: xc/lib/Xt/Hooks.c diff -u xc/lib/Xt/Hooks.c:1.5 xc/lib/Xt/Hooks.c:1.6 --- xc/lib/Xt/Hooks.c:1.5 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Hooks.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Hooks.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Hooks.c,v 1.5 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Hooks.c,v 1.6 2006/01/09 14:59:21 dawes Exp $ */ /*LINTLIBRARY*/ Index: xc/lib/Xt/Imakefile diff -u xc/lib/Xt/Imakefile:3.20 xc/lib/Xt/Imakefile:3.21 --- xc/lib/Xt/Imakefile:3.20 Sun Apr 4 22:33:13 2004 +++ xc/lib/Xt/Imakefile Mon Jan 9 09:59:21 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:12 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/Xt/Imakefile,v 3.20 2004/04/05 02:33:13 dawes Exp $ +XCOMM $XFree86: xc/lib/Xt/Imakefile,v 3.21 2006/01/09 14:59:21 dawes Exp $ #define DoNormalLib NormalLibXt #define DoSharedLib SharedLibXt Index: xc/lib/Xt/InitialI.h diff -u xc/lib/Xt/InitialI.h:3.11 xc/lib/Xt/InitialI.h:3.12 --- xc/lib/Xt/InitialI.h:3.11 Mon Apr 21 12:34:27 2003 +++ xc/lib/Xt/InitialI.h Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: InitialI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/InitialI.h,v 3.11 2003/04/21 16:34:27 herrb Exp $ */ +/* $XFree86: xc/lib/Xt/InitialI.h,v 3.12 2006/01/09 14:59:21 dawes Exp $ */ #ifndef _XtinitialI_h #define _XtinitialI_h Index: xc/lib/Xt/Initialize.c diff -u xc/lib/Xt/Initialize.c:3.23 xc/lib/Xt/Initialize.c:3.24 --- xc/lib/Xt/Initialize.c:3.23 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Initialize.c Tue Apr 19 21:49:18 2005 @@ -1,5 +1,3 @@ -/* $Xorg: Initialize.c,v 1.8 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Initialize.c,v 3.23 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Initialize.c,v 3.24 2005/04/20 01:49:18 dawes Exp $ */ /* @@ -320,7 +318,7 @@ { #ifdef WIN32 register char *ptr1; - register char *ptr2; + register char *ptr2 = NULL; int len1 = 0, len2 = 0; if (ptr1 = getenv("HOME")) { /* old, deprecated */ Index: xc/lib/Xt/Intrinsic.c diff -u xc/lib/Xt/Intrinsic.c:3.24 xc/lib/Xt/Intrinsic.c:3.26 --- xc/lib/Xt/Intrinsic.c:3.24 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Intrinsic.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Intrinsic.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.24 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.26 2006/01/09 14:59:21 dawes Exp $ */ /* @@ -73,6 +71,10 @@ #include +#ifdef XT_GEO_TATTLER +#include +#endif + String XtCXtToolkitError = "XtToolkitError"; Boolean XtIsSubclass( Index: xc/lib/Xt/Intrinsic.h diff -u xc/lib/Xt/Intrinsic.h:3.10 xc/lib/Xt/Intrinsic.h:3.13 --- xc/lib/Xt/Intrinsic.h:3.10 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Intrinsic.h Tue Feb 7 17:02:26 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Intrinsic.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -48,7 +46,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.10 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Intrinsic.h,v 3.13 2006/02/07 22:02:26 dawes Exp $ */ #ifndef _XtIntrinsic_h #define _XtIntrinsic_h @@ -1898,6 +1896,45 @@ #define XtNewString(str) \ ((str) != NULL ? (strcpy(XtMalloc((unsigned)strlen(str) + 1), str)) : NULL) + +/* + * String manipulation functions + */ + +#define XtTextEncoding8bit 0 +#define XtTextEncodingChar2b 1 +#define XtTextEncodingMixed 3 /* char */ + +/* + * Some widgets use Char2b strings, so these are strung manipulation + * functions for those widgets. + */ +extern char* XtNewStringEx(int encoding, char* string); +extern char* XtCharIndexEx(int encoding, char* string, char c); +extern size_t XtStringLengthEx(int encoding, char* string); + +#define IS_CHAR(p, c) ((p)->byte1 == 0 && (p)->byte2 == c) +#define IS_NOT_CHAR(p, c) !IS_CHAR(p, c) +#define IS_NUL(p) IS_CHAR(p, 0) +#define IS_NOT_NUL(p) !IS_NUL(p) + +#define AT_EOL(encoding, label) \ + ((encoding == XtTextEncodingChar2b && \ + IS_NUL((XChar2b*) label)) || \ + (encoding != XtTextEncodingChar2b && \ + (*label) == '\0')) + +#define NOT_AT_EOL(encoding, label) !AT_EOL(encoding, label) + +#define MOVE_FORWARD(encoding, label, nl) \ + do { \ + if (encoding == XtTextEncodingChar2b) \ + label = (char*) (((XChar2b*) nl) + 1); \ + else \ + label = nl + 1; \ + } while (0); + + /************************************************************* * * Work procs Index: xc/lib/Xt/IntrinsicI.h diff -u xc/lib/Xt/IntrinsicI.h:3.11 xc/lib/Xt/IntrinsicI.h:3.12 --- xc/lib/Xt/IntrinsicI.h:3.11 Wed May 26 18:24:40 2004 +++ xc/lib/Xt/IntrinsicI.h Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: IntrinsicI.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.11 2004/05/26 22:24:40 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/IntrinsicI.h,v 3.12 2006/01/09 14:59:21 dawes Exp $ */ #ifndef _XtintrinsicI_h #define _XtintrinsicI_h Index: xc/lib/Xt/IntrinsicP.h diff -u xc/lib/Xt/IntrinsicP.h:1.5 xc/lib/Xt/IntrinsicP.h:1.6 --- xc/lib/Xt/IntrinsicP.h:1.5 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/IntrinsicP.h Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: IntrinsicP.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/IntrinsicP.h,v 1.5 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/IntrinsicP.h,v 1.6 2006/01/09 14:59:21 dawes Exp $ */ #ifndef _XtintrinsicP_h #define _XtintrinsicP_h Index: xc/lib/Xt/Keyboard.c diff -u xc/lib/Xt/Keyboard.c:3.6 xc/lib/Xt/Keyboard.c:3.7 --- xc/lib/Xt/Keyboard.c:3.6 Sat Oct 23 11:29:26 2004 +++ xc/lib/Xt/Keyboard.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Keyboard.c,v 1.5 2001/02/09 02:03:55 xorgcvs Exp $ */ - /******************************************************** Copyright 1988 by Hewlett-Packard Company @@ -59,7 +57,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Keyboard.c,v 3.6 2004/10/23 15:29:26 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Keyboard.c,v 3.7 2006/01/09 14:59:21 dawes Exp $ */ #include "IntrinsicI.h" Index: xc/lib/Xt/Manage.c diff -u xc/lib/Xt/Manage.c:3.12 xc/lib/Xt/Manage.c:3.13 --- xc/lib/Xt/Manage.c:3.12 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Manage.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Manage.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Manage.c,v 3.12 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Manage.c,v 3.13 2006/01/09 14:59:21 dawes Exp $ */ /* Index: xc/lib/Xt/NextEvent.c diff -u xc/lib/Xt/NextEvent.c:3.29 xc/lib/Xt/NextEvent.c:3.30 --- xc/lib/Xt/NextEvent.c:3.29 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/NextEvent.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: NextEvent.c,v 1.8 2001/02/09 02:03:55 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/NextEvent.c,v 3.29 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/NextEvent.c,v 3.30 2006/01/09 14:59:21 dawes Exp $ */ #include "IntrinsicI.h" #include Index: xc/lib/Xt/Object.c diff -u xc/lib/Xt/Object.c:1.7 xc/lib/Xt/Object.c:1.8 --- xc/lib/Xt/Object.c:1.7 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Object.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Object.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Object.c,v 1.7 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Object.c,v 1.8 2006/01/09 14:59:21 dawes Exp $ */ #define OBJECT #include "IntrinsicI.h" Index: xc/lib/Xt/Object.h diff -u xc/lib/Xt/Object.h:1.2 xc/lib/Xt/Object.h:1.3 --- xc/lib/Xt/Object.h:1.2 Fri Dec 14 14:56:26 2001 +++ xc/lib/Xt/Object.h Mon Jan 9 09:59:21 2006 @@ -1,5 +1,4 @@ -/* $Xorg: Object.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ -/* $oHeader: Object.h,v 1.2 88/08/18 15:55:32 asente Exp $ */ +/* $XFree86: xc/lib/Xt/Object.h,v 1.3 2006/01/09 14:59:21 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xt/ObjectP.h diff -u xc/lib/Xt/ObjectP.h:1.2 xc/lib/Xt/ObjectP.h:1.3 --- xc/lib/Xt/ObjectP.h:1.2 Fri Dec 14 14:56:27 2001 +++ xc/lib/Xt/ObjectP.h Mon Jan 9 09:59:21 2006 @@ -1,5 +1,4 @@ -/* $Xorg: ObjectP.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/Xt/ObjectP.h,v 1.3 2006/01/09 14:59:21 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group Index: xc/lib/Xt/PassivGraI.h diff -u xc/lib/Xt/PassivGraI.h:1.4 xc/lib/Xt/PassivGraI.h:1.5 --- xc/lib/Xt/PassivGraI.h:1.4 Mon Apr 21 12:34:28 2003 +++ xc/lib/Xt/PassivGraI.h Mon Jan 9 09:59:21 2006 @@ -1,7 +1,3 @@ -/* -* $Xorg: PassivGraI.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ -*/ - /******************************************************** Copyright 1988 by Hewlett-Packard Company @@ -51,7 +47,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/PassivGraI.h,v 1.4 2003/04/21 16:34:28 herrb Exp $ */ +/* $XFree86: xc/lib/Xt/PassivGraI.h,v 1.5 2006/01/09 14:59:21 dawes Exp $ */ #ifndef _PDI_h_ #define _PDI_h_ Index: xc/lib/Xt/PassivGrab.c diff -u xc/lib/Xt/PassivGrab.c:3.8 xc/lib/Xt/PassivGrab.c:3.9 --- xc/lib/Xt/PassivGrab.c:3.8 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/PassivGrab.c Mon Jan 9 09:59:21 2006 @@ -1,5 +1,3 @@ -/* $Xorg: PassivGrab.c,v 1.5 2001/02/09 02:03:56 xorgcvs Exp $ */ - /******************************************************** Copyright 1988 by Hewlett-Packard Company @@ -33,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xt/PassivGrab.c,v 3.8 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/PassivGrab.c,v 3.9 2006/01/09 14:59:21 dawes Exp $ */ /* Index: xc/lib/Xt/Pointer.c diff -u xc/lib/Xt/Pointer.c:1.3 xc/lib/Xt/Pointer.c:1.4 --- xc/lib/Xt/Pointer.c:1.3 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Pointer.c Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Pointer.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xt/Pointer.c,v 1.4 2005/03/29 04:00:30 tsi Exp $ */ /******************************************************** Index: xc/lib/Xt/Popup.c diff -u xc/lib/Xt/Popup.c:1.5 xc/lib/Xt/Popup.c:1.6 --- xc/lib/Xt/Popup.c:1.5 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Popup.c Mon Jan 9 09:59:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Popup.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Popup.c,v 1.5 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Popup.c,v 1.6 2006/01/09 14:59:22 dawes Exp $ */ #include "IntrinsicI.h" #include "ShellP.h" Index: xc/lib/Xt/PopupCB.c diff -u xc/lib/Xt/PopupCB.c:1.3 xc/lib/Xt/PopupCB.c:1.4 --- xc/lib/Xt/PopupCB.c:1.3 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/PopupCB.c Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: PopupCB.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xt/PopupCB.c,v 1.4 2005/03/29 04:00:30 tsi Exp $ */ /*********************************************************** Index: xc/lib/Xt/RectObj.c diff -u xc/lib/Xt/RectObj.c:1.4 xc/lib/Xt/RectObj.c:1.5 --- xc/lib/Xt/RectObj.c:1.4 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/RectObj.c Mon Jan 9 09:59:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: RectObj.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/RectObj.c,v 1.4 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/RectObj.c,v 1.5 2006/01/09 14:59:22 dawes Exp $ */ #define RECTOBJ #include "IntrinsicI.h" Index: xc/lib/Xt/RectObj.h diff -u xc/lib/Xt/RectObj.h:1.2 xc/lib/Xt/RectObj.h:1.3 --- xc/lib/Xt/RectObj.h:1.2 Fri Dec 14 14:56:28 2001 +++ xc/lib/Xt/RectObj.h Mon Jan 9 09:59:22 2006 @@ -1,5 +1,4 @@ -/* $Xorg: RectObj.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ -/* $oHeader: RectObj.h,v 1.2 88/08/18 17:39:17 asente Exp $ */ +/* $XFree86: xc/lib/Xt/RectObj.h,v 1.3 2006/01/09 14:59:22 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xt/RectObjP.h diff -u xc/lib/Xt/RectObjP.h:1.2 xc/lib/Xt/RectObjP.h:1.3 --- xc/lib/Xt/RectObjP.h:1.2 Fri Dec 14 14:56:28 2001 +++ xc/lib/Xt/RectObjP.h Mon Jan 9 09:59:22 2006 @@ -1,5 +1,4 @@ -/* $Xorg: RectObjP.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ -/* $oHeader: RectObjP.h,v 1.2 88/08/18 15:55:52 asente Exp $ */ +/* $XFree86: xc/lib/Xt/RectObjP.h,v 1.3 2006/01/09 14:59:22 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xt/ResConfig.c diff -u xc/lib/Xt/ResConfig.c:3.9 xc/lib/Xt/ResConfig.c:3.11 --- xc/lib/Xt/ResConfig.c:3.9 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/ResConfig.c Mon Jan 9 09:59:22 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ResConfig.c,v 1.5 2001/02/09 02:03:56 xorgcvs Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group @@ -52,7 +51,7 @@ Corporation. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ResConfig.c,v 3.9 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/ResConfig.c,v 3.11 2006/01/09 14:59:22 dawes Exp $ */ #include "Intrinsic.h" #include "IntrinsicI.h" @@ -659,6 +658,7 @@ return ('*'); } + *part = 0; return ('0'); /* error - return 0 */ } Index: xc/lib/Xt/ResConfigP.h diff -u xc/lib/Xt/ResConfigP.h:3.8 xc/lib/Xt/ResConfigP.h:3.9 --- xc/lib/Xt/ResConfigP.h:3.8 Mon Apr 21 12:34:28 2003 +++ xc/lib/Xt/ResConfigP.h Mon Jan 9 09:59:22 2006 @@ -1,4 +1,3 @@ -/* $Xorg: ResConfigP.h,v 1.5 2001/02/09 02:03:56 xorgcvs Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group @@ -52,7 +51,7 @@ Corporation. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.8 2003/04/21 16:34:28 herrb Exp $ */ +/* $XFree86: xc/lib/Xt/ResConfigP.h,v 3.9 2006/01/09 14:59:22 dawes Exp $ */ #ifndef _RESCONFIGP_H #define _RESCONFIGP_H Index: xc/lib/Xt/ResourceI.h diff -u xc/lib/Xt/ResourceI.h:1.7 xc/lib/Xt/ResourceI.h:1.8 --- xc/lib/Xt/ResourceI.h:1.7 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/ResourceI.h Mon Jan 9 09:59:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ResourceI.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.7 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.8 2006/01/09 14:59:22 dawes Exp $ */ /**************************************************************** * Index: xc/lib/Xt/Resources.c diff -u xc/lib/Xt/Resources.c:1.13 xc/lib/Xt/Resources.c:1.14 --- xc/lib/Xt/Resources.c:1.13 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Resources.c Mon Jan 9 09:59:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Resources.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -59,7 +57,7 @@ */ -/* $XFree86: xc/lib/Xt/Resources.c,v 1.13 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Resources.c,v 1.14 2006/01/09 14:59:22 dawes Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" Index: xc/lib/Xt/Selection.c diff -u xc/lib/Xt/Selection.c:3.11 xc/lib/Xt/Selection.c:3.12 --- xc/lib/Xt/Selection.c:3.11 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Selection.c Mon Jan 9 09:59:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Selection.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Selection.c,v 3.11 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Selection.c,v 3.12 2006/01/09 14:59:22 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" Index: xc/lib/Xt/SelectionI.h diff -u xc/lib/Xt/SelectionI.h:1.3 xc/lib/Xt/SelectionI.h:1.4 --- xc/lib/Xt/SelectionI.h:1.3 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/SelectionI.h Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: SelectionI.h,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xt/SelectionI.h,v 1.4 2005/03/29 04:00:30 tsi Exp $ */ /*********************************************************** Index: xc/lib/Xt/SetSens.c diff -u xc/lib/Xt/SetSens.c:1.4 xc/lib/Xt/SetSens.c:1.5 --- xc/lib/Xt/SetSens.c:1.4 Mon Apr 21 12:34:28 2003 +++ xc/lib/Xt/SetSens.c Mon Jan 9 09:59:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: SetSens.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/SetSens.c,v 1.4 2003/04/21 16:34:28 herrb Exp $ */ +/* $XFree86: xc/lib/Xt/SetSens.c,v 1.5 2006/01/09 14:59:22 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" Index: xc/lib/Xt/SetValues.c diff -u xc/lib/Xt/SetValues.c:1.4 xc/lib/Xt/SetValues.c:1.5 --- xc/lib/Xt/SetValues.c:1.4 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/SetValues.c Mon Jan 9 09:59:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: SetValues.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/SetValues.c,v 1.4 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/SetValues.c,v 1.5 2006/01/09 14:59:22 dawes Exp $ */ #include "IntrinsicI.h" Index: xc/lib/Xt/SetWMCW.c diff -u xc/lib/Xt/SetWMCW.c:1.6 xc/lib/Xt/SetWMCW.c:1.7 --- xc/lib/Xt/SetWMCW.c:1.6 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/SetWMCW.c Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -/* $Xorg: SetWMCW.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ +/* $XFree86: xc/lib/Xt/SetWMCW.c,v 1.7 2005/03/29 04:00:30 tsi Exp $ */ /* * Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. Index: xc/lib/Xt/Shell.c diff -u xc/lib/Xt/Shell.c:3.18 xc/lib/Xt/Shell.c:3.19 --- xc/lib/Xt/Shell.c:3.18 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Shell.c Mon Jan 9 09:59:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Shell.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Shell.c,v 3.18 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Shell.c,v 3.19 2006/01/09 14:59:22 dawes Exp $ */ /* Index: xc/lib/Xt/ShellP.h diff -u xc/lib/Xt/ShellP.h:1.2 xc/lib/Xt/ShellP.h:1.3 --- xc/lib/Xt/ShellP.h:1.2 Fri Dec 14 14:56:30 2001 +++ xc/lib/Xt/ShellP.h Mon Jan 9 09:59:22 2006 @@ -1,5 +1,4 @@ -/* $Xorg: ShellP.h,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/Xt/ShellP.h,v 1.3 2006/01/09 14:59:22 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group Index: xc/lib/Xt/TMaction.c diff -u xc/lib/Xt/TMaction.c:3.10 xc/lib/Xt/TMaction.c:3.12 --- xc/lib/Xt/TMaction.c:3.10 Wed May 26 18:24:40 2004 +++ xc/lib/Xt/TMaction.c Mon Jan 9 09:59:22 2006 @@ -1,4 +1,3 @@ -/* $Xorg: TMaction.c,v 1.5 2001/02/09 02:03:58 xorgcvs Exp $ */ /*LINTLIBRARY*/ /*********************************************************** @@ -59,7 +58,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/TMaction.c,v 3.10 2004/05/26 22:24:40 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/TMaction.c,v 3.12 2006/01/09 14:59:22 dawes Exp $ */ /* TMaction.c -- maintains the state table of actions for the translation * manager. @@ -630,6 +629,7 @@ int localUnbound; TMBindCacheStatusRec bcStatusRec; + bcStatusRec.refCount = 0; procs = (XtActionProc *) XtStackAlloc(stateTree->numQuarks * sizeof(XtActionProc), stackProcs); Index: xc/lib/Xt/TMgrab.c diff -u xc/lib/Xt/TMgrab.c:1.5 xc/lib/Xt/TMgrab.c:1.6 --- xc/lib/Xt/TMgrab.c:1.5 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/TMgrab.c Mon Jan 9 09:59:22 2006 @@ -1,5 +1,3 @@ -/* $Xorg: TMgrab.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/TMgrab.c,v 1.5 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/TMgrab.c,v 1.6 2006/01/09 14:59:22 dawes Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" Index: xc/lib/Xt/TMkey.c diff -u xc/lib/Xt/TMkey.c:3.12 xc/lib/Xt/TMkey.c:3.13 --- xc/lib/Xt/TMkey.c:3.12 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/TMkey.c Mon Jan 9 09:59:22 2006 @@ -1,4 +1,3 @@ -/* $Xorg: TMkey.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ /*LINTLIBRARY*/ /*********************************************************** @@ -59,7 +58,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/TMkey.c,v 3.12 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/TMkey.c,v 3.13 2006/01/09 14:59:22 dawes Exp $ */ #define XK_MISCELLANY #define XK_LATIN1 Index: xc/lib/Xt/TMparse.c diff -u xc/lib/Xt/TMparse.c:3.12 xc/lib/Xt/TMparse.c:3.14 --- xc/lib/Xt/TMparse.c:3.12 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/TMparse.c Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: TMparse.c,v 1.6 2001/02/09 02:03:58 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/TMparse.c,v 3.12 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/TMparse.c,v 3.14 2006/01/09 14:59:23 dawes Exp $ */ /* @@ -1527,6 +1525,7 @@ EventSeqPtr *nextEvent = eventSeqP; *eventSeqP = NULL; + *actionsP = NULL; while ( *str != '\0' && !IsNewline(*str)) { static Event nullEvent = @@ -1612,6 +1611,7 @@ if (str-start >= 199) { Syntax("Action procedure name is longer than 199 chars",""); *error = TRUE; + *actionProcNameP = 0; return str; } (void) memmove(procName, start, str-start); Index: xc/lib/Xt/TMprint.c diff -u xc/lib/Xt/TMprint.c:1.8 xc/lib/Xt/TMprint.c:1.9 --- xc/lib/Xt/TMprint.c:1.8 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/TMprint.c Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: TMprint.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -58,7 +56,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/TMprint.c,v 1.8 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/TMprint.c,v 1.9 2006/01/09 14:59:23 dawes Exp $ */ /*LINTLIBRARY*/ #include "IntrinsicI.h" Index: xc/lib/Xt/TMstate.c diff -u xc/lib/Xt/TMstate.c:1.10 xc/lib/Xt/TMstate.c:1.11 --- xc/lib/Xt/TMstate.c:1.10 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/TMstate.c Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: TMstate.c,v 1.6 2001/02/09 02:03:58 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -32,7 +30,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/TMstate.c,v 1.10 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/TMstate.c,v 1.11 2006/01/09 14:59:23 dawes Exp $ */ /* Index: xc/lib/Xt/Threads.c diff -u xc/lib/Xt/Threads.c:3.8 xc/lib/Xt/Threads.c:3.9 --- xc/lib/Xt/Threads.c:3.8 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Threads.c Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Threads.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /************************************************************ Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -53,7 +51,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Threads.c,v 3.8 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Threads.c,v 3.9 2006/01/09 14:59:23 dawes Exp $ */ #include "IntrinsicI.h" Index: xc/lib/Xt/ThreadsI.h diff -u xc/lib/Xt/ThreadsI.h:3.6 xc/lib/Xt/ThreadsI.h:3.7 --- xc/lib/Xt/ThreadsI.h:3.6 Mon Apr 21 12:34:29 2003 +++ xc/lib/Xt/ThreadsI.h Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ThreadsI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /************************************************************ Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -53,7 +51,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/ThreadsI.h,v 3.6 2003/04/21 16:34:29 herrb Exp $ */ +/* $XFree86: xc/lib/Xt/ThreadsI.h,v 3.7 2006/01/09 14:59:23 dawes Exp $ */ #ifndef _XtThreadsI_h #define _XtThreadsI_h Index: xc/lib/Xt/TranslateI.h diff -u xc/lib/Xt/TranslateI.h:1.5 xc/lib/Xt/TranslateI.h:1.6 --- xc/lib/Xt/TranslateI.h:1.5 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/TranslateI.h Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: TranslateI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.5 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/TranslateI.h,v 1.6 2006/01/09 14:59:23 dawes Exp $ */ /* * TranslateI.h - Header file private to translation management Index: xc/lib/Xt/VarCreate.c diff -u xc/lib/Xt/VarCreate.c:3.7 xc/lib/Xt/VarCreate.c:3.8 --- xc/lib/Xt/VarCreate.c:3.7 Fri Dec 14 14:56:32 2001 +++ xc/lib/Xt/VarCreate.c Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: VarCreate.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /* Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -52,7 +50,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/VarCreate.c,v 3.7 2001/12/14 19:56:32 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/VarCreate.c,v 3.8 2006/01/09 14:59:23 dawes Exp $ */ #include "IntrinsicI.h" #include "StringDefs.h" Index: xc/lib/Xt/VarGet.c diff -u xc/lib/Xt/VarGet.c:1.9 xc/lib/Xt/VarGet.c:1.10 --- xc/lib/Xt/VarGet.c:1.9 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/VarGet.c Mon Jan 9 09:59:23 2006 @@ -1,4 +1,3 @@ -/* $Xorg: VarGet.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ /* Copyright 1993 by Sun Microsystems, Inc. Mountain View, CA. @@ -51,7 +50,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/VarGet.c,v 1.9 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/VarGet.c,v 1.10 2006/01/09 14:59:23 dawes Exp $ */ #include "IntrinsicI.h" #include "VarargsI.h" Index: xc/lib/Xt/Varargs.c diff -u xc/lib/Xt/Varargs.c:3.12 xc/lib/Xt/Varargs.c:3.13 --- xc/lib/Xt/Varargs.c:3.12 Tue May 4 20:07:03 2004 +++ xc/lib/Xt/Varargs.c Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Varargs.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /* Copyright 1985, 1986, 1987, 1988, 1989, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/Varargs.c,v 3.12 2004/05/05 00:07:03 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Varargs.c,v 3.13 2006/01/09 14:59:23 dawes Exp $ */ #include "IntrinsicI.h" #include "VarargsI.h" Index: xc/lib/Xt/VarargsI.h diff -u xc/lib/Xt/VarargsI.h:3.7 xc/lib/Xt/VarargsI.h:3.8 --- xc/lib/Xt/VarargsI.h:3.7 Mon Apr 21 12:34:29 2003 +++ xc/lib/Xt/VarargsI.h Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: VarargsI.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /* Copyright 1985, 1986, 1987, 1988, 1989, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/VarargsI.h,v 3.7 2003/04/21 16:34:29 herrb Exp $ */ +/* $XFree86: xc/lib/Xt/VarargsI.h,v 3.8 2006/01/09 14:59:23 dawes Exp $ */ #ifndef _VarargsI_h_ #define _VarargsI_h_ Index: xc/lib/Xt/Vendor.c diff -u xc/lib/Xt/Vendor.c:1.8 xc/lib/Xt/Vendor.c:1.9 --- xc/lib/Xt/Vendor.c:1.8 Mon Dec 22 16:10:25 2003 +++ xc/lib/Xt/Vendor.c Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Vendor.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Vendor.c,v 1.8 2003/12/22 21:10:25 dickey Exp $ */ +/* $XFree86: xc/lib/Xt/Vendor.c,v 1.9 2006/01/09 14:59:23 dawes Exp $ */ /* Make sure all wm properties can make it out of the resource manager */ Index: xc/lib/Xt/Vendor.h diff -u xc/lib/Xt/Vendor.h:1.2 xc/lib/Xt/Vendor.h:1.3 --- xc/lib/Xt/Vendor.h:1.2 Fri Dec 14 14:56:33 2001 +++ xc/lib/Xt/Vendor.h Mon Jan 9 09:59:23 2006 @@ -1,8 +1,4 @@ -/* -* $Xorg: Vendor.h,v 1.5 2001/02/09 02:03:59 xorgcvs Exp $ -* $oHeader: Vendor.h,v 1.2 88/08/18 15:56:44 asente Exp $ -*/ - +/* $XFree86: xc/lib/Xt/Vendor.h,v 1.3 2006/01/09 14:59:23 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xt/VendorP.h diff -u xc/lib/Xt/VendorP.h:1.2 xc/lib/Xt/VendorP.h:1.3 --- xc/lib/Xt/VendorP.h:1.2 Fri Dec 14 14:56:33 2001 +++ xc/lib/Xt/VendorP.h Mon Jan 9 09:59:23 2006 @@ -1,8 +1,4 @@ -/* -* $Xorg: VendorP.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ -* $oHeader: VendorP.h,v 1.2 88/08/18 15:56:48 asente Exp $ -*/ - +/* $XFree86: xc/lib/Xt/VendorP.h,v 1.3 2006/01/09 14:59:23 dawes Exp $ */ /*********************************************************** Copyright 1987, 1988, 1998 The Open Group Index: xc/lib/Xt/Xt-def.cpp diff -u xc/lib/Xt/Xt-def.cpp:1.5 xc/lib/Xt/Xt-def.cpp:1.7 --- xc/lib/Xt/Xt-def.cpp:1.5 Wed May 5 20:56:22 2004 +++ xc/lib/Xt/Xt-def.cpp Tue Jan 24 23:32:09 2006 @@ -242,6 +242,9 @@ XtName XtNameToWidget XtNewString + XtNewStringEx + XtStringLengthEx + XtCharIndexEx XtNextEvent XtNoticeSignal XtOpenApplication @@ -347,5 +350,4 @@ XtWindow XtWindowOfObject XtWindowToWidget -/* $Xorg: Xt-def.cpp,v 1.3 2000/08/17 19:46:20 cpqbld Exp $ */ -/* $XFree86: xc/lib/Xt/Xt-def.cpp,v 1.5 2004/05/06 00:56:22 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/Xt-def.cpp,v 1.7 2006/01/25 04:32:09 dawes Exp $ */ Index: xc/lib/Xt/Xtos.h diff -u xc/lib/Xt/Xtos.h:3.13 xc/lib/Xt/Xtos.h:3.14 --- xc/lib/Xt/Xtos.h:3.13 Fri Oct 24 11:47:35 2003 +++ xc/lib/Xt/Xtos.h Tue Jun 28 21:14:09 2005 @@ -1,7 +1,3 @@ -/* -* $Xorg: Xtos.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ -*/ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -48,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Xtos.h,v 3.13 2003/10/24 15:47:35 tsi Exp $ */ +/* $XFree86: xc/lib/Xt/Xtos.h,v 3.14 2005/06/29 01:14:09 dawes Exp $ */ #ifndef _Xtos_h #define _Xtos_h @@ -67,7 +63,7 @@ defined(__sparc64__) || \ defined(__s390x__) || \ (defined(__hppa__) && defined(__LP64__)) || \ - defined(__AMD64__) || defined(AMD64) || \ + defined(__amd64__) || defined(__x86_64__) || \ (defined(sgi) && (_MIPS_SZLONG == 64)) #define LONG64 #endif Index: xc/lib/Xt/jump_funcs diff -u xc/lib/Xt/jump_funcs:3.6 xc/lib/Xt/jump_funcs:3.8 --- xc/lib/Xt/jump_funcs:3.6 Wed Jan 17 14:43:13 2001 +++ xc/lib/Xt/jump_funcs Tue Jan 24 23:32:09 2006 @@ -1,9 +1,4 @@ -# $Xorg: jump_funcs,v 1.3 2000/08/17 19:46:20 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/lib/Xt/jump_funcs,v 3.6 2001/01/17 19:43:13 dawes Exp $ +# $XFree86: xc/lib/Xt/jump_funcs,v 3.8 2006/01/25 04:32:09 dawes Exp $ # 00000000 T _XtAppAddActionHook libXt ActionHook 00000000 T _XtRemoveActionHook libXt ActionHook @@ -174,6 +169,9 @@ 00000000 T _XtMapWidget libXt Functions 00000000 T _XtUnmapWidget libXt Functions 00000000 T _XtNewString libXt Functions +00000000 T _XtNewStringEx libXt Functions +00000000 T _XtStringLengthEx libXt Functions +00000000 T _XtCharIndexEx libXt Functions 00000000 T _XtIsSessionShell libXt Functions 00000000 T __XtGClistFree libXt GCManager 00000000 T _XtAllocateGC libXt GCManager Index: xc/lib/Xt/jump_ignore diff -u xc/lib/Xt/jump_ignore:3.8 xc/lib/Xt/jump_ignore:3.9 --- xc/lib/Xt/jump_ignore:3.8 Wed Jan 17 14:43:13 2001 +++ xc/lib/Xt/jump_ignore Mon Jan 9 09:59:23 2006 @@ -1,9 +1,4 @@ -# $Xorg: jump_ignore,v 1.3 2000/08/17 19:46:21 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/lib/Xt/jump_ignore,v 3.8 2001/01/17 19:43:13 dawes Exp $ +# $XFree86: xc/lib/Xt/jump_ignore,v 3.9 2006/01/09 14:59:23 dawes Exp $ # jump_ignore 00000000 T __XtFreeArgList libXt Varargs 00000000 T __XtClearAncestorCache libXt Keyboard Index: xc/lib/Xt/jump_vars diff -u xc/lib/Xt/jump_vars:3.3 xc/lib/Xt/jump_vars:3.4 --- xc/lib/Xt/jump_vars:3.3 Wed Jan 17 14:43:13 2001 +++ xc/lib/Xt/jump_vars Mon Jan 9 09:59:23 2006 @@ -1,9 +1,4 @@ -# $Xorg: jump_vars,v 1.3 2000/08/17 19:46:21 cpqbld Exp $ -# -# -# -# -# $XFree86: xc/lib/Xt/jump_vars,v 3.3 2001/01/17 19:43:13 dawes Exp $ +# $XFree86: xc/lib/Xt/jump_vars,v 3.4 2006/01/09 14:59:23 dawes Exp $ # 00000100 D _compositeClassRec libXt Composite 00000004 D _compositeWidgetClass libXt Composite Index: xc/lib/Xt/libXt.elist diff -u xc/lib/Xt/libXt.elist:1.1.1.2 xc/lib/Xt/libXt.elist:1.2 --- xc/lib/Xt/libXt.elist:1.1.1.2 Tue Jan 16 17:25:32 2001 +++ xc/lib/Xt/libXt.elist Mon Jan 9 09:59:23 2006 @@ -1,4 +1,4 @@ -/* $Xorg: libXt.elist,v 1.3 2000/08/17 19:46:21 cpqbld Exp $ */ +/* $XFree86: xc/lib/Xt/libXt.elist,v 1.2 2006/01/09 14:59:23 dawes Exp $ */ /************************************************************************* * Export list for libXt Index: xc/lib/Xt/sharedlib.c diff -u xc/lib/Xt/sharedlib.c:3.8 xc/lib/Xt/sharedlib.c:3.9 --- xc/lib/Xt/sharedlib.c:3.8 Mon Apr 21 12:34:29 2003 +++ xc/lib/Xt/sharedlib.c Mon Jan 9 09:59:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: sharedlib.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */ - /* Copyright 1989, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/Xt/sharedlib.c,v 3.8 2003/04/21 16:34:29 herrb Exp $ */ +/* $XFree86: xc/lib/Xt/sharedlib.c,v 3.9 2006/01/09 14:59:23 dawes Exp $ */ #if (defined(SUNSHLIB) || defined(AIXSHLIB)) && !defined(SHAREDCODE) #include "IntrinsicI.h" Index: xc/lib/Xt/util/Shell.ht diff -u xc/lib/Xt/util/Shell.ht:3.5 xc/lib/Xt/util/Shell.ht:3.6 --- xc/lib/Xt/util/Shell.ht:3.5 Fri Dec 14 14:56:39 2001 +++ xc/lib/Xt/util/Shell.ht Mon Jan 9 09:59:25 2006 @@ -1,5 +1,3 @@ -/* $Xorg: Shell.ht,v 1.5 2001/02/09 02:03:59 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/util/Shell.ht,v 3.5 2001/12/14 19:56:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/util/Shell.ht,v 3.6 2006/01/09 14:59:25 dawes Exp $ */ #ifndef _XtShell_h #define _XtShell_h Index: xc/lib/Xt/util/StrDefs.ct diff -u xc/lib/Xt/util/StrDefs.ct:3.5 xc/lib/Xt/util/StrDefs.ct:3.6 --- xc/lib/Xt/util/StrDefs.ct:3.5 Fri Dec 14 14:56:39 2001 +++ xc/lib/Xt/util/StrDefs.ct Mon Jan 9 09:59:25 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrDefs.ct,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/util/StrDefs.ct,v 3.5 2001/12/14 19:56:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/util/StrDefs.ct,v 3.6 2006/01/09 14:59:25 dawes Exp $ */ #define Const const Index: xc/lib/Xt/util/StrDefs.ht diff -u xc/lib/Xt/util/StrDefs.ht:3.5 xc/lib/Xt/util/StrDefs.ht:3.6 --- xc/lib/Xt/util/StrDefs.ht:3.5 Fri Dec 14 14:56:39 2001 +++ xc/lib/Xt/util/StrDefs.ht Mon Jan 9 09:59:26 2006 @@ -1,5 +1,3 @@ -/* $Xorg: StrDefs.ht,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ - /*********************************************************** Copyright 1987, 1988, 1994, 1998 The Open Group @@ -46,7 +44,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/util/StrDefs.ht,v 3.5 2001/12/14 19:56:39 dawes Exp $ */ +/* $XFree86: xc/lib/Xt/util/StrDefs.ht,v 3.6 2006/01/09 14:59:26 dawes Exp $ */ #ifndef _XtStringDefs_h_ #define _XtStringDefs_h_ Index: xc/lib/Xt/util/string.list diff -u xc/lib/Xt/util/string.list:3.1 xc/lib/Xt/util/string.list:3.2 --- xc/lib/Xt/util/string.list:3.1 Wed Jan 17 14:43:16 2001 +++ xc/lib/Xt/util/string.list Mon Jan 9 09:59:26 2006 @@ -1,4 +1,4 @@ -! $Xorg: string.list,v 1.3 2000/08/17 19:46:22 cpqbld Exp $ +! $XFree86: xc/lib/Xt/util/string.list,v 3.2 2006/01/09 14:59:26 dawes Exp $ ! NOTE: To maintain binary compatibility, you can only APPEND items within ! a given list!!!! ! Index: xc/lib/Xtst/Imakefile diff -u xc/lib/Xtst/Imakefile:1.4 xc/lib/Xtst/Imakefile:1.5 --- xc/lib/Xtst/Imakefile:1.4 Sun Apr 4 22:33:13 2004 +++ xc/lib/Xtst/Imakefile Fri Oct 14 11:16:00 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:23 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/Xtst/Imakefile,v 1.4 2004/04/05 02:33:13 dawes Exp $ +XCOMM $XFree86: xc/lib/Xtst/Imakefile,v 1.5 2005/10/14 15:16:00 tsi Exp $ #define DoNormalLib NormalLibXtst #define DoSharedLib SharedLibXtst @@ -20,13 +15,9 @@ REQUIREDLIBS = SharedXtstReqs #endif -INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) - SRCS = XTest.c XRecord.c OBJS = XTest.o XRecord.o -LINTLIBS = $(LINTXLIB) - #include DependTarget() Index: xc/lib/Xtst/XRecord.c diff -u xc/lib/Xtst/XRecord.c:1.8 xc/lib/Xtst/XRecord.c:1.9 --- xc/lib/Xtst/XRecord.c:1.8 Wed Jan 26 21:28:59 2005 +++ xc/lib/Xtst/XRecord.c Tue Jun 7 04:02:14 2005 @@ -48,7 +48,7 @@ /* * By Stephen Gildea, X Consortium, and Martha Zimet, NCD. */ -/* $XFree86: xc/lib/Xtst/XRecord.c,v 1.8 2005/01/27 02:28:59 dawes Exp $ */ +/* $XFree86: xc/lib/Xtst/XRecord.c,v 1.9 2005/06/07 08:02:14 dawes Exp $ */ #include #include @@ -56,7 +56,6 @@ #define NEED_REPLIES #include #include -#include #include #include Index: xc/lib/Xtst/Xtst-def.cpp diff -u xc/lib/Xtst/Xtst-def.cpp:1.1.1.4 xc/lib/Xtst/Xtst-def.cpp:1.2 --- xc/lib/Xtst/Xtst-def.cpp:1.1.1.4 Tue Jan 16 17:25:40 2001 +++ xc/lib/Xtst/Xtst-def.cpp Mon Jan 9 09:59:26 2006 @@ -29,4 +29,4 @@ XRecordFreeData XRecordDisableContext XRecordFreeContext -/* $Xorg: Xtst-def.cpp,v 1.3 2000/08/17 19:46:23 cpqbld Exp $ */ +/* $XFree86: xc/lib/Xtst/Xtst-def.cpp,v 1.2 2006/01/09 14:59:26 dawes Exp $ */ Index: xc/lib/XvMC/XvMC.c diff -u xc/lib/XvMC/XvMC.c:1.5 xc/lib/XvMC/XvMC.c:1.6 --- xc/lib/XvMC/XvMC.c:1.5 Tue Oct 15 20:37:33 2002 +++ xc/lib/XvMC/XvMC.c Thu Mar 24 21:22:52 2005 @@ -1,9 +1,10 @@ -/* $XFree86: xc/lib/XvMC/XvMC.c,v 1.5 2002/10/16 00:37:33 dawes Exp $ */ +/* $XFree86: xc/lib/XvMC/XvMC.c,v 1.6 2005/03/25 02:22:52 dawes Exp $ */ #define NEED_REPLIES #include #include "XvMClibint.h" +#include "XvMChooks.h" #include #include Index: xc/lib/XvMC/XvMChooks.h diff -u /dev/null xc/lib/XvMC/XvMChooks.h:1.1 --- /dev/null Tue May 9 21:55:21 2006 +++ xc/lib/XvMC/XvMChooks.h Thu Mar 24 21:22:52 2005 @@ -0,0 +1,24 @@ +/* $XFree86: xc/lib/XvMC/XvMChooks.h,v 1.1 2005/03/25 02:22:52 dawes Exp $ */ + +/* + Definitions for temporary wire protocol hooks to be replaced + when a HW independent libXvMC is created. +*/ +extern Status _xvmc_create_context(Display *dpy, XvMCContext *context, + int *priv_count, CARD32 **priv_data); + +extern Status _xvmc_destroy_context(Display *dpy, XvMCContext *context); + +extern Status _xvmc_create_surface(Display *dpy, XvMCContext *context, + XvMCSurface *surface, int *priv_count, + CARD32 **priv_data); + +extern Status _xvmc_destroy_surface(Display *dpy, XvMCSurface *surface); + +extern Status _xvmc_create_subpicture(Display *dpy, XvMCContext *context, + XvMCSubpicture *subpicture, + int *priv_count, CARD32 **priv_data); + +extern Status _xvmc_destroy_subpicture(Display *dpy, + XvMCSubpicture *subpicture); + Index: xc/lib/XvMC/hw/i810/I810XvMC.c diff -u xc/lib/XvMC/hw/i810/I810XvMC.c:1.12 xc/lib/XvMC/hw/i810/I810XvMC.c:1.14 --- xc/lib/XvMC/hw/i810/I810XvMC.c:1.12 Fri Dec 10 11:06:58 2004 +++ xc/lib/XvMC/hw/i810/I810XvMC.c Fri Oct 14 11:16:00 2005 @@ -33,7 +33,7 @@ ** ** ***************************************************************************/ -/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.c,v 1.12 2004/12/10 16:06:58 alanh Exp $ */ +/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.c,v 1.14 2005/10/14 15:16:00 tsi Exp $ */ #include #include #include @@ -46,10 +46,11 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include "XvMChooks.h" #include "I810XvMC.h" static int error_base; @@ -132,7 +133,7 @@ i810XvMCContext *pI810XvMC; char busIdString[10]; int priv_count; - uint *priv_data; + CARD32 *priv_data; uint magic; Status ret; int major, minor; @@ -429,7 +430,7 @@ i810XvMCContext *pI810XvMC; i810XvMCSurface *pI810Surface; int priv_count; - uint *priv_data; + CARD32 *priv_data; Status ret; if((surface == NULL) || (context == NULL) || (display == NULL)){ @@ -3477,7 +3478,7 @@ i810XvMCContext *pI810XvMC; i810XvMCSubpicture *pI810Subpicture; int priv_count; - uint *priv_data; + CARD32 *priv_data; Status ret; if((subpicture == NULL) || (context == NULL) || (display == NULL)){ Index: xc/lib/XvMC/hw/i810/I810XvMC.h diff -u xc/lib/XvMC/hw/i810/I810XvMC.h:1.5 xc/lib/XvMC/hw/i810/I810XvMC.h:1.6 --- xc/lib/XvMC/hw/i810/I810XvMC.h:1.5 Fri Dec 10 11:06:58 2004 +++ xc/lib/XvMC/hw/i810/I810XvMC.h Thu Mar 24 21:22:52 2005 @@ -32,7 +32,7 @@ * * ***************************************************************************/ -/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.h,v 1.5 2004/12/10 16:06:58 alanh Exp $ */ +/* $XFree86: xc/lib/XvMC/hw/i810/I810XvMC.h,v 1.6 2005/03/25 02:22:52 dawes Exp $ */ #ifndef I810XVMC_H @@ -335,28 +335,6 @@ #define FLUSH(c) drmCommandNone(c->fd, DRM_I810_FLUSH) /* - Definitions for temporary wire protocol hooks to be replaced - when a HW independent libXvMC is created. -*/ -extern Status _xvmc_create_context(Display *dpy, XvMCContext *context, - int *priv_count, uint **priv_data); - -extern Status _xvmc_destroy_context(Display *dpy, XvMCContext *context); - -extern Status _xvmc_create_surface(Display *dpy, XvMCContext *context, - XvMCSurface *surface, int *priv_count, - uint **priv_data); - -extern Status _xvmc_destroy_surface(Display *dpy, XvMCSurface *surface); - -extern Status _xvmc_create_subpicture(Display *dpy, XvMCContext *context, - XvMCSubpicture *subpicture, - int *priv_count, uint **priv_data); - -extern Status _xvmc_destroy_subpicture(Display *dpy, - XvMCSubpicture *subpicture); - -/* Prototypes */ drmBufPtr i810_get_free_buffer(i810XvMCContext *pI810XvMC); Index: xc/lib/XvMC/hw/i810/Imakefile diff -u xc/lib/XvMC/hw/i810/Imakefile:1.6 xc/lib/XvMC/hw/i810/Imakefile:1.8 --- xc/lib/XvMC/hw/i810/Imakefile:1.6 Mon Feb 28 22:48:50 2005 +++ xc/lib/XvMC/hw/i810/Imakefile Fri Oct 14 11:16:00 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/XvMC/hw/i810/Imakefile,v 1.6 2005/03/01 03:48:50 dawes Exp $ +XCOMM $XFree86: xc/lib/XvMC/hw/i810/Imakefile,v 1.8 2005/10/14 15:16:00 tsi Exp $ #define DoNormalLib NormalLibXvMC #define DoSharedLib SharedLibXvMC #define DoDebugLib DebugLibXvMC @@ -18,7 +18,7 @@ #endif DEFINES = $(ALLOC_DEFINES) -DTRUE=1 -DFALSE=0 - INCLUDES = -I$(XINCLUDESRC) -I$(INCLUDESRC) -I$(XLIBSRC) -I$(EXTINCSRC) \ + INCLUDES = -I$(XVMCLIBSRC) \ -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(DRMINCLUDESDIR) \ -I$(XF86DRIVERSRC)/i810 SRCS = I810XvMC.c Index: xc/lib/Xxf86dga/XF86DGA2.c diff -u xc/lib/Xxf86dga/XF86DGA2.c:1.28 xc/lib/Xxf86dga/XF86DGA2.c:1.30 --- xc/lib/Xxf86dga/XF86DGA2.c:1.28 Thu Dec 30 22:30:39 2004 +++ xc/lib/Xxf86dga/XF86DGA2.c Fri Mar 17 18:40:12 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.28 2004/12/31 03:30:39 tsi Exp $ */ +/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.30 2006/03/17 23:40:12 dawes Exp $ */ /* Copyright (c) 1995 Jon Tombs @@ -768,7 +768,8 @@ #elif defined(SVR4) && defined(sun) #define DEV_MEM "/dev/xsvc" #elif defined(HAS_APERTURE_DRV) -#define DEV_MEM "/dev/xf86" +#define DEV_MEM "/dev/mem" +#define DEV_APERTURE "/dev/xf86" #else #define DEV_MEM "/dev/mem" #endif @@ -777,7 +778,7 @@ typedef struct _DGAMapRec{ mmapOffset physical; - unsigned char *virtual; + void *virtual; CARD32 size; int fd; int screen; @@ -964,23 +965,35 @@ if (!name) name = DEV_MEM; #endif - if ((pMap->fd = open(name, O_RDWR)) < 0) - return False; + pMap->virtual = (void *)-1; + if ((pMap->fd = open(name, O_RDWR)) >= 0) { #ifdef linux - /* - * If we are to mmap() something in /proc/bus/pci, ensure we mmap() PCI - * memory. Oddly enough the default seems to be PCI I/O for some kernels. - * Also, avoid having to #include here. - */ + /* + * If we are to mmap() something in /proc/bus/pci, ensure we mmap() PCI + * memory. Oddly enough the default seems to be PCI I/O for some + * kernels. Also, avoid having to #include here. + */ # ifndef PCIIOC_MMAP_IS_MEM # define PCIIOC_MMAP_IS_MEM \ (('P' << 24) | ('C' << 16) | ('I' << 8) | 0x02) # endif - if (!memcmp(name, "/proc/bus/pci/", 14)) - ioctl(pMap->fd, PCIIOC_MMAP_IS_MEM, 0); /* Ignore errors */ + if (!memcmp(name, "/proc/bus/pci/", 14)) + ioctl(pMap->fd, PCIIOC_MMAP_IS_MEM, 0); /* Ignore errors */ +#endif + pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, + MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); + } +#ifdef DEV_APERTURE + /* Try DEV_APERTURE if previous attempt failed. */ + if (pMap->virtual == (void *)-1) { + if (pMap->fd >= 0) + close(pMap->fd); + if ((pMap->fd = open(DEV_APERTURE, O_RDWR)) >= 0) { + pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, + MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); + } + } #endif - pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE, - MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base); if (pMap->virtual == (void *)-1) return False; mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE); Index: xc/lib/Xxf86rush/XF86Rush.c diff -u xc/lib/Xxf86rush/XF86Rush.c:1.6 xc/lib/Xxf86rush/XF86Rush.c:1.7 --- xc/lib/Xxf86rush/XF86Rush.c:1.6 Tue Oct 15 20:37:34 2002 +++ xc/lib/Xxf86rush/XF86Rush.c Sun Mar 27 21:50:59 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/Xxf86rush/XF86Rush.c,v 1.6 2002/10/16 00:37:34 dawes Exp $ */ +/* $XFree86: xc/lib/Xxf86rush/XF86Rush.c,v 1.7 2005/03/28 02:50:59 dawes Exp $ */ /* Copyright (c) 1998 Daryll Strauss @@ -27,7 +27,7 @@ * * *****************************************************************************/ -static int close_display(); +static int close_display(Display *dpy, XExtCodes *codes); static /* const */ XExtensionHooks xf86rush_extension_hooks = { NULL, /* create_gc */ NULL, /* copy_gc */ Index: xc/lib/Xxf86vm/XF86VMode.c diff -u xc/lib/Xxf86vm/XF86VMode.c:3.34 xc/lib/Xxf86vm/XF86VMode.c:3.35 --- xc/lib/Xxf86vm/XF86VMode.c:3.34 Sat Dec 21 19:46:51 2002 +++ xc/lib/Xxf86vm/XF86VMode.c Mon Jan 9 09:59:26 2006 @@ -1,5 +1,4 @@ -/* $XConsortium: XF86VMode.c /main/2 1995/11/14 18:17:58 kaleb $ */ -/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.34 2002/12/22 00:46:51 dawes Exp $ */ +/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.35 2006/01/09 14:59:26 dawes Exp $ */ /* Copyright (c) 1995 Kaleb S. KEITHLEY Index: xc/lib/apple/AppleWM.man diff -u xc/lib/apple/AppleWM.man:1.2 xc/lib/apple/AppleWM.man:1.3 --- xc/lib/apple/AppleWM.man:1.2 Mon Sep 15 20:36:08 2003 +++ xc/lib/apple/AppleWM.man Tue Jul 5 12:37:57 2005 @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/lib/apple/AppleWM.man,v 1.2 2003/09/16 00:36:08 torrey Exp $ +.\" $XFree86: xc/lib/apple/AppleWM.man,v 1.3 2005/07/05 16:37:57 tsi Exp $ .\" .\" Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved. .\" Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved. @@ -124,13 +124,13 @@ .B Events .nf typedef struct { - int type; \/* of event *\/ - unsigned long serial; \/* # of last request processed by server *\/ - Bool send_event; \/* true if came from a SendEvent request *\/ - Display *display; \/* Display the event was read from *\/ - Window window; \/* window of event *\/ - Time time; \/* server timestamp when event happened *\/ - int kind; \/* subtype of event *\/ + int type; /\&* of event *\&/ + unsigned long serial; /\&* # of last request processed by server *\&/ + Bool send_event; /\&* true if came from a SendEvent request *\&/ + Display *display; /\&* Display the event was read from *\&/ + Window window; /\&* window of event *\&/ + Time time; /\&* server timestamp when event happened *\&/ + int kind; /\&* subtype of event *\&/ int arg; } XAppleWMNotifyEvent; .fi Index: xc/lib/apple/Imakefile diff -u xc/lib/apple/Imakefile:1.1 xc/lib/apple/Imakefile:1.3 --- xc/lib/apple/Imakefile:1.1 Tue Aug 12 19:47:10 2003 +++ xc/lib/apple/Imakefile Fri Oct 14 11:16:00 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/apple/Imakefile,v 1.1 2003/08/12 23:47:10 torrey Exp $ +XCOMM $XFree86: xc/lib/apple/Imakefile,v 1.3 2005/10/14 15:16:00 tsi Exp $ #define DoNormalLib NormalLibAppleWM @@ -20,8 +20,12 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL #endif - DEFINES = $(ALLOC_DEFINES) - INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) +#if DoSharedLib && defined(SharedAllocateLocalDefines) +#undef AllocateLocalDefines +#define AllocateLocalDefines SharedAllocateLocalDefines +#endif + + DEFINES = $(ALLOC_DEFINES) AllocateLocalDefines SRCS = applewm.c OBJS = applewm.o LINTLIBS = $(LINTXLIB) Index: xc/lib/apple/applewm.c diff -u xc/lib/apple/applewm.c:1.1 xc/lib/apple/applewm.c:1.5 --- xc/lib/apple/applewm.c:1.1 Tue Aug 12 19:47:10 2003 +++ xc/lib/apple/applewm.c Fri Oct 14 11:16:00 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/apple/applewm.c,v 1.1 2003/08/12 23:47:10 torrey Exp $ */ +/* $XFree86: xc/lib/apple/applewm.c,v 1.5 2005/10/14 15:16:00 tsi Exp $ */ /************************************************************************** Copyright (c) 2002 Apple Computer, Inc. @@ -31,10 +31,11 @@ #define NEED_EVENTS #define NEED_REPLIES #include -#include "applewmstr.h" +#include #include -#include "extutil.h" +#include #include +#include static XExtensionInfo _applewm_info_data; static XExtensionInfo *applewm_info = &_applewm_info_data; @@ -50,8 +51,8 @@ *****************************************************************************/ static int close_display(Display *dpy, XExtCodes *extCodes); -static Bool wire_to_event(); -static Status event_to_wire(); +static Bool wire_to_event (Display *dpy, XEvent *re, xEvent *event); +static Status event_to_wire (Display *dpy, XEvent *re, xEvent *event); static /* const */ XExtensionHooks applewm_extension_hooks = { NULL, /* create_gc */ @@ -74,10 +75,8 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, applewm_info) -static Bool wire_to_event (dpy, re, event) - Display *dpy; - XEvent *re; - xEvent *event; +static Bool +wire_to_event (Display *dpy, XEvent *re, xEvent *event) { XExtDisplayInfo *info = find_display (dpy); XAppleWMNotifyEvent *se; @@ -104,10 +103,8 @@ return False; } -static Status event_to_wire (dpy, re, event) - Display *dpy; - XEvent *re; - xEvent *event; +static Status +event_to_wire (Display *dpy, XEvent *re, xEvent *event) { XExtDisplayInfo *info = find_display (dpy); XAppleWMNotifyEvent *se; @@ -145,9 +142,8 @@ #endif -Bool XAppleWMQueryExtension (dpy, event_basep, error_basep) - Display *dpy; - int *event_basep, *error_basep; +Bool +XAppleWMQueryExtension (Display *dpy, int *event_basep, int *error_basep) { XExtDisplayInfo *info = find_display (dpy); @@ -163,11 +159,9 @@ } } -Bool XAppleWMQueryVersion(dpy, majorVersion, minorVersion, patchVersion) - Display* dpy; - int* majorVersion; - int* minorVersion; - int* patchVersion; +Bool +XAppleWMQueryVersion(Display *dpy, int *majorVersion, int *minorVersion, + int *patchVersion) { XExtDisplayInfo *info = find_display (dpy); xAppleWMQueryVersionReply rep; @@ -195,9 +189,8 @@ return True; } -Bool XAppleWMDisableUpdate(dpy, screen) - Display* dpy; - int screen; +Bool +XAppleWMDisableUpdate(Display *dpy, int screen) { XExtDisplayInfo *info = find_display (dpy); xAppleWMDisableUpdateReq *req; @@ -216,9 +209,8 @@ return True; } -Bool XAppleWMReenableUpdate(dpy, screen) - Display* dpy; - int screen; +Bool +XAppleWMReenableUpdate(Display *dpy, int screen) { XExtDisplayInfo *info = find_display (dpy); xAppleWMReenableUpdateReq *req; @@ -237,9 +229,8 @@ return True; } -Bool XAppleWMSelectInput(dpy, mask) - Display* dpy; - unsigned long mask; +Bool +XAppleWMSelectInput(Display *dpy, unsigned long mask) { XExtDisplayInfo *info = find_display (dpy); xAppleWMSelectInputReq *req; @@ -258,11 +249,9 @@ return True; } -Bool XAppleWMSetWindowMenuWithShortcuts(dpy, nitems, items, shortcuts) - Display* dpy; - int nitems; - const char **items; - const char *shortcuts; +Bool +XAppleWMSetWindowMenuWithShortcuts(Display *dpy, int nitems, + const char **items, const char *shortcuts) { XExtDisplayInfo *info = find_display (dpy); xAppleWMSetWindowMenuReq *req; @@ -301,17 +290,14 @@ return True; } -Bool XAppleWMSetWindowMenu(dpy, nitems, items) - Display* dpy; - int nitems; - const char **items; +Bool +XAppleWMSetWindowMenu(Display *dpy, int nitems, const char **items) { return XAppleWMSetWindowMenuWithShortcuts (dpy, nitems, items, NULL); } -Bool XAppleWMSetWindowMenuCheck(dpy, idx) - Display* dpy; - int idx; +Bool +XAppleWMSetWindowMenuCheck(Display *dpy, int idx) { XExtDisplayInfo *info = find_display (dpy); xAppleWMSetWindowMenuCheckReq *req; @@ -330,8 +316,8 @@ return True; } -Bool XAppleWMSetFrontProcess(dpy) - Display* dpy; +Bool +XAppleWMSetFrontProcess(Display *dpy) { XExtDisplayInfo *info = find_display (dpy); xAppleWMSetFrontProcessReq *req; @@ -349,10 +335,8 @@ return True; } -Bool XAppleWMSetWindowLevel(dpy, id, level) - Display* dpy; - Window id; - int level; +Bool +XAppleWMSetWindowLevel(Display *dpy, Window id, int level) { XExtDisplayInfo *info = find_display (dpy); xAppleWMSetWindowLevelReq *req; @@ -372,9 +356,8 @@ return True; } -Bool XAppleWMSetCanQuit(dpy, state) - Display* dpy; - Bool state; +Bool +XAppleWMSetCanQuit(Display *dpy, Bool state) { XExtDisplayInfo *info = find_display (dpy); xAppleWMSetCanQuitReq *req; @@ -393,13 +376,11 @@ return True; } -Bool XAppleWMFrameGetRect(dpy, frame_class, frame_rect, - ix, iy, iw, ih, ox, oy, ow, oh, rx, ry, rw, rh) - Display* dpy; - unsigned int frame_class, frame_rect; - short ix, iy, iw, ih; - short ox, oy, ow, oh; - short *rx, *ry, *rw, *rh; +Bool +XAppleWMFrameGetRect(Display *dpy, unsigned int frame_class, + unsigned int frame_rect, short ix, short iy, short iw, + short ih, short ox, short oy, short ow, short oh, + short *rx, short *ry, short *rw, short *rh) { XExtDisplayInfo *info = find_display (dpy); xAppleWMFrameGetRectReply rep; @@ -437,13 +418,10 @@ return True; } -unsigned int XAppleWMFrameHitTest(dpy, frame_class, px, py, - ix, iy, iw, ih, ox, oy, ow, oh) - Display* dpy; - unsigned int frame_class; - short px, py; - short ix, iy, iw, ih; - short ox, oy, ow, oh; +unsigned int +XAppleWMFrameHitTest(Display *dpy, unsigned int frame_class, + short px, short py, short ix, short iy, short iw, + short ih, short ox, short oy, short ow, short oh) { XExtDisplayInfo *info = find_display (dpy); xAppleWMFrameHitTestReply rep; @@ -480,18 +458,13 @@ return rep.ret; } -Bool XAppleWMFrameDraw(dpy, screen, window, - frame_class, frame_attr, - ix, iy, iw, ih, ox, oy, ow, oh, - title_length, title_bytes) - Display* dpy; - int screen; - Window window; - unsigned int frame_class, frame_attr; - short ix, iy, iw, ih; - short ox, oy, ow, oh; - unsigned int title_length; - const unsigned char *title_bytes; +Bool +XAppleWMFrameDraw(Display *dpy, int screen, Window window, + unsigned int frame_class, unsigned int frame_attr, + short ix, short iy, short iw, short ih, + short ox, short oy, short ow, short oh, + unsigned int title_length, + const unsigned char *title_bytes) { XExtDisplayInfo *info = find_display (dpy); xAppleWMFrameDrawReq *req; @@ -518,7 +491,7 @@ req->title_length = title_length; req->length += (title_length + 3)>>2; - Data (dpy, title_bytes, title_length); + Data (dpy, (const char *)title_bytes, title_length); UnlockDisplay(dpy); SyncHandle(); Index: xc/lib/dmx/Imakefile diff -u xc/lib/dmx/Imakefile:1.3 xc/lib/dmx/Imakefile:1.4 --- xc/lib/dmx/Imakefile:1.3 Fri Feb 4 21:01:39 2005 +++ xc/lib/dmx/Imakefile Fri Oct 14 11:16:00 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/dmx/Imakefile,v 1.3 2005/02/05 02:01:39 dawes Exp $ +XCOMM $XFree86: xc/lib/dmx/Imakefile,v 1.4 2005/10/14 15:16:00 tsi Exp $ #define DoNormalLib NormalLibDmx #define DoExtraLib ExtraLibDmx @@ -21,7 +21,6 @@ #endif DEFINES = $(ALLOC_DEFINES) - INCLUDES = -I$(XLIBSRC) -I$(EXTINCSRC) SRCS = dmx.c OBJS = dmx.o LINTLIBS = $(LINTXLIB) Index: xc/lib/dmx/dmx.c diff -u xc/lib/dmx/dmx.c:1.1 xc/lib/dmx/dmx.c:1.2 --- xc/lib/dmx/dmx.c:1.1 Wed Jun 30 16:21:37 2004 +++ xc/lib/dmx/dmx.c Fri Oct 14 11:16:00 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/dmx/dmx.c,v 1.1 2004/06/30 20:21:37 martin Exp $ */ +/* $XFree86: xc/lib/dmx/dmx.c,v 1.2 2005/10/14 15:16:00 tsi Exp $ */ /* * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. * @@ -41,11 +41,11 @@ #define NEED_REPLIES #include -#include "Xext.h" +#include #define EXTENSION_PROC_ARGS void * -#include "extutil.h" -#include "dmxproto.h" -#include "dmxext.h" +#include +#include +#include static XExtensionInfo dmx_extension_info_data; static XExtensionInfo *dmx_extension_info = &dmx_extension_info_data; Index: xc/lib/dps/Xlibnet.h diff -u xc/lib/dps/Xlibnet.h:1.8 xc/lib/dps/Xlibnet.h:1.9 --- xc/lib/dps/Xlibnet.h:1.8 Sat Apr 3 17:26:21 2004 +++ xc/lib/dps/Xlibnet.h Mon Jan 9 09:59:26 2006 @@ -1,5 +1,3 @@ -/* $XConsortium: Xlibnet.h,v 1.18 91/07/23 19:01:27 rws Exp $ */ - /* Copyright 1991 Massachusetts Institute of Technology @@ -13,7 +11,7 @@ suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/lib/dps/Xlibnet.h,v 1.8 2004/04/03 22:26:21 dawes Exp $ */ +/* $XFree86: xc/lib/dps/Xlibnet.h,v 1.9 2006/01/09 14:59:26 dawes Exp $ */ /* * Xlibnet.h - Xlib networking include files for UNIX Systems. */ Index: xc/lib/dps/Xstreams.h diff -u xc/lib/dps/Xstreams.h:1.1 xc/lib/dps/Xstreams.h:1.2 --- xc/lib/dps/Xstreams.h:1.1 Tue Feb 15 09:51:21 2000 +++ xc/lib/dps/Xstreams.h Mon Jan 9 09:59:26 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: Xstreams.h,v 1.6 91/07/19 23:22:53 gildea Exp $ */ /* Copyright (c) 1990, 1991 UNIX System Laboratories, Inc. */ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ @@ -22,7 +21,7 @@ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/dps/Xstreams.h,v 1.1 2000/02/15 14:51:21 dawes Exp $ */ +/* $XFree86: xc/lib/dps/Xstreams.h,v 1.2 2006/01/09 14:59:26 dawes Exp $ */ #ifndef _XSTREAMS_H_ Index: xc/lib/dps/cslibint.h diff -u xc/lib/dps/cslibint.h:1.5 xc/lib/dps/cslibint.h:1.6 --- xc/lib/dps/cslibint.h:1.5 Sat Apr 3 17:26:21 2004 +++ xc/lib/dps/cslibint.h Thu Mar 24 21:22:52 2005 @@ -47,7 +47,7 @@ * * Author: Adobe Systems Incorporated and MIT X Consortium */ -/* $XFree86: xc/lib/dps/cslibint.h,v 1.5 2004/04/03 22:26:21 dawes Exp $ */ +/* $XFree86: xc/lib/dps/cslibint.h,v 1.6 2005/03/25 02:22:52 dawes Exp $ */ /* * XlibInternal.h - Header definition and support file for the internal @@ -291,12 +291,14 @@ extern void N_XWaitForReadable(Display *); extern void N_XWaitForWritable(Display *); +#if 0 extern void XDPSGetDefaultColorMaps( Display *dpy, Screen *screen, Drawable drawable, XStandardColormap *colorCube, XStandardColormap *grayRamp); +#endif #endif /* _CSLIBINT_H */ Index: xc/lib/dps/dpsXcmu.c diff -u xc/lib/dps/dpsXcmu.c:1.5 xc/lib/dps/dpsXcmu.c:1.6 --- xc/lib/dps/dpsXcmu.c:1.5 Wed Jul 25 11:04:54 2001 +++ xc/lib/dps/dpsXcmu.c Thu Mar 24 21:22:52 2005 @@ -54,7 +54,7 @@ * * Author: Adobe Systems Incorporated and Donna Converse, MIT X Consortium */ -/* $XFree86: xc/lib/dps/dpsXcmu.c,v 1.5 2001/07/25 15:04:54 dawes Exp $ */ +/* $XFree86: xc/lib/dps/dpsXcmu.c,v 1.6 2005/03/25 02:22:52 dawes Exp $ */ #include #include @@ -67,6 +67,7 @@ #include #include "dpsassert.h" +#include "DPS/dpsXclient.h" #include "cslibint.h" /* Defines for standard colormap routines */ @@ -103,7 +104,6 @@ static Bool CubicCube(XStandardColormap *); static Bool GetColorCubeFromProperty(Display *, XVisualInfo *, XStandardColormap *, XStandardColormap **, int *); static Bool GetGrayRampFromProperty(Display *, XVisualInfo *, XStandardColormap *, XStandardColormap **, int *); -Status XDPSCreateStandardColormaps(Display *, Drawable, Visual *, int, int, int, int, XStandardColormap *, XStandardColormap *, Bool); static Status contiguous(unsigned long *, int, int *, unsigned long, int *, int *); static XVisualInfo *PickCorrectVisual(Display *, XVisualInfo *, int, Colormap); static int FindRampSize(XColor *, XColor *); Index: xc/lib/dps/dpsassert.h diff -u xc/lib/dps/dpsassert.h:1.2 xc/lib/dps/dpsassert.h:1.3 --- xc/lib/dps/dpsassert.h:1.2 Thu May 18 19:46:13 2000 +++ xc/lib/dps/dpsassert.h Thu Mar 24 21:22:52 2005 @@ -35,18 +35,18 @@ * * Author: Adobe Systems Incorporated */ +/* $XFree86: xc/lib/dps/dpsassert.h,v 1.3 2005/03/25 02:22:52 dawes Exp $ */ #ifndef DPSASSERT_H #define DPSASSERT_H #include "DPS/dpsclient.h" -#define DPSAssertWarn(cndtn, cntxt, mssg)\ - if (!(cndtn)) DPSWarnProc((DPSContext)(cntxt),(mssg)) - extern void DPSWarnProc(DPSContext ctxt, char *msg); extern void DPSFatalProc(DPSContext ctxt, char *msg); -extern void DPSCantHappen(void); + +#define DPSAssertWarn(cndtn, cntxt, mssg)\ + if (!(cndtn)) DPSWarnProc((DPSContext)(cntxt),(mssg)) #define DPSAssert(condition) \ if (! (condition)) DPSCantHappen(); Index: xc/lib/dps/dpsclient.c diff -u xc/lib/dps/dpsclient.c:1.3 xc/lib/dps/dpsclient.c:1.5 --- xc/lib/dps/dpsclient.c:1.3 Tue Sep 26 11:56:59 2000 +++ xc/lib/dps/dpsclient.c Tue Mar 29 13:17:00 2005 @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/lib/dps/dpsclient.c,v 1.3 2000/09/26 15:56:59 tsi Exp $ */ +/* $XFree86: xc/lib/dps/dpsclient.c,v 1.5 2005/03/29 18:17:00 tsi Exp $ */ #include #include @@ -420,10 +420,12 @@ void DPSclientPrintProc ( DPSContext ctxt, - char *buf, - unsigned nch) + char *buffer, + unsigned nchar) { - DPSPrivContext cc = (DPSPrivContext) ctxt; + volatile DPSPrivContext cc = (DPSPrivContext) ctxt; + char * volatile buf = buffer; + volatile unsigned nch = nchar; #define DPS_SEQ_MIN 2 @@ -442,8 +444,8 @@ } } while (nch > 0) { - char *oldBuf = NIL; - unsigned oldNch = 0; + char * volatile oldBuf = NIL; + volatile unsigned oldNch = 0; unsigned n; if (cc->objBuf) { /* we're buffering */ unsigned long int m; @@ -2051,13 +2053,15 @@ } static void textInnerWritePostScript( - DPSContext ctxt, char *buf, unsigned int nch) + DPSContext ctxt, char * buffer, unsigned int nchar) { DPSPrivContext cc = (DPSPrivContext)ctxt; + char * volatile buf = buffer; + volatile unsigned int nch = nchar; while (nch > 0) { - char *oldBuf = NIL; - integer oldNch = 0; - unsigned n; + char * volatile oldBuf = NIL; + volatile integer oldNch = 0; + volatile unsigned n; if (cc->outBuf) { /* we're buffering */ unsigned m; integer bst; @@ -2129,7 +2133,7 @@ if (nch != 0) { /* here with the next binary object sequence or encoded token */ - unsigned m = 0; + volatile unsigned m = 0; integer bst; if (!IsBinaryToken(buf[0]) && nch < DPS_SEQ_MIN) { /* gotta buffer it */ Index: xc/lib/dpstk/Imakefile diff -u xc/lib/dpstk/Imakefile:1.7 xc/lib/dpstk/Imakefile:1.8 --- xc/lib/dpstk/Imakefile:1.7 Sun Apr 4 22:33:13 2004 +++ xc/lib/dpstk/Imakefile Tue Jun 7 04:02:15 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/dpstk/Imakefile,v 1.7 2004/04/05 02:33:13 dawes Exp $ +XCOMM $XFree86: xc/lib/dpstk/Imakefile,v 1.8 2005/06/07 08:02:15 dawes Exp $ #define DoNormalLib NormalLibDpsTk #define DoSharedLib SharedLibDpsTk @@ -48,10 +48,16 @@ .SUFFIXES: .psw -.psw.c : +.psw.c : HostProgramTargetName($(PSWRAP)) RunProgram(PSWRAP,-o $*.c -a -f $*.h -h $*.h $<) +HostProgramTargetName($(PSWRAP)): + @echo "checking $@ over in $(PSWRAPSRC) first..."; \ + cd $(PSWRAPSRC) && $(MAKE) pswraponly; \ + echo "okay, continuing in $(CURRENT_DIR)" + includes:: $(SRCS) +depend:: $(SRCS) #if HasMotif Index: xc/lib/expat/Imakefile diff -u xc/lib/expat/Imakefile:1.10 xc/lib/expat/Imakefile:1.11 --- xc/lib/expat/Imakefile:1.10 Sun Apr 4 22:33:13 2004 +++ xc/lib/expat/Imakefile Fri Oct 14 11:16:01 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/expat/Imakefile,v 1.10 2004/04/05 02:33:13 dawes Exp $ +XCOMM $XFree86: xc/lib/expat/Imakefile,v 1.11 2005/10/14 15:16:01 tsi Exp $ #define DoNormalLib NormalLibExpat #define DoSharedLib SharedLibExpat @@ -19,7 +19,7 @@ EXPATSRC = $(EXPATTOP)/lib EXPATINC = $(EXPATTOP)/lib -INCLUDES = -I$(EXPATINC) -I$(EXPATTOP) -I. +INCLUDES = -I$(EXPATINC) -I$(EXPATTOP) /* * Endianness (for short's) Index: xc/lib/font/Imakefile diff -u xc/lib/font/Imakefile:3.40 xc/lib/font/Imakefile:3.42 --- xc/lib/font/Imakefile:3.40 Fri Apr 30 21:29:57 2004 +++ xc/lib/font/Imakefile Sun Feb 19 10:51:13 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:24 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/font/Imakefile,v 3.40 2004/05/01 01:29:57 dawes Exp $ +XCOMM $XFree86: xc/lib/font/Imakefile,v 3.42 2006/02/19 15:51:13 tsi Exp $ #include @@ -27,7 +22,7 @@ #define LibInstall NO #endif -#if BuildLibraries +#if BuildLibraries || BuildServer STUBDIRS = stubs #endif Index: xc/lib/font/FreeType/Imakefile diff -u xc/lib/font/FreeType/Imakefile:1.31 xc/lib/font/FreeType/Imakefile:1.32 --- xc/lib/font/FreeType/Imakefile:1.31 Thu Nov 20 17:36:34 2003 +++ xc/lib/font/FreeType/Imakefile Fri Oct 14 11:16:01 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/FreeType/Imakefile,v 1.31 2003/11/20 22:36:34 dawes Exp $ +XCOMM $XFree86: xc/lib/font/FreeType/Imakefile,v 1.32 2005/10/14 15:16:01 tsi Exp $ #if BuildServer && DoLoadableServer #define IHaveSubdirs @@ -13,9 +13,8 @@ FT2SOURCEDIR = $(TOP)/extras/freetype2/src FT2INCS = $(FREETYPE2INCLUDES) -INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/include -I$(FT2SOURCEDIR)/truetype \ - -I$(INCLUDESRC) +INCLUDES = $(FT2INCS) -I../include -I$(SERVERSRC)/include \ + -I$(FT2SOURCEDIR)/truetype SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c OBJS = xttcap.o ftfuncs.o ftenc.o fttools.o Index: xc/lib/font/FreeType/ftenc.c diff -u xc/lib/font/FreeType/ftenc.c:1.25 xc/lib/font/FreeType/ftenc.c:1.26 --- xc/lib/font/FreeType/ftenc.c:1.25 Thu Nov 20 17:36:34 2003 +++ xc/lib/font/FreeType/ftenc.c Fri Oct 14 11:16:01 2005 @@ -19,19 +19,19 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.25 2003/11/20 22:36:34 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftenc.c,v 1.26 2005/10/14 15:16:01 tsi Exp $ */ #ifndef FONTMODULE #include #else -#include "Xmd.h" -#include "Xdefs.h" +#include +#include #include "xf86_ansic.h" #endif #include "fntfilst.h" #include "fontutil.h" -#include "FSproto.h" +#include #include "fontmisc.h" #include "fontenc.h" Index: xc/lib/font/FreeType/ftfuncs.c diff -u xc/lib/font/FreeType/ftfuncs.c:1.45 xc/lib/font/FreeType/ftfuncs.c:1.46 --- xc/lib/font/FreeType/ftfuncs.c:1.45 Wed Apr 14 11:32:43 2004 +++ xc/lib/font/FreeType/ftfuncs.c Fri Oct 14 11:16:01 2005 @@ -26,7 +26,7 @@ THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.45 2004/04/14 15:32:43 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.46 2005/10/14 15:16:01 tsi Exp $ */ #include "fontmisc.h" @@ -34,14 +34,14 @@ #include #include #else -#include "Xmd.h" -#include "Xdefs.h" +#include +#include #include "xf86_ansic.h" #endif #include "fntfilst.h" #include "fontutil.h" -#include "FSproto.h" +#include #include #include FT_FREETYPE_H #include FT_SIZES_H Index: xc/lib/font/FreeType/ftsystem.c diff -u xc/lib/font/FreeType/ftsystem.c:1.3 xc/lib/font/FreeType/ftsystem.c:1.5 --- xc/lib/font/FreeType/ftsystem.c:1.3 Mon Sep 30 20:02:10 2002 +++ xc/lib/font/FreeType/ftsystem.c Fri Oct 14 11:16:01 2005 @@ -18,7 +18,7 @@ /***************************************************************************/ /* Modified for XFree86 */ -/* $XFree86: xc/lib/font/FreeType/ftsystem.c,v 1.3 2002/10/01 00:02:10 alanh Exp $ */ +/* $XFree86: xc/lib/font/FreeType/ftsystem.c,v 1.5 2005/10/14 15:16:01 tsi Exp $ */ /*************************************************************************/ /* */ @@ -36,14 +36,16 @@ #include FT_SYSTEM_H #include FT_ERRORS_H #include FT_TYPES_H +#include FT_INTERNAL_OBJECTS_H +#include FT_INTERNAL_STREAM_H #ifndef FONTMODULE #include #include #else -#include "Xmd.h" +#include #define _XTYPEDEF_BOOL -#include "Xdefs.h" +#include #define DONT_DEFINE_WRAPPERS #include "xf86_ansic.h" #undef DONT_DEFINE_WRAPPERS Index: xc/lib/font/FreeType/fttools.c diff -u xc/lib/font/FreeType/fttools.c:1.8 xc/lib/font/FreeType/fttools.c:1.9 --- xc/lib/font/FreeType/fttools.c:1.8 Sat Oct 23 11:29:26 2004 +++ xc/lib/font/FreeType/fttools.c Fri Oct 14 11:16:01 2005 @@ -21,19 +21,19 @@ THE SOFTWARE. */ -/* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.8 2004/10/23 15:29:26 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/fttools.c,v 1.9 2005/10/14 15:16:01 tsi Exp $ */ #include "fontmisc.h" #ifndef FONTMODULE #include #include #else -#include "Xmd.h" -#include "Xdefs.h" +#include +#include #include "xf86_ansic.h" #endif -#include "font.h" +#include #include #include FT_FREETYPE_H #include FT_SFNT_NAMES_H Index: xc/lib/font/FreeType/xttcap.c diff -u xc/lib/font/FreeType/xttcap.c:1.2 xc/lib/font/FreeType/xttcap.c:1.3 --- xc/lib/font/FreeType/xttcap.c:1.2 Mon Feb 23 20:13:04 2004 +++ xc/lib/font/FreeType/xttcap.c Fri Oct 14 11:16:01 2005 @@ -30,7 +30,7 @@ Notice=== */ -/* $XFree86: xc/lib/font/FreeType/xttcap.c,v 1.2 2004/02/24 01:13:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/xttcap.c,v 1.3 2005/10/14 15:16:01 tsi Exp $ */ /* #include "xttversion.h" @@ -45,8 +45,8 @@ #include #include #else -#include "Xmd.h" -#include "Xdefs.h" +#include +#include #include "xf86_ansic.h" #endif /* Index: xc/lib/font/FreeType/module/Imakefile diff -u xc/lib/font/FreeType/module/Imakefile:1.22 xc/lib/font/FreeType/module/Imakefile:1.23 --- xc/lib/font/FreeType/module/Imakefile:1.22 Mon May 31 20:16:57 2004 +++ xc/lib/font/FreeType/module/Imakefile Fri Oct 14 11:16:01 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/FreeType/module/Imakefile,v 1.22 2004/06/01 00:16:57 dawes Exp $ +XCOMM $XFree86: xc/lib/font/FreeType/module/Imakefile,v 1.23 2005/10/14 15:16:01 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -54,9 +54,9 @@ DEFINES = -DFONTMODULE Freetype2BuildDefines -DXFREE86_FT2 -INCLUDES = -I. -I.. -I$(FONTINCSRC) -I../../include -I$(XINCLUDESRC) \ +INCLUDES = -I.. -I../../include \ -I$(SERVERSRC)/include \ - -I$(FT2INCDIR) \ + -I$(FT2INCDIR) \ -I$(FT2SOURCEDIR)/base \ -I$(FT2SOURCEDIR)/gzip \ -I$(FT2SOURCEDIR)/lzw \ @@ -70,8 +70,7 @@ -I$(FT2SOURCEDIR)/pshinter \ -I$(FT2SOURCEDIR)/autohint \ -I$(FT2SOURCEDIR)/bdf \ - -I$(FT2SOURCEDIR)/pcf \ - -I$(INCLUDESRC) + -I$(FT2SOURCEDIR)/pcf FT2SRCS = ftbase.c ftinit.c ftglyph.c ftbbox.c ftsystem.c fttype1.c ftxf86.c \ ftgzip.c ftlzw.c raster.c sfnt.c truetype.c cff.c type1.c \ Index: xc/lib/font/FreeType/module/ftmodule.c diff -u xc/lib/font/FreeType/module/ftmodule.c:1.19 xc/lib/font/FreeType/module/ftmodule.c:1.20 --- xc/lib/font/FreeType/module/ftmodule.c:1.19 Fri Feb 13 18:58:29 2004 +++ xc/lib/font/FreeType/module/ftmodule.c Thu Mar 16 11:49:44 2006 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2002 The XFree86 Project, Inc. + * Copyright (C) 1998-2006 The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -44,12 +44,12 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/lib/font/FreeType/module/ftmodule.c,v 1.19 2004/02/13 23:58:29 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/module/ftmodule.c,v 1.20 2006/03/16 16:49:44 dawes Exp $ */ #include "misc.h" -#include "fontmod.h" #include "xf86Module.h" +#include "fontmod.h" static MODULESETUPPROTO(freetypeSetup); @@ -83,7 +83,7 @@ }; static pointer -freetypeSetup(pointer module, pointer opts, int *errmaj, int *errmin) +freetypeSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { freetypeModule.module = module; LoadFont(&freetypeModule); Index: xc/lib/font/FreeType/module/ftoption.h diff -u xc/lib/font/FreeType/module/ftoption.h:1.2 xc/lib/font/FreeType/module/ftoption.h:1.3 --- xc/lib/font/FreeType/module/ftoption.h:1.2 Mon Apr 26 12:15:56 2004 +++ xc/lib/font/FreeType/module/ftoption.h Mon Mar 28 23:00:30 2005 @@ -1,3 +1,4 @@ +/* $XFree86: xc/lib/font/FreeType/module/ftoption.h,v 1.3 2005/03/29 04:00:30 tsi Exp $ */ /***************************************************************************/ /* */ /* ftoption.h */ Index: xc/lib/font/FreeType/module/ftstdlib.h diff -u xc/lib/font/FreeType/module/ftstdlib.h:1.3 xc/lib/font/FreeType/module/ftstdlib.h:1.4 --- xc/lib/font/FreeType/module/ftstdlib.h:1.3 Thu Dec 30 21:56:03 2004 +++ xc/lib/font/FreeType/module/ftstdlib.h Fri Oct 14 11:16:01 2005 @@ -1,5 +1,5 @@ /* ftstdlib.h -- modified for XFree86. */ -/* $XFree86: xc/lib/font/FreeType/module/ftstdlib.h,v 1.3 2004/12/31 02:56:03 tsi Exp $ */ +/* $XFree86: xc/lib/font/FreeType/module/ftstdlib.h,v 1.4 2005/10/14 15:16:01 tsi Exp $ */ /***************************************************************************/ /* */ @@ -139,9 +139,9 @@ #else -#include "Xmd.h" +#include #define _XTYPEDEF_BOOL -#include "Xdefs.h" +#include #define DONT_DEFINE_WRAPPERS #define DEFINE_SETJMP_WRAPPERS #include "xf86_ansic.h" Index: xc/lib/font/FreeType/module/fttypes.h diff -u xc/lib/font/FreeType/module/fttypes.h:1.1 xc/lib/font/FreeType/module/fttypes.h:1.2 --- xc/lib/font/FreeType/module/fttypes.h:1.1 Wed Nov 19 21:35:40 2003 +++ xc/lib/font/FreeType/module/fttypes.h Fri Oct 14 11:16:01 2005 @@ -16,7 +16,7 @@ /* understand and accept it fully. */ /* */ /***************************************************************************/ -/* $XFree86: xc/lib/font/FreeType/module/fttypes.h,v 1.1 2003/11/20 02:35:40 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/module/fttypes.h,v 1.2 2005/10/14 15:16:01 tsi Exp $ */ #ifndef __FTTYPES_H__ #define __FTTYPES_H__ @@ -30,9 +30,9 @@ #ifndef FONTMODULE #include #else -#include "Xmd.h" +#include #define _XTYPEDEF_BOOL -#include "Xdefs.h" +#include #include "xf86_ansic.h" #ifndef size_t #define DONT_DEFINE_WRAPPERS Index: xc/lib/font/FreeType/module/xttmodule.c diff -u xc/lib/font/FreeType/module/xttmodule.c:1.1 xc/lib/font/FreeType/module/xttmodule.c:1.2 --- xc/lib/font/FreeType/module/xttmodule.c:1.1 Wed Mar 17 14:48:33 2004 +++ xc/lib/font/FreeType/module/xttmodule.c Thu Mar 16 11:49:44 2006 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2004 The XFree86 Project, Inc. + * Copyright (C) 1998-2006 The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -44,7 +44,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/lib/font/FreeType/module/xttmodule.c,v 1.1 2004/03/17 19:48:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/FreeType/module/xttmodule.c,v 1.2 2006/03/16 16:49:44 dawes Exp $ */ /* * This is a wrapper module that simply loads the "freetype" module. @@ -74,7 +74,7 @@ XF86ModuleData xttModuleData = { &VersRec, xttSetup, NULL }; static pointer -xttSetup(pointer module, pointer opts, int *errmaj, int *errmin) +xttSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { /* We are just a wrapper, so load the real module. */ return LoadSubModule(module, "freetype", NULL, NULL, NULL, NULL, Index: xc/lib/font/Speedo/Imakefile diff -u xc/lib/font/Speedo/Imakefile:1.11 xc/lib/font/Speedo/Imakefile:1.12 --- xc/lib/font/Speedo/Imakefile:1.11 Mon Aug 27 13:40:58 2001 +++ xc/lib/font/Speedo/Imakefile Fri Oct 14 11:16:01 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:24 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/font/Speedo/Imakefile,v 1.11 2001/08/27 17:40:58 dawes Exp $ +XCOMM $XFree86: xc/lib/font/Speedo/Imakefile,v 1.12 2005/10/14 15:16:01 tsi Exp $ #if BuildServer && DoLoadableServer #define IHaveSubdirs @@ -12,8 +7,7 @@ SUBDIRS = module #endif - INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include - HEADERS = + INCLUDES = -I../include -I$(SERVERSRC)/include SPEEDOSRCS = do_char.c do_trns.c out_bl2d.c out_blk.c \ out_scrn.c out_util.c reset.c set_spcs.c set_trns.c SPEEDOOBJS = do_char.o do_trns.o out_bl2d.o out_blk.o \ Index: xc/lib/font/Speedo/adobe-iso.h diff -u xc/lib/font/Speedo/adobe-iso.h:1.1.1.2 xc/lib/font/Speedo/adobe-iso.h:1.2 --- xc/lib/font/Speedo/adobe-iso.h:1.1.1.2 Tue Jan 16 17:25:43 2001 +++ xc/lib/font/Speedo/adobe-iso.h Mon Jan 9 09:59:27 2006 @@ -1,4 +1,4 @@ -/* $Xorg: adobe-iso.h,v 1.3 2000/08/17 19:46:24 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Speedo/adobe-iso.h,v 1.2 2006/01/09 14:59:27 dawes Exp $ */ /* * Latin 1 format from masterset format 11 (ps) Index: xc/lib/font/Speedo/bics-iso.h diff -u xc/lib/font/Speedo/bics-iso.h:1.7 xc/lib/font/Speedo/bics-iso.h:1.8 --- xc/lib/font/Speedo/bics-iso.h:1.7 Fri Dec 14 14:56:41 2001 +++ xc/lib/font/Speedo/bics-iso.h Mon Jan 9 09:59:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: bics-iso.h,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.7 2001/12/14 19:56:41 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/bics-iso.h,v 1.8 2006/01/09 14:59:27 dawes Exp $ */ int sp_bics_map[] = { 32, 0, Index: xc/lib/font/Speedo/do_char.c diff -u xc/lib/font/Speedo/do_char.c:1.4 xc/lib/font/Speedo/do_char.c:1.5 --- xc/lib/font/Speedo/do_char.c:1.4 Mon Aug 27 15:49:50 2001 +++ xc/lib/font/Speedo/do_char.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: do_char.c,v 1.3 2000/08/17 19:46:24 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/do_char.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/do_char.c,v 1.5 2006/01/09 14:59:27 dawes Exp $ */ /***************************** D O - C H A R . C ***************************** * * Index: xc/lib/font/Speedo/do_trns.c diff -u xc/lib/font/Speedo/do_trns.c:1.4 xc/lib/font/Speedo/do_trns.c:1.5 --- xc/lib/font/Speedo/do_trns.c:1.4 Mon Aug 27 15:49:50 2001 +++ xc/lib/font/Speedo/do_trns.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: do_trns.c,v 1.3 2000/08/17 19:46:25 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/do_trns.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/do_trns.c,v 1.5 2006/01/09 14:59:27 dawes Exp $ */ /**************************** D O _ T R N S . C ****************************** * * Index: xc/lib/font/Speedo/htest.c diff -u xc/lib/font/Speedo/htest.c:1.1.1.2 xc/lib/font/Speedo/htest.c:1.2 --- xc/lib/font/Speedo/htest.c:1.1.1.2 Tue Jan 16 17:25:46 2001 +++ xc/lib/font/Speedo/htest.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,4 @@ -/* $Xorg: htest.c,v 1.3 2000/08/17 19:46:25 cpqbld Exp $ */ - +/* $XFree86: xc/lib/font/Speedo/htest.c,v 1.2 2006/01/09 14:59:27 dawes Exp $ */ /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. Index: xc/lib/font/Speedo/iface.c diff -u xc/lib/font/Speedo/iface.c:1.3 xc/lib/font/Speedo/iface.c:1.4 --- xc/lib/font/Speedo/iface.c:1.3 Wed Jan 17 14:43:17 2001 +++ xc/lib/font/Speedo/iface.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: iface.c,v 1.3 2000/08/17 19:46:25 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/iface.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/iface.c,v 1.4 2006/01/09 14:59:27 dawes Exp $ */ /***************************** I F A C E . C ********************************* * * Index: xc/lib/font/Speedo/keys.h diff -u xc/lib/font/Speedo/keys.h:1.1.1.2 xc/lib/font/Speedo/keys.h:1.2 --- xc/lib/font/Speedo/keys.h:1.1.1.2 Tue Jan 16 17:25:47 2001 +++ xc/lib/font/Speedo/keys.h Mon Jan 9 09:59:27 2006 @@ -1,5 +1,4 @@ -/* $Xorg: keys.h,v 1.3 2000/08/17 19:46:25 cpqbld Exp $ */ - +/* $XFree86: xc/lib/font/Speedo/keys.h,v 1.2 2006/01/09 14:59:27 dawes Exp $ */ /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. Index: xc/lib/font/Speedo/nsample.c diff -u xc/lib/font/Speedo/nsample.c:1.1.1.2 xc/lib/font/Speedo/nsample.c:1.2 --- xc/lib/font/Speedo/nsample.c:1.1.1.2 Tue Jan 16 17:25:48 2001 +++ xc/lib/font/Speedo/nsample.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,4 @@ -/* $Xorg: nsample.c,v 1.3 2000/08/17 19:46:26 cpqbld Exp $ */ - +/* $XFree86: xc/lib/font/Speedo/nsample.c,v 1.2 2006/01/09 14:59:27 dawes Exp $ */ /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. Index: xc/lib/font/Speedo/out_bl2d.c diff -u xc/lib/font/Speedo/out_bl2d.c:1.4 xc/lib/font/Speedo/out_bl2d.c:1.5 --- xc/lib/font/Speedo/out_bl2d.c:1.4 Wed Jan 17 14:43:17 2001 +++ xc/lib/font/Speedo/out_bl2d.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: out_bl2d.c,v 1.3 2000/08/17 19:46:26 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_bl2d.c,v 1.4 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/out_bl2d.c,v 1.5 2006/01/09 14:59:27 dawes Exp $ */ /*************************** O U T _ B L 2 D . C ***************************** * * Index: xc/lib/font/Speedo/out_blk.c diff -u xc/lib/font/Speedo/out_blk.c:1.3 xc/lib/font/Speedo/out_blk.c:1.4 --- xc/lib/font/Speedo/out_blk.c:1.3 Wed Jan 17 14:43:17 2001 +++ xc/lib/font/Speedo/out_blk.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: out_blk.c,v 1.3 2000/08/17 19:46:26 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_blk.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/out_blk.c,v 1.4 2006/01/09 14:59:27 dawes Exp $ */ /*************************** O U T _ B L K . C ********************************* Index: xc/lib/font/Speedo/out_outl.c diff -u xc/lib/font/Speedo/out_outl.c:1.1.1.2 xc/lib/font/Speedo/out_outl.c:1.2 --- xc/lib/font/Speedo/out_outl.c:1.1.1.2 Tue Jan 16 17:25:49 2001 +++ xc/lib/font/Speedo/out_outl.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,4 @@ -/* $Xorg: out_outl.c,v 1.3 2000/08/17 19:46:26 cpqbld Exp $ */ - +/* $XFree86: xc/lib/font/Speedo/out_outl.c,v 1.2 2006/01/09 14:59:27 dawes Exp $ */ /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. Index: xc/lib/font/Speedo/out_scrn.c diff -u xc/lib/font/Speedo/out_scrn.c:1.5 xc/lib/font/Speedo/out_scrn.c:1.6 --- xc/lib/font/Speedo/out_scrn.c:1.5 Wed Jan 17 14:43:17 2001 +++ xc/lib/font/Speedo/out_scrn.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: out_scrn.c,v 1.3 2000/08/17 19:46:26 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_scrn.c,v 1.5 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/out_scrn.c,v 1.6 2006/01/09 14:59:27 dawes Exp $ */ /*************************** O U T _ S C R N . C ***************************** Index: xc/lib/font/Speedo/out_util.c diff -u xc/lib/font/Speedo/out_util.c:1.3 xc/lib/font/Speedo/out_util.c:1.4 --- xc/lib/font/Speedo/out_util.c:1.3 Wed Jan 17 14:43:17 2001 +++ xc/lib/font/Speedo/out_util.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: out_util.c,v 1.3 2000/08/17 19:46:26 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_util.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/out_util.c,v 1.4 2006/01/09 14:59:27 dawes Exp $ */ #define DEBUG 0 Index: xc/lib/font/Speedo/reset.c diff -u xc/lib/font/Speedo/reset.c:1.3 xc/lib/font/Speedo/reset.c:1.4 --- xc/lib/font/Speedo/reset.c:1.3 Wed Jan 17 14:43:17 2001 +++ xc/lib/font/Speedo/reset.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: reset.c,v 1.3 2000/08/17 19:46:26 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/reset.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/reset.c,v 1.4 2006/01/09 14:59:27 dawes Exp $ */ Index: xc/lib/font/Speedo/set_spcs.c diff -u xc/lib/font/Speedo/set_spcs.c:1.4 xc/lib/font/Speedo/set_spcs.c:1.5 --- xc/lib/font/Speedo/set_spcs.c:1.4 Mon Aug 27 15:49:50 2001 +++ xc/lib/font/Speedo/set_spcs.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: set_spcs.c,v 1.3 2000/08/17 19:46:26 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/set_spcs.c,v 1.4 2001/08/27 19:49:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/set_spcs.c,v 1.5 2006/01/09 14:59:27 dawes Exp $ */ /*************************** S E T _ S P C S . C ***************************** Index: xc/lib/font/Speedo/set_trns.c diff -u xc/lib/font/Speedo/set_trns.c:1.6 xc/lib/font/Speedo/set_trns.c:1.7 --- xc/lib/font/Speedo/set_trns.c:1.6 Tue May 27 18:26:44 2003 +++ xc/lib/font/Speedo/set_trns.c Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: set_trns.c,v 1.3 2000/08/17 19:46:27 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/set_trns.c,v 1.6 2003/05/27 22:26:44 tsi Exp $ */ +/* $XFree86: xc/lib/font/Speedo/set_trns.c,v 1.7 2006/01/09 14:59:27 dawes Exp $ */ Index: xc/lib/font/Speedo/spdo_prv.h diff -u xc/lib/font/Speedo/spdo_prv.h:1.5 xc/lib/font/Speedo/spdo_prv.h:1.6 --- xc/lib/font/Speedo/spdo_prv.h:1.5 Wed Jan 17 14:43:18 2001 +++ xc/lib/font/Speedo/spdo_prv.h Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: spdo_prv.h,v 1.3 2000/08/17 19:46:27 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/spdo_prv.h,v 1.5 2001/01/17 19:43:18 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spdo_prv.h,v 1.6 2006/01/09 14:59:27 dawes Exp $ */ Index: xc/lib/font/Speedo/speedo.h diff -u xc/lib/font/Speedo/speedo.h:3.6 xc/lib/font/Speedo/speedo.h:3.7 --- xc/lib/font/Speedo/speedo.h:3.6 Wed Jul 25 11:04:55 2001 +++ xc/lib/font/Speedo/speedo.h Mon Jan 9 09:59:27 2006 @@ -1,5 +1,3 @@ -/* $Xorg: speedo.h,v 1.3 2000/08/17 19:46:27 cpqbld Exp $ */ - /* Copyright 1989-1991, Bitstream Inc., Cambridge, MA. @@ -21,7 +19,7 @@ WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/speedo.h,v 3.6 2001/07/25 15:04:55 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/speedo.h,v 3.7 2006/01/09 14:59:27 dawes Exp $ */ #ifndef _SPEEDO_H_ #define _SPEEDO_H_ Index: xc/lib/font/Speedo/spencode.c diff -u xc/lib/font/Speedo/spencode.c:1.7 xc/lib/font/Speedo/spencode.c:1.8 --- xc/lib/font/Speedo/spencode.c:1.7 Fri Dec 14 14:56:41 2001 +++ xc/lib/font/Speedo/spencode.c Mon Jan 9 09:59:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: spencode.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -47,7 +46,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.7 2001/12/14 19:56:41 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spencode.c,v 1.8 2006/01/09 14:59:27 dawes Exp $ */ #include "spint.h" Index: xc/lib/font/Speedo/sperr.c diff -u xc/lib/font/Speedo/sperr.c:1.7 xc/lib/font/Speedo/sperr.c:1.8 --- xc/lib/font/Speedo/sperr.c:1.7 Fri May 31 14:45:48 2002 +++ xc/lib/font/Speedo/sperr.c Mon Jan 9 09:59:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: sperr.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -52,7 +51,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.7 2002/05/31 18:45:48 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/sperr.c,v 1.8 2006/01/09 14:59:27 dawes Exp $ */ #include "spint.h" Index: xc/lib/font/Speedo/spfile.c diff -u xc/lib/font/Speedo/spfile.c:1.14 xc/lib/font/Speedo/spfile.c:1.15 --- xc/lib/font/Speedo/spfile.c:1.14 Fri Dec 14 14:56:41 2001 +++ xc/lib/font/Speedo/spfile.c Mon Jan 9 09:59:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: spfile.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -49,7 +48,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.14 2001/12/14 19:56:41 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfile.c,v 1.15 2006/01/09 14:59:27 dawes Exp $ */ #include "fntfilst.h" #include "fontenc.h" Index: xc/lib/font/Speedo/spfont.c diff -u xc/lib/font/Speedo/spfont.c:3.13 xc/lib/font/Speedo/spfont.c:3.14 --- xc/lib/font/Speedo/spfont.c:3.13 Tue May 27 18:26:44 2003 +++ xc/lib/font/Speedo/spfont.c Fri Oct 14 11:16:02 2005 @@ -1,4 +1,4 @@ -/* $Xorg: spfont.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.14 2005/10/14 15:16:02 tsi Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -21,7 +21,6 @@ * * Author: Dave Lemke, Network Computing Devices Inc */ -/* $XFree86: xc/lib/font/Speedo/spfont.c,v 3.13 2003/05/27 22:26:44 tsi Exp $ */ /* @@ -55,7 +54,7 @@ * Speedo font loading */ -#include "FSproto.h" +#include #include "spint.h" #include "servermd.h" #include "fontutil.h" Index: xc/lib/font/Speedo/spfuncs.c diff -u xc/lib/font/Speedo/spfuncs.c:1.8 xc/lib/font/Speedo/spfuncs.c:1.9 --- xc/lib/font/Speedo/spfuncs.c:1.8 Fri Dec 14 14:56:42 2001 +++ xc/lib/font/Speedo/spfuncs.c Mon Jan 9 09:59:27 2006 @@ -1,4 +1,3 @@ -/* $Xorg: spfuncs.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -49,7 +48,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.8 2001/12/14 19:56:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spfuncs.c,v 1.9 2006/01/09 14:59:27 dawes Exp $ */ #ifndef FONTMODULE #include Index: xc/lib/font/Speedo/spglyph.c diff -u xc/lib/font/Speedo/spglyph.c:1.7 xc/lib/font/Speedo/spglyph.c:1.8 --- xc/lib/font/Speedo/spglyph.c:1.7 Fri Dec 14 14:56:42 2001 +++ xc/lib/font/Speedo/spglyph.c Mon Jan 9 09:59:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: spglyph.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -49,7 +48,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.7 2001/12/14 19:56:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spglyph.c,v 1.8 2006/01/09 14:59:28 dawes Exp $ */ #include /* for bit order #defines */ #include "spint.h" Index: xc/lib/font/Speedo/spinfo.c diff -u xc/lib/font/Speedo/spinfo.c:1.13 xc/lib/font/Speedo/spinfo.c:1.14 --- xc/lib/font/Speedo/spinfo.c:1.13 Tue Sep 10 12:14:33 2002 +++ xc/lib/font/Speedo/spinfo.c Mon Jan 9 09:59:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: spinfo.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -49,7 +48,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.13 2002/09/10 16:14:33 tsi Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spinfo.c,v 1.14 2006/01/09 14:59:28 dawes Exp $ */ #include "fntfilst.h" #include "fontutil.h" Index: xc/lib/font/Speedo/spint.h diff -u xc/lib/font/Speedo/spint.h:1.10 xc/lib/font/Speedo/spint.h:1.11 --- xc/lib/font/Speedo/spint.h:1.10 Fri Dec 14 14:56:42 2001 +++ xc/lib/font/Speedo/spint.h Mon Jan 9 09:59:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: spint.h,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -47,7 +46,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.10 2001/12/14 19:56:42 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/spint.h,v 1.11 2006/01/09 14:59:28 dawes Exp $ */ #ifndef _SPINT_H_ #define _SPINT_H_ Index: xc/lib/font/Speedo/sptobdf.c diff -u xc/lib/font/Speedo/sptobdf.c:1.2 xc/lib/font/Speedo/sptobdf.c:1.3 --- xc/lib/font/Speedo/sptobdf.c:1.2 Fri Dec 14 14:56:42 2001 +++ xc/lib/font/Speedo/sptobdf.c Mon Jan 9 09:59:28 2006 @@ -1,4 +1,4 @@ -/* $Xorg: sptobdf.c,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ +/* $XFree86: xc/lib/font/Speedo/sptobdf.c,v 1.3 2006/01/09 14:59:28 dawes Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation Index: xc/lib/font/Speedo/useropt.h diff -u xc/lib/font/Speedo/useropt.h:1.2 xc/lib/font/Speedo/useropt.h:1.3 --- xc/lib/font/Speedo/useropt.h:1.2 Fri Dec 14 14:56:43 2001 +++ xc/lib/font/Speedo/useropt.h Mon Jan 9 09:59:28 2006 @@ -1,4 +1,4 @@ -/* $Xorg: useropt.h,v 1.4 2001/02/09 02:04:00 xorgcvs Exp $ */ +/* $XFree86: xc/lib/font/Speedo/useropt.h,v 1.3 2006/01/09 14:59:28 dawes Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group Index: xc/lib/font/Speedo/module/Imakefile diff -u xc/lib/font/Speedo/module/Imakefile:1.8 xc/lib/font/Speedo/module/Imakefile:1.9 --- xc/lib/font/Speedo/module/Imakefile:1.8 Mon May 31 20:16:57 2004 +++ xc/lib/font/Speedo/module/Imakefile Fri Oct 14 11:16:02 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/Speedo/module/Imakefile,v 1.8 2004/06/01 00:16:57 dawes Exp $ +XCOMM $XFree86: xc/lib/font/Speedo/module/Imakefile,v 1.9 2005/10/14 15:16:02 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -49,9 +49,7 @@ #define IHaveModules #include - INCLUDES = -I$(FONTINCSRC) -I../../include -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) -I../ - HEADERS = + INCLUDES = -I../../include -I$(SERVERSRC)/include -I.. DEFINES = -DFONTMODULE SPEEDOSRCS = do_char.c do_trns.c out_bl2d.c out_blk.c speedomod.c \ Index: xc/lib/font/Speedo/module/speedomod.c diff -u xc/lib/font/Speedo/module/speedomod.c:1.9 xc/lib/font/Speedo/module/speedomod.c:1.10 --- xc/lib/font/Speedo/module/speedomod.c:1.9 Fri Feb 13 18:58:29 2004 +++ xc/lib/font/Speedo/module/speedomod.c Thu Mar 16 11:49:45 2006 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998 The XFree86 Project, Inc. + * Copyright (C) 1998-2006 The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -44,12 +44,12 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/lib/font/Speedo/module/speedomod.c,v 1.9 2004/02/13 23:58:29 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/module/speedomod.c,v 1.10 2006/03/16 16:49:45 dawes Exp $ */ #include "misc.h" -#include "fontmod.h" #include "xf86Module.h" +#include "fontmod.h" static MODULESETUPPROTO(speedoSetup); @@ -83,7 +83,7 @@ }; static pointer -speedoSetup(pointer module, pointer opts, int *errmaj, int *errmin) +speedoSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { speedoModule.module = module; LoadFont(&speedoModule); Index: xc/lib/font/Type1/Imakefile diff -u xc/lib/font/Type1/Imakefile:1.13 xc/lib/font/Type1/Imakefile:1.14 --- xc/lib/font/Type1/Imakefile:1.13 Sun Aug 31 13:28:04 2003 +++ xc/lib/font/Type1/Imakefile Fri Oct 14 11:16:02 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:28 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/font/Type1/Imakefile,v 1.13 2003/08/31 17:28:04 herrb Exp $ +XCOMM $XFree86: xc/lib/font/Type1/Imakefile,v 1.14 2005/10/14 15:16:02 tsi Exp $ #if BuildServer && DoLoadableServer #define IHaveSubdirs @@ -12,8 +7,7 @@ SUBDIRS = module #endif -INCLUDES = -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/include +INCLUDES = -I../include -I$(SERVERSRC)/include #if BuildCID CIDSRCS = cidchar.c afm.c Index: xc/lib/font/Type1/afm.c diff -u xc/lib/font/Type1/afm.c:1.4 xc/lib/font/Type1/afm.c:1.5 --- xc/lib/font/Type1/afm.c:1.4 Sat Oct 23 11:29:26 2004 +++ xc/lib/font/Type1/afm.c Fri Oct 14 11:16:02 2005 @@ -15,7 +15,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/afm.c,v 1.4 2004/10/23 15:29:26 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/afm.c,v 1.5 2005/10/14 15:16:02 tsi Exp $ */ #ifdef BUILDCID #ifndef FONTMODULE @@ -23,8 +23,8 @@ #include #include #else -#include "Xmd.h" /* For INT32 declaration */ -#include "Xdefs.h" /* For Bool */ +#include /* For INT32 declaration */ +#include /* For Bool */ #include "xf86_ansic.h" #endif #include "fontmisc.h" /* for xalloc/xfree */ Index: xc/lib/font/Type1/arith.c diff -u xc/lib/font/Type1/arith.c:1.7 xc/lib/font/Type1/arith.c:1.8 --- xc/lib/font/Type1/arith.c:1.7 Tue May 27 18:26:45 2003 +++ xc/lib/font/Type1/arith.c Mon Jan 9 09:59:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: arith.c,v 1.3 2000/08/17 19:46:29 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/arith.c,v 1.7 2003/05/27 22:26:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/arith.c,v 1.8 2006/01/09 14:59:28 dawes Exp $ */ /* ARITH CWEB V0006 ******** */ /* Index: xc/lib/font/Type1/arith.h diff -u xc/lib/font/Type1/arith.h:1.5 xc/lib/font/Type1/arith.h:1.6 --- xc/lib/font/Type1/arith.h:1.5 Wed Jan 17 14:43:22 2001 +++ xc/lib/font/Type1/arith.h Mon Jan 9 09:59:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: arith.h,v 1.3 2000/08/17 19:46:29 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/arith.h,v 1.5 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/arith.h,v 1.6 2006/01/09 14:59:28 dawes Exp $ */ /*SHARED*/ Index: xc/lib/font/Type1/blues.h diff -u xc/lib/font/Type1/blues.h:1.4 xc/lib/font/Type1/blues.h:1.5 --- xc/lib/font/Type1/blues.h:1.4 Wed Jan 17 14:43:22 2001 +++ xc/lib/font/Type1/blues.h Mon Jan 9 09:59:28 2006 @@ -1,4 +1,3 @@ -/* $Xorg: blues.h,v 1.3 2000/08/17 19:46:29 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -28,7 +27,7 @@ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/blues.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/blues.h,v 1.5 2006/01/09 14:59:28 dawes Exp $ */ extern psobj *GetType1CharString ( psfont *fontP, unsigned char code ); Index: xc/lib/font/Type1/cidchar.c diff -u xc/lib/font/Type1/cidchar.c:1.10 xc/lib/font/Type1/cidchar.c:1.11 --- xc/lib/font/Type1/cidchar.c:1.10 Tue May 27 18:26:45 2003 +++ xc/lib/font/Type1/cidchar.c Fri Oct 14 11:16:02 2005 @@ -15,7 +15,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.10 2003/05/27 22:26:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/cidchar.c,v 1.11 2005/10/14 15:16:02 tsi Exp $ */ #ifdef BUILDCID #ifndef FONTMODULE @@ -29,8 +29,8 @@ #endif #endif #else -#include "Xmd.h" /* For INT32 declaration */ -#include "Xdefs.h" /* For Bool */ +#include /* For INT32 declaration */ +#include /* For Bool */ #include "xf86_ansic.h" #endif #ifndef FONTMODULE Index: xc/lib/font/Type1/cluts.h diff -u xc/lib/font/Type1/cluts.h:1.1.1.2 xc/lib/font/Type1/cluts.h:1.2 --- xc/lib/font/Type1/cluts.h:1.1.1.2 Tue Jan 16 17:26:02 2001 +++ xc/lib/font/Type1/cluts.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,4 @@ -/* $Xorg: cluts.h,v 1.3 2000/08/17 19:46:29 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/cluts.h,v 1.2 2006/01/09 14:59:29 dawes Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * Index: xc/lib/font/Type1/curves.c diff -u xc/lib/font/Type1/curves.c:1.8 xc/lib/font/Type1/curves.c:1.9 --- xc/lib/font/Type1/curves.c:1.8 Mon Feb 18 15:51:57 2002 +++ xc/lib/font/Type1/curves.c Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: curves.c,v 1.3 2000/08/17 19:46:29 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 */ /* All Rights Reserved */ @@ -29,7 +28,7 @@ /* CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT */ /* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS */ /* SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/curves.c,v 1.8 2002/02/18 20:51:57 herrb Exp $ */ +/* $XFree86: xc/lib/font/Type1/curves.c,v 1.9 2006/01/09 14:59:29 dawes Exp $ */ /* :h1.CURVES Module - Stepping Beziers Index: xc/lib/font/Type1/curves.h diff -u xc/lib/font/Type1/curves.h:1.4 xc/lib/font/Type1/curves.h:1.5 --- xc/lib/font/Type1/curves.h:1.4 Wed Jan 17 14:43:22 2001 +++ xc/lib/font/Type1/curves.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: curves.h,v 1.3 2000/08/17 19:46:29 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/curves.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/curves.h,v 1.5 2006/01/09 14:59:29 dawes Exp $ */ /*SHARED*/ Index: xc/lib/font/Type1/digit.h diff -u xc/lib/font/Type1/digit.h:1.1.1.2 xc/lib/font/Type1/digit.h:1.2 --- xc/lib/font/Type1/digit.h:1.1.1.2 Tue Jan 16 17:26:03 2001 +++ xc/lib/font/Type1/digit.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,4 @@ -/* $Xorg: digit.h,v 1.3 2000/08/17 19:46:29 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/digit.h,v 1.2 2006/01/09 14:59:29 dawes Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * Index: xc/lib/font/Type1/fontfcn.c diff -u xc/lib/font/Type1/fontfcn.c:1.11 xc/lib/font/Type1/fontfcn.c:1.12 --- xc/lib/font/Type1/fontfcn.c:1.11 Fri Nov 23 14:21:31 2001 +++ xc/lib/font/Type1/fontfcn.c Fri Oct 14 11:16:02 2005 @@ -1,4 +1,4 @@ -/* $Xorg: fontfcn.c,v 1.4 2000/08/17 19:46:30 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.12 2005/10/14 15:16:02 tsi Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -45,21 +45,20 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/fontfcn.c,v 1.11 2001/11/23 19:21:31 dawes Exp $ */ #ifndef FONTMODULE #include #include #else -#include "Xmd.h" /* For INT32 declaration */ -#include "Xdefs.h" /* For Bool */ +#include /* For INT32 declaration */ +#include /* For Bool */ #include "xf86_ansic.h" #endif #include "t1imager.h" #include "util.h" #ifdef BUILDCID #include "range.h" -#include "Xdefs.h" +#include #endif #include "fntfilst.h" #include "fontfcn.h" Index: xc/lib/font/Type1/fontfcn.h diff -u xc/lib/font/Type1/fontfcn.h:1.5 xc/lib/font/Type1/fontfcn.h:1.6 --- xc/lib/font/Type1/fontfcn.h:1.5 Wed Jan 17 14:43:22 2001 +++ xc/lib/font/Type1/fontfcn.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: fontfcn.h,v 1.3 2000/08/17 19:46:30 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -44,7 +43,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/fontfcn.h,v 1.5 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/fontfcn.h,v 1.6 2006/01/09 14:59:29 dawes Exp $ */ #ifdef BUILDCID Index: xc/lib/font/Type1/fonts.h diff -u xc/lib/font/Type1/fonts.h:1.1.1.2 xc/lib/font/Type1/fonts.h:1.2 --- xc/lib/font/Type1/fonts.h:1.1.1.2 Tue Jan 16 17:26:05 2001 +++ xc/lib/font/Type1/fonts.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,4 @@ -/* $Xorg: fonts.h,v 1.3 2000/08/17 19:46:30 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/fonts.h,v 1.2 2006/01/09 14:59:29 dawes Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * Index: xc/lib/font/Type1/hdigit.h diff -u xc/lib/font/Type1/hdigit.h:1.1.1.2 xc/lib/font/Type1/hdigit.h:1.2 --- xc/lib/font/Type1/hdigit.h:1.1.1.2 Tue Jan 16 17:26:05 2001 +++ xc/lib/font/Type1/hdigit.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,4 @@ -/* $Xorg: hdigit.h,v 1.3 2000/08/17 19:46:30 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/hdigit.h,v 1.2 2006/01/09 14:59:29 dawes Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * Index: xc/lib/font/Type1/hints.c diff -u xc/lib/font/Type1/hints.c:1.8 xc/lib/font/Type1/hints.c:1.9 --- xc/lib/font/Type1/hints.c:1.8 Tue May 27 18:26:45 2003 +++ xc/lib/font/Type1/hints.c Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: hints.c,v 1.3 2000/08/17 19:46:30 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/hints.c,v 1.8 2003/05/27 22:26:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/hints.c,v 1.9 2006/01/09 14:59:29 dawes Exp $ */ /* HINTS CWEB V0006 ******** */ /* Index: xc/lib/font/Type1/hints.h diff -u xc/lib/font/Type1/hints.h:1.4 xc/lib/font/Type1/hints.h:1.5 --- xc/lib/font/Type1/hints.h:1.4 Wed Jan 17 14:43:22 2001 +++ xc/lib/font/Type1/hints.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: hints.h,v 1.3 2000/08/17 19:46:30 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/hints.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/hints.h,v 1.5 2006/01/09 14:59:29 dawes Exp $ */ /*SHARED*/ Index: xc/lib/font/Type1/lines.c diff -u xc/lib/font/Type1/lines.c:1.5 xc/lib/font/Type1/lines.c:1.6 --- xc/lib/font/Type1/lines.c:1.5 Tue May 27 18:26:45 2003 +++ xc/lib/font/Type1/lines.c Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lines.c,v 1.3 2000/08/17 19:46:30 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/lines.c,v 1.5 2003/05/27 22:26:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/lines.c,v 1.6 2006/01/09 14:59:29 dawes Exp $ */ /* LINES CWEB V0003 ******** */ /* Index: xc/lib/font/Type1/lines.h diff -u xc/lib/font/Type1/lines.h:1.4 xc/lib/font/Type1/lines.h:1.5 --- xc/lib/font/Type1/lines.h:1.4 Wed Jan 17 14:43:22 2001 +++ xc/lib/font/Type1/lines.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lines.h,v 1.3 2000/08/17 19:46:30 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/lines.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/lines.h,v 1.5 2006/01/09 14:59:29 dawes Exp $ */ /*SHARED*/ Index: xc/lib/font/Type1/minimain.c diff -u xc/lib/font/Type1/minimain.c:1.2 xc/lib/font/Type1/minimain.c:1.3 --- xc/lib/font/Type1/minimain.c:1.2 Fri Dec 14 14:56:44 2001 +++ xc/lib/font/Type1/minimain.c Mon Jan 9 09:59:29 2006 @@ -1,5 +1,4 @@ -/* $Xorg: minimain.c,v 1.4 2001/02/09 02:04:01 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/font/Type1/minimain.c,v 1.3 2006/01/09 14:59:29 dawes Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group Index: xc/lib/font/Type1/objects.c diff -u xc/lib/font/Type1/objects.c:1.11 xc/lib/font/Type1/objects.c:1.12 --- xc/lib/font/Type1/objects.c:1.11 Tue May 27 18:26:45 2003 +++ xc/lib/font/Type1/objects.c Fri Oct 14 11:16:02 2005 @@ -1,4 +1,4 @@ -/* $Xorg: objects.c,v 1.3 2000/08/17 19:46:30 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/objects.c,v 1.12 2005/10/14 15:16:02 tsi Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +26,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/objects.c,v 1.11 2003/05/27 22:26:45 tsi Exp $ */ /* OBJECTS CWEB V0025 ******** */ /* :h1.OBJECTS Module - TYPE1IMAGER Objects Common Routines @@ -60,8 +59,8 @@ #include #include "os.h" #else -#include "Xdefs.h" /* Bool declaration */ -#include "Xmd.h" /* INT32 declaration */ +#include /* Bool declaration */ +#include /* INT32 declaration */ #include "os.h" #include "xf86_ansic.h" #endif Index: xc/lib/font/Type1/objects.h diff -u xc/lib/font/Type1/objects.h:1.15 xc/lib/font/Type1/objects.h:1.16 --- xc/lib/font/Type1/objects.h:1.15 Tue May 27 18:26:45 2003 +++ xc/lib/font/Type1/objects.h Fri Oct 14 11:16:02 2005 @@ -1,4 +1,4 @@ -/* $Xorg: objects.h,v 1.3 2000/08/17 19:46:31 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/objects.h,v 1.16 2005/10/14 15:16:02 tsi Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -43,12 +43,11 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/objects.h,v 1.15 2003/05/27 22:26:45 tsi Exp $ */ /*SHARED*/ /*END SHARED*/ -#include -#include +#include +#include #ifndef FONTMODULE #include #endif Index: xc/lib/font/Type1/paths.c diff -u xc/lib/font/Type1/paths.c:1.8 xc/lib/font/Type1/paths.c:1.9 --- xc/lib/font/Type1/paths.c:1.8 Tue May 27 18:26:46 2003 +++ xc/lib/font/Type1/paths.c Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: paths.c,v 1.3 2000/08/17 19:46:31 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/paths.c,v 1.8 2003/05/27 22:26:46 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/paths.c,v 1.9 2006/01/09 14:59:29 dawes Exp $ */ /* PATHS CWEB V0021 ******** */ /* Index: xc/lib/font/Type1/paths.h diff -u xc/lib/font/Type1/paths.h:1.4 xc/lib/font/Type1/paths.h:1.5 --- xc/lib/font/Type1/paths.h:1.4 Wed Jan 17 14:43:22 2001 +++ xc/lib/font/Type1/paths.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: paths.h,v 1.3 2000/08/17 19:46:31 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/paths.h,v 1.4 2001/01/17 19:43:22 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/paths.h,v 1.5 2006/01/09 14:59:29 dawes Exp $ */ /*SHARED*/ Index: xc/lib/font/Type1/pictures.h diff -u xc/lib/font/Type1/pictures.h:1.4 xc/lib/font/Type1/pictures.h:1.5 --- xc/lib/font/Type1/pictures.h:1.4 Wed Jan 17 14:43:23 2001 +++ xc/lib/font/Type1/pictures.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: pictures.h,v 1.3 2000/08/17 19:46:31 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -27,7 +26,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/pictures.h,v 1.4 2001/01/17 19:43:23 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/pictures.h,v 1.5 2006/01/09 14:59:29 dawes Exp $ */ /* STUB */ Index: xc/lib/font/Type1/regions.c diff -u xc/lib/font/Type1/regions.c:3.9 xc/lib/font/Type1/regions.c:3.10 --- xc/lib/font/Type1/regions.c:3.9 Tue May 27 18:26:46 2003 +++ xc/lib/font/Type1/regions.c Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: regions.c,v 1.3 2000/08/17 19:46:31 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/regions.c,v 3.9 2003/05/27 22:26:46 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/regions.c,v 3.10 2006/01/09 14:59:29 dawes Exp $ */ /* REGIONS CWEB V0023 LOTS */ /* :h1 id=regions.REGIONS Module - Regions Operator Handler Index: xc/lib/font/Type1/regions.h diff -u xc/lib/font/Type1/regions.h:1.8 xc/lib/font/Type1/regions.h:1.9 --- xc/lib/font/Type1/regions.h:1.8 Fri Jun 15 04:09:20 2001 +++ xc/lib/font/Type1/regions.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: regions.h,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/regions.h,v 1.8 2001/06/15 08:09:20 alanh Exp $ */ +/* $XFree86: xc/lib/font/Type1/regions.h,v 1.9 2006/01/09 14:59:29 dawes Exp $ */ /*SHARED*/ #define Interior(p,rule) t1_Interior(p,rule) Index: xc/lib/font/Type1/scanfont.c diff -u xc/lib/font/Type1/scanfont.c:1.17 xc/lib/font/Type1/scanfont.c:1.18 --- xc/lib/font/Type1/scanfont.c:1.17 Fri Nov 28 23:55:28 2003 +++ xc/lib/font/Type1/scanfont.c Fri Oct 14 11:16:02 2005 @@ -1,4 +1,4 @@ -/* $Xorg: scanfont.c,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.18 2005/10/14 15:16:02 tsi Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -45,13 +45,12 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/scanfont.c,v 1.17 2003/11/29 04:55:28 dawes Exp $ */ #ifndef FONTMODULE #include #else -#include "Xdefs.h" /* Bool declaration */ -#include "Xmd.h" /* INT32 declaration */ +#include /* Bool declaration */ +#include /* INT32 declaration */ #include "xf86_ansic.h" #endif #include "t1stdio.h" Index: xc/lib/font/Type1/spaces.c diff -u xc/lib/font/Type1/spaces.c:3.11 xc/lib/font/Type1/spaces.c:3.12 --- xc/lib/font/Type1/spaces.c:3.11 Tue May 27 18:26:47 2003 +++ xc/lib/font/Type1/spaces.c Fri Oct 14 11:16:03 2005 @@ -1,4 +1,4 @@ -/* $Xorg: spaces.c,v 1.4 2000/08/17 19:46:32 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/spaces.c,v 3.12 2005/10/14 15:16:03 tsi Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +26,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/spaces.c,v 3.11 2003/05/27 22:26:47 tsi Exp $ */ /* SPACES CWEB V0021 ******** */ /* :h1 id=spaces.SPACES Module - Handles Coordinate Spaces @@ -40,8 +39,8 @@ */ #ifdef FONTMODULE -#include "Xdefs.h" /* Bool declaration ??? */ -#include "Xmd.h" /* INT32 declaration ??? */ +#include /* Bool declaration ??? */ +#include /* INT32 declaration ??? */ #include "os.h" #include "xf86_ansic.h" #else Index: xc/lib/font/Type1/spaces.h diff -u xc/lib/font/Type1/spaces.h:3.4 xc/lib/font/Type1/spaces.h:3.5 --- xc/lib/font/Type1/spaces.h:3.4 Wed Jan 17 14:43:23 2001 +++ xc/lib/font/Type1/spaces.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: spaces.h,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +25,7 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/spaces.h,v 3.4 2001/01/17 19:43:23 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/spaces.h,v 3.5 2006/01/09 14:59:29 dawes Exp $ */ /*SHARED*/ Index: xc/lib/font/Type1/strokes.h diff -u xc/lib/font/Type1/strokes.h:1.1.1.2 xc/lib/font/Type1/strokes.h:1.2 --- xc/lib/font/Type1/strokes.h:1.1.1.2 Tue Jan 16 17:26:16 2001 +++ xc/lib/font/Type1/strokes.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,4 @@ -/* $Xorg: strokes.h,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/strokes.h,v 1.2 2006/01/09 14:59:29 dawes Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * Index: xc/lib/font/Type1/t1funcs.c diff -u xc/lib/font/Type1/t1funcs.c:3.34 xc/lib/font/Type1/t1funcs.c:3.35 --- xc/lib/font/Type1/t1funcs.c:3.34 Sun Feb 1 22:55:27 2004 +++ xc/lib/font/Type1/t1funcs.c Fri Oct 14 11:16:03 2005 @@ -1,4 +1,4 @@ -/* $Xorg: t1funcs.c,v 1.5 2001/02/09 02:04:01 xorgcvs Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.35 2005/10/14 15:16:03 tsi Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -71,7 +71,6 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1funcs.c,v 3.34 2004/02/02 03:55:27 dawes Exp $ */ /* @@ -121,8 +120,8 @@ #include #endif #else -#include "Xmd.h" -#include "Xdefs.h" +#include +#include #endif #include "os.h" @@ -133,7 +132,7 @@ #include "fntfilst.h" #include "fontutil.h" -#include "FSproto.h" +#include #include "fontenc.h" #include "t1unicode.h" Index: xc/lib/font/Type1/t1hdigit.h diff -u xc/lib/font/Type1/t1hdigit.h:1.1.1.2 xc/lib/font/Type1/t1hdigit.h:1.2 --- xc/lib/font/Type1/t1hdigit.h:1.1.1.2 Tue Jan 16 17:26:17 2001 +++ xc/lib/font/Type1/t1hdigit.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,4 @@ -/* $Xorg: t1hdigit.h,v 1.3 2000/08/17 19:46:33 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1hdigit.h,v 1.2 2006/01/09 14:59:29 dawes Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * Index: xc/lib/font/Type1/t1imager.h diff -u xc/lib/font/Type1/t1imager.h:1.5 xc/lib/font/Type1/t1imager.h:1.6 --- xc/lib/font/Type1/t1imager.h:1.5 Wed Jul 25 11:04:55 2001 +++ xc/lib/font/Type1/t1imager.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: t1imager.h,v 1.3 2000/08/17 19:46:33 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -27,7 +26,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1imager.h,v 1.5 2001/07/25 15:04:55 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1imager.h,v 1.6 2006/01/09 14:59:29 dawes Exp $ */ #include "objects.h" Index: xc/lib/font/Type1/t1info.c diff -u xc/lib/font/Type1/t1info.c:1.19 xc/lib/font/Type1/t1info.c:1.20 --- xc/lib/font/Type1/t1info.c:1.19 Tue May 27 18:26:47 2003 +++ xc/lib/font/Type1/t1info.c Fri Oct 14 11:16:03 2005 @@ -1,4 +1,4 @@ -/* $Xorg: t1info.c,v 1.4 2001/02/09 02:04:01 xorgcvs Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.20 2005/10/14 15:16:03 tsi Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -99,7 +99,6 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1info.c,v 1.19 2003/05/27 22:26:47 tsi Exp $ */ #include "fntfilst.h" #include "fontutil.h" @@ -111,7 +110,7 @@ #else #include "xf86_ansic.h" #endif -#include "FSproto.h" +#include #ifdef BUILDCID #ifndef FONTMODULE Index: xc/lib/font/Type1/t1intf.h diff -u xc/lib/font/Type1/t1intf.h:1.7 xc/lib/font/Type1/t1intf.h:1.8 --- xc/lib/font/Type1/t1intf.h:1.7 Wed Jul 25 11:04:55 2001 +++ xc/lib/font/Type1/t1intf.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: t1intf.h,v 1.3 2000/08/17 19:46:33 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -44,7 +43,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1intf.h,v 1.7 2001/07/25 15:04:55 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1intf.h,v 1.8 2006/01/09 14:59:29 dawes Exp $ */ #ifdef BUILDCID #include "AFM.h" Index: xc/lib/font/Type1/t1io.c diff -u xc/lib/font/Type1/t1io.c:3.9 xc/lib/font/Type1/t1io.c:3.10 --- xc/lib/font/Type1/t1io.c:3.9 Mon Aug 27 15:49:54 2001 +++ xc/lib/font/Type1/t1io.c Fri Oct 14 11:16:03 2005 @@ -1,4 +1,4 @@ -/* $Xorg: t1io.c,v 1.3 2000/08/17 19:46:33 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1io.c,v 3.10 2005/10/14 15:16:03 tsi Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -45,7 +45,6 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/t1io.c,v 3.9 2001/08/27 19:49:54 dawes Exp $ */ /******************************************************************* * I/O package for Type 1 font reading ********************************************************************/ @@ -58,8 +57,8 @@ #include #include #else -#include "Xdefs.h" /* Bool declaration */ -#include "Xmd.h" /* INT32 declaration */ +#include /* Bool declaration */ +#include /* INT32 declaration */ #include "xf86_ansic.h" #endif #include "t1stdio.h" @@ -67,7 +66,7 @@ #ifdef WIN32 #include #endif -#include "Xdefs.h" +#include /* Constants and variables used in the decryption */ #define c1 ((unsigned short)52845) Index: xc/lib/font/Type1/t1malloc.c diff -u xc/lib/font/Type1/t1malloc.c:1.12 xc/lib/font/Type1/t1malloc.c:1.13 --- xc/lib/font/Type1/t1malloc.c:1.12 Thu Jan 22 22:55:25 2004 +++ xc/lib/font/Type1/t1malloc.c Fri Oct 14 11:16:03 2005 @@ -1,4 +1,4 @@ -/* $Xorg: t1malloc.c,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.13 2005/10/14 15:16:03 tsi Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -26,7 +26,6 @@ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1malloc.c,v 1.12 2004/01/23 03:55:25 dawes Exp $ */ /* MALLOC CWEB V0004 LOTS */ /* :h1.MALLOC - Fast Memory Allocation @@ -39,8 +38,8 @@ */ #ifdef FONTMODULE -#include "Xdefs.h" /* Bool declaration */ -#include "Xmd.h" /* INT32 declaration */ +#include /* Bool declaration */ +#include /* INT32 declaration */ #include "os.h" #include "xf86_ansic.h" #else Index: xc/lib/font/Type1/t1snap.c diff -u xc/lib/font/Type1/t1snap.c:1.4 xc/lib/font/Type1/t1snap.c:1.5 --- xc/lib/font/Type1/t1snap.c:1.4 Wed Jan 17 14:43:24 2001 +++ xc/lib/font/Type1/t1snap.c Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: t1snap.c,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -27,7 +26,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1snap.c,v 1.4 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1snap.c,v 1.5 2006/01/09 14:59:29 dawes Exp $ */ #include "objects.h" Index: xc/lib/font/Type1/t1stdio.h diff -u xc/lib/font/Type1/t1stdio.h:1.10 xc/lib/font/Type1/t1stdio.h:1.11 --- xc/lib/font/Type1/t1stdio.h:1.10 Wed Jul 25 11:04:55 2001 +++ xc/lib/font/Type1/t1stdio.h Mon Jan 9 09:59:29 2006 @@ -1,4 +1,3 @@ -/* $Xorg: t1stdio.h,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -27,7 +26,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.10 2001/07/25 15:04:55 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1stdio.h,v 1.11 2006/01/09 14:59:29 dawes Exp $ */ /* T1IO FILE structure and related stuff */ #ifdef XFree86LOADER #undef FILE Index: xc/lib/font/Type1/t1stub.c diff -u xc/lib/font/Type1/t1stub.c:1.9 xc/lib/font/Type1/t1stub.c:1.10 --- xc/lib/font/Type1/t1stub.c:1.9 Mon Feb 18 15:51:57 2002 +++ xc/lib/font/Type1/t1stub.c Fri Oct 14 11:16:03 2005 @@ -1,4 +1,4 @@ -/* $Xorg: t1stub.c,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.10 2005/10/14 15:16:03 tsi Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -27,11 +27,10 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/t1stub.c,v 1.9 2002/02/18 20:51:57 herrb Exp $ */ #ifdef FONTMODULE -#include "Xdefs.h" /* Bool declaration */ -#include "Xmd.h" /* INT32 declaration */ +#include /* Bool declaration */ +#include /* INT32 declaration */ #include "os.h" #include "xf86_ansic.h" #else Index: xc/lib/font/Type1/t1test.c diff -u xc/lib/font/Type1/t1test.c:1.1.1.3 xc/lib/font/Type1/t1test.c:1.2 --- xc/lib/font/Type1/t1test.c:1.1.1.3 Tue Jan 16 17:26:22 2001 +++ xc/lib/font/Type1/t1test.c Fri Oct 14 11:16:03 2005 @@ -1,4 +1,4 @@ -/* $Xorg: t1test.c,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/t1test.c,v 1.2 2005/10/14 15:16:03 tsi Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -29,7 +29,7 @@ */ #include "fntfilst.h" -#include "FSproto.h" +#include void Display(); Index: xc/lib/font/Type1/token.c diff -u xc/lib/font/Type1/token.c:1.6 xc/lib/font/Type1/token.c:1.7 --- xc/lib/font/Type1/token.c:1.6 Tue May 27 18:26:47 2003 +++ xc/lib/font/Type1/token.c Mon Jan 9 09:59:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: token.c,v 1.4 2000/08/17 19:46:34 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -27,7 +26,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/token.c,v 1.6 2003/05/27 22:26:47 tsi Exp $ */ +/* $XFree86: xc/lib/font/Type1/token.c,v 1.7 2006/01/09 14:59:30 dawes Exp $ */ /* Authors: Sig Nin & Carol Thompson IBM Almaden Research Laboratory */ #include "t1stdio.h" #include "util.h" Index: xc/lib/font/Type1/token.h diff -u xc/lib/font/Type1/token.h:1.4 xc/lib/font/Type1/token.h:1.5 --- xc/lib/font/Type1/token.h:1.4 Wed Jan 17 14:43:24 2001 +++ xc/lib/font/Type1/token.h Mon Jan 9 09:59:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: token.h,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -27,7 +26,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/token.h,v 1.4 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/token.h,v 1.5 2006/01/09 14:59:30 dawes Exp $ */ #ifndef TOKEN_H #define TOKEN_H Index: xc/lib/font/Type1/tokst.h diff -u xc/lib/font/Type1/tokst.h:1.4 xc/lib/font/Type1/tokst.h:1.5 --- xc/lib/font/Type1/tokst.h:1.4 Wed Jan 17 14:43:24 2001 +++ xc/lib/font/Type1/tokst.h Mon Jan 9 09:59:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: tokst.h,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -27,7 +26,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. */ -/* $XFree86: xc/lib/font/Type1/tokst.h,v 1.4 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/tokst.h,v 1.5 2006/01/09 14:59:30 dawes Exp $ */ /* -------------------------------------- */ /* --- MACHINE GENERATED, DO NOT EDIT --- */ Index: xc/lib/font/Type1/trig.h diff -u xc/lib/font/Type1/trig.h:1.3 xc/lib/font/Type1/trig.h:1.4 --- xc/lib/font/Type1/trig.h:1.3 Wed Jan 17 14:43:24 2001 +++ xc/lib/font/Type1/trig.h Mon Jan 9 09:59:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: trig.h,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -29,7 +28,7 @@ */ /*SHARED*/ -/* $XFree86: xc/lib/font/Type1/trig.h,v 1.3 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/trig.h,v 1.4 2006/01/09 14:59:30 dawes Exp $ */ #undef DegreeCos #undef DegreeSin Index: xc/lib/font/Type1/type1.c diff -u xc/lib/font/Type1/type1.c:1.11 xc/lib/font/Type1/type1.c:1.12 --- xc/lib/font/Type1/type1.c:1.11 Sat Oct 23 11:29:26 2004 +++ xc/lib/font/Type1/type1.c Fri Oct 14 11:16:03 2005 @@ -1,4 +1,4 @@ -/* $Xorg: type1.c,v 1.4 2000/08/17 19:46:34 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/type1.c,v 1.12 2005/10/14 15:16:03 tsi Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -45,7 +45,6 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/type1.c,v 1.11 2004/10/23 15:29:26 dawes Exp $ */ /*********************************************************************/ /* */ @@ -68,8 +67,8 @@ #include /* a system-dependent include, usually */ #include #else -#include "Xdefs.h" -#include "Xmd.h" +#include +#include #include "xf86_ansic.h" #endif #include "objects.h" Index: xc/lib/font/Type1/util.c diff -u xc/lib/font/Type1/util.c:1.6 xc/lib/font/Type1/util.c:1.7 --- xc/lib/font/Type1/util.c:1.6 Wed Jan 17 14:43:24 2001 +++ xc/lib/font/Type1/util.c Fri Oct 14 11:16:03 2005 @@ -1,4 +1,4 @@ -/* $Xorg: util.c,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/Type1/util.c,v 1.7 2005/10/14 15:16:03 tsi Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -44,14 +44,13 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/util.c,v 1.6 2001/01/17 19:43:24 dawes Exp $ */ /* Author: Katherine A. Hitchcock IBM Almaden Research Laboratory */ #ifndef FONTMODULE #include #else -#include "Xdefs.h" -#include "Xmd.h" +#include +#include #include "xf86_ansic.h" #endif #include "util.h" Index: xc/lib/font/Type1/util.h diff -u xc/lib/font/Type1/util.h:1.5 xc/lib/font/Type1/util.h:1.6 --- xc/lib/font/Type1/util.h:1.5 Wed Jan 17 14:43:24 2001 +++ xc/lib/font/Type1/util.h Mon Jan 9 09:59:30 2006 @@ -1,4 +1,3 @@ -/* $Xorg: util.h,v 1.3 2000/08/17 19:46:34 cpqbld Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * @@ -44,7 +43,7 @@ * The Original Software is CID font code that was developed by Silicon * Graphics, Inc. */ -/* $XFree86: xc/lib/font/Type1/util.h,v 1.5 2001/01/17 19:43:24 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/util.h,v 1.6 2006/01/09 14:59:30 dawes Exp $ */ #ifndef UTIL_H #define UTIL_H Index: xc/lib/font/Type1/module/Imakefile diff -u xc/lib/font/Type1/module/Imakefile:1.9 xc/lib/font/Type1/module/Imakefile:1.10 --- xc/lib/font/Type1/module/Imakefile:1.9 Mon May 31 20:16:57 2004 +++ xc/lib/font/Type1/module/Imakefile Fri Oct 14 11:16:04 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/Type1/module/Imakefile,v 1.9 2004/06/01 00:16:57 dawes Exp $ +XCOMM $XFree86: xc/lib/font/Type1/module/Imakefile,v 1.10 2005/10/14 15:16:04 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -49,8 +49,7 @@ #define IHaveModules #include -INCLUDES = -I$(FONTINCSRC) -I../ -I../../include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/include +INCLUDES = -I.. -I../../include -I$(SERVERSRC)/include #if BuildCID CIDSRCS = cidchar.c afm.c Index: xc/lib/font/Type1/module/type1mod.c diff -u xc/lib/font/Type1/module/type1mod.c:1.11 xc/lib/font/Type1/module/type1mod.c:1.12 --- xc/lib/font/Type1/module/type1mod.c:1.11 Fri Feb 13 18:58:29 2004 +++ xc/lib/font/Type1/module/type1mod.c Thu Mar 16 11:49:45 2006 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998 The XFree86 Project, Inc. + * Copyright (C) 1998-2006 The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -44,12 +44,12 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/lib/font/Type1/module/type1mod.c,v 1.11 2004/02/13 23:58:29 dawes Exp $ */ +/* $XFree86: xc/lib/font/Type1/module/type1mod.c,v 1.12 2006/03/16 16:49:45 dawes Exp $ */ #include "misc.h" -#include "fontmod.h" #include "xf86Module.h" +#include "fontmod.h" static MODULESETUPPROTO(type1Setup); @@ -94,7 +94,7 @@ #endif static pointer -type1Setup(pointer module, pointer opts, int *errmaj, int *errmin) +type1Setup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { type1Module.module = module; LoadFont(&type1Module); Index: xc/lib/font/bitmap/Imakefile diff -u xc/lib/font/bitmap/Imakefile:1.14 xc/lib/font/bitmap/Imakefile:1.15 --- xc/lib/font/bitmap/Imakefile:1.14 Wed Jun 2 18:42:55 2004 +++ xc/lib/font/bitmap/Imakefile Fri Oct 14 11:16:04 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/bitmap/Imakefile,v 1.14 2004/06/02 22:42:55 dawes Exp $ +XCOMM $XFree86: xc/lib/font/bitmap/Imakefile,v 1.15 2005/10/14 15:16:04 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. @@ -70,8 +70,7 @@ PCFDEFS=-DPCFFORMAT - INCLUDES = -I$(FONTINCSRC) -I../include - HEADERS = + INCLUDES = -I../include #ifdef FontFormatDefines FORMAT_DEFS = FontFormatDefines #endif Index: xc/lib/font/bitmap/bdfint.h diff -u xc/lib/font/bitmap/bdfint.h:1.5 xc/lib/font/bitmap/bdfint.h:1.6 --- xc/lib/font/bitmap/bdfint.h:1.5 Fri Dec 14 14:56:45 2001 +++ xc/lib/font/bitmap/bdfint.h Mon Jan 9 09:59:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: bdfint.h,v 1.4 2001/02/09 02:04:01 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.5 2001/12/14 19:56:45 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfint.h,v 1.6 2006/01/09 14:59:31 dawes Exp $ */ #ifndef BDFINT_H #define BDFINT_H Index: xc/lib/font/bitmap/bdfread.c diff -u xc/lib/font/bitmap/bdfread.c:1.13 xc/lib/font/bitmap/bdfread.c:1.14 --- xc/lib/font/bitmap/bdfread.c:1.13 Tue May 27 18:26:48 2003 +++ xc/lib/font/bitmap/bdfread.c Mon Jan 9 09:59:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: bdfread.c,v 1.5 2001/02/09 02:04:01 xorgcvs Exp $ */ - /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -50,7 +48,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.13 2003/05/27 22:26:48 tsi Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfread.c,v 1.14 2006/01/09 14:59:31 dawes Exp $ */ #ifndef FONTMODULE #include Index: xc/lib/font/bitmap/bdfutils.c diff -u xc/lib/font/bitmap/bdfutils.c:1.11 xc/lib/font/bitmap/bdfutils.c:1.12 --- xc/lib/font/bitmap/bdfutils.c:1.11 Sat Sep 13 17:33:02 2003 +++ xc/lib/font/bitmap/bdfutils.c Fri Oct 14 11:16:04 2005 @@ -1,4 +1,4 @@ -/* $Xorg: bdfutils.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.12 2005/10/14 15:16:04 tsi Exp $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -49,7 +49,6 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bdfutils.c,v 1.11 2003/09/13 21:33:02 dawes Exp $ */ #ifndef FONTMODULE #include @@ -58,7 +57,7 @@ #endif #include "fntfilst.h" -#include "fontstruct.h" +#include /* use bitmap structure */ #include "bitmap.h" #include "bdfint.h" Index: xc/lib/font/bitmap/bitmap.c diff -u xc/lib/font/bitmap/bitmap.c:1.7 xc/lib/font/bitmap/bitmap.c:1.8 --- xc/lib/font/bitmap/bitmap.c:1.7 Fri Dec 14 14:56:45 2001 +++ xc/lib/font/bitmap/bitmap.c Mon Jan 9 09:59:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: bitmap.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitmap.c,v 1.7 2001/12/14 19:56:45 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmap.c,v 1.8 2006/01/09 14:59:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/bitmap/bitmapfunc.c diff -u xc/lib/font/bitmap/bitmapfunc.c:3.18 xc/lib/font/bitmap/bitmapfunc.c:3.19 --- xc/lib/font/bitmap/bitmapfunc.c:3.18 Tue Sep 24 16:48:52 2002 +++ xc/lib/font/bitmap/bitmapfunc.c Mon Jan 9 09:59:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: bitmapfunc.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -26,7 +24,7 @@ */ -/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.18 2002/09/24 20:48:52 tsi Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmapfunc.c,v 3.19 2006/01/09 14:59:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/bitmap/bitmaputil.c diff -u xc/lib/font/bitmap/bitmaputil.c:1.11 xc/lib/font/bitmap/bitmaputil.c:1.12 --- xc/lib/font/bitmap/bitmaputil.c:1.11 Tue Feb 18 20:22:34 2003 +++ xc/lib/font/bitmap/bitmaputil.c Mon Jan 9 09:59:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: bitmaputil.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ - /* Copyright 1990, 1994, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.11 2003/02/19 01:22:34 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitmaputil.c,v 1.12 2006/01/09 14:59:31 dawes Exp $ */ #include "fntfilst.h" #include "bitmap.h" Index: xc/lib/font/bitmap/bitscale.c diff -u xc/lib/font/bitmap/bitscale.c:3.30 xc/lib/font/bitmap/bitscale.c:3.31 --- xc/lib/font/bitmap/bitscale.c:3.30 Tue May 27 18:26:48 2003 +++ xc/lib/font/bitmap/bitscale.c Mon Jan 9 09:59:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: bitscale.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1991, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.30 2003/05/27 22:26:48 tsi Exp $ */ +/* $XFree86: xc/lib/font/bitmap/bitscale.c,v 3.31 2006/01/09 14:59:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/bitmap/fontink.c diff -u xc/lib/font/bitmap/fontink.c:1.7 xc/lib/font/bitmap/fontink.c:1.8 --- xc/lib/font/bitmap/fontink.c:1.7 Fri Dec 14 14:56:46 2001 +++ xc/lib/font/bitmap/fontink.c Mon Jan 9 09:59:31 2006 @@ -1,5 +1,3 @@ -/* $Xorg: fontink.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.7 2001/12/14 19:56:46 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.8 2006/01/09 14:59:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/bitmap/pcf.h diff -u xc/lib/font/bitmap/pcf.h:1.5 xc/lib/font/bitmap/pcf.h:1.6 --- xc/lib/font/bitmap/pcf.h:1.5 Mon Nov 17 20:17:04 2003 +++ xc/lib/font/bitmap/pcf.h Fri Oct 14 11:16:04 2005 @@ -1,5 +1,4 @@ -/* $Xorg: pcf.h,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.6 2005/10/14 15:16:04 tsi Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -27,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcf.h,v 1.5 2003/11/18 01:17:04 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium @@ -36,6 +34,9 @@ #ifndef _PCF_H_ #define _PCF_H_ +#include +#include "fntfilio.h" + /* * Information used to read/write PCF fonts */ Index: xc/lib/font/bitmap/pcfread.c diff -u xc/lib/font/bitmap/pcfread.c:1.22 xc/lib/font/bitmap/pcfread.c:1.23 --- xc/lib/font/bitmap/pcfread.c:1.22 Mon Nov 17 20:17:04 2003 +++ xc/lib/font/bitmap/pcfread.c Mon Jan 9 09:59:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: pcfread.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.22 2003/11/18 01:17:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcfread.c,v 1.23 2006/01/09 14:59:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/bitmap/pcfwrite.c diff -u xc/lib/font/bitmap/pcfwrite.c:1.12 xc/lib/font/bitmap/pcfwrite.c:1.13 --- xc/lib/font/bitmap/pcfwrite.c:1.12 Mon Nov 17 20:17:04 2003 +++ xc/lib/font/bitmap/pcfwrite.c Mon Jan 9 09:59:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: pcfwrite.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ /* Copyright 1990, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.12 2003/11/18 01:17:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/pcfwrite.c,v 1.13 2006/01/09 14:59:31 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/bitmap/snfread.c diff -u xc/lib/font/bitmap/snfread.c:1.13 xc/lib/font/bitmap/snfread.c:1.14 --- xc/lib/font/bitmap/snfread.c:1.13 Mon Nov 17 20:17:04 2003 +++ xc/lib/font/bitmap/snfread.c Mon Jan 9 09:59:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: snfread.c,v 1.5 2001/02/09 02:04:02 xorgcvs Exp $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -49,7 +48,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.13 2003/11/18 01:17:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/snfread.c,v 1.14 2006/01/09 14:59:31 dawes Exp $ */ #ifndef FONTMODULE #include Index: xc/lib/font/bitmap/snfstr.h diff -u xc/lib/font/bitmap/snfstr.h:1.6 xc/lib/font/bitmap/snfstr.h:1.7 --- xc/lib/font/bitmap/snfstr.h:1.6 Mon Nov 17 20:17:04 2003 +++ xc/lib/font/bitmap/snfstr.h Mon Jan 9 09:59:31 2006 @@ -1,4 +1,3 @@ -/* $Xorg: snfstr.h,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -49,7 +48,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.6 2003/11/18 01:17:04 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/snfstr.h,v 1.7 2006/01/09 14:59:31 dawes Exp $ */ #ifndef SNFSTR_H #define SNFSTR_H 1 Index: xc/lib/font/bitmap/module/Imakefile diff -u xc/lib/font/bitmap/module/Imakefile:1.8 xc/lib/font/bitmap/module/Imakefile:1.9 --- xc/lib/font/bitmap/module/Imakefile:1.8 Mon May 31 20:16:57 2004 +++ xc/lib/font/bitmap/module/Imakefile Fri Oct 14 11:16:04 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/font/bitmap/module/Imakefile,v 1.8 2004/06/01 00:16:57 dawes Exp $ +XCOMM $XFree86: xc/lib/font/bitmap/module/Imakefile,v 1.9 2005/10/14 15:16:04 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -49,9 +49,7 @@ #define IHaveModules #include - INCLUDES = -I$(FONTINCSRC) -I../../include -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) -I../ - HEADERS = + INCLUDES = -I../../include -I$(SERVERSRC)/include -I.. DEFINES = -DFONTMODULE -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT #ifdef FontFormatDefines Index: xc/lib/font/bitmap/module/bitmapmod.c diff -u xc/lib/font/bitmap/module/bitmapmod.c:1.8 xc/lib/font/bitmap/module/bitmapmod.c:1.9 --- xc/lib/font/bitmap/module/bitmapmod.c:1.8 Fri Feb 13 18:58:29 2004 +++ xc/lib/font/bitmap/module/bitmapmod.c Thu Mar 16 11:49:45 2006 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998 The XFree86 Project, Inc. + * Copyright (C) 1998-2006 The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -44,12 +44,12 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/lib/font/bitmap/module/bitmapmod.c,v 1.8 2004/02/13 23:58:29 dawes Exp $ */ +/* $XFree86: xc/lib/font/bitmap/module/bitmapmod.c,v 1.9 2006/03/16 16:49:45 dawes Exp $ */ #include "misc.h" -#include "fontmod.h" #include "xf86Module.h" +#include "fontmod.h" static MODULESETUPPROTO(bitmapSetup); @@ -76,14 +76,14 @@ extern void BitmapRegisterFontFileFunctions(void); -FontModule bitmapModule = { +static FontModule bitmapModule = { BitmapRegisterFontFileFunctions, "Bitmap", NULL }; static pointer -bitmapSetup(pointer mod, pointer opts, int *errmaj, int *errmin) +bitmapSetup(ModuleDescPtr mod, pointer opts, int *errmaj, int *errmin) { bitmapModule.module = mod; LoadFont(&bitmapModule); Index: xc/lib/font/builtins/Imakefile diff -u xc/lib/font/builtins/Imakefile:1.3 xc/lib/font/builtins/Imakefile:1.6 --- xc/lib/font/builtins/Imakefile:1.3 Sat Nov 3 18:03:00 2001 +++ xc/lib/font/builtins/Imakefile Mon Jan 9 09:59:32 2006 @@ -1,17 +1,20 @@ -XCOMM $XFree86: xc/lib/font/builtins/Imakefile,v 1.3 2001/11/03 23:03:00 dawes Exp $ -XCOMM -XCOMM -XCOMM $XConsortium: Imakefile /main/14 1996/11/03 19:58:41 kaleb $ +XCOMM $XFree86: xc/lib/font/builtins/Imakefile,v 1.6 2006/01/09 14:59:32 dawes Exp $ + #include - INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include - HEADERS = + INCLUDES = -I../include -I../bitmap + + SRCS = dir.c file.c fonts.c fpe.c render.c + OBJS = dir.o file.o fonts.o fpe.o render.o - SRCS = dir.c file.c fonts.c fpe.c render.c - OBJS = dir.o file.o fonts.o fpe.o render.o +#define DoNormalLib NormalLibFont +#define DoSharedLib SharedLibFont +#define DoDebugLib DebugLibFont +#define DoProfileLib ProfileLibFont +#include +LibraryObjectRule() SubdirLibraryRule($(OBJS)) -NormalLibraryObjectRule() NormalLintTarget($(SRCS)) DependTarget() Index: xc/lib/font/builtins/builtin.h diff -u xc/lib/font/builtins/builtin.h:1.4 xc/lib/font/builtins/builtin.h:1.5 --- xc/lib/font/builtins/builtin.h:1.4 Wed Feb 23 15:29:33 2000 +++ xc/lib/font/builtins/builtin.h Fri Oct 14 11:16:05 2005 @@ -1,5 +1,5 @@ /* - * Id: builtin.h,v 1.2 1999/11/02 06:16:47 keithp Exp $ + * $XFree86: xc/lib/font/builtins/builtin.h,v 1.5 2005/10/14 15:16:05 tsi Exp $ * * Copyright 1999 SuSE, Inc. * @@ -17,15 +17,18 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ + +#ifndef _FONT_BUILTIN_H_ + +#define _FONT_BUILTIN_H_ #include -#include +#include #include "fontxlfd.h" #include "fntfil.h" #include "fntfilio.h" @@ -56,5 +59,12 @@ extern const BuiltinAliasRec builtin_alias[]; extern const int builtin_alias_count; -extern FontFilePtr BuiltinFileOpen (); -extern int BuiltinFileClose (); +extern FontFilePtr BuiltinFileOpen(char *name); +extern int BuiltinFileClose(FontFilePtr f); + +extern int BuiltinReadDirectory(char *directory, + FontDirectoryPtr *pdir); + +extern void BuiltinRegisterFontFileFunctions(void); + +#endif Index: xc/lib/font/builtins/dir.c diff -u xc/lib/font/builtins/dir.c:1.4 xc/lib/font/builtins/dir.c:1.5 --- xc/lib/font/builtins/dir.c:1.4 Wed Feb 23 15:29:33 2000 +++ xc/lib/font/builtins/dir.c Fri Oct 14 11:16:05 2005 @@ -1,5 +1,5 @@ /* - * Id: dir.c,v 1.2 1999/11/02 06:16:47 keithp Exp $ + * $XFree86: xc/lib/font/builtins/dir.c,v 1.5 2005/10/14 15:16:05 tsi Exp $ * * Copyright 1999 SuSE, Inc. * @@ -17,45 +17,42 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/dir.c,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ #include "builtin.h" int -BuiltinReadDirectory (directory, pdir) - char *directory; - FontDirectoryPtr *pdir; +BuiltinReadDirectory(char *directory, FontDirectoryPtr *pdir) { FontDirectoryPtr dir; int i; - dir = FontFileMakeDir ("", builtin_dir_count); + dir = FontFileMakeDir("", builtin_dir_count); for (i = 0; i < builtin_dir_count; i++) { - if (!FontFileAddFontFile (dir, - (char *) builtin_dir[i].font_name, - (char *) builtin_dir[i].file_name)) + if (!FontFileAddFontFile(dir, + (char *) builtin_dir[i].font_name, + (char *) builtin_dir[i].file_name)) { - FontFileFreeDir (dir); + FontFileFreeDir(dir); return BadFontPath; } } for (i = 0; i < builtin_alias_count; i++) { - if (!FontFileAddFontAlias (dir, - (char *) builtin_alias[i].alias_name, - (char *) builtin_alias[i].font_name)) + if (!FontFileAddFontAlias(dir, + (char *) builtin_alias[i].alias_name, + (char *) builtin_alias[i].font_name)) { - FontFileFreeDir (dir); + FontFileFreeDir(dir); return BadFontPath; } } - FontFileSortDir (dir); + FontFileSortDir(dir); *pdir = dir; return Successful; } Index: xc/lib/font/builtins/file.c diff -u xc/lib/font/builtins/file.c:1.4 xc/lib/font/builtins/file.c:1.6 --- xc/lib/font/builtins/file.c:1.4 Wed Feb 23 15:29:33 2000 +++ xc/lib/font/builtins/file.c Fri Oct 14 11:16:05 2005 @@ -1,5 +1,5 @@ /* - * Id: file.c,v 1.2 1999/11/02 06:16:47 keithp Exp $ + * $XFree86: xc/lib/font/builtins/file.c,v 1.6 2005/10/14 15:16:05 tsi Exp $ * * Copyright 1999 SuSE, Inc. * @@ -17,12 +17,11 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/file.c,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ #include "builtin.h" @@ -32,11 +31,10 @@ } BuiltinIORec, *BuiltinIOPtr; static int -BuiltinFill (f) - BufFilePtr f; +BuiltinFill(BufFilePtr f) { - int left, len; - BuiltinIOPtr io = ((BuiltinIOPtr) f->private); + int left, len; + BuiltinIOPtr io = ((BuiltinIOPtr) f->private); left = io->file->len - io->offset; if (left <= 0) @@ -47,7 +45,7 @@ len = BUFFILESIZE; if (len > left) len = left; - bcopy (io->file->bits + io->offset, f->buffer, len); + bcopy(io->file->bits + io->offset, f->buffer, len); io->offset += len; f->left = len - 1; f->bufp = f->buffer + 1; @@ -55,15 +53,12 @@ } static int -BuiltinSkip (f, count) - BufFilePtr f; - int count; +BuiltinSkip(BufFilePtr f, int count) { - BuiltinIOPtr io = ((BuiltinIOPtr) f->private); - int curoff; - int fileoff; - int todo; - int left; + BuiltinIOPtr io = ((BuiltinIOPtr) f->private); + int curoff; + int fileoff; + int todo; curoff = f->bufp - f->buffer; fileoff = curoff + f->left; @@ -83,19 +78,15 @@ } static int -BuiltinClose (f, doClose) - BufFilePtr f; +BuiltinClose(BufFilePtr f, int doClose) { - BuiltinIOPtr io = ((BuiltinIOPtr) f->private); - - xfree (io); + xfree(f->private); return 1; } FontFilePtr -BuiltinFileOpen (name) - char *name; +BuiltinFileOpen(char *name) { int i; BuiltinIOPtr io; @@ -107,29 +98,29 @@ break; if (i == builtin_files_count) return NULL; - io = (BuiltinIOPtr) xalloc (sizeof (BuiltinIORec)); + io = xalloc (sizeof (BuiltinIORec)); if (!io) return NULL; io->offset = 0; io->file = (void *) &builtin_files[i]; - raw = BufFileCreate ((char *) io, BuiltinFill, 0, BuiltinSkip, BuiltinClose); + raw = BufFileCreate((char *)io, BuiltinFill, 0, BuiltinSkip, BuiltinClose); if (!raw) { - xfree (io); + xfree(io); return NULL; } - if (cooked = BufFilePushCompressed (raw)) + if ((cooked = BufFilePushCompressed(raw))) raw = cooked; else { raw->left += raw->bufp - raw->buffer; raw->bufp = raw->buffer; } - return (FontFilePtr) raw; + return (FontFilePtr)raw; } -BuiltinFileClose (f) - FontFilePtr f; +int +BuiltinFileClose(FontFilePtr f) { - return BufFileClose ((BufFilePtr) f, TRUE); + return BufFileClose((BufFilePtr)f, TRUE); } Index: xc/lib/font/builtins/fonts.c diff -u xc/lib/font/builtins/fonts.c:1.4 xc/lib/font/builtins/fonts.c:1.5 --- xc/lib/font/builtins/fonts.c:1.4 Wed Feb 23 15:29:34 2000 +++ xc/lib/font/builtins/fonts.c Fri Oct 14 11:16:05 2005 @@ -1,5 +1,5 @@ /* - * Id: fonts.c,v 1.2 1999/11/02 06:16:47 keithp Exp $ + * $XFree86: xc/lib/font/builtins/fonts.c,v 1.5 2005/10/14 15:16:05 tsi Exp $ * * Copyright 1999 SuSE, Inc. * @@ -17,12 +17,11 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.4 2000/02/23 20:29:34 dawes Exp $ */ #include "builtin.h" @@ -2389,47 +2388,57 @@ }; -static char name_6x13[] = "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1"; +static char name_6x13[] = + "-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1"; static char name_cursor[] = "cursor"; -static char name_5x7[] = "-misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1"; -static char name_5x8[] = "-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv"; +static char name_5x7[] = + "-misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1"; +static char name_5x8[] = + "-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso646.1991-irv"; const BuiltinFileRec builtin_files[] = { -"6x13.builtin", sizeof file_6x13, file_6x13, -"cursor.builtin", sizeof file_cursor, file_cursor, -"5x7.builtin", sizeof file_5x7, file_5x7, -"5x8.builtin", sizeof file_5x8, file_5x8, + {"6x13.builtin", sizeof file_6x13, file_6x13}, + {"cursor.builtin", sizeof file_cursor, file_cursor}, + {"5x7.builtin", sizeof file_5x7, file_5x7}, + {"5x8.builtin", sizeof file_5x8, file_5x8}, }; -const int builtin_files_count = sizeof (builtin_files) / sizeof (builtin_files[0]); +const int builtin_files_count = + sizeof(builtin_files) / sizeof(builtin_files[0]); const BuiltinDirRec builtin_dir[] = { -"6x13.builtin", name_6x13, -"cursor.builtin", name_cursor, -"5x7.builtin", name_5x7, -"5x8.builtin", name_5x8, + {"6x13.builtin", name_6x13}, + {"cursor.builtin", name_cursor}, + {"5x7.builtin", name_5x7}, + {"5x8.builtin", name_5x8}, }; -const int builtin_dir_count = sizeof (builtin_dir) / sizeof (builtin_dir[0]); +const int builtin_dir_count = + sizeof(builtin_dir) / sizeof(builtin_dir[0]); static char alias_fixed[] = "fixed"; static char alias_6x13[] = "6x13"; -static char alias_6x13_100[] = "-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1"; +static char alias_6x13_100[] = + "-misc-fixed-medium-r-semicondensed--13-100-100-100-c-60-iso8859-1"; static char alias_5x7[] = "5x7"; -static char alias_5x7_100[] = "-misc-fixed-medium-r-normal--7-50-100-100-c-50-iso8859-1"; +static char alias_5x7_100[] = + "-misc-fixed-medium-r-normal--7-50-100-100-c-50-iso8859-1"; static char alias_5x8[] = "5x8"; -static char alias_5x8_75[] = "-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1"; -static char alias_5x8_100[] = "-misc-fixed-medium-r-normal--8-60-100-100-c-50-iso8859-1"; +static char alias_5x8_75[] = + "-misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1"; +static char alias_5x8_100[] = + "-misc-fixed-medium-r-normal--8-60-100-100-c-50-iso8859-1"; const BuiltinAliasRec builtin_alias[] = { -alias_fixed, name_6x13, -alias_6x13, name_6x13, -alias_6x13_100, name_6x13, -alias_5x7, name_5x7, -alias_5x7_100, name_5x7, -alias_5x8, name_5x8, -alias_5x8_75, name_5x8, -alias_5x8_100, name_5x8, + {alias_fixed, name_6x13}, + {alias_6x13, name_6x13}, + {alias_6x13_100, name_6x13}, + {alias_5x7, name_5x7}, + {alias_5x7_100, name_5x7}, + {alias_5x8, name_5x8}, + {alias_5x8_75, name_5x8}, + {alias_5x8_100, name_5x8}, }; -const int builtin_alias_count = sizeof (builtin_alias) / sizeof (builtin_alias[0]); +const int builtin_alias_count = + sizeof(builtin_alias) / sizeof(builtin_alias[0]); Index: xc/lib/font/builtins/fpe.c diff -u xc/lib/font/builtins/fpe.c:1.4 xc/lib/font/builtins/fpe.c:1.6 --- xc/lib/font/builtins/fpe.c:1.4 Wed Feb 23 15:29:36 2000 +++ xc/lib/font/builtins/fpe.c Fri Oct 14 11:16:05 2005 @@ -1,5 +1,5 @@ /* - * Id: fpe.c,v 1.2 1999/11/02 06:16:48 keithp Exp $ + * $XFree86: xc/lib/font/builtins/fpe.c,v 1.6 2005/10/14 15:16:05 tsi Exp $ * * Copyright 1999 SuSE, Inc. * @@ -17,77 +17,69 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.4 2000/02/23 20:29:36 dawes Exp $ */ -#include "fntfilst.h" +#include "fntfilst.h" +#include "builtin.h" -static int font_file_type; - -const char builtin_fonts[] = "built-ins"; +const char builtin_fonts[] = "built-ins"; int -BuiltinNameCheck (name) - char *name; +BuiltinNameCheck(char *name) { - return (strcmp (name, builtin_fonts) == 0); + return (strcmp(name, builtin_fonts) == 0); } int -BuiltinInitFPE (fpe) - FontPathElementPtr fpe; +BuiltinInitFPE(FontPathElementPtr fpe) { int status; FontDirectoryPtr dir; - status = BuiltinReadDirectory (fpe->name, &dir); + status = BuiltinReadDirectory(fpe->name, &dir); if (status == Successful) - fpe->private = (pointer) dir; + fpe->private = dir; return status; } /* ARGSUSED */ int -BuiltinResetFPE (fpe) - FontPathElementPtr fpe; +BuiltinResetFPE(FontPathElementPtr fpe) { - FontDirectoryPtr dir; - - dir = (FontDirectoryPtr) fpe->private; /* builtins can't change! */ return Successful; } int -BuiltinFreeFPE (fpe) - FontPathElementPtr fpe; +BuiltinFreeFPE(FontPathElementPtr fpe) { - FontFileFreeDir ((FontDirectoryPtr) fpe->private); + FontFileFreeDir(fpe->private); return Successful; } -BuiltinRegisterFpeFunctions() +void +BuiltinRegisterFpeFunctions(void) { - BuiltinRegisterFontFileFunctions (); + BuiltinRegisterFontFileFunctions(); - font_file_type = RegisterFPEFunctions(BuiltinNameCheck, - BuiltinInitFPE, - BuiltinFreeFPE, - BuiltinResetFPE, - FontFileOpenFont, - FontFileCloseFont, - FontFileListFonts, - FontFileStartListFontsWithInfo, - FontFileListNextFontWithInfo, - (WakeupFpeFunc) 0, - (ClientDiedFunc) 0, - (LoadGlyphsFunc) 0, - (StartLaFunc) 0, - (NextLaFunc) 0, - (SetPathFunc) 0); + RegisterFPEFunctions(BuiltinNameCheck, + BuiltinInitFPE, + BuiltinFreeFPE, + BuiltinResetFPE, + FontFileOpenFont, + FontFileCloseFont, + FontFileListFonts, + FontFileStartListFontsWithInfo, + FontFileListNextFontWithInfo, + (WakeupFpeFunc)0, + (ClientDiedFunc)0, + (LoadGlyphsFunc)0, + (StartLaFunc)0, + (NextLaFunc)0, + (SetPathFunc)0); } Index: xc/lib/font/builtins/render.c diff -u xc/lib/font/builtins/render.c:1.4 xc/lib/font/builtins/render.c:1.6 --- xc/lib/font/builtins/render.c:1.4 Wed Feb 23 15:29:36 2000 +++ xc/lib/font/builtins/render.c Fri Oct 14 11:16:05 2005 @@ -1,5 +1,5 @@ /* - * Id: render.c,v 1.2 1999/11/02 06:16:48 keithp Exp $ + * $XFree86: xc/lib/font/builtins/render.c,v 1.6 2005/10/14 15:16:05 tsi Exp $ * * Copyright 1999 SuSE, Inc. * @@ -17,33 +17,35 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/render.c,v 1.4 2000/02/23 20:29:36 dawes Exp $ */ -#include "fntfilst.h" -#include "builtin.h" - -BuiltinOpenBitmap (fpe, ppFont, flags, entry, fileName, format, fmask) - FontPathElementPtr fpe; - FontPtr *ppFont; - int flags; - FontEntryPtr entry; - char *fileName; - fsBitmapFormat format; - fsBitmapFormatMask fmask; +#include "pcf.h" +#include "fntfilst.h" +#include "fontutil.h" +#include "builtin.h" + +static int +BuiltinOpenBitmap( + FontPathElementPtr fpe, + FontPtr *ppFont, + int flags, + FontEntryPtr entry, + char *fileName, + fsBitmapFormat format, + fsBitmapFormatMask fmask, + FontPtr unused) { FontFilePtr file; FontPtr pFont; - int i; int ret; int bit, - byte, - glyph, - scan, + byte, + glyph, + scan, image; file = BuiltinFileOpen (fileName); @@ -51,7 +53,7 @@ return BadFontName; pFont = (FontPtr) xalloc(sizeof(FontRec)); if (!pFont) { - BuiltinFileClose (file); + BuiltinFileClose(file); return AllocError; } /* set up default values */ @@ -64,9 +66,9 @@ pFont->maxPrivate = -1; pFont->devPrivates = (pointer *) 0; - ret = pcfReadFont (pFont, file, bit, byte, glyph, scan); + ret = pcfReadFont(pFont, file, bit, byte, glyph, scan); - BuiltinFileClose (file); + BuiltinFileClose(file); if (ret != Successful) xfree(pFont); else @@ -74,36 +76,34 @@ return ret; } -BuiltinGetInfoBitmap (fpe, pFontInfo, entry, fileName) - FontPathElementPtr fpe; - FontInfoPtr pFontInfo; - FontEntryPtr entry; - char *fileName; +static int +BuiltinGetInfoBitmap( + FontPathElementPtr fpe, + FontInfoPtr pFontInfo, + FontEntryPtr entry, + char *fileName) { FontFilePtr file; - int i; int ret; - FontRendererPtr renderer; - file = BuiltinFileOpen (fileName); + file = BuiltinFileOpen(fileName); if (!file) return BadFontName; - ret = pcfReadFontInfo (pFontInfo, file); - BuiltinFileClose (file); + ret = pcfReadFontInfo(pFontInfo, file); + BuiltinFileClose(file); return ret; } static FontRendererRec renderers[] = { - ".builtin", 8, - BuiltinOpenBitmap, 0, BuiltinGetInfoBitmap, 0, 0 + {".builtin", 8, BuiltinOpenBitmap, 0, BuiltinGetInfoBitmap, 0, 0} }; -#define numRenderers (sizeof renderers / sizeof renderers[0]) +#define numRenderers (sizeof renderers / sizeof renderers[0]) -BuiltinRegisterFontFileFunctions() +void +BuiltinRegisterFontFileFunctions(void) { int i; for (i = 0; i < numRenderers; i++) - FontFileRegisterRenderer ((FontRendererRec *) &renderers[i]); + FontFileRegisterRenderer(&renderers[i]); } - Index: xc/lib/font/fc/Imakefile diff -u xc/lib/font/fc/Imakefile:1.5 xc/lib/font/fc/Imakefile:1.6 --- xc/lib/font/fc/Imakefile:1.5 Wed Jan 17 14:43:28 2001 +++ xc/lib/font/fc/Imakefile Fri Oct 14 11:16:05 2005 @@ -1,12 +1,10 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ +XCOMM $XFree86: xc/lib/font/fc/Imakefile,v 1.6 2005/10/14 15:16:05 tsi Exp $ XCOMM XCOMM Make file for font handling routines XCOMM -XCOMM $XFree86: xc/lib/font/fc/Imakefile,v 1.5 2001/01/17 19:43:28 dawes Exp $ #include - INCLUDES = -I$(FONTINCSRC) -I../include $(TRANS_INCLUDES) - HEADERS = + INCLUDES = -I../include $(TRANS_INCLUDES) SRCS = fsconvert.c fserve.c fsio.c transport.c OBJS = fsconvert.o fserve.o fsio.o transport.o CONN_DEFINES = $(CONNECTION_FLAGS) -DFONT_t -DTRANS_CLIENT -DTRANS_SERVER -DTRANS_REOPEN Index: xc/lib/font/fc/fsconvert.c diff -u xc/lib/font/fc/fsconvert.c:1.15 xc/lib/font/fc/fsconvert.c:1.16 --- xc/lib/font/fc/fsconvert.c:1.15 Mon Sep 1 16:50:43 2003 +++ xc/lib/font/fc/fsconvert.c Fri Oct 14 11:16:05 2005 @@ -1,4 +1,4 @@ -/* $Xorg: fsconvert.c,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.16 2005/10/14 15:16:05 tsi Exp $ */ /* * Copyright 1990 Network Computing Devices * @@ -22,7 +22,6 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.15 2003/09/01 20:50:43 herrb Exp $ */ /* * FS data conversion */ @@ -30,10 +29,10 @@ #include #include #include -#include "FS.h" -#include "FSproto.h" +#include +#include #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fservestr.h" #include "fontutil.h" #include "fslibos.h" Index: xc/lib/font/fc/fserve.c diff -u xc/lib/font/fc/fserve.c:3.27 xc/lib/font/fc/fserve.c:3.28 --- xc/lib/font/fc/fserve.c:3.27 Mon Jan 12 12:19:30 2004 +++ xc/lib/font/fc/fserve.c Fri Oct 14 11:16:05 2005 @@ -1,4 +1,4 @@ -/* $Xorg: fserve.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */ +/* $XFree86: xc/lib/font/fc/fserve.c,v 3.28 2005/10/14 15:16:05 tsi Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -24,7 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fc/fserve.c,v 3.27 2004/01/12 17:19:30 tsi Exp $ */ /* * Copyright 1990 Network Computing Devices @@ -57,12 +56,12 @@ #endif #include "X11/Xtrans.h" #include "X11/Xpoll.h" -#include "FS.h" -#include "FSproto.h" +#include +#include #include #include #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fservestr.h" #include "fontutil.h" #include Index: xc/lib/font/fc/fserve.h diff -u xc/lib/font/fc/fserve.h:1.5 xc/lib/font/fc/fserve.h:1.6 --- xc/lib/font/fc/fserve.h:1.5 Thu Apr 5 13:42:28 2001 +++ xc/lib/font/fc/fserve.h Mon Jan 9 09:59:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: fserve.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */ /* * Copyright 1990 Network Computing Devices * @@ -24,7 +23,7 @@ * Author: Dave Lemke, Network Computing Devices, Inc * */ -/* $XFree86: xc/lib/font/fc/fserve.h,v 1.5 2001/04/05 17:42:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fserve.h,v 1.6 2006/01/09 14:59:32 dawes Exp $ */ #ifndef _FSERVE_H_ #define _FSERVE_H_ Index: xc/lib/font/fc/fservestr.h diff -u xc/lib/font/fc/fservestr.h:3.4 xc/lib/font/fc/fservestr.h:3.5 --- xc/lib/font/fc/fservestr.h:3.4 Wed Jul 25 11:04:56 2001 +++ xc/lib/font/fc/fservestr.h Mon Jan 9 09:59:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: fservestr.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */ /* * Copyright 1990 Network Computing Devices * @@ -23,7 +22,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.4 2001/07/25 15:04:56 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.5 2006/01/09 14:59:32 dawes Exp $ */ #ifndef _FSERVESTR_H_ #define _FSERVESTR_H_ Index: xc/lib/font/fc/fsio.c diff -u xc/lib/font/fc/fsio.c:3.17 xc/lib/font/fc/fsio.c:3.18 --- xc/lib/font/fc/fsio.c:3.17 Tue May 27 18:26:49 2003 +++ xc/lib/font/fc/fsio.c Fri Oct 14 11:16:05 2005 @@ -1,4 +1,4 @@ -/* $Xorg: fsio.c,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */ +/* $XFree86: xc/lib/font/fc/fsio.c,v 3.18 2005/10/14 15:16:05 tsi Exp $ */ /* * Copyright 1990 Network Computing Devices * @@ -23,7 +23,6 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsio.c,v 3.17 2003/05/27 22:26:49 tsi Exp $ */ /* * font server i/o routines */ @@ -34,10 +33,10 @@ #include "X11/Xtrans.h" #include "X11/Xpoll.h" -#include "FS.h" -#include "FSproto.h" +#include +#include #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fservestr.h" #include Index: xc/lib/font/fc/fsio.h diff -u xc/lib/font/fc/fsio.h:1.6 xc/lib/font/fc/fsio.h:1.7 --- xc/lib/font/fc/fsio.h:1.6 Wed Jan 17 14:43:29 2001 +++ xc/lib/font/fc/fsio.h Mon Jan 9 09:59:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: fsio.h,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ */ /* * Copyright 1990 Network Computing Devices * @@ -23,7 +22,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsio.h,v 1.6 2001/01/17 19:43:29 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fsio.h,v 1.7 2006/01/09 14:59:32 dawes Exp $ */ #ifndef _FSIO_H_ #define _FSIO_H_ Index: xc/lib/font/fc/fslibos.h diff -u xc/lib/font/fc/fslibos.h:3.10 xc/lib/font/fc/fslibos.h:3.11 --- xc/lib/font/fc/fslibos.h:3.10 Sat Apr 3 17:26:21 2004 +++ xc/lib/font/fc/fslibos.h Mon Jan 9 09:59:32 2006 @@ -1,4 +1,3 @@ -/* $Xorg: fslibos.h,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -31,7 +30,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.10 2004/04/03 22:26:21 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.11 2006/01/09 14:59:32 dawes Exp $ */ /* * FSlib networking & os include file Index: xc/lib/font/fontcache/Imakefile diff -u xc/lib/font/fontcache/Imakefile:1.3 xc/lib/font/fontcache/Imakefile:1.4 --- xc/lib/font/fontcache/Imakefile:1.3 Sat Aug 18 07:55:50 2001 +++ xc/lib/font/fontcache/Imakefile Fri Oct 14 11:16:06 2005 @@ -1,16 +1,11 @@ -XCOMM Id: Imakefile,v 1.2 1999/01/31 13:02:46 akiyama Exp $ - - - -XCOMM $XFree86: xc/lib/font/fontcache/Imakefile,v 1.3 2001/08/18 11:55:50 tsi Exp $ +XCOMM $XFree86: xc/lib/font/fontcache/Imakefile,v 1.4 2005/10/14 15:16:06 tsi Exp $ #include #if BuildFontCache FONTCACHE_DEFINES = FontCacheExtensionDefines #endif - INCLUDES = -I. -I$(FONTINCSRC) -I../include - HEADERS = + INCLUDES = -I../include SRCS = fontcache.c OBJS = fontcache.o Index: xc/lib/font/fontcache/fcqueue.h diff -u xc/lib/font/fontcache/fcqueue.h:1.2 xc/lib/font/fontcache/fcqueue.h:1.3 --- xc/lib/font/fontcache/fcqueue.h:1.2 Wed Feb 23 15:29:38 2000 +++ xc/lib/font/fontcache/fcqueue.h Mon Jan 9 09:59:32 2006 @@ -31,8 +31,6 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $_Id_: queue.h,v 1.10.2.4 1998/05/12 16:35:25 bde Exp $ - * * ---------------------------------------------------------------------- * * Note: @@ -40,7 +38,6 @@ * /usr/include/sys/queue.h, modified for X-TrueType Server by * Shunsuke Akiyama . * - * Id: fcqueue.h,v 1.1 1999/01/06 13:36:42 akiyama Exp $ */ #ifndef _FCQUEUE_H_ Index: xc/lib/font/fontcache/fontcache.c diff -u xc/lib/font/fontcache/fontcache.c:1.5 xc/lib/font/fontcache/fontcache.c:1.6 --- xc/lib/font/fontcache/fontcache.c:1.5 Sat Oct 27 23:32:45 2001 +++ xc/lib/font/fontcache/fontcache.c Mon Jan 9 09:59:32 2006 @@ -24,9 +24,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Id: fontcache.c,v 1.19 1999/01/31 13:06:00 akiyama Exp $ */ -/* $XFree86: xc/lib/font/fontcache/fontcache.c,v 1.5 2001/10/28 03:32:45 tsi Exp $ */ +/* $XFree86: xc/lib/font/fontcache/fontcache.c,v 1.6 2006/01/09 14:59:32 dawes Exp $ */ #include #include Index: xc/lib/font/fontcache/fontcache.h diff -u xc/lib/font/fontcache/fontcache.h:1.7 xc/lib/font/fontcache/fontcache.h:1.9 --- xc/lib/font/fontcache/fontcache.h:1.7 Sat Jan 25 22:02:19 2003 +++ xc/lib/font/fontcache/fontcache.h Mon Jan 9 09:59:32 2006 @@ -1,4 +1,4 @@ -/*- +/* * Copyright (c) 1998-1999 Shunsuke Akiyama . * All rights reserved. * Copyright (c) 1998-1999 X-TrueType Server Project, All rights reserved. @@ -24,15 +24,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Id: fontcache.h,v 1.12 1999/01/09 06:24:30 akiyama Exp $ */ -/* $XFree86: xc/lib/font/fontcache/fontcache.h,v 1.7 2003/01/26 03:02:19 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontcache/fontcache.h,v 1.9 2006/01/09 14:59:32 dawes Exp $ */ #ifndef _FONTCACHE_H_ #define _FONTCACHE_H_ #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fcqueue.h" #define _FONTCACHE_SERVER_ #include Index: xc/lib/font/fontfile/Imakefile diff -u xc/lib/font/fontfile/Imakefile:3.22 xc/lib/font/fontfile/Imakefile:3.23 --- xc/lib/font/fontfile/Imakefile:3.22 Fri Apr 30 21:30:02 2004 +++ xc/lib/font/fontfile/Imakefile Fri Oct 14 11:16:06 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:36 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/font/fontfile/Imakefile,v 3.22 2004/05/01 01:30:02 dawes Exp $ +XCOMM $XFree86: xc/lib/font/fontfile/Imakefile,v 3.23 2005/10/14 15:16:06 tsi Exp $ #include @@ -13,9 +8,7 @@ SUBDIRS = module #endif - INCLUDES = -I$(FONTINCSRC) -I../include -I$(SERVERSRC)/include \ - -I$(INCLUDESRC) - HEADERS = + INCLUDES = -I../include -I$(SERVERSRC)/include #ifdef FontFormatDefines FORMAT_DEFS = FontFormatDefines #endif Index: xc/lib/font/fontfile/bitsource.c diff -u xc/lib/font/fontfile/bitsource.c:1.4 xc/lib/font/fontfile/bitsource.c:1.5 --- xc/lib/font/fontfile/bitsource.c:1.4 Fri Dec 14 14:56:49 2001 +++ xc/lib/font/fontfile/bitsource.c Mon Jan 9 09:59:33 2006 @@ -1,5 +1,3 @@ -/* $Xorg: bitsource.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/bitsource.c,v 1.4 2001/12/14 19:56:49 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/bitsource.c,v 1.5 2006/01/09 14:59:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/fontfile/bufio.c diff -u xc/lib/font/fontfile/bufio.c:3.10 xc/lib/font/fontfile/bufio.c:3.11 --- xc/lib/font/fontfile/bufio.c:3.10 Fri May 31 14:45:49 2002 +++ xc/lib/font/fontfile/bufio.c Mon Jan 9 09:59:33 2006 @@ -1,5 +1,3 @@ -/* $Xorg: bufio.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.10 2002/05/31 18:45:49 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/bufio.c,v 3.11 2006/01/09 14:59:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/fontfile/decompress.c diff -u xc/lib/font/fontfile/decompress.c:1.5 xc/lib/font/fontfile/decompress.c:1.9 --- xc/lib/font/fontfile/decompress.c:1.5 Fri Dec 14 14:56:50 2001 +++ xc/lib/font/fontfile/decompress.c Sat Apr 8 14:30:24 2006 @@ -1,407 +1,468 @@ -/* $Xorg: decompress.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ -/* - * Copyright 1985, 1986 The Regents of the University of California. - * All rights reserved. +/* $XFree86: xc/lib/font/fontfile/decompress.c,v 1.9 2006/04/08 18:30:24 dawes Exp $ */ + +/*- + * Copyright (c) 2005 + * Thorsten "mirabile" Glaser * - * This code is derived from software contributed to Berkeley by - * James A. Woods, derived from original work by Spencer Thomas - * and Joseph Orost. + * Licensee is hereby permitted to deal in this work without restric- + * tion, including unlimited rights to use, publicly perform, modify, + * merge, distribute, sell, give away or sublicence, provided all co- + * pyright notices above, these terms and the disclaimer are retained + * in all redistributions or reproduced in accompanying documentation + * or other materials provided with binary redistributions. * - * Redistribution and use in source and binary forms are permitted - * provided that the above copyright notice and this paragraph are - * duplicated in all such forms and that any documentation, - * advertising materials, and other materials related to such - * distribution and use acknowledge that the software was developed - * by the University of California, Berkeley. The name of the - * University may not be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * Licensor hereby provides this work "AS IS" and WITHOUT WARRANTY of + * any kind, expressed or implied, to the maximum extent permitted by + * applicable law, but with the warranty of being written without ma- + * licious intent or gross negligence; in no event shall licensor, an + * author or contributor be held liable for any damage, direct, indi- + * rect or other, however caused, arising in any way out of the usage + * of this work, even if advised of the possibility of such damage. */ -/* - -Copyright 1993, 1998 The Open Group +/*- + * Copyright (c) 1985, 1986, 1992, 1993 + * The Regents of the University of California. All rights reserved. + * + * This code is derived from software contributed to Berkeley by + * Diomidis Spinellis and James A. Woods, derived from original + * work by Spencer Thomas and Joseph Orost. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -*/ -/* $XFree86: xc/lib/font/fontfile/decompress.c,v 1.5 2001/12/14 19:56:50 dawes Exp $ */ -/* - * decompress - cat a compressed file +/*- + * fcompress.c - File compression ala IEEE Computer, June 1984. + * + * Compress authors: + * Spencer W. Thomas (decvax!utah-cs!thomas) + * Jim McKie (decvax!mcvax!jim) + * Steve Davies (decvax!vax135!petsd!peora!srd) + * Ken Turkowski (decvax!decwrl!turtlevax!ken) + * James A. Woods (decvax!ihnp4!ames!jaw) + * Joe Orost (decvax!vax135!petsd!joe) + * + * Cleaned up and converted to library returning I/O streams by + * Diomidis Spinellis . + * Converted to the libXfont interface by Thorsten Glaser, with + * the X Consortium's implementation only used as interface spec. + * + * zopen(filename, bits) + * Returns a FILE * that can be used for read. On + * reading the file is decompressed. + * Any file produced by compress(1) can be read. */ #include "fontmisc.h" #include +#ifdef __UNIXOS2__ +#include +#endif + +#ifndef MIN +#define MIN(a, b) (((a) < (b)) ? (a) : (b)) +#endif + +#define BITS 16 /* Default bits. */ +#define HSIZE 69001 /* 95% occupancy */ +#define ZBUFSIZ 8192 /* I/O buffer size */ + +/* A code_int must be able to hold 2**BITS values of type int, and also -1. */ +typedef long code_int; +typedef long count_int; + +static const u_char z_magic[] = + {'\037', '\235'}; /* 1F 9D */ -#define BITS 16 +#define BIT_MASK 0x1f /* Defines for third byte of header. */ +#define BLOCK_MASK 0x80 /* - * a code_int must be able to hold 2**BITS values of type int, and also -1 + * Masks 0x40 and 0x20 are free. I think 0x20 should mean that there is + * a fourth header byte (for expansion). */ -#if BITS > 15 -typedef long int code_int; -#else -typedef int code_int; -#endif +#define INIT_BITS 9 /* Initial number of bits/code. */ + +#define MAXCODE(n_bits) ((1 << (n_bits)) - 1) + +struct s_zstate { + BufFilePtr zs_file; /* File stream for I/O */ + enum { + S_START, S_MIDDLE, S_EOF + } zs_state; /* State of computation */ + int zs_n_bits; /* Number of bits/code. */ + int zs_maxbits; /* User settable max # bits/code. */ + code_int zs_maxcode; /* Maximum code, given n_bits. */ + code_int zs_maxmaxcode; /* Should NEVER generate this code. */ + count_int zs_htab [HSIZE]; + u_short zs_codetab [HSIZE]; + code_int zs_hsize; /* For dynamic table sizing. */ + code_int zs_free_ent; /* First unused entry. */ + /* + * Block compression parameters -- after all codes are used up, + * and compression rate changes, start over. + */ + int zs_block_compress; + int zs_clear_flg; + long zs_ratio; + count_int zs_checkpoint; + long zs_in_count; /* Length of input. */ + long zs_bytes_out; /* Length of output. */ + long zs_out_count; /* # of codes output (for debugging).*/ + u_char zs_buf[ZBUFSIZ]; /* I/O buffer */ + u_char *zs_bp; /* Current I/O window in the zs_buf */ + int zs_offset; /* Number of bits in the zs_buf */ + union { + struct { + long zs_fcode; + code_int zs_ent; + code_int zs_hsize_reg; + int zs_hshift; + } w; /* Write paramenters */ + struct { + u_char *zs_stackp, *zs_ebp; + int zs_finchar; + code_int zs_code, zs_oldcode, zs_incode; + int zs_size; + } r; /* Read parameters */ + } u; +}; + +/* Definitions to retain old variable names */ +#define zs_fcode u.w.zs_fcode +#define zs_ent u.w.zs_ent +#define zs_hsize_reg u.w.zs_hsize_reg +#define zs_hshift u.w.zs_hshift +#define zs_stackp u.r.zs_stackp +#define zs_finchar u.r.zs_finchar +#define zs_code u.r.zs_code +#define zs_oldcode u.r.zs_oldcode +#define zs_incode u.r.zs_incode +#define zs_size u.r.zs_size +#define zs_ebp u.r.zs_ebp + +/* + * To save much memory, we overlay the table used by compress() with those + * used by decompress(). The tab_prefix table is the same size and type as + * the codetab. The tab_suffix table needs 2**BITS characters. We get this + * from the beginning of htab. The output stack uses the rest of htab, and + * contains characters. There is plenty of room for any possible stack + * (stack used to be 8000 characters). + */ + +#define htabof(i) zs->zs_htab[i] +#define codetabof(i) zs->zs_codetab[i] -typedef long int count_int; +#define tab_prefixof(i) codetabof(i) +#define tab_suffixof(i) ((u_char *)(zs->zs_htab))[i] +#define de_stack ((u_char *)&tab_suffixof(1 << BITS)) -#ifdef NO_UCHAR - typedef char char_type; -#else - typedef unsigned char char_type; -#endif /* UCHAR */ - -static char_type magic_header[] = { "\037\235" }; /* 1F 9D */ - -/* Defines for third byte of header */ -#define BIT_MASK 0x1f -#define BLOCK_MASK 0x80 -/* Masks 0x40 and 0x20 are free. I think 0x20 should mean that there is - a fourth header byte (for expansion). -*/ - -#define INIT_BITS 9 /* initial number of bits/code */ - -#ifdef COMPATIBLE /* But wrong! */ -# define MAXCODE(n_bits) (1 << (n_bits) - 1) -#else -# define MAXCODE(n_bits) ((1 << (n_bits)) - 1) -#endif /* COMPATIBLE */ +#define CHECK_GAP 10000 /* Ratio check interval. */ /* * the next two codes should not be changed lightly, as they must not * lie within the contiguous general code space. - */ -#define FIRST 257 /* first free entry */ -#define CLEAR 256 /* table clear output code */ - -#define STACK_SIZE 8192 - -typedef struct _compressedFILE { - BufFilePtr file; - - char_type *stackp; - code_int oldcode; - char_type finchar; - - int block_compress; - int maxbits; - code_int maxcode, maxmaxcode; - - code_int free_ent; - int clear_flg; - int n_bits; - - /* bit buffer */ - int offset, size; - char_type buf[BITS]; - - char_type de_stack[STACK_SIZE]; - char_type *tab_suffix; - unsigned short *tab_prefix; -} CompressedFile; - - -static int hsize_table[] = { - 5003, /* 12 bits - 80% occupancy */ - 9001, /* 13 bits - 91% occupancy */ - 18013, /* 14 bits - 91% occupancy */ - 35023, /* 15 bits - 94% occupancy */ - 69001 /* 16 bits - 95% occupancy */ -}; + */ +#define FIRST 257 /* First free entry. */ +#define CLEAR 256 /* Table clear output code. */ -static int BufCompressedClose ( BufFilePtr f, int doClose ); -static int BufCompressedFill ( BufFilePtr f ); -static code_int getcode ( CompressedFile *file ); -static int BufCompressedSkip ( BufFilePtr f, int bytes ); +static int zclose(BufFilePtr, int); +static int zskip(BufFilePtr, int); +static int zread(BufFilePtr); +static code_int getcode(struct s_zstate *); + +/*- + * Algorithm from "A Technique for High Performance Data Compression", + * Terry A. Welch, IEEE Computer Vol 17, No 6 (June 1984), pp 8-19. + * + * Algorithm: + * Modified Lempel-Ziv method (LZW). Basically finds common + * substrings and replaces them with a variable size code. This is + * deterministic, and can be done on the fly. Thus, the decompression + * procedure needs no input table, but tracks the way the table was built. + */ -BufFilePtr -BufFilePushCompressed (BufFilePtr f) +static int +zclose(BufFilePtr zsf, int doClose) { - int code; - int maxbits; - int hsize; - CompressedFile *file; - int extra; - - if ((BufFileGet(f) != (magic_header[0] & 0xFF)) || - (BufFileGet(f) != (magic_header[1] & 0xFF))) - { - return 0; - } - code = BufFileGet (f); - if (code == BUFFILEEOF) return 0; - - maxbits = code & BIT_MASK; - if (maxbits > BITS || maxbits < 12) - return 0; - hsize = hsize_table[maxbits - 12]; - extra = (1 << maxbits) * sizeof (char_type) + - hsize * sizeof (unsigned short); - file = (CompressedFile *) xalloc (sizeof (CompressedFile) + extra); - if (!file) - return 0; - file->file = f; - file->maxbits = maxbits; - file->block_compress = code & BLOCK_MASK; - file->maxmaxcode = 1 << file->maxbits; - file->tab_suffix = (char_type *) &file[1]; - file->tab_prefix = (unsigned short *) (file->tab_suffix + file->maxmaxcode); - /* - * As above, initialize the first 256 entries in the table. - */ - file->maxcode = MAXCODE(file->n_bits = INIT_BITS); - for ( code = 255; code >= 0; code-- ) { - file->tab_prefix[code] = 0; - file->tab_suffix[code] = (char_type) code; - } - file->free_ent = ((file->block_compress) ? FIRST : 256 ); - file->clear_flg = 0; - file->offset = 0; - file->size = 0; - file->stackp = file->de_stack; - bzero(file->buf, BITS); - file->finchar = file->oldcode = getcode (file); - if (file->oldcode != -1) - *file->stackp++ = file->finchar; - return BufFileCreate ((char *) file, - BufCompressedFill, - 0, - BufCompressedSkip, - BufCompressedClose); + struct s_zstate *zs; + BufFilePtr f; + + if (zsf == NULL) + return 0; + + zs = (struct s_zstate *)zsf->private; + + if (zs == NULL) + return 0; + + f = zs->zs_file; + xfree(zs); + + BufFileClose(f, doClose); + return 1; } static int -BufCompressedClose (BufFilePtr f, int doClose) +zskip(BufFilePtr zsf, int len) { - CompressedFile *file; - BufFilePtr raw; - - file = (CompressedFile *) f->private; - raw = file->file; - xfree (file); - BufFileClose (raw, doClose); - return 1; + while (len--) + if (BufFileGet(zsf) == BUFFILEEOF) + return BUFFILEEOF; + return 0; } +static const u_char rmask[9] = + {0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff}; + +/* + * Decompress read. This routine adapts to the codes in the file building + * the "string" table on-the-fly; requiring no table to be stored in the + * compressed file. See the definitions above. + */ static int -BufCompressedFill (BufFilePtr f) +zread(BufFilePtr zsf) { - CompressedFile *file; - register char_type *stackp, *de_stack; - register char_type finchar; - register code_int code, oldcode, incode; - BufChar *buf, *bufend; - - file = (CompressedFile *) f->private; - - buf = f->buffer; - bufend = buf + BUFFILESIZE; - stackp = file->stackp; - de_stack = file->de_stack; - finchar = file->finchar; - oldcode = file->oldcode; - while (buf < bufend) { - while (stackp > de_stack && buf < bufend) - *buf++ = *--stackp; - - if (buf == bufend) - break; - - if (oldcode == -1) - break; - - code = getcode (file); - if (code == -1) - break; - - if ( (code == CLEAR) && file->block_compress ) { - for ( code = 255; code >= 0; code-- ) - file->tab_prefix[code] = 0; - file->clear_flg = 1; - file->free_ent = FIRST - 1; - if ( (code = getcode (file)) == -1 ) /* O, untimely death! */ - break; - } - incode = code; - /* - * Special case for KwKwK string. - */ - if ( code >= file->free_ent ) { - *stackp++ = finchar; - code = oldcode; - } - - /* - * Generate output characters in reverse order - */ - while ( code >= 256 ) - { - *stackp++ = file->tab_suffix[code]; - code = file->tab_prefix[code]; - } - finchar = file->tab_suffix[code]; - *stackp++ = finchar; - - /* - * Generate the new entry. - */ - if ( (code=file->free_ent) < file->maxmaxcode ) { - file->tab_prefix[code] = (unsigned short)oldcode; - file->tab_suffix[code] = finchar; - file->free_ent = code+1; - } - /* - * Remember previous code. - */ - oldcode = incode; - } - file->oldcode = oldcode; - file->stackp = stackp; - file->finchar = finchar; - if (buf == f->buffer) { - f->left = 0; + u_int count = BUFFILESIZE; + struct s_zstate *zs; + u_char *bp; + + if (zsf == NULL) + return BUFFILEEOF; + bp = zsf->buffer; + zs = (struct s_zstate *)zsf->private; + if ((zs == NULL) || (bp == NULL)) + return BUFFILEEOF; + + switch (zs->zs_state) { + case S_START: + zs->zs_state = S_MIDDLE; + break; + case S_MIDDLE: + goto middle; + case S_EOF: + goto eof; + } + + /* As above, initialize the first 256 entries in the table. */ + zs->zs_maxcode = MAXCODE(zs->zs_n_bits = INIT_BITS); + for (zs->zs_code = 255; zs->zs_code >= 0; zs->zs_code--) { + tab_prefixof(zs->zs_code) = 0; + tab_suffixof(zs->zs_code) = (u_char) zs->zs_code; + } + zs->zs_free_ent = zs->zs_block_compress ? FIRST : 256; + + zs->zs_finchar = zs->zs_oldcode = getcode(zs); + if (zs->zs_oldcode == -1) /* EOF already? */ + return (0); /* Get out of here */ + + /* First code must be 8 bits = char. */ + *bp++ = (u_char)zs->zs_finchar; + count--; + zs->zs_stackp = de_stack; + + while ((zs->zs_code = getcode(zs)) > -1) { + + if ((zs->zs_code == CLEAR) && zs->zs_block_compress) { + for (zs->zs_code = 255; zs->zs_code >= 0; + zs->zs_code--) + tab_prefixof(zs->zs_code) = 0; + zs->zs_clear_flg = 1; + zs->zs_free_ent = FIRST - 1; + if ((zs->zs_code = getcode(zs)) == -1) /* O, untimely death! */ + break; + } + zs->zs_incode = zs->zs_code; + + /* Special case for KwKwK string. */ + if (zs->zs_code >= zs->zs_free_ent) { + *zs->zs_stackp++ = zs->zs_finchar; + zs->zs_code = zs->zs_oldcode; + } + + /* Generate output characters in reverse order. */ + while (zs->zs_code >= 256) { + *zs->zs_stackp++ = tab_suffixof(zs->zs_code); + zs->zs_code = tab_prefixof(zs->zs_code); + } + *zs->zs_stackp++ = zs->zs_finchar = tab_suffixof(zs->zs_code); + + /* And put them out in forward order. */ +middle: do { + if (count-- == 0) { + zs->zs_bytes_out += BUFFILESIZE; + zsf->left = BUFFILESIZE - 1; + zsf->bufp = zsf->buffer + 1; + return zsf->buffer[0]; + } + *bp++ = *--zs->zs_stackp; + } while (zs->zs_stackp > de_stack); + + /* Generate the new entry. */ + if ((zs->zs_code = zs->zs_free_ent) < zs->zs_maxmaxcode) { + tab_prefixof(zs->zs_code) = (u_short) zs->zs_oldcode; + tab_suffixof(zs->zs_code) = zs->zs_finchar; + zs->zs_free_ent = zs->zs_code + 1; + } + + /* Remember previous code. */ + zs->zs_oldcode = zs->zs_incode; + } + zs->zs_state = S_EOF; + zs->zs_bytes_out += BUFFILESIZE - count; +eof: + if (BUFFILESIZE - count) { + zsf->left = (BUFFILESIZE - count) - 1; + zsf->bufp = zsf->buffer + 1; + return zsf->buffer[0]; + } + zsf->left = 0; return BUFFILEEOF; - } - f->bufp = f->buffer + 1; - f->left = (buf - f->buffer) - 1; - return f->buffer[0]; } -/***************************************************************** - * TAG( getcode ) - * +/*- * Read one code from the standard input. If BUFFILEEOF, return -1. * Inputs: - * stdin + * stdin * Outputs: - * code or -1 is returned. + * code or -1 is returned. */ - -static char_type rmask[9] = {0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff}; - static code_int -getcode(CompressedFile *file) +getcode(struct s_zstate *zs) { - register code_int code; - register int r_off, bits; - register char_type *bp = file->buf; - register BufFilePtr raw; - - if ( file->clear_flg > 0 || file->offset >= file->size || - file->free_ent > file->maxcode ) - { - /* - * If the next entry will be too big for the current code - * size, then we must increase the size. This implies reading - * a new buffer full, too. - */ - if ( file->free_ent > file->maxcode ) { - file->n_bits++; - if ( file->n_bits == file->maxbits ) - file->maxcode = file->maxmaxcode; /* won't get any bigger now */ - else - file->maxcode = MAXCODE(file->n_bits); - } - if ( file->clear_flg > 0) { - file->maxcode = MAXCODE (file->n_bits = INIT_BITS); - file->clear_flg = 0; + code_int gcode; + int r_off, bits; + u_char *bp; + + if (zs->zs_clear_flg > 0 || zs->zs_offset >= zs->zs_size || + zs->zs_free_ent > zs->zs_maxcode) { + + zs->zs_bp += zs->zs_n_bits; + /* + * If the next entry will be too big for the current gcode + * size, then we must increase the size. This implies reading + * a new buffer full, too. + */ + if (zs->zs_free_ent > zs->zs_maxcode) { + zs->zs_n_bits++; + if (zs->zs_n_bits == zs->zs_maxbits) { + /* Won't get any bigger now. */ + zs->zs_maxcode = zs->zs_maxmaxcode; + } else + zs->zs_maxcode = MAXCODE(zs->zs_n_bits); + } + if (zs->zs_clear_flg > 0) { + zs->zs_maxcode = MAXCODE(zs->zs_n_bits = INIT_BITS); + zs->zs_clear_flg = 0; + } + + /* fill the buffer up to the neck */ + if (zs->zs_bp + zs->zs_n_bits > zs->zs_ebp) { + for (bp = zs->zs_buf; zs->zs_bp < zs->zs_ebp; + *bp++ = *zs->zs_bp++); + bits = 0; + while ((bits < (ZBUFSIZ - (bp - zs->zs_buf))) + && ((gcode = BufFileGet(zs->zs_file)) + != BUFFILEEOF)) { + *bp++ = gcode; + ++bits; + } + zs->zs_in_count += bits; + zs->zs_bp = zs->zs_buf; + zs->zs_ebp = bp; + } + zs->zs_offset = 0; + zs->zs_size = MIN(zs->zs_n_bits, zs->zs_ebp - zs->zs_bp); + if (zs->zs_size == 0) + return -1; + /* Round size down to integral number of codes. */ + zs->zs_size = (zs->zs_size << 3) - (zs->zs_n_bits - 1); } - bits = file->n_bits; - raw = file->file; - while (bits > 0 && (code = BufFileGet (raw)) != BUFFILEEOF) - { - *bp++ = code; - --bits; + + bp = zs->zs_bp; + r_off = zs->zs_offset; + bits = zs->zs_n_bits; + + /* Get to the first byte. */ + bp += (r_off >> 3); + r_off &= 7; + + /* Get first part (low order bits). */ + gcode = (*bp++ >> r_off); + bits -= (8 - r_off); + r_off = 8 - r_off; /* Now, roffset into gcode word. */ + + /* Get any 8 bit parts in the middle (<=1 for up to 16 bits). */ + if (bits >= 8) { + gcode |= *bp++ << r_off; + r_off += 8; + bits -= 8; } - bp = file->buf; - if (bits == file->n_bits) - return -1; /* end of file */ - file->size = file->n_bits - bits; - file->offset = 0; - /* Round size down to integral number of codes */ - file->size = (file->size << 3) - (file->n_bits - 1); - } - r_off = file->offset; - bits = file->n_bits; - /* - * Get to the first byte. - */ - bp += (r_off >> 3); - r_off &= 7; - /* Get first part (low order bits) */ -#ifdef NO_UCHAR - code = ((*bp++ >> r_off) & rmask[8 - r_off]) & 0xff; -#else - code = (*bp++ >> r_off); -#endif /* NO_UCHAR */ - bits -= (8 - r_off); - r_off = 8 - r_off; /* now, offset into code word */ - /* Get any 8 bit parts in the middle (<=1 for up to 16 bits). */ - if ( bits >= 8 ) { -#ifdef NO_UCHAR - code |= (*bp++ & 0xff) << r_off; -#else - code |= *bp++ << r_off; -#endif /* NO_UCHAR */ - r_off += 8; - bits -= 8; - } - /* high order bits. */ - code |= (*bp & rmask[bits]) << r_off; - file->offset += file->n_bits; - return code; -} + /* High order bits. */ + gcode |= (*bp & rmask[bits]) << r_off; + zs->zs_offset += zs->zs_n_bits; -static int -BufCompressedSkip (BufFilePtr f, int bytes) -{ - int c; - while (bytes--) - { - c = BufFileGet(f); - if (c == BUFFILEEOF) - return BUFFILEEOF; - } - return 0; + return (gcode); } -#ifdef TEST -int -main (int argc, char *argv[]) +BufFilePtr +BufFilePushCompressed(BufFilePtr f) { - BufFilePtr inputraw, input, output; - int c; - - inputraw = BufFileOpenRead (0); - input = BufFilePushCompressed (inputraw); - output = BufFileOpenWrite (1); - while ((c = BufFileGet (input)) != BUFFILEEOF) - BufFilePut (c, output); - BufFileClose (input, FALSE); - BufFileClose (output, FALSE); - return 0; + struct s_zstate *zs; + code_int gcode; + + if ((gcode = BufFileGet(f)) != z_magic[0]) + return 0; + if ((gcode = BufFileGet(f)) != z_magic[1]) + return 0; + if ((gcode = BufFileGet(f)) == BUFFILEEOF) + return 0; + + if ((zs = xalloc(sizeof(struct s_zstate))) == NULL) + return (NULL); + + /* max # bits/code. */ + zs->zs_maxbits = gcode & BIT_MASK; + if (zs->zs_maxbits > BITS) + return 0; + /* Should NEVER generate this code. */ + zs->zs_maxmaxcode = 1L << zs->zs_maxbits; + zs->zs_hsize = HSIZE; /* For dynamic table sizing. */ + zs->zs_free_ent = 0; /* First unused entry. */ + zs->zs_block_compress = gcode & BLOCK_MASK; + zs->zs_clear_flg = 0; + zs->zs_ratio = 0; + zs->zs_checkpoint = CHECK_GAP; + zs->zs_in_count = 3; /* Length of input. */ + zs->zs_out_count = 0; /* # of codes output (for debugging).*/ + zs->zs_state = S_START; + zs->zs_offset = 0; + zs->zs_size = 0; + zs->zs_bp = zs->zs_ebp = zs->zs_buf; + zs->zs_file = f; + + return BufFileCreate((char *)zs, zread, NULL, zskip, zclose); } -#endif Index: xc/lib/font/fontfile/defaults.c diff -u xc/lib/font/fontfile/defaults.c:1.8 xc/lib/font/fontfile/defaults.c:1.9 --- xc/lib/font/fontfile/defaults.c:1.8 Fri Dec 14 14:56:50 2001 +++ xc/lib/font/fontfile/defaults.c Mon Jan 9 09:59:33 2006 @@ -1,5 +1,3 @@ -/* $Xorg: defaults.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/defaults.c,v 1.8 2001/12/14 19:56:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/defaults.c,v 1.9 2006/01/09 14:59:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/fontfile/dirfile.c diff -u xc/lib/font/fontfile/dirfile.c:3.19 xc/lib/font/fontfile/dirfile.c:3.20 --- xc/lib/font/fontfile/dirfile.c:3.19 Sat Oct 23 11:29:26 2004 +++ xc/lib/font/fontfile/dirfile.c Mon Jan 9 09:59:33 2006 @@ -1,5 +1,3 @@ -/* $Xorg: dirfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/dirfile.c,v 3.19 2004/10/23 15:29:26 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/dirfile.c,v 3.20 2006/01/09 14:59:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/fontfile/ffcheck.c diff -u xc/lib/font/fontfile/ffcheck.c:1.17 xc/lib/font/fontfile/ffcheck.c:1.18 --- xc/lib/font/fontfile/ffcheck.c:1.17 Fri Apr 30 21:30:02 2004 +++ xc/lib/font/fontfile/ffcheck.c Mon Jan 9 09:59:33 2006 @@ -1,5 +1,3 @@ -/* $Xorg: ffcheck.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,12 +23,11 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.17 2004/05/01 01:30:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/ffcheck.c,v 1.18 2006/01/09 14:59:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium */ -/* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */ #include "fntfilst.h" #include "bitmap.h" Index: xc/lib/font/fontfile/fileio.c diff -u xc/lib/font/fontfile/fileio.c:3.10 xc/lib/font/fontfile/fileio.c:3.11 --- xc/lib/font/fontfile/fileio.c:3.10 Fri May 31 14:45:50 2002 +++ xc/lib/font/fontfile/fileio.c Mon Jan 9 09:59:33 2006 @@ -1,5 +1,3 @@ -/* $Xorg: fileio.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.10 2002/05/31 18:45:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fileio.c,v 3.11 2006/01/09 14:59:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/fontfile/filewr.c diff -u xc/lib/font/fontfile/filewr.c:3.7 xc/lib/font/fontfile/filewr.c:3.8 --- xc/lib/font/fontfile/filewr.c:3.7 Fri May 31 14:45:50 2002 +++ xc/lib/font/fontfile/filewr.c Mon Jan 9 09:59:33 2006 @@ -1,5 +1,3 @@ -/* $Xorg: filewr.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/filewr.c,v 3.7 2002/05/31 18:45:50 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/filewr.c,v 3.8 2006/01/09 14:59:33 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/fontfile/fontdir.c diff -u xc/lib/font/fontfile/fontdir.c:3.23 xc/lib/font/fontfile/fontdir.c:3.24 --- xc/lib/font/fontfile/fontdir.c:3.23 Tue Dec 2 14:50:40 2003 +++ xc/lib/font/fontfile/fontdir.c Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.23 2003/12/02 19:50:40 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.24 2006/01/09 14:59:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/fontfile/fontfile.c diff -u xc/lib/font/fontfile/fontfile.c:3.22 xc/lib/font/fontfile/fontfile.c:3.23 --- xc/lib/font/fontfile/fontfile.c:3.22 Wed Feb 11 16:11:20 2004 +++ xc/lib/font/fontfile/fontfile.c Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: fontfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,12 +23,11 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fontfile.c,v 3.22 2004/02/11 21:11:20 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontfile.c,v 3.23 2006/01/09 14:59:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium */ -/* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */ #include "fntfilst.h" Index: xc/lib/font/fontfile/fontscale.c diff -u xc/lib/font/fontfile/fontscale.c:3.10 xc/lib/font/fontfile/fontscale.c:3.11 --- xc/lib/font/fontfile/fontscale.c:3.10 Fri Dec 14 14:56:52 2001 +++ xc/lib/font/fontfile/fontscale.c Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: fontscale.c,v 1.5 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/fontscale.c,v 3.10 2001/12/14 19:56:52 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontscale.c,v 3.11 2006/01/09 14:59:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/fontfile/gunzip.c diff -u xc/lib/font/fontfile/gunzip.c:1.5 xc/lib/font/fontfile/gunzip.c:1.6 --- xc/lib/font/fontfile/gunzip.c:1.5 Wed Jan 17 14:43:30 2001 +++ xc/lib/font/fontfile/gunzip.c Mon Jan 9 09:59:34 2006 @@ -1,8 +1,7 @@ -/* $Xorg: gunzip.c,v 1.3 2000/08/17 19:46:37 cpqbld Exp $ */ /* lib/font/fontfile/gunzip.c written by Mark Eichin September 1996. intended for inclusion in X11 public releases. */ -/* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.5 2001/01/17 19:43:30 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/gunzip.c,v 1.6 2006/01/09 14:59:34 dawes Exp $ */ #include "fontmisc.h" #include Index: xc/lib/font/fontfile/printerfont.c diff -u xc/lib/font/fontfile/printerfont.c:1.6 xc/lib/font/fontfile/printerfont.c:1.7 --- xc/lib/font/fontfile/printerfont.c:1.6 Tue May 27 18:26:49 2003 +++ xc/lib/font/fontfile/printerfont.c Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: printerfont.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,12 +23,11 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/printerfont.c,v 1.6 2003/05/27 22:26:49 tsi Exp $ */ +/* $XFree86: xc/lib/font/fontfile/printerfont.c,v 1.7 2006/01/09 14:59:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium */ -/* $NCDXorg: @(#)fontfile.c,v 1.6 1991/07/02 17:00:46 lemke Exp $ */ #include "fntfilst.h" Index: xc/lib/font/fontfile/register.c diff -u xc/lib/font/fontfile/register.c:1.16 xc/lib/font/fontfile/register.c:1.17 --- xc/lib/font/fontfile/register.c:1.16 Fri Apr 30 21:30:02 2004 +++ xc/lib/font/fontfile/register.c Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: register.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/register.c,v 1.16 2004/05/01 01:30:02 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/register.c,v 1.17 2006/01/09 14:59:34 dawes Exp $ */ /* * This is in a separate source file so that small programs Index: xc/lib/font/fontfile/renderers.c diff -u xc/lib/font/fontfile/renderers.c:1.8 xc/lib/font/fontfile/renderers.c:1.9 --- xc/lib/font/fontfile/renderers.c:1.8 Tue Jan 6 11:28:21 2004 +++ xc/lib/font/fontfile/renderers.c Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: renderers.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fontfile/renderers.c,v 1.8 2004/01/06 16:28:21 martin Exp $ */ +/* $XFree86: xc/lib/font/fontfile/renderers.c,v 1.9 2006/01/09 14:59:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/fontfile/module/Imakefile diff -u xc/lib/font/fontfile/module/Imakefile:1.4 xc/lib/font/fontfile/module/Imakefile:1.5 --- xc/lib/font/fontfile/module/Imakefile:1.4 Wed Feb 13 16:32:49 2002 +++ xc/lib/font/fontfile/module/Imakefile Fri Oct 14 11:16:06 2005 @@ -1,8 +1,7 @@ -XCOMM $XFree86: xc/lib/font/fontfile/module/Imakefile,v 1.4 2002/02/13 21:32:49 dawes Exp $ +XCOMM $XFree86: xc/lib/font/fontfile/module/Imakefile,v 1.5 2005/10/14 15:16:06 tsi Exp $ #include - INCLUDES = -I$(FONTINCSRC) -I../../include -I$(SERVERSRC)/include \ - -I$(XINCLUDESRC) + INCLUDES = -I../../include -I$(SERVERSRC)/include DEFINES = -DLOADABLEFONTS Index: xc/lib/font/include/bitmap.h diff -u xc/lib/font/include/bitmap.h:1.10 xc/lib/font/include/bitmap.h:1.11 --- xc/lib/font/include/bitmap.h:1.10 Fri Dec 14 14:56:53 2001 +++ xc/lib/font/include/bitmap.h Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: bitmap.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/include/bitmap.h,v 1.10 2001/12/14 19:56:53 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/bitmap.h,v 1.11 2006/01/09 14:59:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/include/bufio.h diff -u xc/lib/font/include/bufio.h:1.7 xc/lib/font/include/bufio.h:1.8 --- xc/lib/font/include/bufio.h:1.7 Fri Dec 14 14:56:53 2001 +++ xc/lib/font/include/bufio.h Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: bufio.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1993, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/include/bufio.h,v 1.7 2001/12/14 19:56:53 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/bufio.h,v 1.8 2006/01/09 14:59:34 dawes Exp $ */ #ifndef ___BUFIO_H___ #define ___BUFIO_H___ 1 Index: xc/lib/font/include/fntfil.h diff -u xc/lib/font/include/fntfil.h:1.10 xc/lib/font/include/fntfil.h:1.11 --- xc/lib/font/include/fntfil.h:1.10 Mon Dec 9 12:30:00 2002 +++ xc/lib/font/include/fntfil.h Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: fntfil.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fntfil.h,v 1.10 2002/12/09 17:30:00 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fntfil.h,v 1.11 2006/01/09 14:59:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/include/fntfilio.h diff -u xc/lib/font/include/fntfilio.h:1.7 xc/lib/font/include/fntfilio.h:1.8 --- xc/lib/font/include/fntfilio.h:1.7 Fri Dec 14 14:56:54 2001 +++ xc/lib/font/include/fntfilio.h Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: fntfilio.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.7 2001/12/14 19:56:54 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fntfilio.h,v 1.8 2006/01/09 14:59:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/include/fntfilst.h diff -u xc/lib/font/include/fntfilst.h:3.9 xc/lib/font/include/fntfilst.h:3.10 --- xc/lib/font/include/fntfilst.h:3.9 Tue Dec 10 17:23:52 2002 +++ xc/lib/font/include/fntfilst.h Fri Oct 14 11:16:06 2005 @@ -1,5 +1,4 @@ -/* $Xorg: fntfilst.h,v 1.5 2001/02/09 02:04:04 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.10 2005/10/14 15:16:06 tsi Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -25,7 +24,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fntfilst.h,v 3.9 2002/12/10 22:23:52 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium @@ -40,7 +38,7 @@ #ifndef XP_PSTEXT #include "fontmisc.h" #endif -#include "fontstruct.h" +#include #include "fontxlfd.h" #include "fntfil.h" Index: xc/lib/font/include/fontmisc.h diff -u xc/lib/font/include/fontmisc.h:3.20 xc/lib/font/include/fontmisc.h:3.21 --- xc/lib/font/include/fontmisc.h:3.20 Thu Jan 27 17:50:40 2005 +++ xc/lib/font/include/fontmisc.h Mon Jan 9 09:59:34 2006 @@ -1,5 +1,3 @@ -/* $Xorg: fontmisc.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1991, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.20 2005/01/27 22:50:40 tsi Exp $ */ +/* $XFree86: xc/lib/font/include/fontmisc.h,v 3.21 2006/01/09 14:59:34 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/include/fontmod.h diff -u xc/lib/font/include/fontmod.h:1.3 xc/lib/font/include/fontmod.h:1.4 --- xc/lib/font/include/fontmod.h:1.3 Sun Dec 13 00:32:33 1998 +++ xc/lib/font/include/fontmod.h Thu Mar 16 11:49:48 2006 @@ -1,14 +1,18 @@ -/* $XFree86: xc/lib/font/include/fontmod.h,v 1.3 1998/12/13 05:32:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontmod.h,v 1.4 2006/03/16 16:49:48 dawes Exp $ */ #ifndef _FONTMOD_H_ #define _FONTMOD_H_ +#ifndef _XF86MODULE_H +typedef struct module_desc *ModuleDescPtr; +#endif + typedef void (*InitFont)(void); -typedef struct { - InitFont initFunc; - char * name; - pointer module; +typedef struct font_module { + InitFont initFunc; + char * name; + ModuleDescPtr module; } FontModule; extern FontModule *FontModuleList; Index: xc/lib/font/include/fontshow.h diff -u xc/lib/font/include/fontshow.h:1.2 xc/lib/font/include/fontshow.h:1.3 --- xc/lib/font/include/fontshow.h:1.2 Fri Dec 14 14:56:54 2001 +++ xc/lib/font/include/fontshow.h Mon Jan 9 09:59:34 2006 @@ -1,5 +1,4 @@ -/* $Xorg: fontshow.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/font/include/fontshow.h,v 1.3 2006/01/09 14:59:34 dawes Exp $ */ /* Copyright 1990, 1998 The Open Group Index: xc/lib/font/include/fontutil.h diff -u xc/lib/font/include/fontutil.h:1.2 xc/lib/font/include/fontutil.h:1.3 --- xc/lib/font/include/fontutil.h:1.2 Sat Aug 21 09:48:06 1999 +++ xc/lib/font/include/fontutil.h Fri Oct 14 11:16:06 2005 @@ -1,9 +1,9 @@ -/* $XFree86: xc/lib/font/include/fontutil.h,v 1.2 1999/08/21 13:48:06 dawes Exp $ */ +/* $XFree86: xc/lib/font/include/fontutil.h,v 1.3 2005/10/14 15:16:06 tsi Exp $ */ #ifndef _FONTUTIL_H_ #define _FONTUTIL_H_ -#include "FSproto.h" +#include extern int FontCouldBeTerminal(FontInfoPtr); extern int CheckFSFormat(fsBitmapFormat, fsBitmapFormatMask, int *, int *, Index: xc/lib/font/include/fontxlfd.h diff -u xc/lib/font/include/fontxlfd.h:1.6 xc/lib/font/include/fontxlfd.h:1.7 --- xc/lib/font/include/fontxlfd.h:1.6 Fri Dec 14 14:56:55 2001 +++ xc/lib/font/include/fontxlfd.h Fri Oct 14 11:16:06 2005 @@ -1,5 +1,4 @@ -/* $Xorg: fontxlfd.h,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.7 2005/10/14 15:16:06 tsi Exp $ */ /* Copyright 1990, 1994, 1998 The Open Group @@ -27,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/include/fontxlfd.h,v 1.6 2001/12/14 19:56:55 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium @@ -36,7 +34,7 @@ #ifndef _FONTXLFD_H_ #define _FONTXLFD_H_ -#include "FSproto.h" +#include /* Constants for values_supplied bitmap */ Index: xc/lib/font/stubs/Imakefile diff -u xc/lib/font/stubs/Imakefile:1.4 xc/lib/font/stubs/Imakefile:1.5 --- xc/lib/font/stubs/Imakefile:1.4 Wed Feb 13 16:32:49 2002 +++ xc/lib/font/stubs/Imakefile Fri Oct 14 11:16:06 2005 @@ -1,8 +1,8 @@ -XCOMM $XFree86: xc/lib/font/stubs/Imakefile,v 1.4 2002/02/13 21:32:49 dawes Exp $ +XCOMM $XFree86: xc/lib/font/stubs/Imakefile,v 1.5 2005/10/14 15:16:06 tsi Exp $ #include -INCLUDES = -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) +INCLUDES = -I../include SRCS = cauthgen.c csignal.c delfntcid.c errorf.c fatalerror.c \ findoldfnt.c getcres.c getdefptsize.c getnewfntcid.c gettime.c \ initfshdl.c regfpefunc.c rmfshdl.c servclient.c setfntauth.c \ Index: xc/lib/font/stubs/stubs.h diff -u xc/lib/font/stubs/stubs.h:1.4 xc/lib/font/stubs/stubs.h:1.5 --- xc/lib/font/stubs/stubs.h:1.4 Sat Sep 13 17:33:03 2003 +++ xc/lib/font/stubs/stubs.h Fri Oct 14 11:16:06 2005 @@ -1,10 +1,10 @@ -/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.4 2003/09/13 21:33:03 dawes Exp $ */ +/* $XFree86: xc/lib/font/stubs/stubs.h,v 1.5 2005/10/14 15:16:06 tsi Exp $ */ /* This directory includes dummy entry for bdftopcf and mkfontdir */ #include #include "fntfilst.h" -#include "font.h" +#include #ifndef True Index: xc/lib/font/util/Imakefile diff -u xc/lib/font/util/Imakefile:1.7 xc/lib/font/util/Imakefile:1.8 --- xc/lib/font/util/Imakefile:1.7 Wed Jan 17 14:43:32 2001 +++ xc/lib/font/util/Imakefile Fri Oct 14 11:16:06 2005 @@ -1,14 +1,8 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:39 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/font/util/Imakefile,v 1.7 2001/01/17 19:43:32 dawes Exp $ +XCOMM $XFree86: xc/lib/font/util/Imakefile,v 1.8 2005/10/14 15:16:06 tsi Exp $ #include - INCLUDES = -I$(FONTINCSRC) -I../include - HEADERS = + INCLUDES = -I../include #ifdef FontFormatDefines FORMAT_DEFS = FontFormatDefines #endif Index: xc/lib/font/util/atom.c diff -u xc/lib/font/util/atom.c:1.10 xc/lib/font/util/atom.c:1.11 --- xc/lib/font/util/atom.c:1.10 Tue Sep 24 16:52:48 2002 +++ xc/lib/font/util/atom.c Mon Jan 9 09:59:35 2006 @@ -1,5 +1,3 @@ -/* $Xorg: atom.c,v 1.5 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1990, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/atom.c,v 1.10 2002/09/24 20:52:48 tsi Exp $ */ +/* $XFree86: xc/lib/font/util/atom.c,v 1.11 2006/01/09 14:59:35 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/font/util/fontaccel.c diff -u xc/lib/font/util/fontaccel.c:1.7 xc/lib/font/util/fontaccel.c:1.8 --- xc/lib/font/util/fontaccel.c:1.7 Fri Dec 14 14:56:56 2001 +++ xc/lib/font/util/fontaccel.c Fri Oct 14 11:16:06 2005 @@ -1,5 +1,4 @@ -/* $Xorg: fontaccel.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.8 2005/10/14 15:16:06 tsi Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -27,14 +26,13 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontaccel.c,v 1.7 2001/12/14 19:56:56 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium */ #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fontutil.h" void Index: xc/lib/font/util/fontnames.c diff -u xc/lib/font/util/fontnames.c:1.5 xc/lib/font/util/fontnames.c:1.6 --- xc/lib/font/util/fontnames.c:1.5 Fri Dec 14 14:56:56 2001 +++ xc/lib/font/util/fontnames.c Fri Oct 14 11:16:06 2005 @@ -1,5 +1,4 @@ -/* $Xorg: fontnames.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/font/util/fontnames.c,v 1.6 2005/10/14 15:16:06 tsi Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -27,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontnames.c,v 1.5 2001/12/14 19:56:56 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium @@ -36,7 +34,7 @@ */ #include "fontmisc.h" -#include "fontstruct.h" +#include void FreeFontNames(FontNamesPtr pFN) Index: xc/lib/font/util/fontutil.c diff -u xc/lib/font/util/fontutil.c:3.7 xc/lib/font/util/fontutil.c:3.8 --- xc/lib/font/util/fontutil.c:3.7 Fri Dec 14 14:56:56 2001 +++ xc/lib/font/util/fontutil.c Fri Oct 14 11:16:06 2005 @@ -1,5 +1,4 @@ -/* $Xorg: fontutil.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/font/util/fontutil.c,v 3.8 2005/10/14 15:16:06 tsi Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -27,15 +26,14 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontutil.c,v 3.7 2001/12/14 19:56:56 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium */ #include "fontmisc.h" -#include "fontstruct.h" -#include "FSproto.h" +#include +#include #include "fontutil.h" /* Define global here... doesn't hurt the servers, and avoids Index: xc/lib/font/util/fontxlfd.c diff -u xc/lib/font/util/fontxlfd.c:3.18 xc/lib/font/util/fontxlfd.c:3.21 --- xc/lib/font/util/fontxlfd.c:3.18 Sun Mar 21 06:27:05 2004 +++ xc/lib/font/util/fontxlfd.c Sat Jan 28 20:07:23 2006 @@ -1,5 +1,3 @@ -/* $Xorg: fontxlfd.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1990, 1998 The Open Group @@ -27,14 +25,14 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.18 2004/03/21 11:27:05 herrb Exp $ */ +/* $XFree86: xc/lib/font/util/fontxlfd.c,v 3.21 2006/01/29 01:07:23 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium */ #include "fontmisc.h" -#include "fontstruct.h" +#include #include "fontxlfd.h" #include "fontutil.h" #include @@ -133,7 +131,7 @@ } #endif /* Compute a format to use to render the number */ - sprintf(formatbuf, "%%.%dle", XLFD_NDIGITS); + sprintf(formatbuf, "%%.%de", XLFD_NDIGITS); if (space_required) *buffer++ = ' '; @@ -156,7 +154,7 @@ if (exponent >= XLFD_NDIGITS || ndigits - exponent > XLFD_NDIGITS + 1) { /* Scientific */ - sprintf(formatbuf, "%%.%dle", ndigits - 1); + sprintf(formatbuf, "%%.%de", ndigits - 1); sprintf(buffer, formatbuf, value); } else @@ -164,7 +162,7 @@ /* Fixed */ ndigits -= exponent + 1; if (ndigits < 0) ndigits = 0; - sprintf(formatbuf, "%%.%dlf", ndigits); + sprintf(formatbuf, "%%.%df", ndigits); sprintf(buffer, formatbuf, value); if (exponent < 0) { @@ -197,7 +195,7 @@ defined(ia64) || defined(__ia64__) || \ defined(__alpha__) || defined(__alpha) || \ defined(__hppa__) || \ - defined(__AMD64__) || defined(__AMD64) || defined(__amd64__) || \ + defined(__amd64__) || defined(__x86_64__) || \ defined(sgi) #if !defined(__UNIXOS2__) #include @@ -269,7 +267,7 @@ char formatbuf[40], buffer[40]; - sprintf(formatbuf, "%%.%dlg", XLFD_NDIGITS); + sprintf(formatbuf, "%%.%dg", XLFD_NDIGITS); sprintf(buffer, formatbuf, x); return atof(buffer); } @@ -388,7 +386,7 @@ register char *ptr5; FontScalableRec tmpvals; char replaceChar = '0'; - char tmpBuf[1024]; + char tmpBuf[1024], tmpFormat[64]; int spacingLen; int l; char *p; @@ -512,22 +510,25 @@ else if (vals->width < -1) /* overload: -1 means wildcard */ tmpvals.width = -vals->width; - p = ptr1 + 1; /* weight field */ l = strchr(p, '-') - p; - sprintf(tmpBuf, "%*.*s", l, l, p); + sprintf(tmpFormat, "%%%d.%ds", l, l); + sprintf(tmpBuf, tmpFormat, p); p += l + 1; /* slant field */ l = strchr(p, '-') - p; - sprintf(tmpBuf + strlen(tmpBuf), "-%*.*s", l, l, p); + sprintf(tmpFormat, "-%%%d.%ds", l, l); + sprintf(tmpBuf + strlen(tmpBuf), tmpFormat, p); p += l + 1; /* setwidth_name */ l = strchr(p, '-') - p; - sprintf(tmpBuf + strlen(tmpBuf), "-%*.*s", l, l, p); + sprintf(tmpFormat, "-%%%d.%ds", l, l); + sprintf(tmpBuf + strlen(tmpBuf), tmpFormat, p); p += l + 1; /* add_style_name field */ l = strchr(p, '-') - p; - sprintf(tmpBuf + strlen(tmpBuf), "-%*.*s", l, l, p); + sprintf(tmpFormat, "-%%%d.%ds", l, l); + sprintf(tmpBuf + strlen(tmpBuf), tmpFormat, p); strcat(tmpBuf, "-"); if ((tmpvals.values_supplied & PIXELSIZE_MASK) == PIXELSIZE_ARRAY) @@ -569,9 +570,9 @@ sprintf(tmpBuf + strlen(tmpBuf), "%d", (int)(tmpvals.point_matrix[3] * 10.0 + .5)); } - sprintf(tmpBuf + strlen(tmpBuf), "-%d-%d%*.*s%d%s", - tmpvals.x, tmpvals.y, - spacingLen, spacingLen, ptr3, tmpvals.width, ptr5); + sprintf(tmpFormat, "-%%d-%%d%%%d.%ds%%d%%s", spacingLen, spacingLen); + sprintf(tmpBuf + strlen(tmpBuf), tmpFormat, tmpvals.x, tmpvals.y, + ptr3, tmpvals.width, ptr5); strcpy(ptr1 + 1, tmpBuf); if ((vals->values_supplied & CHARSUBSET_SPECIFIED) && !vals->nranges) strcat(fname, "[]"); Index: xc/lib/font/util/format.c diff -u xc/lib/font/util/format.c:1.5 xc/lib/font/util/format.c:1.6 --- xc/lib/font/util/format.c:1.5 Fri Dec 14 14:56:57 2001 +++ xc/lib/font/util/format.c Fri Oct 14 11:16:06 2005 @@ -1,4 +1,4 @@ -/* $Xorg: format.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ +/* $XFree86: xc/lib/font/util/format.c,v 1.6 2005/10/14 15:16:06 tsi Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation @@ -50,11 +50,10 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/util/format.c,v 1.5 2001/12/14 19:56:57 dawes Exp $ */ -#include "FSproto.h" -#include "font.h" -#include "fontstruct.h" +#include +#include +#include #include "fontutil.h" int Index: xc/lib/font/util/miscutil.c diff -u xc/lib/font/util/miscutil.c:1.9 xc/lib/font/util/miscutil.c:1.10 --- xc/lib/font/util/miscutil.c:1.9 Tue Jan 11 18:01:12 2005 +++ xc/lib/font/util/miscutil.c Mon Jan 9 09:59:35 2006 @@ -1,5 +1,3 @@ -/* $Xorg: miscutil.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1991, 1994, 1998 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/font/util/miscutil.c,v 1.9 2005/01/11 23:01:12 tsi Exp $ */ +/* $XFree86: xc/lib/font/util/miscutil.c,v 1.10 2006/01/09 14:59:35 dawes Exp $ */ #include #include Index: xc/lib/font/util/patcache.c diff -u xc/lib/font/util/patcache.c:3.5 xc/lib/font/util/patcache.c:3.6 --- xc/lib/font/util/patcache.c:3.5 Fri Dec 14 14:56:57 2001 +++ xc/lib/font/util/patcache.c Fri Oct 14 11:16:06 2005 @@ -1,5 +1,4 @@ -/* $Xorg: patcache.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/font/util/patcache.c,v 3.6 2005/10/14 15:16:06 tsi Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -25,14 +24,13 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/patcache.c,v 3.5 2001/12/14 19:56:57 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium */ #include -#include +#include /* * Static sized hash table for looking up font name patterns Index: xc/lib/font/util/private.c diff -u xc/lib/font/util/private.c:1.9 xc/lib/font/util/private.c:1.10 --- xc/lib/font/util/private.c:1.9 Thu Feb 27 17:19:20 2003 +++ xc/lib/font/util/private.c Fri Oct 14 11:16:06 2005 @@ -1,5 +1,4 @@ -/* $Xorg: private.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/font/util/private.c,v 1.10 2005/10/14 15:16:06 tsi Exp $ */ /* Copyright 1991, 1998 The Open Group @@ -25,14 +24,13 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/private.c,v 1.9 2003/02/27 22:19:20 tsi Exp $ */ /* * Author: Keith Packard, MIT X Consortium */ #include "fontmisc.h" -#include "fontstruct.h" +#include static int _FontPrivateAllocateIndex = 0; Index: xc/lib/font/util/utilbitmap.c diff -u xc/lib/font/util/utilbitmap.c:1.5 xc/lib/font/util/utilbitmap.c:1.6 --- xc/lib/font/util/utilbitmap.c:1.5 Fri Dec 14 14:56:57 2001 +++ xc/lib/font/util/utilbitmap.c Mon Jan 9 09:59:35 2006 @@ -1,5 +1,3 @@ -/* $Xorg: utilbitmap.c,v 1.4 2001/02/09 02:04:04 xorgcvs Exp $ */ - /* Copyright 1990, 1994, 1998 The Open Group @@ -25,7 +23,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.5 2001/12/14 19:56:57 dawes Exp $ */ +/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.6 2006/01/09 14:59:35 dawes Exp $ */ /* * Author: Keith Packard, MIT X Consortium Index: xc/lib/fontconfig/Imakefile diff -u xc/lib/fontconfig/Imakefile:1.19 xc/lib/fontconfig/Imakefile:1.21 --- xc/lib/fontconfig/Imakefile:1.19 Sun Apr 4 22:33:14 2004 +++ xc/lib/fontconfig/Imakefile Tue Oct 25 12:58:48 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/fontconfig/Imakefile,v 1.19 2004/04/05 02:33:14 dawes Exp $ +XCOMM $XFree86: xc/lib/fontconfig/Imakefile,v 1.21 2005/10/25 16:58:48 dawes Exp $ #define DoNormalLib NormalLibFontconfig #define DoSharedLib SharedLibFontconfig @@ -20,8 +20,7 @@ FONTCONFIGSRC=$(TOP)/extras/fontconfig -INCLUDES=$(EXPATINCLUDES) $(FREETYPE2INCLUDES) -I$(FONTCONFIGSRC)/src \ - -I$(XBUILDINCDIR) +INCLUDES=$(EXPATINCLUDES) $(FREETYPE2INCLUDES) -I$(FONTCONFIGSRC)/src DEFINES=-DFC_DEFAULT_FONTS='"$(FC_DEFAULT_FONTS)"' -DHAVE_EXPAT -DXFREE86_FT2 @@ -110,7 +109,7 @@ RemoveFile($@) $(CONFIG_SUBST_PROG) $(SUBSTVARS) < fontconfig.pc.in > $@ -InstallNonExecFile(fontconfig.pc,$(USRLIBDIR)/pkgconfig) +InstallNonExecFile(fontconfig.pc,$(PKGCONFIGDIR)) clean:: RemoveFile(fontconfig.pc) Index: xc/lib/fontenc/Imakefile diff -u xc/lib/fontenc/Imakefile:1.9 xc/lib/fontenc/Imakefile:1.11 --- xc/lib/fontenc/Imakefile:1.9 Tue Nov 18 14:04:54 2003 +++ xc/lib/fontenc/Imakefile Fri Feb 17 13:01:15 2006 @@ -1,7 +1,6 @@ -XCOMM $XFree86: xc/lib/fontenc/Imakefile,v 1.9 2003/11/18 19:04:54 torrey Exp $ +XCOMM $XFree86: xc/lib/fontenc/Imakefile,v 1.11 2006/02/17 18:01:15 dawes Exp $ - INCLUDES = -I$(FONTINCSRC) -I$(FONTLIBSRC)/include -I$(FONTLIBSRC)/fontfile \ - -I$(INCLUDESRC) + INCLUDES = -I$(FONTLIBSRC)/include -I$(FONTLIBSRC)/fontfile FONTENCDEFS = -DFONTENC_NO_LIBFONT \ -DFONT_ENCODINGS_DIRECTORY=\"$(FONTDIR)/encodings/encodings.dir\" @@ -22,6 +21,12 @@ #define IncSubdir X11 #define IncSubSubdir fonts +#if !BuildFontEncLib +#define LibBuild NO +#else +#define LibBuild YES +#endif + #ifdef SharedFontencReqs REQUIREDLIBS = SharedFontencReqs #endif Index: xc/lib/freetype2/Imakefile diff -u xc/lib/freetype2/Imakefile:1.23 xc/lib/freetype2/Imakefile:1.25 --- xc/lib/freetype2/Imakefile:1.23 Thu Apr 29 13:55:37 2004 +++ xc/lib/freetype2/Imakefile Fri Oct 14 11:16:07 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/freetype2/Imakefile,v 1.23 2004/04/29 17:55:37 torrey Exp $ +XCOMM $XFree86: xc/lib/freetype2/Imakefile,v 1.25 2005/10/14 15:16:07 tsi Exp $ #define IHaveSubdirs #define PassCDebugFlags @@ -34,7 +34,7 @@ DEFINES = $(DARWINDEFINES) Freetype2BuildDefines -DXFREE86_FT2 -INCLUDES = -I.\ +INCLUDES = \ -I$(FREETYPESRC)\ -I$(FREETYPESRC)/base\ -I$(FREETYPESRC)/autofit\ @@ -56,8 +56,7 @@ -I$(FREETYPESRC)/type1\ -I$(FREETYPESRC)/type42\ -I$(FREETYPESRC)/winfonts\ - $(FREETYPE2INCLUDES)\ - -I$(XBUILDINCDIR) + $(FREETYPE2INCLUDES) SUBDIRS=freetype @@ -210,9 +209,9 @@ InstallMultipleFlags($(HEADERS),$(INCDIR),$(INSTINCFLAGS)) /* There might be an ft2build.h file in the wrong place. If so, remove it. */ -install:: - @if [ -f $(DESTDIR)$(INCDIR)/freetype2/ft2build.h ]; then \ - (set -x; $(RM) -f $(DESTDIR)$(INCDIR)/freetype2/ft2build.h) \ +install:: @@\ + @if [ -f $(DESTDIR)$(INCDIR)/freetype2/ft2build.h ]; then \ @@\ + (set -x; $(RM) -f $(DESTDIR)$(INCDIR)/freetype2/ft2build.h) \ @@\ fi LinkFile(ft2build.h,$(FREETYPETOP)/builds/unix/ft2unix.h) Index: xc/lib/freetype2/freetype-def.cpp diff -u xc/lib/freetype2/freetype-def.cpp:1.9 xc/lib/freetype2/freetype-def.cpp:1.10 --- xc/lib/freetype2/freetype-def.cpp:1.9 Wed May 5 21:22:18 2004 +++ xc/lib/freetype2/freetype-def.cpp Sat Apr 8 14:30:24 2006 @@ -139,5 +139,11 @@ FT_Get_BDF_Charset_ID FT_Get_Postscript_Name FT_Stream_Seek +FT_Stream_EnterFrame +FT_Stream_ExitFrame +FT_Stream_GetShort +FT_Stream_GetLong +FT_Load_Sfnt_Table +FT_Library_Version -/* $XFree86: xc/lib/freetype2/freetype-def.cpp,v 1.9 2004/05/06 01:22:18 dawes Exp $ */ +/* $XFree86: xc/lib/freetype2/freetype-def.cpp,v 1.10 2006/04/08 18:30:24 dawes Exp $ */ Index: xc/lib/lbxutil/Imakefile diff -u xc/lib/lbxutil/Imakefile:1.8 xc/lib/lbxutil/Imakefile:1.9 --- xc/lib/lbxutil/Imakefile:1.8 Wed Jan 17 14:43:34 2001 +++ xc/lib/lbxutil/Imakefile Mon Jan 9 09:59:35 2006 @@ -1,10 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:40 cpqbld Exp $ - - - - - -XCOMM $XFree86: xc/lib/lbxutil/Imakefile,v 1.8 2001/01/17 19:43:34 dawes Exp $ +XCOMM $XFree86: xc/lib/lbxutil/Imakefile,v 1.9 2006/01/09 14:59:35 dawes Exp $ #include Index: xc/lib/lbxutil/delta/Imakefile diff -u xc/lib/lbxutil/delta/Imakefile:1.1.1.2 xc/lib/lbxutil/delta/Imakefile:1.2 --- xc/lib/lbxutil/delta/Imakefile:1.1.1.2 Tue Jan 16 17:27:13 2001 +++ xc/lib/lbxutil/delta/Imakefile Fri Oct 14 11:16:07 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:40 cpqbld Exp $ +XCOMM $XFree86: xc/lib/lbxutil/delta/Imakefile,v 1.2 2005/10/14 15:16:07 tsi Exp $ #define IncSubdir X11 #include @@ -7,7 +7,7 @@ OBJS = lbxdelta.o -INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/include -I../../../include/extensions +INCLUDES = -I$(SERVERSRC)/include SubdirLibraryRule($(OBJS)) NormalLibraryObjectRule() Index: xc/lib/lbxutil/delta/lbxdelta.c diff -u xc/lib/lbxutil/delta/lbxdelta.c:1.8 xc/lib/lbxutil/delta/lbxdelta.c:1.10 --- xc/lib/lbxutil/delta/lbxdelta.c:1.8 Mon Aug 27 15:01:07 2001 +++ xc/lib/lbxutil/delta/lbxdelta.c Mon Jan 9 09:59:35 2006 @@ -1,6 +1,4 @@ /* - * $NCDXorg: @(#)lbxdelta.c,v 1.2 1994/01/22 02:23:40 dct Exp $ - * $Xorg: lbxdelta.c,v 1.5 2000/08/17 19:46:40 cpqbld Exp $ * Copyright 1993 Network Computing Devices * * Permission to use, copy, modify, distribute, and sell this software and its @@ -22,14 +20,14 @@ * * Author: Dale Tonogai, Network Computing Devices */ -/* $XFree86: xc/lib/lbxutil/delta/lbxdelta.c,v 1.8 2001/08/27 19:01:07 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/delta/lbxdelta.c,v 1.10 2006/01/09 14:59:35 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "os.h" #define _XLBX_SERVER_ -#include "lbxstr.h" -#include "lbxdeltastr.h" +#include +#include #include Index: xc/lib/lbxutil/image/Imakefile diff -u xc/lib/lbxutil/image/Imakefile:1.4 xc/lib/lbxutil/image/Imakefile:1.5 --- xc/lib/lbxutil/image/Imakefile:1.4 Mon Jun 25 04:12:32 2001 +++ xc/lib/lbxutil/image/Imakefile Fri Oct 14 11:16:07 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:40 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/lbxutil/image/Imakefile,v 1.4 2001/06/25 08:12:32 alanh Exp $ +XCOMM $XFree86: xc/lib/lbxutil/image/Imakefile,v 1.5 2005/10/14 15:16:07 tsi Exp $ #define IncSubdir X11 #include @@ -12,7 +7,7 @@ OBJS = dfaxg42d.o dpackbits.o efaxg42d.o epackbits.o misc.o -INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/include -I../../../include/extensions +INCLUDES = -I$(SERVERSRC)/include SubdirLibraryRule($(OBJS)) NormalLibraryObjectRule() Index: xc/lib/lbxutil/image/dfaxg42d.c diff -u xc/lib/lbxutil/image/dfaxg42d.c:1.6 xc/lib/lbxutil/image/dfaxg42d.c:1.7 --- xc/lib/lbxutil/image/dfaxg42d.c:1.6 Mon Apr 23 16:31:05 2001 +++ xc/lib/lbxutil/image/dfaxg42d.c Fri Oct 14 11:16:07 2005 @@ -1,4 +1,4 @@ -/* $Xorg: dfaxg42d.c,v 1.3 2000/08/17 19:46:40 cpqbld Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/dfaxg42d.c,v 1.7 2005/10/14 15:16:07 tsi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992 Sam Leffler * Copyright (c) 1991, 1992 Silicon Graphics, Inc. @@ -22,7 +22,6 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/lbxutil/image/dfaxg42d.c,v 1.6 2001/04/23 20:31:05 dawes Exp $ */ #include #include @@ -30,7 +29,7 @@ #include #include "g3states.h" #include "lbxfax.h" -#include "lbximage.h" +#include /* * ------------------------------------------------------------------------- Index: xc/lib/lbxutil/image/dpackbits.c diff -u xc/lib/lbxutil/image/dpackbits.c:1.4 xc/lib/lbxutil/image/dpackbits.c:1.5 --- xc/lib/lbxutil/image/dpackbits.c:1.4 Wed Jan 17 14:43:35 2001 +++ xc/lib/lbxutil/image/dpackbits.c Fri Oct 14 11:16:07 2005 @@ -1,4 +1,4 @@ -/* $Xorg: dpackbits.c,v 1.4 2000/08/17 19:46:40 cpqbld Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/dpackbits.c,v 1.5 2005/10/14 15:16:07 tsi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992 Sam Leffler * Copyright (c) 1991, 1992 Silicon Graphics, Inc. @@ -22,11 +22,10 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/lbxutil/image/dpackbits.c,v 1.4 2001/01/17 19:43:35 dawes Exp $ */ #include #include -#include "lbximage.h" +#include /* * ------------------------------------------------------------------------- Index: xc/lib/lbxutil/image/efaxg42d.c diff -u xc/lib/lbxutil/image/efaxg42d.c:1.5 xc/lib/lbxutil/image/efaxg42d.c:1.6 --- xc/lib/lbxutil/image/efaxg42d.c:1.5 Mon Apr 23 16:31:05 2001 +++ xc/lib/lbxutil/image/efaxg42d.c Fri Oct 14 11:16:07 2005 @@ -1,4 +1,4 @@ -/* $Xorg: efaxg42d.c,v 1.3 2000/08/17 19:46:41 cpqbld Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/efaxg42d.c,v 1.6 2005/10/14 15:16:07 tsi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992 Sam Leffler * Copyright (c) 1991, 1992 Silicon Graphics, Inc. @@ -22,13 +22,12 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/lbxutil/image/efaxg42d.c,v 1.5 2001/04/23 20:31:05 dawes Exp $ */ #include #include #include #include "lbxfax.h" -#include "lbximage.h" +#include #include "lbxbwcodes.h" /* Index: xc/lib/lbxutil/image/epackbits.c diff -u xc/lib/lbxutil/image/epackbits.c:1.3 xc/lib/lbxutil/image/epackbits.c:1.4 --- xc/lib/lbxutil/image/epackbits.c:1.3 Wed Jan 17 14:43:35 2001 +++ xc/lib/lbxutil/image/epackbits.c Fri Oct 14 11:16:07 2005 @@ -1,4 +1,4 @@ -/* $Xorg: epackbits.c,v 1.4 2000/08/17 19:46:41 cpqbld Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/epackbits.c,v 1.4 2005/10/14 15:16:07 tsi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992 Sam Leffler * Copyright (c) 1991, 1992 Silicon Graphics, Inc. @@ -24,7 +24,7 @@ */ #include -#include "lbximage.h" +#include /* * ------------------------------------------------------------------------- Index: xc/lib/lbxutil/image/lbxbwcodes.h diff -u xc/lib/lbxutil/image/lbxbwcodes.h:1.3 xc/lib/lbxutil/image/lbxbwcodes.h:1.4 --- xc/lib/lbxutil/image/lbxbwcodes.h:1.3 Sun Mar 4 20:05:12 2001 +++ xc/lib/lbxutil/image/lbxbwcodes.h Mon Jan 9 09:59:35 2006 @@ -1,5 +1,3 @@ -/* $Xorg: lbxbwcodes.h,v 1.3 2000/08/17 19:46:41 cpqbld Exp $ */ - /* * Copyright (c) 1988, 1989, 1990, 1991, 1992 Sam Leffler * Copyright (c) 1991, 1992 Silicon Graphics, Inc. @@ -23,7 +21,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/lbxutil/image/lbxbwcodes.h,v 1.3 2001/03/05 01:05:12 tsi Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/lbxbwcodes.h,v 1.4 2006/01/09 14:59:35 dawes Exp $ */ /* * Note that these tables are ordered such that the Index: xc/lib/lbxutil/image/lbxfax.h diff -u xc/lib/lbxutil/image/lbxfax.h:1.5 xc/lib/lbxutil/image/lbxfax.h:1.6 --- xc/lib/lbxutil/image/lbxfax.h:1.5 Sun Mar 4 20:05:12 2001 +++ xc/lib/lbxutil/image/lbxfax.h Mon Jan 9 09:59:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: lbxfax.h,v 1.3 2000/08/17 19:46:41 cpqbld Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992 Sam Leffler * Copyright (c) 1991, 1992 Silicon Graphics, Inc. @@ -22,7 +21,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/lbxutil/image/lbxfax.h,v 1.5 2001/03/05 01:05:12 tsi Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/lbxfax.h,v 1.6 2006/01/09 14:59:35 dawes Exp $ */ /* * This header file contains various constants and tables needed Index: xc/lib/lbxutil/image/misc.c diff -u xc/lib/lbxutil/image/misc.c:1.3 xc/lib/lbxutil/image/misc.c:1.4 --- xc/lib/lbxutil/image/misc.c:1.3 Wed Jan 17 14:43:35 2001 +++ xc/lib/lbxutil/image/misc.c Mon Jan 9 09:59:35 2006 @@ -1,4 +1,4 @@ -/* $Xorg: misc.c,v 1.3 2000/08/17 19:46:41 cpqbld Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/misc.c,v 1.4 2006/01/09 14:59:35 dawes Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992 Sam Leffler * Copyright (c) 1991, 1992 Silicon Graphics, Inc. Index: xc/lib/lbxutil/image/mkg3states.c diff -u xc/lib/lbxutil/image/mkg3states.c:1.4 xc/lib/lbxutil/image/mkg3states.c:1.5 --- xc/lib/lbxutil/image/mkg3states.c:1.4 Wed Jan 17 14:43:35 2001 +++ xc/lib/lbxutil/image/mkg3states.c Mon Jan 9 09:59:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: mkg3states.c,v 1.3 2000/08/17 19:46:41 cpqbld Exp $ */ /* * Copyright (c) 1991, 1992 Sam Leffler * Copyright (c) 1991, 1992 Silicon Graphics, Inc. @@ -22,7 +21,7 @@ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/lbxutil/image/mkg3states.c,v 1.4 2001/01/17 19:43:35 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/image/mkg3states.c,v 1.5 2006/01/09 14:59:35 dawes Exp $ */ /* * Program to construct Group 3 & Group 4 decoding tables. Index: xc/lib/lbxutil/lbx_zlib/Imakefile diff -u xc/lib/lbxutil/lbx_zlib/Imakefile:1.1.1.2 xc/lib/lbxutil/lbx_zlib/Imakefile:1.2 --- xc/lib/lbxutil/lbx_zlib/Imakefile:1.1.1.2 Tue Jan 16 17:27:21 2001 +++ xc/lib/lbxutil/lbx_zlib/Imakefile Fri Oct 14 11:16:07 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:41 cpqbld Exp $ +XCOMM $XFree86: xc/lib/lbxutil/lbx_zlib/Imakefile,v 1.2 2005/10/14 15:16:07 tsi Exp $ #include @@ -6,8 +6,7 @@ OBJS = lbx_zlib.o lbx_zlib_io.o reqstats.o -INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/include \ - -I../../../include/extensions -I../../zlib +INCLUDES = -I$(SERVERSRC)/include -I../../zlib SubdirLibraryRule($(OBJS)) NormalLibraryObjectRule() Index: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c diff -u xc/lib/lbxutil/lbx_zlib/lbx_zlib.c:1.10 xc/lib/lbxutil/lbx_zlib/lbx_zlib.c:1.11 --- xc/lib/lbxutil/lbx_zlib/lbx_zlib.c:1.10 Fri Dec 14 14:56:59 2001 +++ xc/lib/lbxutil/lbx_zlib/lbx_zlib.c Fri Oct 14 11:16:07 2005 @@ -1,5 +1,4 @@ -/* $Xorg: lbx_zlib.c,v 1.6 2001/02/09 02:04:05 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c,v 1.11 2005/10/14 15:16:07 tsi Exp $ */ /* Copyright 1995, 1998 The Open Group @@ -50,7 +49,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.c,v 1.10 2001/12/14 19:56:59 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ @@ -63,10 +61,10 @@ #if !defined(WIN32) && !defined(Lynx) #include #endif -#include "lbxbufstr.h" +#include #include "lbx_zlib.h" #include "os.h" -#include "lbxzlib.h" +#include unsigned long stream_out_compressed; unsigned long stream_out_uncompressed; Index: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h diff -u xc/lib/lbxutil/lbx_zlib/lbx_zlib.h:1.10 xc/lib/lbxutil/lbx_zlib/lbx_zlib.h:1.11 --- xc/lib/lbxutil/lbx_zlib/lbx_zlib.h:1.10 Fri Dec 14 14:57:00 2001 +++ xc/lib/lbxutil/lbx_zlib/lbx_zlib.h Fri Oct 14 11:16:07 2005 @@ -1,5 +1,4 @@ -/* $Xorg: lbx_zlib.h,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.11 2005/10/14 15:16:07 tsi Exp $ */ /* Copyright 1996 The Open Group @@ -50,10 +49,9 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib.h,v 1.10 2001/12/14 19:57:00 dawes Exp $ */ #include "zlib.h" -#include "Xfuncproto.h" +#include struct compress_private { z_stream stream; Index: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c diff -u xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c:1.13 xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c:1.14 --- xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c:1.13 Sat Apr 3 17:26:21 2004 +++ xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c Fri Oct 14 11:16:07 2005 @@ -1,5 +1,4 @@ -/* $Xorg: lbx_zlib_io.c,v 1.3 2000/08/17 19:46:41 cpqbld Exp $ */ - +/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c,v 1.14 2005/10/14 15:16:07 tsi Exp $ */ /* * Copyright 1993 Network Computing Devices * @@ -22,7 +21,6 @@ * * Author: Dale Tonogai, Network Computing Devices */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/lbx_zlib_io.c,v 1.13 2004/04/03 22:26:21 dawes Exp $ */ #ifdef WIN32 #define _WILLWINSOCK_ @@ -33,7 +31,7 @@ #if !defined(WIN32) && !defined(Lynx) #include #endif -#include "lbxbufstr.h" +#include #include "lbx_zlib.h" #include "os.h" Index: xc/lib/lbxutil/lbx_zlib/reqstats.c diff -u xc/lib/lbxutil/lbx_zlib/reqstats.c:1.6 xc/lib/lbxutil/lbx_zlib/reqstats.c:1.7 --- xc/lib/lbxutil/lbx_zlib/reqstats.c:1.6 Fri Dec 14 14:57:01 2001 +++ xc/lib/lbxutil/lbx_zlib/reqstats.c Fri Oct 14 11:16:07 2005 @@ -1,5 +1,4 @@ -/* $Xorg: reqstats.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.c,v 1.7 2005/10/14 15:16:07 tsi Exp $ */ /* Copyright 1996 The Open Group @@ -27,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.c,v 1.6 2001/12/14 19:57:01 dawes Exp $ */ #include "reqstats.h" @@ -36,7 +34,7 @@ #include #include #define _XLBX_SERVER_ -#include "XLbx.h" +#include #include "lbx_zlib.h" #include #include Index: xc/lib/lbxutil/lbx_zlib/reqstats.h diff -u xc/lib/lbxutil/lbx_zlib/reqstats.h:1.3 xc/lib/lbxutil/lbx_zlib/reqstats.h:1.4 --- xc/lib/lbxutil/lbx_zlib/reqstats.h:1.3 Fri Dec 14 14:57:01 2001 +++ xc/lib/lbxutil/lbx_zlib/reqstats.h Mon Jan 9 09:59:36 2006 @@ -1,5 +1,3 @@ -/* $Xorg: reqstats.h,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ - /* Copyright 1996 The Open Group @@ -27,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.h,v 1.3 2001/12/14 19:57:01 dawes Exp $ */ +/* $XFree86: xc/lib/lbxutil/lbx_zlib/reqstats.h,v 1.4 2006/01/09 14:59:36 dawes Exp $ */ #ifdef LBXREQSTATS struct ReqStats { Index: xc/lib/misc/snprintf.c diff -u xc/lib/misc/snprintf.c:3.2 xc/lib/misc/snprintf.c:3.3 --- xc/lib/misc/snprintf.c:3.2 Sun Feb 6 20:01:16 2005 +++ xc/lib/misc/snprintf.c Mon Jan 9 09:59:36 2006 @@ -51,7 +51,7 @@ * All Rights Reserved */ -/* $XFree86: xc/lib/misc/snprintf.c,v 3.2 2005/02/07 01:01:16 tsi Exp $ */ +/* $XFree86: xc/lib/misc/snprintf.c,v 3.3 2006/01/09 14:59:36 dawes Exp $ */ /* @@ -59,8 +59,6 @@ * ecvt, fcvt and gcvt. */ -/* From: Id: sprint.c,v 1.5 1995/09/10 18:35:09 chuck Exp */ - #include #include #include Index: xc/lib/misc/strlcat.c diff -u xc/lib/misc/strlcat.c:1.1 xc/lib/misc/strlcat.c:1.3 --- xc/lib/misc/strlcat.c:1.1 Sun Oct 26 07:17:14 2003 +++ xc/lib/misc/strlcat.c Mon Jan 9 09:59:36 2006 @@ -1,5 +1,3 @@ -/* $OpenBSD: strlcat.c,v 1.10 2003/04/12 21:56:39 millert Exp $ */ - /* * Copyright (c) 1998 Todd C. Miller * @@ -15,11 +13,12 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/misc/strlcat.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */ +/* $XFree86: xc/lib/misc/strlcat.c,v 1.3 2006/01/09 14:59:36 dawes Exp $ */ #include #include +#include "strlcat.h" /* * Appends src to string dst of size siz (unlike strncat, siz is the Index: xc/lib/misc/strlcat.h diff -u /dev/null xc/lib/misc/strlcat.h:1.1 --- /dev/null Tue May 9 21:55:39 2006 +++ xc/lib/misc/strlcat.h Sun Mar 27 21:50:59 2005 @@ -0,0 +1,4 @@ +/* $XFree86: xc/lib/misc/strlcat.h,v 1.1 2005/03/28 02:50:59 dawes Exp $ */ + +extern size_t strlcat(char *dst, const char *src, size_t siz); + Index: xc/lib/misc/strlcpy.c diff -u xc/lib/misc/strlcpy.c:1.1 xc/lib/misc/strlcpy.c:1.3 --- xc/lib/misc/strlcpy.c:1.1 Sun Oct 26 07:17:14 2003 +++ xc/lib/misc/strlcpy.c Mon Jan 9 09:59:36 2006 @@ -1,5 +1,3 @@ -/* $OpenBSD: strlcpy.c,v 1.7 2003/04/12 21:56:39 millert Exp $ */ - /* * Copyright (c) 1998 Todd C. Miller * @@ -15,10 +13,11 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/lib/misc/strlcpy.c,v 1.1 2003/10/26 12:17:14 herrb Exp $ */ +/* $XFree86: xc/lib/misc/strlcpy.c,v 1.3 2006/01/09 14:59:36 dawes Exp $ */ #include #include +#include "strlcpy.h" /* * Copy src to string dst of size siz. At most siz-1 characters Index: xc/lib/misc/strlcpy.h diff -u /dev/null xc/lib/misc/strlcpy.h:1.1 --- /dev/null Tue May 9 21:55:39 2006 +++ xc/lib/misc/strlcpy.h Sun Mar 27 21:50:59 2005 @@ -0,0 +1,4 @@ +/* $XFree86: xc/lib/misc/strlcpy.h,v 1.1 2005/03/28 02:50:59 dawes Exp $ */ + +extern size_t strlcpy(char *dst, const char *src, size_t siz); + Index: xc/lib/oldX/Imakefile diff -u xc/lib/oldX/Imakefile:1.4 xc/lib/oldX/Imakefile:1.5 --- xc/lib/oldX/Imakefile:1.4 Sun Apr 4 22:33:14 2004 +++ xc/lib/oldX/Imakefile Fri Oct 14 11:16:08 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/oldX/Imakefile,v 1.4 2004/04/05 02:33:14 dawes Exp $ +XCOMM $XFree86: xc/lib/oldX/Imakefile,v 1.5 2005/10/14 15:16:08 tsi Exp $ #define DoNormalLib NormalOldX #define DoSharedLib SharedOldX @@ -21,7 +16,6 @@ #if Malloc0ReturnsNull DEFINES = -DMALLOC_0_RETURNS_NULL #endif - INCLUDES = -I$(XINCLUDESRC) -I$(XLIBSRC) SRCS = \ XDraw.c \ XCrAssoc.c \ Index: xc/lib/oldX/XCrAssoc.c diff -u xc/lib/oldX/XCrAssoc.c:1.2 xc/lib/oldX/XCrAssoc.c:1.3 --- xc/lib/oldX/XCrAssoc.c:1.2 Fri Dec 14 14:57:02 2001 +++ xc/lib/oldX/XCrAssoc.c Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -/* $Xorg: XCrAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ +/* $XFree86: xc/lib/oldX/XCrAssoc.c,v 1.3 2005/10/14 15:16:08 tsi Exp $ */ /* Copyright 1985, 1998 The Open Group. @@ -25,8 +25,8 @@ */ -#include "Xlibint.h" -#include "X10.h" +#include +#include /* * XCreateAssocTable - Create an XAssocTable. The size argument should be Index: xc/lib/oldX/XDelAssoc.c diff -u xc/lib/oldX/XDelAssoc.c:1.5 xc/lib/oldX/XDelAssoc.c:1.6 --- xc/lib/oldX/XDelAssoc.c:1.5 Sat Apr 3 17:38:52 2004 +++ xc/lib/oldX/XDelAssoc.c Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -/* $Xorg: XDelAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ +/* $XFree86: xc/lib/oldX/XDelAssoc.c,v 1.6 2005/10/14 15:16:08 tsi Exp $ */ /* Copyright 1985, 1998 The Open Group. @@ -24,10 +24,9 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/oldX/XDelAssoc.c,v 1.5 2004/04/03 22:38:52 tsi Exp $ */ -#include "Xlibint.h" -#include "X10.h" +#include +#include /* * XDeleteAssoc - Delete an association in an XAssocTable keyed on Index: xc/lib/oldX/XDestAssoc.c diff -u xc/lib/oldX/XDestAssoc.c:1.5 xc/lib/oldX/XDestAssoc.c:1.6 --- xc/lib/oldX/XDestAssoc.c:1.5 Sat Apr 3 17:38:52 2004 +++ xc/lib/oldX/XDestAssoc.c Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -/* $Xorg: XDestAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ +/* $XFree86: xc/lib/oldX/XDestAssoc.c,v 1.6 2005/10/14 15:16:08 tsi Exp $ */ /* Copyright 1985, 1998 The Open Group. @@ -24,10 +24,9 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/oldX/XDestAssoc.c,v 1.5 2004/04/03 22:38:52 tsi Exp $ */ -#include "Xlibint.h" -#include "X10.h" +#include +#include /* * XDestroyAssocTable - Destroy (free the memory associated with) Index: xc/lib/oldX/XDraw.c diff -u xc/lib/oldX/XDraw.c:1.6 xc/lib/oldX/XDraw.c:1.7 --- xc/lib/oldX/XDraw.c:1.6 Sat Apr 3 17:38:52 2004 +++ xc/lib/oldX/XDraw.c Fri Oct 14 11:16:08 2005 @@ -1,5 +1,4 @@ -/* $Xorg: XDraw.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ - +/* $XFree86: xc/lib/oldX/XDraw.c,v 1.7 2005/10/14 15:16:08 tsi Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -26,11 +25,10 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/oldX/XDraw.c,v 1.6 2004/04/03 22:38:52 tsi Exp $ */ -#include "Xlibint.h" -#include "Xlib.h" -#include "X10.h" +#include +#include +#include #define OK_RETURN 1 #define ERR_RETURN 0 Index: xc/lib/oldX/XLookAssoc.c diff -u xc/lib/oldX/XLookAssoc.c:1.2 xc/lib/oldX/XLookAssoc.c:1.3 --- xc/lib/oldX/XLookAssoc.c:1.2 Fri Dec 14 14:57:03 2001 +++ xc/lib/oldX/XLookAssoc.c Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -/* $Xorg: XLookAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ +/* $XFree86: xc/lib/oldX/XLookAssoc.c,v 1.3 2005/10/14 15:16:08 tsi Exp $ */ /* Copyright 1985, 1998 The Open Group @@ -25,8 +25,8 @@ */ -#include "Xlibint.h" -#include "X10.h" +#include +#include /* * XLookUpAssoc - Retrieve the data stored in an XAssocTable by its XId. Index: xc/lib/oldX/XMakeAssoc.c diff -u xc/lib/oldX/XMakeAssoc.c:1.5 xc/lib/oldX/XMakeAssoc.c:1.6 --- xc/lib/oldX/XMakeAssoc.c:1.5 Sat Apr 3 17:38:52 2004 +++ xc/lib/oldX/XMakeAssoc.c Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -/* $Xorg: XMakeAssoc.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ +/* $XFree86: xc/lib/oldX/XMakeAssoc.c,v 1.6 2005/10/14 15:16:08 tsi Exp $ */ /* Copyright 1985, 1998 The Open Group. @@ -24,10 +24,9 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/oldX/XMakeAssoc.c,v 1.5 2004/04/03 22:38:52 tsi Exp $ */ -#include "Xlibint.h" -#include "X10.h" +#include +#include /* * XMakeAssoc - Insert data into an XAssocTable keyed on an XId. Index: xc/lib/oldX/oldX-def.cpp diff -u xc/lib/oldX/oldX-def.cpp:1.1.1.3 xc/lib/oldX/oldX-def.cpp:1.2 --- xc/lib/oldX/oldX-def.cpp:1.1.1.3 Tue Jan 16 17:27:30 2001 +++ xc/lib/oldX/oldX-def.cpp Mon Jan 9 09:59:36 2006 @@ -8,4 +8,4 @@ XDestroyAssocTable XLookUpAssoc XMakeAssoc -/* $Xorg: oldX-def.cpp,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */ +/* $XFree86: xc/lib/oldX/oldX-def.cpp,v 1.2 2006/01/09 14:59:36 dawes Exp $ */ Index: xc/lib/regex/Imakefile diff -u xc/lib/regex/Imakefile:1.1 xc/lib/regex/Imakefile:1.2 --- xc/lib/regex/Imakefile:1.1 Sat Jan 2 22:58:16 1999 +++ xc/lib/regex/Imakefile Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/lib/regex/Imakefile,v 1.1 1999/01/03 03:58:16 dawes Exp $ +XCOMM $XFree86: xc/lib/regex/Imakefile,v 1.2 2005/10/14 15:16:08 tsi Exp $ #define DoNormalLib YES #define DoSharedLib NO @@ -20,7 +20,7 @@ REGEXSOURCEDIR = $(TOP)/extras/regex -INCLUDES = -I. -I$(REGEXSOURCEDIR) +INCLUDES = -I$(REGEXSOURCEDIR) #include Index: xc/lib/xkbfile/Imakefile diff -u xc/lib/xkbfile/Imakefile:3.7 xc/lib/xkbfile/Imakefile:3.8 --- xc/lib/xkbfile/Imakefile:3.7 Sun Apr 4 22:33:14 2004 +++ xc/lib/xkbfile/Imakefile Fri Oct 14 11:16:08 2005 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.7 2004/04/05 02:33:14 dawes Exp $ +XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.8 2005/10/14 15:16:08 tsi Exp $ #define DoNormalLib NormalLibxkbfile #define DoSharedLib SharedLibxkbfile @@ -34,7 +29,6 @@ xkbconfig.o xkbbells.o maprules.o HEADERS = XKBfile.h XKM.h XKMformat.h XKBrules.h \ XKBconfig.h XKBbells.h - INCLUDES = -I. -I$(EXTINCSRC) ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\" Index: xc/lib/xkbfile/XKBbells.h diff -u xc/lib/xkbfile/XKBbells.h:3.3 xc/lib/xkbfile/XKBbells.h:3.4 --- xc/lib/xkbfile/XKBbells.h:3.3 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/XKBbells.h Mon Jan 9 09:59:36 2006 @@ -1,7 +1,6 @@ #ifndef _XKBBELLS_H_ #define _XKBBELLS_H_ 1 -/* $Xorg: XKBbells.h,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -27,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKBbells.h,v 3.3 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBbells.h,v 3.4 2006/01/09 14:59:36 dawes Exp $ */ #define XkbBN_Info "Info" #define XkbBN_Warning "Warning" Index: xc/lib/xkbfile/XKBconfig.h diff -u xc/lib/xkbfile/XKBconfig.h:3.6 xc/lib/xkbfile/XKBconfig.h:3.7 --- xc/lib/xkbfile/XKBconfig.h:3.6 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/XKBconfig.h Mon Jan 9 09:59:36 2006 @@ -1,7 +1,6 @@ #ifndef _XKBCONFIG_H_ #define _XKBCONFIG_H_ 1 -/* $Xorg: XKBconfig.h,v 1.3 2000/08/17 19:46:42 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -27,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.6 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBconfig.h,v 3.7 2006/01/09 14:59:36 dawes Exp $ */ typedef struct _XkbConfigRtrn *XkbConfigRtrnPtr; Index: xc/lib/xkbfile/XKBfile.h diff -u xc/lib/xkbfile/XKBfile.h:3.7 xc/lib/xkbfile/XKBfile.h:3.8 --- xc/lib/xkbfile/XKBfile.h:3.7 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/XKBfile.h Mon Jan 9 09:59:36 2006 @@ -1,9 +1,8 @@ -/* $XFree86: xc/lib/xkbfile/XKBfile.h,v 3.7 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBfile.h,v 3.8 2006/01/09 14:59:36 dawes Exp $ */ #ifndef _XKBFILE_H_ #define _XKBFILE_H_ 1 -/* $Xorg: XKBfile.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. Index: xc/lib/xkbfile/XKBfileInt.h diff -u xc/lib/xkbfile/XKBfileInt.h:3.4 xc/lib/xkbfile/XKBfileInt.h:3.5 --- xc/lib/xkbfile/XKBfileInt.h:3.4 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/XKBfileInt.h Mon Jan 9 09:59:36 2006 @@ -1,7 +1,6 @@ #ifndef _XKBFILEINT_H_ #define _XKBFILEINT_H_ 1 -/* $Xorg: XKBfileInt.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -27,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKBfileInt.h,v 3.4 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBfileInt.h,v 3.5 2006/01/09 14:59:36 dawes Exp $ */ #include "XKBfile.h" Index: xc/lib/xkbfile/XKBrules.h diff -u xc/lib/xkbfile/XKBrules.h:3.6 xc/lib/xkbfile/XKBrules.h:3.7 --- xc/lib/xkbfile/XKBrules.h:3.6 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/XKBrules.h Mon Jan 9 09:59:36 2006 @@ -1,7 +1,6 @@ #ifndef _XKBRULES_H_ #define _XKBRULES_H_ 1 -/* $Xorg: XKBrules.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ /************************************************************ Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. @@ -27,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.6 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKBrules.h,v 3.7 2006/01/09 14:59:36 dawes Exp $ */ /***====================================================================***/ Index: xc/lib/xkbfile/XKM.h diff -u xc/lib/xkbfile/XKM.h:1.1.1.2 xc/lib/xkbfile/XKM.h:1.2 --- xc/lib/xkbfile/XKM.h:1.1.1.2 Tue Jan 16 17:27:37 2001 +++ xc/lib/xkbfile/XKM.h Mon Jan 9 09:59:36 2006 @@ -1,4 +1,4 @@ -/* $Xorg: XKM.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKM.h,v 1.2 2006/01/09 14:59:36 dawes Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. Index: xc/lib/xkbfile/XKMformat.h diff -u xc/lib/xkbfile/XKMformat.h:1.2 xc/lib/xkbfile/XKMformat.h:1.3 --- xc/lib/xkbfile/XKMformat.h:1.2 Tue Jul 31 20:44:44 2001 +++ xc/lib/xkbfile/XKMformat.h Mon Jan 9 09:59:36 2006 @@ -1,4 +1,3 @@ -/* $Xorg: XKMformat.h,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/XKMformat.h,v 1.2 2001/08/01 00:44:44 tsi Exp $ */ +/* $XFree86: xc/lib/xkbfile/XKMformat.h,v 1.3 2006/01/09 14:59:36 dawes Exp $ */ #ifndef _XKMFORMAT_H_ #define _XKMFORMAT_H_ 1 Index: xc/lib/xkbfile/cout.c diff -u xc/lib/xkbfile/cout.c:3.9 xc/lib/xkbfile/cout.c:3.10 --- xc/lib/xkbfile/cout.c:3.9 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/cout.c Mon Jan 9 09:59:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: cout.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - /* $XFree86: xc/lib/xkbfile/cout.c,v 3.9 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/cout.c,v 3.10 2006/01/09 14:59:37 dawes Exp $ */ #include #include Index: xc/lib/xkbfile/magic diff -u xc/lib/xkbfile/magic:1.1.1.3 xc/lib/xkbfile/magic:1.2 --- xc/lib/xkbfile/magic:1.1.1.3 Tue Jan 16 17:27:40 2001 +++ xc/lib/xkbfile/magic Mon Jan 9 09:59:37 2006 @@ -1,4 +1,4 @@ -# $Xorg: magic,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ +# $XFree86: xc/lib/xkbfile/magic,v 1.2 2006/01/09 14:59:37 dawes Exp $ # Here are some lines you can add to /etc/magic # to identify XKM (compiled X keymap) files # and determine their version and the byte ordering Index: xc/lib/xkbfile/maprules.c diff -u xc/lib/xkbfile/maprules.c:3.18 xc/lib/xkbfile/maprules.c:3.19 --- xc/lib/xkbfile/maprules.c:3.18 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/maprules.c Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -/* $Xorg: maprules.c,v 1.4 2000/08/17 19:46:43 cpqbld Exp $ */ +/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.19 2005/10/14 15:16:08 tsi Exp $ */ /************************************************************ Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/maprules.c,v 3.18 2003/11/17 22:20:23 dawes Exp $ */ #include #include @@ -60,9 +59,9 @@ #include "misc.h" #include "inputstr.h" #include "dix.h" -#include "XKBstr.h" +#include #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #endif Index: xc/lib/xkbfile/srvmisc.c diff -u xc/lib/xkbfile/srvmisc.c:3.5 xc/lib/xkbfile/srvmisc.c:3.6 --- xc/lib/xkbfile/srvmisc.c:3.5 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/srvmisc.c Mon Jan 9 09:59:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: srvmisc.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/srvmisc.c,v 3.5 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/srvmisc.c,v 3.6 2006/01/09 14:59:37 dawes Exp $ */ #include #include Index: xc/lib/xkbfile/xkbatom.c diff -u xc/lib/xkbfile/xkbatom.c:3.9 xc/lib/xkbfile/xkbatom.c:3.10 --- xc/lib/xkbfile/xkbatom.c:3.9 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/xkbatom.c Mon Jan 9 09:59:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbatom.c,v 1.4 2001/02/09 02:04:05 xorgcvs Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -71,7 +70,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbatom.c,v 3.9 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbatom.c,v 3.10 2006/01/09 14:59:37 dawes Exp $ */ #include #include Index: xc/lib/xkbfile/xkbbells.c diff -u xc/lib/xkbfile/xkbbells.c:1.2 xc/lib/xkbfile/xkbbells.c:1.3 --- xc/lib/xkbfile/xkbbells.c:1.2 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/xkbbells.c Mon Jan 9 09:59:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbbells.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbbells.c,v 1.2 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbbells.c,v 1.3 2006/01/09 14:59:37 dawes Exp $ */ #include #include Index: xc/lib/xkbfile/xkbconfig.c diff -u xc/lib/xkbfile/xkbconfig.c:3.8 xc/lib/xkbfile/xkbconfig.c:3.9 --- xc/lib/xkbfile/xkbconfig.c:3.8 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/xkbconfig.c Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -/* $Xorg: xkbconfig.c,v 1.4 2000/08/17 19:46:43 cpqbld Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.9 2005/10/14 15:16:08 tsi Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbconfig.c,v 3.8 2003/11/17 22:20:23 dawes Exp $ */ #include #include @@ -44,15 +43,15 @@ #else -#include "X.h" +#include #define NEED_EVENTS #include -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include "dix.h" #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" +#include #endif #include Index: xc/lib/xkbfile/xkbdraw.c diff -u xc/lib/xkbfile/xkbdraw.c:1.4 xc/lib/xkbfile/xkbdraw.c:1.5 --- xc/lib/xkbfile/xkbdraw.c:1.4 Mon Nov 17 17:20:23 2003 +++ xc/lib/xkbfile/xkbdraw.c Mon Jan 9 09:59:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkbdraw.c,v 1.3 2000/08/17 19:46:43 cpqbld Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbdraw.c,v 1.4 2003/11/17 22:20:23 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbdraw.c,v 1.5 2006/01/09 14:59:37 dawes Exp $ */ #include #include Index: xc/lib/xkbfile/xkberrs.c diff -u xc/lib/xkbfile/xkberrs.c:3.5 xc/lib/xkbfile/xkberrs.c:3.6 --- xc/lib/xkbfile/xkberrs.c:3.5 Fri Nov 8 08:35:43 2002 +++ xc/lib/xkbfile/xkberrs.c Mon Jan 9 09:59:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkberrs.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.5 2002/11/08 13:35:43 alanh Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkberrs.c,v 3.6 2006/01/09 14:59:37 dawes Exp $ */ #include #include Index: xc/lib/xkbfile/xkbmisc.c diff -u xc/lib/xkbfile/xkbmisc.c:1.8 xc/lib/xkbfile/xkbmisc.c:1.9 --- xc/lib/xkbfile/xkbmisc.c:1.8 Mon Nov 17 17:20:24 2003 +++ xc/lib/xkbfile/xkbmisc.c Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -/* $Xorg: xkbmisc.c,v 1.4 2000/08/17 19:46:44 cpqbld Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.9 2005/10/14 15:16:08 tsi Exp $ */ /************************************************************ Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbmisc.c,v 1.8 2003/11/17 22:20:24 dawes Exp $ */ #include #include @@ -44,16 +43,16 @@ #else -#include "X.h" +#include #define NEED_EVENTS #include -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include "dix.h" -#include "XKBstr.h" +#include #define XKBSRV_NEED_FILE_FUNCS 1 -#include "XKBsrv.h" +#include #include #include "xkb.h" Index: xc/lib/xkbfile/xkbout.c diff -u xc/lib/xkbfile/xkbout.c:3.11 xc/lib/xkbfile/xkbout.c:3.12 --- xc/lib/xkbfile/xkbout.c:3.11 Mon Feb 28 18:19:13 2005 +++ xc/lib/xkbfile/xkbout.c Fri Oct 14 11:16:08 2005 @@ -23,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.11 2005/02/28 23:19:13 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbout.c,v 3.12 2005/10/14 15:16:08 tsi Exp $ */ #include #include @@ -41,16 +41,16 @@ #else -#include "X.h" +#include #define NEED_EVENTS #include -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include "dix.h" -#include "XKBstr.h" +#include #define XKBSRV_NEED_FILE_FUNCS 1 -#include "XKBsrv.h" +#include #include #include Index: xc/lib/xkbfile/xkbtext.c diff -u xc/lib/xkbfile/xkbtext.c:3.12 xc/lib/xkbfile/xkbtext.c:3.13 --- xc/lib/xkbfile/xkbtext.c:3.12 Mon Nov 17 17:20:24 2003 +++ xc/lib/xkbfile/xkbtext.c Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -/* $Xorg: xkbtext.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.13 2005/10/14 15:16:08 tsi Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkbtext.c,v 3.12 2003/11/17 22:20:24 dawes Exp $ */ #include #include @@ -43,16 +42,16 @@ #else -#include "X.h" +#include #define NEED_EVENTS -#include "Xproto.h" +#include #include "misc.h" #include "inputstr.h" #include "dix.h" -#include "XKBstr.h" +#include #define XKBSRV_NEED_FILE_FUNCS 1 -#include "XKBsrv.h" -#include "XKBgeom.h" +#include +#include #endif Index: xc/lib/xkbfile/xkmout.c diff -u xc/lib/xkbfile/xkmout.c:1.6 xc/lib/xkbfile/xkmout.c:1.7 --- xc/lib/xkbfile/xkmout.c:1.6 Mon Nov 17 17:20:24 2003 +++ xc/lib/xkbfile/xkmout.c Mon Jan 9 09:59:37 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xkmout.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkmout.c,v 1.6 2003/11/17 22:20:24 dawes Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkmout.c,v 1.7 2006/01/09 14:59:37 dawes Exp $ */ #include #include Index: xc/lib/xkbfile/xkmread.c diff -u xc/lib/xkbfile/xkmread.c:1.7 xc/lib/xkbfile/xkmread.c:1.8 --- xc/lib/xkbfile/xkmread.c:1.7 Mon Nov 17 17:20:24 2003 +++ xc/lib/xkbfile/xkmread.c Fri Oct 14 11:16:08 2005 @@ -1,4 +1,4 @@ -/* $Xorg: xkmread.c,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ */ +/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.8 2005/10/14 15:16:08 tsi Exp $ */ /************************************************************ Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbfile/xkmread.c,v 1.7 2003/11/17 22:20:24 dawes Exp $ */ #include @@ -45,16 +44,16 @@ #else -#include "X.h" +#include #define NEED_EVENTS -#include "Xproto.h" +#include #include #include "misc.h" #include "inputstr.h" -#include "XKBstr.h" +#include #define XKBSRV_NEED_FILE_FUNCS -#include "XKBsrv.h" -#include "XKBgeom.h" +#include +#include Atom XkbInternAtom(Display *dpy,char *str,Bool only_if_exists) Index: xc/lib/xkbui/Imakefile diff -u xc/lib/xkbui/Imakefile:3.7 xc/lib/xkbui/Imakefile:3.9 --- xc/lib/xkbui/Imakefile:3.7 Tue Jun 29 18:55:33 2004 +++ xc/lib/xkbui/Imakefile Mon Jan 9 09:59:37 2006 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: Imakefile /main/1 1995/11/30 19:00:42 kaleb $ -XCOMM $XFree86: xc/lib/xkbui/Imakefile,v 3.7 2004/06/29 22:55:33 herrb Exp $ +XCOMM $XFree86: xc/lib/xkbui/Imakefile,v 3.9 2006/01/09 14:59:37 dawes Exp $ + #define DoNormalLib NormalLibxkbui #define DoSharedLib SharedLibxkbui #define DoExtraLib ExtraLibxkbui @@ -18,7 +18,7 @@ SRCS = XKBui.c OBJS = XKBui.o HEADERS = XKBui.h - INCLUDES = -I. -I$(EXTINCSRC) -I../xkbfile + INCLUDES = -I../xkbfile #include Index: xc/lib/xkbui/XKBui.c diff -u xc/lib/xkbui/XKBui.c:3.7 xc/lib/xkbui/XKBui.c:3.8 --- xc/lib/xkbui/XKBui.c:3.7 Mon Nov 17 17:20:25 2003 +++ xc/lib/xkbui/XKBui.c Mon Jan 9 09:59:37 2006 @@ -1,4 +1,3 @@ -/* $XConsortium: XKBui.c /main/2 1995/12/07 21:18:19 kaleb $ */ /************************************************************ Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbui/XKBui.c,v 3.7 2003/11/17 22:20:25 dawes Exp $ */ +/* $XFree86: xc/lib/xkbui/XKBui.c,v 3.8 2006/01/09 14:59:37 dawes Exp $ */ #include #include Index: xc/lib/xkbui/XKBui.h diff -u xc/lib/xkbui/XKBui.h:3.1 xc/lib/xkbui/XKBui.h:3.2 --- xc/lib/xkbui/XKBui.h:3.1 Mon Nov 17 17:20:25 2003 +++ xc/lib/xkbui/XKBui.h Mon Jan 9 09:59:37 2006 @@ -1,6 +1,5 @@ #ifndef XKBUI_H #define XKBUI_H 1 -/* $XConsortium: XKBui.h /main/2 1995/12/07 21:18:19 kaleb $ */ /************************************************************ Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. @@ -26,7 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbui/XKBui.h,v 3.1 2003/11/17 22:20:25 dawes Exp $ */ +/* $XFree86: xc/lib/xkbui/XKBui.h,v 3.2 2006/01/09 14:59:37 dawes Exp $ */ #include #include Index: xc/lib/xkbui/XKBuiPriv.h diff -u xc/lib/xkbui/XKBuiPriv.h:3.0 xc/lib/xkbui/XKBuiPriv.h:3.1 --- xc/lib/xkbui/XKBuiPriv.h:3.0 Thu Jun 13 03:58:06 1996 +++ xc/lib/xkbui/XKBuiPriv.h Mon Jan 9 09:59:37 2006 @@ -1,6 +1,5 @@ #ifndef XKBUIPRIV_H #define XKBUIPRIV_H 1 -/* $XConsortium: XKBuiPriv.h /main/2 1995/12/07 21:18:19 kaleb $ */ /************************************************************ Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. @@ -26,6 +25,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/lib/xkbui/XKBuiPriv.h,v 3.1 2006/01/09 14:59:37 dawes Exp $ */ #include "XKBui.h" Index: xc/lib/xtrans/Imakefile diff -u xc/lib/xtrans/Imakefile:1.1.1.3 xc/lib/xtrans/Imakefile:1.2 --- xc/lib/xtrans/Imakefile:1.1.1.3 Tue Jan 16 17:27:48 2001 +++ xc/lib/xtrans/Imakefile Mon Jan 9 09:59:38 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ +XCOMM $XFree86: xc/lib/xtrans/Imakefile,v 1.2 2006/01/09 14:59:38 dawes Exp $ #define IncSubdir X11 Index: xc/lib/xtrans/Xtrans.c diff -u xc/lib/xtrans/Xtrans.c:3.35 xc/lib/xtrans/Xtrans.c:3.36 --- xc/lib/xtrans/Xtrans.c:3.35 Sat Apr 3 17:26:21 2004 +++ xc/lib/xtrans/Xtrans.c Mon Jan 9 09:59:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xtrans.c,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtrans.c,v 3.35 2004/04/03 22:26:21 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtrans.c,v 3.36 2006/01/09 14:59:38 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * Index: xc/lib/xtrans/Xtrans.h diff -u xc/lib/xtrans/Xtrans.h:3.22 xc/lib/xtrans/Xtrans.h:3.23 --- xc/lib/xtrans/Xtrans.h:3.22 Thu Jul 24 09:50:19 2003 +++ xc/lib/xtrans/Xtrans.h Mon Jan 9 09:59:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xtrans.h,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtrans.h,v 3.22 2003/07/24 13:50:19 eich Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtrans.h,v 3.23 2006/01/09 14:59:38 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * Index: xc/lib/xtrans/Xtransdnet.c diff -u xc/lib/xtrans/Xtransdnet.c:3.8 xc/lib/xtrans/Xtransdnet.c:3.9 --- xc/lib/xtrans/Xtransdnet.c:3.8 Tue Aug 26 11:38:39 2003 +++ xc/lib/xtrans/Xtransdnet.c Mon Jan 9 09:59:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xtransdnet.c,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransdnet.c,v 3.8 2003/08/26 15:38:39 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransdnet.c,v 3.9 2006/01/09 14:59:38 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * Index: xc/lib/xtrans/Xtransint.h diff -u xc/lib/xtrans/Xtransint.h:3.43 xc/lib/xtrans/Xtransint.h:3.45 --- xc/lib/xtrans/Xtransint.h:3.43 Sat Apr 3 17:26:21 2004 +++ xc/lib/xtrans/Xtransint.h Fri Oct 14 11:16:09 2005 @@ -1,4 +1,3 @@ -/* $Xorg: Xtransint.h,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransint.h,v 3.43 2004/04/03 22:26:21 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransint.h,v 3.45 2005/10/14 15:16:09 tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -84,7 +83,7 @@ # define _WILLWINSOCK_ #endif -#include "Xtrans.h" +#include #ifdef XTRANSDEBUG # include @@ -436,7 +435,7 @@ * to fprintf. */ #ifdef XTRANSDEBUGTIMESTAMP -#if defined(XSERV_t) && defined(TRANS_SERVER) +#if (defined(XSERV_t) || defined(FONT_t)) && defined(TRANS_SERVER) /* Use ErrorF() for the X server */ #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \ int hack= 0, saveerrno=errno; \ @@ -460,7 +459,7 @@ } else ((void)0) #endif /* XSERV_t && TRANS_SERVER */ #else /* XTRANSDEBUGTIMESTAMP */ -#if defined(XSERV_t) && defined(TRANS_SERVER) +#if (defined(XSERV_t) || defined(FONT_t)) && defined(TRANS_SERVER) /* Use ErrorF() for the X server */ #define PRMSG(lvl,x,a,b,c) if (lvl <= XTRANSDEBUG){ \ int hack= 0, saveerrno=errno; \ Index: xc/lib/xtrans/Xtranslcl.c diff -u xc/lib/xtrans/Xtranslcl.c:3.42 xc/lib/xtrans/Xtranslcl.c:3.44 --- xc/lib/xtrans/Xtranslcl.c:3.42 Sat Apr 3 17:26:22 2004 +++ xc/lib/xtrans/Xtranslcl.c Sun Feb 19 19:14:35 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xtranslcl.c,v 1.6 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtranslcl.c,v 3.42 2004/04/03 22:26:22 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranslcl.c,v 3.44 2006/02/20 00:14:35 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -65,17 +64,18 @@ * * The goal is to have common connection code among all SVR4/Intel vendors. * - * ALL THE ABOVE COMPANIES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * ALL THE ABOVE COMPANIES DISCLAIM ALL WARRANTIES WITH REGARD TO THIS * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, - * IN NO EVENT SHALL THESE COMPANIES * BE LIABLE FOR ANY SPECIAL, INDIRECT - * OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE - * OR PERFORMANCE OF THIS SOFTWARE. + * IN NO EVENT SHALL THESE COMPANIES BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. */ #include #include +#include #include #include #include @@ -87,6 +87,9 @@ #include #endif #endif +#ifdef SVR4 +#include +#endif #include #include #include @@ -204,18 +207,7 @@ #define SIGNAL_T void #endif /* SYSV */ -typedef SIGNAL_T (*PFV)(); - -extern PFV signal(); - -extern char *ptsname( - int -); - -static void _dummy(int sig) - -{ -} +typedef SIGNAL_T (*PFV)(int); #ifndef sun #define X_STREAMS_DIR "/dev/X" @@ -283,6 +275,14 @@ #ifndef sun #ifdef TRANS_CLIENT +#ifdef PTSNODENAME +static SIGNAL_T +TRANS(PTSCatchSignal)(int sig) +{ + (void)(sig); +} +#endif + static int TRANS(PTSOpenClient)(XtransConnInfo ciptr, char *port) @@ -387,7 +387,7 @@ * wait for server to respond */ - savef = signal(SIGALRM, _dummy); + savef = signal(SIGALRM, TRANS(PTSCatchSignal)); alarm_time = alarm (30); /* CONNECT_TIMEOUT */ ret = read(fd, buf, 1); @@ -488,7 +488,7 @@ grantpt(fd); unlockpt(fd); - if( (slave=ptsname(fd)) == NULL) { + if( (slave = ptsname(fd)) == NULL) { PRMSG(1, "PTSOpenServer: Unable to get slave device name\n", 0,0,0 ); close(fd); return(-1); @@ -637,7 +637,6 @@ int fd; char server_path[64]; struct stat filestat; - extern int isastream(); #endif PRMSG(2,"NAMEDOpenClient(%s)\n", port, 0,0 ); @@ -895,11 +894,10 @@ return(ret); } - + /* SCO doesnt use the ISC transport type - it causes problems */ #ifndef __SCO__ - /* ISC */ #ifdef TRANS_CLIENT @@ -1019,6 +1017,17 @@ #ifdef TRANS_SERVER +#if defined(ISCDEVNODENAME) && \ + !defined(UNIXCONN) && \ + !defined(SVR4) && \ + defined(ISC40) +static SIGNAL_T +TRANS(ISCCatchSignal)(int sig) +{ + (void)(sig); +} +#endif + static int TRANS(ISCOpenServer)(XtransConnInfo ciptr, char *port) @@ -1100,7 +1109,7 @@ #else #ifdef ISC40 /* catch SIGSYS on symlink for ISC40 compiled binaries running on ISC30 */ - signal(SIGSYS,_dummy); + signal(SIGSYS, TRANS(ISCCatchSignal)); #endif if( link(server_path, server_unix_path) < 0 ) #ifdef ISC40 @@ -1205,6 +1214,14 @@ #ifdef TRANS_CLIENT +#if defined(SCORNODENAME) +static SIGNAL_T +TRANS(SCOCatchSignal)(int sig) +{ + (void)(sig); +} +#endif + static int TRANS(SCOOpenClient)(XtransConnInfo ciptr, char *port) { @@ -1213,8 +1230,7 @@ char server_path[64]; struct strbuf ctlbuf; unsigned long alarm_time; - void (*savef)(); - extern int getmsg(), putmsg(); + PFV savef; long temp; #endif @@ -1246,7 +1262,7 @@ ctlbuf.buf = (caddr_t)&temp; fl = 0; - savef = signal(SIGALRM, _dummy); + savef = signal(SIGALRM, TRANS(SCOCatchSignal)); alarm_time = alarm(10); ret = getmsg(server, &ctlbuf, 0, &fl); Index: xc/lib/xtrans/Xtranssock.c diff -u xc/lib/xtrans/Xtranssock.c:3.70 xc/lib/xtrans/Xtranssock.c:3.73 --- xc/lib/xtrans/Xtranssock.c:3.70 Sat Apr 3 17:26:22 2004 +++ xc/lib/xtrans/Xtranssock.c Wed Mar 1 16:01:55 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xtranssock.c,v 1.11 2001/02/09 02:04:06 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -27,7 +26,7 @@ from the copyright holders. */ -/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.70 2004/04/03 22:26:22 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.73 2006/03/01 21:01:55 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -537,7 +536,7 @@ TRANS(SocketOpenCOTSClientBase) (char *transname, char *protocol, char *host, char *port, int previndex) { - XtransConnInfo ciptr; + XtransConnInfo ciptr = NULL; int i = previndex; PRMSG (2, "SocketOpenCOTSClient(%s,%s,%s)\n", @@ -586,7 +585,7 @@ char *host, char *port) { - XtransConnInfo ciptr; + XtransConnInfo ciptr = NULL; int i = -1; PRMSG (2,"SocketOpenCOTSServer(%s,%s,%s)\n", protocol, host, port); @@ -653,7 +652,7 @@ char *host, char *port) { - XtransConnInfo ciptr; + XtransConnInfo ciptr = NULL; int i = -1; PRMSG (2,"SocketOpenCLTSClient(%s,%s,%s)\n", protocol, host, port); @@ -692,7 +691,7 @@ char *host, char *port) { - XtransConnInfo ciptr; + XtransConnInfo ciptr = NULL; int i = -1; PRMSG (2,"SocketOpenCLTSServer(%s,%s,%s)\n", protocol, host, port); @@ -737,7 +736,7 @@ TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, char *port) { - XtransConnInfo ciptr; + XtransConnInfo ciptr = NULL; int i = -1; PRMSG (2, @@ -771,7 +770,7 @@ TRANS(SocketReopenCLTSServer) (Xtransport *thistrans, int fd, char *port) { - XtransConnInfo ciptr; + XtransConnInfo ciptr = NULL; int i = -1; PRMSG (2, @@ -1003,7 +1002,8 @@ } else { namelen = sizeof (struct sockaddr_in6); #ifdef SIN6_LEN - ((struct sockaddr_in6 *)&sockname)->sin6_len = sizeof(sockname); + ((struct sockaddr_in6 *)&sockname)->sin6_len = + (unsigned char)sizeof(sockname); #endif ((struct sockaddr_in6 *)&sockname)->sin6_family = AF_INET6; ((struct sockaddr_in6 *)&sockname)->sin6_port = htons(sport); Index: xc/lib/xtrans/Xtranstli.c diff -u xc/lib/xtrans/Xtranstli.c:3.13 xc/lib/xtrans/Xtranstli.c:3.14 --- xc/lib/xtrans/Xtranstli.c:3.13 Tue Aug 26 11:38:39 2003 +++ xc/lib/xtrans/Xtranstli.c Mon Jan 9 09:59:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xtranstli.c,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtranstli.c,v 3.13 2003/08/26 15:38:39 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranstli.c,v 3.14 2006/01/09 14:59:38 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * Index: xc/lib/xtrans/Xtransutil.c diff -u xc/lib/xtrans/Xtransutil.c:3.28 xc/lib/xtrans/Xtransutil.c:3.30 --- xc/lib/xtrans/Xtransutil.c:3.28 Sat Apr 3 17:26:22 2004 +++ xc/lib/xtrans/Xtransutil.c Mon Jan 9 09:59:38 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Xtransutil.c,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.28 2004/04/03 22:26:22 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.30 2006/01/09 14:59:38 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -384,8 +383,8 @@ #if defined(IPv6) && defined(AF_INET6) struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *) peer_addr; #endif - char *address; - int addresslen; + char * volatile address; + volatile int addresslen; #ifdef XTHREADS_NEEDS_BYNAMEPARAMS _Xgethostbynameparams hparams; #endif Index: xc/lib/xtrans/transport.c diff -u xc/lib/xtrans/transport.c:3.10 xc/lib/xtrans/transport.c:3.11 --- xc/lib/xtrans/transport.c:3.10 Mon Mar 24 23:18:15 2003 +++ xc/lib/xtrans/transport.c Mon Jun 27 22:33:53 2005 @@ -1,4 +1,3 @@ -/* $Xorg: transport.c,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group @@ -26,7 +25,7 @@ from The Open Group. */ -/* $XFree86: xc/lib/xtrans/transport.c,v 3.10 2003/03/25 04:18:15 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/transport.c,v 3.11 2005/06/28 02:33:53 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -64,6 +63,9 @@ #define xrealloc(_ptr,_size) realloc(_ptr,_size) #define xfree(_ptr) free(_ptr) #endif +#ifdef FONT_t +extern void ErrorF(const char *f, ...); +#endif #include "Xtransint.h" Index: xc/lib/zlib/Imakefile diff -u xc/lib/zlib/Imakefile:1.10 xc/lib/zlib/Imakefile:1.11 --- xc/lib/zlib/Imakefile:1.10 Tue Oct 28 13:09:31 2003 +++ xc/lib/zlib/Imakefile Mon Jan 9 09:59:38 2006 @@ -1,10 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:46 cpqbld Exp $ - - - - - -XCOMM $XFree86: xc/lib/zlib/Imakefile,v 1.10 2003/10/28 18:09:31 tsi Exp $ +XCOMM $XFree86: xc/lib/zlib/Imakefile,v 1.11 2006/01/09 14:59:38 dawes Exp $ #define DoNormalLib YES #define DoSharedLib NO Index: xc/nls/compose.dir diff -u xc/nls/compose.dir:1.29 xc/nls/compose.dir:1.30 --- xc/nls/compose.dir:1.29 Fri Feb 25 13:25:34 2005 +++ xc/nls/compose.dir Mon Jan 30 20:56:08 2006 @@ -3,7 +3,7 @@ XCOMM The first word is the compose table file name and XCOMM the second word is full locale name. XCOMM -XCOMM $XFree86: xc/nls/compose.dir,v 1.29 2005/02/25 18:25:34 dawes Exp $ +XCOMM $XFree86: xc/nls/compose.dir,v 1.30 2006/01/31 01:56:08 dawes Exp $ XCOMM iso8859-1/Compose: C iso8859-1/Compose: af_ZA.ISO8859-1 @@ -193,6 +193,8 @@ iso8859-2/Compose: sl_SI.ISO8859-2 iso8859-5/Compose: sp_YU.ISO8859-5 iso8859-2/Compose: sq_AL.ISO8859-2 +iso8859-2/Compose: sr_CS.ISO8859-2 +iso8859-5/Compose: sr_CS.ISO8859-5 iso8859-2/Compose: sr_SP.ISO8859-2 iso8859-2/Compose: sr_YU.ISO8859-2 iso8859-5/Compose: sr_YU.ISO8859-5 @@ -346,6 +348,7 @@ en_US.UTF-8/Compose: sk_SK.UTF-8 en_US.UTF-8/Compose: sl_SI.UTF-8 en_US.UTF-8/Compose: sq_AL.UTF-8 +en_US.UTF-8/Compose: sr_CS.UTF-8 en_US.UTF-8/Compose: sr_YU.UTF-8 en_US.UTF-8/Compose: ss_ZA.UTF-8 en_US.UTF-8/Compose: st_ZA.UTF-8 Index: xc/nls/locale.alias diff -u xc/nls/locale.alias:1.71 xc/nls/locale.alias:1.72 --- xc/nls/locale.alias:1.71 Tue Mar 15 16:05:50 2005 +++ xc/nls/locale.alias Mon Jan 30 20:56:08 2006 @@ -4,7 +4,7 @@ XCOMM The first word is the alias name (simplified locale name) XCOMM the second word is full locale name. XCOMM -XCOMM $XFree86: xc/nls/locale.alias,v 1.71 2005/03/15 21:05:50 dawes Exp $ +XCOMM $XFree86: xc/nls/locale.alias,v 1.72 2006/01/31 01:56:08 dawes Exp $ XCOMM POSIX: C @@ -592,10 +592,13 @@ rw_RW.utf8: rw_RW.UTF-8 se_NO: se_NO.UTF-8 se_NO.utf8: se_NO.UTF-8 -sh: sh_YU.ISO8859-2 -sh_HR.iso88592: sh_HR.ISO8859-2 -sh_YU: sh_YU.ISO8859-2 -sh_SP: sh_YU.ISO8859-2 +XCOMM sh was the old ISO code for Serbo-Croatian (now individual sr and hr). +XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro). +XCOMM These lines should be deleted in the future. +sh: sr_CS.ISO8859-2 +sh_HR.iso88592: hr_HR.ISO8859-2 +sh_YU: sr_CS.ISO8859-2 +sh_SP: sr_CS.ISO8859-2 si: si_LK.UTF-8 si_LK: si_LK.UTF-8 sk: sk_SK.ISO8859-2 @@ -606,26 +609,44 @@ sl_SI: sl_SI.ISO8859-2 sl_SI.iso88592: sl_SI.ISO8859-2 sl_SI.ISO-8859-2: sl_SI.ISO8859-2 -sp: sp_YU.ISO8859-5 -sp_YU: sp_YU.ISO8859-5 +XCOMM sp is not an ISO 639 language code, but in Cyrillic, "R" looks like "P". +XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro). +XCOMM These lines should be deleted in the future. +sp: sr_CS.ISO8859-5 +sp_YU: sr_CS.ISO8859-5 sq: sq_AL.ISO8859-2 sq_AL: sq_AL.ISO8859-2 sq_AL.iso88592: sq_AL.ISO8859-2 -sr_SP: sr_SP.ISO8859-2 -sr: sr_YU.ISO8859-5 -sr_YU: sr_YU.ISO8859-5 -sr_YU.iso88592: sr_YU.ISO8859-2 -sr_YU.iso88595: sr_YU.ISO8859-5 -sr@cyrillic: sr_YU.ISO8859-5 -sr_YU@cyrillic: sr_YU.ISO8859-5 -sr_YU.iso88595@cyrillic: sr_YU.ISO8859-5 -sr_YU.ISO8859-5@cyrillic: sr_YU.ISO8859-5 -sr_YU.cp1251@cyrillic: sr_YU.CP1251 -sr_YU.CP1251@cyrillic: sr_YU.CP1251 -sr_YU.microsoftcp1251@cyrillic: sr_YU.CP1251 -sr_YU.microsoft-cp1251@cyrillic: sr_YU.CP1251 -sr_YU.MICROSOFT-CP1251@cyrillic: sr_YU.CP1251 -sr_YU.UTF-8@cyrillic: sr_YU.UTF-8 +XCOMM SP is not an ISO 639 country code, but in Cyrillic, "R" looks like "P". +XCOMM YU was the old ISO code for Yugoslavia (now CS for Serbia&Montenegro). +XCOMM Some of these lines should be deleted in the future. +sr_SP: sr_CS.ISO8859-2 +sr: sr_CS.ISO8859-5 +sr_YU: sr_CS.ISO8859-5 +sr_YU.iso88592: sr_CS.ISO8859-2 +sr_YU.iso88595: sr_CS.ISO8859-5 +sr@cyrillic: sr_CS.ISO8859-5 +sr_YU@cyrillic: sr_CS.ISO8859-5 +sr_YU.iso88595@cyrillic: sr_CS.ISO8859-5 +sr_YU.ISO8859-5@cyrillic: sr_CS.ISO8859-5 +sr_YU.cp1251@cyrillic: sr_CS.CP1251 +sr_YU.CP1251@cyrillic: sr_CS.CP1251 +sr_YU.microsoftcp1251@cyrillic: sr_CS.CP1251 +sr_YU.microsoft-cp1251@cyrillic: sr_CS.CP1251 +sr_YU.MICROSOFT-CP1251@cyrillic: sr_CS.CP1251 +sr_YU.UTF-8@cyrillic: sr_CS.UTF-8 +sr_CS: sr_CS.ISO8859-5 +sr_CS.iso88592: sr_CS.ISO8859-2 +sr_CS.ISO-8859-2: sr_CS.ISO8859-2 +sr_CS.iso88595: sr_CS.ISO8859-5 +sr_CS.ISO-8859-5: sr_CS.ISO8859-5 +sr@Latn: sr_CS.ISO8859-2 +sr_CS@Latn: sr_CS.ISO8859-2 +sr_CS.iso88592@Latn: sr_CS.ISO8859-2 +sr_CS.ISO-8859-2@Latn: sr_CS.ISO8859-2 +sr_CS.ISO8859-2@Latn: sr_CS.ISO8859-2 +sr_CS.utf8: sr_CS.UTF-8 +sr_CS.UTF-8@Latn: sr_CS.UTF-8 ss: ss_ZA.ISO8859-1 ss_ZA: ss_ZA.ISO8859-1 ss_ZA.iso88591: ss_ZA.ISO8859-1 @@ -806,7 +827,7 @@ romanian: ro_RO.ISO8859-2 rumanian: ro_RO.ISO8859-2 russian: ru_RU.ISO8859-5 -serbocroatian: sh_YU.ISO8859-2 +serbocroatian: sr_CS.ISO8859-2 slovak: sk_SK.ISO8859-2 slovene: sl_SI.ISO8859-2 slovenian: sl_SI.ISO8859-2 @@ -913,7 +934,7 @@ Slovak_Slovakia.1250: sk_SK.iso8859-2 Slovene_Slovenia.1250: sl_SI.iso8859-2 Albanian_Albania.1250: sq_AL.iso8859-2 -Serbian (Latin)_Serbia.1250: sr_YU.iso8859-2 +Serbian (Latin)_Serbia.1250: sr_CS.iso8859-2 Swedish_Finland.1252: sv_FI.iso8859-1 Swedish_Sweden.1252: sv_SE.iso8859-1 Turkish_Turkey.1254: tr_TR.iso8859-9 Index: xc/nls/locale.dir diff -u xc/nls/locale.dir:1.49 xc/nls/locale.dir:1.50 --- xc/nls/locale.dir:1.49 Fri Feb 25 13:25:35 2005 +++ xc/nls/locale.dir Mon Jan 30 20:56:08 2006 @@ -3,7 +3,7 @@ XCOMM The first word is the locale database file name and XCOMM the second word is the full locale name. XCOMM -XCOMM $XFree86: xc/nls/locale.dir,v 1.49 2005/02/25 18:25:35 dawes Exp $ +XCOMM $XFree86: xc/nls/locale.dir,v 1.50 2006/01/31 01:56:08 dawes Exp $ XCOMM C/XLC_LOCALE: C @@ -194,6 +194,8 @@ iso8859-2/XLC_LOCALE: sl_SI.ISO8859-2 iso8859-5/XLC_LOCALE: sp_YU.ISO8859-5 iso8859-2/XLC_LOCALE: sq_AL.ISO8859-2 +iso8859-2/XLC_LOCALE: sr_CS.ISO8859-2 +iso8859-5/XLC_LOCALE: sr_CS.ISO8859-5 iso8859-2/XLC_LOCALE: sr_SP.ISO8859-2 iso8859-2/XLC_LOCALE: sr_YU.ISO8859-2 iso8859-5/XLC_LOCALE: sr_YU.ISO8859-5 @@ -365,6 +367,7 @@ en_US.UTF-8/XLC_LOCALE: sk_SK.UTF-8 en_US.UTF-8/XLC_LOCALE: sl_SI.UTF-8 en_US.UTF-8/XLC_LOCALE: sq_AL.UTF-8 +en_US.UTF-8/XLC_LOCALE: sr_CS.UTF-8 en_US.UTF-8/XLC_LOCALE: sr_YU.UTF-8 en_US.UTF-8/XLC_LOCALE: ss_ZA.UTF-8 en_US.UTF-8/XLC_LOCALE: st_ZA.UTF-8 Index: xc/nls/Compose/el_GR.UTF-8 diff -u xc/nls/Compose/el_GR.UTF-8:1.2 xc/nls/Compose/el_GR.UTF-8:1.3 --- xc/nls/Compose/el_GR.UTF-8:1.2 Sun Jun 30 22:25:54 2002 +++ xc/nls/Compose/el_GR.UTF-8 Tue Jan 24 23:45:59 2006 @@ -1,5 +1,5 @@ XCOMM -XCOMM $XFree86: xc/nls/Compose/el_GR.UTF-8,v 1.2 2002/07/01 02:25:54 tsi Exp $ +XCOMM $XFree86: xc/nls/Compose/el_GR.UTF-8,v 1.3 2006/01/25 04:45:59 dawes Exp $ XCOMM XCOMM UTF-8 compose sequence definitions for the greek keyboard layout. XCOMM @@ -1572,4 +1572,12 @@ : "â‚Ż" U20af : "â‚Ż" U20af +XCOMM Khmer digraphs + + : "ាំ" + : "ោះ" + : "áźáź‡" + : "ុំ" + : "ុះ" + XCOMM End Index: xc/nls/Compose/en_US.UTF-8 diff -u xc/nls/Compose/en_US.UTF-8:1.13 xc/nls/Compose/en_US.UTF-8:1.14 --- xc/nls/Compose/en_US.UTF-8:1.13 Sat May 8 02:10:16 2004 +++ xc/nls/Compose/en_US.UTF-8 Tue Jan 24 23:45:59 2006 @@ -1,7 +1,7 @@ XCOMM UTF-8 (Unicode) compose sequence XCOMM David.Monniaux@ens.fr XCOMM -XCOMM $XFree86: xc/nls/Compose/en_US.UTF-8,v 1.13 2004/05/08 06:10:16 pascal Exp $ +XCOMM $XFree86: xc/nls/Compose/en_US.UTF-8,v 1.14 2006/01/25 04:45:59 dawes Exp $ XCOMM Part 1 - Manual definitions @@ -5596,3 +5596,13 @@ : "톿" U1D1BF # MUSICAL SYMBOL FUSA WHITE : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK : "퇀" U1D1C0 # MUSICAL SYMBOL FUSA BLACK + +XCOMM Khmer digraphs + + : "ាំ" + : "ោះ" + : "áźáź‡" + : "ុំ" + : "ុះ" + +XCOMM End Index: xc/nls/Compose/iso8859-1 diff -u xc/nls/Compose/iso8859-1:1.9 xc/nls/Compose/iso8859-1:1.10 --- xc/nls/Compose/iso8859-1:1.9 Wed Oct 9 21:22:28 2002 +++ xc/nls/Compose/iso8859-1 Mon Jan 9 09:59:38 2006 @@ -1,9 +1,6 @@ -XCOMM $Xorg: iso8859-1,v 1.3 2000/08/17 19:46:59 cpqbld Exp $ -XCOMM XCOMM ISO 8859-1 (Latin1) Compose Sequence XCOMM -XCOMM -XCOMM $XFree86: xc/nls/Compose/iso8859-1,v 1.9 2002/10/10 01:22:28 dawes Exp $ +XCOMM $XFree86: xc/nls/Compose/iso8859-1,v 1.10 2006/01/09 14:59:38 dawes Exp $ XCOMM XCOMM Sequence Definition XCOMM Index: xc/nls/Compose/iso8859-15 diff -u xc/nls/Compose/iso8859-15:1.9 xc/nls/Compose/iso8859-15:1.10 --- xc/nls/Compose/iso8859-15:1.9 Mon Dec 16 23:58:42 2002 +++ xc/nls/Compose/iso8859-15 Mon Jan 9 09:59:39 2006 @@ -1,8 +1,6 @@ -XCOMM $TOG: fcd8859-15 /main/2 1998/06/17 15:53:45 kaleb $ -XCOMM XCOMM ISO 8859-15 (Latin1) Compose Sequence XCOMM -XCOMM $XFree86: xc/nls/Compose/iso8859-15,v 1.9 2002/12/17 04:58:42 dawes Exp $ +XCOMM $XFree86: xc/nls/Compose/iso8859-15,v 1.10 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM Sequence Definition XCOMM Index: xc/nls/Compose/iso8859-2 diff -u xc/nls/Compose/iso8859-2:1.7 xc/nls/Compose/iso8859-2:1.8 --- xc/nls/Compose/iso8859-2:1.7 Mon Aug 13 13:46:02 2001 +++ xc/nls/Compose/iso8859-2 Mon Jan 9 09:59:39 2006 @@ -1,8 +1,6 @@ -XCOMM $Xorg: iso8859-2,v 1.3 2000/08/17 19:46:59 cpqbld Exp $ -XCOMM XCOMM ISO 8859-2 (Latin2) Compose Sequence XCOMM -XCOMM $XFree86: xc/nls/Compose/iso8859-2,v 1.7 2001/08/13 17:46:02 dawes Exp $ +XCOMM $XFree86: xc/nls/Compose/iso8859-2,v 1.8 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM Sequence Definition XCOMM Index: xc/nls/Compose/iso8859-3 diff -u xc/nls/Compose/iso8859-3:1.2 xc/nls/Compose/iso8859-3:1.3 --- xc/nls/Compose/iso8859-3:1.2 Thu Apr 26 17:09:40 2001 +++ xc/nls/Compose/iso8859-3 Mon Jan 9 09:59:39 2006 @@ -1,10 +1,8 @@ -XCOMM $TOG: fcd8859-15 /main/2 1998/06/17 15:53:45 kaleb $ -XCOMM XCOMM ISO 8859-3 (Latin3) Compose Sequence XCOMM XCOMM Sequence Definition XCOMM -XCOMM $XFree86: xc/nls/Compose/iso8859-3,v 1.2 2001/04/26 21:09:40 dawes Exp $ +XCOMM $XFree86: xc/nls/Compose/iso8859-3,v 1.3 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM Means XCOMM Special Character Index: xc/nls/Compose/iso8859-7 diff -u xc/nls/Compose/iso8859-7:1.5 xc/nls/Compose/iso8859-7:1.6 --- xc/nls/Compose/iso8859-7:1.5 Mon Dec 24 12:15:10 2001 +++ xc/nls/Compose/iso8859-7 Mon Jan 9 09:59:39 2006 @@ -1,9 +1,7 @@ -XCOMM $TOG: iso8859-7 /main/7 1998/05/20 15:33:23 kaleb $ -XCOMM XCOMM ISO 8859-7 (Greek) Compose Sequence XCOMM XCOMM -XCOMM $XFree86: xc/nls/Compose/iso8859-7,v 1.5 2001/12/24 17:15:10 dawes Exp $ +XCOMM $XFree86: xc/nls/Compose/iso8859-7,v 1.6 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM Sequence Definition XCOMM Index: xc/nls/Compose/iso8859-9 diff -u xc/nls/Compose/iso8859-9:1.2 xc/nls/Compose/iso8859-9:1.3 --- xc/nls/Compose/iso8859-9:1.2 Thu Apr 26 17:09:40 2001 +++ xc/nls/Compose/iso8859-9 Mon Jan 9 09:59:39 2006 @@ -1,10 +1,8 @@ -XCOMM $TOG: fcd8859-15 /main/2 1998/06/17 15:53:45 kaleb $ -XCOMM XCOMM ISO 8859-9 (Latin5) Compose Sequence XCOMM XCOMM Sequence Definition XCOMM -XCOMM $XFree86: xc/nls/Compose/iso8859-9,v 1.2 2001/04/26 21:09:40 dawes Exp $ +XCOMM $XFree86: xc/nls/Compose/iso8859-9,v 1.3 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM Means XCOMM Special Character Index: xc/nls/Compose/vi_VN.tcvn diff -u xc/nls/Compose/vi_VN.tcvn:1.3 xc/nls/Compose/vi_VN.tcvn:1.4 --- xc/nls/Compose/vi_VN.tcvn:1.3 Thu Apr 26 17:09:40 2001 +++ xc/nls/Compose/vi_VN.tcvn Mon Jan 9 09:59:39 2006 @@ -1,5 +1,4 @@ -XCOMM $XConsortium: iso8859-1 /main/6 1995/11/08 07:24:10 kaleb $ -XCOMM $XFree86: xc/nls/Compose/vi_VN.tcvn,v 1.3 2001/04/26 21:09:40 dawes Exp $ +XCOMM $XFree86: xc/nls/Compose/vi_VN.tcvn,v 1.4 2006/01/09 14:59:39 dawes Exp $ XCOMM 1998/12/18 Le Hong Boi $ XCOMM XCOMM TCVN 5712-2 Compose Sequences Index: xc/nls/Compose/vi_VN.viscii diff -u xc/nls/Compose/vi_VN.viscii:1.3 xc/nls/Compose/vi_VN.viscii:1.4 --- xc/nls/Compose/vi_VN.viscii:1.3 Thu Apr 26 17:09:40 2001 +++ xc/nls/Compose/vi_VN.viscii Mon Jan 9 09:59:39 2006 @@ -1,5 +1,4 @@ -XCOMM $XConsortium: iso8859-1 /main/6 1995/11/08 07:24:10 kaleb $ -XCOMM $XFree86: xc/nls/Compose/vi_VN.viscii,v 1.3 2001/04/26 21:09:40 dawes Exp $ +XCOMM $XFree86: xc/nls/Compose/vi_VN.viscii,v 1.4 2006/01/09 14:59:39 dawes Exp $ XCOMM 1998/12/18 Le Hong Boi $ XCOMM XCOMM TCVN 5712-2 Compose Sequences Index: xc/nls/XLC_LOCALE/C diff -u xc/nls/XLC_LOCALE/C:1.4 xc/nls/XLC_LOCALE/C:1.5 --- xc/nls/XLC_LOCALE/C:1.4 Wed Jan 17 14:37:05 2001 +++ xc/nls/XLC_LOCALE/C Mon Jan 9 09:59:39 2006 @@ -1,6 +1,5 @@ -XCOMM $Xorg: C,v 1.3 2000/08/17 19:46:59 cpqbld Exp $ XCOMM XLocale Database Sample for C. -XCOMM $XFree86: xc/nls/XLC_LOCALE/C,v 1.4 2001/01/17 19:37:05 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/C,v 1.5 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM Index: xc/nls/XLC_LOCALE/iso8859-1 diff -u xc/nls/XLC_LOCALE/iso8859-1:1.1.1.2 xc/nls/XLC_LOCALE/iso8859-1:1.2 --- xc/nls/XLC_LOCALE/iso8859-1:1.1.1.2 Tue Jan 16 17:28:45 2001 +++ xc/nls/XLC_LOCALE/iso8859-1 Mon Jan 9 09:59:39 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: iso8859-1,v 1.3 2000/08/17 19:46:59 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-1,v 1.2 2006/01/09 14:59:39 dawes Exp $ XCOMM XLocale Database Sample for iso8859-1. XCOMM Index: xc/nls/XLC_LOCALE/iso8859-10 diff -u xc/nls/XLC_LOCALE/iso8859-10:1.3 xc/nls/XLC_LOCALE/iso8859-10:1.4 --- xc/nls/XLC_LOCALE/iso8859-10:1.3 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-10 Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: iso8859-10,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-10,v 1.4 2005/03/29 04:00:30 tsi Exp $ XCOMM XLocale Database Sample for iso8859-4. XCOMM Index: xc/nls/XLC_LOCALE/iso8859-13 diff -u xc/nls/XLC_LOCALE/iso8859-13:1.2 xc/nls/XLC_LOCALE/iso8859-13:1.3 --- xc/nls/XLC_LOCALE/iso8859-13:1.2 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-13 Mon Jan 9 09:59:39 2006 @@ -1,7 +1,6 @@ -XCOMM $TOG: iso8859-13 /main/1 1998/05/20 13:49:21 kaleb $ XCOMM XLocale Database Sample for iso8859-13. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-13,v 1.2 2005/02/02 14:33:23 pascal Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-13,v 1.3 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM XLC_FONTSET category Index: xc/nls/XLC_LOCALE/iso8859-14 diff -u xc/nls/XLC_LOCALE/iso8859-14:1.2 xc/nls/XLC_LOCALE/iso8859-14:1.3 --- xc/nls/XLC_LOCALE/iso8859-14:1.2 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-14 Mon Jan 9 09:59:39 2006 @@ -1,7 +1,6 @@ -XCOMM $TOG: iso8859-14 /main/1 1998/05/20 14:49:21 kaleb $ XCOMM XLocale Database Sample for iso8859-14. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-14,v 1.2 2005/02/02 14:33:23 pascal Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-14,v 1.3 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM XLC_FONTSET category Index: xc/nls/XLC_LOCALE/iso8859-15 diff -u xc/nls/XLC_LOCALE/iso8859-15:1.6 xc/nls/XLC_LOCALE/iso8859-15:1.7 --- xc/nls/XLC_LOCALE/iso8859-15:1.6 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-15 Mon Jan 9 09:59:39 2006 @@ -1,4 +1,3 @@ -XCOMM $TOG: fcd8859-15 /main/1 1998/05/20 14:49:16 kaleb $ XCOMM XLocale Database Sample for fcd/dis/iso 8859-15. XCOMM When Final Committee Draft (FCD) 8859-15 is formalized XCOMM then this file will be renamed iso8859-15. @@ -6,7 +5,7 @@ XCOMM (a.k.a. Latin-0) character set so that Europeans who want XCOMM the Euro currency character can do so. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-15,v 1.6 2005/02/02 14:33:23 pascal Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-15,v 1.7 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM Index: xc/nls/XLC_LOCALE/iso8859-2 diff -u xc/nls/XLC_LOCALE/iso8859-2:1.2 xc/nls/XLC_LOCALE/iso8859-2:1.3 --- xc/nls/XLC_LOCALE/iso8859-2:1.2 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-2 Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: iso8859-2,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-2,v 1.3 2005/03/29 04:00:30 tsi Exp $ XCOMM XLocale Database Sample for iso8859-2. XCOMM Index: xc/nls/XLC_LOCALE/iso8859-3 diff -u xc/nls/XLC_LOCALE/iso8859-3:1.2 xc/nls/XLC_LOCALE/iso8859-3:1.3 --- xc/nls/XLC_LOCALE/iso8859-3:1.2 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-3 Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: iso8859-3,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-3,v 1.3 2005/03/29 04:00:30 tsi Exp $ XCOMM XLocale Database Sample for iso8859-3. XCOMM Index: xc/nls/XLC_LOCALE/iso8859-4 diff -u xc/nls/XLC_LOCALE/iso8859-4:1.2 xc/nls/XLC_LOCALE/iso8859-4:1.3 --- xc/nls/XLC_LOCALE/iso8859-4:1.2 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-4 Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: iso8859-4,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-4,v 1.3 2005/03/29 04:00:30 tsi Exp $ XCOMM XLocale Database Sample for iso8859-4. XCOMM Index: xc/nls/XLC_LOCALE/iso8859-5 diff -u xc/nls/XLC_LOCALE/iso8859-5:1.2 xc/nls/XLC_LOCALE/iso8859-5:1.3 --- xc/nls/XLC_LOCALE/iso8859-5:1.2 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-5 Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: iso8859-5,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-5,v 1.3 2005/03/29 04:00:30 tsi Exp $ XCOMM XLocale Database Sample for iso8859-5. XCOMM Index: xc/nls/XLC_LOCALE/iso8859-6 diff -u xc/nls/XLC_LOCALE/iso8859-6:1.2 xc/nls/XLC_LOCALE/iso8859-6:1.3 --- xc/nls/XLC_LOCALE/iso8859-6:1.2 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-6 Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: iso8859-6,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-6,v 1.3 2005/03/29 04:00:30 tsi Exp $ XCOMM XLocale Database Sample for iso8859-6. XCOMM Index: xc/nls/XLC_LOCALE/iso8859-7 diff -u xc/nls/XLC_LOCALE/iso8859-7:1.2 xc/nls/XLC_LOCALE/iso8859-7:1.3 --- xc/nls/XLC_LOCALE/iso8859-7:1.2 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-7 Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: iso8859-7,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-7,v 1.3 2005/03/29 04:00:30 tsi Exp $ XCOMM XLocale Database Sample for iso8859-7. XCOMM Index: xc/nls/XLC_LOCALE/iso8859-8 diff -u xc/nls/XLC_LOCALE/iso8859-8:1.2 xc/nls/XLC_LOCALE/iso8859-8:1.3 --- xc/nls/XLC_LOCALE/iso8859-8:1.2 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-8 Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: iso8859-8,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-8,v 1.3 2005/03/29 04:00:30 tsi Exp $ XCOMM XLocale Database Sample for iso8859-8. XCOMM Index: xc/nls/XLC_LOCALE/iso8859-9 diff -u xc/nls/XLC_LOCALE/iso8859-9:1.2 xc/nls/XLC_LOCALE/iso8859-9:1.3 --- xc/nls/XLC_LOCALE/iso8859-9:1.2 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-9 Mon Mar 28 23:00:30 2005 @@ -1,4 +1,4 @@ -XCOMM $Xorg: iso8859-9,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-9,v 1.3 2005/03/29 04:00:30 tsi Exp $ XCOMM XLocale Database Sample for iso8859-9. XCOMM Index: xc/nls/XLC_LOCALE/iso8859-9e diff -u xc/nls/XLC_LOCALE/iso8859-9e:1.4 xc/nls/XLC_LOCALE/iso8859-9e:1.5 --- xc/nls/XLC_LOCALE/iso8859-9e:1.4 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/iso8859-9e Mon Jan 9 09:59:39 2006 @@ -1,7 +1,6 @@ -XCOMM $XConsortium: iso8859-9e /main/7 1996/09/28 16:51:50 rws $ XCOMM XLocale Database Sample for iso8859-9e. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-9e,v 1.4 2005/02/02 14:33:23 pascal Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/iso8859-9e,v 1.5 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM XLC_FONTSET category Index: xc/nls/XLC_LOCALE/ja diff -u xc/nls/XLC_LOCALE/ja:1.4 xc/nls/XLC_LOCALE/ja:1.5 --- xc/nls/XLC_LOCALE/ja:1.4 Wed Jan 17 14:37:05 2001 +++ xc/nls/XLC_LOCALE/ja Mon Jan 9 09:59:39 2006 @@ -1,8 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/ja,v 1.4 2001/01/17 19:37:05 dawes Exp $ -XCOMM -XCOMM -XCOMM -XCOMM $Xorg: ja,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/ja,v 1.5 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM XLocale Database Sample for ja_JP.euc XCOMM Index: xc/nls/XLC_LOCALE/ja.JIS diff -u xc/nls/XLC_LOCALE/ja.JIS:1.4 xc/nls/XLC_LOCALE/ja.JIS:1.5 --- xc/nls/XLC_LOCALE/ja.JIS:1.4 Wed Jan 17 14:37:05 2001 +++ xc/nls/XLC_LOCALE/ja.JIS Mon Jan 9 09:59:39 2006 @@ -1,8 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/ja.JIS,v 1.4 2001/01/17 19:37:05 dawes Exp $ -XCOMM -XCOMM -XCOMM -XCOMM $Xorg: ja.JIS,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/ja.JIS,v 1.5 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM XLocale Database Sample for ja_JP.jis XCOMM Index: xc/nls/XLC_LOCALE/ja.S90 diff -u xc/nls/XLC_LOCALE/ja.S90:1.1.1.2 xc/nls/XLC_LOCALE/ja.S90:1.2 --- xc/nls/XLC_LOCALE/ja.S90:1.1.1.2 Tue Jan 16 17:29:00 2001 +++ xc/nls/XLC_LOCALE/ja.S90 Mon Jan 9 09:59:39 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: ja.S90,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/ja.S90,v 1.2 2006/01/09 14:59:39 dawes Exp $ XCOMM Copyright 1995 by FUJITSU LIMITED XCOMM This is source code modified by FUJITSU LIMITED under the Joint XCOMM Development Agreement for the CDEnext PST. Index: xc/nls/XLC_LOCALE/ja.SJIS diff -u xc/nls/XLC_LOCALE/ja.SJIS:1.4 xc/nls/XLC_LOCALE/ja.SJIS:1.5 --- xc/nls/XLC_LOCALE/ja.SJIS:1.4 Wed Jan 17 14:37:05 2001 +++ xc/nls/XLC_LOCALE/ja.SJIS Mon Jan 9 09:59:39 2006 @@ -1,8 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/ja.SJIS,v 1.4 2001/01/17 19:37:05 dawes Exp $ -XCOMM -XCOMM -XCOMM -XCOMM $Xorg: ja.SJIS,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/ja.SJIS,v 1.5 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM XLocale Database Sample for ja_JP.sjis XCOMM Index: xc/nls/XLC_LOCALE/ja.U90 diff -u xc/nls/XLC_LOCALE/ja.U90:1.1.1.2 xc/nls/XLC_LOCALE/ja.U90:1.2 --- xc/nls/XLC_LOCALE/ja.U90:1.1.1.2 Tue Jan 16 17:29:07 2001 +++ xc/nls/XLC_LOCALE/ja.U90 Mon Jan 9 09:59:39 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: ja.U90,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/ja.U90,v 1.2 2006/01/09 14:59:39 dawes Exp $ XCOMM Copyright 1995 by FUJITSU LIMITED XCOMM This is source code modified by FUJITSU LIMITED under the Joint XCOMM Development Agreement for the CDEnext PST. Index: xc/nls/XLC_LOCALE/ko diff -u xc/nls/XLC_LOCALE/ko:1.3 xc/nls/XLC_LOCALE/ko:1.4 --- xc/nls/XLC_LOCALE/ko:1.3 Thu Apr 26 14:11:13 2001 +++ xc/nls/XLC_LOCALE/ko Mon Jan 9 09:59:39 2006 @@ -1,7 +1,6 @@ -XCOMM $Xorg: ko,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ XCOMM XLocale Database Sample for ko. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/ko,v 1.3 2001/04/26 18:11:13 tsi Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/ko,v 1.4 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM XLC_FONTSET category Index: xc/nls/XLC_LOCALE/koi8-r diff -u xc/nls/XLC_LOCALE/koi8-r:3.5 xc/nls/XLC_LOCALE/koi8-r:3.6 --- xc/nls/XLC_LOCALE/koi8-r:3.5 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/koi8-r Mon Jan 9 09:59:39 2006 @@ -1,8 +1,6 @@ -XCOMM $Xorg: koi8-r,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ XCOMM XLocale Database Sample for koi8-r. XCOMM -XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-r,v 3.5 2005/02/02 14:33:23 pascal Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/koi8-r,v 3.6 2006/01/09 14:59:39 dawes Exp $ XCOMM XCOMM XLC_FONTSET category Index: xc/nls/XLC_LOCALE/microsoft-cp1251 diff -u xc/nls/XLC_LOCALE/microsoft-cp1251:1.3 xc/nls/XLC_LOCALE/microsoft-cp1251:1.4 --- xc/nls/XLC_LOCALE/microsoft-cp1251:1.3 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/microsoft-cp1251 Mon Jan 9 09:59:40 2006 @@ -1,7 +1,6 @@ -XCOMM $TOG: microsoft-cp1251 /main/1 1998/05/20 14:49:21 kaleb $ XCOMM XLocale Database Sample for microsoft-cp1251. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1251,v 1.3 2005/02/02 14:33:23 pascal Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1251,v 1.4 2006/01/09 14:59:40 dawes Exp $ XCOMM XCOMM XLC_FONTSET category Index: xc/nls/XLC_LOCALE/microsoft-cp1255 diff -u xc/nls/XLC_LOCALE/microsoft-cp1255:1.3 xc/nls/XLC_LOCALE/microsoft-cp1255:1.4 --- xc/nls/XLC_LOCALE/microsoft-cp1255:1.3 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/microsoft-cp1255 Mon Jan 9 09:59:40 2006 @@ -1,7 +1,6 @@ -XCOMM $TOG: microsoft-cp1255 /main/1 1998/05/20 14:49:21 kaleb $ XCOMM XLocale Database Sample for microsoft-cp1255. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1255,v 1.3 2005/02/02 14:33:23 pascal Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1255,v 1.4 2006/01/09 14:59:40 dawes Exp $ XCOMM XCOMM XLC_FONTSET category Index: xc/nls/XLC_LOCALE/microsoft-cp1256 diff -u xc/nls/XLC_LOCALE/microsoft-cp1256:1.3 xc/nls/XLC_LOCALE/microsoft-cp1256:1.4 --- xc/nls/XLC_LOCALE/microsoft-cp1256:1.3 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/microsoft-cp1256 Mon Jan 9 09:59:40 2006 @@ -1,7 +1,6 @@ -XCOMM $TOG: microsoft-cp1256 /main/1 1998/05/20 14:49:21 kaleb $ XCOMM XLocale Database Sample for microsoft-cp1256. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1256,v 1.3 2005/02/02 14:33:23 pascal Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/microsoft-cp1256,v 1.4 2006/01/09 14:59:40 dawes Exp $ XCOMM XCOMM XLC_FONTSET category Index: xc/nls/XLC_LOCALE/tatar-cyr diff -u xc/nls/XLC_LOCALE/tatar-cyr:1.3 xc/nls/XLC_LOCALE/tatar-cyr:1.4 --- xc/nls/XLC_LOCALE/tatar-cyr:1.3 Wed Feb 2 09:33:23 2005 +++ xc/nls/XLC_LOCALE/tatar-cyr Mon Jan 9 09:59:40 2006 @@ -1,7 +1,6 @@ -XCOMM $TOG: tatar-cyr /main/1 1998/05/20 14:49:21 kaleb $ XCOMM XLocale Database Sample for tatar-cyr. XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/tatar-cyr,v 1.3 2005/02/02 14:33:23 pascal Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/tatar-cyr,v 1.4 2006/01/09 14:59:40 dawes Exp $ XCOMM XCOMM XLC_FONTSET category Index: xc/nls/XLC_LOCALE/th_TH diff -u xc/nls/XLC_LOCALE/th_TH:1.1 xc/nls/XLC_LOCALE/th_TH:1.2 --- xc/nls/XLC_LOCALE/th_TH:1.1 Thu Feb 8 19:02:55 2001 +++ xc/nls/XLC_LOCALE/th_TH Mon Jan 9 09:59:40 2006 @@ -1,7 +1,6 @@ -XCOMM $XConsortium: th_TH$ XCOMM XLocale Database Sample for th_TH XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/th_TH,v 1.1 2001/02/09 00:02:55 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/th_TH,v 1.2 2006/01/09 14:59:40 dawes Exp $ XCOMM XCOMM Modified from origial th_TH.TACTIS Index: xc/nls/XLC_LOCALE/th_TH.UTF-8 diff -u xc/nls/XLC_LOCALE/th_TH.UTF-8:1.2 xc/nls/XLC_LOCALE/th_TH.UTF-8:1.3 --- xc/nls/XLC_LOCALE/th_TH.UTF-8:1.2 Thu Jan 16 05:01:29 2003 +++ xc/nls/XLC_LOCALE/th_TH.UTF-8 Mon Jan 9 09:59:40 2006 @@ -1,7 +1,6 @@ -XCOMM $XConsortium: th_TH$ XCOMM XLocale Database Sample for th_TH XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/th_TH.UTF-8,v 1.2 2003/01/16 10:01:29 eich Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/th_TH.UTF-8,v 1.3 2006/01/09 14:59:40 dawes Exp $ XCOMM XCOMM Modified from origial th_TH.TACTIS Index: xc/nls/XLC_LOCALE/zh_CN diff -u xc/nls/XLC_LOCALE/zh_CN:1.1 xc/nls/XLC_LOCALE/zh_CN:1.2 --- xc/nls/XLC_LOCALE/zh_CN:1.1 Thu Nov 1 18:35:28 2001 +++ xc/nls/XLC_LOCALE/zh_CN Mon Jan 9 09:59:40 2006 @@ -1,7 +1,6 @@ -XCOMM $Xorg: zh,v 1.3 2000/08/17 19:47:00 cpqbld Exp $ XCOMM XLocale Database Sample for zh (eucCN). XCOMM -XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_CN,v 1.1 2001/11/01 23:35:28 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_CN,v 1.2 2006/01/09 14:59:40 dawes Exp $ XCOMM XCOMM XLC_FONTSET category Index: xc/nls/XLC_LOCALE/zh_TW diff -u xc/nls/XLC_LOCALE/zh_TW:1.3 xc/nls/XLC_LOCALE/zh_TW:1.4 --- xc/nls/XLC_LOCALE/zh_TW:1.3 Wed Jan 17 14:37:05 2001 +++ xc/nls/XLC_LOCALE/zh_TW Mon Jan 9 09:59:40 2006 @@ -1,4 +1,4 @@ -XCOMM $Xorg: zh_TW,v 1.3 2000/08/17 19:47:01 cpqbld Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_TW,v 1.4 2006/01/09 14:59:40 dawes Exp $ XCOMM XLocale Database Sample for zh_TW XCOMM XCOMM Note: In lib/X11/lcCT.c, charset names for CNS11643 coded character Index: xc/programs/Imakefile diff -u xc/programs/Imakefile:3.58 xc/programs/Imakefile:3.60 --- xc/programs/Imakefile:3.58 Sun Feb 27 23:14:32 2005 +++ xc/programs/Imakefile Sat Apr 8 14:33:00 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Imakefile,v 3.58 2005/02/28 04:14:32 dawes Exp $ +XCOMM $XFree86: xc/programs/Imakefile,v 3.60 2006/04/08 18:33:00 dawes Exp $ #if BuildServer || BuildClients #define IHaveSubdirs @@ -33,12 +33,17 @@ #if BuildLBX LBXPROXYSRCDIR = lbxproxy #endif +#if BuildDBE + DBESRCDIR = dbedizzy +#endif PROXYMGRSRCDIR = proxymngr RSTARTSRCDIR = rstart SMPROXYSRCDIR = smproxy TWMSRCDIR = twm XCONSOLESRCDIR = xconsole +#if BuildXdm XDMSRCDIR = xdm +#endif XFINDPROXYSRCDIR = xfindproxy XFWPSRCDIR = xfwp #if BuildXF86VidModeLibrary @@ -112,7 +117,7 @@ SUBDIRS = \ appres bdftopcf fonttosfnt bitmap \ $(SCREENSAVESRCDIR) editres $(FCDIRS) $(FCLANGDIR) fslsfonts fstobdf \ - iceauth ico listres luit \ + $(DBESRCDIR) iceauth ico listres luit \ $(MAKEPSRESDIR) $(DPSCLIENTDIRS) \ $(MKCFMSRCDIR) \ mkfontdir $(MKFONTSCALEDIR) oclock $(PROXYMGRSRCDIR) \ Index: xc/programs/Xserver/Imakefile diff -u xc/programs/Xserver/Imakefile:3.310 xc/programs/Xserver/Imakefile:3.324 --- xc/programs/Xserver/Imakefile:3.310 Wed Feb 9 16:46:51 2005 +++ xc/programs/Xserver/Imakefile Wed Mar 1 22:00:34 2006 @@ -1,10 +1,10 @@ /* * Server Master Makefile */ -XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.310 2005/02/09 21:46:51 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.324 2006/03/02 03:00:34 dawes Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -59,293 +59,211 @@ #ifdef XFree86Version /* Do not strip server binaries */ -INSTPGMFLAGS = + INSTPGMFLAGS = #endif -#define PreFbLibs $(DIX) $(OS) $(XPDDX) -#define TinyPreFbLibs $(TINY_DIX) $(TINY_OS) $(XPDDX) -#define PreFbLibsNoFont $(DIX) $(OS) -#define BarePostFbLibs $(MFB) $(MI) -#define PostFbLibs BarePostFbLibs $(EXTENSIONS) -#define NoMfbBarePostFbLibs $(MI) -#define NoMfbPostFbLibs NoMfbBarePostFbLibs $(EXTENSIONS) - -#define MFBBareLibs PreFbLibs BarePostFbLibs -#define NoMFBBareLibs PreFbLibs NoMfbBarePostFbLibs -#define MFBLibs PreFbLibs PostFbLibs -#define NoMFBLibs PreFbLibs NoMfbPostFbLibs -#define CFBLibs PreFbLibs $(CFB) PostFbLibs -#define CFB4Libs PreFbLibs $(CFB4) PostFbLibs + DIXDIR = dix + OSDIR = os + HWDIR = hw + + FBDIR = fb + MFBDIR = mfb + CFB8DIR = cfb + CFB16DIR = cfb16 + CFB24DIR = cfb24 + CFB32DIR = cfb32 + AFBDIR = afb + LAYERDIR = miext/layer + ROOTLESSDIR = miext/rootless + SHADOWDIR = miext/shadow + + MISCDIR = Xext + + OS = os/LibraryTargetName(os) + MI = mi/LibraryTargetName(mi) + DIX = dix/LibraryTargetName(dix) +#if DoLoadableServer + MFB = mfb/ModuleLibraryTargetName(mfb) + FB = fb/ModuleLibraryTargetName(fb) + CFB8 = cfb/ModuleLibraryTargetName(cfb) + CFB16 = cfb16/ModuleLibraryTargetName(cfb16) + CFB24 = cfb24/ModuleLibraryTargetName(cfb24) + CFB32 = cfb32/ModuleLibraryTargetName(cfb32) + SHADOW = miext/shadow/ModuleLibraryTargetName(shadow) + LAYER = miext/layer/ModuleLibraryTargetName(layer) +#else + MFB = mfb/LibraryTargetName(mfb) + FB = fb/LibraryTargetName(fb) + CFB8 = cfb/LibraryTargetName(cfb) + CFB16 = cfb16/LibraryTargetName(cfb16) + CFB24 = cfb24/LibraryTargetName(cfb24) + CFB32 = cfb32/LibraryTargetName(cfb32) + SHADOW = miext/shadow/LibraryTargetName(shadow) + LAYER = miext/layer/LibraryTargetName(layer) +#endif #if BuildLowMem -#define LMFCFBLibs PreFbLibs $(LMFCFB) NoMfbBarePostFbLibs $(EXTENSIONS) + LMFCFB = lmfcfb/LibraryTargetName(cfb) #endif -#define CFB8Libs PreFbLibs $(CFB8) PostFbLibs -#define CFB16Libs PreFbLibs $(CFB16) PostFbLibs -#define CFB24Libs PreFbLibs $(CFB24) PostFbLibs -#define CFB32Libs PreFbLibs $(CFB32) PostFbLibs - -#define NoMFBCFBLibs PreFbLibs $(CFB) NoMfbPostFbLibs -#define NoMFBCFB8Libs PreFbLibs $(CFB8) NoMfbPostFbLibs -#define FbPostFbLibs $(FB) NoMfbPostFbLibs -#define TinyFbPostFbLibs $(FB) $(MI) $(TINY_EXTENSIONS) -#define FBLibs PreFbLibs FbPostFbLibs - -#define MiExtLibs $(SHADOW) - -#define BareAllFBLibs PreFbLibs $(FB) $(CFB) BarePostFbLibs #if BuildGlxExt #if BuildXF86DRI - DRILIB = GL/dri/ModuleLibraryTargetName(dri) + DRILIB = GL/dri/ModuleLibraryTargetName(dri) #else - DRILIB = + DRILIB = #endif #if GlxUseSGISI - GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/sgi-si/ModuleLibraryTargetName(GLcore) \ - $(DRILIB) + GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ + GL/sgi-si/ModuleLibraryTargetName(GLcore) \ + $(DRILIB) #else #if DoLoadableServer - GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) + GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ + GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) #else - GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) \ - $(DRILIB) + GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ + GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) \ + $(DRILIB) #endif #endif - GLXDIR = GL - GLXEXT = $(GLXLIB) + GLXDIR = GL + GLXEXT = $(GLXLIB) #endif #if BuildXInputExt - XINPUTEXT = Xi/LibraryTargetName(xinput) - XIDIR = Xi + XINPUTEXT = Xi/LibraryTargetName(xinput) + XIDIR = Xi #endif + #if BuildXKB - XKBEXT = xkb/LibraryTargetName(xkb) - XKBDIR = xkb + XKBEXT = xkb/LibraryTargetName(xkb) + XKBDIR = xkb #ifdef XFree86Version - XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o + XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o #endif #endif + #if BuildLBX - LBXEXT = lbx/LibraryTargetName(lbx) \ - $(TOP)/lib/lbxutil/LibraryTargetName(lbxutil) - LBXDIRS = lbx + LBXEXT = lbx/LibraryTargetName(lbx) \ + $(TOP)/lib/lbxutil/LibraryTargetName(lbxutil) + LBXDIRS = lbx #endif + #if BuildDBE - DBEEXT = dbe/LibraryTargetName(dbe) + DBEEXT = dbe/LibraryTargetName(dbe) #endif #if BuildDBE || BuildDBElib - DBEDIR = dbe + DBEDIR = dbe #endif + #if BuildRECORD - RECORDEXT = record/LibraryTargetName(record) + RECORDEXT = record/LibraryTargetName(record) #endif #if BuildRECORD || BuildRECORDlib - RECORDDIR = record + RECORDDIR = record #endif + #if BuildXTrap - XTRAPEXT = XTrap/LibraryTargetName(xtrap) - XTRAPDIR = XTrap + XTRAPEXT = XTrap/LibraryTargetName(xtrap) + XTRAPDIR = XTrap #endif + #ifdef SiteExtensionLibs - SITEEXTS = SiteExtensionLibs + SITEEXTS = SiteExtensionLibs #endif #ifdef SiteExtensionDirs - SITEEXTDIRS = SiteExtensionDirs + SITEEXTDIRS = SiteExtensionDirs #endif + #if DoLoadableServer && HasDlopen - LIBDL = DlLibrary + LIBDL = DlLibrary #endif - LIBREGEX = RegexLibrary + LIBREGEX = RegexLibrary #if BuildXprint + XPDDXDIR = Xprint + #if XpRasterDDX -XPRASTLIB = Xprint/raster/LibraryTargetName(raster) + XPRASTLIB = $(XPDDXDIR)/raster/LibraryTargetName(raster) #endif #if XpColorPclDDX -XPPCLLIB = Xprint/pcl/LibraryTargetName(pcl) + XPPCLLIB = $(XPDDXDIR)/pcl/LibraryTargetName(pcl) #endif #if XpMonoPclDDX -XPMPCLLIB = Xprint/pcl-mono/LibraryTargetName(pcl) + XPMPCLLIB = $(XPDDXDIR)/pcl-mono/LibraryTargetName(pcl) #endif #if XpPostScriptDDX -XPPSLIB = Xprint/ps/LibraryTargetName(ps) + XPPSLIB = $(XPDDXDIR)/ps/LibraryTargetName(ps) #endif -XPDDXLIBS = Xprint/LibraryTargetName(printer) \ - $(XPRASTLIB) $(XPPCLLIB) $(XPMPCLLIB) $(XPPSLIB) -XPDDXFBLIBS = $(CFB32) $(MFB) + XPDDXLIBS = $(XPDDXDIR)/LibraryTargetName(printer) \ + $(XPRASTLIB) $(XPPCLLIB) $(XPMPCLLIB) $(XPPSLIB) + XPDDXFBLIBS = $(CFB32) $(CFB8) $(MFB) $(MI) #if !PrintOnlyServer - XPDDX = $(XPDDXLIBS) - XPFBLIBS = $(XPDDXFBLIBS) + XPDDX = $(XPDDXLIBS) + XPFBLIBS = $(XPDDXFBLIBS) + XPFBDIRS = $(CFB32DIR) $(CFBDIR) $(MFBDIR) #endif - XPDDXDIR = Xprint #endif #if !BuildXprint || PrintOnlyServer -XPFBLIBS = dix/LibraryTargetName(xpstubs) + XPFBLIBS = $(FONTLIBSRC)/stubs/LibraryTargetName(fntstubs) #endif #if BuildRender - RENDERDIR = render - RENDERLIB = $(RENDERDIR)/LibraryTargetName(render) -#if BuildSeparateTinyDIX - TINY_RENDERLIB = $(RENDERDIR)/tiny/LibraryTargetName(render) -#else - TINY_RENDERLIB = $(RENDERLIB) -#endif + RENDERLIB = render/LibraryTargetName(render) + RENDERDIR = render #endif #if BuildRandR - RANDRDIR = randr - RANDRLIB = $(RANDRDIR)/LibraryTargetName(randr) -#if BuildSeparateTinyDIX - TINY_RANDRLIB = $(RANDRDIR)/tiny/LibraryTargetName(randr) -#else - TINY_RANDRLIB = $(RANDRLIB) + RANDRLIB = randr/LibraryTargetName(randr) + RANDRDIR = randr #endif -#endif - BASEEXTS = Xext/LibraryTargetName(exts) - STATICEXTS = $(XKBEXT) $(XINPUTEXT) $(LBXEXT) $(SITEEXTS) $(RANDRLIB) \ - $(RENDERLIB) - MISCEXT = Xext/LibraryTargetName(ext) - LOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT) $(XTRAPEXT) - EXTENSIONS = $(LOADABLEEXTS) $(STATICEXTS) - -#if BuildSeparateTinyDIX -TINY_STATICEXTS = $(XKBEXT) $(XINPUTEXT) $(LBXEXT) $(SITEEXTS) \ - $(TINY_RANDRLIB) $(TINY_RENDERLIB) - TINY_MISCEXT = Xext/tiny/LibraryTargetName(ext) -#else -TINY_STATICEXTS = $(STATICEXTS) - TINY_MISCEXT = $(MISCEXT) -#endif -TINY_LOADABLEEXTS = $(TINY_MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT) $(XTRAPEXT) -TINY_EXTENSIONS = $(TINY_STATICEXTS) $(TINY_LOADABLEEXTS) - XPLOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(XTRAPEXT) - XPEXTENSIONS = $(XPLOADABLEEXTS) $(STATICEXTS) + STATICEXTS = $(XKBEXT) $(XINPUTEXT) $(LBXEXT) $(SITEEXTS) $(RANDRLIB) \ + $(RENDERLIB) + MISCEXT = Xext/LibraryTargetName(ext) + LOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT) $(XTRAPEXT) + EXTENSIONS = $(LOADABLEEXTS) $(STATICEXTS) + + EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) $(LBXDIRS) $(DBEDIR) \ + $(RECORDDIR) $(RANDRDIR) $(RENDERDIR) $(XTRAPDIR) \ + $(SITEEXTDIRS) + STDDIRS = include mi $(XPDDXDIR) $(XPFBDIRS) -#if DoLoadableServer - XF86EXTENSIONS = $(BASEEXTS) $(STATICEXTS) -#else - XF86EXTENSIONS = $(STATICEXTS) $(LOADABLEEXTS) -#endif - - DMXSTATICEXTS = $(XKBEXT) $(XINPUTEXT) $(LBXEXT) $(SITEEXTS) $(RENDERLIB) -DMXLOADABLEEXTS = $(MISCEXT) $(RECORDEXT) $(XTRAPEXT) - DMXEXTENSIONS = $(DMXLOADABLEEXTS) $(DMXSTATICEXTS) - - EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) \ - $(LBXDIRS) $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \ - $(RANDRDIR) $(RENDERDIR) $(XTRAPDIR) #if BuildLBX || GzipFontCompression - ZLIB = GzipLibrary -#endif - OS = os/LibraryTargetName(os) -#if BuildSeparateTinyDIX - TINY_OS = os/tiny/LibraryTargetName(os) -#else - TINY_OS = $(OS) -#endif - BSDEMUL = $(DEPXBSDLIB) -#if DoLoadableServer - MFB = mfb/ModuleLibraryTargetName(mfb) - FB = fb/ModuleLibraryTargetName(fb) - CFB = cfb16/ModuleLibraryTargetName(cfb16) \ - cfb24/ModuleLibraryTargetName(cfb24) \ - cfb32/ModuleLibraryTargetName(cfb32) \ - cfb/ModuleLibraryTargetName(cfb) - CFB8 = cfb/ModuleLibraryTargetName(cfb) - CFB4 = cfb4/ModuleLibraryTargetName(cfb4) \ - cfb/ModuleLibraryTargetName(cfb) - CFB16 = cfb16/ModuleLibraryTargetName(cfb16) \ - cfb/ModuleLibraryTargetName(cfb) - CFB24 = cfb24/ModuleLibraryTargetName(cfb24) \ - cfb/ModuleLibraryTargetName(cfb) - CFB32 = cfb32/ModuleLibraryTargetName(cfb32) \ - cfb/ModuleLibraryTargetName(cfb) - SHADOW = miext/shadow/ModuleLibraryTargetName(shadow) - LAYER = miext/layer/ModuleLibraryTargetName(layer) -#else - MFB = mfb/LibraryTargetName(mfb) - FB = fb/LibraryTargetName(fb) - CFB = cfb16/LibraryTargetName(cfb16) \ - cfb24/LibraryTargetName(cfb24) \ - cfb32/LibraryTargetName(cfb32) \ - cfb/LibraryTargetName(cfb) - CFB8 = cfb/LibraryTargetName(cfb) - CFB4 = cfb4/LibraryTargetName(cfb4) \ - cfb/LibraryTargetName(cfb) - CFB16 = cfb16/LibraryTargetName(cfb16) \ - cfb/LibraryTargetName(cfb) - CFB24 = cfb24/LibraryTargetName(cfb24) \ - cfb/LibraryTargetName(cfb) - CFB32 = cfb32/LibraryTargetName(cfb32) \ - cfb/LibraryTargetName(cfb) - SHADOW = miext/shadow/LibraryTargetName(shadow) - LAYER = miext/layer/LibraryTargetName(layer) -#endif -#if BuildLowMem - LMFCFB = lmfcfb/LibraryTargetName(cfb) -#endif - MI = mi/LibraryTargetName(mi) - MIINITEXTOBJ = mi/miinitext.o - DIX = dix/LibraryTargetName(dix) -#if BuildSeparateTinyDIX - TINY_DIX = dix/tiny/LibraryTargetName(dix) -#else - TINY_DIX = $(DIX) + ZLIB = GzipLibrary #endif + #if DoLoadableServer - FONTBASE = $(FONTLIBSRC)/fontbase.o \ - $(FONTLIBSRC)/LibraryTargetName(fontbase) + FONTBASE = $(FONTLIBSRC)/fontbase.o \ + $(FONTLIBSRC)/LibraryTargetName(fontbase) #endif #if XserverStaticFontLib - FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(FREETYPE2LIB) - TINY_FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) + FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(FREETYPE2LIB) #else - FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB) - TINY_FONT = $(LDPRELIB) $(XFONTLIB) + FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB) #endif - FONTLIBS = $(FONT) $(XPFBLIBS) - TINY_FONTLIBS = $(TINY_FONT) $(XPFBLIBS) -#if UsbMouseSupport + + FONTLIBS = $(FONT) $(XPFBLIBS) + +#if UsbMouseSupport #if !HasLibUsb - USB = $(XF86OSSRC)/bsd/libusb/LibraryTargetName(usb) + USB = $(XF86OSSRC)/bsd/libusb/LibraryTargetName(usb) #else - USB = UsbHidLib + USB = UsbHidLib #endif #endif #ifdef ServerExtraSysLibs - EXTRASYSLIBS = ServerExtraSysLibs + EXTRASYSLIBS = ServerExtraSysLibs #endif #if HasPam && HasPamMisc - PAMLIBS = PamLibraries PamMiscLibraries -#endif -#if !(SystemV4 || defined(SGIArchitecture) || UseRgbTxt) - DBMLIBS = DBMLibrary + PAMLIBS = PamLibraries PamMiscLibraries #endif - SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries $(DBMLIBS) $(USB) \ - $(PAMLIBS) $(XAUTHLIB) $(XDMCPLIB) $(EXTRASYSLIBS) - NOAUTH_SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries $(DBMLIBS) $(USB) \ - $(PAMLIBS) $(XDMCPLIB) $(EXTRASYSLIBS) + SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries $(USB) \ + $(PAMLIBS) $(XAUTHLIB) $(XDMCPLIB) $(EXTRASYSLIBS) + NOAUTH_SYSLIBS = $(ZLIB) MathLibrary Krb5Libraries $(USB) \ + $(PAMLIBS) $(XDMCPLIB) $(EXTRASYSLIBS) #if !HasCbrt - CBRT = mi/LibraryTargetName(cbrt) + CBRT = mi/LibraryTargetName(cbrt) #endif - STDDIRS = include dix os mi $(XPDDXDIR) $(EXTDIRS) - FBDIR = fb - MFBDIR = mfb - CFB4DIR = cfb4 - CFB8DIR = cfb - CFB16DIR = cfb16 - CFB24DIR = cfb24 - CFB32DIR = cfb32 - AFBDIR = afb - LAYERDIR = miext/layer - ROOTLESSDIR = miext/rootless - SHADOWDIR = miext/shadow XCOMM XCOMM This turns off the default rule for compiling .c files because @@ -356,104 +274,263 @@ .s.o: +#if HasParallelMake +XCOMM +XCOMM force non-parallel build of XF86 servers to prevent MUTEX overrides +XCOMM +#if defined(XF86Server) && XF86Server + XF86SERVER = XFree86 +#endif +#if defined(XnestServer) && XnestServer + XNESTSERVER = Xnest +#endif +#if defined(XVirtualFramebufferServer) && XVirtualFramebufferServer + XVFBSERVER = Xvfb +#endif +#if defined(XdmxServer) && XdmxServer + XDMXSERVER = Xdmx +#endif +#if defined(XWinServer) && XWinServer && !MakeDllModules + XWINSERVER = XWin +#endif +#if (defined(XF86Server) && XF86Server) || \ + (defined(XnestServer) && XnestServer) || \ + (defined(XVirtualFramebufferServer) && XVirtualFramebufferServer) || \ + (defined(XdmxServer) && XdmxServer) || \ + (!MakeDllModules && defined(XWinServer) && XWinServer) +MakeMutex($(XF86SERVER) $(XNESTSERVER) $(XVFBSERVER) $(XDMXSERVER) $(XWINSERVER)) +#endif +MakeMutex($(STDDIRS) $(DIXDIR) $(OSDIR) $(HWDIR) $(EXTDIRS) \ + $(MFBDIR) $(FBDIR) $(AFBDIR) \ + $(CFBDIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR)) +#endif + + /* Build rule blocks, add one for each server - * + * * If a server needs mfb, its build block should have a line like: - * MFBSUBDIR = mfb + * MFBSUBDIR = mfb * Similarly, its build block should have: - * CFB4SUBDIR = cfb4 (if the server needs 4 bit cfb) - * CFB8SUBDIR = cfb (8 bit cfb) - * CFB16SUBDIR = cfb16 (16 bit cfb) - * CFB24SUBDIR = cfb24 (24 bit cfb) - * CFB32SUBDIR = cfb32 (32 bit cfb) - * + * CFB8SUBDIR = cfb (8 bit cfb) + * CFB16SUBDIR = cfb16 (16 bit cfb) + * CFB24SUBDIR = cfb24 (24 bit cfb) + * CFB32SUBDIR = cfb32 (32 bit cfb) + * * If a server does not need all of the above components, simply * omit the relevant lines from the build block. - * + * * If these guidelines are followed, a make at the top of the server * tree should result in each subdirectory being built only once, * even if multiple servers that share subdirectories are being built. */ -#if BuildLowMem -LMFCFBDIR = lmfcfb -#endif - -#if defined(XdecServer) && XdecServer +#if defined(XF86Server) && XF86Server XCOMM -XCOMM Digital MIPS based WS server (ultrix 4.2 and beyond) +XCOMM XFree86 Server XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -DECWSDDXDIR = hw/dec/ws -#if BuildLowMem -DECDIRS = $(STDDIRS) $(LMFCFBDIR) $(DECWSDDXDIR) $(DEPDIRS) + + DIXSUBDIR = dix + HWSUBDIR = hw + OSSUBDIR = os + FBSUBDIR = fb + MFBSUBDIR = mfb + CFB8SUBDIR = cfb + CFB16SUBDIR = cfb16 +#if DoLoadableServer || defined(SparcArchitecture) + CFB24SUBDIR = cfb24 +#endif + CFB32SUBDIR = cfb32 +#ifdef OS2Architecture + SERVERDEFFILE = XFree86.def +#endif +#if XF86AFB + AFBSUBDIR = afb +#endif + XFREE86DDXDIR = hw/xfree86 + XF86SERVERSUBDIRS = $(STDDIRS) $(DIXSUBDIR) $(OSSUBDIR) $(HWSUBDIR) \ + $(EXTDIRS) $(MFBDIR) $(FBSUBDIR) $(AFBSUBDIR) \ + $(CFB8SUBDIR) $(CFB16SUBDIR) $(CFB24SUBDIR) \ + $(CFB32SUBDIR) $(SHADOWDIR) $(LAYERDIR) $(DEPDIRS) + XF86INIT = $(XF86COMSRC)/xf86Init.o $(XF86COMSRC)/xf86IniExt.o + XF86COMLIB = $(XF86COMSRC)/LibraryTargetName(xf86) + XF86PARSLIB = $(XF86PARSERSRC)/LibraryTargetName(xf86config) + XF86OSLIB = $(XF86OSSRC)/LibraryTargetName(xf86_os) +#if UseMemLeak + MEMDEBUGLIB = $(TOP)/util/memleak/LibraryTargetName(memleak) +#elif UseStackTrace + STACKTRACELIB = $(TOP)/util/memleak/LibraryTargetName(stacktrace) +#endif +#if DoLoadableServer + BASEEXTS = Xext/LibraryTargetName(exts) + XF86EXTENSIONS = $(BASEEXTS) $(STATICEXTS) + XF86LIBS = $(MEMDEBUGLIB) $(XF86INIT) $(XF86COMLIB) $(XF86PARSLIB) \ + $(XF86OSLIB) $(STACKTRACELIB) + XF86LOADERLIB = $(XF86SRC)/loader/LibraryTargetName(loader) + XF86MAINLIBS = $(DIX) $(OS) $(FONTBASE) $(XF86COMLIB) $(XPDDX) $(MI) \ + $(XF86EXTENSIONS) + XF86SERVERSYSLIBS = $(XPFBLIBS) $(SYSLIBS) $(LIBDL) $(LIBREGEX) + XF86SERVERLIBS = $(XF86LIBS) $(XF86LOADERLIB) $(XF86MAINLIBS) $(XF86OSLIB) #else -DECDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DECWSDDXDIR) $(DEPDIRS) + XF86EXTENSIONS = $(STATICEXTS) $(LOADABLEEXTS) +#if XF86XAA + XF86XAALIB = $(XF86SRC)/xaa/LibraryTargetName(xaa) #endif -DECOBJS = hw/dec/ws/init.o hw/dec/ws/sdepthinit.o -#if BuildLowMem -DECLIBS = hw/dec/ws/LibraryTargetName(dec) LMFCFBLibs +#if XF86VgaHw + XF86VGAHWLIB = $(XF86SRC)/vgahw/LibraryTargetName(vgahw) +#endif +#if XF86FBDevHw + XF86FBDEVHWLIB = $(XF86SRC)/fbdevhw/LibraryTargetName(fbdevhw) +#endif +#if XF1Bpp || XF4Bpp + XF1BPPLIB = $(XF86SRC)/xf1bpp/LibraryTargetName(xf1bpp) +#endif +#if XF4Bpp + XF4BPPLIB = $(XF86SRC)/xf4bpp/LibraryTargetName(xf4bpp) +#endif +#if XF8_32Wid && defined(SparcArchitecture) + XF8_32WIDLIB = $(XF86SRC)/xf8_32wid/LibraryTargetName(xf8_32wid) \ + $(CFB24) +#endif +#if XF8_32Bpp + XF8_32BPPLIB = $(XF86SRC)/xf8_32bpp/LibraryTargetName(xf8_32bpp) +#endif +#if XF8_16Bpp + XF8_16BPPLIB = $(XF86SRC)/xf8_16bpp/LibraryTargetName(xf8_16bpp) +#endif +#if XF24_32Bpp && 0 /* No longer used */ + XF24_32BPPLIB = $(XF86SRC)/xf24_32bpp/LibraryTargetName(xf24_32bpp) +#endif +#if XFShadowFB + XFSHADOWFBLIB = $(XF86SRC)/shadowfb/LibraryTargetName(shadowfb) +#endif +#if XF86AFB + AFBLIB = afb/LibraryTargetName(afb) +#endif +#if XF86Ramdac + XF86RAMDACLIB = $(XF86SRC)/ramdac/LibraryTargetName(ramdac) +#endif +#if XF86I2C + XF86I2CLIB = $(XF86SRC)/i2c/LibraryTargetName(i2c) +#endif +#if XF86DDC + XF86DDCLIB = $(XF86SRC)/ddc/LibraryTargetName(ddc) +#endif +#if XF86VBE + XF86VBELIB = $(XF86SRC)/vbe/LibraryTargetName(vbe) +#endif +#if XF86RAC + XF86RACLIB = $(XF86SRC)/rac/LibraryTargetName(rac) +#endif +#if XF86INT10_BUILD > X86EMU_GENERIC + XF86INT10LIB = $(XF86OSSRC)/LibraryTargetName(int10) #else -DECLIBS = hw/dec/ws/LibraryTargetName(dec) CFB8Libs + XF86INT10LIB = $(XF86SRC)/int10/LibraryTargetName(int10) +#endif + XF86DRIVERLIB = $(XF86SRC)/drivers/LibraryTargetName(driver) + XF86IDRIVERLIB = $(XF86SRC)/input/LibraryTargetName(idriver) + XF86DRVOBJS = $(XF86SRC)/drivers/drvConf.o + XF86DRVLIBS = $(XF86DRIVERLIB) $(XF86RAMDACLIB) $(XF86DDCLIB) \ + $(XF86I2CLIB) $(XF86XAALIB) $(XF86VGAHWLIB) \ + $(XF86FBDEVHWLIB) $(XF8_32WIDLIB) $(XF8_32BPPLIB) \ + $(XF8_16BPPLIB) $(XF24_32BPPLIB) $(XF4BPPLIB) \ + $(XF1BPPLIB) $(XFSHADOWFBLIB) $(AFBLIB) + XF86IDRVOBJS = $(XF86SRC)/input/drvConf.o + XF86IDRVLIBS = $(XF86IDRIVERLIB) + XF86SCANLIB = $(XF86SRC)/scanpci/LibraryTargetName(scanpci) + XF86LIBS = $(MEMDEBUGLIB) $(XF86INIT) $(XF86COMLIB) $(XF86RACLIB) \ + $(XF86PARSLIB) $(XF86VBELIB) $(XF86OSLIB) \ + $(XF86INT10LIB) $(STACKTRACELIB) + XF86MAINLIBS = $(SHADOW) $(DIX) $(OS) $(XPDDX) $(FB) \ + $(CFB32) $(CFB16) $(CFB8) $(MFB) $(MI) \ + $(XF86EXTENSIONS) $(XF86COMLIB) + XF86SERVERSYSLIBS = $(FONTLIBS) $(SYSLIBS) $(LIBDL) $(LIBREGEX) + XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) \ + $(XF86MAINLIBS) $(XF86SCANLIB) +#endif + XF86SERVEROBJS = $(XF86XKBOBJS) $(XF86DRVOBJS) $(XF86IDRVOBJS) +#if HasParallelMake +MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS)) +#endif +#if ForceServerRemake +$(XF86SERVERLIBS) $(XF86SERVERSYSLIBS):: $(XF86SERVERSUBDIRS) + @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi +#endif +SetUIDServerTarget(XFree86, \ + $(XF86SERVERSUBDIRS), \ + $(XF86SERVEROBJS) $(SERVERDEFFILE), \ + $(XF86SERVERLIBS), \ + $(XF86SERVERSYSLIBS)) +#if DoLoadableServer +ServerDriverSDKTarget(XFree86) #endif -ServerTarget(Xdec,$(DECDIRS),$(DECOBJS), \ - $(DECLIBS),$(FONTLIBS) $(SYSLIBS)) #ifndef ServerToInstall -#define ServerToInstall Xdec +#define ServerToInstall XFree86 #endif -#endif /* XdecServer */ +#endif /* XF86Server */ -#if defined(XdecMultiDepthServer) && XdecMultiDepthServer -XCOMM -XCOMM Digital MIPS based WS server (ultrix 4.2 and beyond) -XCOMM Supports 8, 12, and 24 bit pixmaps -XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -CFB16SUBDIR = cfb16 -CFB24SUBDIR = cfb24 -CFB32SUBDIR = cfb32 -DECWSDDXDIR = hw/dec/ws -DECDIRS1 = $(STDDIRS) $(MFBDIR) \ - $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \ - $(DECWSDDXDIR) $(DEPDIRS) -DECOBJS1 = hw/dec/ws/init.o hw/dec/ws/mdepthinit.o -DECLIBS1 = hw/dec/ws/LibraryTargetName(dec) CFBLibs -ServerTarget(Xdec_md,$(DECDIRS1),$(DECOBJS1), \ - $(DECLIBS1),$(FONTLIBS) $(SYSLIBS)) -#ifndef ServerToInstall -#define ServerToInstall Xdec_md +#if BuildLowMem + LMFCFBDIR = lmfcfb #endif -#endif /* XdecMultiDepthServer */ - #if defined(XsunServer) && XsunServer XCOMM XCOMM Sun server XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -SUNDDXDIR = hw/sun -#if DoLoadableServer -SUNOBJS = hw/sun/sunInit.o hw/sun/sunInitExt.o hw/sun/stubs.o -#elif defined(XF86Server) && XF86Server -SUNOBJS = hw/sun/sunInit.o hw/sun/stubs.o -#else -SUNOBJS = hw/sun/sunInit.o -#endif + + HWSUBDIR = hw #if BuildLowMem -SUNDIRS = $(STDDIRS) $(LMFCFBDIR) $(SUNDDXDIR) $(DEPDIRS) -SUNLIBS = hw/sun/LibraryTargetName(sun) LMFCFBLibs + LMFCFBSUBDIR = lmfcfb #else -SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(SUNDDXDIR) $(DEPDIRS) -SUNLIBS = hw/sun/LibraryTargetName(sun) CFB8Libs + MFBSUBDIR = mfb + CFB8SUBDIR = cfb +#endif + SUNDDXDIR = hw/sun +#if BuildXKB + SUNXKBEXT = $(SUNDDXDIR)/$(XKBEXT) #endif -SUNSYSLIBS = $(FONTLIBS) $(WIDECHARSYSLIB) $(SYSLIBS) -SetUIDServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS), \ - $(SUNLIBS),$(SUNSYSLIBS)) -#if !defined(ServerToInstall) && (!defined(XF86Server) || !XF86Server) +#if BuildRECORD + SUNRECORDEXT = $(SUNDDXDIR)/$(RECORDEXT) +#endif +#if BuildRender + SUNRENDERLIB = $(SUNDDXDIR)/$(RENDERLIB) +#endif +#if BuildRandR + SUNRANDRLIB = $(SUNDDXDIR)/$(RANDRLIB) +#endif +#if BuildDBE + SUNDBEEXT = $(SUNDDXDIR)/$(DBEEXT) +#endif +#if BuildXTrap + SUNXTRAPEXT = $(SUNDDXDIR)/$(XTRAPEXT) +#endif + SUNSTATICEXTS = $(SUNXKBEXT) $(LBXEXT) $(SITEEXTS) $(SUNRANDRLIB) \ + $(SUNRENDERLIB) + SUNMISCEXT = $(SUNDDXDIR)/$(MISCEXT) + SUNLOADABLEEXTS = $(SUNMISCEXT) $(SUNDBEEXT) $(SUNRECORDEXT) $(GLXEXT) \ + $(SUNXTRAPEXT) + SUNEXTENSIONS = $(SUNLOADABLEEXTS) $(SUNSTATICEXTS) + SUNEXTDIRS = $(GLXDIR) $(LBXDIRS) $(SITEEXTDIRS) + SUNSYSLIBS = $(FONTLIBS) $(WIDECHARSYSLIB) $(SYSLIBS) + SUNLIB = $(SUNDDXDIR)/LibraryTargetName(sun) + SUNOBJS = $(SUNDDXDIR)/sunInit.o $(SUNDDXDIR)/sunInitExt.o +#if BuildLowMem + SUNDIRS = $(STDDIRS) $(HWSUBDIR) $(SUNEXTDIRS) $(LMFCFBSUBDIR) \ + $(DEPDIRS) + SUNLIBS = $(SUNLIB) $(SUNDDXDIR)/$(DIX) $(SUNDDXDIR)/$(OS) \ + $(XPDDX) $(LMFCFB) $(MI) $(SUNEXTENSIONS) +#else + SUNDIRS = $(STDDIRS) $(HWSUBDIR) $(SUNEXTDIRS) \ + $(CFB8SUBDIR) $(MFBSUBDIR) $(DEPDIRS) + SUNLIBS = $(SUNLIB) $(SUNDDXDIR)/$(DIX) $(SUNDDXDIR)/$(OS) \ + $(XPDDX) $(CFB8) $(MFB) $(MI) $(SUNEXTENSIONS) +#endif +SetUIDServerTarget(Xsun, \ + $(SUNDIRS), \ + $(SUNOBJS), \ + $(SUNLIBS), \ + $(SUNSYSLIBS)) +#ifndef ServerToInstall #define ServerToInstall Xsun #endif #endif /* XsunServer */ @@ -463,26 +540,52 @@ XCOMM XCOMM Sun multiple pixmap depth (8, 12, 24) server XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -CFB16SUBDIR = cfb16 -CFB24SUBDIR = cfb24 -CFB32SUBDIR = cfb32 -SUNDDXDIR = hw/sun -SUN24DIRS = $(STDDIRS) $(MFBDIR) \ - $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \ - $(SUNDDXDIR) $(DEPDIRS) -#if DoLoadableServer -SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/sunInitExt.o hw/sun/stubs.o -#elif defined(XF86Server) && XF86Server -SUN24OBJS = hw/sun/sunInitMulti.o hw/sun/stubs.o -#else -SUN24OBJS = hw/sun/sunInitMulti.o + + HWSUBDIR = hw + MFBSUBDIR = mfb + CFB8SUBDIR = cfb + CFB16SUBDIR = cfb16 + CFB32SUBDIR = cfb32 + SUNDDXDIR = hw/sun +#if BuildXKB + SUNXKBEXT = $(SUNDDXDIR)/$(XKBEXT) +#endif +#if BuildRECORD + SUNRECORDEXT = $(SUNDDXDIR)/$(RECORDEXT) +#endif +#if BuildRender + SUNRENDERLIB = $(SUNDDXDIR)/$(RENDERLIB) +#endif +#if BuildRandR + SUNRANDRLIB = $(SUNDDXDIR)/$(RANDRLIB) +#endif +#if BuildDBE + SUNDBEEXT = $(SUNDDXDIR)/$(DBEEXT) #endif -SUN24LIBS = hw/sun/LibraryTargetName(sun) CFBLibs -SetUIDServerTarget(Xsun24,$(SUN24DIRS),$(SUN24OBJS), \ - $(SUN24LIBS),$(FONTLIBS) $(SYSLIBS)) -#if !defined(ServerToInstall) && (!defined(XF86Server) || !XF86Server) +#if BuildXTrap + SUNXTRAPEXT = $(SUNDDXDIR)/$(XTRAPEXT) +#endif + SUNSTATICEXTS = $(SUNXKBEXT) $(LBXEXT) $(SITEEXTS) $(SUNRANDRLIB) \ + $(SUNRENDERLIB) + SUNMISCEXT = $(SUNDDXDIR)/$(MISCEXT) + SUNLOADABLEEXTS = $(SUNMISCEXT) $(SUNDBEEXT) $(SUNRECORDEXT) $(GLXEXT) \ + $(SUNXTRAPEXT) + SUNEXTENSIONS = $(SUNLOADABLEEXTS) $(SUNSTATICEXTS) + SUNEXTDIRS = $(GLXDIR) $(LBXDIRS) $(SITEEXTDIRS) + SUNSYSLIBS = $(FONTLIBS) $(WIDECHARSYSLIB) $(SYSLIBS) + SUNLIB = $(SUNDDXDIR)/LibraryTargetName(sun) + SUN24DIRS = $(STDDIRS) $(HWSUBDIR) $(SUNEXTDIRS) $(MFBSUBDIR) \ + $(CFB8SUBDIR) $(CFB16SUBDIR) $(CFB32SUBDIR) $(DEPDIRS) + SUN24OBJS = $(SUNDDXDIR)/sunInitMulti.o $(SUNDDXDIR)/sunInitExt.o + SUN24LIBS = $(SUNLIB) $(SUNDDXDIR)/$(DIX) $(SUNDDXDIR)/$(OS) \ + $(XPDDX) $(CFB32) $(CFB16) $(CFB8) $(MFB) \ + $(MI) $(SUNEXTENSIONS) +SetUIDServerTarget(Xsun24, \ + $(SUN24DIRS), \ + $(SUN24OBJS), \ + $(SUN24LIBS), \ + $(SUNSYSLIBS)) +#ifndef ServerToInstall #define ServerToInstall Xsun24 #endif #endif /* Xsun24Server */ @@ -492,18 +595,48 @@ XCOMM XCOMM Sun monochrome server XCOMM -MFBSUBDIR = mfb -SUNDDXDIR = hw/sun -SUNMDIRS = $(STDDIRS) $(MFBDIR) $(SUNDDXDIR) $(DEPDIRS) -#if defined(XF86Server) && XF86Server -SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o hw/sun/stubs.o -#else -SUNMOBJS = hw/sun/sunInitMono.o hw/sun/sunInExMono.o + + HWSUBDIR = hw + MFBSUBDIR = mfb + SUNDDXDIR = hw/sun +#if BuildXKB + SUNXKBEXT = $(SUNDDXDIR)/$(XKBEXT) #endif -SUNMLIBS = hw/sun/LibraryTargetName(sun) MFBLibs -SetUIDServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS), \ - $(SUNMLIBS),$(FONTLIBS) $(SYSLIBS)) -#if !defined(ServerToInstall) && (!defined(XF86Server) || !XF86Server) +#if BuildRECORD + SUNRECORDEXT = $(SUNDDXDIR)/$(RECORDEXT) +#endif +#if BuildRender + SUNRENDERLIB = $(SUNDDXDIR)/$(RENDERLIB) +#endif +#if BuildRandR + SUNRANDRLIB = $(SUNDDXDIR)/$(RANDRLIB) +#endif +#if BuildDBE + SUNDBEEXT = $(SUNDDXDIR)/$(DBEEXT) +#endif +#if BuildXTrap + SUNXTRAPEXT = $(SUNDDXDIR)/$(XTRAPEXT) +#endif + SUNSTATICEXTS = $(SUNXKBEXT) $(LBXEXT) $(SITEEXTS) $(SUNRANDRLIB) \ + $(SUNRENDERLIB) + SUNMISCEXT = $(SUNDDXDIR)/$(MISCEXT) + SUNLOADABLEEXTS = $(SUNMISCEXT) $(SUNDBEEXT) $(SUNRECORDEXT) $(GLXEXT) \ + $(SUNXTRAPEXT) + SUNEXTENSIONS = $(SUNLOADABLEEXTS) $(SUNSTATICEXTS) + SUNEXTDIRS = $(GLXDIR) $(LBXDIRS) $(SITEEXTDIRS) + SUNSYSLIBS = $(FONTLIBS) $(WIDECHARSYSLIB) $(SYSLIBS) + SUNLIB = $(SUNDDXDIR)/LibraryTargetName(sun) + SUNMDIRS = $(STDDIRS) $(HWSUBDIR) $(SUNEXTDIRS) $(MFBSUBDIR) \ + $(DEPDIRS) + SUNMOBJS = $(SUNDDXDIR)/sunInitMono.o $(SUNDDXDIR)/sunInExMono.o + SUNMLIBS = $(SUNLIB) $(SUNDDXDIR)/$(DIX) $(SUNDDXDIR)/$(OS) \ + $(XPDDX) $(MFB) $(MI) $(SUNEXTENSIONS) +SetUIDServerTarget(XsunMono, \ + $(SUNMDIRS), \ + $(SUNMOBJS), \ + $(SUNMLIBS), \ + $(SUNSYSLIBS)) +#ifndef ServerToInstall #define ServerToInstall XsunMono #endif #endif /* XsunMonoServer */ @@ -513,14 +646,48 @@ XCOMM XCOMM Sun server for LynxOS microSPARC 2.4.0 XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -LYNXDDXDIR = hw/sunLynx -SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(LYNXDDXDIR) $(DEPDIRS) -SUNOBJS = hw/sunLynx/sunLyInit.o -SUNLIBS = hw/sunLynx/libsun.a CFB8Libs -ServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS), \ - $(SUNLIBS),$(FONTLIBS) $(SYSLIBS)) + + HWSUBDIR = hw + MFBSUBDIR = mfb + CFB8SUBDIR = cfb + LYNXDDXDIR = hw/sunLynx +#if BuildXKB + LYNXXKBEXT = $(LYNXDDXDIR)/$(XKBEXT) +#endif +#if BuildRECORD + LYNXRECORDEXT = $(LYNXDDXDIR)/$(RECORDEXT) +#endif +#if BuildRender + LYNXRENDERLIB = $(LYNXDDXDIR)/$(RENDERLIB) +#endif +#if BuildRandR + LYNXRANDRLIB = $(LYNXDDXDIR)/$(RANDRLIB) +#endif +#if BuildDBE + LYNXDBEEXT = $(LYNXDDXDIR)/$(DBEEXT) +#endif +#if BuildXTrap + LYNXXTRAPEXT = $(LYNXDDXDIR)/$(XTRAPEXT) +#endif + LYNXSTATICEXTS = $(LYNXXKBEXT) $(LBXEXT) $(SITEEXTS) $(LYNXRANDRLIB) \ + $(LYNXRECORDLIB) + LYNXMISCEXT = $(LYNXDDXDIR)/$(MISCEXT) + LYNXLOADABLEEXTS = $(LYNXMISCEXT) $(LYNXDBEEXT) $LYNXRECORDEXT) $(GLXEXT) \ + $(LYNXXTRAPEXT) + LYNXEXTENSIONS = $(LYNXLOADABLEEXTS) $(LYNXSTATICEXTS) + LYNXEXTDIRS = $(GLXDIR) $(LBXDIRS) $(SITEEXTDIRS) + LYNXSYSLIBS = $(FONTLIBS) $(SYSLIBS) + LYNXLIB = $(LYNXDDXDIR)/LibraryTargetName(sun) + LYNXDIRS = $(STDDIRS) $(HWSUBDIR) $(LYNXEXTDIRS) \ + $(MFBSUBDIR) $(CFB8SUBDIR) $(DEPDIRS) + LYNXOBJS = $(LYNXDDXDIR)/sunLyInit.o $(LYNXDDXDIR)/sunInitExt.o + LYNXLIBS = $(LYNXLIB) $(LYNXDDXDIR)/$(DIX) $(LYNXDDXDIR)/$(OS) \ + $(XPDDX) $(CFB8) $(MFB) $(MI) $(LYNXEXTENSIONS) +ServerTarget(Xsun, \ + $(LYNXDIRS), \ + $(LYNXOBJS), \ + $(LYNXLIBS), \ + $(LYNXSYSLIBS)) #ifndef ServerToInstall #define ServerToInstall Xsun #endif @@ -531,227 +698,126 @@ XCOMM XCOMM Sun monochrome server for LynxOS microSPARC 2.4.0 XCOMM -MFBSUBDIR = mfb -LYNXDDXDIR = hw/sunLynx -SUNMDIRS = $(STDDIRS) $(MFBDIR) $(LYNXDDXDIR) $(DEPDIRS) -SUNMOBJS = hw/sunLynx/sunInitMono.o hw/sunLynx/sunInExMono.o -SUNMLIBS = hw/sunLynx/libsun.a MFBBareLibs $(OTHEREXTS) -ServerTarget(XsunMono,$(SUNMDIRS),$(SUNMOBJS), \ - $(SUNMLIBS),$(FONTLIBS) $(SYSLIBS)) -#ifndef ServerToInstall -#define ServerToInstall XsunMono -#endif -#endif /* XsunLynxMonoServer */ - -#if HasParallelMake -XCOMM -XCOMM force non-parallel build of XF86 servers to prevent MUTEX overrides -XCOMM -#if defined(XF86Server) && XF86Server -XF86SERVER = XFree86 + HWSUBDIR = hw + MFBSUBDIR = mfb + LYNXDDXDIR = hw/sunLynx +#if BuildXKB + LYNXXKBEXT = $(LYNXDDXDIR)/$(XKBEXT) #endif -#if defined(XnestServer) && XnestServer -XNEST = Xnest +#if BuildRECORD + LYNXRECORDEXT = $(LYNXDDXDIR)/$(RECORDEXT) #endif -#if defined(XVirtualFramebufferServer) && XVirtualFramebufferServer -XVFB = Xvfb +#if BuildRender + LYNXRENDERLIB = $(LYNXDDXDIR)/$(RENDERLIB) #endif -#if defined(XdmxServer) && XdmxServer -XDMX = Xdmx +#if BuildRandR + LYNXRANDRLIB = $(LYNXDDXDIR)/$(RANDRLIB) #endif -#if defined(XWinServer) && XWinServer && !MakeDllModules -XWIN = XWin +#if BuildDBE + LYNXDBEEXT = $(LYNXDDXDIR)/$(DBEEXT) #endif -#if (defined(XF86Server) && XF86Server) || \ - (defined(XnestServer) && XnestServer) || \ - (defined(XVirtualFramebufferServer) && XVirtualFramebufferServer) || \ - (defined(XdmxServer) && XdmxServer) || \ - (!MakeDllModules && defined(XWinServer) && XWinServer) -MakeMutex($(XF86SERVER) $(XNEST) $(XVFB) $(XDMX) $(XWIN)) +#if BuildXTrap + LYNXXTRAPEXT = $(LYNXDDXDIR)/$(XTRAPEXT) #endif -MakeMutex($(STDDIRS) mfb fb cfb cfb16 cfb24 cfb32) + LYNXSTATICEXTS = $(LYNXXKBEXT) $(LBXEXT) $(SITEEXTS) $(LYNXRANDRLIB) \ + $(LYNXRECORDLIB) + LYNXMISCEXT = $(LYNXDDXDIR)/$(MISCEXT) + LYNXLOADABLEEXTS = $(LYNXMISCEXT) $(LYNXDBEEXT) $LYNXRECORDEXT) $(GLXEXT) \ + $(LYNXXTRAPEXT) + LYNXEXTENSIONS = $(LYNXLOADABLEEXTS) $(LYNXSTATICEXTS) + LYNXEXTDIRS = $(GLXDIR) $(LBXDIRS) $(SITEEXTDIRS) + LYNXSYSLIBS = $(FONTLIBS) $(SYSLIBS) + LYNXLIB = $(LYNXDDXDIR)/LibraryTargetName(sun) + LYNXMDIRS = $(STDDIRS) $(HWSUBDIR) $(LYNXEXTDIRS) $(MFBSUBDIR) \ + $(DEPDIRS) + LYNXMOBJS = $(LYNXDDXDIR)/sunInitMono.o $(LYNXDDXDIR)/sunInExMono.o + LYNXMLIBS = $(LYNXLIB) $(LYNXDDXDIR)/$(DIX) $(LYNXDDXDIR)/$(OS) \ + $(XPDDX) $(MFB) $(MI) $(LYNXEXTENSIONS) +ServerTarget(XsunMono, \ + $(LYNXMDIRS), \ + $(LYNXMOBJS), \ + $(LYNXMLIBS), \ + $(LYNXSYSLIBS)) +#ifndef ServerToInstall +#define ServerToInstall XsunMono #endif +#endif /* XsunLynxMonoServer */ -#if defined(XF86Server) && XF86Server +#if defined(TinyXServer) && TinyXServer XCOMM -XCOMM XFree86 Server +XCOMM Tiny X server section XCOMM -FBSUBDIR = fb -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -CFB16SUBDIR = cfb16 -CFB24SUBDIR = cfb24 -CFB32SUBDIR = cfb32 -#ifdef OS2Architecture -SERVERDEFFILE = XFree86.def -XNESTDEFFILE = Xnest.def -XVFBDEFFILE = Xvfb.def -XDMXDEFFILE = Xdmx.def -#endif -#if XF86AFB -AFBSUBDIR = afb -#endif -XFREE86DDXDIR = hw/xfree86 -XF86SERVERSUBDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(AFBDIR) \ - $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \ - $(SHADOWDIR) $(LAYERDIR) $(XFREE86DDXDIR) $(DEPDIRS) -XF86INIT = $(XF86COMSRC)/xf86Init.o $(XF86COMSRC)/xf86IniExt.o -XF86COMLIB = $(XF86COMSRC)/LibraryTargetName(xf86) -XF86PARSLIB= $(XF86PARSERSRC)/LibraryTargetName(xf86config) -XF86OSLIB = $(XF86OSSRC)/LibraryTargetName(xf86_os) -#if XF86XAA -XF86XAALIB = $(XF86SRC)/xaa/LibraryTargetName(xaa) -#endif -#if XF86VgaHw -XF86VGAHWLIB = $(XF86SRC)/vgahw/LibraryTargetName(vgahw) -#endif -#if XF86FBDevHw -XF86FBDEVHWLIB = $(XF86SRC)/fbdevhw/LibraryTargetName(fbdevhw) -#endif -#if XF1Bpp || XF4Bpp -XF1BPPLIB = $(XF86SRC)/xf1bpp/LibraryTargetName(xf1bpp) -#endif -#if XF4Bpp -XF4BPPLIB = $(XF86SRC)/xf4bpp/LibraryTargetName(xf4bpp) -#endif -#if XF8_32Wid -XF8_32WIDLIB = $(XF86SRC)/xf8_32wid/LibraryTargetName(xf8_32wid) -#endif -#if XF8_32Bpp -XF8_32BPPLIB = $(XF86SRC)/xf8_32bpp/LibraryTargetName(xf8_32bpp) -#endif -#if XF8_16Bpp -XF8_16BPPLIB = $(XF86SRC)/xf8_16bpp/LibraryTargetName(xf8_16bpp) -#endif -#if XF24_32Bpp -XF24_32BPPLIB = $(XF86SRC)/xf24_32bpp/LibraryTargetName(xf24_32bpp) -#endif -#if XFShadowFB -XFSHADOWFBLIB = $(XF86SRC)/shadowfb/LibraryTargetName(shadowfb) -#endif -#if XF86AFB -AFBLIB = afb/LibraryTargetName(afb) -#endif -XF86DRIVERLIB = $(XF86SRC)/drivers/LibraryTargetName(driver) -#if XF86Ramdac -XF86RAMDACLIB = $(XF86SRC)/ramdac/LibraryTargetName(ramdac) -#endif -#if XF86I2C -XF86I2CLIB = $(XF86SRC)/i2c/LibraryTargetName(i2c) -#endif -#if XF86DDC -XF86DDCLIB = $(XF86SRC)/ddc/LibraryTargetName(ddc) -#endif -#if XF86VBE -XF86VBELIB = $(XF86SRC)/vbe/LibraryTargetName(vbe) -#endif -#if XF86RAC -XF86RACLIB = $(XF86SRC)/rac/LibraryTargetName(rac) -#endif -#if XF86INT10_BUILD > X86EMU_GENERIC -XF86INT10LIB = $(XF86OSSRC)/LibraryTargetName(int10) -#else -XF86INT10LIB = $(XF86SRC)/int10/LibraryTargetName(int10) + + HWSUBDIR = hw + TINYXDIR = hw/tinyx + TINY_DIX = $(TINYXDIR)/$(DIX) + TINY_OS = $(TINYXDIR)/$(OS) + +#if BuildRender + TINY_RENDERLIB = $(TINYXDIR)/$(RENDERLIB) #endif -#if UseMemLeak -MEMDEBUGLIB = $(TOP)/util/memleak/LibraryTargetName(memleak) +#if BuildRandR + TINY_RANDRLIB = $(TINYXDIR)/$(RANDRLIB) #endif -XF86IDRIVERLIB = $(XF86SRC)/input/LibraryTargetName(idriver) -#if !DoLoadableServer -XF86DRVOBJS = $(XF86SRC)/drivers/drvConf.o -XF86DRVLIBS = $(XF86DRIVERLIB) $(XF86RAMDACLIB) $(XF86DDCLIB) $(XF86I2CLIB) \ - $(XF86XAALIB) $(XF86VGAHWLIB) $(XF86FBDEVHWLIB) \ - $(XF8_32WIDLIB) $(XF8_32BPPLIB) \ - $(XF8_16BPPLIB) $(XF24_32BPPLIB) \ - $(XF4BPPLIB) $(XF1BPPLIB) $(XFSHADOWFBLIB) $(AFBLIB) -XF86IDRVOBJS = $(XF86SRC)/input/drvConf.o -XF86IDRVLIBS = $(XF86IDRIVERLIB) -XF86SCANLIB = $(XF86SRC)/scanpci/LibraryTargetName(scanpci) -XF86LIBS = $(MEMDEBUGLIB) $(XF86INIT) $(XF86COMLIB) $(XF86RACLIB) \ - $(XF86PARSLIB) $(XF86VBELIB) $(XF86OSLIB) $(XF86INT10LIB) -#else -XF86LIBS = $(MEMDEBUGLIB) $(XF86INIT) $(XF86COMLIB) \ - $(XF86PARSLIB) $(XF86OSLIB) + + TINY_STATICEXTS = $(XKBEXT) $(XINPUTEXT) $(LBXEXT) $(SITEEXTS) \ + $(TINY_RANDRLIB) $(TINY_RENDERLIB) + TINY_MISCEXT = $(TINYXDIR)/$(MISCEXT) + TINY_LOADABLEEXTS = $(TINY_MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT) \ + $(XTRAPEXT) + TINY_EXTENSIONS = $(TINY_STATICEXTS) $(TINY_LOADABLEEXTS) + TINY_EXTDIRS = $(XKBDIR) $(XIDIR) $(GLXDIR) $(LBXDIRS) $(DBEDIR) \ + $(RECORDDIR) $(XTRAPDIR) $(SITEEXTDIRS) + +#if XserverStaticFontLib +#if TinyXFreeType + TINYFREETYPELIB = $(FREETYPE2LIB) #endif -#if DoLoadableServer -XF86LOADERLIB = $(XF86SRC)/loader/LibraryTargetName(loader) -XF86MAINLIBS = PreFbLibsNoFont \ - $(FONTBASE) $(XF86COMLIB) \ - NoMfbBarePostFbLibs $(XF86EXTENSIONS) -XF86SERVERSYSLIBS = $(XPFBLIBS) $(SYSLIBS) $(LIBDL) $(LIBREGEX) -XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \ - $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB) + TINY_FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(TINYFREETYPELIB) #else -XF86MAINLIBS = MiExtLibs BareAllFBLibs $(XF86EXTENSIONS) $(XF86COMLIB) $(MI) -XF86SERVERSYSLIBS = $(FONTLIBS) $(SYSLIBS) $(LIBDL) $(LIBREGEX) -XF86SERVERLIBS = $(XF86DRVLIBS) $(XF86IDRVLIBS) $(XF86LIBS) $(XF86LOADERLIB) \ - $(XF86COMLIB) $(XF86MAINLIBS) $(XF86SCANLIB) $(XF86OSLIB) \ - $(XF86DDCLIB) -#endif -XF86SERVEROBJS = $(XF86XKBOBJS) $(XF86DRVOBJS) $(XF86IDRVOBJS) -#if HasParallelMake -MakeMutex($(XF86SERVERSUBDIRS) $(XF86SERVERLIBS) $(XF86SERVERSYSLIBS)) -#endif -#if ForceServerRemake -$(XF86SERVERLIBS) $(XF86SERVERSYSLIBS):: $(XF86SERVERSUBDIRS) - @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi -#endif -SetUIDServerTarget(XFree86,$(XF86SERVERSUBDIRS),$(XF86SERVEROBJS) $(SERVERDEFFILE), \ - $(XF86SERVERLIBS),$(XF86SERVERSYSLIBS)) -#if DoLoadableServer -ServerDriverSDKTarget(XFree86) -#endif -#ifndef ServerToInstall -#define ServerToInstall XFree86 + TINY_FONT = $(LDPRELIB) $(XFONTLIB) $(FREETYPE2LIB) #endif -#endif /* XF86Server */ -#if defined(TinyXServer) && TinyXServer -XCOMM -XCOMM Tiny X server section -XCOMM + TINY_FONTLIBS = $(TINY_FONT) $(FONTLIBSRC)/stubs/LibraryTargetName(fntstubs) - TINYXDIR = hw/tinyx #if HasTsLib - TINYXTSLIB = -lts + TINYXTSLIB = -lts #endif #ifdef LinuxArchitecture - TINYXOSDIR = $(TINYXDIR)/linux - TINYXOS = $(TINYXOSDIR)/LibraryTargetName(linux) $(TINYXTSLIB) + TINYXOSDIR = $(TINYXDIR)/linux + TINYXOS = $(TINYXOSDIR)/LibraryTargetName(linux) $(TINYXTSLIB) #endif #ifdef VXWORKS - TINYXOSDIR = $(TINYXDIR)/vxworks - TINYXOS = $(TINYXOSDIR)/LibraryTargetName(vxworks) + TINYXOSDIR = $(TINYXDIR)/vxworks + TINYXOS = $(TINYXOSDIR)/LibraryTargetName(vxworks) #endif - FBSUBDIR = fb - TINYX = $(TINYXDIR)/LibraryTargetName(tinyx) - TINYXFBDEV = $(TINYXDIR)/fbdev/LibraryTargetName(fbdev) - + FBSUBDIR = fb + TINYX = $(TINYXDIR)/LibraryTargetName(tinyx) + TINYXFBDEV = $(TINYXDIR)/fbdev/LibraryTargetName(fbdev) -#define StdTinyxDirs $(TINYXDIR) $(TINYXOSDIR) $(DEPDIRS) -#define StdTinyxSysLibs $(TINY_FONTLIBS) $(SYSLIBS) -#define TinyxLibs $(TINYX) $(TINYXOS) MiExtLibs -#define TinyxObjs $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o $(TINYXDIR)/ffcheck.o $(TINYXDIR)/stubs.o os/tiny/lbxio.o #if defined(XfbdevServer) && XfbdevServer XCOMM XCOMM server with TinyX fbdev driver only XCOMM - FBDEVDIR = $(TINYXDIR)/fbdev - FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev) - - TINYXDIRS = StdTinyxDirs - - FBDEVDIRS = $(STDDIRS) $(TINYXDIRS) $(FBDEVDIR) $(SHADOWDIR) $(LAYERDIR) - - FBDEVLIBS = TinyPreFbLibs $(FBDEV) $(LAYER) TinyxLibs TinyFbPostFbLibs - FBDEVOBJS = TinyxObjs -FBDEVSYSLIBS = StdTinyxSysLibs + FBDEVDIR = $(TINYXDIR)/fbdev + FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev) + + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) + + FBDEVDIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(FBDEVDIR) $(SHADOWDIR) $(LAYERDIR) + + FBDEVLIBS = $(TINY_DIX) $(TINY_OS) $(FBDEV) $(LAYER) $(TINYX) \ + $(TINYXOS) $(SHADOW) $(FB) $(MI) $(TINY_EXTENSIONS) + FBDEVOBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + FBDEVSYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(FBDEVDIRS) $(FBDEVOBJS) $(FBDEVLIBS) $(FBDEVSYSLIBS)) @@ -760,25 +826,32 @@ $(FBDEVOBJS) $(XFBDEV) $(FBDEVLIBS) $(FBDEVSYSLIBS):: $(FBDEVDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xfbdev,$(FBDEVDIRS),$(FBDEVOBJS), \ - $(FBDEVLIBS),$(FBDEVSYSLIBS)) +ServerTarget(Xfbdev, \ + $(FBDEVDIRS), \ + $(FBDEVOBJS), \ + $(FBDEVLIBS), \ + $(FBDEVSYSLIBS)) #endif /* XfbdevServer */ + #if defined(XSavageServer) && XSavageServer XCOMM XCOMM server with TinyX S3 Savage driver XCOMM - SAVAGEDIR = $(TINYXDIR)/savage - SAVAGE = $(SAVAGEDIR)/LibraryTargetName(savage) - - TINYXDIRS = StdTinyxDirs - - SAVAGEDIRS = $(STDDIRS) $(TINYXDIRS) $(SAVAGEDIR) - - SAVAGEOBJS = TinyxObjs - SAVAGELIBS = TinyPreFbLibs $(SAVAGE) TinyxLibs TinyFbPostFbLibs -SAVAGESYSLIBS = StdTinyxSysLibs + SAVAGEDIR = $(TINYXDIR)/savage + SAVAGE = $(SAVAGEDIR)/LibraryTargetName(savage) + + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) + + SAVAGEDIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(SAVAGEDIR) + + SAVAGEOBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + SAVAGELIBS = $(TINY_DIX) $(TINY_OS) $(SAVAGE) $(TINYX) $(TINYXOS) \ + $(SHADOW) $(FB) $(MI) $(TINY_EXTENSIONS) + SAVAGESYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(SAVAGEDIRS) $(SAVAGEOBJS) $(SAVAGELIBS) $(SAVAGESYSLIBS)) @@ -787,25 +860,32 @@ $(SAVAGEOBJS) $(XSAVAGE) $(SAVAGELIBS) $(SAVAGESYSLIBS):: $(SAVAGEDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xsavage,$(SAVAGEDIRS),$(SAVAGEOBJS), \ - $(SAVAGELIBS),$(SAVAGESYSLIBS)) +ServerTarget(Xsavage, \ + $(SAVAGEDIRS), \ + $(SAVAGEOBJS), \ + $(SAVAGELIBS), \ + $(SAVAGESYSLIBS)) #endif /* XSavageServer */ + #if defined(XIgsServer) && XIgsServer XCOMM XCOMM server with TinyX S3 Igs driver XCOMM - IGSDIR = $(TINYXDIR)/igs - IGS = $(IGSDIR)/LibraryTargetName(igs) - - TINYXDIRS = StdTinyxDirs - - IGSDIRS = $(STDDIRS) $(TINYXDIRS) $(IGSDIR) - - IGSOBJS = TinyxObjs - IGSLIBS = TinyPreFbLibs $(IGS) TinyxLibs TinyFbPostFbLibs - IGSSYSLIBS = StdTinyxSysLibs + IGSDIR = $(TINYXDIR)/igs + IGS = $(IGSDIR)/LibraryTargetName(igs) + + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) + + IGSDIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(IGSDIR) + + IGSOBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + IGSLIBS = $(TINY_DIX) $(TINY_OS) $(IGS) $(TINYX) $(TINYXOS) \ + $(SHADOW) $(FB) $(MI) $(TINY_EXTENSIONS) + IGSSYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(IGSDIRS) $(IGSOBJS) $(IGSLIBS) $(IGSSYSLIBS)) @@ -814,31 +894,40 @@ $(IGSOBJS) $(XIGS) $(IGSLIBS) $(IGSSYSLIBS):: $(IGSDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xigs,$(IGSDIRS),$(IGSOBJS), \ - $(IGSLIBS),$(IGSSYSLIBS)) +ServerTarget(Xigs, \ + $(IGSDIRS), \ + $(IGSOBJS), \ + $(IGSLIBS), \ + $(IGSSYSLIBS)) #endif /* XIgsServer */ + #if defined(XTridentServer) && XTridentServer XCOMM XCOMM server with TinyX TRIDENT Cyber9525 driver XCOMM - FBDEVDIR = $(TINYXDIR)/fbdev - FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev) - VESADIR = $(TINYXDIR)/vesa - VESA = $(VESADIR)/LibraryTargetName(vesa) - TRIDENTDIR = $(TINYXDIR)/trident - TRIDENT = $(TRIDENTDIR)/LibraryTargetName(trident) - - TINYXDIRS = StdTinyxDirs - - TRIDENTDIRS = $(STDDIRS) $(TINYXDIRS) \ - $(FBDEVDIR) $(VESADIR) $(SHADOWDIR) $(LAYERDIR) $(TRIDENTDIR) - - TRIDENTOBJS = TinyxObjs - TRIDENTLIBS = TinyPreFbLibs $(TRIDENT) $(FBDEV) $(VESA) $(LAYER) \ - TinyxLibs TinyFbPostFbLibs -TRIDENTSYSLIBS = StdTinyxSysLibs + FBDEVDIR = $(TINYXDIR)/fbdev + FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev) + + VESADIR = $(TINYXDIR)/vesa + VESA = $(VESADIR)/LibraryTargetName(vesa) + + TRIDENTDIR = $(TINYXDIR)/trident + TRIDENT = $(TRIDENTDIR)/LibraryTargetName(trident) + + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) + + TRIDENTDIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(FBDEVDIR) $(VESADIR) $(SHADOWDIR) \ + $(LAYERDIR) $(TRIDENTDIR) + + TRIDENTOBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + TRIDENTLIBS = $(TINY_DIX) $(TINY_OS) $(TRIDENT) $(FBDEV) $(VESA) \ + $(LAYER) $(TINYX) $(TINYXOS) $(SHADOW) $(FB) $(MI) \ + $(TINY_EXTENSIONS) + TRIDENTSYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(TRIDENTDIRS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS)) @@ -847,28 +936,37 @@ $(TRIDENTOBJS) $(TRIDENTLIBS) $(TRIDENTSYSLIBS):: $(TRIDENTDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xtrident,$(TRIDENTDIRS),$(TRIDENTOBJS), \ - $(TRIDENTLIBS),$(TRIDENTSYSLIBS)) +ServerTarget(Xtrident, \ + $(TRIDENTDIRS), \ + $(TRIDENTOBJS), \ + $(TRIDENTLIBS), \ + $(TRIDENTSYSLIBS)) #endif /* XTridentServer */ + #if defined(XchipsServer) && XchipsServer XCOMM XCOMM server with TinyX C&T driver XCOMM - VESADIR = $(TINYXDIR)/vesa - VESA = $(VESADIR)/LibraryTargetName(vesa) - CHIPSDIR = $(TINYXDIR)/chips - CHIPS = $(CHIPSDIR)/LibraryTargetName(chips) - - TINYXDIRS = StdTinyxDirs - - CHIPSDIRS = $(STDDIRS) $(TINYXDIRS) \ - $(FBDEVDIR) $(VESADIR) $(SHADOWDIR) $(LAYERDIR) $(CHIPSDIR) - - CHIPSOBJS = TinyxObjs - CHIPSLIBS = TinyPreFbLibs $(CHIPS) $(VESA) $(LAYER) TinyxLibs TinyFbPostFbLibs -CHIPSSYSLIBS = StdTinyxSysLibs + VESADIR = $(TINYXDIR)/vesa + VESA = $(VESADIR)/LibraryTargetName(vesa) + + CHIPSDIR = $(TINYXDIR)/chips + CHIPS = $(CHIPSDIR)/LibraryTargetName(chips) + + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) + + CHIPSDIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(FBDEVDIR) $(VESADIR) $(SHADOWDIR) \ + $(LAYERDIR) $(CHIPSDIR) + + CHIPSOBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + CHIPSLIBS = $(TINY_DIX) $(TINY_OS) $(CHIPS) $(VESA) $(LAYER) \ + $(TINYX) $(TINYXOS) $(SHADOW) $(FB) $(MI) \ + $(TINY_EXTENSIONS) + CHIPSSYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(CHIPSDIRS) $(CHIPSLIBS) $(CHIPSSYSLIBS)) @@ -877,28 +975,37 @@ $(CHIPSOBJS) $(CHIPSLIBS) $(CHIPSSYSLIBS):: $(CHIPSDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xchips,$(CHIPSDIRS),$(CHIPSOBJS), \ - $(CHIPSLIBS),$(CHIPSSYSLIBS)) +ServerTarget(Xchips, \ + $(CHIPSDIRS), \ + $(CHIPSOBJS), \ + $(CHIPSLIBS), \ + $(CHIPSSYSLIBS)) #endif /* XchipsServer */ + #if defined(Xmach64Server) && Xmach64Server XCOMM XCOMM server with TinyX Mach64 driver (for Mobility 1 machines) XCOMM - VESADIR = $(TINYXDIR)/vesa - VESA = $(VESADIR)/LibraryTargetName(vesa) - MACH64DIR = $(TINYXDIR)/mach64 - MACH64 = $(MACH64DIR)/LibraryTargetName(mach64) - - TINYXDIRS = StdTinyxDirs - - MACH64DIRS = $(STDDIRS) $(TINYXDIRS) \ - $(VESADIR) $(SHADOWDIR) $(LAYERDIR) $(MACH64DIR) - - MACH64OBJS = TinyxObjs - MACH64LIBS = TinyPreFbLibs $(MACH64) $(VESA) $(LAYER) TinyxLibs TinyFbPostFbLibs -MACH64SYSLIBS = StdTinyxSysLibs + VESADIR = $(TINYXDIR)/vesa + VESA = $(VESADIR)/LibraryTargetName(vesa) + + MACH64DIR = $(TINYXDIR)/mach64 + MACH64 = $(MACH64DIR)/LibraryTargetName(mach64) + + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) + + MACH64DIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(VESADIR) $(SHADOWDIR) $(LAYERDIR) \ + $(MACH64DIR) + + MACH64OBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + MACH64LIBS = $(TINY_DIX) $(TINY_OS) $(MACH64) $(VESA) $(LAYER) \ + $(TINYX) $(TINYXOS) $(SHADOW) $(FB) $(MI) \ + $(TINY_EXTENSIONS) + MACH64SYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(MACH64DIRS) $(MACH64LIBS) $(MACH64SYSLIBS)) @@ -907,29 +1014,38 @@ $(MACH64OBJS) $(MACH64LIBS) $(MACH64SYSLIBS):: $(MACH64DIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xmach64,$(MACH64DIRS),$(MACH64OBJS), \ - $(MACH64LIBS),$(MACH64SYSLIBS)) +ServerTarget(Xmach64, \ + $(MACH64DIRS), \ + $(MACH64OBJS), \ + $(MACH64LIBS), \ + $(MACH64SYSLIBS)) #endif /* Xmach64Server */ + #if defined(Xi810Server) && Xi810Server XCOMM XCOMM server with Intel i810 driver XCOMM - FBDEVDIR = $(TINYXDIR)/fbdev - FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev) - VESADIR = $(TINYXDIR)/vesa - VESA = $(VESADIR)/LibraryTargetName(vesa) - I810DIR = $(TINYXDIR)/i810 - I810 = $(I810DIR)/LibraryTargetName(i810) - - TINYXDIRS = StdTinyxDirs - - I810DIRS = $(STDDIRS) $(TINYXDIRS) $(SHADOWDIR) $(I810DIR) - - I810OBJS = TinyxObjs - I810LIBS = TinyPreFbLibs $(I810) TinyxLibs TinyFbPostFbLibs - I810SYSLIBS = StdTinyxSysLibs + FBDEVDIR = $(TINYXDIR)/fbdev + FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev) + + VESADIR = $(TINYXDIR)/vesa + VESA = $(VESADIR)/LibraryTargetName(vesa) + + I810DIR = $(TINYXDIR)/i810 + I810 = $(I810DIR)/LibraryTargetName(i810) + + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) + + I810DIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(SHADOWDIR) $(I810DIR) + + I810OBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + I810LIBS = $(TINY_DIX) $(TINY_OS) $(I810) $(TINYX) $(TINYXOS) \ + $(SHADOW) $(FB) $(MI) $(TINY_EXTENSIONS) + I810SYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(I810DIRS) $(I810LIBS) $(I810SYSLIBS)) @@ -938,8 +1054,11 @@ $(I810OBJS) $(I810LIBS) $(I810SYSLIBS):: $(I810DIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xi810,$(I810DIRS),$(I810OBJS), \ - $(I810LIBS),$(I810SYSLIBS)) +ServerTarget(Xi810, \ + $(I810DIRS), \ + $(I810OBJS), \ + $(I810LIBS), \ + $(I810SYSLIBS)) #endif /* Xi810Server */ @@ -948,16 +1067,19 @@ XCOMM server with TinyX SiS 530 driver XCOMM - SIS530DIR = $(TINYXDIR)/sis530 - SIS530 = $(SIS530DIR)/LibraryTargetName(sis530) + SIS530DIR = $(TINYXDIR)/sis530 + SIS530 = $(SIS530DIR)/LibraryTargetName(sis530) - TINYXDIRS = StdTinyxDirs + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) - SIS530DIRS = $(STDDIRS) $(TINYXDIRS) $(SIS530DIR) - - SIS530OBJS = TinyxObjs - SIS530LIBS = TinyPreFbLibs $(SIS530) TinyxLibs TinyFbPostFbLibs -SIS530SYSLIBS = StdTinyxSysLibs + SIS530DIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(SIS530DIR) + + SIS530OBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + SIS530LIBS = $(TINY_DIX) $(TINY_OS) $(SIS530) $(TINYX) $(TINYXOS) \ + $(SHADOW) $(FB) $(MI) $(TINY_EXTENSIONS) + SIS530SYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(SIS530DIRS) $(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS)) @@ -966,25 +1088,32 @@ $(SIS530OBJS) $(SIS530LIBS) $(SIS530SYSLIBS):: $(SIS530DIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xsis530,$(SIS530DIRS),$(SIS530OBJS), \ - $(SIS530LIBS),$(SIS530SYSLIBS)) +ServerTarget(Xsis530, \ + $(SIS530DIRS), \ + $(SIS530OBJS), \ + $(SIS530LIBS), \ + $(SIS530SYSLIBS)) #endif /* XSis530Server */ + #if defined(XTrioServer) && XTrioServer XCOMM XCOMM server with TinyX S3 Trio driver XCOMM - TRIODIR = $(TINYXDIR)/trio - TRIO = $(TRIODIR)/LibraryTargetName(trio) + TRIODIR = $(TINYXDIR)/trio + TRIO = $(TRIODIR)/LibraryTargetName(trio) + + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) - TINYXDIRS = StdTinyxDirs + TRIODIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(TRIODIR) - TRIODIRS = $(STDDIRS) $(TINYXDIRS) $(TRIODIR) - - TRIOOBJS = TinyxObjs - TRIOLIBS = TinyPreFbLibs $(TRIO) TinyxLibs TinyFbPostFbLibs -TRIOSYSLIBS = StdTinyxSysLibs + TRIOOBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + TRIOLIBS = $(TINY_DIX) $(TINY_OS) $(TRIO) $(TINYX) $(TINYXOS) \ + $(SHADOW) $(FB) $(MI) $(TINY_EXTENSIONS) + TRIOSYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(TRIODIRS) $(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS)) @@ -993,33 +1122,41 @@ $(TRIOOBJS) $(TRIOLIBS) $(TRIOSYSLIBS):: $(TRIODIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xtrio,$(TRIODIRS),$(TRIOOBJS), \ - $(TRIOLIBS),$(TRIOSYSLIBS)) +ServerTarget(Xtrio, \ + $(TRIODIRS), \ + $(TRIOOBJS), \ + $(TRIOLIBS), \ + $(TRIOSYSLIBS)) #endif /* XTrioServer */ + #if defined(XipaqServer) && XipaqServer XCOMM XCOMM server with Alan's HP VGA Out PCMCIA driver & fbdev XCOMM - FBDEVDIR = $(TINYXDIR)/fbdev - FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev) + FBDEVDIR = $(TINYXDIR)/fbdev + FBDEV = $(FBDEVDIR)/LibraryTargetName(fbdev) + + PCMCIADIR = $(TINYXDIR)/pcmcia + PCMCIA = $(PCMCIADIR)/LibraryTargetName(pcmcia) - PCMCIADIR = $(TINYXDIR)/pcmcia - PCMCIA = $(PCMCIADIR)/LibraryTargetName(pcmcia) + IPAQDIR = $(TINYXDIR)/ipaq + IPAQ = $(IPAQDIR)/LibraryTargetName(ipaq) - IPAQDIR = $(TINYXDIR)/ipaq - IPAQ = $(IPAQDIR)/LibraryTargetName(ipaq) + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) + + IPAQDIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(FBDEVDIR) $(LAYERDIR) $(SHADOWDIR) \ + $(PCMCIADIR) $(IPAQDIR) + + IPAQOBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + IPAQLIBS = $(TINY_DIX) $(TINY_OS) $(IPAQ) $(FBDEV) $(LAYER) \ + $(PCMCIA) $(TINYX) $(TINYXOS) $(SHADOW) $(FB) $(MI) \ + $(TINY_EXTENSIONS) + IPAQSYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) - TINYXDIRS = StdTinyxDirs - - IPAQDIRS = $(STDDIRS) $(TINYXDIRS) $(FBDEVDIR) $(LAYERDIR) $(SHADOWDIR) $(PCMCIADIR) $(IPAQDIR) - - IPAQOBJS = TinyxObjs - IPAQLIBS = TinyPreFbLibs $(IPAQ) $(FBDEV) $(LAYER) $(SHADOW) \ - $(PCMCIA) TinyxLibs TinyFbPostFbLibs - IPAQSYSLIBS = StdTinyxSysLibs - #if HasParallelMake MakeMutex($(IPAQDIRS) $(IPAQOBJS) $(IPAQLIBS) $(IPAQSYSLIBS)) #endif @@ -1027,32 +1164,40 @@ $(IPAQOBJS) $(IPAQLIBS) $(IPAQSYSLIBS):: $(IPAQDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xipaq,$(IPAQDIRS),$(IPAQOBJS), \ - $(IPAQLIBS),$(IPAQSYSLIBS)) +ServerTarget(Xipaq, \ + $(IPAQDIRS), \ + $(IPAQOBJS), \ + $(IPAQLIBS), \ + $(IPAQSYSLIBS)) #endif /* XIPAQServer */ + #if defined(XTS300Server) && XTS300Server XCOMM XCOMM server with TinyX S3 Trio and SiS530 driver for the TS300/TS400 XCOMM - TRIODIR = $(TINYXDIR)/trio - TRIO = $(TRIODIR)/LibraryTargetName(trio) - - SIS530DIR = $(TINYXDIR)/sis530 - SIS530 = $(SIS530DIR)/LibraryTargetName(sis530) - - TS300DIR = $(TINYXDIR)/ts300 - TS300 = $(TS300DIR)/LibraryTargetName(ts300) - - TINYXDIRS = StdTinyxDirs - - TS300DIRS = $(STDDIRS) $(TINYXDIRS) $(TRIODIR) $(SIS530DIR) $(TS300DIR) - - TS300OBJS = TinyxObjs - TS300LIBS = TinyPreFbLibs $(TS300) $(TRIO) $(SIS530) TinyxLibs TinyFbPostFbLibs - TS300SYSLIBS = StdTinyxSysLibs - + TRIODIR = $(TINYXDIR)/trio + TRIO = $(TRIODIR)/LibraryTargetName(trio) + + SIS530DIR = $(TINYXDIR)/sis530 + SIS530 = $(SIS530DIR)/LibraryTargetName(sis530) + + TS300DIR = $(TINYXDIR)/ts300 + TS300 = $(TS300DIR)/LibraryTargetName(ts300) + + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) + + TS300DIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(TRIODIR) $(SIS530DIR) $(TS300DIR) + + TS300OBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + TS300LIBS = $(TINY_DIX) $(TINY_OS) $(TS300) $(TRIO) $(SIS530) \ + $(TINYX) $(TINYXOS) $(SHADOW) $(FB) $(MI) \ + $(TINY_EXTENSIONS) + TS300SYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) + #if HasParallelMake MakeMutex($(TS300DIRS) $(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS)) #endif @@ -1060,25 +1205,33 @@ $(TS300OBJS) $(TS300LIBS) $(TS300SYSLIBS):: $(TS300DIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xts300,$(TS300DIRS),$(TS300OBJS), \ - $(TS300LIBS),$(TS300SYSLIBS)) +ServerTarget(Xts300, \ + $(TS300DIRS), \ + $(TS300OBJS), \ + $(TS300LIBS), \ + $(TS300SYSLIBS)) #endif /* XTS300Server */ + #if defined(XItsyServer) && XItsyServer XCOMM XCOMM server with TinyX FB driver only XCOMM - ITSYDIR = $(TINYXDIR)/itsy - ITSY = $(ITSYDIR)/LibraryTargetName(itsy) - TINYXDIRS = StdTinyxDirs + ITSYDIR = $(TINYXDIR)/itsy + ITSY = $(ITSYDIR)/LibraryTargetName(itsy) + + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) + + ITSYDIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(ITSYDIR) + + ITSYOBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + ITSYLIBS = $(TINY_DIX) $(TINY_OS) $(ITSY) $(TINYX) $(TINYXOS) \ + $(SHADOW) $(FB) $(MI) $(TINY_EXTENSIONS) + ITSYSYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) - ITSYDIRS = $(STDDIRS) $(TINYXDIRS) $(ITSYDIR) - - ITSYOBJS = TinyxObjs - ITSYLIBS = TinyPreFbLibs $(ITSY) TinyxLibs TinyFbPostFbLibs -ITSYSYSLIBS = StdTinyxSysLibs - #if HasParallelMake MakeMutex($(ITSYDIRS) $(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS)) #endif @@ -1086,25 +1239,32 @@ $(ITSYOBJS) $(ITSYLIBS) $(ITSYSYSLIBS):: $(ITSYDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xitsy,$(ITSYDIRS),$(ITSYOBJS), \ - $(ITSYLIBS),$(ITSYSYSLIBS)) +ServerTarget(Xitsy, \ + $(ITSYDIRS), \ + $(ITSYOBJS), \ + $(ITSYLIBS), \ + $(ITSYSYSLIBS)) #endif /* XItsyServer */ + #if defined(XvesaServer) && XvesaServer XCOMM XCOMM server with vesa driver only based on TinyX server XCOMM - VESADIR = $(TINYXDIR)/vesa - VESA = $(VESADIR)/LibraryTargetName(vesa) + VESADIR = $(TINYXDIR)/vesa + VESA = $(VESADIR)/LibraryTargetName(vesa) - TINYXDIRS = StdTinyxDirs + TINYXDIRS = $(TINYXOSDIR) $(DEPDIRS) - VESADIRS = $(STDDIRS) $(TINYXDIRS) $(VESADIR) $(SHADOWDIR) $(LAYERDIR) + VESADIRS = $(STDDIRS) $(HWSUBDIR) $(TINY_EXTDIRS) $(TINYXDIRS) \ + $(FBSUBDIR) $(VESADIR) $(SHADOWDIR) $(LAYERDIR) - VESAOBJS = TinyxObjs - VESALIBS = TinyPreFbLibs $(VESA) $(LAYER) TinyxLibs TinyFbPostFbLibs -VESASYSLIBS = StdTinyxSysLibs + VESAOBJS = $(TINYXDIR)/miinitext.o $(TINYXDIR)/register.o \ + $(TINYXDIR)/ffcheck.o + VESALIBS = $(TINY_DIX) $(TINY_OS) $(VESA) $(LAYER) $(TINYX) \ + $(TINYXOS) $(SHADOW) $(FB) $(MI) $(TINY_EXTENSIONS) + VESASYSLIBS = $(TINY_FONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(VESADIRS) $(VESAOBJS) $(VESALIBS) $(VESASYSLIBS)) @@ -1113,38 +1273,58 @@ $(VESAOBJS) $(XVESA) $(VESALIBS) $(VESASYSLIBS):: $(VESADIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xvesa,$(VESADIRS),$(VESAOBJS), \ - $(VESALIBS),$(VESASYSLIBS)) +ServerTarget(Xvesa, \ + $(VESADIRS), \ + $(VESAOBJS), \ + $(VESALIBS), \ + $(VESASYSLIBS)) #endif /* XvesaServer */ -TINYXSUBDIRS=$(TINYXDIRS) $(FBDEVDIR) $(SAVAGEDIR) $(TRIDENTDIR) $(I810DIR) \ - $(SIS530DIR) $(TRIODIR) $(TS300DIR) $(ITSYDIR) $(IGSDIR) \ - $(VESADIR) $(PCMCIADIR) $(IPAQDIR) $(MACH64DIR) $(CHIPSDIR) + TINYXSUBDIRS = $(TINYXDIRS) $(FBDEVDIR) $(SAVAGEDIR) $(TRIDENTDIR) \ + $(I810DIR) $(SIS530DIR) $(TRIODIR) $(TS300DIR) \ + $(ITSYDIR) $(IGSDIR) $(VESADIR) $(PCMCIADIR) $(IPAQDIR) \ + $(MACH64DIR) $(CHIPSDIR) #endif /* TinyXServer */ + #if defined(XprtServer) && XprtServer XCOMM XCOMM Print Server XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -CFB32SUBDIR = cfb32 -XPSUBDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB32DIR) $(DEPDIRS) -#if PrintOnlyServer -#if BuildDPMS -XPDPMSSTUBOBJS = Xprint/dpmsstubs.o + + MFBSUBDIR = mfb + CFB8SUBDIR = cfb + CFB32SUBDIR = cfb32 +#if BuildRECORD + XPRECORDEXT = $(XPDDXDIR)/$(RECORDEXT) #endif -XPOBJS = Xprint/ddxInit.o Xprint/miinitext.o $(XPDPMSSTUBOBJS) -XPLIBS = PreFbLibs $(XPDDXLIBS) $(XPDDXFBLIBS) $(MI) $(XPEXTENSIONS) -#else -XPOBJS = Xprint/ddxInit.o -XPLIBS = PreFbLibs $(XPFBLIBS) BarePostFbLibs $(XPEXTENSIONS) +#if BuildRender + XPRENDERLIB = $(XPDDXDIR)/$(RENDERLIB) +#endif +#if BuildRandR + XPRANDRLIB = $(XPDDXDIR)/$(RANDRLIB) #endif +#if BuildDBE + XPDBEEXT = $(XPDDXDIR)/$(DBEEXT) +#endif +#if BuildXTrap + XPXTRAPEXT = $(XPDDXDIR)/$(XTRAPEXT) +#endif + XPSTATICEXTS = $(LBXEXT) $(SITEEXTS) $(XPRANDRLIB) $(XPRENDERLIB) + XPMISCEXT = $(XPDDXDIR)/$(MISCEXT) + XPLOADABLEEXTS = $(XPMISCEXT) $(XPDBEEXT) $(XPRECORDEXT) $(XPXTRAPEXT) + XPEXTENSIONS = $(XPLOADABLEEXTS) $(XPSTATICEXTS) + XPEXTDIRS = $(LBXDIRS) $(SITEEXTDIRS) + XPSUBDIRS = $(STDDIRS) $(XPEXTDIRS) $(MFBSUBDIR) \ + $(CFB8SUBDIR) $(CFB32SUBDIR) $(DEPDIRS) + XPOBJS = Xprint/ddxInit.o Xprint/miinitext.o + XPLIBS = $(XPDDXDIR)/$(DIX) $(XPDDXDIR)/$(OS) \ + $(XPDDXLIBS) $(XPDDXFBLIBS) $(XPEXTENSIONS) #if (defined(SunArchitecture) || defined(SparcArchitecture)) && \ defined(SVR4Architecture) -XPSYSLIBS = $(FONT) $(CBRT) $(SYSLIBS) -lw + XPSYSLIBS = $(FONT) $(CBRT) $(SYSLIBS) -lw #else -XPSYSLIBS = $(FONT) $(CBRT) $(SYSLIBS) + XPSYSLIBS = $(FONT) $(CBRT) $(SYSLIBS) #endif #if HasParallelMake MakeMutex($(XPSUBDIRS) $(XPOBJS) $(XPLIBS) $(XPSYSLIBS)) @@ -1153,30 +1333,56 @@ $(XPOBJS) $(XPLIBS) $(XPSYSLIBS):: $(XPSUBDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xprt,$(XPSUBDIRS),$(XPOBJS), \ - $(XPLIBS),$(XPSYSLIBS)) +ServerTarget(Xprt, \ + $(XPSUBDIRS), \ + $(XPOBJS), \ + $(XPLIBS), \ + $(XPSYSLIBS)) #endif /* XprtServer */ + #if defined(XnestServer) && XnestServer XCOMM XCOMM Server with Xlib-based ddx XCOMM -#ifndef Win32Architecture -XNESTDDXDIR = hw/xnest -#else -XNESTDDXDIR = hw + + HWSUBDIR = hw +#ifdef OS2Architecture + XNESTDEFFILE = Xnest.def #endif -XNESTDIRS = $(STDDIRS) $(XNESTDDXDIR) $(DEPDIRS) -#if !defined(LynxOSArchitecture) && \ - !defined(Win32Architecture) && \ - !defined(QNX4Architecture) -XNESTOBJS = hw/xnest/miinitext.o -#else -XNESTOBJS = hw/xnest/miinitext.o dix/main.o + XNESTDDXDIR = hw/xnest +#if BuildXKB + XNESTXKBEXT = $(XNESTDDXDIR)/$(XKBEXT) +#endif +#if BuildRECORD + XNESTRECORDEXT = $(XNESTDDXDIR)/$(RECORDEXT) +#endif +#if BuildRender + XNESTRENDERLIB = $(XNESTDDXDIR)/$(RENDERLIB) +#endif +#if BuildRandR + XNESTRANDRLIB = $(XNESTDDXDIR)/$(RANDRLIB) +#endif +#if BuildDBE + XNESTDBEEXT = $(XNESTDDXDIR)/$(DBEEXT) #endif -XNEST = hw/xnest/LibraryTargetName(xnest) -XNESTLIBS = PreFbLibs $(XNEST) NoMfbPostFbLibs $(XNEST) -XNESTSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(NOAUTH_SYSLIBS) +#if BuildXTrap + XNESTXTRAPEXT = $(XNESTDDXDIR)/$(XTRAPEXT) +#endif + XNESTSTATICEXTS = $(XNESTXKBEXT) $(LBXEXT) $(SITEEXTS) $(XNESTRANDRLIB) \ + $(XNESTRENDERLIB) + XNESTMISCEXT = $(XNESTDDXDIR)/$(MISCEXT) + XNESTLOADABLEEXTS = $(XNESTMISCEXT) $(XNESTDBEEXT) $(XNESTRECORDEXT) \ + $(GLXEXT) $(XNESTXTRAPEXT) + XNESTEXTENSIONS = $(XNESTLOADABLEEXTS) $(XNESTSTATICEXTS) + XNESTEXTDIRS = $(GLXDIR) $(LBXDIRS) $(SITEEXTDIRS) + XNESTDIRS = $(STDDIRS) $(HWSUBDIR) $(XNESTEXTDIRS) $(DEPDIRS) + XNESTOBJS = $(XNESTDDXDIR)/dix/main.o $(XNESTDDXDIR)/miinitext.o + XNEST = $(XNESTDDXDIR)/LibraryTargetName(xnest) + XNESTLIBS = $(XNESTDDXDIR)/$(DIX) $(XNESTDDXDIR)/$(OS) $(XNEST) \ + $(MI) $(XNESTEXTENSIONS) + XNESTFONTLIBS = $(FONT) $(FONTLIBSRC)/stubs/LibraryTargetName(fntstubs) + XNESTSYSLIBS = $(XNESTFONTLIBS) $(LDPRELIBS) $(XLIB) $(NOAUTH_SYSLIBS) #if HasParallelMake MakeMutex($(XNESTDIRS) $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS)) #endif @@ -1184,49 +1390,55 @@ $(XNESTOBJS) $(XNESTLIBS) $(XNESTSYSLIBS):: $(XNESTDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xnest,$(XNESTDIRS),$(XNESTOBJS) $(XNESTDEFFILE), \ - $(XNESTLIBS),$(XNESTSYSLIBS)) +ServerTarget(Xnest, \ + $(XNESTDIRS), \ + $(XNESTOBJS) $(XNESTDEFFILE), \ + $(XNESTLIBS), \ + $(XNESTSYSLIBS)) #endif /* XnestServer */ -#if defined(XnonServer) && XnonServer -XCOMM -XCOMM non server, just compile sources for build test -XCOMM -MFBSUBDIR = mfb -CFB8SUBDIR = cfb -CFB16SUBDIR = cfb16 -CFB32SUBDIR = cfb32 -#if HasParallelMake -MakeMutex($(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS)) -#endif -Xnon: $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(CFB16DIR) $(CFB32DIR) $(DEPDIRS) -#endif /* XnonServer */ - - #if defined(XVirtualFramebufferServer) && XVirtualFramebufferServer XCOMM XCOMM server with Virtual (malloced) framebuffer XCOMM -MFBSUBDIR = mfb -FBSUBDIR = fb -#if defined(Win32Architecture) -XVFBDDXDIR = hw -#else -XVFBDDXDIR = hw/vfb + +#ifdef OS2Architecture + XVFBDEFFILE = Xvfb.def #endif -XVFBDIRS = $(STDDIRS) $(MFBDIR) $(FBDIR) $(XVFBDDXDIR) $(DEPDIRS) -#ifndef Win32Architecture -#if BuildDPMS -XVFBDPMSSTUBOBJS = $(XVFBDDXDIR)/dpmsstubs.o + HWSUBDIR = hw + MFBSUBDIR = mfb + FBSUBDIR = fb + XVFBDDXDIR = hw/vfb +#if BuildRECORD + XVFBRECORDEXT = $(XVFBDDXDIR)/$(RECORDEXT) #endif -XVFBOBJS = $(XVFBDDXDIR)/stubs.o $(XVFBDDXDIR)/miinitext.o $(XVFBDPMSSTUBOBJS) -#else -XVFBOBJS = dix/main.o hw/vfb/stubs.o hw/vfb/miinitext.o +#if BuildRender + XVFBRENDERLIB = $(XVFBDDXDIR)/$(RENDERLIB) +#endif +#if BuildRandR + XVFBRANDRLIB = $(XVFBDDXDIR)/$(RANDRLIB) #endif -XVFB = $(XVFBDDXDIR)/LibraryTargetName(vfb) -XVFBLIBS = PreFbLibs $(XVFB) $(FB) PostFbLibs -XVFBSYSLIBS = $(FONTLIBS) $(SYSLIBS) +#if BuildDBE + XVFBDBEEXT = $(XVFBDDXDIR)/$(DBEEXT) +#endif +#if BuildXTrap + XVFBXTRAPEXT = $(XVFBDDXDIR)/$(XTRAPEXT) +#endif + XVFBSTATICEXTS = $(LBXEXT) $(SITEEXTS) $(XVFBRANDRLIB) $(XVFBRENDERLIB) + XVFBMISCEXT = $(XVFBDDXDIR)/$(MISCEXT) + XVFBLOADABLEEXTS = $(XVFBMISCEXT) $(XVFBDBEEXT) $(XVFBRECORDEXT) $(GLXEXT) \ + $(XVFBXTRAPEXT) + XVFBEXTENSIONS = $(XVFBLOADABLEEXTS) $(XVFBSTATICEXTS) + XVFBEXTDIRS = $(GLXDIR) $(LBXDIRS) $(SITEEXTDIRS) + XVFBDIRS = $(STDDIRS) $(HWSUBDIR) $(XVFBEXTDIRS) \ + $(MFBSUBDIR) $(FBSUBDIR) $(DEPDIRS) + XVFBOBJS = $(XVFBDDXDIR)/dix/main.o $(XVFBDDXDIR)/miinitext.o + XVFB = $(XVFBDDXDIR)/LibraryTargetName(vfb) + XVFBLIBS = $(XVFBDDXDIR)/$(DIX) $(XVFBDDXDIR)/$(OS) $(XVFB) $(FB) \ + $(MFB) $(MI) $(XVFBEXTENSIONS) + XVFBFONTLIBS = $(FONT) $(FONTLIBSRC)/stubs/LibraryTargetName(fntstubs) + XVFBSYSLIBS = $(XVFBFONTLIBS) $(SYSLIBS) #if HasParallelMake MakeMutex($(XVFBDIRS) $(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS)) #endif @@ -1234,43 +1446,48 @@ $(XVFBOBJS) $(XVFB) $(XVFBLIBS) $(XVFBSYSLIBS):: $(XVFBDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xvfb,$(XVFBDIRS),$(XVFBOBJS) $(XVFBDEFFILE), \ - $(XVFBLIBS),$(XVFBSYSLIBS)) +ServerTarget(Xvfb, \ + $(XVFBDIRS), \ + $(XVFBOBJS) $(XVFBDEFFILE), \ + $(XVFBLIBS), \ + $(XVFBSYSLIBS)) #endif /* XVirtualFramebufferServer */ + #if defined(XdmxServer) && XdmxServer XCOMM XCOMM distribued multihead Server XCOMM -#ifndef Win32Architecture -XDMXDDXDIR = hw/dmx -#else -XDMXDDXDIR = hw + +#ifdef OS2Architecture + XDMXDEFFILE = Xdmx.def #endif -FBSUBDIR = fb -XDMXDIRS = $(STDDIRS) $(XDMXDDXDIR) $(SHADOWDIR) $(DEPDIRS) $(FBDIR) + HWSUBDIR = hw + FBSUBDIR = fb + XDMXDDXDIR = hw/dmx + DMXSTATICEXTS = $(XKBEXT) $(XINPUTEXT) $(LBXEXT) $(SITEEXTS) $(RENDERLIB) + DMXLOADABLEEXTS = $(XDMXDDXDIR)/$(MISCEXT) $(RECORDEXT) $(XTRAPEXT) + DMXEXTENSIONS = $(DMXLOADABLEEXTS) $(DMXSTATICEXTS) + DMXEXTDIRS = $(XKBDIR) $(XIDIR) $(LBXDIRS) $(RECORDDIR) $(RENDERDIR) \ + $(XTRAPDIR) $(SITEEXTDIRS) + XDMXDIRS = $(STDDIRS) $(HWSUBDIR) $(FBSUBDIR) \ + $(DMXEXTDIRS) $(SHADOWDIR) $(DEPDIRS) #if BuildGlxInDmx -#if BuildXinerama -GLXPROXY_EXTRAOBJS = hw/dmx/panoramiX.o + GLXPROXYLIB = $(XDMXDDXDIR)/glxProxy/LibraryTargetName(glxProxy) #endif -GLXPROXYLIB = hw/dmx/glxProxy/LibraryTargetName(glxProxy) -#endif -#if !defined(LynxOSArchitecture) && \ - !defined(Win32Architecture) && \ - !defined(QNX4Architecture) -XDMXOBJS = hw/dmx/miinitext.o $(GLXPROXY_EXTRAOBJS) -#else -XDMXOBJS = hw/dmx/miinitext.o $(GLXPROXY_EXTRAOBJS) dix/main.o -#endif -XDMXINPUT = hw/dmx/input/LibraryTargetName(dmxinput) -XDMXCONFIG = hw/dmx/config/LibraryTargetName(dmxconfig) -XDMX = hw/dmx/LibraryTargetName(dmxlib) $(XDMXCONFIG) $(GLXPROXYLIB) -XDMXLIBS = PreFbLibs $(XDMX) MiExtLibs $(FB) $(MI) $(DMXEXTENSIONS) $(XDMXINPUT) + XDMXOBJS = $(XDMXDDXDIR)/dix/main.o $(XDMXDDXDIR)/miinitext.o + XDMXINPUT = $(XDMXDDXDIR)/input/LibraryTargetName(dmxinput) + XDMXCONFIG = $(XDMXDDXDIR)/config/LibraryTargetName(dmxconfig) + XDMX = $(XDMXDDXDIR)/LibraryTargetName(dmxlib) $(XDMXCONFIG) \ + $(GLXPROXYLIB) + XDMXLIBS = $(XDMXDDXDIR)/$(DIX) $(XDMXDDXDIR)/$(OS) $(XDMX) \ + $(SHADOW) $(FB) $(MI) $(DMXEXTENSIONS) $(XDMXINPUT) #if BuildRender -XDMXRENDERLIB = $(XRENDERLIB) + XDMXRENDERLIB = $(XRENDERLIB) #endif -XDMXSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XILIB) $(XMULIB) $(XDMXRENDERLIB) \ - $(XLIB) $(NOAUTH_SYSLIBS) + XDMXFONTLIBS = $(FONT) $(FONTLIBSRC)/stubs/LibraryTargetName(fntstubs) + XDMXSYSLIBS = $(XDMXFONTLIBS) $(LDPRELIBS) $(XILIB) $(XMULIB) \ + $(XDMXRENDERLIB) $(XLIB) $(NOAUTH_SYSLIBS) #if HasParallelMake MakeMutex($(XDMXDIRS) $(XDMXOBJS) $(XDMXLIBS) $(XDMXSYSLIBS)) #endif @@ -1278,33 +1495,42 @@ $(XDMXOBJS) $(XDMXLIBS) $(XDMXSYSLIBS):: $(XDMXDIRS) @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(Xdmx,$(XDMXDIRS),$(XDMXOBJS) $(XDMXDEFFILE), \ - $(LIBCWRAPPER) $(XDMXLIBS),$(XDMXSYSLIBS)) +ServerTarget(Xdmx, \ + $(XDMXDIRS), \ + $(XDMXOBJS) $(XDMXDEFFILE), \ + $(XDMXLIBS), \ + $(XDMXSYSLIBS)) #endif /* XdmxServer */ + #if defined(XWinServer) && XWinServer XCOMM XCOMM X Server for MS Windows XCOMM -FBSUBDIR = fb + + DIXSUBDIR = dix + HWSUBDIR = hw + OSSUBDIR = os + FBSUBDIR = fb #if 1 -LAYERDIR = + LAYERDIR = #endif -XWINDDXDIR = hw/xwin -XWINPARSERDIR = hw/xfree86/parser -XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config) -XWINLIB = $(XWINDDXDIR)/LibraryTargetName(Xwin) -XWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(XWINDDXDIR) \ - $(DEPDIRS) $(XWINPARSERDIR) -XWINOBJS = $(XWINDDXDIR)/stubs.o $(XWINDDXDIR)/XWin.res + XWINDDXDIR = hw/xwin + XWINPARSERDIR = hw/xfree86/parser + XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config) + XWINLIB = $(XWINDDXDIR)/LibraryTargetName(Xwin) + XWINDIRS = $(STDDIRS) $(DIXSUBDIR) $(OSSUBDIR) $(HWSUBDIR) \ + $(EXTDIRS) $(FBSUBDIR) $(SHADOWDIR) $(LAYERDIR) \ + $(DEPDIRS) $(XWINPARSERDIR) + XWINOBJS = $(XWINDDXDIR)/stubs.o $(XWINDDXDIR)/XWin.res #if 0 -XWINLIBS = PreFbLibs $(XWINLIB) FbPostFbLibs $(LAYER) $(SHADOW) \ - $(XWINPARSERLIB) + XWINLIBS = $(DIX) $(OS) $(XPDDX) $(XWINLIB) $(FB) $(MI) \ + $(EXTENSIONS) $(LAYER) $(SHADOW) $(XWINPARSERLIB) #else -XWINLIBS = PreFbLibs $(XWINLIB) FbPostFbLibs $(SHADOW) \ - $(XWINPARSERLIB) + XWINLIBS = $(DIX) $(OS) $(XPDDX) $(XWINLIB) $(FB) $(MI) \ + $(EXTENSIONS) $(SHADOW) $(XWINPARSERLIB) #endif -XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) -lgdi32 + XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) -lgdi32 /* * These flags cause XWin.exe to be a Windows executable, which @@ -1314,7 +1540,7 @@ * implement a method to redirect status and error messages to a file * before enabling these flags. */ -EXTRA_LDOPTIONS = -mwindows -e _mainCRTStartup + EXTRA_LDOPTIONS = -mwindows -e _mainCRTStartup #if HasParallelMake MakeMutex($(XWINDIRS) $(XWINOBJS) $(XWINLIB) $(XWINLIBS) $(XWINSYSLIBS)) @@ -1325,8 +1551,11 @@ @if [ -f $@ ]; then touch $@ >/dev/null 2>&1 || exit 0; fi #endif -ServerTarget(XWin,$(XWINDIRS),$(XWINOBJS), \ - $(XWINLIBS),$(XWINSYSLIBS)) +ServerTarget(XWin, \ + $(XWINDIRS), \ + $(XWINOBJS), \ + $(XWINLIBS), \ + $(XWINSYSLIBS)) #ifndef ServerToInstall #define ServerToInstall XWin @@ -1341,49 +1570,61 @@ * off, libraries in ProjectRoot are listed as dependencies for some targets. * This causes problems unless we tell make where to find these dependencies. */ -VPATH = $(BUILDLIBDIR):$(USRLIBDIR) + VPATH = $(BUILDLIBDIR):$(USRLIBDIR) #endif #if defined(XDarwinServer) && XDarwinServer XCOMM XCOMM X Darwin server for Mac OS X / Darwin XCOMM -FBSUBDIR = fb -DARWINDDXDIR = hw/darwin -DARWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(DARWINDDXDIR) $(DEPDIRS) -DARWINOBJS = $(DARWINDDXDIR)/miinitext.o -DARWINLIBS = PreFbLibs $(DARWINDDXDIR)/LibraryTargetName(darwin) -DARWINEXTLIBS = MiExtLibs FbPostFbLibs $(DARWINDDXDIR)/LibraryTargetName(darwin) -DARWINSYSLIBS = $(FONTLIBS) $(SYSLIBS) -framework IOKit -IOKITLIB = $(DARWINDDXDIR)/iokit/LibraryTargetName(iokit) + + DIXSUBDIR = dix + HWSUBDIR = hw + OSSUBDIR = os + FBSUBDIR = fb + DARWINDDXDIR = hw/darwin + DARWINDIRS = $(STDDIRS) $(DIXSUBDIR) $(OSSUBDIR) $(HWSUBDIR) \ + $(EXTDIRS) $(FBSUBDIR) $(SHADOWDIR) $(DEPDIRS) + DARWINOBJS = $(DARWINDDXDIR)/miinitext.o + DARWINLIBS = $(DIX) $(OS) $(XPDDX) \ + $(DARWINDDXDIR)/LibraryTargetName(darwin) + DARWINEXTLIBS = $(SHADOW) $(FB) $(MI) $(EXTENSIONS) \ + $(DARWINDDXDIR)/LibraryTargetName(darwin) + DARWINSYSLIBS = $(FONTLIBS) $(SYSLIBS) -framework IOKit + IOKITLIB = $(DARWINDDXDIR)/iokit/LibraryTargetName(iokit) /* * IOKit X server */ -SetUIDServerTarget(XDarwin,$(DARWINDIRS),$(DARWINOBJS), \ - $(DARWINLIBS) $(IOKITLIB) $(DARWINEXTLIBS),$(DARWINSYSLIBS)) +SetUIDServerTarget(XDarwin, \ + $(DARWINDIRS), \ + $(DARWINOBJS), \ + $(DARWINLIBS) $(IOKITLIB) $(DARWINEXTLIBS), \ + $(DARWINSYSLIBS)) #if DarwinQuartzSupport -QUARTZDIR = $(DARWINDDXDIR)/quartz -QUARTZLIB = $(QUARTZDIR)/LibraryTargetName(XQuartz) -QUARTZSYSLIBS = -framework ApplicationServices -framework Cocoa \ - -framework CoreAudio -framework Carbon -ObjC -ROOTLESSLIB = $(ROOTLESSDIR)/LibraryTargetName(rootless) \ - $(ROOTLESSDIR)/safeAlpha/LibraryTargetName(safeAlpha) \ - $(ROOTLESSDIR)/accel/LibraryTargetName(rlAccel) -XPLUGINLIB = XpluginLibrary + QUARTZDIR = $(DARWINDDXDIR)/quartz + QUARTZLIB = $(QUARTZDIR)/LibraryTargetName(XQuartz) + QUARTZSYSLIBS = -framework ApplicationServices -framework Cocoa \ + -framework CoreAudio -framework Carbon -ObjC + ROOTLESSLIB = $(ROOTLESSDIR)/LibraryTargetName(rootless) \ + $(ROOTLESSDIR)/safeAlpha/LibraryTargetName(safeAlpha) \ + $(ROOTLESSDIR)/accel/LibraryTargetName(rlAccel) + XPLUGINLIB = XpluginLibrary #if NothingOutsideProjectRoot -XDARWINAPPDIR = $(BINDIR)/XDarwin.app/Contents + XDARWINAPPDIR = $(BINDIR)/XDarwin.app/Contents #else -XDARWINAPPDIR = /Applications/XDarwin.app/Contents + XDARWINAPPDIR = /Applications/XDarwin.app/Contents #endif /* * Quartz X server (installed in its application bundle) */ -SetUIDServerTarget(XDarwinApp,$(DARWINDIRS),$(DARWINOBJS), \ +SetUIDServerTarget(XDarwinApp, \ + $(DARWINDIRS), \ + $(DARWINOBJS), \ $(DARWINLIBS) $(QUARTZLIB) $(DARWINEXTLIBS), \ $(DARWINSYSLIBS) $(QUARTZSYSLIBS) -u _miDCInitialize) @@ -1399,44 +1640,72 @@ * (installed in their own bundles inside XDarwin's) */ #if HasXplugin -XPRDIRS = $(QUARTZDIR)/xpr $(ROOTLESSDIR) $(ROOTLESSDIR)/safeAlpha -XPRLIBS = $(QUARTZDIR)/xpr/LibraryTargetName(xpr) $(ROOTLESSLIB) - -BundleProgramTarget(xpr,XDarwinApp,$(XPRDIRS),$(QUARTZDIR)/xpr/xprScreen.o, \ - $(XPRLIBS),-framework ApplicationServices \ - $(XPLUGINLIB),$(XDARWINAPPDIR)/Resources) -#endif - -CRDIRS = $(QUARTZDIR)/cr $(ROOTLESSDIR) $(ROOTLESSDIR)/safeAlpha -CRLIBS = $(QUARTZDIR)/cr/LibraryTargetName(cr) $(ROOTLESSLIB) - -BundleProgramTarget(cr,XDarwinApp,$(CRDIRS),$(QUARTZDIR)/cr/crScreen.o, \ - $(CRLIBS),-framework ApplicationServices -framework Cocoa \ - -framework Carbon -ObjC,$(XDARWINAPPDIR)/Resources) - -FSDIRS = $(QUARTZDIR)/fullscreen $(SHADOWDIR) -FSLIBS = $(QUARTZDIR)/fullscreen/LibraryTargetName(fullscreen) $(SHADOW) + XPRDIRS = $(QUARTZDIR)/xpr $(ROOTLESSDIR) $(ROOTLESSDIR)/safeAlpha + XPRLIBS = $(QUARTZDIR)/xpr/LibraryTargetName(xpr) $(ROOTLESSLIB) -BundleProgramTarget(fullscreen,XDarwinApp,$(FSDIRS), \ - $(QUARTZDIR)/fullscreen/fullscreen.o,$(FSLIBS), \ - -framework ApplicationServices,$(XDARWINAPPDIR)/Resources) +BundleProgramTarget(xpr, \ + XDarwinApp, \ + $(XPRDIRS), \ + $(QUARTZDIR)/xpr/xprScreen.o, \ + $(XPRLIBS), \ + -framework ApplicationServices $(XPLUGINLIB), \ + $(XDARWINAPPDIR)/Resources) +#endif + + CRDIRS = $(QUARTZDIR)/cr $(ROOTLESSDIR) $(ROOTLESSDIR)/safeAlpha + CRLIBS = $(QUARTZDIR)/cr/LibraryTargetName(cr) $(ROOTLESSLIB) + +BundleProgramTarget(cr, \ + XDarwinApp, \ + $(CRDIRS), \ + $(QUARTZDIR)/cr/crScreen.o, \ + $(CRLIBS), \ + -framework ApplicationServices \ + -framework Cocoa \ + -framework Carbon -ObjC, \ + $(XDARWINAPPDIR)/Resources) + + FSDIRS = $(QUARTZDIR)/fullscreen $(SHADOWDIR) + FSLIBS = $(QUARTZDIR)/fullscreen/LibraryTargetName(fullscreen) \ + $(SHADOW) + +BundleProgramTarget(fullscreen, \ + XDarwinApp, \ + $(FSDIRS), \ + $(QUARTZDIR)/fullscreen/fullscreen.o, \ + $(FSLIBS), \ + -framework ApplicationServices, \ + $(XDARWINAPPDIR)/Resources) /* * GLX bundles for Quartz * (installed in their own bundles inside XDarwin's) */ -BundleProgramTarget(glxAGL,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \ - GL/apple/libAGLcore.a, \ - -framework AGL -framework OpenGL,$(XDARWINAPPDIR)/Resources) +BundleProgramTarget(glxAGL, \ + XDarwinApp, \ + GL, \ + GL/glx/glxext.o, \ + GL/glx/libglx.a GL/apple/libAGLcore.a, \ + -framework AGL -framework OpenGL, \ + $(XDARWINAPPDIR)/Resources) #if BuildAppleDRI -BundleProgramTarget(glxCGL,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \ - GL/apple/libCGLcore.a, \ - -framework OpenGL $(XPLUGINLIB),$(XDARWINAPPDIR)/Resources) -#endif - -BundleProgramTarget(glxMesa,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \ - GL/mesa/GLcore/libGLcore.a,NullParameter,$(XDARWINAPPDIR)/Resources) +BundleProgramTarget(glxCGL, \ + XDarwinApp, \ + GL, \ + GL/glx/glxext.o, \ + GL/glx/libglx.a GL/apple/libCGLcore.a, \ + -framework OpenGL $(XPLUGINLIB), \ + $(XDARWINAPPDIR)/Resources) +#endif + +BundleProgramTarget(glxMesa, \ + XDarwinApp, \ + GL, \ + GL/glx/glxext.o, \ + GL/glx/libglx.a GL/mesa/GLcore/libGLcore.a, \ + NullParameter, \ + $(XDARWINAPPDIR)/Resources) #else /* !DarwinQuartzSupport */ @@ -1447,18 +1716,35 @@ #endif /* XDarwinServer */ -CFBSUBDIRS = $(CFB8SUBDIR) $(CFB16SUBDIR) $(CFB24SUBDIR) $(CFB32SUBDIR) -MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) -IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR) -DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \ - $(HPDDXDIR) $(XFREE86DDXDIR) $(XWINDDXDIR) $(DARWINDDXDIR) \ - $(XVFBDDXDIR) $(XNESTDDXDIR) $(XDMXDDXDIR) -SUBDIRS = $(STDDIRS) $(MFBSUBDIR) $(CFBSUBDIRS) \ - $(IPLANDIRS) $(ILBMDIR) $(AFBSUBDIR) \ - $(LMFCFBDIR) $(DDXDIRS) $(FBSUBDIR) $(TINYXSUBDIRS) $(MIEXTDIRS) \ - $(XWINPARSERDIR) +#if defined(XnonServer) && XnonServer +XCOMM +XCOMM non server, just compile sources for build test +XCOMM + + XNONSUBDIRS = $(STDDIRS) $(DIXSUBDIR) $(OSSUBDIR) $(HWSUBDIR) \ + $(CFB8SUBDIR) $(CFB16SUBDIR) \ + $(CFB24SUBDIR) $(CFB32SUBDIR) \ + $(MFBSUBDIR) $(AFBSUBDIR) $(FBSUBDIR) \ + $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) \ + $(EXTDIRS) $(DEPDIRS) +#if HasParallelMake +MakeMutex($(XNONSUBDIRS)) +#endif +all:: Xnon +Xnon: $(XNONSUBDIRS) +#endif /* XnonServer */ + + + CFBSUBDIRS = $(CFB8SUBDIR) $(CFB16SUBDIR) $(CFB24SUBDIR) $(CFB32SUBDIR) + MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR) $(ROOTLESSDIR) + IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR) + SUBDIRS = $(STDDIRS) $(DIXSUBDIR) $(OSSUBDIR) $(HWSUBDIR) \ + $(EXTDIRS) $(LMFCFBSUBDIR) $(MFBSUBDIR) $(CFBSUBDIRS) \ + $(IPLANDIRS) $(ILBMDIR) $(AFBSUBDIR) \ + $(LMFCFBDIR) $(FBSUBDIR) $(TINYXSUBDIRS) \ + $(MIEXTDIRS) $(XWINPARSERDIR) -#if defined(ServerToInstall) && !defined(OS2Architecture) +#if defined(ServerToInstall) && !defined(OS2Architecture) install:: -(cd $(DESTDIR)$(BINDIR); $(RM) X; $(LN) ServerToInstall X) #endif @@ -1471,7 +1757,7 @@ ForceSubdirs($(DEPDIRS) $(SUBDIRS)) -DEFAULTFONTPATH = DefaultFontPath -EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`" + DEFAULTFONTPATH = DefaultFontPath + EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`" InstallManPage(Xserver,$(MANDIR)) Index: xc/programs/Xserver/XFree86.def diff -u xc/programs/Xserver/XFree86.def:1.6 xc/programs/Xserver/XFree86.def:1.7 --- xc/programs/Xserver/XFree86.def:1.6 Sun Feb 6 20:38:24 2005 +++ xc/programs/Xserver/XFree86.def Sat Apr 8 14:30:24 2006 @@ -1,5 +1,5 @@ NAME XFree86 NOTWINDOWCOMPAT -DESCRIPTION "@#XFREE86:4.5.0#@ $XFree86: xc/programs/Xserver/XFree86.def,v 1.6 2005/02/07 01:38:24 tsi Exp $" +DESCRIPTION "@#XFREE86:4.6.0#@ $XFree86: xc/programs/Xserver/XFree86.def,v 1.7 2006/04/08 18:30:24 dawes Exp $" PROTMODE EXETYPE OS2 Index: xc/programs/Xserver/Xdmx.def diff -u xc/programs/Xserver/Xdmx.def:1.1 xc/programs/Xserver/Xdmx.def:1.2 --- xc/programs/Xserver/Xdmx.def:1.1 Sun Feb 6 20:38:24 2005 +++ xc/programs/Xserver/Xdmx.def Sat Apr 8 14:30:24 2006 @@ -1,4 +1,4 @@ NAME Xdmx WINDOWCOMPAT -DESCRIPTION "@#XFREE86:4.5.0#@ $XFree86: xc/programs/Xserver/Xdmx.def,v 1.1 2005/02/07 01:38:24 tsi Exp $" +DESCRIPTION "@#XFREE86:4.6.0#@ $XFree86: xc/programs/Xserver/Xdmx.def,v 1.2 2006/04/08 18:30:24 dawes Exp $" PROTMODE EXETYPE OS2 Index: xc/programs/Xserver/Xnest.def diff -u xc/programs/Xserver/Xnest.def:3.6 xc/programs/Xserver/Xnest.def:3.7 --- xc/programs/Xserver/Xnest.def:3.6 Sun Feb 6 20:38:24 2005 +++ xc/programs/Xserver/Xnest.def Sat Apr 8 14:30:24 2006 @@ -1,4 +1,4 @@ NAME Xnest WINDOWCOMPAT -DESCRIPTION "@#XFREE86:4.5.0#@ $XFree86: xc/programs/Xserver/Xnest.def,v 3.6 2005/02/07 01:38:24 tsi Exp $" +DESCRIPTION "@#XFREE86:4.6.0#@ $XFree86: xc/programs/Xserver/Xnest.def,v 3.7 2006/04/08 18:30:24 dawes Exp $" PROTMODE EXETYPE OS2 Index: xc/programs/Xserver/Xserver.man diff -u xc/programs/Xserver/Xserver.man:3.33 xc/programs/Xserver/Xserver.man:3.35 --- xc/programs/Xserver/Xserver.man:3.33 Thu Feb 10 22:03:10 2005 +++ xc/programs/Xserver/Xserver.man Mon Mar 6 11:06:22 2006 @@ -1,4 +1,3 @@ -.\" $Xorg: Xserver.man,v 1.4 2001/02/09 02:04:07 xorgcvs Exp $ .\" Copyright 1984 - 1991, 1993, 1994, 1998 The Open Group .\" .\" Permission to use, copy, modify, distribute, and sell this software and its @@ -22,7 +21,7 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from The Open Group. -.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.33 2005/02/11 03:03:10 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/Xserver.man,v 3.35 2006/03/06 16:06:22 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH XSERVER 1 __vendorversion__ @@ -711,6 +710,11 @@ .I SIGTERM This signal causes the server to exit cleanly. .TP 8 +.I SIGINT +This signal causes the server to exit after cleaning up the DDX/hardware +state. This type of exit is not as clean as a SIGTERM, but is faster, and +far better than a SIGKILL. +.TP 8 .I SIGUSR1 This signal is used quite differently from either of the above. When the server starts, it checks to see if it has inherited SIGUSR1 as SIG_IGN Index: xc/programs/Xserver/Xvfb.def diff -u xc/programs/Xserver/Xvfb.def:3.5 xc/programs/Xserver/Xvfb.def:3.6 --- xc/programs/Xserver/Xvfb.def:3.5 Sun Feb 6 20:38:24 2005 +++ xc/programs/Xserver/Xvfb.def Sat Apr 8 14:30:24 2006 @@ -1,4 +1,4 @@ NAME Xvfb WINDOWCOMPAT -DESCRIPTION "@#XFREE86:4.5.0#@ $XFree86: xc/programs/Xserver/Xvfb.def,v 3.5 2005/02/07 01:38:24 tsi Exp $" +DESCRIPTION "@#XFREE86:4.6.0#@ $XFree86: xc/programs/Xserver/Xvfb.def,v 3.6 2006/04/08 18:30:24 dawes Exp $" PROTMODE EXETYPE OS2 Index: xc/programs/Xserver/GL/apple/Imakefile diff -u xc/programs/Xserver/GL/apple/Imakefile:1.5 xc/programs/Xserver/GL/apple/Imakefile:1.6 --- xc/programs/Xserver/GL/apple/Imakefile:1.5 Fri Dec 10 12:52:46 2004 +++ xc/programs/Xserver/GL/apple/Imakefile Fri Oct 14 11:16:09 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/apple/Imakefile,v 1.5 2004/12/10 17:52:46 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/apple/Imakefile,v 1.6 2005/10/14 15:16:09 tsi Exp $ #include @@ -29,9 +29,8 @@ SRCS = $(BASE_SRCS) $(AGL_SRCS) $(GL_SRCS) OBJS = $(BASE_OBJS) $(AGL_OBJS) $(GL_OBJS) - INCLUDES = -I. -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(LIBSRC)/GL/glx -I$(LIBSRC)/GL/include \ - -I$(SERVERSRC)/mi -I$(SERVERSRC)/include -I$(FONTINCSRC) \ + INCLUDES = -I$(LIBSRC)/GL/glx -I$(LIBSRC)/GL/include \ + -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ -I$(SERVERSRC)/render -I$(SERVERSRC)/GL/include \ -I$(SERVERSRC)/GL/glx -I$(SERVERSRC)/hw/darwin/quartz/cr \ -I$(SERVERSRC)/hw/darwin/quartz $(GL_INCLUDES) \ Index: xc/programs/Xserver/GL/dri/Imakefile diff -u xc/programs/Xserver/GL/dri/Imakefile:1.12 xc/programs/Xserver/GL/dri/Imakefile:1.13 --- xc/programs/Xserver/GL/dri/Imakefile:1.12 Mon Feb 28 22:48:50 2005 +++ xc/programs/Xserver/GL/dri/Imakefile Fri Oct 14 11:16:09 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/dri/Imakefile,v 1.12 2005/03/01 03:48:50 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/dri/Imakefile,v 1.13 2005/10/14 15:16:09 tsi Exp $ /* * Copyright (c) 2000-2005 by The XFree86 Project, Inc. * All rights reserved. @@ -57,12 +57,10 @@ SRCS = xf86dri.c dri.c $(MSRC) OBJS = xf86dri.o dri.o $(MOBJ) - INCLUDES = -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) -I$(MESASRCDIR)/include \ + INCLUDES = -I$(SERVERSRC)/include -I$(MESASRCDIR)/include \ -I$(XF86OSSRC) -I$(XF86COMSRC) \ -I../include -I../glx -I$(LIBSRC)/GL/include \ - -I$(SERVERSRC)/mi -I$(FONTINCSRC) \ - -I$(DRMINCLUDESDIR) + -I$(SERVERSRC)/mi -I$(DRMINCLUDESDIR) DEFINES = $(GLX_DEFINES) LinkSourceFile(xf86dri.h,$(LIBSRC)/GL/glx) Index: xc/programs/Xserver/GL/dri/dri.c diff -u xc/programs/Xserver/GL/dri/dri.c:1.42 xc/programs/Xserver/GL/dri/dri.c:1.44 --- xc/programs/Xserver/GL/dri/dri.c:1.42 Fri Dec 10 11:06:58 2004 +++ xc/programs/Xserver/GL/dri/dri.c Sun Feb 19 10:51:13 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.42 2004/12/10 16:06:58 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.44 2006/02/19 15:51:13 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -44,8 +44,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -67,10 +67,6 @@ #include "mi.h" #include "mipointer.h" -#if defined(XFree86LOADER) && !defined(PANORAMIX) -extern Bool noPanoramiXExtension; -#endif - static int DRIScreenPrivIndex = -1; static int DRIWindowPrivIndex = -1; static unsigned long DRIGeneration = 0; @@ -117,7 +113,6 @@ drm_context_t * reserved; int reserved_count; int i, fd, drmWasAvailable; - Bool xineramaInCore = FALSE; int err = 0; char *openbusid; drmVersionPtr drmlibv; @@ -133,22 +128,11 @@ * If Xinerama is on, don't allow DRI to initialise. It won't be usable * anyway. */ -#if defined(PANORAMIX) && !defined(XFree86LOADER) - xineramaInCore = TRUE; -#elif defined(XFree86LOADER) - if (xf86LoaderCheckSymbol("noPanoramiXExtension")) - xineramaInCore = TRUE; -#endif - -#if defined(PANORAMIX) || defined(XFree86LOADER) - if (xineramaInCore) { - if (!noPanoramiXExtension) { - DRIDrvMsg(pScreen->myNum, X_WARNING, - "Direct rendering is not supported when Xinerama is enabled\n"); - return FALSE; - } + if (IsXineramaActive()) { + DRIDrvMsg(pScreen->myNum, X_WARNING, + "Direct rendering is not supported when Xinerama is enabled\n"); + return FALSE; } -#endif drmWasAvailable = drmAvailable(); Index: xc/programs/Xserver/GL/dri/drimodule.c diff -u xc/programs/Xserver/GL/dri/drimodule.c:1.7 xc/programs/Xserver/GL/dri/drimodule.c:1.8 --- xc/programs/Xserver/GL/dri/drimodule.c:1.7 Mon Feb 28 22:48:50 2005 +++ xc/programs/Xserver/GL/dri/drimodule.c Thu Mar 16 11:49:48 2006 @@ -24,7 +24,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.7 2005/03/01 03:48:50 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/drimodule.c,v 1.8 2006/03/16 16:49:48 dawes Exp $ */ /* * Authors: @@ -93,7 +93,7 @@ XF86ModuleData driModuleData = { &VersRec, driSetup, NULL }; static pointer -driSetup(pointer module, pointer opts, int *errmaj, int *errmin) +driSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { pointer drm = NULL; @@ -102,8 +102,8 @@ if (!drm) { if (errmaj) *errmaj = LDR_NOSUBENT; } else { - LoaderReqSymLists(drmSymbols, NULL); - LoaderRefSymbols("noPanoramiXExtension", NULL); + LoaderModReqSymLists(drm, drmSymbols, NULL); + LoaderModRefSymbols(module, "noPanoramiXExtension", NULL); LoadExtension(&XF86DRIExt, FALSE); } /* Need a non-NULL return value to indicate success. */ Index: xc/programs/Xserver/GL/dri/xf86dri.c diff -u xc/programs/Xserver/GL/dri/xf86dri.c:1.14 xc/programs/Xserver/GL/dri/xf86dri.c:1.15 --- xc/programs/Xserver/GL/dri/xf86dri.c:1.14 Fri Dec 10 11:06:59 2004 +++ xc/programs/Xserver/GL/dri/xf86dri.c Fri Oct 14 11:16:09 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.14 2004/12/10 16:06:59 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.15 2005/10/14 15:16:09 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -42,8 +42,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" Index: xc/programs/Xserver/GL/glx/Imakefile diff -u xc/programs/Xserver/GL/glx/Imakefile:1.17 xc/programs/Xserver/GL/glx/Imakefile:1.19 --- xc/programs/Xserver/GL/glx/Imakefile:1.17 Fri Dec 10 11:06:59 2004 +++ xc/programs/Xserver/GL/glx/Imakefile Sun Oct 16 19:02:24 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/glx/Imakefile,v 1.17 2004/12/10 16:06:59 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/glx/Imakefile,v 1.19 2005/10/16 23:02:24 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -89,10 +89,9 @@ g_render.o g_renderswap.o g_single.o g_singleswap.o \ glcontextmodes.o $(MOBJS) - INCLUDES = -I$(SERVERSRC)/GL/glx -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(MESASRCDIR)/include \ - -I$(XINCLUDESRC) -I$(SERVERSRC)/mi \ - -I$(EXTINCSRC) -I$(FONTINCSRC) -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) + INCLUDES = -I$(SERVERSRC)/GL/glx -I$(SERVERSRC)/GL/include \ + -I$(SERVERSRC)/include -I$(MESASRCDIR)/include \ + -I$(SERVERSRC)/mi -I$(LIBSRC)/GL/include #if defined(DarwinArchitecture) && ((OSMajorVersion == 6 && OSMinorVersion < 3) || OSMajorVersion < 6) NO_EXT_DEFS = -DMISSING_GL_EXTS Index: xc/programs/Xserver/GL/glx/glxmodule.c diff -u xc/programs/Xserver/GL/glx/glxmodule.c:1.2 xc/programs/Xserver/GL/glx/glxmodule.c:1.3 --- xc/programs/Xserver/GL/glx/glxmodule.c:1.2 Fri Dec 10 11:06:59 2004 +++ xc/programs/Xserver/GL/glx/glxmodule.c Thu Mar 16 11:49:49 2006 @@ -25,7 +25,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/programs/Xserver/GL/glx/glxmodule.c,v 1.2 2004/12/10 16:06:59 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/glx/glxmodule.c,v 1.3 2006/03/16 16:49:49 dawes Exp $ */ /* * Authors: @@ -60,841 +60,10 @@ "__glColorTableParameteriv_size", "__glConvolutionParameterfv_size", "__glConvolutionParameteriv_size", - "__glDDXExtensionInfo", - "__glDDXScreenInfo", "__glEvalComputeK", "__glFloorLog2", "__glFogfv_size", "__glFogiv_size", - "__glGetBooleanv_size", - "__glGetColorTableParameterfv_size", - "__glGetColorTableParameteriv_size", - "__glGetConvolutionParameterfv_size", - "__glGetConvolutionParameteriv_size", - "__glGetDoublev_size", - "__glGetFloatv_size", - "__glGetHistogramParameterfv_size", - "__glGetHistogramParameteriv_size", - "__glGetIntegerv_size", - "__glGetLightfv_size", - "__glGetLightiv_size", - "__glGetMapdv_size", - "__glGetMapfv_size", - "__glGetMapiv_size", - "__glGetMaterialfv_size", - "__glGetMaterialiv_size", - "__glGetMinmaxParameterfv_size", - "__glGetMinmaxParameteriv_size", - "__glGetPixelMapfv_size", - "__glGetPixelMapuiv_size", - "__glGetPixelMapusv_size", - "__glGetTexEnvfv_size", - "__glGetTexEnviv_size", - "__glGetTexGendv_size", - "__glGetTexGenfv_size", - "__glGetTexGeniv_size", - "__glGetTexImage_size", - "__glGetTexLevelParameterfv_size", - "__glGetTexLevelParameteriv_size", - "__glGetTexParameterfv_size", - "__glGetTexParameteriv_size", - "__glLightModelfv_size", - "__glLightModeliv_size", - "__glLightfv_size", - "__glLightiv_size", - "__glMaterialfv_size", - "__glMaterialiv_size", - "__glPointParameterfvARB_size", - "__glReadPixels_size", - "__glTexEnvfv_size", - "__glTexEnviv_size", - "__glTexGendv_size", - "__glTexGenfv_size", - "__glTexGeniv_size", - "__glTexParameterfv_size", - "__glTexParameteriv_size", - "__glXglDDXExtensionInfo", - "__glXglDDXScreenInfo", - "__glXActiveScreens", - "__glXAssociateContext", - "__glXBadContext", - "__glXBadContextState", - "__glXBadContextTag", - "__glXBadCurrentWindow", - "__glXBadDrawable", - "__glXBadLargeRequest", - "__glXBadPixmap", - "__glXBadRenderRequest", - "__glXBitmapReqSize", - "__glXCacheDrawableSize", - "__glXCallListsReqSize", - "__glXClearErrorOccured", - "__glXClientInfo", - "__glXClientRes", - "__glXClients", - "__glXColorSubTableReqSize", - "__glXColorTableParameterfvReqSize", - "__glXColorTableParameterivReqSize", - "__glXColorTableReqSize", - "__glXContextRes", - "__glXConvolutionFilter1DReqSize", - "__glXConvolutionFilter2DReqSize", - "__glXConvolutionParameterfvReqSize", - "__glXConvolutionParameterivReqSize", - "__glXCopyContext", - "__glXCoreType", - "__glXCreateContext", - "__glXCreateGLXPixmap", - "__glXDeassociateContext", - "__glXDestroyContext", - "__glXDestroyGLXPixmap", - "__glXDispSwap_Accum", - "__glXDispSwap_ActiveStencilFaceEXT", - "__glXDispSwap_ActiveTextureARB", - "__glXDispSwap_AlphaFunc", - "__glXDispSwap_AreTexturesResident", - "__glXDispSwap_AreTexturesResidentEXT", - "__glXDispSwap_Begin", - "__glXDispSwap_BindTexture", - "__glXDispSwap_Bitmap", - "__glXDispSwap_BlendColor", - "__glXDispSwap_BlendEquation", - "__glXDispSwap_BlendFunc", - "__glXDispSwap_CallList", - "__glXDispSwap_CallLists", - "__glXDispSwap_Clear", - "__glXDispSwap_ClearAccum", - "__glXDispSwap_ClearColor", - "__glXDispSwap_ClearDepth", - "__glXDispSwap_ClearIndex", - "__glXDispSwap_ClearStencil", - "__glXDispSwap_ClipPlane", - "__glXDispSwap_Color3bv", - "__glXDispSwap_Color3dv", - "__glXDispSwap_Color3fv", - "__glXDispSwap_Color3iv", - "__glXDispSwap_Color3sv", - "__glXDispSwap_Color3ubv", - "__glXDispSwap_Color3uiv", - "__glXDispSwap_Color3usv", - "__glXDispSwap_Color4bv", - "__glXDispSwap_Color4dv", - "__glXDispSwap_Color4fv", - "__glXDispSwap_Color4iv", - "__glXDispSwap_Color4sv", - "__glXDispSwap_Color4ubv", - "__glXDispSwap_Color4uiv", - "__glXDispSwap_Color4usv", - "__glXDispSwap_ColorMask", - "__glXDispSwap_ColorMaterial", - "__glXDispSwap_ColorSubTable", - "__glXDispSwap_ColorTable", - "__glXDispSwap_ColorTableParameterfv", - "__glXDispSwap_ColorTableParameteriv", - "__glXDispSwap_ConvolutionFilter1D", - "__glXDispSwap_ConvolutionFilter2D", - "__glXDispSwap_ConvolutionParameterf", - "__glXDispSwap_ConvolutionParameterfv", - "__glXDispSwap_ConvolutionParameteri", - "__glXDispSwap_ConvolutionParameteriv", - "__glXDispSwap_CopyColorSubTable", - "__glXDispSwap_CopyColorTable", - "__glXDispSwap_CopyConvolutionFilter1D", - "__glXDispSwap_CopyConvolutionFilter2D", - "__glXDispSwap_CopyPixels", - "__glXDispSwap_CopyTexImage1D", - "__glXDispSwap_CopyTexImage2D", - "__glXDispSwap_CopyTexSubImage1D", - "__glXDispSwap_CopyTexSubImage2D", - "__glXDispSwap_CopyTexSubImage3D", - "__glXDispSwap_CullFace", - "__glXDispSwap_DeleteLists", - "__glXDispSwap_DeleteTextures", - "__glXDispSwap_DeleteTexturesEXT", - "__glXDispSwap_DepthFunc", - "__glXDispSwap_DepthMask", - "__glXDispSwap_DepthRange", - "__glXDispSwap_Disable", - "__glXDispSwap_DrawArrays", - "__glXDispSwap_DrawArraysEXT", - "__glXDispSwap_DrawBuffer", - "__glXDispSwap_DrawPixels", - "__glXDispSwap_EdgeFlagv", - "__glXDispSwap_Enable", - "__glXDispSwap_End", - "__glXDispSwap_EndList", - "__glXDispSwap_EvalCoord1dv", - "__glXDispSwap_EvalCoord1fv", - "__glXDispSwap_EvalCoord2dv", - "__glXDispSwap_EvalCoord2fv", - "__glXDispSwap_EvalMesh1", - "__glXDispSwap_EvalMesh2", - "__glXDispSwap_EvalPoint1", - "__glXDispSwap_EvalPoint2", - "__glXDispSwap_FeedbackBuffer", - "__glXDispSwap_Finish", - "__glXDispSwap_Flush", - "__glXDispSwap_Fogf", - "__glXDispSwap_Fogfv", - "__glXDispSwap_Fogi", - "__glXDispSwap_Fogiv", - "__glXDispSwap_FrontFace", - "__glXDispSwap_Frustum", - "__glXDispSwap_GenLists", - "__glXDispSwap_GenTextures", - "__glXDispSwap_GenTexturesEXT", - "__glXDispSwap_GetBooleanv", - "__glXDispSwap_GetClipPlane", - "__glXDispSwap_GetColorTable", - "__glXDispSwap_GetColorTableParameterfv", - "__glXDispSwap_GetColorTableParameteriv", - "__glXDispSwap_GetConvolutionFilter", - "__glXDispSwap_GetConvolutionParameterfv", - "__glXDispSwap_GetConvolutionParameteriv", - "__glXDispSwap_GetDoublev", - "__glXDispSwap_GetError", - "__glXDispSwap_GetFloatv", - "__glXDispSwap_GetHistogram", - "__glXDispSwap_GetHistogramParameterfv", - "__glXDispSwap_GetHistogramParameteriv", - "__glXDispSwap_GetIntegerv", - "__glXDispSwap_GetLightfv", - "__glXDispSwap_GetLightiv", - "__glXDispSwap_GetMapdv", - "__glXDispSwap_GetMapfv", - "__glXDispSwap_GetMapiv", - "__glXDispSwap_GetMaterialfv", - "__glXDispSwap_GetMaterialiv", - "__glXDispSwap_GetMinmax", - "__glXDispSwap_GetMinmaxParameterfv", - "__glXDispSwap_GetMinmaxParameteriv", - "__glXDispSwap_GetPixelMapfv", - "__glXDispSwap_GetPixelMapuiv", - "__glXDispSwap_GetPixelMapusv", - "__glXDispSwap_GetPolygonStipple", - "__glXDispSwap_GetSeparableFilter", - "__glXDispSwap_GetString", - "__glXDispSwap_GetTexEnvfv", - "__glXDispSwap_GetTexEnviv", - "__glXDispSwap_GetTexGendv", - "__glXDispSwap_GetTexGenfv", - "__glXDispSwap_GetTexGeniv", - "__glXDispSwap_GetTexImage", - "__glXDispSwap_GetTexLevelParameterfv", - "__glXDispSwap_GetTexLevelParameteriv", - "__glXDispSwap_GetTexParameterfv", - "__glXDispSwap_GetTexParameteriv", - "__glXDispSwap_Hint", - "__glXDispSwap_Histogram", - "__glXDispSwap_IndexMask", - "__glXDispSwap_Indexdv", - "__glXDispSwap_Indexfv", - "__glXDispSwap_Indexiv", - "__glXDispSwap_Indexsv", - "__glXDispSwap_Indexubv", - "__glXDispSwap_InitNames", - "__glXDispSwap_IsEnabled", - "__glXDispSwap_IsList", - "__glXDispSwap_IsTexture", - "__glXDispSwap_IsTextureEXT", - "__glXDispSwap_LightModelf", - "__glXDispSwap_LightModelfv", - "__glXDispSwap_LightModeli", - "__glXDispSwap_LightModeliv", - "__glXDispSwap_Lightf", - "__glXDispSwap_Lightfv", - "__glXDispSwap_Lighti", - "__glXDispSwap_Lightiv", - "__glXDispSwap_LineStipple", - "__glXDispSwap_LineWidth", - "__glXDispSwap_ListBase", - "__glXDispSwap_LoadIdentity", - "__glXDispSwap_LoadMatrixd", - "__glXDispSwap_LoadMatrixf", - "__glXDispSwap_LoadName", - "__glXDispSwap_LogicOp", - "__glXDispSwap_Map1d", - "__glXDispSwap_Map1f", - "__glXDispSwap_Map2d", - "__glXDispSwap_Map2f", - "__glXDispSwap_MapGrid1d", - "__glXDispSwap_MapGrid1f", - "__glXDispSwap_MapGrid2d", - "__glXDispSwap_MapGrid2f", - "__glXDispSwap_Materialf", - "__glXDispSwap_Materialfv", - "__glXDispSwap_Materiali", - "__glXDispSwap_Materialiv", - "__glXDispSwap_MatrixMode", - "__glXDispSwap_Minmax", - "__glXDispSwap_MultMatrixd", - "__glXDispSwap_MultMatrixf", - "__glXDispSwap_MultiTexCoord1dvARB", - "__glXDispSwap_MultiTexCoord1fvARB", - "__glXDispSwap_MultiTexCoord1ivARB", - "__glXDispSwap_MultiTexCoord1svARB", - "__glXDispSwap_MultiTexCoord2dvARB", - "__glXDispSwap_MultiTexCoord2fvARB", - "__glXDispSwap_MultiTexCoord2ivARB", - "__glXDispSwap_MultiTexCoord2svARB", - "__glXDispSwap_MultiTexCoord3dvARB", - "__glXDispSwap_MultiTexCoord3fvARB", - "__glXDispSwap_MultiTexCoord3ivARB", - "__glXDispSwap_MultiTexCoord3svARB", - "__glXDispSwap_MultiTexCoord4dvARB", - "__glXDispSwap_MultiTexCoord4fvARB", - "__glXDispSwap_MultiTexCoord4ivARB", - "__glXDispSwap_MultiTexCoord4svARB", - "__glXDispSwap_NewList", - "__glXDispSwap_Normal3bv", - "__glXDispSwap_Normal3dv", - "__glXDispSwap_Normal3fv", - "__glXDispSwap_Normal3iv", - "__glXDispSwap_Normal3sv", - "__glXDispSwap_Ortho", - "__glXDispSwap_PassThrough", - "__glXDispSwap_PixelMapfv", - "__glXDispSwap_PixelMapuiv", - "__glXDispSwap_PixelMapusv", - "__glXDispSwap_PixelStoref", - "__glXDispSwap_PixelStorei", - "__glXDispSwap_PixelTransferf", - "__glXDispSwap_PixelTransferi", - "__glXDispSwap_PixelZoom", - "__glXDispSwap_PointParameterfARB", - "__glXDispSwap_PointParameterfvARB", - "__glXDispSwap_PointSize", - "__glXDispSwap_PolygonMode", - "__glXDispSwap_PolygonOffset", - "__glXDispSwap_PolygonStipple", - "__glXDispSwap_PopAttrib", - "__glXDispSwap_PopMatrix", - "__glXDispSwap_PopName", - "__glXDispSwap_PrioritizeTextures", - "__glXDispSwap_PushAttrib", - "__glXDispSwap_PushMatrix", - "__glXDispSwap_PushName", - "__glXDispSwap_RasterPos2dv", - "__glXDispSwap_RasterPos2fv", - "__glXDispSwap_RasterPos2iv", - "__glXDispSwap_RasterPos2sv", - "__glXDispSwap_RasterPos3dv", - "__glXDispSwap_RasterPos3fv", - "__glXDispSwap_RasterPos3iv", - "__glXDispSwap_RasterPos3sv", - "__glXDispSwap_RasterPos4dv", - "__glXDispSwap_RasterPos4fv", - "__glXDispSwap_RasterPos4iv", - "__glXDispSwap_RasterPos4sv", - "__glXDispSwap_ReadBuffer", - "__glXDispSwap_ReadPixels", - "__glXDispSwap_Rectdv", - "__glXDispSwap_Rectfv", - "__glXDispSwap_Rectiv", - "__glXDispSwap_Rectsv", - "__glXDispSwap_RenderMode", - "__glXDispSwap_ResetHistogram", - "__glXDispSwap_ResetMinmax", - "__glXDispSwap_Rotated", - "__glXDispSwap_Rotatef", - "__glXDispSwap_Scaled", - "__glXDispSwap_Scalef", - "__glXDispSwap_Scissor", - "__glXDispSwap_SelectBuffer", - "__glXDispSwap_SeparableFilter2D", - "__glXDispSwap_ShadeModel", - "__glXDispSwap_StencilFunc", - "__glXDispSwap_StencilMask", - "__glXDispSwap_StencilOp", - "__glXDispSwap_TexCoord1dv", - "__glXDispSwap_TexCoord1fv", - "__glXDispSwap_TexCoord1iv", - "__glXDispSwap_TexCoord1sv", - "__glXDispSwap_TexCoord2dv", - "__glXDispSwap_TexCoord2fv", - "__glXDispSwap_TexCoord2iv", - "__glXDispSwap_TexCoord2sv", - "__glXDispSwap_TexCoord3dv", - "__glXDispSwap_TexCoord3fv", - "__glXDispSwap_TexCoord3iv", - "__glXDispSwap_TexCoord3sv", - "__glXDispSwap_TexCoord4dv", - "__glXDispSwap_TexCoord4fv", - "__glXDispSwap_TexCoord4iv", - "__glXDispSwap_TexCoord4sv", - "__glXDispSwap_TexEnvf", - "__glXDispSwap_TexEnvfv", - "__glXDispSwap_TexEnvi", - "__glXDispSwap_TexEnviv", - "__glXDispSwap_TexGend", - "__glXDispSwap_TexGendv", - "__glXDispSwap_TexGenf", - "__glXDispSwap_TexGenfv", - "__glXDispSwap_TexGeni", - "__glXDispSwap_TexGeniv", - "__glXDispSwap_TexImage1D", - "__glXDispSwap_TexImage2D", - "__glXDispSwap_TexImage3D", - "__glXDispSwap_TexParameterf", - "__glXDispSwap_TexParameterfv", - "__glXDispSwap_TexParameteri", - "__glXDispSwap_TexParameteriv", - "__glXDispSwap_TexSubImage1D", - "__glXDispSwap_TexSubImage2D", - "__glXDispSwap_TexSubImage3D", - "__glXDispSwap_Translated", - "__glXDispSwap_Translatef", - "__glXDispSwap_Vertex2dv", - "__glXDispSwap_Vertex2fv", - "__glXDispSwap_Vertex2iv", - "__glXDispSwap_Vertex2sv", - "__glXDispSwap_Vertex3dv", - "__glXDispSwap_Vertex3fv", - "__glXDispSwap_Vertex3iv", - "__glXDispSwap_Vertex3sv", - "__glXDispSwap_Vertex4dv", - "__glXDispSwap_Vertex4fv", - "__glXDispSwap_Vertex4iv", - "__glXDispSwap_Vertex4sv", - "__glXDispSwap_Viewport", - "__glXDispSwap_WindowPos3fARB", - "__glXDisp_Accum", - "__glXDisp_ActiveStencilFaceEXT", - "__glXDisp_ActiveTextureARB", - "__glXDisp_AlphaFunc", - "__glXDisp_AreTexturesResident", - "__glXDisp_AreTexturesResidentEXT", - "__glXDisp_Begin", - "__glXDisp_BindTexture", - "__glXDisp_Bitmap", - "__glXDisp_BlendColor", - "__glXDisp_BlendEquation", - "__glXDisp_BlendFunc", - "__glXDisp_CallList", - "__glXDisp_CallLists", - "__glXDisp_Clear", - "__glXDisp_ClearAccum", - "__glXDisp_ClearColor", - "__glXDisp_ClearDepth", - "__glXDisp_ClearIndex", - "__glXDisp_ClearStencil", - "__glXDisp_ClipPlane", - "__glXDisp_Color3bv", - "__glXDisp_Color3dv", - "__glXDisp_Color3fv", - "__glXDisp_Color3iv", - "__glXDisp_Color3sv", - "__glXDisp_Color3ubv", - "__glXDisp_Color3uiv", - "__glXDisp_Color3usv", - "__glXDisp_Color4bv", - "__glXDisp_Color4dv", - "__glXDisp_Color4fv", - "__glXDisp_Color4iv", - "__glXDisp_Color4sv", - "__glXDisp_Color4ubv", - "__glXDisp_Color4uiv", - "__glXDisp_Color4usv", - "__glXDisp_ColorMask", - "__glXDisp_ColorMaterial", - "__glXDisp_ColorSubTable", - "__glXDisp_ColorTable", - "__glXDisp_ColorTableParameterfv", - "__glXDisp_ColorTableParameteriv", - "__glXDisp_ConvolutionFilter1D", - "__glXDisp_ConvolutionFilter2D", - "__glXDisp_ConvolutionParameterf", - "__glXDisp_ConvolutionParameterfv", - "__glXDisp_ConvolutionParameteri", - "__glXDisp_ConvolutionParameteriv", - "__glXDisp_CopyColorSubTable", - "__glXDisp_CopyColorTable", - "__glXDisp_CopyConvolutionFilter1D", - "__glXDisp_CopyConvolutionFilter2D", - "__glXDisp_CopyPixels", - "__glXDisp_CopyTexImage1D", - "__glXDisp_CopyTexImage2D", - "__glXDisp_CopyTexSubImage1D", - "__glXDisp_CopyTexSubImage2D", - "__glXDisp_CopyTexSubImage3D", - "__glXDisp_CullFace", - "__glXDisp_DeleteLists", - "__glXDisp_DeleteTextures", - "__glXDisp_DeleteTexturesEXT", - "__glXDisp_DepthFunc", - "__glXDisp_DepthMask", - "__glXDisp_DepthRange", - "__glXDisp_Disable", - "__glXDisp_DrawArrays", - "__glXDisp_DrawArraysEXT", - "__glXDisp_DrawBuffer", - "__glXDisp_DrawPixels", - "__glXDisp_EdgeFlagv", - "__glXDisp_Enable", - "__glXDisp_End", - "__glXDisp_EndList", - "__glXDisp_EvalCoord1dv", - "__glXDisp_EvalCoord1fv", - "__glXDisp_EvalCoord2dv", - "__glXDisp_EvalCoord2fv", - "__glXDisp_EvalMesh1", - "__glXDisp_EvalMesh2", - "__glXDisp_EvalPoint1", - "__glXDisp_EvalPoint2", - "__glXDisp_FeedbackBuffer", - "__glXDisp_Finish", - "__glXDisp_Flush", - "__glXDisp_Fogf", - "__glXDisp_Fogfv", - "__glXDisp_Fogi", - "__glXDisp_Fogiv", - "__glXDisp_FrontFace", - "__glXDisp_Frustum", - "__glXDisp_GenLists", - "__glXDisp_GenTextures", - "__glXDisp_GenTexturesEXT", - "__glXDisp_GetBooleanv", - "__glXDisp_GetClipPlane", - "__glXDisp_GetColorTable", - "__glXDisp_GetColorTableParameterfv", - "__glXDisp_GetColorTableParameteriv", - "__glXDisp_GetConvolutionFilter", - "__glXDisp_GetConvolutionParameterfv", - "__glXDisp_GetConvolutionParameteriv", - "__glXDisp_GetDoublev", - "__glXDisp_GetError", - "__glXDisp_GetFloatv", - "__glXDisp_GetHistogram", - "__glXDisp_GetHistogramParameterfv", - "__glXDisp_GetHistogramParameteriv", - "__glXDisp_GetIntegerv", - "__glXDisp_GetLightfv", - "__glXDisp_GetLightiv", - "__glXDisp_GetMapdv", - "__glXDisp_GetMapfv", - "__glXDisp_GetMapiv", - "__glXDisp_GetMaterialfv", - "__glXDisp_GetMaterialiv", - "__glXDisp_GetMinmax", - "__glXDisp_GetMinmaxParameterfv", - "__glXDisp_GetMinmaxParameteriv", - "__glXDisp_GetPixelMapfv", - "__glXDisp_GetPixelMapuiv", - "__glXDisp_GetPixelMapusv", - "__glXDisp_GetPolygonStipple", - "__glXDisp_GetSeparableFilter", - "__glXDisp_GetString", - "__glXDisp_GetTexEnvfv", - "__glXDisp_GetTexEnviv", - "__glXDisp_GetTexGendv", - "__glXDisp_GetTexGenfv", - "__glXDisp_GetTexGeniv", - "__glXDisp_GetTexImage", - "__glXDisp_GetTexLevelParameterfv", - "__glXDisp_GetTexLevelParameteriv", - "__glXDisp_GetTexParameterfv", - "__glXDisp_GetTexParameteriv", - "__glXDisp_Hint", - "__glXDisp_Histogram", - "__glXDisp_IndexMask", - "__glXDisp_Indexdv", - "__glXDisp_Indexfv", - "__glXDisp_Indexiv", - "__glXDisp_Indexsv", - "__glXDisp_Indexubv", - "__glXDisp_InitNames", - "__glXDisp_IsEnabled", - "__glXDisp_IsList", - "__glXDisp_IsTexture", - "__glXDisp_IsTextureEXT", - "__glXDisp_LightModelf", - "__glXDisp_LightModelfv", - "__glXDisp_LightModeli", - "__glXDisp_LightModeliv", - "__glXDisp_Lightf", - "__glXDisp_Lightfv", - "__glXDisp_Lighti", - "__glXDisp_Lightiv", - "__glXDisp_LineStipple", - "__glXDisp_LineWidth", - "__glXDisp_ListBase", - "__glXDisp_LoadIdentity", - "__glXDisp_LoadMatrixd", - "__glXDisp_LoadMatrixf", - "__glXDisp_LoadName", - "__glXDisp_LogicOp", - "__glXDisp_Map1d", - "__glXDisp_Map1f", - "__glXDisp_Map2d", - "__glXDisp_Map2f", - "__glXDisp_MapGrid1d", - "__glXDisp_MapGrid1f", - "__glXDisp_MapGrid2d", - "__glXDisp_MapGrid2f", - "__glXDisp_Materialf", - "__glXDisp_Materialfv", - "__glXDisp_Materiali", - "__glXDisp_Materialiv", - "__glXDisp_MatrixMode", - "__glXDisp_Minmax", - "__glXDisp_MultMatrixd", - "__glXDisp_MultMatrixf", - "__glXDisp_MultiTexCoord1dvARB", - "__glXDisp_MultiTexCoord1fvARB", - "__glXDisp_MultiTexCoord1ivARB", - "__glXDisp_MultiTexCoord1svARB", - "__glXDisp_MultiTexCoord2dvARB", - "__glXDisp_MultiTexCoord2fvARB", - "__glXDisp_MultiTexCoord2ivARB", - "__glXDisp_MultiTexCoord2svARB", - "__glXDisp_MultiTexCoord3dvARB", - "__glXDisp_MultiTexCoord3fvARB", - "__glXDisp_MultiTexCoord3ivARB", - "__glXDisp_MultiTexCoord3svARB", - "__glXDisp_MultiTexCoord4dvARB", - "__glXDisp_MultiTexCoord4fvARB", - "__glXDisp_MultiTexCoord4ivARB", - "__glXDisp_MultiTexCoord4svARB", - "__glXDisp_NewList", - "__glXDisp_Normal3bv", - "__glXDisp_Normal3dv", - "__glXDisp_Normal3fv", - "__glXDisp_Normal3iv", - "__glXDisp_Normal3sv", - "__glXDisp_Ortho", - "__glXDisp_PassThrough", - "__glXDisp_PixelMapfv", - "__glXDisp_PixelMapuiv", - "__glXDisp_PixelMapusv", - "__glXDisp_PixelStoref", - "__glXDisp_PixelStorei", - "__glXDisp_PixelTransferf", - "__glXDisp_PixelTransferi", - "__glXDisp_PixelZoom", - "__glXDisp_PointParameterfARB", - "__glXDisp_PointParameterfvARB", - "__glXDisp_PointSize", - "__glXDisp_PolygonMode", - "__glXDisp_PolygonOffset", - "__glXDisp_PolygonStipple", - "__glXDisp_PopAttrib", - "__glXDisp_PopMatrix", - "__glXDisp_PopName", - "__glXDisp_PrioritizeTextures", - "__glXDisp_PushAttrib", - "__glXDisp_PushMatrix", - "__glXDisp_PushName", - "__glXDisp_RasterPos2dv", - "__glXDisp_RasterPos2fv", - "__glXDisp_RasterPos2iv", - "__glXDisp_RasterPos2sv", - "__glXDisp_RasterPos3dv", - "__glXDisp_RasterPos3fv", - "__glXDisp_RasterPos3iv", - "__glXDisp_RasterPos3sv", - "__glXDisp_RasterPos4dv", - "__glXDisp_RasterPos4fv", - "__glXDisp_RasterPos4iv", - "__glXDisp_RasterPos4sv", - "__glXDisp_ReadBuffer", - "__glXDisp_ReadPixels", - "__glXDisp_Rectdv", - "__glXDisp_Rectfv", - "__glXDisp_Rectiv", - "__glXDisp_Rectsv", - "__glXDisp_RenderMode", - "__glXDisp_ResetHistogram", - "__glXDisp_ResetMinmax", - "__glXDisp_Rotated", - "__glXDisp_Rotatef", - "__glXDisp_Scaled", - "__glXDisp_Scalef", - "__glXDisp_Scissor", - "__glXDisp_SelectBuffer", - "__glXDisp_SeparableFilter2D", - "__glXDisp_ShadeModel", - "__glXDisp_StencilFunc", - "__glXDisp_StencilMask", - "__glXDisp_StencilOp", - "__glXDisp_TexCoord1dv", - "__glXDisp_TexCoord1fv", - "__glXDisp_TexCoord1iv", - "__glXDisp_TexCoord1sv", - "__glXDisp_TexCoord2dv", - "__glXDisp_TexCoord2fv", - "__glXDisp_TexCoord2iv", - "__glXDisp_TexCoord2sv", - "__glXDisp_TexCoord3dv", - "__glXDisp_TexCoord3fv", - "__glXDisp_TexCoord3iv", - "__glXDisp_TexCoord3sv", - "__glXDisp_TexCoord4dv", - "__glXDisp_TexCoord4fv", - "__glXDisp_TexCoord4iv", - "__glXDisp_TexCoord4sv", - "__glXDisp_TexEnvf", - "__glXDisp_TexEnvfv", - "__glXDisp_TexEnvi", - "__glXDisp_TexEnviv", - "__glXDisp_TexGend", - "__glXDisp_TexGendv", - "__glXDisp_TexGenf", - "__glXDisp_TexGenfv", - "__glXDisp_TexGeni", - "__glXDisp_TexGeniv", - "__glXDisp_TexImage1D", - "__glXDisp_TexImage2D", - "__glXDisp_TexImage3D", - "__glXDisp_TexParameterf", - "__glXDisp_TexParameterfv", - "__glXDisp_TexParameteri", - "__glXDisp_TexParameteriv", - "__glXDisp_TexSubImage1D", - "__glXDisp_TexSubImage2D", - "__glXDisp_TexSubImage3D", - "__glXDisp_Translated", - "__glXDisp_Translatef", - "__glXDisp_Vertex2dv", - "__glXDisp_Vertex2fv", - "__glXDisp_Vertex2iv", - "__glXDisp_Vertex2sv", - "__glXDisp_Vertex3dv", - "__glXDisp_Vertex3fv", - "__glXDisp_Vertex3iv", - "__glXDisp_Vertex3sv", - "__glXDisp_Vertex4dv", - "__glXDisp_Vertex4fv", - "__glXDisp_Vertex4iv", - "__glXDisp_Vertex4sv", - "__glXDisp_Viewport", - "__glXDisp_WindowPos3fARB", - "__glXDrawArraysSize", - "__glXDrawPixelsReqSize", - "__glXDrawableRes", - "__glXErrorOccured", - "__glXFBInitDrawable", - "__glXFBMemSwapBuffers", - "__glXFindDrawablePrivate", - "__glXFogfvReqSize", - "__glXFogivReqSize", - "__glXForceCurrent", - "__glXFree", - "__glXFreeBuffers", - "__glXFreeContext", - "__glXGetDrawablePrivate", - "__glXGetVisualConfigs", - "__glXImageSize", - "__glXImpAtoi", - "__glXImpCalloc", - "__glXImpFatal", - "__glXImpFclose", - "__glXImpFopen", - "__glXImpFprintf", - "__glXImpFree", - "__glXImpGetDrawablePrivate", - "__glXImpGetenv", - "__glXImpMalloc", - "__glXImpRealloc", - "__glXImpSprintf", - "__glXImpWarning", - "__glXInitFB", - "__glXInitMem", - "__glXInitPix", - "__glXIsDirect", - "__glXLastContext", - "__glXLightModelfvReqSize", - "__glXLightModelivReqSize", - "__glXLightfvReqSize", - "__glXLightivReqSize", - "__glXLookupContextByTag", - "__glXMakeCurrent", - "__glXMalloc", - "__glXMap1dReqSize", - "__glXMap1fReqSize", - "__glXMap2dReqSize", - "__glXMap2fReqSize", - "__glXMaterialfvReqSize", - "__glXMaterialivReqSize", - "__glXNoSuchRenderOpcode", - "__glXNoSuchSingleOpcode", - "__glXNop", - "__glXPixInitDrawable", - "__glXPixelMapfvReqSize", - "__glXPixelMapuivReqSize", - "__glXPixelMapusvReqSize", - "__glXPixmapRes", - "__glXPrioritizeTexturesReqSize", - "__glXQueryContextInfoEXT", - "__glXQueryExtensionsString", - "__glXQueryServerString", - "__glXQueryVersion", - "__glXRealloc", - "__glXRender", - "__glXRenderLarge", - "__glXRenderSizeTable", - "__glXRenderSizeTable_EXT", - "__glXRenderTable", - "__glXRenderTable_EXT", - "__glXReply", - "__glXResetLargeCommandStatus", - "__glXResizeBuffers", - "__glXResizeDrawableBuffers", - "__glXScreenInit", - "__glXScreenReset", - "__glXSeparableFilter2DReqSize", - "__glXSingleTable", - "__glXSwapBuffers", - "__glXSwapClientInfo", - "__glXSwapCopyContext", - "__glXSwapCreateContext", - "__glXSwapCreateGLXPixmap", - "__glXSwapDestroyContext", - "__glXSwapDestroyGLXPixmap", - "__glXSwapGetVisualConfigs", - "__glXSwapIsDirect", - "__glXSwapIsDirectReply", - "__glXSwapMakeCurrent", - "__glXSwapMakeCurrentReply", - "__glXSwapQueryContextInfoEXTReply", - "__glXSwapQueryExtensionsString", - "__glXSwapQueryServerString", - "__glXSwapQueryVersion", - "__glXSwapQueryVersionReply", - "__glXSwapRender", - "__glXSwapRenderLarge", - "__glXSwapRenderTable", - "__glXSwapRenderTable_EXT", - "__glXSwapSingleTable", - "__glXSwapSwapBuffers", - "__glXSwapUseXFont", - "__glXSwapVendorPrivTable_EXT", - "__glXSwapVendorPrivate", - "__glXSwapVendorPrivateWithReply", - "__glXSwapWaitGL", - "__glXSwapWaitX", - "__glXTexEnvfvReqSize", - "__glXTexEnvivReqSize", - "__glXTexGendvReqSize", - "__glXTexGenfvReqSize", - "__glXTexGenivReqSize", - "__glXTexImage1DReqSize", - "__glXTexImage2DReqSize", - "__glXTexImage3DReqSize", - "__glXTexParameterfvReqSize", - "__glXTexParameterivReqSize", - "__glXTexSubImage1DReqSize", - "__glXTexSubImage2DReqSize", - "__glXTexSubImage3DReqSize", - "__glXTypeSize", - "__glXUnrefDrawablePrivate", - "__glXUnsupportedPrivateRequest", - "__glXUseXFont", - "__glXVendorPrivTable_EXT", - "__glXVendorPrivate", - "__glXVendorPrivateWithReply", - "__glXWaitGL", - "__glXWaitX", - "__glXcombine_strings", "glAccum", "glActiveStencilFaceEXT", "glActiveTextureARB", @@ -1212,8 +381,6 @@ "glVertexPointer", "glViewport", "glWindowPos3fARB", - "glxSwapQueryExtensionsStringReply", - "glxSwapQueryServerStringReply", NULL }; @@ -1234,7 +401,7 @@ XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL }; static pointer -glxSetup(pointer module, pointer opts, int *errmaj, int *errmin) +glxSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { static Bool setupDone = FALSE; pointer GLcore = NULL; @@ -1252,7 +419,7 @@ if (!GLcore) { if (errmaj) *errmaj = LDR_NOSUBENT; } else { - LoaderReqSymLists(glcoreSymbols, NULL); + LoaderModReqSymLists(GLcore, glcoreSymbols, NULL); LoadExtension(&GLXExt, FALSE); /* Wrap the init visuals routine in micmap.c */ GlxWrapInitVisuals(&miInitVisualsProc); Index: xc/programs/Xserver/GL/mesa/Imakefile diff -u xc/programs/Xserver/GL/mesa/Imakefile:1.9 xc/programs/Xserver/GL/mesa/Imakefile:1.10 --- xc/programs/Xserver/GL/mesa/Imakefile:1.9 Fri Dec 10 11:07:00 2004 +++ xc/programs/Xserver/GL/mesa/Imakefile Fri Oct 14 11:16:09 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/Imakefile,v 1.9 2004/12/10 16:07:00 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/Imakefile,v 1.10 2005/10/14 15:16:09 tsi Exp $ #define IHaveModules @@ -13,10 +13,8 @@ #define MesaBuildDir /**/ #include "../../../../lib/GL/mesa/Imakefile.inc" - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src/mesa \ - -I$(SERVERSRC)/include + INCLUDES = -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ + -I$(MESASRCDIR)/src/mesa -I$(SERVERSRC)/include DEFINES = $(GLX_DEFINES) Index: xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c diff -u xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c:1.1 xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c:1.2 --- xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c:1.1 Sun Feb 24 19:45:41 2002 +++ xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c Thu Mar 16 11:49:50 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c,v 1.1 2002/02/25 00:45:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c,v 1.2 2006/03/16 16:49:50 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -53,7 +53,7 @@ XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL }; static pointer -GLcoreSetup(pointer module, pointer opts, int *errmaj, int *errmin) +GLcoreSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { /* Need a non-NULL return value to indicate success */ return (pointer)1; Index: xc/programs/Xserver/GL/mesa/GLcore/Imakefile diff -u xc/programs/Xserver/GL/mesa/GLcore/Imakefile:1.8 xc/programs/Xserver/GL/mesa/GLcore/Imakefile:1.9 --- xc/programs/Xserver/GL/mesa/GLcore/Imakefile:1.8 Fri Dec 10 12:58:27 2004 +++ xc/programs/Xserver/GL/mesa/GLcore/Imakefile Fri Oct 14 11:16:09 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.8 2004/12/10 17:58:27 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.9 2005/10/14 15:16:09 tsi Exp $ /* * Copyright (c) 2000-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -91,10 +91,8 @@ ../math/DONE ../swrast/DONE ../swrast_setup/DONE \ ../tnl/DONE ../shader/DONE - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src/mesa \ - -I$(SERVERSRC)/include + INCLUDES = -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ + -I$(MESASRCDIR)/src/mesa -I$(SERVERSRC)/include DEFINES = $(GLX_DEFINES) Index: xc/programs/Xserver/GL/mesa/GLcore/module/Imakefile diff -u xc/programs/Xserver/GL/mesa/GLcore/module/Imakefile:1.5 xc/programs/Xserver/GL/mesa/GLcore/module/Imakefile:1.6 --- xc/programs/Xserver/GL/mesa/GLcore/module/Imakefile:1.5 Thu Jan 6 14:08:12 2005 +++ xc/programs/Xserver/GL/mesa/GLcore/module/Imakefile Fri Oct 14 11:16:09 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/module/Imakefile,v 1.5 2005/01/06 19:08:12 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/module/Imakefile,v 1.6 2005/10/14 15:16:09 tsi Exp $ /* * Copyright (c) 2000-2005 by The XFree86 Project, Inc. * All rights reserved. @@ -84,10 +84,8 @@ ../../swrast_setup/module/DONE ../../tnl/module/DONE \ ../../shader/module/DONE - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src \ - -I$(SERVERSRC)/include + INCLUDES = -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ + -I$(MESASRCDIR)/src -I$(SERVERSRC)/include DEFINES = $(GLX_DEFINES) Index: xc/programs/Xserver/GL/mesa/X/Imakefile diff -u xc/programs/Xserver/GL/mesa/X/Imakefile:1.6 xc/programs/Xserver/GL/mesa/X/Imakefile:1.10 --- xc/programs/Xserver/GL/mesa/X/Imakefile:1.6 Mon Feb 28 22:48:50 2005 +++ xc/programs/Xserver/GL/mesa/X/Imakefile Fri Apr 28 23:19:35 2006 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/X/Imakefile,v 1.6 2005/03/01 03:48:50 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/X/Imakefile,v 1.10 2006/04/29 03:19:35 dawes Exp $ #if DoLoadableServer #if !BuildModuleInSubdir @@ -30,7 +30,11 @@ COMMON_SRCS = driverfuncs.c COMMON_OBJS = driverfuncs.o -#ifndef XFree86Version +#ifdef XFree86Version + + X_INCS = -I$(XF86OSSRC) + +#else /* This appears to be the quickest way to build a non-XFree86 server */ GLXSRV_DEFINES = -DXFree86Server -DXFree86FakeServer @@ -43,19 +47,20 @@ SRCS = $(DRIVER_SRCS) $(GLX_SRCS) $(COMMON_SRCS) OBJS = $(DRIVER_OBJS) $(GLX_OBJS) $(COMMON_OBJS) - INCLUDES = -I$(SERVERSRC)/GL/mesa/X -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) \ + INCLUDES = -I$(SERVERSRC)/GL/mesa/X \ -I$(MESASRCDIR)/src/mesa \ -I$(MESASRCDIR)/src/mesa/main \ -I$(MESASRCDIR)/src/mesa/glapi \ -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src -I$(MESASRCDIR)/src/mesa/drivers/x11 \ + -I$(MESASRCDIR)/src \ + -I$(MESASRCDIR)/src/mesa/drivers/x11 \ -I$(MESASRCDIR)/include \ - -I$(LIBSRC)/GL/glx -I$(LIBSRC)/GL/include \ - -I$(SERVERSRC)/include -I$(SERVERSRC)/GL/include \ + -I$(LIBSRC)/GL/glx \ + -I$(LIBSRC)/GL/include \ + -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/GL/include \ -I$(SERVERSRC)/GL/glx \ - -I$(XF86OSSRC) \ - -I$(DRMINCLUDESDIR) + -I$(DRMINCLUDESDIR) $(X_INCS) DEFINES = $(GLX_DEFINES) $(GLXSRV_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ @@ -70,6 +75,10 @@ LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) +#if defined(SparcArchitecture) && HasGcc +SpecialCObjectRule(xm_api,NullParameter,-O0) +#endif + DependTarget() #ifdef IHaveSubdirs Index: xc/programs/Xserver/GL/mesa/array_cache/Imakefile diff -u xc/programs/Xserver/GL/mesa/array_cache/Imakefile:1.1 xc/programs/Xserver/GL/mesa/array_cache/Imakefile:1.3 --- xc/programs/Xserver/GL/mesa/array_cache/Imakefile:1.1 Thu Apr 8 06:08:01 2004 +++ xc/programs/Xserver/GL/mesa/array_cache/Imakefile Sun Oct 16 19:02:24 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/array_cache/Imakefile,v 1.1 2004/04/08 10:08:01 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/array_cache/Imakefile,v 1.3 2005/10/16 23:02:24 tsi Exp $ #if DoLoadableServer #if !BuildModuleInSubdir @@ -29,10 +29,10 @@ -I$(MESASRCDIR)/src/mesa/main \ -I$(MESASRCDIR)/src/mesa/glapi \ -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) + -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/GL/include \ + -I$(SERVERSRC)/GL/glx \ + -I$(LIBSRC)/GL/include DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ Index: xc/programs/Xserver/GL/mesa/main/Imakefile diff -u xc/programs/Xserver/GL/mesa/main/Imakefile:1.2 xc/programs/Xserver/GL/mesa/main/Imakefile:1.4 --- xc/programs/Xserver/GL/mesa/main/Imakefile:1.2 Fri Dec 10 11:07:00 2004 +++ xc/programs/Xserver/GL/mesa/main/Imakefile Sun Oct 16 19:02:24 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/main/Imakefile,v 1.2 2004/12/10 16:07:00 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/main/Imakefile,v 1.4 2005/10/16 23:02:24 tsi Exp $ #if DoLoadableServer #if !BuildModuleInSubdir @@ -28,10 +28,10 @@ -I$(MESASRCDIR)/src/mesa/glapi \ -I$(MESASRCDIR)/src/mesa/shader \ -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) + -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/GL/include \ + -I$(SERVERSRC)/GL/glx \ + -I$(LIBSRC)/GL/include DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ Index: xc/programs/Xserver/GL/mesa/math/Imakefile diff -u xc/programs/Xserver/GL/mesa/math/Imakefile:1.1 xc/programs/Xserver/GL/mesa/math/Imakefile:1.3 --- xc/programs/Xserver/GL/mesa/math/Imakefile:1.1 Thu Apr 8 06:08:01 2004 +++ xc/programs/Xserver/GL/mesa/math/Imakefile Sun Oct 16 19:02:24 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/math/Imakefile,v 1.1 2004/04/08 10:08:01 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/math/Imakefile,v 1.3 2005/10/16 23:02:24 tsi Exp $ #if DoLoadableServer #if !BuildModuleInSubdir @@ -28,10 +28,10 @@ -I$(MESASRCDIR)/src/mesa/main \ -I$(MESASRCDIR)/src/mesa/glapi \ -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) + -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/GL/include \ + -I$(SERVERSRC)/GL/glx \ + -I$(LIBSRC)/GL/include DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ Index: xc/programs/Xserver/GL/mesa/shader/Imakefile diff -u xc/programs/Xserver/GL/mesa/shader/Imakefile:1.2 xc/programs/Xserver/GL/mesa/shader/Imakefile:1.4 --- xc/programs/Xserver/GL/mesa/shader/Imakefile:1.2 Fri Dec 10 12:58:27 2004 +++ xc/programs/Xserver/GL/mesa/shader/Imakefile Sun Oct 16 19:02:24 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/shader/Imakefile,v 1.2 2004/12/10 17:58:27 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/shader/Imakefile,v 1.4 2005/10/16 23:02:24 tsi Exp $ #if DoLoadableServer #if !BuildModuleInSubdir @@ -29,10 +29,10 @@ -I$(MESASRCDIR)/src/mesa/glapi \ -I$(MESASRCDIR)/src/mesa/shader \ -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) + -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/GL/include \ + -I$(SERVERSRC)/GL/glx \ + -I$(LIBSRC)/GL/include DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ Index: xc/programs/Xserver/GL/mesa/swrast/Imakefile diff -u xc/programs/Xserver/GL/mesa/swrast/Imakefile:1.2 xc/programs/Xserver/GL/mesa/swrast/Imakefile:1.4 --- xc/programs/Xserver/GL/mesa/swrast/Imakefile:1.2 Fri Dec 10 11:07:00 2004 +++ xc/programs/Xserver/GL/mesa/swrast/Imakefile Sun Oct 16 19:02:24 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/swrast/Imakefile,v 1.2 2004/12/10 16:07:00 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/swrast/Imakefile,v 1.4 2005/10/16 23:02:24 tsi Exp $ #if DoLoadableServer #if !BuildModuleInSubdir @@ -31,10 +31,10 @@ -I$(MESASRCDIR)/src/mesa/swrast \ -I$(MESASRCDIR)/src/mesa/swrast_setup \ -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) + -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/GL/include \ + -I$(SERVERSRC)/GL/glx \ + -I$(LIBSRC)/GL/include DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ Index: xc/programs/Xserver/GL/mesa/swrast_setup/Imakefile diff -u xc/programs/Xserver/GL/mesa/swrast_setup/Imakefile:1.1 xc/programs/Xserver/GL/mesa/swrast_setup/Imakefile:1.3 --- xc/programs/Xserver/GL/mesa/swrast_setup/Imakefile:1.1 Thu Apr 8 06:08:02 2004 +++ xc/programs/Xserver/GL/mesa/swrast_setup/Imakefile Sun Oct 16 19:02:24 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/swrast_setup/Imakefile,v 1.1 2004/04/08 10:08:02 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/swrast_setup/Imakefile,v 1.3 2005/10/16 23:02:24 tsi Exp $ #if DoLoadableServer #if !BuildModuleInSubdir @@ -28,10 +28,10 @@ -I$(MESASRCDIR)/src/mesa/glapi \ -I$(MESASRCDIR)/src/mesa/swrast_setup \ -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) + -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/GL/include \ + -I$(SERVERSRC)/GL/glx \ + -I$(LIBSRC)/GL/include DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ Index: xc/programs/Xserver/GL/mesa/tnl/Imakefile diff -u xc/programs/Xserver/GL/mesa/tnl/Imakefile:1.3 xc/programs/Xserver/GL/mesa/tnl/Imakefile:1.5 --- xc/programs/Xserver/GL/mesa/tnl/Imakefile:1.3 Mon Feb 7 11:01:47 2005 +++ xc/programs/Xserver/GL/mesa/tnl/Imakefile Sun Oct 16 19:02:24 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/tnl/Imakefile,v 1.3 2005/02/07 16:01:47 tsi Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/tnl/Imakefile,v 1.5 2005/10/16 23:02:24 tsi Exp $ #if DoLoadableServer #if !BuildModuleInSubdir @@ -20,7 +20,6 @@ #include "../../../../../../lib/GL/mesa/tnl/Imakefile.inc" #endif - SRCS = $(MESA_TNL_SRCS) OBJS = $(MESA_TNL_OBJS) @@ -32,10 +31,10 @@ -I$(MESASRCDIR)/src/mesa/shader \ -I$(MESASRCDIR)/src/mesa/tnl \ -I$(MESASRCDIR)/include \ - -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \ - -I$(LIBSRC)/GL/include \ - -I$(XF86SRC) -I$(INCLUDESRC) + -I$(SERVERSRC)/include \ + -I$(SERVERSRC)/GL/include \ + -I$(SERVERSRC)/GL/glx \ + -I$(LIBSRC)/GL/include DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ Index: xc/programs/Xserver/GL/opengl/Imakefile diff -u xc/programs/Xserver/GL/opengl/Imakefile:1.2 xc/programs/Xserver/GL/opengl/Imakefile:1.3 --- xc/programs/Xserver/GL/opengl/Imakefile:1.2 Mon Jun 14 03:31:44 1999 +++ xc/programs/Xserver/GL/opengl/Imakefile Fri Oct 14 11:16:10 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/opengl/Imakefile,v 1.2 1999/06/14 07:31:44 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/opengl/Imakefile,v 1.3 2005/10/14 15:16:10 tsi Exp $ XCOMM The contents of this file are subject to the GLX Public License Version 1.0 XCOMM (the "License"). You may not use this file except in compliance with the @@ -121,14 +121,9 @@ vc_poly.o INCLUDES = \ - -I. \ -I.. \ -Iinclude \ - -I$(TOP)/server/include \ - -I$(TOP)/programs/Xserver/include \ - -I$(TOP)/include \ - -I$(TOP)/include/GL \ - -I$(INCLUDESRC) + -I$(TOP)/programs/Xserver/include DEFINES = \ -D_LANGUAGE_C \ Index: xc/programs/Xserver/XTrap/Imakefile diff -u xc/programs/Xserver/XTrap/Imakefile:1.2 xc/programs/Xserver/XTrap/Imakefile:1.6 --- xc/programs/Xserver/XTrap/Imakefile:1.2 Mon Sep 16 21:15:08 2002 +++ xc/programs/Xserver/XTrap/Imakefile Sun Feb 19 10:51:14 2006 @@ -1,27 +1,104 @@ -XCOMM $XFree86: xc/programs/Xserver/XTrap/Imakefile,v 1.2 2002/09/17 01:15:08 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/XTrap/Imakefile,v 1.6 2006/02/19 15:51:14 tsi Exp $ + +/* + * Copyright (c) 2005-2006 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #if DoLoadableServer +#if !BuildModuleInSubdir +#define IHaveModules +#elif !defined(IHaveModules) #define IHaveSubdirs +SUBDIRS = module +#endif #endif #include -#if DoLoadableServer - SUBDIRS = module +#ifdef IHaveModules +MODSRC = xf86XTrapModule.c +MODOBJ = xf86XTrapModule.o #endif - SRCS = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c - OBJS = xtrapddmi.o xtrapdi.o xtrapdiswp.o xtrapditbl.o - INCLUDES = -I../include -I$(EXTINCSRC) -I$(XINCLUDESRC) -I$(SERVERSRC)/Xext +#ifndef LinkDefines +#define LinkDefines /**/ +#endif + + SRCS = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c $(MODSRC) + OBJS = xtrapddmi.o xtrapdi.o xtrapdiswp.o xtrapditbl.o $(MODOBJ) + INCLUDES = -I$(SERVERSRC)/XTrap -I$(SERVERSRC)/include -I$(SERVERSRC)/Xext + DEFINES = $(EXT_DEFINES) LinkDefines + +#ifdef IHaveModules +ModuleObjectRule() +LibraryModuleTarget(xtrap,$(OBJS),extensions) +#else +NormalLibraryObjectRule() NormalLibraryTarget(xtrap,$(OBJS)) +#endif + LintLibraryTarget(xtrap,$(SRCS)) NormalLintTarget($(SRCS)) -NormalLibraryObjectRule() +#ifdef IHaveModules +InstallLibraryModule(xtrap,$(MODULEDIR),extensions) +#endif -#if DoLoadableServer +#ifdef IHaveSubdirs MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif DependTarget() + +#ifdef LinkDirectory +LinkSourceFile(xtrapddmi.c,LinkDirectory) +LinkSourceFile(xtrapdi.c,LinkDirectory) +LinkSourceFile(xtrapdiswp.c,LinkDirectory) +LinkSourceFile(xtrapditbl.c,LinkDirectory) +LinkSourceFile(xf86XTrapModule.c,LinkDirectory) +#endif + Index: xc/programs/Xserver/XTrap/xf86XTrapModule.c diff -u xc/programs/Xserver/XTrap/xf86XTrapModule.c:1.1 xc/programs/Xserver/XTrap/xf86XTrapModule.c:1.4 --- xc/programs/Xserver/XTrap/xf86XTrapModule.c:1.1 Fri Nov 2 18:29:29 2001 +++ xc/programs/Xserver/XTrap/xf86XTrapModule.c Thu Mar 16 11:49:50 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xf86XTrapModule.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XTrap/xf86XTrapModule.c,v 1.4 2006/03/16 16:49:50 dawes Exp $ */ /* This is the xf86 module code for the DEC_XTRAP extension. */ @@ -38,7 +38,7 @@ XF86ModuleData xtrapModuleData = { &xtrapVersRec, xtrapSetup, NULL }; static pointer -xtrapSetup(pointer module, pointer opts, int *errmaj, int *errmin) { +xtrapSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { LoadExtension(&xtrapExt, FALSE); /* Need a non-NULL return value to indicate success */ return (pointer)1; Index: xc/programs/Xserver/XTrap/xtrapddmi.c diff -u xc/programs/Xserver/XTrap/xtrapddmi.c:1.2 xc/programs/Xserver/XTrap/xtrapddmi.c:1.4 --- xc/programs/Xserver/XTrap/xtrapddmi.c:1.2 Tue Jan 22 22:31:39 2002 +++ xc/programs/Xserver/XTrap/xtrapddmi.c Fri Oct 14 11:16:10 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.2 2002/01/23 03:31:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.c,v 1.4 2005/10/14 15:16:10 tsi Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA @@ -20,6 +20,53 @@ *****************************************************************************/ /* + * Copyright (c) 2005 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* * ABSTRACT: * * This module is the platform-specific but conditionally independent @@ -63,8 +110,8 @@ #endif #include -#include -#include +#include "xtrapddmi.h" +#include "xtrapproto.h" extern int XETrapErrorBase; extern xXTrapGetAvailReply XETrap_avail; @@ -77,7 +124,8 @@ * This function performs the platform specific setup for server * extension implementations. */ -void XETrapPlatformSetup() +void +XETrapPlatformSetup() { } @@ -89,14 +137,15 @@ * This routine processes the simulation of some input event. * */ -int XETrapSimulateXEvent(register xXTrapInputReq *request, - register ClientPtr client) +int +XETrapSimulateXEvent(xXTrapReq *r, ClientPtr client) { ScreenPtr pScr = NULL; int status = Success; xEvent xev; - register int x = request->input.x; - register int y = request->input.y; + xXTrapInputReq *request = (xXTrapInputReq *)r; + int x = request->input.x; + int y = request->input.y; DevicePtr keydev = LookupKeyboardDevice(); DevicePtr ptrdev = LookupPointerDevice(); @@ -170,15 +219,4 @@ } #endif -int -#ifdef __STDC__ -ProcBadRequest( ClientPtr client) -#else -ProcBadRequest(client) - ClientPtr client; -#endif -{ - return (BadRequest); -} - #endif /* vms && ! LINKED_IN */ Index: xc/programs/Xserver/XTrap/xtrapddmi.h diff -u /dev/null xc/programs/Xserver/XTrap/xtrapddmi.h:1.2 --- /dev/null Tue May 9 21:55:52 2006 +++ xc/programs/Xserver/XTrap/xtrapddmi.h Fri Oct 14 11:16:10 2005 @@ -0,0 +1,115 @@ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapddmi.h,v 1.2 2005/10/14 15:16:10 tsi Exp $ */ + +#ifndef __XTRAPDDMI__ +#define __XTRAPDDMI__ + +/***************************************************************************** +Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + +*****************************************************************************/ +/* + * + * CONTRIBUTORS: + * + * Dick Annicchiarico + * Robert Chesler + * Dan Coutu + * Gene Durso + * Marc Evans + * Alan Jamison + * Mark Henry + * Ken Miller + * + * DESCRIPTION: + * This header file is used by the XTrap server extension only + * (not used by clients or the XTrap Toolkit). Information + * contained herein should *not* be visible to clients (xtrapdi.h + * is used for this). The name is historical. + */ +#include +#include +#include "dix.h" + +#ifndef MIN +# define MIN(a,b) ((a) < (b) ? (a) : (b)) +#endif +#ifndef MAX +# define MAX(a,b) ((a) > (b) ? (a) : (b)) +#endif + +#define XETrapNumEvents 1L /* constants used for AddExtension */ + +/* Other constants used within the extension code */ +#define XETrapMinRepSize 32L /* Minimum number of longs */ + +/* This structure will be globally declared to provide storage to hold + * the various extension wide configuration information. Allocated on + * a per-client basis. + */ +typedef struct +{ + ClientPtr client; /* Multi-client support and error handling */ + xXTrapGetCurReply cur; /* Struct of Miscellaneous state info */ + xXTrapGetStatsReply *stats; /* Pointer to stat's, malloc'd if requested */ + CARD32 last_input_time B32; /* last timestamp from input event */ + CARD16 protocol B16; /* current communication protocol */ +} XETrapEnv; + +#define XETrapSetHeaderEvent(phdr) ((phdr)->type = 0x1L) +#define XETrapSetHeaderRequest(phdr) ((phdr)->type = 0x2L) +#define XETrapSetHeaderSpecial(phdr) ((phdr)->type = 0x3L) +#define XETrapSetHeaderCursor(phdr) ((phdr)->type = 0x4L) +#define XETrapSetHeaderReply(phdr) ((phdr)->type = 0x5L) + +#ifndef vaxc +#define globaldef +#define globalref extern +#endif + +/* Extension platform identifier (conditionally defined) */ +#if ( defined (__osf__) && defined(__alpha) ) +# define XETrapPlatform PF_DECOSF1 +#endif +#ifdef ultrix +# define XETrapPlatform PF_DECUltrix +#endif +#ifdef vms +#ifdef VAXELN +# define XETrapPlatform PF_DECELN +#else +# define XETrapPlatform PF_DECVMS +#endif +#endif +#ifdef VT1000 +# define XETrapPlatform PF_DECVT1000 +#endif +#ifdef VXT +# define XETrapPlatform PF_DECXTerm +#endif +#ifdef PC +# define XETrapPlatform PF_IBMAT +#endif +#ifdef sun +# define XETrapPlatform PF_SunSparc +#endif +#ifndef XETrapPlatform +# define XETrapPlatform PF_Other +#endif /* XETrapPlatform */ + +#endif /* __XTRAPDDMI__ */ Index: xc/programs/Xserver/XTrap/xtrapdi.c diff -u xc/programs/Xserver/XTrap/xtrapdi.c:1.7 xc/programs/Xserver/XTrap/xtrapdi.c:1.8 --- xc/programs/Xserver/XTrap/xtrapdi.c:1.7 Tue Oct 28 17:52:10 2003 +++ xc/programs/Xserver/XTrap/xtrapdi.c Thu Mar 24 21:22:52 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.8 2005/03/25 02:22:52 dawes Exp $ */ /***************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH. @@ -21,6 +21,53 @@ *****************************************************************************/ /* + * Copyright (c) 2005 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* * ABSTRACT: * * This module is the main module for extension initialization and setup. @@ -43,7 +90,7 @@ * Robert Chesler - add client arg to swapping routines for X11R6 port * */ - + /*-----------------* * Include Files * *-----------------*/ @@ -73,8 +120,8 @@ #include "pixmapstr.h" /* DrawableRec */ #include "windowstr.h" /* Drawable Lookup structures */ #include -#include -#include +#include "xtrapddmi.h" +#include "xtrapproto.h" #include "colormapst.h" #ifdef PANORAMIX #include "panoramiX.h" @@ -92,24 +139,24 @@ int XETrapErrorBase = 0L; xXTrapGetAvailReply XETrap_avail; /* What's available to clients */ -globalref int_function XETrapDispatchVector[10L]; /* Vector of XTrap Rtns */ -globalref int_function XETSwDispatchVector[10L]; /* Swapped XTrap Rtns */ +globalref XETDispatchFunc XETrapDispatchVector[10L]; /* Vector of XTrap Rtns */ +globalref XETDispatchFunc XETSwDispatchVector[10L]; /* Swapped XTrap Rtns */ -globalref int_function XETrapProcVector[256L]; /* The "shadowed" ProcVector */ +globalref XETProcFunc XETrapProcVector[256L]; /* The "shadowed" ProcVector */ /* The "real" EventVector (XTrap creates it till events * truly become vectored */ #ifndef VECTORED_EVENTS -globalref int_function EventProcVector[XETrapCoreEvents]; +globalref ProcessInputProc EventProcVector[XETrapCoreEvents]; #else extern WindowPtr GetCurrentRootWindow(); -globalref int_function EventProcVector[128L]; +globalref ProcessInputProc EventProcVector[128L]; #endif -static int_function keybd_process_inp = NULL; /* Used for VECTORED_EVENTS */ +static ProcessInputProc keybd_process_inp = NULL; /* Used for VECTORED_EVENTS */ /* The "shadowed" Event Vector */ -globalref int_function XETrapEventProcVector[XETrapCoreEvents]; +globalref ProcessInputProc XETrapEventProcVector[XETrapCoreEvents]; -globalref void_function XETSwProcVector[256L];/* Vector of Req swapping rtns */ +globalref XETSwReqFunc XETSwProcVector[256L];/* Vector of Req swapping rtns */ /* This macro returns a true/false indicator based on whether it changes the * environment state bits local to the server extension. This is based on the @@ -169,7 +216,8 @@ /*----------------------------* * Forward Declarations *----------------------------*/ -static void _SwapProc (int (**f1 )(), int (**f2 )()); +static void _SwapInputProc (ProcessInputProc (*f1), ProcessInputProc (*f2)); +static void _SwapEventProc (XETProcFunc (*f1), XETProcFunc (*f2)); static void sXETrapEvent (xETrapDataEvent *from , xETrapDataEvent *to ); static int add_accelerator_node (ClientPtr client , ClientList *accel ); static void remove_accelerator_node (ClientPtr client , ClientList *accel ); @@ -180,7 +228,8 @@ static void GetSendColorCellsRep (ClientPtr client , xResourceReq *req ); static void GetSendColorPlanesRep (ClientPtr client , xResourceReq *req ); #endif - +static int realXETrapConfig(xXTrapConfigReq *request, ClientPtr client); + /* * DESCRIPTION: * @@ -190,7 +239,8 @@ * client would be reset here. * */ -int XETrapDestroyEnv(pointer value, XID id) +int +XETrapDestroyEnv(pointer value, XID id) { xXTrapReq request; XETrapEnv *penv = XETenv[(long)value]; @@ -224,7 +274,7 @@ return 0; } - + /* * DESCRIPTION: * @@ -238,7 +288,8 @@ * server restart. * */ -void XETrapCloseDown(ExtensionEntry *extEntry) +void +XETrapCloseDown(ExtensionEntry *extEntry) { long i; @@ -252,7 +303,7 @@ ignore_grabs = False; return; } - + /* * * DESCRIPTION: @@ -271,7 +322,8 @@ * functions are retained for vectoring purposes. */ -Bool XETrapRedirectDevices() +Bool +XETrapRedirectDevices() { Bool retval = True; @@ -285,9 +337,9 @@ else { EventProcVector[KeyPress] = - (int_function)XETrapKbdDev->realInputProc; + XETrapKbdDev->realInputProc; EventProcVector[KeyRelease] = - (int_function)XETrapKbdDev->realInputProc; + XETrapKbdDev->realInputProc; } #ifdef VECTORED_EVENTS keybd_process_inp = EventProcVector[KeyPress]; @@ -310,11 +362,11 @@ else { EventProcVector[ButtonPress] = - (int_function)XETrapPtrDev->realInputProc; + XETrapPtrDev->realInputProc; EventProcVector[ButtonRelease] = - (int_function)XETrapPtrDev->realInputProc; + XETrapPtrDev->realInputProc; EventProcVector[MotionNotify] = - (int_function)XETrapPtrDev->realInputProc; + XETrapPtrDev->realInputProc; } XETrapEventProcVector[ButtonPress] = XETrapPointer; XETrapEventProcVector[ButtonRelease] = XETrapPointer; @@ -323,7 +375,7 @@ #endif /* !VECTORED_EVENTS */ return(retval); } - + /* * * DESCRIPTION: @@ -340,9 +392,10 @@ * */ -void DEC_XTRAPInit() +void +DEC_XTRAPInit() { - register ExtensionEntry *extEntry; + ExtensionEntry *extEntry; unsigned int i; Atom a; @@ -365,8 +418,7 @@ XETrap_avail.data.event_base = extEntry->eventBase; /* Set up our swapped reply vector */ - ReplySwapVector[XETrap_avail.data.major_opcode] = - (void_function) sReplyXTrapDispatch; + ReplySwapVector[XETrap_avail.data.major_opcode] = sReplyXTrapDispatch; /* Set up our swapped event vector */ EventSwapVector[extEntry->eventBase + XETrapData] = @@ -455,7 +507,7 @@ } for (i=128L; i<=255L; i++) { /* Extension "swapped" requests are not implemented */ - XETSwProcVector[i] = NotImplemented; + XETSwProcVector[i] = XETSwNotImplemented; } #ifdef VERBOSE ErrorF("%s: Vers. %d.%d-%d successfully loaded\n", XTrapExtName, @@ -466,7 +518,7 @@ return; } - + /* * DESCRIPTION: * @@ -482,7 +534,8 @@ * */ -int XETrapCreateEnv(ClientPtr client) +int +XETrapCreateEnv(ClientPtr client) { XETrapEnv *penv = NULL; int status = Success; @@ -529,7 +582,7 @@ return(status); } - + /* * DESCRIPTION: * @@ -546,11 +599,12 @@ * necessary. */ -int XETrapDispatch(ClientPtr client) +int +XETrapDispatch(ClientPtr client) { REQUEST(xXTrapReq); - register int status = Success; + int status = Success; REQUEST_AT_LEAST_SIZE(xXTrapReq); @@ -575,7 +629,7 @@ } return(status); } - + /* * DESCRIPTION: * @@ -588,11 +642,12 @@ * DIFFERENT than that of the extension. */ -int sXETrapDispatch(ClientPtr client) +int +sXETrapDispatch(ClientPtr client) { REQUEST(xXTrapReq); - register int status = Success; + int status = Success; REQUEST_AT_LEAST_SIZE(xXTrapReq); @@ -617,7 +672,7 @@ } return(status); } - + /* * DESCRIPTION: * @@ -627,11 +682,12 @@ * is created. * */ -int XETrapReset(xXTrapReq *request, ClientPtr client) +int +XETrapReset(xXTrapReq *request, ClientPtr client) { static xXTrapConfigReq DummyReq; - register int i; - register int status = Success; + int i; + int status = Success; XETrapEnv *penv = XETenv[client->index]; /* in case any i/o's pending */ @@ -657,7 +713,7 @@ DummyReq.config_flags_event[i] = 0xFF; /* Clear all protocol events */ } /* Call config routine to clear all configurable fields */ - status = XETrapConfig(&DummyReq, client); + status = realXETrapConfig(&DummyReq, client); /* reset the environment */ for (i=0L; icur.data_state_flags); i++) { @@ -667,16 +723,19 @@ return(status); } - + /* * DESCRIPTION: * * This function sends a reply back to the requesting client indicating * the available states of the extension can be configured for. */ -int XETrapGetAvailable(xXTrapGetReq *request, ClientPtr client) +int +XETrapGetAvailable(xXTrapReq *r, ClientPtr client) { XETrapEnv *penv = XETenv[client->index]; + xXTrapGetReq *request = (xXTrapGetReq *)r; + update_protocol(request, client); /* Initialize the reply as needed */ XETrap_avail.data.xtrap_protocol = penv->protocol; @@ -685,14 +744,15 @@ WriteReplyToClient(client, sizeof(xXTrapGetAvailReply), &XETrap_avail); return(Success); } - + /* * DESCRIPTION: * * This function sends a reply back to the requesting client indicating * the current state of the extension. */ -int XETrapGetCurrent(xXTrapReq *request, ClientPtr client) +int +XETrapGetCurrent(xXTrapReq *request, ClientPtr client) { XETrapEnv *penv = XETenv[client->index]; int rep_size = (penv->protocol == 31 ? 284 : sz_xXTrapGetCurReply); @@ -705,7 +765,7 @@ return(Success); } - + /* * DESCRIPTION: * @@ -713,7 +773,8 @@ * statistics (counts) of requests and events. If stat's isn't * configured, return failure. */ -int XETrapGetStatistics(xXTrapReq *request, ClientPtr client) +int +XETrapGetStatistics(xXTrapReq *request, ClientPtr client) { int status = Success; XETrapEnv *penv = XETenv[client->index]; @@ -754,14 +815,15 @@ } return(status); } - + /* * DESCRIPTION: * * This function is dispatched when a client requests the extension to * be configured in some manner. */ -int XETrapConfig(xXTrapConfigReq *request, ClientPtr client) +static int +realXETrapConfig(xXTrapConfigReq *request, ClientPtr client) { UByteP vflags = request->config_flags_valid; UByteP dflags = request->config_flags_data; @@ -789,7 +851,7 @@ { /* Client wants the XTrap rtn */ if (++(vectored_events[i]) <= 1L) { /* first client, so do it */ - _SwapProc(&(XETrapEventProcVector[i]), + _SwapInputProc(&(XETrapEventProcVector[i]), &(EventProcVector[i])); } } @@ -797,7 +859,7 @@ { /* Client wants the *real* rtn */ if (--(vectored_events[i]) <= 0L) { /* No more clients using, so do it */ - _SwapProc(&(XETrapEventProcVector[i]), + _SwapInputProc(&(XETrapEventProcVector[i]), &(EventProcVector[i])); } } @@ -806,22 +868,22 @@ case KeyPress: /* needed for command key processing */ case KeyRelease: XETrapKbdDev->processInputProc = - (void_function)(EventProcVector[i] ? - (void_function)EventProcVector[i] : - (void_function)keybd_process_inp); + (EventProcVector[i] ? + EventProcVector[i] : + keybd_process_inp); XETrapKbdDev->realInputProc = - (void_function)(EventProcVector[i] ? - (void_function)EventProcVector[i] : - (void_function)keybd_process_inp); + (EventProcVector[i] ? + EventProcVector[i] : + keybd_process_inp); break; #ifndef VECTORED_EVENTS case ButtonPress: /* hack until events become vectored */ case ButtonRelease: case MotionNotify: XETrapPtrDev->processInputProc = - (void_function)EventProcVector[i]; + EventProcVector[i]; XETrapPtrDev->realInputProc = - (void_function)EventProcVector[i]; + EventProcVector[i]; break; default: status = BadImplementation; @@ -885,14 +947,14 @@ { /* Client wants the XTrap rtn */ if (++(vectored_requests[i]) <= 1L) { /* first client, so do it */ - _SwapProc(&(XETrapProcVector[i]), &(ProcVector[i])); + _SwapEventProc(&(XETrapProcVector[i]), &(ProcVector[i])); } } else { /* Client wants the *real* rtn */ if (--(vectored_requests[i]) <= 0L) { /* No more clients using, so do it */ - _SwapProc(&(XETrapProcVector[i]), &(ProcVector[i])); + _SwapEventProc(&(XETrapProcVector[i]), &(ProcVector[i])); } } if (status == Success) @@ -962,7 +1024,14 @@ } return(status); } - +int +XETrapConfig(xXTrapReq *r, ClientPtr client) +{ + xXTrapConfigReq *request = (xXTrapConfigReq *)r; + return realXETrapConfig(request, client); +} + + /* * DESCRIPTION: * @@ -970,7 +1039,8 @@ * of requests and/or core events to the client may take place. * */ -int XETrapStartTrap(xXTrapReq *request, ClientPtr client) +int +XETrapStartTrap(xXTrapReq *request, ClientPtr client) { XETrapEnv *penv = XETenv[client->index]; int status = add_accelerator_node(penv->client, &io_clients); @@ -987,7 +1057,8 @@ * of requests and/or core events to the client may *not* take place. * */ -int XETrapStopTrap(xXTrapReq *request, ClientPtr client) +int +XETrapStopTrap(xXTrapReq *request, ClientPtr client) { XETrapEnv *penv = XETenv[client->index]; @@ -995,17 +1066,19 @@ BitFalse(penv->cur.data_state_flags, XETrapTrapActive); return(Success); } - + /* * DESCRIPTION: * * This function sends a reply back to the requesting client indicating * the specific XTrap version of this extension. */ -int XETrapGetVersion(xXTrapGetReq *request, ClientPtr client) +int +XETrapGetVersion(xXTrapReq *r, ClientPtr client) { xXTrapGetVersReply ver_rep; XETrapEnv *penv = XETenv[client->index]; + xXTrapGetReq *request = (xXTrapGetReq *)r; update_protocol(request,client); /* to agree on protocol version */ /* Initialize the reply as needed */ @@ -1020,14 +1093,15 @@ WriteReplyToClient(client, sizeof(xXTrapGetVersReply), &ver_rep); return(Success); } - + /* * DESCRIPTION: * * This function sends a reply back to the requesting client indicating * the specific XTrap version of this extension. */ -int XETrapGetLastInpTime(xXTrapReq *request, ClientPtr client) +int +XETrapGetLastInpTime(xXTrapReq *request, ClientPtr client) { xXTrapGetLITimReply tim_rep; XETrapEnv *penv = XETenv[client->index]; @@ -1041,7 +1115,7 @@ WriteReplyToClient(client, sizeof(xXTrapGetLITimReply), &tim_rep); return(Success); } - + /* * DESCRIPTION: * @@ -1056,7 +1130,8 @@ * back if writing to a swapped client, however, and this is done * by calling the appropriate XETSwProcVector[] routine. */ -int XETrapRequestVector(ClientPtr client) +int +XETrapRequestVector(ClientPtr client) { int status = True; XETrapDatum *pdata, *spdata = NULL; @@ -1146,7 +1221,7 @@ else if (penv->cur.data_config_max_pkt_size == XETrapMinPktSize) { /* Minimum size, so swap it as an ResourceReq */ - XETSwResourceReq(&(spdata->u.req)); + XETSwResourceReq(&(spdata->u.req), penv->client); } else { /* trying to swap an extension request! */ @@ -1309,14 +1384,15 @@ * key should be ignored for subsequent server processing. * */ -int XETrapKeyboard(xEvent *x_event, DevicePtr keybd, int count) +void +XETrapKeyboard(xEvent *x_event, DeviceIntPtr keybd, int count) { - register BYTE type = x_event->u.u.type; - register BYTE detail = x_event->u.u.detail; + BYTE type = x_event->u.u.type; + BYTE detail = x_event->u.u.detail; XETrapEnv *penv; ClientList *stc = &stats_clients; ClientList *cmc = &cmd_clients; - int_function cur_func = XETrapKeyboard; + ProcessInputProc cur_func = XETrapKeyboard; #ifdef VERBOSE if (count != 1L) @@ -1457,9 +1533,8 @@ } #endif key_ignore = False; /* reset for next time around */ - return 0; } - + /* * DESCRIPTION: * @@ -1473,11 +1548,12 @@ * */ #ifndef VECTORED_EVENTS -int XETrapPointer(xEvent *x_event, DevicePtr ptrdev, int count) +void +XETrapPointer(xEvent *x_event, DeviceIntPtr ptrdev, int count) { XETrapEnv *penv; ClientList *stc = &stats_clients; - int_function cur_func = XETrapPointer; + ProcessInputProc cur_func = XETrapPointer; #ifdef VERBOSE if (count != 1L) @@ -1511,11 +1587,10 @@ (void)(*EventProcVector[x_event->u.u.type])(x_event,ptrdev,count); } } - return 0; } #endif /* !VECTORED_EVENTS */ - + /* * DESCRIPTION: * @@ -1524,10 +1599,11 @@ * and writes out both the header and detail information. * */ -void XETrapStampAndMail(xEvent *x_event) +void +XETrapStampAndMail(xEvent *x_event) { XETrapDatum data; - register CARD32 size; + CARD32 size; XETrapEnv *penv; ClientList *ioc = &io_clients; @@ -1598,10 +1674,11 @@ return; } #ifdef VECTORED_EVENTS -int XETrapEventVector(ClientPtr client, xEvent *x_event) +int +XETrapEventVector(ClientPtr client, xEvent *x_event) { XETrapDatum data; - register CARD32 size; + CARD32 size; XETrapEnv *penv; ClientList *ioc = &io_clients; @@ -1656,9 +1733,10 @@ return; } #endif /* VECTORED_EVENTS */ -void sReplyXTrapDispatch(ClientPtr client, int size, char *reply) +void +sReplyXTrapDispatch(ClientPtr client, int size, void *reply) { - register XETrapRepHdr *rep = (XETrapRepHdr *)reply; + XETrapRepHdr *rep = (XETrapRepHdr *)reply; switch(rep->detail) { @@ -1704,7 +1782,7 @@ } return; } - + /* * XLib communications routines */ @@ -1718,7 +1796,8 @@ * an X Event. nbytes must be at least equal to XETrapMinPktSize * */ -int XETrapWriteXLib(XETrapEnv *penv, BYTE *data, CARD32 nbytes) +int +XETrapWriteXLib(XETrapEnv *penv, BYTE *data, CARD32 nbytes) { CARD32 size, total = 0L; xETrapDataEvent event; @@ -1764,7 +1843,8 @@ * Static Functions *----------------------------*/ -static void update_protocol(xXTrapGetReq *reqptr, ClientPtr client) +static void +update_protocol(xXTrapGetReq *reqptr, ClientPtr client) { XETrapEnv *penv = XETenv[client->index]; /* update protocol number */ @@ -1786,9 +1866,20 @@ * lint from complaining about mixed types. It seems to work, but I would * probably classify this as a hack. */ -static void _SwapProc( register int (**f1)(), register int (**f2)()) +static void +_SwapInputProc (ProcessInputProc (*f1), ProcessInputProc (*f2)) +{ + ProcessInputProc t1 = *f1; + *f1 = *f2; + *f2 = t1; + + return; +} + +static void +_SwapEventProc (XETProcFunc (*f1), XETProcFunc (*f2)) { - register int (*t1)() = *f1; + XETProcFunc t1 = *f1; *f1 = *f2; *f2 = t1; @@ -1803,7 +1894,8 @@ * swapped by code in XETrapRequestVector(). * */ -static void sXETrapEvent(xETrapDataEvent *from, xETrapDataEvent *to) +static void +sXETrapEvent(xETrapDataEvent *from, xETrapDataEvent *to) { to->type = from->type; to->detail = from->detail; @@ -1820,7 +1912,8 @@ * (either io_clients, stats_clients, or cmd_clients). * */ -static int add_accelerator_node(ClientPtr client, ClientList *accel) +static int +add_accelerator_node(ClientPtr client, ClientList *accel) { Bool found = False; int status = Success; @@ -1859,7 +1952,8 @@ * (either io_clients, stats_clients, or cmd_clients). * */ -static void remove_accelerator_node(ClientPtr client, ClientList *accel) +static void +remove_accelerator_node(ClientPtr client, ClientList *accel) { while (accel->next != NULL) { @@ -1880,7 +1974,8 @@ } #ifdef COLOR_REPLIES -static void GetSendColorRep(ClientPtr client, xResourceReq *req) +static void +GetSendColorRep(ClientPtr client, xResourceReq *req) { /* adapted from ProcAllocColor() in dispatch.c */ XETrapDatum data; int retval; @@ -1936,7 +2031,8 @@ } } -static void GetSendNamedColorRep(ClientPtr client, xResourceReq *req) +static void +GetSendNamedColorRep(ClientPtr client, xResourceReq *req) { /* adapted from ProcAllocNamedColor() in dispatch.c */ XETrapDatum data; XETrapEnv *penv = XETenv[client->index]; @@ -2004,7 +2100,8 @@ } } -static void GetSendColorCellsRep(ClientPtr client, xResourceReq *req) +static void +GetSendColorCellsRep(ClientPtr client, xResourceReq *req) { /* adapted from ProcAllocColorCells() in dispatch.c */ int retval; int npixels, nmasks; @@ -2076,7 +2173,8 @@ } DEALLOCATE_LOCAL(data); } -static void GetSendColorPlanesRep(ClientPtr client, xResourceReq *req) +static void +GetSendColorPlanesRep(ClientPtr client, xResourceReq *req) { /* adapted from ProcAllocColorPlanes() in dispatch.c */ int retval; int npixels, nmasks; Index: xc/programs/Xserver/XTrap/xtrapdiswp.c diff -u xc/programs/Xserver/XTrap/xtrapdiswp.c:1.1 xc/programs/Xserver/XTrap/xtrapdiswp.c:1.3 --- xc/programs/Xserver/XTrap/xtrapdiswp.c:1.1 Fri Nov 2 18:29:29 2001 +++ xc/programs/Xserver/XTrap/xtrapdiswp.c Fri Oct 14 11:16:10 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapdiswp.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapdiswp.c,v 1.3 2005/10/14 15:16:10 tsi Exp $ */ /**************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991, 1992 by @@ -24,6 +24,53 @@ *****************************************************************************/ /* + * Copyright (c) 2005 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* * ABSTRACT: * * This module is the device independent module responsible for all @@ -44,7 +91,7 @@ * Robert Chesler - added client arg for X11R6 port in many spots * */ - + #include #define NEED_REPLIES #define NEED_EVENTS @@ -60,83 +107,101 @@ # include "extnsionst.h" /* Server ExtensionEntry definitions */ #endif # include "swapreq.h" /* Server SwapColorItem definition */ -#include -#include +#include "xtrapddmi.h" +#include "xtrapproto.h" /* In-coming XTrap requests needing to be swapped to native format */ -int sXETrapReset(xXTrapReq *request, ClientPtr client) +int +sXETrapReset(xXTrapReq *request, ClientPtr client) { - register char n; + char n; swaps(&(request->length),n); return(XETrapReset(request,client)); } -int sXETrapGetAvailable(xXTrapGetReq *request, ClientPtr client) +int +sXETrapGetAvailable(xXTrapReq *r, ClientPtr client) { - register char n; + char n; + xXTrapGetReq *request = (xXTrapGetReq *)r; + swaps(&(request->length),n); swaps(&(request->protocol),n); - return(XETrapGetAvailable(request,client)); + return(XETrapGetAvailable(r, client)); } -int sXETrapConfig(xXTrapConfigReq *request, ClientPtr client) +int +sXETrapConfig(xXTrapReq *r, ClientPtr client) { - register char n; + char n; + xXTrapConfigReq *request = (xXTrapConfigReq *)r; + swaps(&(request->length),n); swaps(&(request->config_max_pkt_size),n); - return(XETrapConfig(request,client)); + return(XETrapConfig(r,client)); } -int sXETrapStartTrap(xXTrapReq *request, ClientPtr client) +int +sXETrapStartTrap(xXTrapReq *request, ClientPtr client) { - register char n; + char n; swaps(&(request->length),n); return(XETrapStartTrap(request,client)); } -int sXETrapStopTrap(xXTrapReq *request, ClientPtr client) +int +sXETrapStopTrap(xXTrapReq *request, ClientPtr client) { - register char n; + char n; swaps(&(request->length),n); return(XETrapStopTrap(request,client)); } -int sXETrapGetCurrent(xXTrapReq *request, ClientPtr client) +int +sXETrapGetCurrent(xXTrapReq *request, ClientPtr client) { - register char n; + char n; swaps(&(request->length),n); return(XETrapGetCurrent(request,client)); } -int sXETrapGetStatistics(xXTrapReq *request, ClientPtr client) +int +sXETrapGetStatistics(xXTrapReq *request, ClientPtr client) { - register char n; + char n; swaps(&(request->length),n); - return(XETrapGetStatistics(request,client)); + return(XETrapGetStatistics(request, client)); } #ifndef _XINPUT -int sXETrapSimulateXEvent(xXTrapInputReq *request, ClientPtr client) +int +sXETrapSimulateXEvent(xXTrapReq *r, ClientPtr client) { - register char n; + char n; + xXTrapInputReq *request = (xXTrapInputReq *)r; + swaps(&(request->input.x),n); swaps(&(request->input.y),n); - return(XETrapSimulateXEvent(request,client)); + return(XETrapSimulateXEvent(r, client)); } #endif -int sXETrapGetVersion(xXTrapGetReq *request, ClientPtr client) +int +sXETrapGetVersion(xXTrapReq *r, ClientPtr client) { - register char n; + char n; + xXTrapGetReq *request = (xXTrapGetReq *)r; + swaps(&(request->length),n); swaps(&(request->protocol),n); - return(XETrapGetVersion(request,client)); + return(XETrapGetVersion(r, client)); } -int sXETrapGetLastInpTime(xXTrapReq *request, ClientPtr client) +int +sXETrapGetLastInpTime(xXTrapReq *request, ClientPtr client) { - register char n; + char n; swaps(&(request->length),n); return(XETrapGetLastInpTime(request,client)); } @@ -144,10 +209,11 @@ /* Out-going XTrap replies needing to be swapped *from* native format */ -void sReplyXETrapGetAvail(ClientPtr client, int size, char *reply) +void +sReplyXETrapGetAvail(ClientPtr client, int size, char *reply) { xXTrapGetAvailReply *rep = (xXTrapGetAvailReply *)reply; - register char n; + char n; swaps(&(rep->hdr.sequenceNumber),n); swapl(&(rep->hdr.length),n); swapl(&(rep->data.pf_ident),n); @@ -162,10 +228,12 @@ (void)WriteToClient(client,size,reply); return; } -void sReplyXETrapGetVers(ClientPtr client, int size, char *reply) + +void +sReplyXETrapGetVers(ClientPtr client, int size, char *reply) { xXTrapGetVersReply *rep = (xXTrapGetVersReply *)reply; - register char n; + char n; swaps(&(rep->hdr.sequenceNumber),n); swapl(&(rep->hdr.length),n); swaps(&(rep->data.xtrap_release),n); @@ -174,31 +242,37 @@ (void)WriteToClient(client,size,reply); return; } -void sReplyXETrapGetLITim(ClientPtr client, int size, char *reply) + +void +sReplyXETrapGetLITim(ClientPtr client, int size, char *reply) { xXTrapGetLITimReply *rep = (xXTrapGetLITimReply *)reply; - register char n; + char n; swaps(&(rep->hdr.sequenceNumber),n); swapl(&(rep->hdr.length),n); swapl(&(rep->data_last_time),n); (void)WriteToClient(client,size,reply); return; } -void sReplyXETrapGetCur(ClientPtr client, int size, char *reply) + +void +sReplyXETrapGetCur(ClientPtr client, int size, char *reply) { xXTrapGetCurReply *rep = (xXTrapGetCurReply *)reply; - register char n; + char n; swaps(&(rep->hdr.sequenceNumber),n); swapl(&(rep->hdr.length),n); swaps(&(rep->data_config_max_pkt_size),n); (void)WriteToClient(client,size,reply); return; } -void sReplyXETrapGetStats(ClientPtr client, int size, char *reply) + +void +sReplyXETrapGetStats(ClientPtr client, int size, char *reply) { xXTrapGetStatsReply *rep = (xXTrapGetStatsReply *)reply; - register char n; - register int i; + char n; + int i; long *p; swaps(&(rep->sequenceNumber),n); @@ -217,9 +291,10 @@ /* Out-going XTrap I/O header needing to be swapped *from* native format */ -void sXETrapHeader(XETrapHeader *hdr) +void +sXETrapHeader(XETrapHeader *hdr) { - register char n; + char n; swapl(&(hdr->count), n); swapl(&(hdr->timestamp), n); @@ -234,9 +309,10 @@ /* The following is used for all requests that have no fields to be swapped (except "length") */ -void XETSwSimpleReq(register xReq *data) +void +XETSwSimpleReq(xResourceReq *data, ClientPtr client) { - register char n; + char n; swaps(&(data->length), n); } @@ -244,17 +320,20 @@ only a single 32-bit field to be swapped, coming right after the "length" field */ -void XETSwResourceReq(register xResourceReq *data) +void +XETSwResourceReq(xResourceReq *data, ClientPtr client) { - register char n; + char n; swaps(&(data->length), n); swapl(&(data->id), n); } -void XETSwCreateWindow(register xCreateWindowReq *data,ClientPtr client) +void +XETSwCreateWindow(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xCreateWindowReq *data = (xCreateWindowReq *)d; swapl(&(data->wid), n); swapl(&(data->parent), n); @@ -270,10 +349,11 @@ swaps(&(data->length), n); } -void XETSwChangeWindowAttributes(register xChangeWindowAttributesReq *data, -ClientPtr client) +void +XETSwChangeWindowAttributes(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xChangeWindowAttributesReq *data = (xChangeWindowAttributesReq *)d; swapl(&(data->window), n); swapl(&(data->valueMask), n); @@ -281,9 +361,12 @@ swaps(&(data->length), n); } -void XETSwReparentWindow(register xReparentWindowReq *data) +void +XETSwReparentWindow(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xReparentWindowReq *data = (xReparentWindowReq *)d; + swaps(&(data->length), n); swapl(&(data->window), n); swapl(&(data->parent), n); @@ -291,9 +374,12 @@ swaps(&(data->y), n); } -void XETSwConfigureWindow(xConfigureWindowReq *data, ClientPtr client) +void +XETSwConfigureWindow(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xConfigureWindowReq *data = (xConfigureWindowReq *)d; + swapl(&(data->window), n); swaps(&(data->mask), n); SwapRestL(data); @@ -301,16 +387,22 @@ } -void XETSwInternAtom(register xInternAtomReq *data) +void +XETSwInternAtom(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xInternAtomReq *data = (xInternAtomReq *)d; + swaps(&(data->length), n); swaps(&(data->nbytes), n); } -void XETSwChangeProperty(register xChangePropertyReq *data) +void +XETSwChangeProperty(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xChangePropertyReq *data = (xChangePropertyReq *)d; + swaps(&(data->length), n); swapl(&(data->window), n); swapl(&(data->property), n); @@ -327,17 +419,23 @@ swapl(&(data->nUnits), n); } -void XETSwDeleteProperty(register xDeletePropertyReq *data) +void +XETSwDeleteProperty(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xDeletePropertyReq *data = (xDeletePropertyReq *)d; + swaps(&(data->length), n); swapl(&(data->window), n); swapl(&(data->property), n); } -void XETSwGetProperty(register xGetPropertyReq *data) +void +XETSwGetProperty(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xGetPropertyReq *data = (xGetPropertyReq *)d; + swaps(&(data->length), n); swapl(&(data->window), n); swapl(&(data->property), n); @@ -346,18 +444,24 @@ swapl(&(data->longLength), n); } -void XETSwSetSelectionOwner(register xSetSelectionOwnerReq *data) +void +XETSwSetSelectionOwner(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xSetSelectionOwnerReq *data = (xSetSelectionOwnerReq *)d; + swaps(&(data->length), n); swapl(&(data->window), n); swapl(&(data->selection), n); swapl(&(data->time), n); } -void XETSwConvertSelection(register xConvertSelectionReq *data) +void +XETSwConvertSelection(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xConvertSelectionReq *data = (xConvertSelectionReq *)d; + swaps(&(data->length), n); swapl(&(data->requestor), n); swapl(&(data->selection), n); @@ -366,25 +470,31 @@ swapl(&(data->time), n); } -void XETSwSendEvent(register xSendEventReq *data) +void +XETSwSendEvent(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xSendEventReq *data = (xSendEventReq *)d; + xEvent eventT; - void (*proc)(); + EventSwapPtr proc; swapl(&(data->destination), n); swapl(&(data->eventMask), n); /* Swap event */ proc = EventSwapVector[data->event.u.u.type & 0177]; - if (!proc || (int (*)()) proc == (int (*)()) NotImplemented) + if (!proc || proc == NotImplemented) (*proc)(&(data->event), &eventT); data->event = eventT; swaps(&(data->length), n); } -void XETSwGrabPointer(register xGrabPointerReq *data) +void +XETSwGrabPointer(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xGrabPointerReq *data = (xGrabPointerReq *)d; + swaps(&(data->length), n); swapl(&(data->grabWindow), n); swaps(&(data->eventMask), n); @@ -393,9 +503,12 @@ swapl(&(data->time), n); } -void XETSwGrabButton(register xGrabButtonReq *data) +void +XETSwGrabButton(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xGrabButtonReq *data = (xGrabButtonReq *)d; + swaps(&(data->length), n); swapl(&(data->grabWindow), n); swaps(&(data->eventMask), n); @@ -404,59 +517,80 @@ swaps(&(data->modifiers), n); } -void XETSwUngrabButton(register xUngrabButtonReq *data) +void +XETSwUngrabButton(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xUngrabButtonReq *data = (xUngrabButtonReq *)d; + swaps(&(data->length), n); swapl(&(data->grabWindow), n); swaps(&(data->modifiers), n); } -void XETSwChangeActivePointerGrab(register xChangeActivePointerGrabReq *data) +void +XETSwChangeActivePointerGrab(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xChangeActivePointerGrabReq *data = (xChangeActivePointerGrabReq *)d; + swaps(&(data->length), n); swapl(&(data->cursor), n); swapl(&(data->time), n); swaps(&(data->eventMask), n); } -void XETSwGrabKeyboard(register xGrabKeyboardReq *data) +void +XETSwGrabKeyboard(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xGrabKeyboardReq *data = (xGrabKeyboardReq *)d; + swaps(&(data->length), n); swapl(&(data->grabWindow), n); swapl(&(data->time), n); } -void XETSwGrabKey(register xGrabKeyReq *data) +void +XETSwGrabKey(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xGrabKeyReq *data = (xGrabKeyReq *)d; + swaps(&(data->length), n); swapl(&(data->grabWindow), n); swaps(&(data->modifiers), n); } -void XETSwUngrabKey(register xUngrabKeyReq *data) +void +XETSwUngrabKey(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xUngrabKeyReq *data = (xUngrabKeyReq *)d; + swaps(&(data->length), n); swapl(&(data->grabWindow), n); swaps(&(data->modifiers), n); } -void XETSwGetMotionEvents(register xGetMotionEventsReq *data) +void +XETSwGetMotionEvents(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xGetMotionEventsReq *data = (xGetMotionEventsReq *)d; + swaps(&(data->length), n); swapl(&(data->window), n); swapl(&(data->start), n); swapl(&(data->stop), n); } -void XETSwTranslateCoords(register xTranslateCoordsReq *data) +void +XETSwTranslateCoords(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xTranslateCoordsReq *data = (xTranslateCoordsReq *)d; + swaps(&(data->length), n); swapl(&(data->srcWid), n); swapl(&(data->dstWid), n); @@ -464,9 +598,12 @@ swaps(&(data->srcY), n); } -void XETSwWarpPointer(register xWarpPointerReq *data) +void +XETSwWarpPointer(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xWarpPointerReq *data = (xWarpPointerReq *)d; + swaps(&(data->length), n); swapl(&(data->srcWid), n); swapl(&(data->dstWid), n); @@ -478,48 +615,65 @@ swaps(&(data->dstY), n); } -void XETSwSetInputFocus(register xSetInputFocusReq *data) +void +XETSwSetInputFocus(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xSetInputFocusReq *data = (xSetInputFocusReq *)d; + swaps(&(data->length), n); swapl(&(data->focus), n); swapl(&(data->time), n); } -void XETSwOpenFont(register xOpenFontReq *data) +void +XETSwOpenFont(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xOpenFontReq *data = (xOpenFontReq *)d; + swaps(&(data->length), n); swapl(&(data->fid), n); swaps(&(data->nbytes), n); } -void XETSwListFonts(register xListFontsReq *data) +void +XETSwListFonts(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xListFontsReq *data = (xListFontsReq *)d; + swaps(&(data->length), n); swaps(&(data->maxNames), n); swaps(&(data->nbytes), n); } -void XETSwListFontsWithInfo(register xListFontsWithInfoReq *data) +void +XETSwListFontsWithInfo(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xListFontsWithInfoReq *data = (xListFontsWithInfoReq *)d; + swaps(&(data->length), n); swaps(&(data->maxNames), n); swaps(&(data->nbytes), n); } -void XETSwSetFontPath(register xSetFontPathReq *data) +void +XETSwSetFontPath(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xSetFontPathReq *data = (xSetFontPathReq *)d; + swaps(&(data->length), n); swaps(&(data->nFonts), n); } -void XETSwCreatePixmap(register xCreatePixmapReq *data) +void +XETSwCreatePixmap(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xCreatePixmapReq *data = (xCreatePixmapReq *)d; swaps(&(data->length), n); swapl(&(data->pid), n); @@ -528,9 +682,12 @@ swaps(&(data->height), n); } -void XETSwCreateGC(register xCreateGCReq *data, ClientPtr client) +void +XETSwCreateGC(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xCreateGCReq *data = (xCreateGCReq *)d; + swapl(&(data->gc), n); swapl(&(data->drawable), n); swapl(&(data->mask), n); @@ -538,37 +695,48 @@ swaps(&(data->length), n); } -void XETSwChangeGC(register xChangeGCReq *data, ClientPtr client) +void +XETSwChangeGC(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xChangeGCReq *data = (xChangeGCReq *)d; + swapl(&(data->gc), n); swapl(&(data->mask), n); SwapRestL(data); swaps(&(data->length), n); } -void XETSwCopyGC(register xCopyGCReq *data) +void +XETSwCopyGC(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xCopyGCReq *data = (xCopyGCReq *)d; + swaps(&(data->length), n); swapl(&(data->srcGC), n); swapl(&(data->dstGC), n); swapl(&(data->mask), n); } -void XETSwSetDashes(register xSetDashesReq *data) +void +XETSwSetDashes(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xSetDashesReq *data = (xSetDashesReq *)d; + swaps(&(data->length), n); swapl(&(data->gc), n); swaps(&(data->dashOffset), n); swaps(&(data->nDashes), n); } -void XETSwSetClipRectangles(register xSetClipRectanglesReq *data, ClientPtr -client) +void +XETSwSetClipRectangles(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xSetClipRectanglesReq *data = (xSetClipRectanglesReq *)d; + swapl(&(data->gc), n); swaps(&(data->xOrigin), n); swaps(&(data->yOrigin), n); @@ -576,9 +744,12 @@ swaps(&(data->length), n); } -void XETSwClearToBackground(register xClearAreaReq *data) +void +XETSwClearToBackground(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xClearAreaReq *data = (xClearAreaReq *)d; + swaps(&(data->length), n); swapl(&(data->window), n); swaps(&(data->x), n); @@ -587,9 +758,12 @@ swaps(&(data->height), n); } -void XETSwCopyArea(register xCopyAreaReq *data) +void +XETSwCopyArea(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xCopyAreaReq *data = (xCopyAreaReq *)d; + swaps(&(data->length), n); swapl(&(data->srcDrawable), n); swapl(&(data->dstDrawable), n); @@ -602,9 +776,12 @@ swaps(&(data->height), n); } -void XETSwCopyPlane(register xCopyPlaneReq *data) +void +XETSwCopyPlane(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xCopyPlaneReq *data = (xCopyPlaneReq *)d; + swaps(&(data->length), n); swapl(&(data->srcDrawable), n); swapl(&(data->dstDrawable), n); @@ -620,9 +797,11 @@ /* The following routine is used for all Poly drawing requests (except FillPoly, which uses a different request format) */ -void XETSwPoly(register xPolyPointReq *data, ClientPtr client) +void +XETSwPoly(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xPolyPointReq *data = (xPolyPointReq *)d; swapl(&(data->drawable), n); swapl(&(data->gc), n); @@ -633,9 +812,11 @@ * is longer than xPolyPointReq, and we don't want to swap * the difference as shorts! */ -void XETSwFillPoly(register xFillPolyReq *data, ClientPtr client) +void +XETSwFillPoly(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xFillPolyReq *data = (xFillPolyReq *)d; swapl(&(data->drawable), n); swapl(&(data->gc), n); @@ -643,9 +824,12 @@ swaps(&(data->length), n); } -void XETSwPutImage(register xPutImageReq *data) +void +XETSwPutImage(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xPutImageReq *data = (xPutImageReq *)d; + swaps(&(data->length), n); swapl(&(data->drawable), n); swapl(&(data->gc), n); @@ -656,9 +840,12 @@ /* Image should already be swapped */ } -void XETSwGetImage(register xGetImageReq *data) +void +XETSwGetImage(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xGetImageReq *data = (xGetImageReq *)d; + swaps(&(data->length), n); swapl(&(data->drawable), n); swaps(&(data->x), n); @@ -670,9 +857,12 @@ /* ProcPolyText used for both PolyText8 and PolyText16 */ -void XETSwPolyText(register xPolyTextReq *data) +void +XETSwPolyText(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xPolyTextReq *data = (xPolyTextReq *)d; + swaps(&(data->length), n); swapl(&(data->drawable), n); swapl(&(data->gc), n); @@ -682,9 +872,12 @@ /* ProcImageText used for both ImageText8 and ImageText16 */ -void XETSwImageText(register xImageTextReq *data) +void +XETSwImageText(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xImageTextReq *data = (xImageTextReq *)d; + swaps(&(data->length), n); swapl(&(data->drawable), n); swapl(&(data->gc), n); @@ -692,9 +885,12 @@ swaps(&(data->y), n); } -void XETSwCreateColormap(register xCreateColormapReq *data) +void +XETSwCreateColormap(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xCreateColormapReq *data = (xCreateColormapReq *)d; + swaps(&(data->length), n); swapl(&(data->mid), n); swapl(&(data->window), n); @@ -702,18 +898,24 @@ } -void XETSwCopyColormapAndFree(register xCopyColormapAndFreeReq *data) +void +XETSwCopyColormapAndFree(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xCopyColormapAndFreeReq *data = (xCopyColormapAndFreeReq *)d; + swaps(&(data->length), n); swapl(&(data->mid), n); swapl(&(data->srcCmap), n); } -void XETSwAllocColor (register xAllocColorReq *data) +void +XETSwAllocColor(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xAllocColorReq *data = (xAllocColorReq *)d; + swaps(&(data->length), n); swapl(&(data->cmap), n); swaps(&(data->red), n); @@ -721,27 +923,35 @@ swaps(&(data->blue), n); } -void XETSwAllocNamedColor (register xAllocNamedColorReq *data) +void +XETSwAllocNamedColor(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xAllocNamedColorReq *data = (xAllocNamedColorReq *)d; swaps(&(data->length), n); swapl(&(data->cmap), n); swaps(&(data->nbytes), n); } -void XETSwAllocColorCells (register xAllocColorCellsReq *data) +void +XETSwAllocColorCells(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xAllocColorCellsReq *data = (xAllocColorCellsReq *)d; + swaps(&(data->length), n); swapl(&(data->cmap), n); swaps(&(data->colors), n); swaps(&(data->planes), n); } -void XETSwAllocColorPlanes(register xAllocColorPlanesReq *data) +void +XETSwAllocColorPlanes(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xAllocColorPlanesReq *data = (xAllocColorPlanesReq *)d; + swaps(&(data->length), n); swapl(&(data->cmap), n); swaps(&(data->colors), n); @@ -750,10 +960,12 @@ swaps(&(data->blue), n); } -void XETSwFreeColors (register xFreeColorsReq *data, ClientPtr -client) +void +XETSwFreeColors(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xFreeColorsReq *data = (xFreeColorsReq *)d; + swapl(&(data->cmap), n); swapl(&(data->planeMask), n); SwapRestL(data); @@ -761,12 +973,13 @@ } -void XETSwStoreColors (register xStoreColorsReq *data,ClientPtr -client) +void +XETSwStoreColors(xResourceReq *d, ClientPtr client) { - register char n; + char n; unsigned long count; xColorItem *pItem; + xStoreColorsReq *data = (xStoreColorsReq *)d; swapl(&(data->cmap), n); pItem = (xColorItem *) &(data[1]); @@ -775,34 +988,46 @@ swaps(&(data->length), n); } -void XETSwStoreNamedColor (register xStoreNamedColorReq *data) +void +XETSwStoreNamedColor(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xStoreNamedColorReq *data = (xStoreNamedColorReq *)d; + swaps(&(data->length), n); swapl(&(data->cmap), n); swapl(&(data->pixel), n); swaps(&(data->nbytes), n); } -void XETSwQueryColors(register xQueryColorsReq *data, ClientPtr client) +void +XETSwQueryColors(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xQueryColorsReq *data = (xQueryColorsReq *)d; + swapl(&(data->cmap), n); SwapRestL(data); swaps(&(data->length), n); } -void XETSwLookupColor(register xLookupColorReq *data) +void +XETSwLookupColor(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xLookupColorReq *data = (xLookupColorReq *)d; + swaps(&(data->length), n); swapl(&(data->cmap), n); swaps(&(data->nbytes), n); } -void XETSwCreateCursor(register xCreateCursorReq *data) +void +XETSwCreateCursor(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xCreateCursorReq *data = (xCreateCursorReq *)d; + swaps(&(data->length), n); swapl(&(data->cid), n); swapl(&(data->source), n); @@ -817,9 +1042,12 @@ swaps(&(data->y), n); } -void XETSwCreateGlyphCursor(register xCreateGlyphCursorReq *data) +void +XETSwCreateGlyphCursor(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xCreateGlyphCursorReq *data = (xCreateGlyphCursorReq *)d; + swaps(&(data->length), n); swapl(&(data->cid), n); swapl(&(data->source), n); @@ -835,9 +1063,12 @@ } -void XETSwRecolorCursor(register xRecolorCursorReq *data) +void +XETSwRecolorCursor(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xRecolorCursorReq *data = (xRecolorCursorReq *)d; + swaps(&(data->length), n); swapl(&(data->cursor), n); swaps(&(data->foreRed), n); @@ -848,9 +1079,12 @@ swaps(&(data->backBlue), n); } -void XETSwQueryBestSize (register xQueryBestSizeReq *data) +void +XETSwQueryBestSize(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xQueryBestSizeReq *data = (xQueryBestSizeReq *)d; + swaps(&(data->length), n); swapl(&(data->drawable), n); swaps(&(data->width), n); @@ -858,18 +1092,23 @@ } -void XETSwQueryExtension (register xQueryExtensionReq *data) +void +XETSwQueryExtension(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xQueryExtensionReq *data = (xQueryExtensionReq *)d; + swaps(&(data->length), n); swaps(&(data->nbytes), n); } -void XETSwChangeKeyboardMapping (register xChangeKeyboardMappingReq *data) +void +XETSwChangeKeyboardMapping(xResourceReq *d, ClientPtr client) { - register char n; - register long *p; - register int i, count; + char n; + long *p; + int i, count; + xChangeKeyboardMappingReq *data = (xChangeKeyboardMappingReq *)d; swaps(&(data->length), n); p = (long *)&(data[1]); @@ -882,18 +1121,23 @@ } -void XETSwChangeKeyboardControl (register xChangeKeyboardControlReq *data, - ClientPtr client) +void +XETSwChangeKeyboardControl(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xChangeKeyboardControlReq *data = (xChangeKeyboardControlReq *)d; + swapl(&(data->mask), n); SwapRestL(data); swaps(&(data->length), n); } -void XETSwChangePointerControl (register xChangePointerControlReq *data) +void +XETSwChangePointerControl(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xChangePointerControlReq *data = (xChangePointerControlReq *)d; + swaps(&(data->length), n); swaps(&(data->accelNum), n); swaps(&(data->accelDenum), n); @@ -901,25 +1145,33 @@ } -void XETSwSetScreenSaver (register xSetScreenSaverReq *data) +void +XETSwSetScreenSaver(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xSetScreenSaverReq *data = (xSetScreenSaverReq *)d; + swaps(&(data->length), n); swaps(&(data->timeout), n); swaps(&(data->interval), n); } -void XETSwChangeHosts(register xChangeHostsReq *data) +void +XETSwChangeHosts(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xChangeHostsReq *data = (xChangeHostsReq *)d; swaps(&(data->length), n); swaps(&(data->hostLength), n); } -void XETSwRotateProperties(register xRotatePropertiesReq *data, ClientPtr client) +void +XETSwRotateProperties(xResourceReq *d, ClientPtr client) { - register char n; + char n; + xRotatePropertiesReq *data = (xRotatePropertiesReq *)d; + swapl(&(data->window), n); swaps(&(data->nAtoms), n); swaps(&(data->nPositions), n); @@ -928,7 +1180,22 @@ } /*ARGSUSED*/ -void XETSwNoOperation(xReq *data) +void +XETSwNoOperation(xResourceReq *d, ClientPtr client) +{ + /* noop -- don't do anything */ +} + +/*ARGSUSED*/ +void +XETSwNotImplemented(xResourceReq *d, ClientPtr client) +{ + /* noop -- don't do anything */ +} + +/*ARGSUSED*/ +void +XETSwProcBadRequest(xResourceReq *d, ClientPtr client) { /* noop -- don't do anything */ } @@ -936,9 +1203,9 @@ /* Byte swap a list of longs */ #if defined vms && !defined MITR5 #ifndef LINKED_IN -void SwapLongs ( register long *list, register unsigned long count) +void SwapLongs ( long *list, register unsigned long count) { - register char n; + char n; while (count >= 8) { swapl(list+0, n); @@ -962,9 +1229,9 @@ /* Byte swap a list of shorts */ -void SwapShorts (register short *list, register unsigned long count) +void SwapShorts (short *list, register unsigned long count) { - register char n; + char n; while (count >= 16) { swaps(list+0, n); @@ -996,7 +1263,7 @@ SwapColorItem(xColorItem *pItem) { - register char n; + char n; swapl(&pItem->pixel, n); swaps(&pItem->red, n); swaps(&pItem->green, n); Index: xc/programs/Xserver/XTrap/xtrapditbl.c diff -u xc/programs/Xserver/XTrap/xtrapditbl.c:1.1 xc/programs/Xserver/XTrap/xtrapditbl.c:1.3 --- xc/programs/Xserver/XTrap/xtrapditbl.c:1.1 Fri Nov 2 18:29:29 2001 +++ xc/programs/Xserver/XTrap/xtrapditbl.c Fri Oct 14 11:16:10 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/XTrap/xtrapditbl.c,v 1.1 2001/11/02 23:29:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapditbl.c,v 1.3 2005/10/14 15:16:10 tsi Exp $ */ /**************************************************************************** Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA @@ -20,6 +20,53 @@ *****************************************************************************/ /* + * Copyright (c) 2005 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* * ABSTRACT: * * This module is contains Vector tables used for swapping and general @@ -31,7 +78,7 @@ * Marc Evans * */ - + /*-----------------* * Include Files * *-----------------*/ @@ -49,12 +96,12 @@ #else # include "extnsionst.h" /* Server ExtensionEntry definitions */ #endif -#include -#include +#include "xtrapddmi.h" +#include "xtrapproto.h" -globaldef void_function XETSwProcVector[256L] = +globaldef XETSwReqFunc XETSwProcVector[256L] = { - (void_function)ProcBadRequest, + XETSwProcBadRequest, XETSwCreateWindow, XETSwChangeWindowAttributes, XETSwResourceReq, /* GetWindowAttributes */ @@ -174,13 +221,13 @@ XETSwSimpleReq, /* GetPointerMapping, */ XETSwSimpleReq, /* SetModifierMapping, */ XETSwSimpleReq, /* GetModifierMapping, */ - NotImplemented, /* 120 */ - NotImplemented, - NotImplemented, - NotImplemented, - NotImplemented, - NotImplemented, /* 125 */ - NotImplemented, + XETSwNotImplemented, /* 120 */ + XETSwNotImplemented, + XETSwNotImplemented, + XETSwNotImplemented, + XETSwNotImplemented, + XETSwNotImplemented, /* 125 */ + XETSwNotImplemented, XETSwNoOperation }; @@ -188,7 +235,7 @@ * as minor_opcode values in the request structure. Failure to do this * could result in random code paths. */ -globaldef int_function XETrapDispatchVector[10L] = +globaldef XETDispatchFunc XETrapDispatchVector[10L] = { XETrapReset, /* 0 XETrap_Reset */ XETrapGetAvailable, /* 1 XETrap_GetAvailable */ @@ -208,7 +255,7 @@ * as minor_opcode values in the request structure. Failure to do this * could result in random code paths. */ -globaldef int_function XETSwDispatchVector[10L] = +globaldef XETDispatchFunc XETSwDispatchVector[10L] = { sXETrapReset, /* 0 XETrap_Reset */ sXETrapGetAvailable, /* 1 XETrap_GetAvailable */ @@ -225,14 +272,14 @@ }; /* ProcVector shadow vector */ -globaldef int_function XETrapProcVector[256L] = {XETrapRequestVector}; +globaldef XETProcFunc XETrapProcVector[256L] = {XETrapRequestVector}; /* * Events are faked as if they're vectored since that's * the way it'll eventually be (X11 R5?). */ #ifndef VECTORED_EVENTS -globaldef int_function EventProcVector[XETrapCoreEvents] = {NULL}; +globaldef ProcessInputProc EventProcVector[XETrapCoreEvents] = {NULL}; #endif -globaldef int_function XETrapEventProcVector[XETrapCoreEvents] = {NULL}; +globaldef ProcessInputProc XETrapEventProcVector[XETrapCoreEvents] = {NULL}; Index: xc/programs/Xserver/XTrap/xtrapproto.h diff -u /dev/null xc/programs/Xserver/XTrap/xtrapproto.h:1.1 --- /dev/null Tue May 9 21:55:52 2006 +++ xc/programs/Xserver/XTrap/xtrapproto.h Thu Mar 24 21:22:53 2005 @@ -0,0 +1,222 @@ +/* $XFree86: xc/programs/Xserver/XTrap/xtrapproto.h,v 1.1 2005/03/25 02:22:53 dawes Exp $ */ + +#ifndef __XTRAPPROTO__ +#define __XTRAPPROTO__ + +/***************************************************************************** +Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + +*****************************************************************************/ +/* + * Copyright (c) 2005 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * + * CONTRIBUTORS: + * + * Dick Annicchiarico + * Robert Chesler + * Dan Coutu + * Gene Durso + * Marc Evans + * Alan Jamison + * Mark Henry + * Ken Miller + * + * DESCRIPTION: + * This header file contains the function prototypes for extension + * routines sorted by module (globally defined routines *only*). + */ +#ifndef Bool +# define Bool int +#endif + +typedef void (*XETSwReqFunc)(xResourceReq *data, ClientPtr client); +typedef int (*XETDispatchFunc)(xXTrapReq *stuff, ClientPtr client); +typedef int (*XETProcFunc)(ClientPtr client); + +/* xtrapdi.c */ +int XETrapDestroyEnv (pointer value , XID id ); +void XETrapCloseDown ( ExtensionEntry *extEntry ); +Bool XETrapRedirectDevices (void ); +void DEC_XTRAPInit (void ); +int XETrapCreateEnv (ClientPtr client ); +int XETrapDispatch (ClientPtr client ); +int sXETrapDispatch (ClientPtr client ); +int XETrapReset (xXTrapReq *request , ClientPtr client ); +int XETrapGetAvailable (xXTrapReq *request , ClientPtr client ); +int XETrapGetCurrent (xXTrapReq *request , ClientPtr client ); +int XETrapGetStatistics (xXTrapReq *request , ClientPtr client ); +int XETrapConfig (xXTrapReq *request , ClientPtr client ); +int XETrapStartTrap (xXTrapReq *request , ClientPtr client ); +int XETrapStopTrap (xXTrapReq *request , ClientPtr client ); +int XETrapGetVersion (xXTrapReq *request , ClientPtr client ); +int XETrapGetLastInpTime (xXTrapReq *request , ClientPtr client ); +int XETrapRequestVector (ClientPtr client ); +void XETrapKeyboard (xEvent *x_event , DeviceIntPtr keybd , int count ); +#ifndef VECTORED_EVENTS +void XETrapPointer (xEvent *x_event , DeviceIntPtr ptrdev , int count ); +#else +int XETrapEventVector (ClientPtr client , xEvent *x_event ); +#endif +void XETrapStampAndMail (xEvent *x_event ); +void sReplyXTrapDispatch (ClientPtr client , int size , void *reply ); +int XETrapWriteXLib (XETrapEnv *penv , BYTE *data , CARD32 nbytes ); + +/* xtrapddmi.c */ +void XETrapPlatformSetup (void ); +int XETrapSimulateXEvent (xXTrapReq *request , ClientPtr client ); + +/* xtrapdiswap.c */ +int sXETrapReset (xXTrapReq *request , ClientPtr client ); +int sXETrapGetAvailable (xXTrapReq *request , ClientPtr client ); +int sXETrapConfig (xXTrapReq *request , ClientPtr client ); +int sXETrapStartTrap (xXTrapReq *request , ClientPtr client ); +int sXETrapStopTrap (xXTrapReq *request , ClientPtr client ); +int sXETrapGetCurrent (xXTrapReq *request , ClientPtr client ); +int sXETrapGetStatistics (xXTrapReq *request , ClientPtr client ); +int sXETrapSimulateXEvent (xXTrapReq *request , ClientPtr client ); +int sXETrapGetVersion (xXTrapReq *request , ClientPtr client ); +int sXETrapGetLastInpTime (xXTrapReq *request , ClientPtr client ); +void sReplyXETrapGetAvail (ClientPtr client , int size , char *reply ); +void sReplyXETrapGetVers (ClientPtr client , int size , char *reply ); +void sReplyXETrapGetLITim (ClientPtr client , int size , char *reply ); +void sReplyXETrapGetCur (ClientPtr client , int size , char *reply ); +void sReplyXETrapGetStats (ClientPtr client , int size , char *reply ); +void sXETrapHeader (XETrapHeader *hdr ); +void XETSwSimpleReq (xResourceReq *data, ClientPtr client ); +void XETSwResourceReq (xResourceReq *data, ClientPtr client ); +void XETSwCreateWindow (xResourceReq *data , ClientPtr client ); +void XETSwChangeWindowAttributes (xResourceReq *data , ClientPtr client ); +void XETSwReparentWindow (xResourceReq *data, ClientPtr client ); +void XETSwConfigureWindow (xResourceReq *data , ClientPtr client ); +void XETSwInternAtom (xResourceReq *data, ClientPtr client ); +void XETSwChangeProperty (xResourceReq *data, ClientPtr client ); +void XETSwDeleteProperty (xResourceReq *data, ClientPtr client ); +void XETSwGetProperty (xResourceReq *data, ClientPtr client ); +void XETSwSetSelectionOwner (xResourceReq *data, ClientPtr client ); +void XETSwConvertSelection (xResourceReq *data, ClientPtr client ); +void XETSwSendEvent (xResourceReq *data, ClientPtr client ); +void XETSwGrabPointer (xResourceReq *data, ClientPtr client ); +void XETSwGrabButton (xResourceReq *data, ClientPtr client ); +void XETSwUngrabButton (xResourceReq *data, ClientPtr client ); +void XETSwChangeActivePointerGrab (xResourceReq *data, ClientPtr client ); +void XETSwGrabKeyboard (xResourceReq *data, ClientPtr client ); +void XETSwGrabKey (xResourceReq *data, ClientPtr client ); +void XETSwUngrabKey (xResourceReq *data, ClientPtr client ); +void XETSwGetMotionEvents (xResourceReq *data, ClientPtr client ); +void XETSwTranslateCoords (xResourceReq *data, ClientPtr client ); +void XETSwWarpPointer (xResourceReq *data, ClientPtr client ); +void XETSwSetInputFocus (xResourceReq *data, ClientPtr client ); +void XETSwOpenFont (xResourceReq *data, ClientPtr client ); +void XETSwListFonts (xResourceReq *data, ClientPtr client ); +void XETSwListFontsWithInfo (xResourceReq *data, ClientPtr client ); +void XETSwSetFontPath (xResourceReq *data, ClientPtr client ); +void XETSwCreatePixmap (xResourceReq *data, ClientPtr client ); +void XETSwCreateGC (xResourceReq *data , ClientPtr client ); +void XETSwChangeGC (xResourceReq *data , ClientPtr client ); +void XETSwCopyGC (xResourceReq *data, ClientPtr client ); +void XETSwSetDashes (xResourceReq *data, ClientPtr client ); +void XETSwSetClipRectangles (xResourceReq *data , ClientPtr client ); +void XETSwClearToBackground (xResourceReq *data, ClientPtr client ); +void XETSwCopyArea (xResourceReq *data, ClientPtr client ); +void XETSwCopyPlane (xResourceReq *data, ClientPtr client ); +void XETSwPoly (xResourceReq *data, ClientPtr client ); +void XETSwFillPoly (xResourceReq *data, ClientPtr client ); +void XETSwPutImage (xResourceReq *data, ClientPtr client ); +void XETSwGetImage (xResourceReq *data, ClientPtr client ); +void XETSwPolyText (xResourceReq *data, ClientPtr client ); +void XETSwImageText (xResourceReq *data, ClientPtr client ); +void XETSwCreateColormap (xResourceReq *data, ClientPtr client ); +void XETSwCopyColormapAndFree (xResourceReq *data, ClientPtr client ); +void XETSwAllocColor (xResourceReq *data, ClientPtr client ); +void XETSwAllocNamedColor (xResourceReq *data, ClientPtr client ); +void XETSwAllocColorCells (xResourceReq *data, ClientPtr client ); +void XETSwAllocColorPlanes (xResourceReq *data, ClientPtr client ); +void XETSwFreeColors (xResourceReq *data , ClientPtr client ); +void XETSwStoreColors (xResourceReq *data , ClientPtr client ); +void XETSwStoreNamedColor (xResourceReq *data, ClientPtr client ); +void XETSwQueryColors (xResourceReq *data , ClientPtr client ); +void XETSwLookupColor (xResourceReq *data, ClientPtr client ); +void XETSwCreateCursor (xResourceReq *data, ClientPtr client ); +void XETSwCreateGlyphCursor (xResourceReq *data, ClientPtr client ); +void XETSwRecolorCursor (xResourceReq *data, ClientPtr client ); +void XETSwQueryBestSize (xResourceReq *data, ClientPtr client ); +void XETSwQueryExtension (xResourceReq *data, ClientPtr client ); +void XETSwChangeKeyboardMapping (xResourceReq *data, ClientPtr client ); +void XETSwChangeKeyboardControl (xResourceReq *data , ClientPtr client ); +void XETSwChangePointerControl (xResourceReq *data, ClientPtr client ); +void XETSwSetScreenSaver (xResourceReq *data, ClientPtr client ); +void XETSwChangeHosts (xResourceReq *data, ClientPtr client ); +void XETSwRotateProperties (xResourceReq *data , ClientPtr client ); +void XETSwNoOperation (xResourceReq *data, ClientPtr client ); +void XETSwNotImplemented (xResourceReq *data, ClientPtr client); +void XETSwProcBadRequest(xResourceReq *data, ClientPtr client); +#ifdef vms +void SwapLongs (long *list , unsigned long count ); +void SwapShorts (short *list , unsigned long count ); +int SwapColorItem (xColorItem *pItem ); +#endif /* vms */ + + +#endif /* __XTRAPPROTO__ */ Index: xc/programs/Xserver/XTrap/module/Imakefile diff -u xc/programs/Xserver/XTrap/module/Imakefile:1.5 xc/programs/Xserver/XTrap/module/Imakefile:1.6 --- xc/programs/Xserver/XTrap/module/Imakefile:1.5 Mon May 31 20:16:58 2004 +++ xc/programs/Xserver/XTrap/module/Imakefile Fri May 13 17:02:30 2005 @@ -1,72 +1,6 @@ -XCOMM $XFree86: xc/programs/Xserver/XTrap/module/Imakefile,v 1.5 2004/06/01 00:16:58 dawes Exp $ -/* - * Copyright (c) 1994-2004 by 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 in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution, and in the same place and form as other copyright, - * license and disclaimer information. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: "This product - * includes software developed by The XFree86 Project, Inc - * (http://www.xfree86.org/) and its contributors", in the same - * place and form as other third-party acknowledgments. Alternately, - * this acknowledgment may appear in the software itself, in the - * same form and location as other such third-party acknowledgments. - * - * 4. Except as contained in this notice, the name of The XFree86 - * Project, Inc shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from The XFree86 Project, Inc. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ +XCOMM $XFree86: xc/programs/Xserver/XTrap/module/Imakefile,v 1.6 2005/05/13 21:02:30 dawes Exp $ #define IHaveModules -#include - - SRCS = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c xf86XTrapModule.c - OBJS = xtrapddmi.o xtrapdi.o xtrapdiswp.o xtrapditbl.o xf86XTrapModule.o - INCLUDES = -I.. -I../../include -I$(EXTINCSRC) -I$(XINCLUDESRC) \ - -I$(SERVERSRC)/Xext - DEFINES = -DEXTMODULE - -LinkSourceFile(xf86XTrapModule.c,..) -LinkSourceFile(xtrapddmi.c,..) -LinkSourceFile(xtrapdi.c,..) -LinkSourceFile(xtrapdiswp.c,..) -LinkSourceFile(xtrapditbl.c,..) - -ModuleObjectRule() -LibraryModuleTarget(xtrap,$(OBJS),extensions) - -InstallLibraryModule(xtrap,$(MODULEDIR),extensions) - -DependTarget() - -InstallDriverSDKLibraryModule(xtrap,$(DRIVERSDKMODULEDIR),extensions) +#define LinkDirectory .. +#include "../Imakefile" Index: xc/programs/Xserver/Xext/EVI.c diff -u xc/programs/Xserver/Xext/EVI.c:3.11 xc/programs/Xserver/Xext/EVI.c:3.13 --- xc/programs/Xserver/Xext/EVI.c:3.11 Tue Oct 28 18:08:43 2003 +++ xc/programs/Xserver/Xext/EVI.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,3 @@ -/* $Xorg: EVI.c,v 1.3 2000/08/17 19:47:55 cpqbld Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this @@ -21,18 +20,19 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.11 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/EVI.c,v 3.13 2005/10/14 15:16:11 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include "dix.h" #define _XEVI_SERVER_ -#include "XEVIstr.h" +#include #include "EVIstruct.h" #include "modinit.h" +#ifdef EVI #if 0 static unsigned char XEVIReqCode = 0; #endif @@ -196,3 +196,4 @@ eviPriv = eviDDXInit(); } } +#endif Index: xc/programs/Xserver/Xext/EVIstruct.h diff -u xc/programs/Xserver/Xext/EVIstruct.h:3.6 xc/programs/Xserver/Xext/EVIstruct.h:3.7 --- xc/programs/Xserver/Xext/EVIstruct.h:3.6 Mon Nov 17 17:20:26 2003 +++ xc/programs/Xserver/Xext/EVIstruct.h Mon Jan 9 09:59:40 2006 @@ -1,4 +1,3 @@ -/* $Xorg: EVIstruct.h,v 1.3 2000/08/17 19:47:55 cpqbld Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this @@ -21,7 +20,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.6 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/EVIstruct.h,v 3.7 2006/01/09 14:59:40 dawes Exp $ */ #ifndef EVI_STRUCT_H #define EVI_STRUCT_H Index: xc/programs/Xserver/Xext/Imakefile diff -u xc/programs/Xserver/Xext/Imakefile:3.48 xc/programs/Xserver/Xext/Imakefile:3.51 --- xc/programs/Xserver/Xext/Imakefile:3.48 Thu Aug 5 16:37:42 2004 +++ xc/programs/Xserver/Xext/Imakefile Sun Feb 19 10:51:16 2006 @@ -1,7 +1,7 @@ -XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.48 2004/08/05 20:37:42 tsi Exp $ +XCOMM $XFree86: xc/programs/Xserver/Xext/Imakefile,v 3.51 2006/02/19 15:51:16 tsi Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -52,99 +52,103 @@ #if DoLoadableServer #define IHaveSubdirs -SUBDIRS1 = extmod + SUBDIRS = extmod #endif -#if BuildSeparateTinyDIX && !BuildTinyDIX -#ifndef IHaveSubdirs -#define IHaveSubdirs -#endif -SUBDIRS2 = tiny -#endif - -SUBDIRS = $(SUBDIRS1) $(SUBDIRS2) - #if BuildEVI #ifdef SGIArchitectureNotTog - EVISRCS = EVI.c sgiEVI.c - EVIOBJS = EVI.o sgiEVI.o + EVISRCS = EVI.c sgiEVI.c + EVIOBJS = EVI.o sgiEVI.o #else - EVISRCS = EVI.c sampleEVI.c - EVIOBJS = EVI.o sampleEVI.o + EVISRCS = EVI.c sampleEVI.c + EVIOBJS = EVI.o sampleEVI.o #endif #endif + #if HasShm - SHMSRCS = shm.c - SHMOBJS = shm.o + SHMSRCS = shm.c + SHMOBJS = shm.o #endif #if BuildMultibuffer - MULTIBUFSRC = mbuf.c - MULTIBUFOBJ = mbuf.o + MULTIBUFSRC = mbuf.c + MULTIBUFOBJ = mbuf.o + SLEEPSRCS = sleepuntil.c + SLEEPOBJS = sleepuntil.o #endif #if BuildScreenSaverExt - SCRNSAVSRC = saver.c - SCRNSAVOBJ = saver.o + SCRNSAVSRC = saver.c + SCRNSAVOBJ = saver.o #endif #if BuildXF86VidModeExt && XF86Server - VIDMODESRCS = xf86vmode.c - VIDMODEOBJS = xf86vmode.o + VIDMODESRCS = xf86vmode.c + VIDMODEOBJS = xf86vmode.o #endif #if BuildXF86MiscExt && XF86Server -XF86MISCSRCS = xf86misc.c -XF86MISCOBJS = xf86misc.o + XF86MISCSRCS = xf86misc.c + XF86MISCOBJS = xf86misc.o #endif #if BuildXF86BigfontExt -XF86BIGFSRCS = xf86bigfont.c -XF86BIGFOBJS = xf86bigfont.o + XF86BIGFSRCS = xf86bigfont.c + XF86BIGFOBJS = xf86bigfont.o #if HasShm - SHM_DEFINES = -DHAS_SHM + SHM_DEFINES = -DHAS_SHM #endif #endif -#if BuildXF86DGA && XF86Server - XF86DGASRCS = xf86dga.c xf86dga2.c - XF86DGAOBJS = xf86dga.o xf86dga2.o +#if BuildXF86DGA + XF86DGASRCS = xf86dga.c xf86dga2.c + XF86DGAOBJS = xf86dga.o xf86dga2.o #endif #if BuildXvExt - XVSRCS = xvmain.c xvdisp.c xvmc.c - XVOBJS = xvmain.o xvdisp.o xvmc.o + XVSRCS = xvmain.c xvdisp.c + XVOBJS = xvmain.o xvdisp.o +#endif + +#if BuildXvMCExt + XVMCSRCS = xvmc.c + XVMCOBJS = xvmc.o #endif #if BuildXResExt - XRESSRCS = xres.c - XRESOBJS = xres.o + XRESSRCS = xres.c + XRESOBJS = xres.o #endif #if BuildAppgroup - APPGROUPSRCS = appgroup.c - APPGROUPOBJS = appgroup.o + APPGROUPSRCS = appgroup.c + APPGROUPOBJS = appgroup.o #endif + #if BuildXCSecurity SECURITYSRCS = security.c SECURITYOBJS = security.o SERVERCONFIGDIR = ServerConfigDir POLICYFILEDEF = -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGDIR)/SecurityPolicy\" #endif + #if BuildCup CUPSRCS = cup.c CUPOBJS = cup.o #endif + #if BuildXinerama PNRXSRCS = panoramiX.c panoramiXSwap.c panoramiXprocs.c PNRXOBJS = panoramiX.o panoramiXSwap.o panoramiXprocs.o - PNRXINCLUDES = -I$(FONTINCSRC) -I$(SERVERSRC)/mi -I$(SERVERSRC)/render + PNRXINCLUDES = -I$(SERVERSRC)/mi -I$(SERVERSRC)/render #endif -#if !(BuildSeparateTinyDIX && BuildTinyDIX) && XdmxServer + +#if XdmxServer DMXSRCS = dmx.c DMXOBJS = dmx.o DMXINCLUDES = -I$(SERVERSRC)/hw/dmx #endif + #if BuildDPMS DPMSSRCS = dpms.c DPMSOBJS = dpms.o @@ -153,45 +157,75 @@ #if BuildFontCache FONTCACHESRCS = fontcache.c FONTCACHEOBJS = fontcache.o -#if 0 - FONTCACHEINCLUDES = -I$(XF86SRC)/os-support #endif + +#if BuildMITMiscExt + MITMISCSRCS = mitmisc.c + MITMISCOBJS = mitmisc.o +#endif + +#if BuildTestExt + XTESTSRCS = xtest.c xtest1di.c xtest1dd.c + XTESTOBJS = xtest.o xtest1di.o xtest1dd.o + SLEEPSRCS = sleepuntil.c + SLEEPOBJS = sleepuntil.o +#endif + +#if BuildSyncExt + SYNCSRCS = sync.c + SYNCOBJS = sync.o +#endif + +#if BuildXCMiscExt + XCMISCSRCS = xcmisc.c + XCMISCOBJS = xcmisc.o +#endif + +#if BuildShapeExt + SHAPESRCS = shape.c + SHAPEOBJS = shape.o #endif +#if BuildBigReqsExt + BIGREQSRCS = bigreq.c + BIGREQOBJS = bigreq.o +#endif - SRCS = shape.c $(SHMSRCS) $(MULTIBUFSRC) \ - mitmisc.c xtest.c xtest1di.c xtest1dd.c sleepuntil.c \ - bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c $(VIDMODESRCS) \ - $(XF86MISCSRCS) $(XF86BIGFSRCS) $(XF86DGASRCS) $(SECURITYSRCS) \ - $(APPGROUPSRCS) xprint.c $(CUPSRCS) $(PNRXSRCS) $(DPMSSRCS) \ - $(EVISRCS) $(XVSRCS) $(FONTCACHESRCS) $(XRESSRCS) $(DMXSRCS) + SRCS = $(SHAPESRCS) $(SHMSRCS) $(MULTIBUFSRC) $(MITMISCSRCS) \ + $(XTESTSRCS) $(SLEEPSRCS) $(BIGREQSRCS) $(SYNCSRCS) \ + $(SCRNSAVSRC) $(XCMISCSRCS) $(VIDMODESRCS) $(XF86MISCSRCS) \ + $(XF86BIGFSRCS) $(XF86DGASRCS) $(SECURITYSRCS) \ + $(APPGROUPSRCS) xprint.c $(CUPSRCS) $(PNRXSRCS) \ + $(DPMSSRCS) $(EVISRCS) $(XVSRCS) $(XVMCSRCS) \ + $(FONTCACHESRCS) $(XRESSRCS) $(DMXSRCS) - OBJS = shape.o $(SHMOBJS) $(MULTIBUFOBJ) \ - mitmisc.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o \ - bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o $(VIDMODEOBJS) \ - $(XF86MISCOBJS) $(XF86BIGFOBJS) $(XF86DGAOBJS) $(SECURITYOBJS) \ - $(APPGROUPOBJS) xprint.o $(CUPOBJS) $(PNRXOBJS) $(DPMSOBJS) \ - $(EVIOBJS) $(XVOBJS) $(FONTCACHEOBJS) $(XRESOBJS) $(DMXOBJS) + OBJS = $(SHAPEOBJS) $(SHMOBJS) $(MULTIBUFOBJ) $(MITMISCOBJS) \ + $(XTESTOBJS) $(SLEEPOBJS) $(BIGREQOBJS) $(SYNCOBJS) \ + $(SCRNSAVOBJ) $(XCMISCOBJS) $(VIDMODEOBJS) $(XF86MISCOBJS) \ + $(XF86BIGFOBJS) $(XF86DGAOBJS) $(SECURITYOBJS) \ + $(APPGROUPOBJS) xprint.o $(CUPOBJS) $(PNRXOBJS) \ + $(DPMSOBJS) $(EVIOBJS) $(XVOBJS) $(XVMCOBJS) \ + $(FONTCACHEOBJS) $(XRESOBJS) $(DMXOBJS) - SOBJS = $(SHMOBJS) $(APPGROUPOBJS) $(SECURITYOBJS) xprint.o \ - xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(PNRXOBJS) \ - $(XF86BIGFOBJS) +#if DoLoadableServer + SOBJS = $(SHMOBJS) $(APPGROUPOBJS) $(SECURITYOBJS) xprint.o \ + $(XTESTOBJS) $(SLEEPOBJS) $(PNRXOBJS) \ + $(XF86BIGFOBJS) +#endif #ifdef XFree86Version /* XXX Check if this can be eliminated */ -XF86INCLUDES = -I$(XF86COMSRC) + XF86INCLUDES = -I$(XF86COMSRC) #endif - INCLUDES = -I$(SERVERSRC)/Xext -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(EXTINCSRC) \ - $(PNRXINCLUDES) $(XF86INCLUDES) -I$(FONTINCSRC) \ - $(FONTCACHEINCLUDES) $(DMXINCLUDES) - LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln + INCLUDES = -I$(SERVERSRC)/Xext -I$(SERVERSRC)/include \ + $(PNRXINCLUDES) $(XF86INCLUDES) $(DMXINCLUDES) + LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln -#if BuildTinyDIX -TINY_DEFINES = TinyDIXDefines +#ifndef LinkDefines +#define LinkDefines /**/ #endif - DEFINES = $(EXT_DEFINES) $(TINY_DEFINES) + DEFINES = $(EXT_DEFINES) LinkDefines NormalLibraryObjectRule() @@ -248,7 +282,6 @@ LinkSourceFile(cup.c,LinkDirectory) LinkSourceFile(dmx.c,LinkDirectory) LinkSourceFile(dpms.c,LinkDirectory) -LinkSourceFile(dpmsstubs.c,LinkDirectory) LinkSourceFile(fontcache.c,LinkDirectory) LinkSourceFile(mbuf.c,LinkDirectory) LinkSourceFile(mbufbf.c,LinkDirectory) @@ -266,6 +299,10 @@ LinkSourceFile(sync.c,LinkDirectory) LinkSourceFile(xcmisc.c,LinkDirectory) LinkSourceFile(xf86bigfont.c,LinkDirectory) +LinkSourceFile(xf86dga.c,LinkDirectory) +LinkSourceFile(xf86dga2.c,LinkDirectory) +LinkSourceFile(xf86misc.c,LinkDirectory) +LinkSourceFile(xf86vmode.c,LinkDirectory) LinkSourceFile(xprint.c,LinkDirectory) LinkSourceFile(xres.c,LinkDirectory) LinkSourceFile(xtest.c,LinkDirectory) @@ -276,3 +313,6 @@ LinkSourceFile(xvmc.c,LinkDirectory) #endif +LinkSourceFile(recordproc.h,$(SERVERSRC)/record) +LinkSourceFile(dbeproc.h,$(SERVERSRC)/dbe) +LinkSourceFile(dbestruct.h,$(SERVERSRC)/dbe) Index: xc/programs/Xserver/Xext/SecurityPolicy diff -u xc/programs/Xserver/Xext/SecurityPolicy:1.1.1.2 xc/programs/Xserver/Xext/SecurityPolicy:1.2 --- xc/programs/Xserver/Xext/SecurityPolicy:1.1.1.2 Tue Jan 16 17:39:55 2001 +++ xc/programs/Xserver/Xext/SecurityPolicy Mon Jan 9 09:59:41 2006 @@ -1,6 +1,6 @@ version-1 -# $Xorg: SecurityPolicy,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ +# $XFree86: xc/programs/Xserver/Xext/SecurityPolicy,v 1.2 2006/01/09 14:59:41 dawes Exp $ # The site policy fields are interpreted by the XC-QUERY-SECURITY-1 # authorization protocol. The values are arbitrary and site-specific. Index: xc/programs/Xserver/Xext/appgroup.c diff -u xc/programs/Xserver/Xext/appgroup.c:1.12 xc/programs/Xserver/Xext/appgroup.c:1.14 --- xc/programs/Xserver/Xext/appgroup.c:1.12 Wed Jun 2 18:42:55 2004 +++ xc/programs/Xserver/Xext/appgroup.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.12 2004/06/02 22:42:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/appgroup.c,v 1.14 2005/10/14 15:16:11 tsi Exp $ */ /* Copyright 1996, 1998, 2001 The Open Group @@ -26,7 +26,7 @@ */ /* - * Copyright (c) 1996-2004 by The XFree86 Project, Inc. + * Copyright (c) 1996-2005 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -74,8 +74,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -84,11 +84,11 @@ #include "colormapst.h" #include "servermd.h" #define _XAG_SERVER_ -#include "Xagstr.h" -#include "Xagsrv.h" +#include +#include #define _SECURITY_SERVER -#include "security.h" -#include "Xfuncproto.h" +#include +#include #define XSERV_t #include @@ -134,10 +134,8 @@ extern char* ConnectionInfo; extern int connBlockScreenStart; -static -int XagAppGroupFree( - pointer what, - XID id) /* unused */ +static int +XagAppGroupFree(pointer what, XID id) { int i; AppGroupPtr pAppGrp = (AppGroupPtr) what; @@ -168,10 +166,8 @@ } /* static */ -void XagClientStateChange( - CallbackListPtr* pcbl, - pointer nulldata, - pointer calldata) +void +XagClientStateChange(CallbackListPtr* pcbl, pointer nulldata, pointer calldata) { SecurityAuthorizationPtr pAuth; NewClientInfoRec* pci = (NewClientInfoRec*) calldata; @@ -300,22 +296,20 @@ } /*ARGSUSED*/ -static -void XagResetProc( - ExtensionEntry* extEntry) +static void +XagResetProc(ExtensionEntry* extEntry) { DeleteCallback (&ClientStateCallback, XagClientStateChange, NULL); XagCallbackRefCount = 0; while (appGrpList) XagAppGroupFree ((pointer) appGrpList, 0); } -static -int ProcXagQueryVersion( - register ClientPtr client) +static int +ProcXagQueryVersion(ClientPtr client) { /* REQUEST (xXagQueryVersionReq); */ xXagQueryVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH (xXagQueryVersionReq); rep.type = X_Reply; @@ -333,12 +327,9 @@ return client->noClientException; } -static -void ProcessAttr( - AppGroupPtr pAppGrp, - ClientPtr client, - unsigned int attrib_mask, - CARD32* attribs) +static void +ProcessAttr(AppGroupPtr pAppGrp, ClientPtr client, unsigned int attrib_mask, + CARD32* attribs) { int i; @@ -371,9 +362,8 @@ } } -static -void CreateConnectionInfo( - AppGroupPtr pAppGrp) +static void +CreateConnectionInfo(AppGroupPtr pAppGrp) { xWindowRoot* rootp; xWindowRoot* roots[MAXSCREENS]; @@ -432,12 +422,9 @@ pAppGrp->connSetupPrefix.length = olen >> 2; } -static -AppGroupPtr CreateAppGroup( - ClientPtr client, - XID appgroupId, - unsigned int attrib_mask, - CARD32* attribs) +static AppGroupPtr +CreateAppGroup(ClientPtr client, XID appgroupId, unsigned int attrib_mask, + CARD32* attribs) { AppGroupPtr pAppGrp; @@ -460,11 +447,8 @@ return pAppGrp; } -static -int AttrValidate( - ClientPtr client, - int attrib_mask, - AppGroupPtr pAppGrp) +static int +AttrValidate(ClientPtr client, int attrib_mask, AppGroupPtr pAppGrp) { WindowPtr pWin; int idepth, ivids, found; @@ -504,8 +488,8 @@ } /* static */ -int ProcXagCreate ( - register ClientPtr client) +int +ProcXagCreate(ClientPtr client) { REQUEST (xXagCreateReq); AppGroupPtr pAppGrp; @@ -536,8 +520,8 @@ } /* static */ -int ProcXagDestroy( - register ClientPtr client) +int +ProcXagDestroy(ClientPtr client) { AppGroupPtr pAppGrp; REQUEST (xXagDestroyReq); @@ -552,9 +536,8 @@ return client->noClientException; } -static -int ProcXagGetAttr( - register ClientPtr client) +static int +ProcXagGetAttr(ClientPtr client) { AppGroupPtr pAppGrp; REQUEST (xXagGetAttrReq); @@ -588,9 +571,8 @@ return client->noClientException; } -static -int ProcXagQuery( - register ClientPtr client) +static int +ProcXagQuery(ClientPtr client) { ClientPtr pClient; AppGroupPtr pAppGrp; @@ -620,9 +602,8 @@ return BadMatch; } -static -int ProcXagCreateAssoc( - register ClientPtr client) +static int +ProcXagCreateAssoc(ClientPtr client) { REQUEST (xXagCreateAssocReq); @@ -643,9 +624,8 @@ return client->noClientException; } -static -int ProcXagDestroyAssoc( - register ClientPtr client) +static int +ProcXagDestroyAssoc(ClientPtr client) { /* REQUEST (xXagDestroyAssocReq); */ @@ -654,9 +634,8 @@ return client->noClientException; } -static -int ProcXagDispatch ( - register ClientPtr client) +static int +ProcXagDispatch(ClientPtr client) { REQUEST (xReq); switch (stuff->data) @@ -680,21 +659,19 @@ } } -static -int SProcXagQueryVersion( - register ClientPtr client) +static int +SProcXagQueryVersion(ClientPtr client) { - register int n; + int n; REQUEST(xXagQueryVersionReq); swaps(&stuff->length, n); return ProcXagQueryVersion(client); } -static -int SProcXagCreate( - ClientPtr client) +static int +SProcXagCreate(ClientPtr client) { - register int n; + int n; REQUEST (xXagCreateReq); swaps (&stuff->length, n); REQUEST_AT_LEAST_SIZE (xXagCreateReq); @@ -704,11 +681,10 @@ return ProcXagCreate (client); } -static -int SProcXagDestroy( - ClientPtr client) +static int +SProcXagDestroy(ClientPtr client) { - register int n; + int n; REQUEST (xXagDestroyReq); swaps (&stuff->length, n); REQUEST_SIZE_MATCH (xXagDestroyReq); @@ -716,11 +692,10 @@ return ProcXagDestroy (client); } -static -int SProcXagGetAttr( - ClientPtr client) +static int +SProcXagGetAttr(ClientPtr client) { - register int n; + int n; REQUEST (xXagGetAttrReq); swaps (&stuff->length, n); REQUEST_SIZE_MATCH (xXagGetAttrReq); @@ -728,11 +703,10 @@ return ProcXagGetAttr (client); } -static -int SProcXagQuery( - ClientPtr client) +static int +SProcXagQuery(ClientPtr client) { - register int n; + int n; REQUEST (xXagQueryReq); swaps (&stuff->length, n); REQUEST_SIZE_MATCH (xXagQueryReq); @@ -740,11 +714,10 @@ return ProcXagQuery (client); } -static -int SProcXagCreateAssoc( - ClientPtr client) +static int +SProcXagCreateAssoc(ClientPtr client) { - register int n; + int n; REQUEST (xXagCreateAssocReq); swaps (&stuff->length, n); REQUEST_SIZE_MATCH (xXagCreateAssocReq); @@ -754,11 +727,10 @@ return ProcXagCreateAssoc (client); } -static -int SProcXagDestroyAssoc( - ClientPtr client) +static int +SProcXagDestroyAssoc(ClientPtr client) { - register int n; + int n; REQUEST (xXagDestroyAssocReq); swaps (&stuff->length, n); REQUEST_SIZE_MATCH (xXagDestroyAssocReq); @@ -766,9 +738,8 @@ return ProcXagDestroyAssoc (client); } -static -int SProcXagDispatch( - register ClientPtr client) +static int +SProcXagDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -792,20 +763,20 @@ } } -Colormap XagDefaultColormap( - ClientPtr client) +Colormap +XagDefaultColormap(ClientPtr client) { return (client->appgroup ? client->appgroup->default_colormap : None); } -VisualID XagRootVisual( - ClientPtr client) +VisualID +XagRootVisual(ClientPtr client) { return (client->appgroup ? client->appgroup->root_visual : 0); } -ClientPtr XagLeader( - ClientPtr client) +ClientPtr +XagLeader(ClientPtr client) { return (client->appgroup ? client->appgroup->leader : NULL); } @@ -815,9 +786,8 @@ * We don't want to send it to the leader when the window is on a different * screen, e.g. a print screen. */ -Bool XagIsControlledRoot( - ClientPtr client, - WindowPtr pParent) +Bool +XagIsControlledRoot(ClientPtr client, WindowPtr pParent) { if (client->appgroup) { if (client->appgroup->single_screen && @@ -831,11 +801,9 @@ return FALSE; } -void XagConnectionInfo( - ClientPtr client, - xConnSetupPrefix** conn_prefix, - char** conn_info, - int* num_screen) +void +XagConnectionInfo(ClientPtr client, xConnSetupPrefix** conn_prefix, + char** conn_info, int* num_screen) { if (client->appgroup && client->appgroup->ConnectionInfo) { *conn_prefix = &client->appgroup->connSetupPrefix; @@ -844,15 +812,14 @@ } } -XID XagId( - ClientPtr client) +XID +XagId(ClientPtr client) { return (client->appgroup ? client->appgroup->appgroupId : 0); } -void XagGetDeltaInfo( - ClientPtr client, - CARD32* buf) +void +XagGetDeltaInfo(ClientPtr client, CARD32* buf) { *buf++ = (CARD32) client->appgroup->default_root; *buf++ = (CARD32) client->appgroup->root_visual; @@ -861,8 +828,8 @@ *buf = (CARD32) client->appgroup->white_pixel; } -void XagCallClientStateChange( - ClientPtr client) +void +XagCallClientStateChange(ClientPtr client) { if (appGrpList) { NewClientInfoRec clientinfo; Index: xc/programs/Xserver/Xext/bigreq.c diff -u xc/programs/Xserver/Xext/bigreq.c:3.9 xc/programs/Xserver/Xext/bigreq.c:3.11 --- xc/programs/Xserver/Xext/bigreq.c:3.9 Mon Nov 17 17:20:26 2003 +++ xc/programs/Xserver/Xext/bigreq.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,3 @@ -/* $Xorg: bigreq.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -26,16 +25,16 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.9 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/bigreq.c,v 3.11 2005/10/14 15:16:11 tsi Exp $ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" -#include "bigreqstr.h" +#include #include "opaque.h" #include "modinit.h" @@ -70,18 +69,16 @@ /*ARGSUSED*/ static void -BigReqResetProc (extEntry) - ExtensionEntry *extEntry; +BigReqResetProc(ExtensionEntry *extEntry) { } static int -ProcBigReqDispatch (client) - register ClientPtr client; +ProcBigReqDispatch(ClientPtr client) { REQUEST(xBigReqEnableReq); xBigReqEnableReply rep; - register int n; + int n; if (client->swapped) { swaps(&stuff->length, n); Index: xc/programs/Xserver/Xext/cup.c diff -u xc/programs/Xserver/Xext/cup.c:1.12 xc/programs/Xserver/Xext/cup.c:1.14 --- xc/programs/Xserver/Xext/cup.c:1.12 Tue Oct 28 18:08:43 2003 +++ xc/programs/Xserver/Xext/cup.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,3 @@ -/* $Xorg: cup.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* Copyright 1997, 1998 The Open Group @@ -24,12 +23,12 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.12 2003/10/28 23:08:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/cup.c,v 1.14 2005/10/14 15:16:11 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -38,8 +37,8 @@ #include "servermd.h" #include "swapreq.h" #define _XCUP_SERVER_ -#include "Xcupstr.h" -#include "Xfuncproto.h" +#include +#include #ifndef EXTMODULE #include "../os/osdep.h" @@ -49,6 +48,8 @@ #include "modinit.h" +#ifdef TOGCUP + static int ProcDispatch(ClientPtr client); static int SProcDispatch(ClientPtr client); static void ResetProc(ExtensionEntry* extEntry); @@ -128,7 +129,7 @@ #define NUM_DESKTOP_COLORS (sizeof citems / sizeof citems[0]) void -XcupExtensionInit (INITARGS) +XcupExtensionInit(INITARGS) { #if 0 ExtensionEntry* extEntry; @@ -157,19 +158,17 @@ } /*ARGSUSED*/ -static -void ResetProc( - ExtensionEntry* extEntry) +static void +ResetProc(ExtensionEntry* extEntry) { } -static -int ProcQueryVersion( - register ClientPtr client) +static int +ProcQueryVersion(ClientPtr client) { /* REQUEST (xXcupQueryVersionReq); */ xXcupQueryVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH (xXcupQueryVersionReq); rep.type = X_Reply; @@ -187,14 +186,13 @@ return client->noClientException; } -static -int ProcGetReservedColormapEntries( - register ClientPtr client) +static int +ProcGetReservedColormapEntries(ClientPtr client) { REQUEST (xXcupGetReservedColormapEntriesReq); xXcupGetReservedColormapEntriesReply rep; xColorItem* cptr; - register int n; + int n; REQUEST_SIZE_MATCH (xXcupGetReservedColormapEntriesReq); @@ -220,9 +218,8 @@ return client->noClientException; } -static -int ProcStoreColors( - register ClientPtr client) +static int +ProcStoreColors(ClientPtr client) { REQUEST (xXcupStoreColorsReq); ColormapPtr pcmp; @@ -279,9 +276,8 @@ } } -static -int ProcDispatch( - register ClientPtr client) +static int +ProcDispatch(ClientPtr client) { REQUEST (xReq); switch (stuff->data) @@ -297,22 +293,20 @@ } } -static -int SProcQueryVersion( - register ClientPtr client) +static int +SProcQueryVersion(ClientPtr client) { - register int n; + int n; REQUEST(xXcupQueryVersionReq); swaps(&stuff->length, n); return ProcQueryVersion(client); } -static -int SProcGetReservedColormapEntries( - ClientPtr client) +static int +SProcGetReservedColormapEntries(ClientPtr client) { - register int n; + int n; REQUEST (xXcupGetReservedColormapEntriesReq); swaps (&stuff->length, n); @@ -321,11 +315,10 @@ return ProcGetReservedColormapEntries (client); } -static -int SProcXcupStoreColors( - ClientPtr client) +static int +SProcXcupStoreColors(ClientPtr client) { - register int n; + int n; int count; xColorItem* pItem; @@ -339,9 +332,8 @@ return ProcStoreColors (client); } -static -int SProcDispatch( - register ClientPtr client) +static int +SProcDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -357,4 +349,4 @@ } } - +#endif Index: xc/programs/Xserver/Xext/dmx.c diff -u xc/programs/Xserver/Xext/dmx.c:1.4 xc/programs/Xserver/Xext/dmx.c:1.6 --- xc/programs/Xserver/Xext/dmx.c:1.4 Fri Jan 28 11:56:43 2005 +++ xc/programs/Xserver/Xext/dmx.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/dmx.c,v 1.4 2005/01/28 16:56:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dmx.c,v 1.6 2005/10/14 15:16:11 tsi Exp $ */ /* * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina. * @@ -43,8 +43,8 @@ * Please see the Client-to-Server DMX Extension to the X Protocol * document for details about the protocol. */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -53,10 +53,10 @@ #include "opaque.h" #include "dmxextension.h" -#include "dmxproto.h" +#include #define _DMX_SERVER_ -#include "dmxext.h" +#include #ifdef PANORAMIX #include "panoramiX.h" @@ -100,7 +100,8 @@ static DISPATCH_PROC(SProcDMXAddInput); static DISPATCH_PROC(SProcDMXRemoveInput); -static int _DMXXineramaActive(void) +static int +_DMXXineramaActive(void) { #ifdef PANORAMIX return !noPanoramiXExtension; @@ -109,20 +110,22 @@ #endif } -static void DMXResetProc(ExtensionEntry *extEntry) +static void +DMXResetProc(ExtensionEntry *extEntry) { } /** Initialize the extension. */ -void DMXExtensionInit(void) +void +DMXExtensionInit(void) { AddExtension(DMX_EXTENSION_NAME, 0, 0, ProcDMXDispatch, SProcDMXDispatch, DMXResetProc, StandardMinorOpcode); } -static void dmxSetScreenAttribute(int bit, DMXScreenAttributesPtr attr, - CARD32 value) +static void +dmxSetScreenAttribute(int bit, DMXScreenAttributesPtr attr, CARD32 value) { switch (1 << bit) { case DMXScreenWindowWidth: attr->screenWindowWidth = value; break; @@ -138,9 +141,9 @@ } } -static int dmxFetchScreenAttributes(unsigned int mask, - DMXScreenAttributesPtr attr, - CARD32 *value_list) +static int +dmxFetchScreenAttributes(unsigned int mask, DMXScreenAttributesPtr attr, + CARD32 *value_list) { int i; CARD32 *value = value_list; @@ -156,8 +159,8 @@ return count; } -static void dmxSetDesktopAttribute(int bit, DMXDesktopAttributesPtr attr, - CARD32 value) +static void +dmxSetDesktopAttribute(int bit, DMXDesktopAttributesPtr attr, CARD32 value) { switch (1 << bit) { case DMXDesktopWidth: attr->width = value; break; @@ -167,9 +170,9 @@ } } -static int dmxFetchDesktopAttributes(unsigned int mask, - DMXDesktopAttributesPtr attr, - CARD32 *value_list) +static int +dmxFetchDesktopAttributes(unsigned int mask, DMXDesktopAttributesPtr attr, + CARD32 *value_list) { int i; CARD32 *value = value_list; @@ -185,8 +188,8 @@ return count; } -static void dmxSetInputAttribute(int bit, DMXInputAttributesPtr attr, - CARD32 value) +static void +dmxSetInputAttribute(int bit, DMXInputAttributesPtr attr, CARD32 value) { switch (1 << bit) { case DMXInputType: attr->inputType = value; break; @@ -195,9 +198,9 @@ } } -static int dmxFetchInputAttributes(unsigned int mask, - DMXInputAttributesPtr attr, - CARD32 *value_list) +static int +dmxFetchInputAttributes(unsigned int mask, DMXInputAttributesPtr attr, + CARD32 *value_list) { int i; CARD32 *value = value_list; @@ -213,7 +216,8 @@ return count; } -static int ProcDMXQueryVersion(ClientPtr client) +static int +ProcDMXQueryVersion(ClientPtr client) { xDMXQueryVersionReply rep; int n; @@ -237,7 +241,8 @@ return client->noClientException; } -static int ProcDMXSync(ClientPtr client) +static int +ProcDMXSync(ClientPtr client) { xDMXSyncReply rep; int n; @@ -259,7 +264,8 @@ return client->noClientException; } -static int ProcDMXForceWindowCreation(ClientPtr client) +static int +ProcDMXForceWindowCreation(ClientPtr client) { xDMXForceWindowCreationReply rep; REQUEST(xDMXForceWindowCreationReq); @@ -309,7 +315,8 @@ return Success; } -static int ProcDMXGetScreenCount(ClientPtr client) +static int +ProcDMXGetScreenCount(ClientPtr client) { xDMXGetScreenCountReply rep; int n; @@ -329,7 +336,8 @@ return client->noClientException; } -static int ProcDMXGetScreenAttributes(ClientPtr client) +static int +ProcDMXGetScreenAttributes(ClientPtr client) { REQUEST(xDMXGetScreenAttributesReq); xDMXGetScreenAttributesReply rep; @@ -386,7 +394,8 @@ return client->noClientException; } -static int ProcDMXChangeScreensAttributes(ClientPtr client) +static int +ProcDMXChangeScreensAttributes(ClientPtr client) { REQUEST(xDMXChangeScreensAttributesReq); xDMXChangeScreensAttributesReply rep; @@ -459,7 +468,8 @@ return client->noClientException; } -static int ProcDMXAddScreen(ClientPtr client) +static int +ProcDMXAddScreen(ClientPtr client) { REQUEST(xDMXAddScreenReq); xDMXAddScreenReply rep; @@ -510,7 +520,8 @@ return client->noClientException; } -static int ProcDMXRemoveScreen(ClientPtr client) +static int +ProcDMXRemoveScreen(ClientPtr client) { REQUEST(xDMXRemoveScreenReq); xDMXRemoveScreenReply rep; @@ -538,9 +549,9 @@ #ifdef PANORAMIX -static int dmxPopulatePanoramiX(ClientPtr client, Window window, - CARD32 *screens, CARD32 *windows, - xRectangle *pos, xRectangle *vis) +static int +dmxPopulatePanoramiX(ClientPtr client, Window window, CARD32 *screens, + CARD32 *windows, xRectangle *pos, xRectangle *vis) { WindowPtr pWin; PanoramiXRes *win; @@ -568,8 +579,9 @@ } #endif -static int dmxPopulate(ClientPtr client, Window window, CARD32 *screens, - CARD32 *windows, xRectangle *pos, xRectangle *vis) +static int +dmxPopulate(ClientPtr client, Window window, CARD32 *screens, + CARD32 *windows, xRectangle *pos, xRectangle *vis) { WindowPtr pWin; DMXWindowAttributesRec attr; @@ -591,7 +603,8 @@ return 1; } -static int dmxMaxNumScreens(void) +static int +dmxMaxNumScreens(void) { #ifdef PANORAMIX if (!noPanoramiXExtension) return PanoramiXNumScreens; @@ -599,7 +612,8 @@ return 1; } -static int ProcDMXGetWindowAttributes(ClientPtr client) +static int +ProcDMXGetWindowAttributes(ClientPtr client) { REQUEST(xDMXGetWindowAttributesReq); xDMXGetWindowAttributesReply rep; @@ -680,7 +694,8 @@ return client->noClientException; } -static int ProcDMXGetDesktopAttributes(ClientPtr client) +static int +ProcDMXGetDesktopAttributes(ClientPtr client) { xDMXGetDesktopAttributesReply rep; int n; @@ -711,7 +726,8 @@ return client->noClientException; } -static int ProcDMXChangeDesktopAttributes(ClientPtr client) +static int +ProcDMXChangeDesktopAttributes(ClientPtr client) { REQUEST(xDMXChangeDesktopAttributesReq); xDMXChangeDesktopAttributesReply rep; @@ -754,7 +770,8 @@ return client->noClientException; } -static int ProcDMXGetInputCount(ClientPtr client) +static int +ProcDMXGetInputCount(ClientPtr client) { xDMXGetInputCountReply rep; int n; @@ -774,7 +791,8 @@ return client->noClientException; } -static int ProcDMXGetInputAttributes(ClientPtr client) +static int +ProcDMXGetInputAttributes(ClientPtr client) { REQUEST(xDMXGetInputAttributesReq); xDMXGetInputAttributesReply rep; @@ -812,7 +830,8 @@ return client->noClientException; } -static int ProcDMXAddInput(ClientPtr client) +static int +ProcDMXAddInput(ClientPtr client) { REQUEST(xDMXAddInputReq); xDMXAddInputReply rep; @@ -863,7 +882,8 @@ return client->noClientException; } -static int ProcDMXRemoveInput(ClientPtr client) +static int +ProcDMXRemoveInput(ClientPtr client) { REQUEST(xDMXRemoveInputReq); xDMXRemoveInputReply rep; @@ -889,7 +909,8 @@ return client->noClientException; } -static int ProcDMXDispatch(ClientPtr client) +static int +ProcDMXDispatch(ClientPtr client) { REQUEST(xReq); @@ -921,7 +942,8 @@ } } -static int SProcDMXQueryVersion(ClientPtr client) +static int +SProcDMXQueryVersion(ClientPtr client) { int n; REQUEST(xDMXQueryVersionReq); @@ -931,7 +953,8 @@ return ProcDMXQueryVersion(client); } -static int SProcDMXSync(ClientPtr client) +static int +SProcDMXSync(ClientPtr client) { int n; REQUEST(xDMXSyncReq); @@ -941,7 +964,8 @@ return ProcDMXSync(client); } -static int SProcDMXForceWindowCreation(ClientPtr client) +static int +SProcDMXForceWindowCreation(ClientPtr client) { int n; REQUEST(xDMXForceWindowCreationReq); @@ -952,7 +976,8 @@ return ProcDMXForceWindowCreation(client); } -static int SProcDMXGetScreenCount(ClientPtr client) +static int +SProcDMXGetScreenCount(ClientPtr client) { int n; REQUEST(xDMXGetScreenCountReq); @@ -962,7 +987,8 @@ return ProcDMXGetScreenCount(client); } -static int SProcDMXGetScreenAttributes(ClientPtr client) +static int +SProcDMXGetScreenAttributes(ClientPtr client) { int n; REQUEST(xDMXGetScreenAttributesReq); @@ -973,7 +999,8 @@ return ProcDMXGetScreenAttributes(client); } -static int SProcDMXChangeScreensAttributes(ClientPtr client) +static int +SProcDMXChangeScreensAttributes(ClientPtr client) { int n; REQUEST(xDMXChangeScreensAttributesReq); @@ -986,7 +1013,8 @@ return ProcDMXGetScreenAttributes(client); } -static int SProcDMXAddScreen(ClientPtr client) +static int +SProcDMXAddScreen(ClientPtr client) { int n; int paddedLength; @@ -1001,7 +1029,8 @@ return ProcDMXAddScreen(client); } -static int SProcDMXRemoveScreen(ClientPtr client) +static int +SProcDMXRemoveScreen(ClientPtr client) { int n; REQUEST(xDMXRemoveScreenReq); @@ -1012,7 +1041,8 @@ return ProcDMXRemoveScreen(client); } -static int SProcDMXGetWindowAttributes(ClientPtr client) +static int +SProcDMXGetWindowAttributes(ClientPtr client) { int n; REQUEST(xDMXGetWindowAttributesReq); @@ -1023,7 +1053,8 @@ return ProcDMXGetWindowAttributes(client); } -static int SProcDMXGetDesktopAttributes(ClientPtr client) +static int +SProcDMXGetDesktopAttributes(ClientPtr client) { int n; REQUEST(xDMXGetDesktopAttributesReq); @@ -1033,7 +1064,8 @@ return ProcDMXGetDesktopAttributes(client); } -static int SProcDMXChangeDesktopAttributes(ClientPtr client) +static int +SProcDMXChangeDesktopAttributes(ClientPtr client) { int n; REQUEST(xDMXChangeDesktopAttributesReq); @@ -1045,7 +1077,8 @@ return ProcDMXChangeDesktopAttributes(client); } -static int SProcDMXGetInputCount(ClientPtr client) +static int +SProcDMXGetInputCount(ClientPtr client) { int n; REQUEST(xDMXGetInputCountReq); @@ -1055,7 +1088,8 @@ return ProcDMXGetInputCount(client); } -static int SProcDMXGetInputAttributes(ClientPtr client) +static int +SProcDMXGetInputAttributes(ClientPtr client) { int n; REQUEST(xDMXGetInputAttributesReq); @@ -1066,7 +1100,8 @@ return ProcDMXGetInputAttributes(client); } -static int SProcDMXAddInput(ClientPtr client) +static int +SProcDMXAddInput(ClientPtr client) { int n; int paddedLength; @@ -1081,7 +1116,8 @@ return ProcDMXAddInput(client); } -static int SProcDMXRemoveInput(ClientPtr client) +static int +SProcDMXRemoveInput(ClientPtr client) { int n; REQUEST(xDMXRemoveInputReq); @@ -1092,7 +1128,8 @@ return ProcDMXRemoveInput(client); } -static int SProcDMXDispatch (ClientPtr client) +static int +SProcDMXDispatch (ClientPtr client) { REQUEST(xReq); Index: xc/programs/Xserver/Xext/dpms.c diff -u xc/programs/Xserver/Xext/dpms.c:3.13 xc/programs/Xserver/Xext/dpms.c:3.15 --- xc/programs/Xserver/Xext/dpms.c:3.13 Wed Jun 2 18:42:55 2004 +++ xc/programs/Xserver/Xext/dpms.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,3 @@ -/* $Xorg: dpms.c,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. @@ -73,24 +72,18 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* - * HISTORY - * - * @(#)RCSfile: dpms.c,v Revision: 1.1.4.5 (DEC) Date: 1996/03/04 15:27:00 - */ - -/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.13 2004/06/02 22:42:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/dpms.c,v 3.15 2005/10/14 15:16:11 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "opaque.h" #define DPMS_SERVER -#include "dpms.h" -#include "dpmsstr.h" +#include +#include #include "dpmsproc.h" #include "modinit.h" @@ -137,18 +130,16 @@ /*ARGSUSED*/ static void -DPMSResetProc (extEntry) - ExtensionEntry *extEntry; +DPMSResetProc(ExtensionEntry *extEntry) { } static int -ProcDPMSGetVersion(client) - register ClientPtr client; +ProcDPMSGetVersion(ClientPtr client) { /* REQUEST(xDPMSGetVersionReq); */ xDPMSGetVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH(xDPMSGetVersionReq); @@ -167,11 +158,11 @@ } static int -ProcDPMSCapable(register ClientPtr client) +ProcDPMSCapable(ClientPtr client) { /* REQUEST(xDPMSCapableReq); */ xDPMSCapableReply rep; - register int n; + int n; REQUEST_SIZE_MATCH(xDPMSCapableReq); @@ -188,12 +179,11 @@ } static int -ProcDPMSGetTimeouts(client) - register ClientPtr client; +ProcDPMSGetTimeouts(ClientPtr client) { /* REQUEST(xDPMSGetTimeoutsReq); */ xDPMSGetTimeoutsReply rep; - register int n; + int n; REQUEST_SIZE_MATCH(xDPMSGetTimeoutsReq); @@ -215,8 +205,7 @@ } static int -ProcDPMSSetTimeouts(client) - register ClientPtr client; +ProcDPMSSetTimeouts(ClientPtr client) { REQUEST(xDPMSSetTimeoutsReq); @@ -242,8 +231,7 @@ } static int -ProcDPMSEnable(client) - register ClientPtr client; +ProcDPMSEnable(ClientPtr client) { /* REQUEST(xDPMSEnableReq); */ @@ -256,8 +244,7 @@ } static int -ProcDPMSDisable(client) - register ClientPtr client; +ProcDPMSDisable(ClientPtr client) { /* REQUEST(xDPMSDisableReq); */ @@ -271,8 +258,7 @@ } static int -ProcDPMSForceLevel(client) - register ClientPtr client; +ProcDPMSForceLevel(ClientPtr client) { REQUEST(xDPMSForceLevelReq); @@ -304,11 +290,11 @@ } static int -ProcDPMSInfo(register ClientPtr client) +ProcDPMSInfo(ClientPtr client) { /* REQUEST(xDPMSInfoReq); */ xDPMSInfoReply rep; - register int n; + int n; REQUEST_SIZE_MATCH(xDPMSInfoReq); @@ -327,8 +313,7 @@ } static int -ProcDPMSDispatch (client) - register ClientPtr client; +ProcDPMSDispatch(ClientPtr client) { REQUEST(xReq); @@ -356,10 +341,9 @@ } static int -SProcDPMSGetVersion(client) - register ClientPtr client; +SProcDPMSGetVersion(ClientPtr client) { - register int n; + int n; REQUEST(xDPMSGetVersionReq); swaps(&stuff->length, n); @@ -370,10 +354,10 @@ } static int -SProcDPMSCapable(register ClientPtr client) +SProcDPMSCapable(ClientPtr client) { REQUEST(xDPMSCapableReq); - register int n; + int n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xDPMSCapableReq); @@ -382,11 +366,10 @@ } static int -SProcDPMSGetTimeouts(client) - register ClientPtr client; +SProcDPMSGetTimeouts(ClientPtr client) { REQUEST(xDPMSGetTimeoutsReq); - register int n; + int n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xDPMSGetTimeoutsReq); @@ -395,11 +378,10 @@ } static int -SProcDPMSSetTimeouts(client) - register ClientPtr client; +SProcDPMSSetTimeouts(ClientPtr client) { REQUEST(xDPMSSetTimeoutsReq); - register int n; + int n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xDPMSSetTimeoutsReq); @@ -411,11 +393,10 @@ } static int -SProcDPMSEnable(client) - register ClientPtr client; +SProcDPMSEnable(ClientPtr client) { REQUEST(xDPMSEnableReq); - register int n; + int n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xDPMSEnableReq); @@ -424,11 +405,10 @@ } static int -SProcDPMSDisable(client) - register ClientPtr client; +SProcDPMSDisable(ClientPtr client) { REQUEST(xDPMSDisableReq); - register int n; + int n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xDPMSDisableReq); @@ -437,11 +417,10 @@ } static int -SProcDPMSForceLevel(client) - register ClientPtr client; +SProcDPMSForceLevel(ClientPtr client) { REQUEST(xDPMSForceLevelReq); - register int n; + int n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xDPMSForceLevelReq); @@ -452,11 +431,10 @@ } static int -SProcDPMSInfo(client) - register ClientPtr client; +SProcDPMSInfo(ClientPtr client) { REQUEST(xDPMSInfoReq); - register int n; + int n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xDPMSInfoReq); @@ -465,8 +443,7 @@ } static int -SProcDPMSDispatch (client) - register ClientPtr client; +SProcDPMSDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) Index: xc/programs/Xserver/Xext/dpmsstubs.c diff -u xc/programs/Xserver/Xext/dpmsstubs.c:3.5 xc/programs/Xserver/Xext/dpmsstubs.c:removed --- xc/programs/Xserver/Xext/dpmsstubs.c:3.5 Tue Jul 15 21:38:29 2003 +++ xc/programs/Xserver/Xext/dpmsstubs.c Tue May 9 21:55:52 2006 @@ -1,50 +0,0 @@ -/* $Xorg: dpmsstubs.c,v 1.3 2000/08/17 19:47:56 cpqbld Exp $ */ -/***************************************************************** - -Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, -BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR -IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of Digital Equipment Corporation -shall not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from Digital -Equipment Corporation. - -******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/dpmsstubs.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */ - -typedef int Bool; - -#include "dpmsproc.h" - -#define FALSE 0 - -Bool DPMSSupported(void) -{ - return FALSE; -} - -int DPMSGet(int *plevel) -{ - return -1; -} - -void DPMSSet(int level) -{ - -} Index: xc/programs/Xserver/Xext/fontcache.c diff -u xc/programs/Xserver/Xext/fontcache.c:1.8 xc/programs/Xserver/Xext/fontcache.c:1.10 --- xc/programs/Xserver/Xext/fontcache.c:1.8 Mon Nov 17 17:20:26 2003 +++ xc/programs/Xserver/Xext/fontcache.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,4 @@ -/*- +/* * Copyright (c) 1998-1999 Shunsuke Akiyama . * All rights reserved. * Copyright (c) 1998-1999 X-TrueType Server Project, All rights @@ -24,17 +24,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * Id: fontcache.c,v 1.12 1999/01/31 13:47:45 akiyama Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.8 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/fontcache.c,v 1.10 2005/10/14 15:16:11 tsi Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -42,13 +40,14 @@ #include "inputstr.h" #include "servermd.h" #define _FONTCACHE_SERVER_ -#include "fontcacheP.h" -#include "fontcachstr.h" -#include "Xfuncproto.h" +#include +#include +#include #include "swaprep.h" #include "modinit.h" +#ifdef FONTCACHE static int miscErrorBase; static void FontCacheResetProc( @@ -92,17 +91,15 @@ /*ARGSUSED*/ static void -FontCacheResetProc (extEntry) - ExtensionEntry* extEntry; +FontCacheResetProc(ExtensionEntry *extEntry) { } static int -ProcFontCacheQueryVersion(client) - register ClientPtr client; +ProcFontCacheQueryVersion(ClientPtr client) { xFontCacheQueryVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH(xFontCacheQueryVersionReq); rep.type = X_Reply; @@ -121,12 +118,11 @@ } static int -ProcFontCacheGetCacheSettings(client) - register ClientPtr client; +ProcFontCacheGetCacheSettings(ClientPtr client) { xFontCacheGetCacheSettingsReply rep; FontCacheSettings cinfo; - register int n; + int n; REQUEST_SIZE_MATCH(xFontCacheGetCacheSettingsReq); rep.type = X_Reply; @@ -159,12 +155,11 @@ } static int -ProcFontCacheGetCacheStatistics(client) - register ClientPtr client; +ProcFontCacheGetCacheStatistics(ClientPtr client) { xFontCacheGetCacheStatisticsReply rep; FontCacheStatistics cstats; - register int n; + int n; REQUEST_SIZE_MATCH(xFontCacheGetCacheStatisticsReq); rep.type = X_Reply; @@ -212,8 +207,7 @@ } static int -ProcFontCacheChangeCacheSettings(client) - register ClientPtr client; +ProcFontCacheChangeCacheSettings(ClientPtr client) { FontCacheSettings cs; @@ -241,8 +235,7 @@ } static int -ProcFontCacheDispatch (client) - register ClientPtr client; +ProcFontCacheDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -261,20 +254,18 @@ } static int -SProcFontCacheQueryVersion(client) - register ClientPtr client; +SProcFontCacheQueryVersion(ClientPtr client) { - register int n; + int n; REQUEST(xFontCacheQueryVersionReq); swaps(&stuff->length, n); return ProcFontCacheQueryVersion(client); } static int -SProcFontCacheGetCacheSettings(client) - ClientPtr client; +SProcFontCacheGetCacheSettings(ClientPtr client) { - register int n; + int n; REQUEST(xFontCacheGetCacheSettingsReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xFontCacheGetCacheSettingsReq); @@ -282,10 +273,9 @@ } static int -SProcFontCacheGetCacheStatistics(client) - ClientPtr client; +SProcFontCacheGetCacheStatistics(ClientPtr client) { - register int n; + int n; REQUEST(xFontCacheGetCacheStatisticsReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xFontCacheGetCacheStatisticsReq); @@ -293,10 +283,9 @@ } static int -SProcFontCacheChangeCacheSettings(client) - ClientPtr client; +SProcFontCacheChangeCacheSettings(ClientPtr client) { - register int n; + int n; REQUEST(xFontCacheChangeCacheSettingsReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xFontCacheChangeCacheSettingsReq); @@ -309,8 +298,7 @@ } static int -SProcFontCacheDispatch (client) - register ClientPtr client; +SProcFontCacheDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -327,3 +315,4 @@ return miscErrorBase + FontCacheBadProtocol; } } +#endif Index: xc/programs/Xserver/Xext/mbuf.c diff -u xc/programs/Xserver/Xext/mbuf.c:3.16 xc/programs/Xserver/Xext/mbuf.c:3.19 --- xc/programs/Xserver/Xext/mbuf.c:3.16 Mon Nov 17 17:20:26 2003 +++ xc/programs/Xserver/Xext/mbuf.c Sun Feb 19 19:14:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.16 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbuf.c,v 3.19 2006/02/20 00:14:35 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,11 +25,10 @@ ********************************************************/ -/* $Xorg: mbuf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "window.h" #include "os.h" #include "windowstr.h" @@ -41,8 +40,10 @@ #include "resource.h" #include "opaque.h" #include "sleepuntil.h" +#include "modinit.h" #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include "multibufst.h" +#include +#include "mbufproc.h" #ifdef EXTMODULE #include "xf86_ansic.h" @@ -53,6 +54,7 @@ #endif #endif +#ifdef MULTIBUFFER /* given an OtherClientPtr obj, get the ClientPtr */ #define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) @@ -198,7 +200,7 @@ ); void -MultibufferExtensionInit() +MultibufferExtensionInit(INITARGS) { ExtensionEntry *extEntry; int i, j; @@ -261,8 +263,7 @@ /*ARGSUSED*/ static void -MultibufferResetProc (extEntry) -ExtensionEntry *extEntry; +MultibufferResetProc(ExtensionEntry *extEntry) { int i; ScreenPtr pScreen; @@ -283,11 +284,10 @@ } static int -ProcGetBufferVersion (client) - register ClientPtr client; +ProcGetBufferVersion(ClientPtr client) { xMbufGetBufferVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH (xMbufGetBufferVersionReq); rep.type = X_Reply; @@ -304,9 +304,7 @@ } static void -SetupBackgroundPainter (pWin, pGC) - WindowPtr pWin; - GCPtr pGC; +SetupBackgroundPainter(WindowPtr pWin, GCPtr pGC) { pointer gcvalues[4]; int ts_x_origin, ts_y_origin; @@ -354,12 +352,7 @@ } int -CreateImageBuffers (pWin, nbuf, ids, action, hint) - WindowPtr pWin; - int nbuf; - XID *ids; - int action; - int hint; +CreateImageBuffers(WindowPtr pWin, int nbuf, XID *ids, int action, int hint) { MultibuffersPtr pMultibuffers; MultibufferPtr pMultibuffer; @@ -442,12 +435,11 @@ static int -ProcCreateImageBuffers (client) - register ClientPtr client; +ProcCreateImageBuffers(ClientPtr client) { REQUEST(xMbufCreateImageBuffersReq); xMbufCreateImageBuffersReply rep; - register int n; + int n; WindowPtr pWin; XID *ids; int len, nbuf; @@ -508,8 +500,7 @@ } static int -ProcDisplayImageBuffers (client) - register ClientPtr client; +ProcDisplayImageBuffers(ClientPtr client) { REQUEST(xMbufDisplayImageBuffersReq); MultibufferPtr *pMultibuffer; @@ -581,8 +572,7 @@ static int -ProcDestroyImageBuffers (client) - register ClientPtr client; +ProcDestroyImageBuffers(ClientPtr client) { REQUEST (xMbufDestroyImageBuffersReq); WindowPtr pWin; @@ -595,8 +585,7 @@ } static int -ProcSetMBufferAttributes (client) - register ClientPtr client; +ProcSetMBufferAttributes(ClientPtr client) { REQUEST (xMbufSetMBufferAttributesReq); WindowPtr pWin; @@ -649,8 +638,7 @@ } static int -ProcGetMBufferAttributes (client) - ClientPtr client; +ProcGetMBufferAttributes(ClientPtr client) { REQUEST (xMbufGetMBufferAttributesReq); WindowPtr pWin; @@ -694,8 +682,7 @@ } static int -ProcSetBufferAttributes (client) - register ClientPtr client; +ProcSetBufferAttributes(ClientPtr client) { REQUEST(xMbufSetBufferAttributesReq); MultibufferPtr pMultibuffer; @@ -736,8 +723,7 @@ } int -ProcGetBufferAttributes (client) - register ClientPtr client; +ProcGetBufferAttributes(ClientPtr client) { REQUEST(xMbufGetBufferAttributesReq); MultibufferPtr pMultibuffer; @@ -780,8 +766,7 @@ } static int -ProcGetBufferInfo (client) - register ClientPtr client; +ProcGetBufferInfo(ClientPtr client) { REQUEST (xMbufGetBufferInfoReq); DrawablePtr pDrawable; @@ -845,8 +830,7 @@ } static int -ProcClearImageBufferArea (client) - register ClientPtr client; +ProcClearImageBufferArea(ClientPtr client) { REQUEST (xMbufClearImageBufferAreaReq); MultibufferPtr pMultibuffer; @@ -907,8 +891,7 @@ } static int -ProcMultibufferDispatch (client) - register ClientPtr client; +ProcMultibufferDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) { @@ -938,10 +921,9 @@ } static int -SProcGetBufferVersion (client) - register ClientPtr client; +SProcGetBufferVersion(ClientPtr client) { - register int n; + int n; REQUEST (xMbufGetBufferVersionReq); swaps (&stuff->length, n); @@ -949,10 +931,9 @@ } static int -SProcCreateImageBuffers (client) - register ClientPtr client; +SProcCreateImageBuffers(ClientPtr client) { - register int n; + int n; REQUEST (xMbufCreateImageBuffersReq); swaps (&stuff->length, n); @@ -963,10 +944,9 @@ } static int -SProcDisplayImageBuffers (client) - register ClientPtr client; +SProcDisplayImageBuffers(ClientPtr client) { - register int n; + int n; REQUEST (xMbufDisplayImageBuffersReq); swaps (&stuff->length, n); @@ -978,10 +958,9 @@ } static int -SProcDestroyImageBuffers (client) - register ClientPtr client; +SProcDestroyImageBuffers(ClientPtr client) { - register int n; + int n; REQUEST (xMbufDestroyImageBuffersReq); swaps (&stuff->length, n); @@ -991,10 +970,9 @@ } static int -SProcSetMBufferAttributes (client) - register ClientPtr client; +SProcSetMBufferAttributes(ClientPtr client) { - register int n; + int n; REQUEST (xMbufSetMBufferAttributesReq); swaps (&stuff->length, n); @@ -1006,10 +984,9 @@ } static int -SProcGetMBufferAttributes (client) - register ClientPtr client; +SProcGetMBufferAttributes(ClientPtr client) { - register int n; + int n; REQUEST (xMbufGetMBufferAttributesReq); swaps (&stuff->length, n); @@ -1019,10 +996,9 @@ } static int -SProcSetBufferAttributes (client) - register ClientPtr client; +SProcSetBufferAttributes(ClientPtr client) { - register int n; + int n; REQUEST (xMbufSetBufferAttributesReq); swaps (&stuff->length, n); @@ -1034,10 +1010,9 @@ } static int -SProcGetBufferAttributes (client) - register ClientPtr client; +SProcGetBufferAttributes(ClientPtr client) { - register int n; + int n; REQUEST (xMbufGetBufferAttributesReq); swaps (&stuff->length, n); @@ -1047,10 +1022,9 @@ } static int -SProcGetBufferInfo (client) - register ClientPtr client; +SProcGetBufferInfo(ClientPtr client) { - register int n; + int n; REQUEST (xMbufGetBufferInfoReq); swaps (&stuff->length, n); @@ -1060,10 +1034,9 @@ } static int -SProcClearImageBufferArea(client) - register ClientPtr client; +SProcClearImageBufferArea(ClientPtr client) { - register char n; + char n; REQUEST(xMbufClearImageBufferAreaReq); swaps(&stuff->length, n); @@ -1077,8 +1050,7 @@ } static int -SProcMultibufferDispatch (client) - register ClientPtr client; +SProcMultibufferDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) { @@ -1108,8 +1080,7 @@ } static void -SUpdateNotifyEvent (from, to) - xMbufUpdateNotifyEvent *from, *to; +SUpdateNotifyEvent(xMbufUpdateNotifyEvent *from, xMbufUpdateNotifyEvent *to) { to->type = from->type; cpswaps (from->sequenceNumber, to->sequenceNumber); @@ -1118,8 +1089,7 @@ } static void -SClobberNotifyEvent (from, to) - xMbufClobberNotifyEvent *from, *to; +SClobberNotifyEvent(xMbufClobberNotifyEvent *from, xMbufClobberNotifyEvent *to) { to->type = from->type; cpswaps (from->sequenceNumber, to->sequenceNumber); @@ -1128,10 +1098,8 @@ } static void -PerformDisplayRequest (ppMultibuffers, pMultibuffer, nbuf) - MultibufferPtr *pMultibuffer; - MultibuffersPtr *ppMultibuffers; - int nbuf; +PerformDisplayRequest(MultibuffersPtr *ppMultibuffers, + MultibufferPtr *pMultibuffer, int nbuf) { GCPtr pGC; PixmapPtr pPrevPixmap, pNewPixmap; @@ -1237,9 +1205,7 @@ } DrawablePtr -GetBufferPointer (pWin, i) - WindowPtr pWin; - int i; +GetBufferPointer(WindowPtr pWin, int i) { MultibuffersPtr pMultibuffers; @@ -1249,9 +1215,7 @@ } int -DisplayImageBuffers (ids, nbuf) - XID *ids; - int nbuf; +DisplayImageBuffers(XID *ids, int nbuf) { MultibufferPtr *pMultibuffer; MultibuffersPtr *pMultibuffers; @@ -1285,9 +1249,7 @@ static Bool -QueueDisplayRequest (client, activateTime) - ClientPtr client; - TimeStamp activateTime; +QueueDisplayRequest(ClientPtr client, TimeStamp activateTime) { /* see xtest.c:ProcXTestFakeInput for code similar to this */ @@ -1298,7 +1260,7 @@ /* swap the request back so we can simply re-execute it */ if (client->swapped) { - register int n; + int n; REQUEST (xMbufDisplayImageBuffersReq); SwapRestL(stuff); @@ -1317,11 +1279,8 @@ */ static int -DeliverEventsToMultibuffer (pMultibuffer, pEvents, count, filter) - MultibufferPtr pMultibuffer; - xEvent *pEvents; - int count; - Mask filter; +DeliverEventsToMultibuffer(MultibufferPtr pMultibuffer, xEvent *pEvents, + int count, Mask filter) { int deliveries = 0, nondeliveries = 0; int attempt; @@ -1363,17 +1322,15 @@ */ void -MultibufferExpose (pMultibuffer, pRegion) - MultibufferPtr pMultibuffer; - RegionPtr pRegion; +MultibufferExpose(MultibufferPtr pMultibuffer, RegionPtr pRegion) { if (pRegion && !REGION_NIL(pRegion)) { xEvent *pEvent; PixmapPtr pPixmap; - register xEvent *pe; - register BoxPtr pBox; - register int i; + xEvent *pe; + BoxPtr pBox; + int i; int numRects; pPixmap = pMultibuffer->pPixmap; @@ -1406,9 +1363,7 @@ /* send UpdateNotify event */ void -MultibufferUpdate (pMultibuffer, time2) - MultibufferPtr pMultibuffer; - CARD32 time2; +MultibufferUpdate(MultibufferPtr pMultibuffer, CARD32 time2) { xMbufUpdateNotifyEvent event; @@ -1425,8 +1380,7 @@ */ void -MultibufferClobber (pMultibuffer) - MultibufferPtr pMultibuffer; +MultibufferClobber(MultibufferPtr pMultibuffer) { xMbufClobberNotifyEvent event; @@ -1443,9 +1397,7 @@ */ static void -AliasMultibuffer (pMultibuffers, i) - MultibuffersPtr pMultibuffers; - int i; +AliasMultibuffer(MultibuffersPtr pMultibuffers, int i) { MultibufferPtr pMultibuffer; @@ -1477,8 +1429,7 @@ */ void -DestroyImageBuffers (pWin) - WindowPtr pWin; +DestroyImageBuffers(WindowPtr pWin) { FreeResourceByType (pWin->drawable.id, MultibuffersResType, FALSE); /* Zero out the window's pointer to the buffers so they won't be reused */ @@ -1490,9 +1441,7 @@ */ static Bool -MultibufferPositionWindow (pWin, x, y) - WindowPtr pWin; - int x, y; +MultibufferPositionWindow(WindowPtr pWin, int x, int y) { ScreenPtr pScreen; MultibufferScreenPtr pMultibufferScreen; @@ -1614,9 +1563,7 @@ /* Resource delete func for MultibufferDrawableResType */ /*ARGSUSED*/ static int -MultibufferDrawableDelete (value, id) - pointer value; - XID id; +MultibufferDrawableDelete(pointer value, XID id) { DrawablePtr pDrawable = (DrawablePtr)value; WindowPtr pWin; @@ -1640,9 +1587,7 @@ /* Resource delete func for MultibufferResType */ /*ARGSUSED*/ static int -MultibufferDelete (value, id) - pointer value; - XID id; +MultibufferDelete(pointer value, XID id) { MultibufferPtr pMultibuffer = (MultibufferPtr)value; MultibuffersPtr pMultibuffers; @@ -1660,9 +1605,7 @@ /* Resource delete func for MultibuffersResType */ /*ARGSUSED*/ static int -MultibuffersDelete (value, id) - pointer value; - XID id; +MultibuffersDelete(pointer value, XID id) { MultibuffersPtr pMultibuffers = (MultibuffersPtr)value; int i; @@ -1677,12 +1620,10 @@ /* Resource delete func for OtherClientResType */ static int -OtherClientDelete (value, id) - pointer value; - XID id; +OtherClientDelete(pointer value, XID id) { MultibufferPtr pMultibuffer = (MultibufferPtr)value; - register OtherClientsPtr other, prev; + OtherClientsPtr other, prev; prev = 0; for (other = pMultibuffer->otherClients; other; other = other->next) @@ -1703,10 +1644,8 @@ } static int -EventSelectForMultibuffer (pMultibuffer, client, mask) - MultibufferPtr pMultibuffer; - ClientPtr client; - Mask mask; +EventSelectForMultibuffer(MultibufferPtr pMultibuffer, ClientPtr client, + Mask mask) { OtherClientsPtr other; @@ -1756,8 +1695,7 @@ /* or together all the otherClients event masks */ static void -RecalculateMultibufferOtherEvents (pMultibuffer) - MultibufferPtr pMultibuffer; +RecalculateMultibufferOtherEvents(MultibufferPtr pMultibuffer) { Mask otherEventMask; OtherClients *other; @@ -1770,9 +1708,7 @@ /* add milliseconds to a timestamp, handling overflow */ static void -BumpTimeStamp (ts, inc) -TimeStamp *ts; -CARD32 inc; +BumpTimeStamp(TimeStamp *ts, CARD32 inc) { CARD32 newms; @@ -1781,3 +1717,5 @@ ts->months++; ts->milliseconds = newms; } + +#endif Index: xc/programs/Xserver/Xext/mbufbf.c diff -u xc/programs/Xserver/Xext/mbufbf.c:3.6 xc/programs/Xserver/Xext/mbufbf.c:3.7 --- xc/programs/Xserver/Xext/mbufbf.c:3.6 Mon Nov 10 13:21:42 2003 +++ xc/programs/Xserver/Xext/mbufbf.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.6 2003/11/10 18:21:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbufbf.c,v 3.7 2005/10/14 15:16:11 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -25,13 +25,11 @@ */ -/* $Xorg: mbufbf.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ - #define NEED_REPLIES #define NEED_EVENTS #include -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "windowstr.h" @@ -49,7 +47,7 @@ #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ #define _MULTIBUF_BUFFER_ -#include "multibufst.h" +#include /* Support for doublebuffer hardare Index: xc/programs/Xserver/Xext/mbufproc.h diff -u /dev/null xc/programs/Xserver/Xext/mbufproc.h:1.1 --- /dev/null Tue May 9 21:55:52 2006 +++ xc/programs/Xserver/Xext/mbufproc.h Sun Mar 27 21:51:00 2005 @@ -0,0 +1,4 @@ +/* $XFree86: xc/programs/Xserver/Xext/mbufproc.h,v 1.1 2005/03/28 02:51:00 dawes Exp $ */ + +extern DrawablePtr GetBufferPointer(WindowPtr pWin, int i); + Index: xc/programs/Xserver/Xext/mbufpx.c diff -u xc/programs/Xserver/Xext/mbufpx.c:3.4 xc/programs/Xserver/Xext/mbufpx.c:3.5 --- xc/programs/Xserver/Xext/mbufpx.c:3.4 Fri Dec 14 14:58:49 2001 +++ xc/programs/Xserver/Xext/mbufpx.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.4 2001/12/14 19:58:49 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mbufpx.c,v 3.5 2005/10/14 15:16:11 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,12 +25,11 @@ ********************************************************/ -/* $Xorg: mbufpx.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS #include -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "windowstr.h" @@ -47,7 +46,7 @@ #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ #define _MULTIBUF_PIXMAP_ -#include "multibufst.h" +#include static Bool NoopDDA_True() { return TRUE; } Index: xc/programs/Xserver/Xext/mitmisc.c diff -u xc/programs/Xserver/Xext/mitmisc.c:3.7 xc/programs/Xserver/Xext/mitmisc.c:3.10 --- xc/programs/Xserver/Xext/mitmisc.c:3.7 Mon Nov 17 17:20:26 2003 +++ xc/programs/Xserver/Xext/mitmisc.c Sun Feb 19 19:14:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.7 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/mitmisc.c,v 3.10 2006/02/20 00:14:35 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,19 +27,18 @@ /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */ -/* $Xorg: mitmisc.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ - #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #define _MITMISC_SERVER_ -#include "mitmiscstr.h" +#include #include "modinit.h" +#ifdef MITMISC extern Bool permitOldBugs; #if 0 @@ -76,14 +75,12 @@ /*ARGSUSED*/ static void -MITResetProc (extEntry) -ExtensionEntry *extEntry; +MITResetProc(ExtensionEntry *extEntry) { } static int -ProcMITSetBugMode(client) - register ClientPtr client; +ProcMITSetBugMode(ClientPtr client) { REQUEST(xMITSetBugModeReq); @@ -98,11 +95,10 @@ } static int -ProcMITGetBugMode(client) - register ClientPtr client; +ProcMITGetBugMode(ClientPtr client) { xMITGetBugModeReply rep; - register int n; + int n; REQUEST_SIZE_MATCH(xMITGetBugModeReq); rep.type = X_Reply; @@ -118,8 +114,7 @@ } static int -ProcMITDispatch (client) - register ClientPtr client; +ProcMITDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -134,10 +129,9 @@ } static int -SProcMITSetBugMode(client) - register ClientPtr client; +SProcMITSetBugMode(ClientPtr client) { - register int n; + int n; REQUEST(xMITSetBugModeReq); swaps(&stuff->length, n); @@ -145,10 +139,9 @@ } static int -SProcMITGetBugMode(client) - register ClientPtr client; +SProcMITGetBugMode(ClientPtr client) { - register int n; + int n; REQUEST(xMITGetBugModeReq); swaps(&stuff->length, n); @@ -156,8 +149,7 @@ } static int -SProcMITDispatch (client) - register ClientPtr client; +SProcMITDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -170,3 +162,5 @@ return BadRequest; } } + +#endif Index: xc/programs/Xserver/Xext/panoramiX.c diff -u xc/programs/Xserver/Xext/panoramiX.c:3.40 xc/programs/Xserver/Xext/panoramiX.c:3.46 --- xc/programs/Xserver/Xext/panoramiX.c:3.40 Wed Jun 30 16:21:38 2004 +++ xc/programs/Xserver/Xext/panoramiX.c Sun Feb 19 10:51:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: panoramiX.c,v 1.5 2000/08/17 19:47:57 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -24,7 +23,7 @@ Equipment Corporation. ******************************************************************/ /* - * Copyright (c) 1996-2004 by The XFree86 Project, Inc. + * Copyright (c) 1996-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -69,13 +68,13 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.40 2004/06/30 20:21:38 martin Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiX.c,v 3.46 2006/02/19 15:51:16 tsi Exp $ */ #define NEED_REPLIES #include -#include "X.h" -#include "Xproto.h" -#include "Xarch.h" +#include +#include +#include #include "misc.h" #include "cursor.h" #include "cursorstr.h" @@ -88,7 +87,7 @@ #include "windowstr.h" #include "pixmapstr.h" #include "panoramiX.h" -#include "panoramiXproto.h" +#include #include "panoramiXsrv.h" #include "globals.h" #include "servermd.h" @@ -99,9 +98,6 @@ #include "modinit.h" -PanoramiXData *panoramiXdataPtr = NULL; -unsigned long XRT_WINDOW; - #ifdef PANORAMIX #ifdef GLXPROXY @@ -117,11 +113,12 @@ * PanoramiX data declarations */ -int PanoramiXPixWidth = 0; -int PanoramiXPixHeight = 0; -int PanoramiXNumScreens = 0; +int PanoramiXPixWidth = 0; +int PanoramiXPixHeight = 0; +int PanoramiXNumScreens = 0; -RegionRec PanoramiXScreenRegion = {{0, 0, 0, 0}, NULL}; +PanoramiXData *panoramiXdataPtr = NULL; +RegionRec PanoramiXScreenRegion = {{0, 0, 0, 0}, NULL}; static int PanoramiXNumDepths; static DepthPtr PanoramiXDepths; @@ -132,6 +129,7 @@ XID *PanoramiXVisualTable = NULL; unsigned long XRC_DRAWABLE; +unsigned long XRT_WINDOW; unsigned long XRT_PIXMAP; unsigned long XRT_GC; unsigned long XRT_COLORMAP; @@ -141,7 +139,7 @@ */ static int panoramiXGeneration; -static int ProcPanoramiXDispatch(ClientPtr client); +static int ProcPanoramiXDispatch(ClientPtr client); static void PanoramiXResetProc(ExtensionEntry*); @@ -164,8 +162,10 @@ } PanoramiXGCRec, *PanoramiXGCPtr; typedef struct { - CreateGCProcPtr CreateGC; - CloseScreenProcPtr CloseScreen; + CloseScreenProcPtr CloseScreen; + PaintWindowBackgroundProcPtr PaintWindowBackground; + PaintWindowBorderProcPtr PaintWindowBorder; + CreateGCProcPtr CreateGC; } PanoramiXScreenRec, *PanoramiXScreenPtr; RegionRec XineramaScreenRegions[MAXSCREENS]; @@ -184,8 +184,7 @@ }; #define Xinerama_GC_FUNC_PROLOGUE(pGC)\ - PanoramiXGCPtr pGCPriv = \ - (PanoramiXGCPtr) (pGC)->devPrivates[PanoramiXGCIndex].ptr;\ + PanoramiXGCPtr pGCPriv = (pGC)->devPrivates[PanoramiXGCIndex].ptr;\ (pGC)->funcs = pGCPriv->wrapFuncs; #define Xinerama_GC_FUNC_EPILOGUE(pGC)\ @@ -194,40 +193,87 @@ static Bool -XineramaCloseScreen (int i, ScreenPtr pScreen) +XineramaCloseScreen(int i, ScreenPtr pScreen) { - PanoramiXScreenPtr pScreenPriv = - (PanoramiXScreenPtr) pScreen->devPrivates[PanoramiXScreenIndex].ptr; + PanoramiXScreenPtr pScreenPriv = + pScreen->devPrivates[PanoramiXScreenIndex].ptr; pScreen->CloseScreen = pScreenPriv->CloseScreen; + pScreen->PaintWindowBackground = pScreenPriv->PaintWindowBackground; + pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder; pScreen->CreateGC = pScreenPriv->CreateGC; REGION_UNINIT(pScreen, &XineramaScreenRegions[pScreen->myNum]); if (pScreen->myNum == 0) REGION_UNINIT(pScreen, &PanoramiXScreenRegion); - xfree ((pointer) pScreenPriv); + xfree(pScreenPriv); - return (*pScreen->CloseScreen) (i, pScreen); + return (*pScreen->CloseScreen)(i, pScreen); } -Bool +static void +XineramaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what) +{ + ScreenPtr pScreen = pWin->drawable.pScreen; + PanoramiXScreenPtr pScreenPriv = + pScreen->devPrivates[PanoramiXScreenIndex].ptr; + WindowPtr pBWindow = pWin; + Bool noPanoramiXExtensionSave = noPanoramiXExtension; + int xsave, ysave; + + /* Find the window whose background/border is to be used */ + while (pBWindow->backgroundState == ParentRelative) + pBWindow = pBWindow->parent; + xsave = pBWindow->drawable.x; + ysave = pBWindow->drawable.y; + + if (!noPanoramiXExtension) { + int screen = pScreen->myNum; + + /* Disable kludge in older framebuffers */ + noPanoramiXExtension = TRUE; + + /* The extension mangles root window origins */ + if (pBWindow == WindowTable[screen]) { + pBWindow->drawable.x -= panoramiXdataPtr[screen].x; + pBWindow->drawable.y -= panoramiXdataPtr[screen].y; + } + } + + /* Unwrap, call down and re-wrap */ + if (what == PW_BACKGROUND) { + pScreen->PaintWindowBackground = pScreenPriv->PaintWindowBackground; + (*pScreen->PaintWindowBackground)(pWin, pRegion, PW_BACKGROUND); + pScreen->PaintWindowBackground = XineramaPaintWindow; + } else { + pScreen->PaintWindowBorder = pScreenPriv->PaintWindowBorder; + (*pScreen->PaintWindowBorder)(pWin, pRegion, PW_BORDER); + pScreen->PaintWindowBorder = XineramaPaintWindow; + } + + /* Recover from the above temporary adjustments */ + noPanoramiXExtension = noPanoramiXExtensionSave; + pBWindow->drawable.x = xsave; + pBWindow->drawable.y = ysave; +} + +static Bool XineramaCreateGC(GCPtr pGC) { ScreenPtr pScreen = pGC->pScreen; - PanoramiXScreenPtr pScreenPriv = - (PanoramiXScreenPtr) pScreen->devPrivates[PanoramiXScreenIndex].ptr; + PanoramiXScreenPtr pScreenPriv = + pScreen->devPrivates[PanoramiXScreenIndex].ptr; Bool ret; pScreen->CreateGC = pScreenPriv->CreateGC; - if((ret = (*pScreen->CreateGC)(pGC))) { - PanoramiXGCPtr pGCPriv = - (PanoramiXGCPtr) pGC->devPrivates[PanoramiXGCIndex].ptr; + if ((ret = (*pScreen->CreateGC)(pGC))) { + PanoramiXGCPtr pGCPriv = pGC->devPrivates[PanoramiXGCIndex].ptr; pGCPriv->wrapFuncs = pGC->funcs; - pGC->funcs = &XineramaGCFuncs; + pGC->funcs = &XineramaGCFuncs; - pGCPriv->clipOrg.x = pGC->clipOrg.x; + pGCPriv->clipOrg.x = pGC->clipOrg.x; pGCPriv->clipOrg.y = pGC->clipOrg.y; pGCPriv->patOrg.x = pGC->patOrg.x; pGCPriv->patOrg.y = pGC->patOrg.y; @@ -241,65 +287,65 @@ XineramaValidateGC( GCPtr pGC, unsigned long changes, - DrawablePtr pDraw + DrawablePtr pDraw ){ - Xinerama_GC_FUNC_PROLOGUE (pGC); + Xinerama_GC_FUNC_PROLOGUE(pGC); - if((pDraw->type == DRAWABLE_WINDOW) && !(((WindowPtr)pDraw)->parent)) { + if ((pDraw->type == DRAWABLE_WINDOW) && !(((WindowPtr)pDraw)->parent)) { /* the root window */ int x_off = panoramiXdataPtr[pGC->pScreen->myNum].x; int y_off = panoramiXdataPtr[pGC->pScreen->myNum].y; int new_val; new_val = pGCPriv->clipOrg.x - x_off; - if(pGC->clipOrg.x != new_val) { + if (pGC->clipOrg.x != new_val) { pGC->clipOrg.x = new_val; changes |= GCClipXOrigin; } new_val = pGCPriv->clipOrg.y - y_off; - if(pGC->clipOrg.y != new_val) { + if (pGC->clipOrg.y != new_val) { pGC->clipOrg.y = new_val; changes |= GCClipYOrigin; } new_val = pGCPriv->patOrg.x - x_off; - if(pGC->patOrg.x != new_val) { + if (pGC->patOrg.x != new_val) { pGC->patOrg.x = new_val; changes |= GCTileStipXOrigin; } new_val = pGCPriv->patOrg.y - y_off; - if(pGC->patOrg.y != new_val) { + if (pGC->patOrg.y != new_val) { pGC->patOrg.y = new_val; changes |= GCTileStipYOrigin; } } else { - if(pGC->clipOrg.x != pGCPriv->clipOrg.x) { + if (pGC->clipOrg.x != pGCPriv->clipOrg.x) { pGC->clipOrg.x = pGCPriv->clipOrg.x; changes |= GCClipXOrigin; } - if(pGC->clipOrg.y != pGCPriv->clipOrg.y) { + if (pGC->clipOrg.y != pGCPriv->clipOrg.y) { pGC->clipOrg.y = pGCPriv->clipOrg.y; changes |= GCClipYOrigin; } - if(pGC->patOrg.x != pGCPriv->patOrg.x) { + if (pGC->patOrg.x != pGCPriv->patOrg.x) { pGC->patOrg.x = pGCPriv->patOrg.x; changes |= GCTileStipXOrigin; } - if(pGC->patOrg.y != pGCPriv->patOrg.y) { + if (pGC->patOrg.y != pGCPriv->patOrg.y) { pGC->patOrg.y = pGCPriv->patOrg.y; changes |= GCTileStipYOrigin; } } - + (*pGC->funcs->ValidateGC)(pGC, changes, pDraw); - Xinerama_GC_FUNC_EPILOGUE (pGC); + Xinerama_GC_FUNC_EPILOGUE(pGC); } static void XineramaDestroyGC(GCPtr pGC) { - Xinerama_GC_FUNC_PROLOGUE (pGC); + Xinerama_GC_FUNC_PROLOGUE(pGC); (*pGC->funcs->DestroyGC)(pGC); - Xinerama_GC_FUNC_EPILOGUE (pGC); + Xinerama_GC_FUNC_EPILOGUE(pGC); } static void @@ -307,42 +353,41 @@ GCPtr pGC, unsigned long mask ){ - Xinerama_GC_FUNC_PROLOGUE (pGC); + Xinerama_GC_FUNC_PROLOGUE(pGC); - if(mask & GCTileStipXOrigin) + if (mask & GCTileStipXOrigin) pGCPriv->patOrg.x = pGC->patOrg.x; - if(mask & GCTileStipYOrigin) + if (mask & GCTileStipYOrigin) pGCPriv->patOrg.y = pGC->patOrg.y; - if(mask & GCClipXOrigin) - pGCPriv->clipOrg.x = pGC->clipOrg.x; - if(mask & GCClipYOrigin) + if (mask & GCClipXOrigin) + pGCPriv->clipOrg.x = pGC->clipOrg.x; + if (mask & GCClipYOrigin) pGCPriv->clipOrg.y = pGC->clipOrg.y; - (*pGC->funcs->ChangeGC) (pGC, mask); - Xinerama_GC_FUNC_EPILOGUE (pGC); + (*pGC->funcs->ChangeGC)(pGC, mask); + Xinerama_GC_FUNC_EPILOGUE(pGC); } static void XineramaCopyGC ( - GCPtr pGCSrc, + GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst ){ - PanoramiXGCPtr pSrcPriv = - (PanoramiXGCPtr) pGCSrc->devPrivates[PanoramiXGCIndex].ptr; - Xinerama_GC_FUNC_PROLOGUE (pGCDst); - - if(mask & GCTileStipXOrigin) - pGCPriv->patOrg.x = pSrcPriv->patOrg.x; - if(mask & GCTileStipYOrigin) - pGCPriv->patOrg.y = pSrcPriv->patOrg.y; - if(mask & GCClipXOrigin) - pGCPriv->clipOrg.x = pSrcPriv->clipOrg.x; - if(mask & GCClipYOrigin) - pGCPriv->clipOrg.y = pSrcPriv->clipOrg.y; + PanoramiXGCPtr pSrcPriv = pGCSrc->devPrivates[PanoramiXGCIndex].ptr; + Xinerama_GC_FUNC_PROLOGUE(pGCDst); + + if (mask & GCTileStipXOrigin) + pGCPriv->patOrg.x = pSrcPriv->patOrg.x; + if (mask & GCTileStipYOrigin) + pGCPriv->patOrg.y = pSrcPriv->patOrg.y; + if (mask & GCClipXOrigin) + pGCPriv->clipOrg.x = pSrcPriv->clipOrg.x; + if (mask & GCClipYOrigin) + pGCPriv->clipOrg.y = pSrcPriv->clipOrg.y; - (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst); - Xinerama_GC_FUNC_EPILOGUE (pGCDst); + (*pGCDst->funcs->CopyGC)(pGCSrc, mask, pGCDst); + Xinerama_GC_FUNC_EPILOGUE(pGCDst); } static void @@ -350,27 +395,27 @@ GCPtr pGC, int type, pointer pvalue, - int nrects + int nrects ){ - Xinerama_GC_FUNC_PROLOGUE (pGC); - (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects); - Xinerama_GC_FUNC_EPILOGUE (pGC); + Xinerama_GC_FUNC_PROLOGUE(pGC); + (*pGC->funcs->ChangeClip)(pGC, type, pvalue, nrects); + Xinerama_GC_FUNC_EPILOGUE(pGC); } static void XineramaCopyClip(GCPtr pgcDst, GCPtr pgcSrc) { - Xinerama_GC_FUNC_PROLOGUE (pgcDst); + Xinerama_GC_FUNC_PROLOGUE(pgcDst); (* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc); - Xinerama_GC_FUNC_EPILOGUE (pgcDst); + Xinerama_GC_FUNC_EPILOGUE(pgcDst); } static void XineramaDestroyClip(GCPtr pGC) { - Xinerama_GC_FUNC_PROLOGUE (pGC); + Xinerama_GC_FUNC_PROLOGUE(pGC); (* pGC->funcs->DestroyClip)(pGC); - Xinerama_GC_FUNC_EPILOGUE (pGC); + Xinerama_GC_FUNC_EPILOGUE(pGC); } @@ -383,15 +428,16 @@ } -static Bool +static Bool XineramaFindIDOnAnyScreen(pointer resource, XID id, pointer privdata) { - PanoramiXRes *res = (PanoramiXRes*)resource; + PanoramiXRes *res = resource; int j; - FOR_NSCREENS(j) - if(res->info[j].id == *((XID*)privdata)) return TRUE; - + FOR_NSCREENS(j) + if (res->info[j].id == *((XID*)privdata)) + return TRUE; + return FALSE; } @@ -405,15 +451,15 @@ typedef struct { int screen; int id; -} PanoramiXSearchData; +} PanoramiXSearchData; -static Bool +static Bool XineramaFindIDByScrnum(pointer resource, XID id, pointer privdata) { - PanoramiXRes *res = (PanoramiXRes*)resource; - PanoramiXSearchData *data = (PanoramiXSearchData*)privdata; - + PanoramiXRes *res = resource; + PanoramiXSearchData *data = privdata; + return (res->info[data->screen].id == data->id); } @@ -422,7 +468,7 @@ { PanoramiXSearchData data; - if(!screen) + if (!screen) return LookupIDByType(id, type); data.screen = screen; @@ -437,15 +483,15 @@ { int num = pWin->drawable.pScreen->myNum; - if(num != ScrnNum) { + if (num != ScrnNum) { PanoramiXRes *win; win = PanoramiXFindIDByScrnum(XRT_WINDOW, pWin->drawable.id, num); - if (win) - pWin = (WindowPtr) LookupIDByType(win->info[ScrnNum].id, RT_WINDOW); + if (win) + pWin = LookupIDByType(win->info[ScrnNum].id, RT_WINDOW); } - + return pWin; } @@ -461,7 +507,7 @@ { XineramaConnectionCallbackList *newlist; - if(!(newlist = xalloc(sizeof(XineramaConnectionCallbackList)))) + if (!(newlist = xalloc(sizeof(XineramaConnectionCallbackList)))) return FALSE; newlist->next = ConnectionCallbackList; @@ -479,7 +525,7 @@ for (i = 0; i < PanoramiXNumScreens; i++) { BoxRec TheBox; - pScreen = screenInfo.screens[i]; + pScreen = screenInfo.screens[i]; panoramiXdataPtr[i].x = dixScreenOrigins[i].x; panoramiXdataPtr[i].y = dixScreenOrigins[i].y; @@ -523,38 +569,39 @@ /* * PanoramiXExtensionInit(): - * Called from InitExtensions in main(). + * Called from InitExtensions in main(). * Register PanoramiXeen Extension * Initialize global variables. - */ + */ void PanoramiXExtensionInit(int argc, char *argv[]) { - int i; - Bool success = FALSE; - ExtensionEntry *extEntry; + int i; + Bool success = FALSE; + ExtensionEntry *extEntry; ScreenPtr pScreen = screenInfo.screens[0]; PanoramiXScreenPtr pScreenPriv; - if (noPanoramiXExtension) + if (noPanoramiXExtension) return; + /* + * Given this extension was explicitly requested, initialise it even if + * there's only one screen. + */ + GlobalScrInfo = &screenInfo; /* For debug visibility */ PanoramiXNumScreens = screenInfo.numScreens; - if (PanoramiXNumScreens == 1) { /* Only 1 screen */ - noPanoramiXExtension = TRUE; - return; - } while (panoramiXGeneration != serverGeneration) { - extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0, + extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0, ProcPanoramiXDispatch, - SProcPanoramiXDispatch, PanoramiXResetProc, + SProcPanoramiXDispatch, PanoramiXResetProc, StandardMinorOpcode); if (!extEntry) { ErrorF("PanoramiXExtensionInit(): failed to AddExtension\n"); break; - } + } #if 0 PanoramiXReqCode = (unsigned char)extEntry->base; @@ -565,40 +612,43 @@ * run in non-PanoramiXeen mode. */ - panoramiXdataPtr = (PanoramiXData *) + panoramiXdataPtr = (PanoramiXData *) xcalloc(PanoramiXNumScreens, sizeof(PanoramiXData)); - BREAK_IF(!panoramiXdataPtr); + BREAK_IF(!panoramiXdataPtr); BREAK_IF((PanoramiXGCIndex = AllocateGCPrivateIndex()) < 0); BREAK_IF((PanoramiXScreenIndex = AllocateScreenPrivateIndex()) < 0); - + for (i = 0; i < PanoramiXNumScreens; i++) { pScreen = screenInfo.screens[i]; - if(!AllocateGCPrivate(pScreen, PanoramiXGCIndex, + if (!AllocateGCPrivate(pScreen, PanoramiXGCIndex, sizeof(PanoramiXGCRec))) { noPanoramiXExtension = TRUE; return; } pScreenPriv = xalloc(sizeof(PanoramiXScreenRec)); - pScreen->devPrivates[PanoramiXScreenIndex].ptr = - (pointer)pScreenPriv; - if(!pScreenPriv) { + pScreen->devPrivates[PanoramiXScreenIndex].ptr = pScreenPriv; + if (!pScreenPriv) { noPanoramiXExtension = TRUE; return; } - - pScreenPriv->CreateGC = pScreen->CreateGC; + pScreenPriv->CloseScreen = pScreen->CloseScreen; - - pScreen->CreateGC = XineramaCreateGC; + pScreenPriv->PaintWindowBackground = pScreen->PaintWindowBackground; + pScreenPriv->PaintWindowBorder = pScreen->PaintWindowBorder; + pScreenPriv->CreateGC = pScreen->CreateGC; + pScreen->CloseScreen = XineramaCloseScreen; + pScreen->PaintWindowBackground = XineramaPaintWindow; + pScreen->PaintWindowBorder = XineramaPaintWindow; + pScreen->CreateGC = XineramaCreateGC; } XRC_DRAWABLE = CreateNewResourceClass(); - XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource) | + XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource) | XRC_DRAWABLE; - XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource) | + XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource) | XRC_DRAWABLE; XRT_GC = CreateNewResourceType(XineramaDeleteResource); XRT_COLORMAP = CreateNewResourceType(XineramaDeleteResource); @@ -612,7 +662,7 @@ ErrorF("%s Extension failed to initialize\n", PANORAMIX_PROTOCOL_NAME); return; } - + XineramaInitData(pScreen); /* @@ -669,24 +719,26 @@ ProcVector[X_AllocColor] = PanoramiXAllocColor; ProcVector[X_AllocNamedColor] = PanoramiXAllocNamedColor; ProcVector[X_AllocColorCells] = PanoramiXAllocColorCells; - ProcVector[X_AllocColorPlanes] = PanoramiXAllocColorPlanes; + ProcVector[X_AllocColorPlanes] = PanoramiXAllocColorPlanes; ProcVector[X_FreeColors] = PanoramiXFreeColors; - ProcVector[X_StoreColors] = PanoramiXStoreColors; - ProcVector[X_StoreNamedColor] = PanoramiXStoreNamedColor; + ProcVector[X_StoreColors] = PanoramiXStoreColors; + ProcVector[X_StoreNamedColor] = PanoramiXStoreNamedColor; #ifdef RENDER - PanoramiXRenderInit (); + PanoramiXRenderInit(); #endif } extern Bool CreateConnectionBlock(void); -Bool PanoramiXCreateConnectionBlock(void) +Bool +PanoramiXCreateConnectionBlock(void) { int i, j, length; Bool disableBackingStore = FALSE; Bool disableSaveUnders = FALSE; int old_width, old_height; + int rootDepth; float width_mult, height_mult; xWindowRoot *root; xVisualType *visual; @@ -698,29 +750,30 @@ * Do normal CreateConnectionBlock but faking it for only one screen */ - if(!PanoramiXNumDepths) { + if (!PanoramiXNumDepths || !PanoramiXNumVisuals) { ErrorF("PanoramiX error: Incompatible screens. No common visuals\n"); return FALSE; } - for(i = 1; i < screenInfo.numScreens; i++) { + rootDepth = screenInfo.screens[0]->rootDepth; + for (i = 1; i < screenInfo.numScreens; i++) { pScreen = screenInfo.screens[i]; - if(pScreen->rootDepth != screenInfo.screens[0]->rootDepth) { + if (pScreen->rootDepth != rootDepth) { ErrorF("PanoramiX error: Incompatible screens. Root window depths differ\n"); return FALSE; } - if(pScreen->backingStoreSupport != screenInfo.screens[0]->backingStoreSupport) + if (pScreen->backingStoreSupport != screenInfo.screens[0]->backingStoreSupport) disableBackingStore = TRUE; - if(pScreen->saveUnderSupport != screenInfo.screens[0]->saveUnderSupport) + if (pScreen->saveUnderSupport != screenInfo.screens[0]->saveUnderSupport) disableSaveUnders = TRUE; } - if(disableBackingStore || disableSaveUnders) { - for(i = 0; i < screenInfo.numScreens; i++) { + if (disableBackingStore || disableSaveUnders) { + for (i = 0; i < screenInfo.numScreens; i++) { pScreen = screenInfo.screens[i]; - if(disableBackingStore) + if (disableBackingStore) pScreen->backingStoreSupport = NotUseful; - if(disableSaveUnders) + if (disableSaveUnders) pScreen->saveUnderSupport = NotUseful; } } @@ -733,27 +786,43 @@ } screenInfo.numScreens = i; - + root = (xWindowRoot *) (ConnectionInfo + connBlockScreenStart); length = connBlockScreenStart + sizeof(xWindowRoot); /* overwrite the connection block */ - root->nDepths = PanoramiXNumDepths; + root->nDepths = 0; for (i = 0; i < PanoramiXNumDepths; i++) { + if (!PanoramiXDepths[i].numVids) { + if (rootDepth == PanoramiXDepths[i].depth) { + /* This is a fatal error */ + ErrorF("Root depth has no visuals common to all screens\n"); + xfree(ConnectionInfo); + return FALSE; + } +#if 0 + ErrorF("Ignoring depth %d has no visuals common to all screens\n", + PanoramiXDepths[i].depth); + continue; +#endif + } + + root->nDepths++; + depth = (xDepth *) (ConnectionInfo + length); depth->depth = PanoramiXDepths[i].depth; depth->nVisuals = PanoramiXDepths[i].numVids; length += sizeof(xDepth); visual = (xVisualType *)(ConnectionInfo + length); - + for (j = 0; j < depth->nVisuals; j++, visual++) { visual->visualID = PanoramiXDepths[i].vids[j]; for (pVisual = PanoramiXVisuals; pVisual->vid != visual->visualID; pVisual++) - ; + ; visual->class = pVisual->class; visual->bitsPerRGB = pVisual->bitsPerRGBValue; @@ -776,7 +845,7 @@ /* * OK, change some dimensions so it looks as if it were one big screen */ - + old_width = root->pixWidth; old_height = root->pixHeight; @@ -787,10 +856,10 @@ root->mmWidth *= width_mult; root->mmHeight *= height_mult; - while(ConnectionCallbackList) { + while (ConnectionCallbackList) { pointer tmp; - tmp = (pointer)ConnectionCallbackList; + tmp = ConnectionCallbackList; (*ConnectionCallbackList->func)(); ConnectionCallbackList = ConnectionCallbackList->next; xfree(tmp); @@ -799,21 +868,21 @@ return TRUE; } -extern -void PanoramiXConsolidate(void) +void +PanoramiXConsolidate(void) { - int i, j, k; + int i, j, k; VisualPtr pVisual, pVisual2; ScreenPtr pScreen, pScreen2; DepthPtr pDepth, pDepth2; PanoramiXRes *root, *defmap, *saver; Bool foundDepth, missingDepth; - if(!PanoramiXVisualTable) + if (!PanoramiXVisualTable) PanoramiXVisualTable = xcalloc(256 * MAXSCREENS, sizeof(XID)); pScreen = screenInfo.screens[0]; - pVisual = pScreen->visuals; + pVisual = pScreen->visuals; pDepth = pScreen->allowedDepths; PanoramiXNumDepths = 0; @@ -822,35 +891,35 @@ PanoramiXVisuals = xcalloc(pScreen->numVisuals,sizeof(VisualRec)); for (i = 0; i < pScreen->numDepths; i++, pDepth++) { - missingDepth = FALSE; - for (j = 1; j < PanoramiXNumScreens; j++) { - pScreen2 = screenInfo.screens[j]; - pDepth2 = pScreen2->allowedDepths; - - foundDepth = FALSE; - for (k = 0; k < pScreen2->numDepths; k++, pDepth2++) { - if(pDepth2->depth == pDepth->depth) { - foundDepth = TRUE; - break; - } - } - - if(!foundDepth) { - missingDepth = TRUE; - break; - } - } - - if(!missingDepth) { - PanoramiXDepths[PanoramiXNumDepths].depth = pDepth->depth; - PanoramiXDepths[PanoramiXNumDepths].numVids = 0; - if(pDepth->numVids) - PanoramiXDepths[PanoramiXNumDepths].vids = - xalloc(sizeof(VisualID) * pDepth->numVids); - else - PanoramiXDepths[PanoramiXNumDepths].vids = NULL; - PanoramiXNumDepths++; - } + missingDepth = FALSE; + for (j = 1; j < PanoramiXNumScreens; j++) { + pScreen2 = screenInfo.screens[j]; + pDepth2 = pScreen2->allowedDepths; + + foundDepth = FALSE; + for (k = 0; k < pScreen2->numDepths; k++, pDepth2++) { + if (pDepth2->depth == pDepth->depth) { + foundDepth = TRUE; + break; + } + } + + if (!foundDepth) { + missingDepth = TRUE; + break; + } + } + + if (!missingDepth) { + PanoramiXDepths[PanoramiXNumDepths].depth = pDepth->depth; + PanoramiXDepths[PanoramiXNumDepths].numVids = 0; + if (pDepth->numVids) + PanoramiXDepths[PanoramiXNumDepths].vids = + xalloc(sizeof(VisualID) * pDepth->numVids); + else + PanoramiXDepths[PanoramiXNumDepths].vids = NULL; + PanoramiXNumDepths++; + } } for (i = 0; i < pScreen->numVisuals; i++, pVisual++) { @@ -884,16 +953,16 @@ (pVisual->offsetGreen == pVisual2->offsetGreen) && (pVisual->offsetBlue == pVisual2->offsetBlue)) { - /* We merely assign the first visual that matches. OpenGL - will need to get involved at some point if you want - match GLX visuals */ + /* We merely assign the first visual that matches. OpenGL + will need to get involved at some point if you want + match GLX visuals */ PanoramiXVisualTable[(pVisual->vid * MAXSCREENS) + j] = pVisual2->vid; break; } } } - + /* if it doesn't exist on all screens we can't use it */ for (j = 0; j < PanoramiXNumScreens; j++) { if (!PanoramiXVisualTable[(pVisual->vid * MAXSCREENS) + j]) { @@ -903,29 +972,41 @@ } /* if it does, make sure it's in the list of supported depths and visuals */ - if(PanoramiXVisualTable[pVisual->vid * MAXSCREENS]) { - PanoramiXVisuals[PanoramiXNumVisuals].vid = pVisual->vid; - PanoramiXVisuals[PanoramiXNumVisuals].class = pVisual->class; - PanoramiXVisuals[PanoramiXNumVisuals].bitsPerRGBValue = pVisual->bitsPerRGBValue; - PanoramiXVisuals[PanoramiXNumVisuals].ColormapEntries = pVisual->ColormapEntries; - PanoramiXVisuals[PanoramiXNumVisuals].nplanes = pVisual->nplanes; - PanoramiXVisuals[PanoramiXNumVisuals].redMask = pVisual->redMask; - PanoramiXVisuals[PanoramiXNumVisuals].greenMask = pVisual->greenMask; - PanoramiXVisuals[PanoramiXNumVisuals].blueMask = pVisual->blueMask; - PanoramiXVisuals[PanoramiXNumVisuals].offsetRed = pVisual->offsetRed; - PanoramiXVisuals[PanoramiXNumVisuals].offsetGreen = pVisual->offsetGreen; - PanoramiXVisuals[PanoramiXNumVisuals].offsetBlue = pVisual->offsetBlue; - PanoramiXNumVisuals++; + if (PanoramiXVisualTable[pVisual->vid * MAXSCREENS]) { + PanoramiXVisuals[PanoramiXNumVisuals].vid = + pVisual->vid; + PanoramiXVisuals[PanoramiXNumVisuals].class = + pVisual->class; + PanoramiXVisuals[PanoramiXNumVisuals].bitsPerRGBValue = + pVisual->bitsPerRGBValue; + PanoramiXVisuals[PanoramiXNumVisuals].ColormapEntries = + pVisual->ColormapEntries; + PanoramiXVisuals[PanoramiXNumVisuals].nplanes = + pVisual->nplanes; + PanoramiXVisuals[PanoramiXNumVisuals].redMask = + pVisual->redMask; + PanoramiXVisuals[PanoramiXNumVisuals].greenMask = + pVisual->greenMask; + PanoramiXVisuals[PanoramiXNumVisuals].blueMask = + pVisual->blueMask; + PanoramiXVisuals[PanoramiXNumVisuals].offsetRed = + pVisual->offsetRed; + PanoramiXVisuals[PanoramiXNumVisuals].offsetGreen = + pVisual->offsetGreen; + PanoramiXVisuals[PanoramiXNumVisuals].offsetBlue = + pVisual->offsetBlue; + PanoramiXNumVisuals++; for (j = 0; j < PanoramiXNumDepths; j++) { - if (PanoramiXDepths[j].depth == pVisual->nplanes) { - PanoramiXDepths[j].vids[PanoramiXDepths[j].numVids] = pVisual->vid; + if (PanoramiXDepths[j].depth == pVisual->nplanes) { + PanoramiXDepths[j].vids[PanoramiXDepths[j].numVids] = + pVisual->vid; PanoramiXDepths[j].numVids++; break; - } - } + } + } } - } + } root = (PanoramiXRes *) xalloc(sizeof(PanoramiXRes)); @@ -939,10 +1020,10 @@ for (i = 0; i < PanoramiXNumScreens; i++) { root->info[i].id = WindowTable[i]->drawable.id; root->u.win.class = InputOutput; - root->u.win.root = TRUE; - saver->info[i].id = savedScreenInfo[i].wid; - saver->u.win.class = InputOutput; - saver->u.win.root = TRUE; + root->u.win.root = TRUE; + saver->info[i].id = savedScreenInfo[i].wid; + saver->u.win.class = InputOutput; + saver->u.win.root = TRUE; defmap->info[i].id = (screenInfo.screens[i])->defColormap; } @@ -957,41 +1038,42 @@ * Exit, deallocating as needed. */ -static void PanoramiXResetProc(ExtensionEntry* extEntry) +static void +PanoramiXResetProc(ExtensionEntry* extEntry) { int i; #ifdef RENDER - PanoramiXRenderReset (); + PanoramiXRenderReset(); #endif screenInfo.numScreens = PanoramiXNumScreens; for (i = 256; i--; ) ProcVector[i] = SavedProcVector[i]; - Xfree(panoramiXdataPtr); + Xfree(panoramiXdataPtr); } int -ProcPanoramiXQueryVersion (ClientPtr client) +ProcPanoramiXQueryVersion(ClientPtr client) { /* REQUEST(xPanoramiXQueryVersionReq); */ xPanoramiXQueryVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq); rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; rep.majorVersion = PANORAMIX_MAJOR_VERSION; - rep.minorVersion = PANORAMIX_MINOR_VERSION; - if (client->swapped) { - swaps(&rep.sequenceNumber, n); - swapl(&rep.length, n); - swaps(&rep.majorVersion, n); - swaps(&rep.minorVersion, n); + rep.minorVersion = PANORAMIX_MINOR_VERSION; + if (client->swapped) { + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); + swaps(&rep.majorVersion, n); + swaps(&rep.minorVersion, n); } - WriteToClient(client, sizeof (xPanoramiXQueryVersionReply), (char *)&rep); + WriteToClient(client, sizeof(xPanoramiXQueryVersionReply), (char *)&rep); return (client->noClientException); } @@ -999,10 +1081,10 @@ ProcPanoramiXGetState(ClientPtr client) { REQUEST(xPanoramiXGetStateReq); - WindowPtr pWin; + WindowPtr pWin; xPanoramiXGetStateReply rep; - register int n; - + int n; + REQUEST_SIZE_MATCH(xPanoramiXGetStateReq); pWin = LookupWindow (stuff->window, client); if (!pWin) @@ -1011,23 +1093,23 @@ rep.length = 0; rep.sequenceNumber = client->sequence; rep.state = !noPanoramiXExtension; - if (client->swapped) { + if (client->swapped) { swaps (&rep.sequenceNumber, n); swapl (&rep.length, n); swaps (&rep.state, n); - } - WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep); + } + WriteToClient (client, sizeof(xPanoramiXGetStateReply), (char *) &rep); return client->noClientException; } -int +int ProcPanoramiXGetScreenCount(ClientPtr client) { REQUEST(xPanoramiXGetScreenCountReq); - WindowPtr pWin; + WindowPtr pWin; xPanoramiXGetScreenCountReply rep; - register int n; + int n; REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq); pWin = LookupWindow (stuff->window, client); @@ -1037,23 +1119,23 @@ rep.length = 0; rep.sequenceNumber = client->sequence; rep.ScreenCount = PanoramiXNumScreens; - if (client->swapped) { + if (client->swapped) { swaps (&rep.sequenceNumber, n); swapl (&rep.length, n); swaps (&rep.ScreenCount, n); - } - WriteToClient (client, sizeof (xPanoramiXGetScreenCountReply), (char *) &rep); + } + WriteToClient (client, sizeof(xPanoramiXGetScreenCountReply), (char *) &rep); return client->noClientException; } -int +int ProcPanoramiXGetScreenSize(ClientPtr client) { REQUEST(xPanoramiXGetScreenSizeReq); - WindowPtr pWin; + WindowPtr pWin; xPanoramiXGetScreenSizeReply rep; - register int n; - + int n; + REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq); pWin = LookupWindow (stuff->window, client); if (!pWin) @@ -1062,15 +1144,15 @@ rep.length = 0; rep.sequenceNumber = client->sequence; /* screen dimensions */ - rep.width = panoramiXdataPtr[stuff->screen].width; - rep.height = panoramiXdataPtr[stuff->screen].height; - if (client->swapped) { + rep.width = panoramiXdataPtr[stuff->screen].width; + rep.height = panoramiXdataPtr[stuff->screen].height; + if (client->swapped) { swaps (&rep.sequenceNumber, n); swapl (&rep.length, n); swaps (&rep.width, n); swaps (&rep.height, n); - } - WriteToClient (client, sizeof (xPanoramiXGetScreenSizeReply), (char *) &rep); + } + WriteToClient (client, sizeof(xPanoramiXGetScreenSizeReply), (char *) &rep); return client->noClientException; } @@ -1088,12 +1170,12 @@ rep.sequenceNumber = client->sequence; rep.state = !noPanoramiXExtension; if (client->swapped) { - register int n; + int n; swaps (&rep.sequenceNumber, n); swapl (&rep.length, n); swapl (&rep.state, n); - } - WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep); + } + WriteToClient (client, sizeof(xXineramaIsActiveReply), (char *) &rep); return client->noClientException; } @@ -1111,25 +1193,25 @@ rep.number = (noPanoramiXExtension) ? 0 : PanoramiXNumScreens; rep.length = rep.number * sz_XineramaScreenInfo >> 2; if (client->swapped) { - register int n; + int n; swaps (&rep.sequenceNumber, n); swapl (&rep.length, n); swapl (&rep.number, n); - } - WriteToClient (client, sizeof (xXineramaQueryScreensReply), (char *) &rep); + } + WriteToClient (client, sizeof(xXineramaQueryScreensReply), (char *) &rep); - if(!noPanoramiXExtension) { + if (!noPanoramiXExtension) { xXineramaScreenInfo scratch; int i; - for(i = 0; i < PanoramiXNumScreens; i++) { + for (i = 0; i < PanoramiXNumScreens; i++) { scratch.x_org = panoramiXdataPtr[i].x; scratch.y_org = panoramiXdataPtr[i].y; scratch.width = panoramiXdataPtr[i].width; scratch.height = panoramiXdataPtr[i].height; - - if(client->swapped) { - register int n; + + if (client->swapped) { + int n; swaps (&scratch.x_org, n); swaps (&scratch.y_org, n); swaps (&scratch.width, n); @@ -1179,11 +1261,11 @@ /* Just get it to work. Worry about speed later */ int shiftR = 8 - shiftL; - while(bytes--) { + while (bytes--) { *dst |= SHIFT_L(*src, shiftL); *(dst + 1) |= SHIFT_R(*src, shiftR); dst++; src++; - } + } } @@ -1196,7 +1278,7 @@ DrawablePtr *pDrawables, int left, int top, - int width, + int width, int height, unsigned int format, unsigned long planemask, @@ -1216,68 +1298,68 @@ /* find box in logical screen space */ SrcBox.x1 = left; SrcBox.y1 = top; - if(!isRoot) { + if (!isRoot) { SrcBox.x1 += pDraw->x + panoramiXdataPtr[0].x; SrcBox.y1 += pDraw->y + panoramiXdataPtr[0].y; } SrcBox.x2 = SrcBox.x1 + width; SrcBox.y2 = SrcBox.y1 + height; - + REGION_INIT(pScreen, &SrcRegion, &SrcBox, 1); REGION_NULL(pScreen, &GrabRegion); depth = (format == XYPixmap) ? 1 : pDraw->depth; - for(i = 0; i < PanoramiXNumScreens; i++) { + for (i = 0; i < PanoramiXNumScreens; i++) { pDraw = pDrawables[i]; inOut = RECT_IN_REGION(pScreen,&XineramaScreenRegions[i],&SrcBox); - if(inOut == rgnIN) { - (*pDraw->pScreen->GetImage)(pDraw, + if (inOut == rgnIN) { + (*pDraw->pScreen->GetImage)(pDraw, SrcBox.x1 - pDraw->x - panoramiXdataPtr[i].x, - SrcBox.y1 - pDraw->y - panoramiXdataPtr[i].y, + SrcBox.y1 - pDraw->y - panoramiXdataPtr[i].y, width, height, format, planemask, data); break; } else if (inOut == rgnOUT) continue; - REGION_INTERSECT(pScreen, &GrabRegion, &SrcRegion, + REGION_INTERSECT(pScreen, &GrabRegion, &SrcRegion, &XineramaScreenRegions[i]); nbox = REGION_NUM_RECTS(&GrabRegion); - if(nbox) { + if (nbox) { pbox = REGION_RECTS(&GrabRegion); - while(nbox--) { + while (nbox--) { w = pbox->x2 - pbox->x1; h = pbox->y2 - pbox->y1; ScratchPitch = PixmapBytePad(w, depth); sizeNeeded = ScratchPitch * h; - if(sizeNeeded > size) { + if (sizeNeeded > size) { char *tmpdata = ScratchMem; ScratchMem = xrealloc(ScratchMem, sizeNeeded); - if(ScratchMem) + if (ScratchMem) size = sizeNeeded; else { ScratchMem = tmpdata; break; - } + } } x = pbox->x1 - pDraw->x - panoramiXdataPtr[i].x; y = pbox->y1 - pDraw->y - panoramiXdataPtr[i].y; - (*pDraw->pScreen->GetImage)(pDraw, x, y, w, h, + (*pDraw->pScreen->GetImage)(pDraw, x, y, w, h, format, planemask, ScratchMem); - + /* copy the memory over */ - if(depth == 1) { + if (depth == 1) { int k, shift, leftover, index, index2; - + x = pbox->x1 - SrcBox.x1; y = pbox->y1 - SrcBox.y1; shift = x & 7; @@ -1286,28 +1368,28 @@ w >>= 3; /* clean up the edge */ - if(leftover) { + if (leftover) { int mask = (1 << leftover) - 1; - for(j = h, k = w; j--; k += ScratchPitch) + for (j = h, k = w; j--; k += ScratchPitch) ScratchMem[k] &= mask; } - for(j = 0, index = (pitch * y) + x, index2 = 0; j < h; - j++, index += pitch, index2 += ScratchPitch) + for (j = 0, index = (pitch * y) + x, index2 = 0; j < h; + j++, index += pitch, index2 += ScratchPitch) { - if(w) { - if(!shift) + if (w) { + if (!shift) memcpy(data + index, ScratchMem + index2, w); else - CopyBits(data + index, shift, + CopyBits(data + index, shift, ScratchMem + index2, w); } - - if(leftover) { - data[index + w] |= + + if (leftover) { + data[index + w] |= SHIFT_L(ScratchMem[index2 + w], shift); - if((shift + leftover) > 8) - data[index + w + 1] |= + if ((shift + leftover) > 8) + data[index + w + 1] |= SHIFT_R(ScratchMem[index2 + w],(8 - shift)); } } @@ -1317,8 +1399,8 @@ y = pbox->y1 - SrcBox.y1; w *= j; - for(j = 0; j < h; j++) { - memcpy(data + (pitch * (y + j)) + x, + for (j = 0; j < h; j++) { + memcpy(data + (pitch * (y + j)) + x, ScratchMem + (ScratchPitch * j), w); } } @@ -1326,23 +1408,17 @@ } REGION_SUBTRACT(pScreen, &SrcRegion, &SrcRegion, &GrabRegion); - if(!REGION_NOTEMPTY(pScreen, &SrcRegion)) + if (!REGION_NOTEMPTY(pScreen, &SrcRegion)) break; } - + } - if(ScratchMem) + if (ScratchMem) xfree(ScratchMem); REGION_UNINIT(pScreen, &SrcRegion); REGION_UNINIT(pScreen, &GrabRegion); } -#else -PanoramiXRes * -PanoramiXFindIDByScrnum(RESTYPE type, XID id, int screen) -{ - return NULL; -} -#endif +#endif /* PANORAMIX */ Index: xc/programs/Xserver/Xext/panoramiX.h diff -u xc/programs/Xserver/Xext/panoramiX.h:1.6 xc/programs/Xserver/Xext/panoramiX.h:1.8 --- xc/programs/Xserver/Xext/panoramiX.h:1.6 Sat Mar 22 23:56:02 2003 +++ xc/programs/Xserver/Xext/panoramiX.h Mon Jan 9 09:59:41 2006 @@ -1,4 +1,3 @@ -/* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * @@ -19,7 +18,7 @@ * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.6 2003/03/23 04:56:02 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.8 2006/01/09 14:59:41 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ @@ -30,7 +29,7 @@ #ifndef _PANORAMIX_H_ #define _PANORAMIX_H_ -#include "panoramiXext.h" +#include #include "gcstruct.h" Index: xc/programs/Xserver/Xext/panoramiXSwap.c diff -u xc/programs/Xserver/Xext/panoramiXSwap.c:3.10 xc/programs/Xserver/Xext/panoramiXSwap.c:3.13 --- xc/programs/Xserver/Xext/panoramiXSwap.c:3.10 Sat Sep 13 17:33:03 2003 +++ xc/programs/Xserver/Xext/panoramiXSwap.c Sun Feb 19 10:51:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXSwap.c,v 1.4 2000/08/17 19:47:57 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -23,11 +22,11 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.10 2003/09/13 21:33:03 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.13 2006/02/19 15:51:16 tsi Exp $ */ #include -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "cursor.h" #include "cursorstr.h" @@ -44,16 +43,18 @@ #include #endif #include "panoramiX.h" -#include "panoramiXproto.h" +#include #include "panoramiXsrv.h" #include "globals.h" #include "panoramiXh.h" +#ifdef PANORAMIX + static int -SProcPanoramiXQueryVersion (ClientPtr client) +SProcPanoramiXQueryVersion(ClientPtr client) { REQUEST(xPanoramiXQueryVersionReq); - register int n; + int n; swaps(&stuff->length,n); REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq); @@ -64,7 +65,7 @@ SProcPanoramiXGetState(ClientPtr client) { REQUEST(xPanoramiXGetStateReq); - register int n; + int n; swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xPanoramiXGetStateReq); @@ -75,7 +76,7 @@ SProcPanoramiXGetScreenCount(ClientPtr client) { REQUEST(xPanoramiXGetScreenCountReq); - register int n; + int n; swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq); @@ -86,7 +87,7 @@ SProcPanoramiXGetScreenSize(ClientPtr client) { REQUEST(xPanoramiXGetScreenSizeReq); - register int n; + int n; swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq); @@ -98,7 +99,7 @@ SProcXineramaIsActive(ClientPtr client) { REQUEST(xXineramaIsActiveReq); - register int n; + int n; swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xXineramaIsActiveReq); @@ -110,7 +111,7 @@ SProcXineramaQueryScreens(ClientPtr client) { REQUEST(xXineramaQueryScreensReq); - register int n; + int n; swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xXineramaQueryScreensReq); @@ -138,3 +139,5 @@ } return BadRequest; } + +#endif /* PANORAMIX */ Index: xc/programs/Xserver/Xext/panoramiXh.h diff -u xc/programs/Xserver/Xext/panoramiXh.h:1.4 xc/programs/Xserver/Xext/panoramiXh.h:1.5 --- xc/programs/Xserver/Xext/panoramiXh.h:1.4 Fri Jun 25 11:44:42 2004 +++ xc/programs/Xserver/Xext/panoramiXh.h Sun Jan 29 11:27:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.4 2004/06/25 15:44:42 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXh.h,v 1.5 2006/01/29 16:27:35 tsi Exp $ */ /* * Server dispatcher function replacements @@ -72,7 +72,6 @@ PROC_EXTERN(ProcXineramaQueryScreens); PROC_EXTERN(ProcXineramaIsActive); -extern Bool XineramaCreateGC(GCPtr pGC); extern int SProcPanoramiXDispatch(ClientPtr client); Index: xc/programs/Xserver/Xext/panoramiXprocs.c diff -u xc/programs/Xserver/Xext/panoramiXprocs.c:3.37 xc/programs/Xserver/Xext/panoramiXprocs.c:3.40 --- xc/programs/Xserver/Xext/panoramiXprocs.c:3.37 Mon Nov 10 13:21:43 2003 +++ xc/programs/Xserver/Xext/panoramiXprocs.c Sun Feb 19 10:51:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: panoramiXprocs.c,v 1.5 2000/08/17 19:47:57 cpqbld Exp $ */ /***************************************************************** Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -26,13 +25,13 @@ /* Massively rewritten by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.37 2003/11/10 18:21:43 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/panoramiXprocs.c,v 3.40 2006/02/19 15:51:16 tsi Exp $ */ #include -#include "X.h" +#include #define NEED_REPLIES #define NEED_EVENTS -#include "Xproto.h" +#include #include "windowstr.h" #include "dixfontstr.h" #include "gcstruct.h" @@ -48,6 +47,8 @@ #include "resource.h" #include "panoramiXh.h" +#ifdef PANORAMIX + #define XINERAMA_IMAGE_BUFSIZE (256*1024) #define INPUTONLY_LEGAL_MASK (CWWinGravity | CWEventMask | \ CWDontPropagate | CWOverrideRedirect | CWCursor ) @@ -69,7 +70,8 @@ */ extern XID clientErrorValue; /* XXX this is a kludge */ -int PanoramiXCreateWindow(ClientPtr client) +int +PanoramiXCreateWindow(ClientPtr client) { PanoramiXRes *parent, *newWin; PanoramiXRes *backPix = NULL; @@ -172,7 +174,8 @@ } -int PanoramiXChangeWindowAttributes(ClientPtr client) +int +PanoramiXChangeWindowAttributes(ClientPtr client) { PanoramiXRes *win; PanoramiXRes *backPix = NULL; @@ -240,7 +243,8 @@ } -int PanoramiXDestroyWindow(ClientPtr client) +int +PanoramiXDestroyWindow(ClientPtr client) { PanoramiXRes *win; int result = 0, j; @@ -265,7 +269,8 @@ } -int PanoramiXDestroySubwindows(ClientPtr client) +int +PanoramiXDestroySubwindows(ClientPtr client) { PanoramiXRes *win; int result = 0, j; @@ -290,7 +295,8 @@ } -int PanoramiXChangeSaveSet(ClientPtr client) +int +PanoramiXChangeSaveSet(ClientPtr client) { PanoramiXRes *win; int result = 0, j; @@ -312,7 +318,8 @@ } -int PanoramiXReparentWindow(ClientPtr client) +int +PanoramiXReparentWindow(ClientPtr client) { PanoramiXRes *win, *parent; int result = 0, j; @@ -349,7 +356,8 @@ } -int PanoramiXMapWindow(ClientPtr client) +int +PanoramiXMapWindow(ClientPtr client) { PanoramiXRes *win; int result = 0, j; @@ -371,7 +379,8 @@ } -int PanoramiXMapSubwindows(ClientPtr client) +int +PanoramiXMapSubwindows(ClientPtr client) { PanoramiXRes *win; int result = 0, j; @@ -393,7 +402,8 @@ } -int PanoramiXUnmapWindow(ClientPtr client) +int +PanoramiXUnmapWindow(ClientPtr client) { PanoramiXRes *win; int result = 0, j; @@ -415,7 +425,8 @@ } -int PanoramiXUnmapSubwindows(ClientPtr client) +int +PanoramiXUnmapSubwindows(ClientPtr client) { PanoramiXRes *win; int result = 0, j; @@ -437,7 +448,8 @@ } -int PanoramiXConfigureWindow(ClientPtr client) +int +PanoramiXConfigureWindow(ClientPtr client) { PanoramiXRes *win; PanoramiXRes *sib = NULL; @@ -503,7 +515,8 @@ } -int PanoramiXCirculateWindow(ClientPtr client) +int +PanoramiXCirculateWindow(ClientPtr client) { PanoramiXRes *win; int result = 0, j; @@ -525,7 +538,8 @@ } -int PanoramiXGetGeometry(ClientPtr client) +int +PanoramiXGetGeometry(ClientPtr client) { xGetGeometryReply rep; DrawablePtr pDraw; @@ -567,12 +581,13 @@ return (client->noClientException); } -int PanoramiXTranslateCoords(ClientPtr client) +int +PanoramiXTranslateCoords(ClientPtr client) { INT16 x, y; REQUEST(xTranslateCoordsReq); - register WindowPtr pWin, pDst; + WindowPtr pWin, pDst; xTranslateCoordsReply rep; REQUEST_SIZE_MATCH(xTranslateCoordsReq); @@ -643,7 +658,8 @@ return(client->noClientException); } -int PanoramiXCreatePixmap(ClientPtr client) +int +PanoramiXCreatePixmap(ClientPtr client) { PanoramiXRes *refDraw, *newPix; int result = 0, j; @@ -681,7 +697,8 @@ } -int PanoramiXFreePixmap(ClientPtr client) +int +PanoramiXFreePixmap(ClientPtr client) { PanoramiXRes *pix; int result = 0, j; @@ -708,7 +725,8 @@ } -int PanoramiXCreateGC(ClientPtr client) +int +PanoramiXCreateGC(ClientPtr client) { PanoramiXRes *refDraw; PanoramiXRes *newGC; @@ -785,7 +803,8 @@ return (result); } -int PanoramiXChangeGC(ClientPtr client) +int +PanoramiXChangeGC(ClientPtr client) { PanoramiXRes *gc; PanoramiXRes *stip = NULL; @@ -848,7 +867,8 @@ } -int PanoramiXCopyGC(ClientPtr client) +int +PanoramiXCopyGC(ClientPtr client) { PanoramiXRes *srcGC, *dstGC; int result = 0, j; @@ -875,7 +895,8 @@ } -int PanoramiXSetDashes(ClientPtr client) +int +PanoramiXSetDashes(ClientPtr client) { PanoramiXRes *gc; int result = 0, j; @@ -897,7 +918,8 @@ } -int PanoramiXSetClipRectangles(ClientPtr client) +int +PanoramiXSetClipRectangles(ClientPtr client) { PanoramiXRes *gc; int result = 0, j; @@ -919,7 +941,8 @@ } -int PanoramiXFreeGC(ClientPtr client) +int +PanoramiXFreeGC(ClientPtr client) { PanoramiXRes *gc; int result = 0, j; @@ -944,7 +967,8 @@ } -int PanoramiXClearToBackground(ClientPtr client) +int +PanoramiXClearToBackground(ClientPtr client) { PanoramiXRes *win; int result = 0, j, x, y; @@ -984,7 +1008,8 @@ have to fix this later. (MArk). */ -int PanoramiXCopyArea(ClientPtr client) +int +PanoramiXCopyArea(ClientPtr client) { int j, result = 0, srcx, srcy, dstx, dsty; PanoramiXRes *gc, *src, *dst; @@ -1129,7 +1154,8 @@ } -int PanoramiXCopyPlane(ClientPtr client) +int +PanoramiXCopyPlane(ClientPtr client) { int j, srcx, srcy, dstx, dsty; PanoramiXRes *gc, *src, *dst; @@ -1233,7 +1259,8 @@ } -int PanoramiXPolyPoint(ClientPtr client) +int +PanoramiXPolyPoint(ClientPtr client) { PanoramiXRes *gc, *draw; int result = 0, npoint, j; @@ -1291,7 +1318,8 @@ } -int PanoramiXPolyLine(ClientPtr client) +int +PanoramiXPolyLine(ClientPtr client) { PanoramiXRes *gc, *draw; int result = 0, npoint, j; @@ -1349,7 +1377,8 @@ } -int PanoramiXPolySegment(ClientPtr client) +int +PanoramiXPolySegment(ClientPtr client) { int result = 0, nsegs, i, j; PanoramiXRes *gc, *draw; @@ -1410,7 +1439,8 @@ } -int PanoramiXPolyRectangle(ClientPtr client) +int +PanoramiXPolyRectangle(ClientPtr client) { int result = 0, nrects, i, j; PanoramiXRes *gc, *draw; @@ -1471,7 +1501,8 @@ } -int PanoramiXPolyArc(ClientPtr client) +int +PanoramiXPolyArc(ClientPtr client) { int result = 0, narcs, i, j; PanoramiXRes *gc, *draw; @@ -1529,7 +1560,8 @@ } -int PanoramiXFillPoly(ClientPtr client) +int +PanoramiXFillPoly(ClientPtr client) { int result = 0, count, j; PanoramiXRes *gc, *draw; @@ -1588,7 +1620,8 @@ } -int PanoramiXPolyFillRectangle(ClientPtr client) +int +PanoramiXPolyFillRectangle(ClientPtr client) { int result = 0, things, i, j; PanoramiXRes *gc, *draw; @@ -1647,7 +1680,8 @@ } -int PanoramiXPolyFillArc(ClientPtr client) +int +PanoramiXPolyFillArc(ClientPtr client) { PanoramiXRes *gc, *draw; Bool isRoot; @@ -1706,7 +1740,8 @@ } -int PanoramiXPutImage(ClientPtr client) +int +PanoramiXPutImage(ClientPtr client) { PanoramiXRes *gc, *draw; Bool isRoot; @@ -1744,7 +1779,8 @@ } -int PanoramiXGetImage(ClientPtr client) +int +PanoramiXGetImage(ClientPtr client) { DrawablePtr drawables[MAXSCREENS]; DrawablePtr pDraw; @@ -2366,3 +2402,5 @@ } return (result); } + +#endif /* PANORAMIX */ Index: xc/programs/Xserver/Xext/sampleEVI.c diff -u xc/programs/Xserver/Xext/sampleEVI.c:3.5 xc/programs/Xserver/Xext/sampleEVI.c:3.7 --- xc/programs/Xserver/Xext/sampleEVI.c:3.5 Tue Jul 15 21:38:29 2003 +++ xc/programs/Xserver/Xext/sampleEVI.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,3 @@ -/* $Xorg: sampleEVI.c,v 1.3 2000/08/17 19:47:58 cpqbld Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this @@ -21,18 +20,19 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/sampleEVI.c,v 3.5 2003/07/16 01:38:29 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/sampleEVI.c,v 3.7 2005/10/14 15:16:11 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "dixstruct.h" #include "extnsionst.h" #include "dix.h" #define _XEVI_SERVER_ -#include "XEVIstr.h" +#include #include "EVIstruct.h" #include "scrnintstr.h" -static int sampleGetVisualInfo( +static int +sampleGetVisualInfo( VisualID32 *visual, int n_visual, xExtendedVisualInfo **evi_rn, @@ -44,7 +44,7 @@ VisualID32 *temp_conflict; xExtendedVisualInfo *evi; int max_visuals = 0, max_sz_conflict, sz_conflict = 0; - register int visualI, scrI, sz_evi = 0, conflictI, n_conflict; + int visualI, scrI, sz_evi = 0, conflictI, n_conflict; *evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi); if (!*evi_rn) return BadAlloc; @@ -79,9 +79,8 @@ return Success; } -static void sampleFreeVisualInfo( - xExtendedVisualInfo *evi, - VisualID32 *conflict) +static void +sampleFreeVisualInfo(xExtendedVisualInfo *evi, VisualID32 *conflict) { if (evi) xfree(evi); @@ -89,7 +88,8 @@ xfree(conflict); } -EviPrivPtr eviDDXInit(void) +EviPrivPtr +eviDDXInit(void) { static EviPrivRec eviPriv; eviPriv.getVisualInfo = sampleGetVisualInfo; @@ -97,6 +97,7 @@ return &eviPriv; } -void eviDDXReset(void) +void +eviDDXReset(void) { } Index: xc/programs/Xserver/Xext/saver.c diff -u xc/programs/Xserver/Xext/saver.c:3.11 xc/programs/Xserver/Xext/saver.c:3.13 --- xc/programs/Xserver/Xext/saver.c:3.11 Fri Oct 22 21:28:38 2004 +++ xc/programs/Xserver/Xext/saver.c Fri Oct 14 11:16:11 2005 @@ -25,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.11 2004/10/23 01:28:38 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.13 2005/10/14 15:16:11 tsi Exp $ */ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -75,8 +75,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "windowstr.h" @@ -86,7 +86,7 @@ #include "dixstruct.h" #include "resource.h" #include "opaque.h" -#include "saverproto.h" +#include #include "gcstruct.h" #include "cursorstr.h" #include "colormapst.h" @@ -104,6 +104,7 @@ #include "modinit.h" +#ifdef SCREENSAVER #if 0 static unsigned char ScreenSaverReqCode = 0; #endif @@ -295,14 +296,12 @@ /*ARGSUSED*/ static void -ScreenSaverResetProc (extEntry) -ExtensionEntry *extEntry; +ScreenSaverResetProc(ExtensionEntry *extEntry) { } static void -CheckScreenPrivate (pScreen) - ScreenPtr pScreen; +CheckScreenPrivate(ScreenPtr pScreen) { SetupScreen (pScreen); @@ -318,8 +317,7 @@ } static ScreenSaverScreenPrivatePtr -MakeScreenPrivate (pScreen) - ScreenPtr pScreen; +MakeScreenPrivate(ScreenPtr pScreen) { SetupScreen (pScreen); @@ -338,9 +336,7 @@ } static unsigned long -getEventMask (pScreen, client) - ScreenPtr pScreen; - ClientPtr client; +getEventMask(ScreenPtr pScreen, ClientPtr client) { SetupScreen(pScreen); ScreenSaverEventPtr pEv; @@ -354,10 +350,7 @@ } static Bool -setEventMask (pScreen, client, mask) - ScreenPtr pScreen; - ClientPtr client; - unsigned long mask; +setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) { SetupScreen(pScreen); ScreenSaverEventPtr pEv, *pPrev; @@ -404,8 +397,7 @@ } static void -FreeAttrs (pAttr) - ScreenSaverAttrPtr pAttr; +FreeAttrs(ScreenSaverAttrPtr pAttr) { PixmapPtr pPixmap; CursorPtr pCursor; @@ -419,8 +411,7 @@ } static void -FreeScreenAttr (pAttr) - ScreenSaverAttrPtr pAttr; +FreeScreenAttr(ScreenSaverAttrPtr pAttr) { FreeAttrs (pAttr); xfree (pAttr->values); @@ -428,9 +419,7 @@ } static int -ScreenSaverFreeEvents (value, id) - pointer value; - XID id; +ScreenSaverFreeEvents(pointer value, XID id) { ScreenSaverEventPtr pOld = (ScreenSaverEventPtr)value; ScreenPtr pScreen = pOld->screen; @@ -451,9 +440,7 @@ } static int -ScreenSaverFreeAttr (value, id) - pointer value; - XID id; +ScreenSaverFreeAttr(pointer value, XID id) { ScreenSaverAttrPtr pOldAttr = (ScreenSaverAttrPtr)value; ScreenPtr pScreen = pOldAttr->screen; @@ -475,10 +462,7 @@ } static void -SendScreenSaverNotify (pScreen, state, forced) - ScreenPtr pScreen; - int state; - Bool forced; +SendScreenSaverNotify(ScreenPtr pScreen, int state, Bool forced) { ScreenSaverScreenPrivatePtr pPriv; ScreenSaverEventPtr pEv; @@ -521,8 +505,8 @@ } static void -SScreenSaverNotifyEvent (from, to) - xScreenSaverNotifyEvent *from, *to; +SScreenSaverNotifyEvent(xScreenSaverNotifyEvent *from, + xScreenSaverNotifyEvent *to) { to->type = from->type; to->state = from->state; @@ -535,8 +519,7 @@ } static void -UninstallSaverColormap (pScreen) - ScreenPtr pScreen; +UninstallSaverColormap(ScreenPtr pScreen) { SetupScreen(pScreen); ColormapPtr pCmap; @@ -552,8 +535,7 @@ } static Bool -CreateSaverWindow (pScreen) - ScreenPtr pScreen; +CreateSaverWindow(ScreenPtr pScreen) { SetupScreen (pScreen); ScreenSaverStuffPtr pSaver; @@ -672,8 +654,7 @@ } static Bool -DestroySaverWindow (pScreen) - ScreenPtr pScreen; +DestroySaverWindow(ScreenPtr pScreen) { SetupScreen(pScreen); ScreenSaverStuffPtr pSaver; @@ -694,10 +675,7 @@ } static Bool -ScreenSaverHandle (pScreen, xstate, force) - ScreenPtr pScreen; - int xstate; - Bool force; +ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force) { int state = 0; Bool ret = FALSE; @@ -728,11 +706,10 @@ } static int -ProcScreenSaverQueryVersion (client) - register ClientPtr client; +ProcScreenSaverQueryVersion(ClientPtr client) { xScreenSaverQueryVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH (xScreenSaverQueryVersionReq); rep.type = X_Reply; @@ -749,12 +726,11 @@ } int -ProcScreenSaverQueryInfo (client) - register ClientPtr client; +ProcScreenSaverQueryInfo(ClientPtr client) { REQUEST(xScreenSaverQueryInfoReq); xScreenSaverQueryInfoReply rep; - register int n; + int n; ScreenSaverStuffPtr pSaver; DrawablePtr pDraw; CARD32 lastInput; @@ -821,8 +797,7 @@ } static int -ProcScreenSaverSelectInput (client) - register ClientPtr client; +ProcScreenSaverSelectInput(ClientPtr client) { REQUEST(xScreenSaverSelectInputReq); DrawablePtr pDraw; @@ -837,7 +812,7 @@ } static int -ScreenSaverSetAttributes (ClientPtr client) +ScreenSaverSetAttributes(ClientPtr client) { REQUEST(xScreenSaverSetAttributesReq); DrawablePtr pDraw; @@ -1216,7 +1191,7 @@ } static int -ScreenSaverUnsetAttributes (ClientPtr client) +ScreenSaverUnsetAttributes(ClientPtr client) { REQUEST(xScreenSaverSetAttributesReq); DrawablePtr pDraw; @@ -1237,7 +1212,7 @@ } static int -ProcScreenSaverSetAttributes (ClientPtr client) +ProcScreenSaverSetAttributes(ClientPtr client) { #ifdef PANORAMIX if(!noPanoramiXExtension) { @@ -1316,7 +1291,7 @@ } static int -ProcScreenSaverUnsetAttributes (ClientPtr client) +ProcScreenSaverUnsetAttributes(ClientPtr client) { #ifdef PANORAMIX if(!noPanoramiXExtension) { @@ -1351,8 +1326,7 @@ #define NUM_REQUESTS ((sizeof NormalVector) / (sizeof NormalVector[0])) static int -ProcScreenSaverDispatch (client) - ClientPtr client; +ProcScreenSaverDispatch(ClientPtr client) { REQUEST(xReq); @@ -1362,8 +1336,7 @@ } static int -SProcScreenSaverQueryVersion (client) - ClientPtr client; +SProcScreenSaverQueryVersion(ClientPtr client) { REQUEST(xScreenSaverQueryVersionReq); int n; @@ -1374,8 +1347,7 @@ } static int -SProcScreenSaverQueryInfo (client) - ClientPtr client; +SProcScreenSaverQueryInfo(ClientPtr client) { REQUEST(xScreenSaverQueryInfoReq); int n; @@ -1387,8 +1359,7 @@ } static int -SProcScreenSaverSelectInput (client) - ClientPtr client; +SProcScreenSaverSelectInput(ClientPtr client) { REQUEST(xScreenSaverSelectInputReq); int n; @@ -1401,8 +1372,7 @@ } static int -SProcScreenSaverSetAttributes (client) - ClientPtr client; +SProcScreenSaverSetAttributes(ClientPtr client) { REQUEST(xScreenSaverSetAttributesReq); int n; @@ -1422,8 +1392,7 @@ } static int -SProcScreenSaverUnsetAttributes (client) - ClientPtr client; +SProcScreenSaverUnsetAttributes(ClientPtr client) { REQUEST(xScreenSaverUnsetAttributesReq); int n; @@ -1443,8 +1412,7 @@ }; static int -SProcScreenSaverDispatch (client) - ClientPtr client; +SProcScreenSaverDispatch(ClientPtr client) { REQUEST(xReq); @@ -1452,3 +1420,5 @@ return (*SwappedVector[stuff->data])(client); return BadRequest; } + +#endif Index: xc/programs/Xserver/Xext/security.c diff -u xc/programs/Xserver/Xext/security.c:1.18 xc/programs/Xserver/Xext/security.c:1.20 --- xc/programs/Xserver/Xext/security.c:1.18 Wed Jun 2 18:42:55 2004 +++ xc/programs/Xserver/Xext/security.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,3 @@ -/* $Xorg: security.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -70,7 +69,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.18 2004/06/02 22:42:55 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/security.c,v 1.20 2005/10/14 15:16:11 tsi Exp $ */ #include "dixstruct.h" #include "extnsionst.h" @@ -81,19 +80,19 @@ #include "colormapst.h" #include "propertyst.h" #define _SECURITY_SERVER -#include "securstr.h" +#include #include #include #ifdef LBX #define _XLBX_SERVER_ -#include "XLbx.h" +#include extern unsigned char LbxReqCode; #endif #ifdef XAPPGROUP -#include "Xagsrv.h" +#include #endif #include /* for file reading operations */ -#include "Xatom.h" /* for XA_STRING */ +#include /* for XA_STRING */ #ifndef DEFAULTPOLICYFILE # define DEFAULTPOLICYFILE NULL @@ -169,9 +168,7 @@ */ static int -SecurityDeleteAuthorization( - pointer value, - XID id) +SecurityDeleteAuthorization(pointer value, XID id) { SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)value; unsigned short name_len, data_len; @@ -228,9 +225,7 @@ /* resource delete function for RTEventClient */ static int -SecurityDeleteAuthorizationEventClient( - pointer value, - XID id) +SecurityDeleteAuthorizationEventClient(pointer value, XID id) { OtherClientsPtr pEventClient, prev = NULL; SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)value; @@ -270,9 +265,8 @@ */ static CARD32 -SecurityComputeAuthorizationTimeout( - SecurityAuthorizationPtr pAuth, - unsigned int seconds) +SecurityComputeAuthorizationTimeout(SecurityAuthorizationPtr pAuth, + unsigned int seconds) { /* maxSecs is the number of full seconds that can be expressed in * 32 bits worth of milliseconds @@ -311,10 +305,7 @@ */ static CARD32 -SecurityAuthorizationExpired( - OsTimerPtr timer, - CARD32 time, - pointer pval) +SecurityAuthorizationExpired(OsTimerPtr timer, CARD32 time, pointer pval) { SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)pval; @@ -346,8 +337,7 @@ */ static void -SecurityStartAuthorizationTimer( - SecurityAuthorizationPtr pAuth) +SecurityStartAuthorizationTimer(SecurityAuthorizationPtr pAuth) { pAuth->timer = TimerSet(pAuth->timer, 0, SecurityComputeAuthorizationTimeout(pAuth, pAuth->timeout), @@ -360,8 +350,7 @@ */ static int -ProcSecurityQueryVersion( - ClientPtr client) +ProcSecurityQueryVersion(ClientPtr client) { /* REQUEST(xSecurityQueryVersionReq); */ xSecurityQueryVersionReply rep; @@ -380,7 +369,7 @@ rep.minorVersion = SECURITY_MINOR_VERSION; if(client->swapped) { - register char n; + char n; swaps(&rep.sequenceNumber, n); swaps(&rep.majorVersion, n); swaps(&rep.minorVersion, n); @@ -392,10 +381,8 @@ static int -SecurityEventSelectForAuthorization( - SecurityAuthorizationPtr pAuth, - ClientPtr client, - Mask mask) +SecurityEventSelectForAuthorization(SecurityAuthorizationPtr pAuth, + ClientPtr client, Mask mask) { OtherClients *pEventClient; @@ -432,8 +419,7 @@ static int -ProcSecurityGenerateAuthorization( - ClientPtr client) +ProcSecurityGenerateAuthorization(ClientPtr client) { REQUEST(xSecurityGenerateAuthorizationReq); int len; /* request length in CARD32s*/ @@ -598,7 +584,7 @@ if (client->swapped) { - register char n; + char n; swapl(&rep.length, n); swaps(&rep.sequenceNumber, n); swapl(&rep.authId, n); @@ -629,8 +615,7 @@ } /* ProcSecurityGenerateAuthorization */ static int -ProcSecurityRevokeAuthorization( - ClientPtr client) +ProcSecurityRevokeAuthorization(ClientPtr client) { REQUEST(xSecurityRevokeAuthorizationReq); SecurityAuthorizationPtr pAuth; @@ -654,8 +639,7 @@ static int -ProcSecurityDispatch( - ClientPtr client) +ProcSecurityDispatch(ClientPtr client) { REQUEST(xReq); @@ -673,11 +657,10 @@ } /* ProcSecurityDispatch */ static int -SProcSecurityQueryVersion( - ClientPtr client) +SProcSecurityQueryVersion(ClientPtr client) { REQUEST(xSecurityQueryVersionReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xSecurityQueryVersionReq); @@ -688,11 +671,10 @@ static int -SProcSecurityGenerateAuthorization( - ClientPtr client) +SProcSecurityGenerateAuthorization(ClientPtr client) { REQUEST(xSecurityGenerateAuthorizationReq); - register char n; + char n; CARD32 *values; unsigned long nvalues; @@ -711,11 +693,10 @@ static int -SProcSecurityRevokeAuthorization( - ClientPtr client) +SProcSecurityRevokeAuthorization(ClientPtr client) { REQUEST(xSecurityRevokeAuthorizationReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq); @@ -725,8 +706,7 @@ static int -SProcSecurityDispatch( - ClientPtr client) +SProcSecurityDispatch(ClientPtr client) { REQUEST(xReq); @@ -744,9 +724,8 @@ } /* SProcSecurityDispatch */ static void -SwapSecurityAuthorizationRevokedEvent( - xSecurityAuthorizationRevokedEvent *from, - xSecurityAuthorizationRevokedEvent *to) +SwapSecurityAuthorizationRevokedEvent(xSecurityAuthorizationRevokedEvent *from, + xSecurityAuthorizationRevokedEvent *to) { to->type = from->type; to->detail = from->detail; @@ -774,10 +753,8 @@ */ static void -SecurityDetermineEventPropogationLimits( - DeviceIntPtr dev, - WindowPtr *ppWin, - WindowPtr *ppStopWin) +SecurityDetermineEventPropogationLimits(DeviceIntPtr dev, WindowPtr *ppWin, + WindowPtr *ppStopWin) { WindowPtr pFocusWin = dev->focus ? dev->focus->win : NoneWin; @@ -824,10 +801,7 @@ */ Bool -SecurityCheckDeviceAccess(client, dev, fromRequest) - ClientPtr client; - DeviceIntPtr dev; - Bool fromRequest; +SecurityCheckDeviceAccess(ClientPtr client, DeviceIntPtr dev, Bool fromRequest) { WindowPtr pWin, pStopWin; Bool untrusted_got_event; @@ -944,9 +918,7 @@ */ static pointer -SecurityAuditResourceIDAccess( - ClientPtr client, - XID id) +SecurityAuditResourceIDAccess(ClientPtr client, XID id) { int cid = CLIENT_ID(id); int reqtype = ((xReq *)client->requestBuffer)->reqType; @@ -998,12 +970,8 @@ */ static pointer -SecurityCheckResourceIDAccess( - ClientPtr client, - XID id, - RESTYPE rtype, - Mask access_mode, - pointer rval) +SecurityCheckResourceIDAccess(ClientPtr client, XID id, RESTYPE rtype, + Mask access_mode, pointer rval) { int cid = CLIENT_ID(id); int reqtype = ((xReq *)client->requestBuffer)->reqType; @@ -1164,10 +1132,8 @@ */ static void -SecurityClientStateCallback( - CallbackListPtr *pcbl, - pointer nulldata, - pointer calldata) +SecurityClientStateCallback(CallbackListPtr *pcbl, pointer nulldata, + pointer calldata) { NewClientInfoRec *pci = (NewClientInfoRec *)calldata; ClientPtr client = pci->client; @@ -1223,9 +1189,7 @@ #ifdef LBX Bool -SecuritySameLevel(client, authId) - ClientPtr client; - XID authId; +SecuritySameLevel(ClientPtr client, XID authId) { SecurityAuthorizationPtr pAuth; @@ -1258,15 +1222,9 @@ * region of the window will be destroyed (overwritten) in pBuf. */ void -SecurityCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h, - format, pBuf) - ClientPtr client; - RegionPtr pVisibleRegion; - long widthBytesLine; - DrawablePtr pDraw; - int x, y, w, h; - unsigned int format; - char * pBuf; +SecurityCensorImage(ClientPtr client, RegionPtr pVisibleRegion, + long widthBytesLine, DrawablePtr pDraw, int x, int y, + int w, int h, unsigned int format, char *pBuf) { ScreenPtr pScreen = pDraw->pScreen; RegionRec imageRegion; /* region representing x,y,w,h */ @@ -1414,8 +1372,7 @@ #endif static char * -SecuritySkipWhitespace( - char *p) +SecuritySkipWhitespace(char *p) { while (SecurityIsWhitespace(*p)) p++; @@ -1424,8 +1381,7 @@ static char * -SecurityParseString( - char **rest) +SecurityParseString(char **rest) { char *startOfString; char *s = *rest; @@ -1461,8 +1417,7 @@ static int -SecurityParseKeyword( - char **p) +SecurityParseKeyword(char **p) { int i; char *s = *p; @@ -1482,8 +1437,7 @@ static Bool -SecurityParsePropertyAccessRule( - char *p) +SecurityParsePropertyAccessRule(char *p) { char *propname; char c; @@ -1623,8 +1577,7 @@ static int nSecurityPolicyStrings = 0; static Bool -SecurityParseSitePolicy( - char *p) +SecurityParseSitePolicy(char *p) { char *policyStr = SecurityParseString(&p); char *copyPolicyStr; @@ -1654,8 +1607,7 @@ char ** -SecurityGetSitePolicyStrings(n) - int *n; +SecurityGetSitePolicyStrings(int *n) { *n = nSecurityPolicyStrings; return SecurityPolicyStrings; @@ -1781,9 +1733,7 @@ static Bool -SecurityMatchString( - char *ws, - char *cs) +SecurityMatchString(char *ws, char *cs) { while (*ws && *cs) { @@ -1815,11 +1765,8 @@ char -SecurityCheckPropertyAccess(client, pWin, propertyName, access_mode) - ClientPtr client; - WindowPtr pWin; - ATOM propertyName; - Mask access_mode; +SecurityCheckPropertyAccess(ClientPtr client, WindowPtr pWin, + ATOM propertyName, Mask access_mode) { PropertyAccessPtr pacl; char action = SecurityDefaultAction; @@ -1957,8 +1904,7 @@ */ static void -SecurityResetProc( - ExtensionEntry *extEntry) +SecurityResetProc(ExtensionEntry *extEntry) { SecurityFreePropertyAccessList(); SecurityFreeSitePolicyStrings(); @@ -1966,10 +1912,7 @@ int -XSecurityOptions(argc, argv, i) - int argc; - char **argv; - int i; +XSecurityOptions(int argc, char **argv, int i) { if (strcmp(argv[i], "-sp") == 0) { Index: xc/programs/Xserver/Xext/shape.c diff -u xc/programs/Xserver/Xext/shape.c:3.19 xc/programs/Xserver/Xext/shape.c:3.21 --- xc/programs/Xserver/Xext/shape.c:3.19 Mon Nov 17 17:20:26 2003 +++ xc/programs/Xserver/Xext/shape.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.19 2003/11/17 22:20:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.21 2005/10/14 15:16:11 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,11 +25,10 @@ ********************************************************/ -/* $Xorg: shape.c,v 1.4 2001/02/09 02:04:32 xorgcvs Exp $ */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "windowstr.h" @@ -40,7 +39,7 @@ #include "resource.h" #include "opaque.h" #define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include "shapestr.h" +#include #include "regionstr.h" #include "gcstruct.h" #ifdef EXTMODULE @@ -170,20 +169,13 @@ /*ARGSUSED*/ static void -ShapeResetProc (extEntry) -ExtensionEntry *extEntry; +ShapeResetProc(ExtensionEntry *extEntry) { } static int -RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create) - ClientPtr client; - WindowPtr pWin; - int kind; - RegionPtr *destRgnp, srcRgn; - int op; - int xoff, yoff; - CreateDftPtr create; /* creates a reasonable *destRgnp */ +RegionOperate(ClientPtr client, WindowPtr pWin, int kind, RegionPtr *destRgnp, + RegionPtr srcRgn, int op, int xoff, int yoff, CreateDftPtr create) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -261,8 +253,7 @@ } static RegionPtr -CreateBoundingShape (pWin) - WindowPtr pWin; +CreateBoundingShape(WindowPtr pWin) { BoxRec extents; @@ -274,8 +265,7 @@ } static RegionPtr -CreateClipShape (pWin) - WindowPtr pWin; +CreateClipShape(WindowPtr pWin) { BoxRec extents; @@ -287,11 +277,10 @@ } static int -ProcShapeQueryVersion (client) - register ClientPtr client; +ProcShapeQueryVersion(ClientPtr client) { xShapeQueryVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH (xShapeQueryVersionReq); rep.type = X_Reply; @@ -315,8 +304,7 @@ *****************/ static int -ProcShapeRectangles (client) - register ClientPtr client; +ProcShapeRectangles(ClientPtr client) { WindowPtr pWin; ScreenPtr pScreen; @@ -377,8 +365,7 @@ #ifdef PANORAMIX static int -ProcPanoramiXShapeRectangles( - register ClientPtr client) +ProcPanoramiXShapeRectangles(ClientPtr client) { REQUEST(xShapeRectanglesReq); PanoramiXRes *win; @@ -406,8 +393,7 @@ static int -ProcShapeMask (client) - register ClientPtr client; +ProcShapeMask(ClientPtr client) { WindowPtr pWin; ScreenPtr pScreen; @@ -466,8 +452,7 @@ #ifdef PANORAMIX static int -ProcPanoramiXShapeMask( - register ClientPtr client) +ProcPanoramiXShapeMask(ClientPtr client) { REQUEST(xShapeMaskReq); PanoramiXRes *win, *pmap; @@ -503,8 +488,7 @@ ************/ static int -ProcShapeCombine (client) - register ClientPtr client; +ProcShapeCombine(ClientPtr client) { WindowPtr pSrcWin, pDestWin; ScreenPtr pScreen; @@ -581,8 +565,7 @@ #ifdef PANORAMIX static int -ProcPanoramiXShapeCombine( - register ClientPtr client) +ProcPanoramiXShapeCombine(ClientPtr client) { REQUEST(xShapeCombineReq); PanoramiXRes *win, *win2; @@ -613,8 +596,7 @@ *************/ static int -ProcShapeOffset (client) - register ClientPtr client; +ProcShapeOffset(ClientPtr client) { WindowPtr pWin; ScreenPtr pScreen; @@ -650,8 +632,7 @@ #ifdef PANORAMIX static int -ProcPanoramiXShapeOffset( - register ClientPtr client) +ProcPanoramiXShapeOffset(ClientPtr client) { REQUEST(xShapeOffsetReq); PanoramiXRes *win; @@ -674,14 +655,13 @@ static int -ProcShapeQueryExtents (client) - register ClientPtr client; +ProcShapeQueryExtents(ClientPtr client) { REQUEST(xShapeQueryExtentsReq); WindowPtr pWin; xShapeQueryExtentsReply rep; BoxRec extents, *pExtents; - register int n; + int n; RegionPtr region; REQUEST_SIZE_MATCH (xShapeQueryExtentsReq); @@ -739,9 +719,7 @@ /*ARGSUSED*/ static int -ShapeFreeClient (data, id) - pointer data; - XID id; +ShapeFreeClient(pointer data, XID id) { ShapeEventPtr pShapeEvent; WindowPtr pWin; @@ -768,9 +746,7 @@ /*ARGSUSED*/ static int -ShapeFreeEvents (data, id) - pointer data; - XID id; +ShapeFreeEvents(pointer data, XID id) { ShapeEventPtr *pHead, pCur, pNext; @@ -785,8 +761,7 @@ } static int -ProcShapeSelectInput (client) - register ClientPtr client; +ProcShapeSelectInput(ClientPtr client) { REQUEST(xShapeSelectInputReq); WindowPtr pWin; @@ -880,9 +855,7 @@ */ static void -SendShapeNotify (pWin, which) - WindowPtr pWin; - int which; +SendShapeNotify(WindowPtr pWin, int which) { ShapeEventPtr *pHead, pShapeEvent; ClientPtr client; @@ -938,15 +911,14 @@ } static int -ProcShapeInputSelected (client) - register ClientPtr client; +ProcShapeInputSelected(ClientPtr client) { REQUEST(xShapeInputSelectedReq); WindowPtr pWin; ShapeEventPtr pShapeEvent, *pHead; int enabled; xShapeInputSelectedReply rep; - register int n; + int n; REQUEST_SIZE_MATCH (xShapeInputSelectedReq); pWin = LookupWindow (stuff->window, client); @@ -979,8 +951,7 @@ } static int -ProcShapeGetRectangles (client) - register ClientPtr client; +ProcShapeGetRectangles(ClientPtr client) { REQUEST(xShapeGetRectanglesReq); WindowPtr pWin; @@ -988,7 +959,7 @@ xRectangle *rects; int nrects, i; RegionPtr region; - register int n; + int n; REQUEST_SIZE_MATCH(xShapeGetRectanglesReq); pWin = LookupWindow (stuff->window, client); @@ -1056,8 +1027,7 @@ } static int -ProcShapeDispatch (client) - register ClientPtr client; +ProcShapeDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) { @@ -1105,8 +1075,7 @@ } static void -SShapeNotifyEvent(from, to) - xShapeNotifyEvent *from, *to; +SShapeNotifyEvent(xShapeNotifyEvent *from, xShapeNotifyEvent *to) { to->type = from->type; to->kind = from->kind; @@ -1121,10 +1090,9 @@ } static int -SProcShapeQueryVersion (client) - register ClientPtr client; +SProcShapeQueryVersion(ClientPtr client) { - register int n; + int n; REQUEST (xShapeQueryVersionReq); swaps (&stuff->length, n); @@ -1132,10 +1100,9 @@ } static int -SProcShapeRectangles (client) - register ClientPtr client; +SProcShapeRectangles(ClientPtr client) { - register char n; + char n; REQUEST (xShapeRectanglesReq); swaps (&stuff->length, n); @@ -1148,10 +1115,9 @@ } static int -SProcShapeMask (client) - register ClientPtr client; +SProcShapeMask(ClientPtr client) { - register char n; + char n; REQUEST (xShapeMaskReq); swaps (&stuff->length, n); @@ -1164,10 +1130,9 @@ } static int -SProcShapeCombine (client) - register ClientPtr client; +SProcShapeCombine(ClientPtr client) { - register char n; + char n; REQUEST (xShapeCombineReq); swaps (&stuff->length, n); @@ -1180,10 +1145,9 @@ } static int -SProcShapeOffset (client) - register ClientPtr client; +SProcShapeOffset(ClientPtr client) { - register char n; + char n; REQUEST (xShapeOffsetReq); swaps (&stuff->length, n); @@ -1195,10 +1159,9 @@ } static int -SProcShapeQueryExtents (client) - register ClientPtr client; +SProcShapeQueryExtents(ClientPtr client) { - register char n; + char n; REQUEST (xShapeQueryExtentsReq); swaps (&stuff->length, n); @@ -1208,10 +1171,9 @@ } static int -SProcShapeSelectInput (client) - register ClientPtr client; +SProcShapeSelectInput(ClientPtr client) { - register char n; + char n; REQUEST (xShapeSelectInputReq); swaps (&stuff->length, n); @@ -1221,10 +1183,9 @@ } static int -SProcShapeInputSelected (client) - register ClientPtr client; +SProcShapeInputSelected(ClientPtr client) { - register int n; + int n; REQUEST (xShapeInputSelectedReq); swaps (&stuff->length, n); @@ -1234,11 +1195,10 @@ } static int -SProcShapeGetRectangles (client) - register ClientPtr client; +SProcShapeGetRectangles(ClientPtr client) { REQUEST(xShapeGetRectanglesReq); - register char n; + char n; swaps (&stuff->length, n); REQUEST_SIZE_MATCH(xShapeGetRectanglesReq); @@ -1247,8 +1207,7 @@ } static int -SProcShapeDispatch (client) - register ClientPtr client; +SProcShapeDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) { Index: xc/programs/Xserver/Xext/shm.c diff -u xc/programs/Xserver/Xext/shm.c:3.43 xc/programs/Xserver/Xext/shm.c:3.48 --- xc/programs/Xserver/Xext/shm.c:3.43 Sat Sep 25 14:06:20 2004 +++ xc/programs/Xserver/Xext/shm.c Sun Feb 19 19:14:35 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.43 2004/09/25 18:06:20 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/shm.c,v 3.48 2006/02/20 00:14:35 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -27,10 +27,9 @@ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ -/* $Xorg: shm.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ - #define SHM +#ifndef EXTMODULE #include #ifndef Lynx #include @@ -41,10 +40,11 @@ #endif #include #include +#endif #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -56,8 +56,8 @@ #include "extnsionst.h" #include "servermd.h" #define _XSHM_SERVER_ -#include "shmstr.h" -#include "Xfuncproto.h" +#include +#include #ifdef EXTMODULE #include "xf86_ansic.h" #endif @@ -69,6 +69,8 @@ #include "modinit.h" +#ifdef MITSHM + typedef struct _ShmDesc { struct _ShmDesc *next; int shmid; @@ -163,15 +165,15 @@ static Bool badSysCall = FALSE; static void -SigSysHandler(signo) -int signo; +SigSysHandler(int signo) { badSysCall = TRUE; } -static Bool CheckForShmSyscall() +static Bool +CheckForShmSyscall(void) { - void (*oldHandler)(); + void (*oldHandler)(int); int shmid = -1; /* If no SHM support in the kernel, the bad syscall will generate SIGSYS */ @@ -212,15 +214,19 @@ } #endif - sharedPixmaps = xFalse; - pixmapFormat = 0; - { - sharedPixmaps = xTrue; - pixmapFormat = shmPixFormat[0]; - for (i = 0; i < screenInfo.numScreens; i++) - { - if (!shmFuncs[i]) - shmFuncs[i] = &miFuncs; + sharedPixmaps = xTrue; + pixmapFormat = shmPixFormat[0]; + for (i = 0; i < screenInfo.numScreens; i++) + { + if (!shmFuncs[i]) { + /* + * A faster ShmPutImage implementation can be used if the screen + * stores pixmap data in the server's address space. We now + * assume this is so, by default, given that it is the more usual + * case. + */ + shmFuncs[i] = &fbFuncs; + } if (!shmFuncs[i]->CreatePixmap) sharedPixmaps = xFalse; if (shmPixFormat[i] && (shmPixFormat[i] != pixmapFormat)) @@ -228,11 +234,11 @@ sharedPixmaps = xFalse; pixmapFormat = 0; } - } - if (!pixmapFormat) + } + if (!pixmapFormat) pixmapFormat = ZPixmap; - if (sharedPixmaps) - { + if (sharedPixmaps) + { for (i = 0; i < screenInfo.numScreens; i++) { destroyPixmap[i] = screenInfo.screens[i]->DestroyPixmap; @@ -247,7 +253,6 @@ return; } #endif - } } ShmSegType = CreateNewResourceType(ShmDetachSegment); if (ShmSegType && @@ -264,8 +269,7 @@ /*ARGSUSED*/ static void -ShmResetProc (extEntry) -ExtensionEntry *extEntry; +ShmResetProc(ExtensionEntry *extEntry) { int i; @@ -277,23 +281,19 @@ } void -ShmRegisterFuncs( - ScreenPtr pScreen, - ShmFuncsPtr funcs) +ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs) { shmFuncs[pScreen->myNum] = funcs; } void -ShmSetPixmapFormat( - ScreenPtr pScreen, - int format) +ShmSetPixmapFormat(ScreenPtr pScreen, int format) { shmPixFormat[pScreen->myNum] = format; } static Bool -ShmDestroyPixmap (PixmapPtr pPixmap) +ShmDestroyPixmap(PixmapPtr pPixmap) { ScreenPtr pScreen = pPixmap->drawable.pScreen; Bool ret; @@ -328,18 +328,22 @@ } void -ShmRegisterFbFuncs(pScreen) - ScreenPtr pScreen; +ShmRegisterMiFuncs(ScreenPtr pScreen) +{ + shmFuncs[pScreen->myNum] = &miFuncs; +} + +void +ShmRegisterFbFuncs(ScreenPtr pScreen) { shmFuncs[pScreen->myNum] = &fbFuncs; } static int -ProcShmQueryVersion(client) - register ClientPtr client; +ProcShmQueryVersion(ClientPtr client) { xShmQueryVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH(xShmQueryVersionReq); rep.type = X_Reply; @@ -405,8 +409,7 @@ } static int -ProcShmAttach(client) - register ClientPtr client; +ProcShmAttach(ClientPtr client) { struct shmid_ds buf; ShmDescPtr shmdesc; @@ -467,9 +470,7 @@ /*ARGSUSED*/ static int -ShmDetachSegment(value, shmseg) - pointer value; /* must conform to DeleteType */ - XID shmseg; +ShmDetachSegment(pointer value, XID shmseg) { ShmDescPtr shmdesc = (ShmDescPtr)value; ShmDescPtr *prev; @@ -485,8 +486,7 @@ } static int -ProcShmDetach(client) - register ClientPtr client; +ProcShmDetach(ClientPtr client) { ShmDescPtr shmdesc; REQUEST(xShmDetachReq); @@ -498,12 +498,9 @@ } static void -miShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) - DrawablePtr dst; - GCPtr pGC; - int depth, w, h, sx, sy, sw, sh, dx, dy; - unsigned int format; - char *data; +miShmPutImage(DrawablePtr dst, GCPtr pGC, int depth, unsigned int format, + int w, int h, int sx, int sy, int sw, int sh, int dx, int dy, + char *data) { PixmapPtr pmap; GCPtr putGC; @@ -531,12 +528,9 @@ } static void -fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data) - DrawablePtr dst; - GCPtr pGC; - int depth, w, h, sx, sy, sw, sh, dx, dy; - unsigned int format; - char *data; +fbShmPutImage(DrawablePtr dst, GCPtr pGC, int depth, unsigned int format, + int w, int h, int sx, int sy, int sw, int sh, int dx, int dy, + char *data) { if ((format == ZPixmap) || (depth == 1)) { @@ -562,7 +556,7 @@ #ifdef PANORAMIX static int -ProcPanoramiXShmPutImage(register ClientPtr client) +ProcPanoramiXShmPutImage(ClientPtr client) { int j, result = 0, orig_x, orig_y; PanoramiXRes *draw, *gc; @@ -702,7 +696,7 @@ } if (client->swapped) { - register int n; + int n; swaps(&xgi.sequenceNumber, n); swapl(&xgi.length, n); swapl(&xgi.visual, n); @@ -714,8 +708,7 @@ } static int -ProcPanoramiXShmCreatePixmap( - register ClientPtr client) +ProcPanoramiXShmCreatePixmap(ClientPtr client) { ScreenPtr pScreen = NULL; PixmapPtr pMap = NULL; @@ -803,11 +796,10 @@ #endif static int -ProcShmPutImage(client) - register ClientPtr client; +ProcShmPutImage(ClientPtr client) { - register GCPtr pGC; - register DrawablePtr pDraw; + GCPtr pGC; + DrawablePtr pDraw; long length; ShmDescPtr shmdesc; REQUEST(xShmPutImageReq); @@ -907,10 +899,9 @@ static int -ProcShmGetImage(client) - register ClientPtr client; +ProcShmGetImage(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; long lenPer = 0, length; Mask plane = 0; xShmGetImageReply xgi; @@ -1017,14 +1008,10 @@ } static PixmapPtr -fbShmCreatePixmap (pScreen, width, height, depth, addr) - ScreenPtr pScreen; - int width; - int height; - int depth; - char *addr; +fbShmCreatePixmap(ScreenPtr pScreen, int width, int height, int depth, + char *addr) { - register PixmapPtr pPixmap; + PixmapPtr pPixmap; pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, pScreen->rootDepth); if (!pPixmap) @@ -1039,13 +1026,12 @@ } static int -ProcShmCreatePixmap(client) - register ClientPtr client; +ProcShmCreatePixmap(ClientPtr client) { PixmapPtr pMap; - register DrawablePtr pDraw; + DrawablePtr pDraw; DepthPtr pDepth; - register int i; + int i; ShmDescPtr shmdesc; REQUEST(xShmCreatePixmapReq); @@ -1095,8 +1081,7 @@ } static int -ProcShmDispatch (client) - register ClientPtr client; +ProcShmDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -1131,8 +1116,7 @@ } static void -SShmCompletionEvent(from, to) - xShmCompletionEvent *from, *to; +SShmCompletionEvent(xShmCompletionEvent *from, xShmCompletionEvent *to) { to->type = from->type; cpswaps(from->sequenceNumber, to->sequenceNumber); @@ -1144,10 +1128,9 @@ } static int -SProcShmQueryVersion(client) - register ClientPtr client; +SProcShmQueryVersion(ClientPtr client) { - register int n; + int n; REQUEST(xShmQueryVersionReq); swaps(&stuff->length, n); @@ -1155,10 +1138,9 @@ } static int -SProcShmAttach(client) - ClientPtr client; +SProcShmAttach(ClientPtr client) { - register int n; + int n; REQUEST(xShmAttachReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xShmAttachReq); @@ -1168,10 +1150,9 @@ } static int -SProcShmDetach(client) - ClientPtr client; +SProcShmDetach(ClientPtr client) { - register int n; + int n; REQUEST(xShmDetachReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xShmDetachReq); @@ -1180,10 +1161,9 @@ } static int -SProcShmPutImage(client) - ClientPtr client; +SProcShmPutImage(ClientPtr client) { - register int n; + int n; REQUEST(xShmPutImageReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xShmPutImageReq); @@ -1207,10 +1187,9 @@ } static int -SProcShmGetImage(client) - ClientPtr client; +SProcShmGetImage(ClientPtr client) { - register int n; + int n; REQUEST(xShmGetImageReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xShmGetImageReq); @@ -1230,10 +1209,9 @@ } static int -SProcShmCreatePixmap(client) - ClientPtr client; +SProcShmCreatePixmap(ClientPtr client) { - register int n; + int n; REQUEST(xShmCreatePixmapReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xShmCreatePixmapReq); @@ -1250,8 +1228,7 @@ } static int -SProcShmDispatch (client) - register ClientPtr client; +SProcShmDispatch (ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -1272,3 +1249,5 @@ return BadRequest; } } + +#endif Index: xc/programs/Xserver/Xext/sleepuntil.c diff -u xc/programs/Xserver/Xext/sleepuntil.c:3.7 xc/programs/Xserver/Xext/sleepuntil.c:3.9 --- xc/programs/Xserver/Xext/sleepuntil.c:3.7 Mon Nov 17 17:20:27 2003 +++ xc/programs/Xserver/Xext/sleepuntil.c Fri Oct 14 11:16:11 2005 @@ -1,5 +1,4 @@ /* - * $Xorg: sleepuntil.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ * Copyright 1992, 1998 The Open Group @@ -25,13 +24,13 @@ * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.7 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.c,v 3.9 2005/10/14 15:16:11 tsi Exp $ */ /* dixsleep.c - implement millisecond timeouts for X clients */ #include "sleepuntil.h" -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "windowstr.h" #include "dixstruct.h" @@ -76,13 +75,8 @@ ); int -ClientSleepUntil (client, revive, notifyFunc, closure) - ClientPtr client; - TimeStamp *revive; - void (*notifyFunc)( - ClientPtr /* client */, - pointer /* closure */); - pointer closure; +ClientSleepUntil(ClientPtr client, TimeStamp *revive, + sleepUntilNotifyFunc notifyFunc, pointer closure) { SertafiedPtr pRequest, pReq, pPrev; @@ -136,9 +130,7 @@ } static void -ClientAwaken (client, closure) - ClientPtr client; - pointer closure; +ClientAwaken(ClientPtr client, pointer closure) { if (!client->clientGone) AttendClient (client); @@ -146,9 +138,7 @@ static int -SertafiedDelete (value, id) - pointer value; - XID id; +SertafiedDelete(pointer value, XID id) { SertafiedPtr pRequest = (SertafiedPtr)value; SertafiedPtr pReq, pPrev; @@ -170,10 +160,7 @@ } static void -SertafiedBlockHandler (data, wt, LastSelectMask) - pointer data; /* unused */ - OSTimePtr wt; /* wait time */ - pointer LastSelectMask; +SertafiedBlockHandler(pointer data, OSTimePtr wt, pointer LastSelectMask) { SertafiedPtr pReq, pNext; unsigned long delay; @@ -206,10 +193,7 @@ } static void -SertafiedWakeupHandler (data, i, LastSelectMask) - pointer data; - int i; - pointer LastSelectMask; +SertafiedWakeupHandler(pointer data, int i, pointer LastSelectMask) { SertafiedPtr pReq, pNext; TimeStamp now; Index: xc/programs/Xserver/Xext/sleepuntil.h diff -u xc/programs/Xserver/Xext/sleepuntil.h:1.3 xc/programs/Xserver/Xext/sleepuntil.h:1.4 --- xc/programs/Xserver/Xext/sleepuntil.h:1.3 Fri Feb 13 18:58:30 2004 +++ xc/programs/Xserver/Xext/sleepuntil.h Sun Mar 27 21:51:00 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.h,v 1.3 2004/02/13 23:58:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/sleepuntil.h,v 1.4 2005/03/28 02:51:00 dawes Exp $ */ /* - * Copyright (C) 2001 The XFree86 Project, Inc. + * Copyright (C) 2001-2005 The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -51,13 +51,12 @@ #include "dix.h" +typedef void (*sleepUntilNotifyFunc)(ClientPtr client, pointer closure); + extern int ClientSleepUntil( ClientPtr client, TimeStamp *revive, - void (*notifyFunc)( - ClientPtr /* client */, - pointer /* closure */ - ), + sleepUntilNotifyFunc notifyFunc, pointer Closure ); Index: xc/programs/Xserver/Xext/sync.c diff -u xc/programs/Xserver/Xext/sync.c:3.14 xc/programs/Xserver/Xext/sync.c:3.16 --- xc/programs/Xserver/Xext/sync.c:3.14 Mon Nov 17 17:20:27 2003 +++ xc/programs/Xserver/Xext/sync.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,3 @@ -/* $Xorg: sync.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* Copyright 1991, 1993, 1998 The Open Group @@ -50,13 +49,13 @@ PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.14 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/sync.c,v 3.16 2005/10/14 15:16:11 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "Xmd.h" +#include +#include +#include #include "misc.h" #include "os.h" #include "extnsionst.h" @@ -64,8 +63,8 @@ #include "resource.h" #include "opaque.h" #define _SYNC_SERVER -#include "sync.h" -#include "syncstr.h" +#include +#include #ifdef EXTMODULE #include "xf86_ansic.h" @@ -78,6 +77,8 @@ #include "modinit.h" +#ifdef XSYNC + /* * Local Global Variables */ @@ -296,8 +297,7 @@ * delete and add triggers on this list. */ static void -SyncDeleteTriggerFromCounter(pTrigger) - SyncTrigger *pTrigger; +SyncDeleteTriggerFromCounter(SyncTrigger *pTrigger) { SyncTriggerList *pCur, *pPrev = NULL; @@ -325,8 +325,7 @@ static int -SyncAddTriggerToCounter(pTrigger) - SyncTrigger *pTrigger; +SyncAddTriggerToCounter(SyncTrigger *pTrigger) { SyncTriggerList *pCur; @@ -369,9 +368,7 @@ */ static Bool -SyncCheckTriggerPositiveComparison(pTrigger, oldval) - SyncTrigger *pTrigger; - CARD64 oldval; +SyncCheckTriggerPositiveComparison(SyncTrigger *pTrigger, CARD64 oldval) { return (pTrigger->pCounter == NULL || XSyncValueGreaterOrEqual(pTrigger->pCounter->value, @@ -379,9 +376,7 @@ } static Bool -SyncCheckTriggerNegativeComparison(pTrigger, oldval) - SyncTrigger *pTrigger; - CARD64 oldval; +SyncCheckTriggerNegativeComparison(SyncTrigger *pTrigger, CARD64 oldval) { return (pTrigger->pCounter == NULL || XSyncValueLessOrEqual(pTrigger->pCounter->value, @@ -389,9 +384,7 @@ } static Bool -SyncCheckTriggerPositiveTransition(pTrigger, oldval) - SyncTrigger *pTrigger; - CARD64 oldval; +SyncCheckTriggerPositiveTransition(SyncTrigger *pTrigger, CARD64 oldval) { return (pTrigger->pCounter == NULL || (XSyncValueLessThan(oldval, pTrigger->test_value) && @@ -400,9 +393,7 @@ } static Bool -SyncCheckTriggerNegativeTransition(pTrigger, oldval) - SyncTrigger *pTrigger; - CARD64 oldval; +SyncCheckTriggerNegativeTransition(SyncTrigger *pTrigger, CARD64 oldval) { return (pTrigger->pCounter == NULL || (XSyncValueGreaterThan(oldval, pTrigger->test_value) && @@ -413,11 +404,8 @@ static int -SyncInitTrigger(client, pTrigger, counter, changes) - ClientPtr client; /* so we can set errorValue */ - SyncTrigger *pTrigger; - XSyncCounter counter; - Mask changes; +SyncInitTrigger(ClientPtr client, SyncTrigger *pTrigger, + XSyncCounter counter, Mask changes) { SyncCounter *pCounter = pTrigger->pCounter; int status; @@ -529,8 +517,7 @@ * clients. The alarm maintains a list of clients interested in events. */ static void -SyncSendAlarmNotifyEvents(pAlarm) - SyncAlarm *pAlarm; +SyncSendAlarmNotifyEvents(SyncAlarm *pAlarm) { SyncAlarmClientList *pcl; xSyncAlarmNotifyEvent ane; @@ -577,10 +564,8 @@ * go only to the Awaiting client. */ static void -SyncSendCounterNotifyEvents(client, ppAwait, num_events) - ClientPtr client; - SyncAwait **ppAwait; - int num_events; +SyncSendCounterNotifyEvents(ClientPtr client, SyncAwait **ppAwait, + int num_events) { xSyncCounterNotifyEvent *pEvents, *pev; int i; @@ -617,8 +602,7 @@ * It is plugged into pTrigger->CounterDestroyed (for alarm triggers). */ void -SyncAlarmCounterDestroyed(pTrigger) - SyncTrigger *pTrigger; +SyncAlarmCounterDestroyed(SyncTrigger *pTrigger) { SyncAlarm *pAlarm = (SyncAlarm *)pTrigger; @@ -632,8 +616,7 @@ * It is plugged into pTrigger->TriggerFired (for alarm triggers). */ static void -SyncAlarmTriggerFired(pTrigger) - SyncTrigger *pTrigger; +SyncAlarmTriggerFired(SyncTrigger *pTrigger) { SyncAlarm *pAlarm = (SyncAlarm *)pTrigger; CARD64 new_test_value; @@ -708,8 +691,7 @@ * (for Await triggers). */ static void -SyncAwaitTriggerFired(pTrigger) - SyncTrigger *pTrigger; +SyncAwaitTriggerFired(SyncTrigger *pTrigger) { SyncAwait *pAwait = (SyncAwait *)pTrigger; int numwaits; @@ -802,9 +784,7 @@ * any triggers depending on the counter will be checked. */ void -SyncChangeCounter(pCounter, newval) - SyncCounter *pCounter; - CARD64 newval; +SyncChangeCounter(SyncCounter *pCounter, CARD64 newval) { SyncTriggerList *ptl, *pnext; CARD64 oldval; @@ -829,10 +809,7 @@ /* loosely based on dix/events.c/EventSelectForWindow */ static Bool -SyncEventSelectForAlarm(pAlarm, client, wantevents) - SyncAlarm *pAlarm; - ClientPtr client; - Bool wantevents; +SyncEventSelectForAlarm(SyncAlarm *pAlarm, ClientPtr client, Bool wantevents) { SyncAlarmClientList *pClients; @@ -901,11 +878,8 @@ * ** SyncChangeAlarmAttributes ** This is used by CreateAlarm and ChangeAlarm */ static int -SyncChangeAlarmAttributes(client, pAlarm, mask, values) - ClientPtr client; - SyncAlarm *pAlarm; - Mask mask; - CARD32 *values; +SyncChangeAlarmAttributes(ClientPtr client, SyncAlarm *pAlarm, Mask mask, + CARD32 *values) { int status; XSyncCounter counter; @@ -1002,10 +976,7 @@ static SyncCounter * -SyncCreateCounter(client, id, initialvalue) - ClientPtr client; - XSyncCounter id; - CARD64 initialvalue; +SyncCreateCounter(ClientPtr client, XSyncCounter id, CARD64 initialvalue) { SyncCounter *pCounter; @@ -1037,19 +1008,10 @@ */ pointer -SyncCreateSystemCounter(name, initial, resolution, counterType, - QueryValue, BracketValues) - char *name; - CARD64 initial; - CARD64 resolution; - SyncCounterType counterType; - void (*QueryValue) ( - pointer /* pCounter */, - CARD64 * /* pValue_return */); - void (*BracketValues) ( - pointer /* pCounter */, - CARD64 * /* pbracket_less */, - CARD64 * /* pbracket_greater */); +SyncCreateSystemCounter(char *name, CARD64 initial, CARD64 resolution, + SyncCounterType counterType, + SyncQueryValueProcPtr QueryValue, + SyncBracketValuesProcPtr BracketValues) { SyncCounter *pCounter; @@ -1096,17 +1058,14 @@ } void -SyncDestroySystemCounter(pSysCounter) - pointer pSysCounter; +SyncDestroySystemCounter(pointer pSysCounter) { SyncCounter *pCounter = (SyncCounter *)pSysCounter; FreeResource(pCounter->id, RT_NONE); } static void -SyncComputeBracketValues(pCounter, startOver) - SyncCounter *pCounter; - Bool startOver; +SyncComputeBracketValues(SyncCounter *pCounter, Bool startOver) { SyncTriggerList *pCur; SyncTrigger *pTrigger; @@ -1192,9 +1151,7 @@ /* ARGSUSED */ static int -FreeAlarm(addr, id) - pointer addr; - XID id; +FreeAlarm(pointer addr, XID id) { SyncAlarm *pAlarm = (SyncAlarm *) addr; @@ -1219,9 +1176,7 @@ */ /* ARGSUSED */ static int -FreeCounter(env, id) - pointer env; - XID id; +FreeCounter(pointer env, XID id) { SyncCounter *pCounter = (SyncCounter *) env; SyncTriggerList *ptl, *pnext; @@ -1271,9 +1226,7 @@ */ /* ARGSUSED */ static int -FreeAwait(addr, id) - pointer addr; - XID id; +FreeAwait(pointer addr, XID id) { SyncAwaitUnion *pAwaitUnion = (SyncAwaitUnion *) addr; SyncAwait *pAwait; @@ -1299,9 +1252,7 @@ /* loosely based on dix/events.c/OtherClientGone */ static int -FreeAlarmClient(value, id) - pointer value; /* must conform to DeleteType */ - XID id; +FreeAlarmClient(pointer value, XID id) { SyncAlarm *pAlarm = (SyncAlarm *)value; SyncAlarmClientList *pCur, *pPrev; @@ -1334,8 +1285,7 @@ * ** Initialize the extension */ static int -ProcSyncInitialize(client) - ClientPtr client; +ProcSyncInitialize(ClientPtr client) { xSyncInitializeReply rep; int n; @@ -1360,8 +1310,7 @@ * ** Get list of system counters available through the extension */ static int -ProcSyncListSystemCounters(client) - ClientPtr client; +ProcSyncListSystemCounters(ClientPtr client) { xSyncListSystemCountersReply rep; int i, len; @@ -1391,7 +1340,7 @@ if (client->swapped) { - register char n; + char n; swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); swapl(&rep.nCounters, n); @@ -1411,7 +1360,7 @@ if (client->swapped) { - register char n; + char n; swapl(&walklist->counter, n); swapl(&walklist->resolution_hi, n); swapl(&walklist->resolution_lo, n); @@ -1438,8 +1387,7 @@ * ** Set client Priority */ static int -ProcSyncSetPriority(client) - ClientPtr client; +ProcSyncSetPriority(ClientPtr client) { REQUEST(xSyncSetPriorityReq); ClientPtr priorityclient; @@ -1472,8 +1420,7 @@ * ** Get client Priority */ static int -ProcSyncGetPriority(client) - ClientPtr client; +ProcSyncGetPriority(ClientPtr client) { REQUEST(xSyncGetPriorityReq); xSyncGetPriorityReply rep; @@ -1496,7 +1443,7 @@ if (client->swapped) { - register char n; + char n; swaps(&rep.sequenceNumber, n); swapl(&rep.priority, n); } @@ -1510,8 +1457,7 @@ * ** Create a new counter */ static int -ProcSyncCreateCounter(client) - ClientPtr client; +ProcSyncCreateCounter(ClientPtr client) { REQUEST(xSyncCreateCounterReq); CARD64 initial; @@ -1531,8 +1477,7 @@ * ** Set Counter value */ static int -ProcSyncSetCounter(client) - ClientPtr client; +ProcSyncSetCounter(ClientPtr client) { REQUEST(xSyncSetCounterReq); SyncCounter *pCounter; @@ -1563,8 +1508,7 @@ * ** Change Counter value */ static int -ProcSyncChangeCounter(client) - ClientPtr client; +ProcSyncChangeCounter(ClientPtr client) { REQUEST(xSyncChangeCounterReq); SyncCounter *pCounter; @@ -1603,8 +1547,7 @@ * ** Destroy a counter */ static int -ProcSyncDestroyCounter(client) - ClientPtr client; +ProcSyncDestroyCounter(ClientPtr client) { REQUEST(xSyncDestroyCounterReq); SyncCounter *pCounter; @@ -1632,8 +1575,7 @@ * ** Await */ static int -ProcSyncAwait(client) - ClientPtr client; +ProcSyncAwait(ClientPtr client) { REQUEST(xSyncAwaitReq); int len, items; @@ -1748,8 +1690,7 @@ * ** Query a counter */ static int -ProcSyncQueryCounter(client) - ClientPtr client; +ProcSyncQueryCounter(ClientPtr client) { REQUEST(xSyncQueryCounterReq); xSyncQueryCounterReply rep; @@ -1781,7 +1722,7 @@ rep.value_lo = XSyncValueLow32(pCounter->value); if (client->swapped) { - register char n; + char n; swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); swapl(&rep.value_hi, n); @@ -1796,8 +1737,7 @@ * ** Create Alarm */ static int -ProcSyncCreateAlarm(client) - ClientPtr client; +ProcSyncCreateAlarm(ClientPtr client) { REQUEST(xSyncCreateAlarmReq); SyncAlarm *pAlarm; @@ -1876,8 +1816,7 @@ * ** Change Alarm */ static int -ProcSyncChangeAlarm(client) - ClientPtr client; +ProcSyncChangeAlarm(ClientPtr client) { REQUEST(xSyncChangeAlarmReq); SyncAlarm *pAlarm; @@ -1917,8 +1856,7 @@ } static int -ProcSyncQueryAlarm(client) - ClientPtr client; +ProcSyncQueryAlarm(ClientPtr client) { REQUEST(xSyncQueryAlarmReq); SyncAlarm *pAlarm; @@ -1963,7 +1901,7 @@ if (client->swapped) { - register char n; + char n; swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); swapl(&rep.counter, n); @@ -1980,8 +1918,7 @@ static int -ProcSyncDestroyAlarm(client) - ClientPtr client; +ProcSyncDestroyAlarm(ClientPtr client) { REQUEST(xSyncDestroyAlarmReq); @@ -2002,8 +1939,7 @@ * ** Given an extension request, call the appropriate request procedure */ static int -ProcSyncDispatch(client) - ClientPtr client; +ProcSyncDispatch(ClientPtr client) { REQUEST(xReq); @@ -2048,11 +1984,10 @@ */ static int -SProcSyncInitialize(client) - ClientPtr client; +SProcSyncInitialize(ClientPtr client) { REQUEST(xSyncInitializeReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncInitializeReq); @@ -2061,11 +1996,10 @@ } static int -SProcSyncListSystemCounters(client) - ClientPtr client; +SProcSyncListSystemCounters(ClientPtr client) { REQUEST(xSyncListSystemCountersReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncListSystemCountersReq); @@ -2074,11 +2008,10 @@ } static int -SProcSyncCreateCounter(client) - ClientPtr client; +SProcSyncCreateCounter(ClientPtr client) { REQUEST(xSyncCreateCounterReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncCreateCounterReq); @@ -2090,11 +2023,10 @@ } static int -SProcSyncSetCounter(client) - ClientPtr client; +SProcSyncSetCounter(ClientPtr client) { REQUEST(xSyncSetCounterReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncSetCounterReq); @@ -2106,11 +2038,10 @@ } static int -SProcSyncChangeCounter(client) - ClientPtr client; +SProcSyncChangeCounter(ClientPtr client) { REQUEST(xSyncChangeCounterReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncChangeCounterReq); @@ -2122,11 +2053,10 @@ } static int -SProcSyncQueryCounter(client) - ClientPtr client; +SProcSyncQueryCounter(ClientPtr client) { REQUEST(xSyncQueryCounterReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncQueryCounterReq); @@ -2136,11 +2066,10 @@ } static int -SProcSyncDestroyCounter(client) - ClientPtr client; +SProcSyncDestroyCounter(ClientPtr client) { REQUEST(xSyncDestroyCounterReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncDestroyCounterReq); @@ -2150,11 +2079,10 @@ } static int -SProcSyncAwait(client) - ClientPtr client; +SProcSyncAwait(ClientPtr client) { REQUEST(xSyncAwaitReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_AT_LEAST_SIZE(xSyncAwaitReq); @@ -2165,11 +2093,10 @@ static int -SProcSyncCreateAlarm(client) - ClientPtr client; +SProcSyncCreateAlarm(ClientPtr client) { REQUEST(xSyncCreateAlarmReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_AT_LEAST_SIZE(xSyncCreateAlarmReq); @@ -2181,11 +2108,10 @@ } static int -SProcSyncChangeAlarm(client) - ClientPtr client; +SProcSyncChangeAlarm(ClientPtr client) { REQUEST(xSyncChangeAlarmReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq); @@ -2196,11 +2122,10 @@ } static int -SProcSyncQueryAlarm(client) - ClientPtr client; +SProcSyncQueryAlarm(ClientPtr client) { REQUEST(xSyncQueryAlarmReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncQueryAlarmReq); @@ -2210,11 +2135,10 @@ } static int -SProcSyncDestroyAlarm(client) - ClientPtr client; +SProcSyncDestroyAlarm(ClientPtr client) { REQUEST(xSyncDestroyAlarmReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncDestroyAlarmReq); @@ -2224,11 +2148,10 @@ } static int -SProcSyncSetPriority(client) - ClientPtr client; +SProcSyncSetPriority(ClientPtr client) { REQUEST(xSyncSetPriorityReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncSetPriorityReq); @@ -2239,11 +2162,10 @@ } static int -SProcSyncGetPriority(client) - ClientPtr client; +SProcSyncGetPriority(ClientPtr client) { REQUEST(xSyncGetPriorityReq); - register char n; + char n; swaps(&stuff->length, n); REQUEST_SIZE_MATCH (xSyncGetPriorityReq); @@ -2254,8 +2176,7 @@ static int -SProcSyncDispatch(client) - ClientPtr client; +SProcSyncDispatch(ClientPtr client) { REQUEST(xReq); @@ -2507,3 +2428,5 @@ ServertimeQueryValue, ServertimeBracketValues); pnext_time = NULL; } + +#endif Index: xc/programs/Xserver/Xext/xcmisc.c diff -u xc/programs/Xserver/Xext/xcmisc.c:3.8 xc/programs/Xserver/Xext/xcmisc.c:3.10 --- xc/programs/Xserver/Xext/xcmisc.c:3.8 Mon Nov 17 17:20:27 2003 +++ xc/programs/Xserver/Xext/xcmisc.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,3 @@ -/* $Xorg: xcmisc.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,18 +25,18 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.8 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xcmisc.c,v 3.10 2005/10/14 15:16:11 tsi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include "xcmiscstr.h" +#include #include "modinit.h" #if 0 @@ -78,17 +77,15 @@ /*ARGSUSED*/ static void -XCMiscResetProc (extEntry) - ExtensionEntry *extEntry; +XCMiscResetProc(ExtensionEntry *extEntry) { } static int -ProcXCMiscGetVersion(client) - register ClientPtr client; +ProcXCMiscGetVersion(ClientPtr client) { xXCMiscGetVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH(xXCMiscGetVersionReq); rep.type = X_Reply; @@ -106,11 +103,10 @@ } static int -ProcXCMiscGetXIDRange(client) - register ClientPtr client; +ProcXCMiscGetXIDRange(ClientPtr client) { xXCMiscGetXIDRangeReply rep; - register int n; + int n; XID min_id, max_id; REQUEST_SIZE_MATCH(xXCMiscGetXIDRangeReq); @@ -130,12 +126,11 @@ } static int -ProcXCMiscGetXIDList(client) - register ClientPtr client; +ProcXCMiscGetXIDList(ClientPtr client) { REQUEST(xXCMiscGetXIDListReq); xXCMiscGetXIDListReply rep; - register int n; + int n; XID *pids; unsigned int count; @@ -167,8 +162,7 @@ } static int -ProcXCMiscDispatch (client) - register ClientPtr client; +ProcXCMiscDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -185,10 +179,9 @@ } static int -SProcXCMiscGetVersion(client) - register ClientPtr client; +SProcXCMiscGetVersion(ClientPtr client) { - register int n; + int n; REQUEST(xXCMiscGetVersionReq); swaps(&stuff->length, n); @@ -199,10 +192,9 @@ } static int -SProcXCMiscGetXIDRange(client) - register ClientPtr client; +SProcXCMiscGetXIDRange(ClientPtr client) { - register int n; + int n; REQUEST(xReq); swaps(&stuff->length, n); @@ -210,10 +202,9 @@ } static int -SProcXCMiscGetXIDList(client) - register ClientPtr client; +SProcXCMiscGetXIDList(ClientPtr client) { - register int n; + int n; REQUEST(xXCMiscGetXIDListReq); swaps(&stuff->length, n); @@ -222,8 +213,7 @@ } static int -SProcXCMiscDispatch (client) - register ClientPtr client; +SProcXCMiscDispatch (ClientPtr client) { REQUEST(xReq); switch (stuff->data) Index: xc/programs/Xserver/Xext/xf86bigfont.c diff -u xc/programs/Xserver/Xext/xf86bigfont.c:1.19 xc/programs/Xserver/Xext/xf86bigfont.c:1.21 --- xc/programs/Xserver/Xext/xf86bigfont.c:1.19 Sat Apr 3 17:26:22 2004 +++ xc/programs/Xserver/Xext/xf86bigfont.c Fri Oct 14 11:16:11 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.19 2004/04/03 22:26:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86bigfont.c,v 1.21 2005/10/14 15:16:11 tsi Exp $ */ /* * BIGFONT extension for sharing font metrics between clients (if possible) * and for transmitting font metrics to clients in a compressed form. @@ -60,8 +60,8 @@ #include #endif -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -70,7 +70,7 @@ #include "extnsionst.h" #define _XF86BIGFONT_SERVER_ -#include "xf86bigfstr.h" +#include static void XF86BigfontResetProc( ExtensionEntry * /* extEntry */ @@ -106,8 +106,7 @@ static Bool badSysCall = FALSE; static void -SigSysHandler( - int signo) +SigSysHandler(int signo) { badSysCall = TRUE; } @@ -222,8 +221,7 @@ static ShmDescPtr ShmList = (ShmDescPtr) NULL; static ShmDescPtr -shmalloc( - unsigned int size) +shmalloc(unsigned int size) { ShmDescPtr pDesc; int shmid; @@ -279,8 +277,7 @@ } static void -shmdealloc( - ShmDescPtr pDesc) +shmdealloc(ShmDescPtr pDesc) { #ifndef EARLY_REMOVE shmctl(pDesc->shmid, IPC_RMID, (void *) 0); @@ -296,8 +293,7 @@ /* Called when a font is closed. */ void -XF86BigfontFreeFontShm( - FontPtr pFont) +XF86BigfontFreeFontShm(FontPtr pFont) { #ifdef HAS_SHM ShmDescPtr pDesc; @@ -326,8 +322,7 @@ /* Called when a server generation dies. */ static void -XF86BigfontResetProc( - ExtensionEntry* extEntry) +XF86BigfontResetProc(ExtensionEntry* extEntry) { /* This function is normally called from CloseDownExtensions(), called * from main(). It will be followed by a call to FreeAllResources(), @@ -344,8 +339,7 @@ /* ========== Handling of extension specific requests ========== */ static int -ProcXF86BigfontQueryVersion( - ClientPtr client) +ProcXF86BigfontQueryVersion(ClientPtr client) { xXF86BigfontQueryVersionReply reply; @@ -385,8 +379,7 @@ } static void -swapCharInfo( - xCharInfo *pCI) +swapCharInfo(xCharInfo *pCI) { char tmp; @@ -406,8 +399,7 @@ (p->ascent << 11) + (p->descent << 6)) ^ p->attributes) static int -ProcXF86BigfontQueryFont( - ClientPtr client) +ProcXF86BigfontQueryFont(ClientPtr client) { FontPtr pFont; REQUEST(xXF86BigfontQueryFontReq); @@ -727,8 +719,7 @@ } static int -ProcXF86BigfontDispatch( - ClientPtr client) +ProcXF86BigfontDispatch(ClientPtr client) { REQUEST(xReq); @@ -743,8 +734,7 @@ } static int -SProcXF86BigfontQueryVersion( - ClientPtr client) +SProcXF86BigfontQueryVersion(ClientPtr client) { REQUEST(xXF86BigfontQueryVersionReq); char tmp; @@ -754,8 +744,7 @@ } static int -SProcXF86BigfontQueryFont( - ClientPtr client) +SProcXF86BigfontQueryFont(ClientPtr client) { REQUEST(xXF86BigfontQueryFontReq); char tmp; @@ -767,8 +756,7 @@ } static int -SProcXF86BigfontDispatch( - ClientPtr client) +SProcXF86BigfontDispatch(ClientPtr client) { REQUEST(xReq); Index: xc/programs/Xserver/Xext/xf86dga.c diff -u xc/programs/Xserver/Xext/xf86dga.c:3.24 xc/programs/Xserver/Xext/xf86dga.c:3.26 --- xc/programs/Xserver/Xext/xf86dga.c:3.24 Thu Dec 9 14:33:00 2004 +++ xc/programs/Xserver/Xext/xf86dga.c Fri Oct 14 11:16:12 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.24 2004/12/09 19:33:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.26 2005/10/14 15:16:12 tsi Exp $ */ /* @@ -9,8 +9,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -19,8 +19,8 @@ #include "scrnintstr.h" #include "servermd.h" #define _XF86DGA_SERVER_ -#include "xf86dga.h" -#include "xf86dgastr.h" +#include +#include #include "swaprep.h" #include "dgaproc.h" @@ -281,7 +281,7 @@ } int -ProcXF86DGADispatch(register ClientPtr client) +ProcXF86DGADispatch(ClientPtr client) { REQUEST(xReq); Index: xc/programs/Xserver/Xext/xf86dga2.c diff -u xc/programs/Xserver/Xext/xf86dga2.c:1.21 xc/programs/Xserver/Xext/xf86dga2.c:1.25 --- xc/programs/Xserver/Xext/xf86dga2.c:1.21 Thu Jan 20 12:53:44 2005 +++ xc/programs/Xserver/Xext/xf86dga2.c Mon Mar 20 22:56:25 2006 @@ -3,13 +3,13 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.21 2005/01/20 17:53:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.25 2006/03/21 03:56:25 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "dixstruct.h" #include "dixevents.h" @@ -20,8 +20,8 @@ #include "scrnintstr.h" #include "servermd.h" #define _XF86DGA_SERVER_ -#include "xf86dga.h" -#include "xf86dgastr.h" +#include +#include #include "swaprep.h" #include "dgaproc.h" #include "xf86dgaext.h" @@ -34,6 +34,8 @@ #include "modinit.h" +#ifdef XFreeXDGA + static DISPATCH_PROC(ProcXDGADispatch); static DISPATCH_PROC(SProcXDGADispatch); static DISPATCH_PROC(ProcXDGAQueryVersion); @@ -120,10 +122,11 @@ static void -XDGAResetProc (ExtensionEntry *extEntry) +XDGAResetProc(ExtensionEntry *extEntry) { DeleteCallback (&ClientStateCallback, DGAClientStateChange, NULL); DGACallbackRefCount = 0; + DGAShutdown(); } @@ -775,3 +778,5 @@ XDGAEventBase = &DGAEventBase; } #endif + +#endif Index: xc/programs/Xserver/Xext/xf86misc.c diff -u xc/programs/Xserver/Xext/xf86misc.c:3.46 xc/programs/Xserver/Xext/xf86misc.c:3.48 --- xc/programs/Xserver/Xext/xf86misc.c:3.46 Wed Dec 15 10:03:28 2004 +++ xc/programs/Xserver/Xext/xf86misc.c Fri Oct 14 11:16:12 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86misc.c,v 3.46 2004/12/15 15:03:28 twini Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86misc.c,v 3.48 2005/10/14 15:16:12 tsi Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc @@ -51,8 +51,8 @@ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" @@ -61,10 +61,10 @@ #include "servermd.h" #define _XF86MISC_SERVER_ #undef _XF86MISC_SAVER_COMPAT_ -#include "xf86mscstr.h" +#include #include "swaprep.h" #include "xf86.h" -#include "Xfuncproto.h" +#include #include "xf86miscproc.h" #if 0 @@ -202,17 +202,15 @@ /*ARGSUSED*/ static void -XF86MiscResetProc (extEntry) - ExtensionEntry* extEntry; +XF86MiscResetProc(ExtensionEntry *extEntry) { } static int -ProcXF86MiscQueryVersion(client) - register ClientPtr client; +ProcXF86MiscQueryVersion(ClientPtr client) { xXF86MiscQueryVersionReply rep; - register int n; + int n; DEBUG_P("XF86MiscQueryVersion"); @@ -240,8 +238,7 @@ * clients. */ static int -ProcXF86MiscSetSaver(client) - register ClientPtr client; +ProcXF86MiscSetSaver(ClientPtr client) { REQUEST(xXF86MiscSetSaverReq); ScrnInfoPtr vptr; @@ -266,12 +263,11 @@ * clients. */ static int -ProcXF86MiscGetSaver(client) - register ClientPtr client; +ProcXF86MiscGetSaver(ClientPtr client) { REQUEST(xXF86MiscGetSaverReq); xXF86MiscGetSaverReply rep; - register int n; + int n; ScrnInfoPtr vptr; if (stuff->screen > screenInfo.numScreens) @@ -299,13 +295,12 @@ #endif /* _XF86MISC_SAVER_COMPAT_ */ static int -ProcXF86MiscGetMouseSettings(client) - register ClientPtr client; +ProcXF86MiscGetMouseSettings(ClientPtr client) { xXF86MiscGetMouseSettingsReply rep; char *devname; pointer mouse; - register int n; + int n; DEBUG_P("XF86MiscGetMouseSettings"); @@ -351,12 +346,11 @@ } static int -ProcXF86MiscGetKbdSettings(client) - register ClientPtr client; +ProcXF86MiscGetKbdSettings(ClientPtr client) { xXF86MiscGetKbdSettingsReply rep; pointer kbd; - register int n; + int n; DEBUG_P("XF86MiscGetKbdSettings"); @@ -383,8 +377,7 @@ } static int -ProcXF86MiscSetMouseSettings(client) - register ClientPtr client; +ProcXF86MiscSetMouseSettings(ClientPtr client) { MiscExtReturn ret; pointer mouse; @@ -460,8 +453,7 @@ } static int -ProcXF86MiscSetKbdSettings(client) - register ClientPtr client; +ProcXF86MiscSetKbdSettings(ClientPtr client) { MiscExtReturn ret; pointer kbd; @@ -499,8 +491,7 @@ } static int -ProcXF86MiscSetGrabKeysState(client) - register ClientPtr client; +ProcXF86MiscSetGrabKeysState(ClientPtr client) { int n, status; xXF86MiscSetGrabKeysStateReply rep; @@ -556,14 +547,13 @@ } static int -ProcXF86MiscGetFilePaths(client) - register ClientPtr client; +ProcXF86MiscGetFilePaths(ClientPtr client) { xXF86MiscGetFilePathsReply rep; const char *configfile; const char *modulepath; const char *logfile; - register int n; + int n; DEBUG_P("XF86MiscGetFilePaths"); @@ -602,13 +592,12 @@ } static int -ProcXF86MiscPassMessage(client) - register ClientPtr client; +ProcXF86MiscPassMessage(ClientPtr client) { xXF86MiscPassMessageReply rep; char *msgtype, *msgval, *retstr; int retval, size; - register int n; + int n; REQUEST(xXF86MiscPassMessageReq); @@ -666,8 +655,7 @@ } static int -ProcXF86MiscDispatch (client) - register ClientPtr client; +ProcXF86MiscDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -710,10 +698,9 @@ } static int -SProcXF86MiscQueryVersion(client) - register ClientPtr client; +SProcXF86MiscQueryVersion(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscQueryVersionReq); swaps(&stuff->length, n); return ProcXF86MiscQueryVersion(client); @@ -721,10 +708,9 @@ #ifdef _XF86MISC_SAVER_COMPAT_ static int -SProcXF86MiscGetSaver(client) - ClientPtr client; +SProcXF86MiscGetSaver(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscGetSaverReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86MiscGetSaverReq); @@ -733,10 +719,9 @@ } static int -SProcXF86MiscSetSaver(client) - ClientPtr client; +SProcXF86MiscSetSaver(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscSetSaverReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86MiscSetSaverReq); @@ -748,10 +733,9 @@ #endif /* _XF86MISC_SAVER_COMPAT_ */ static int -SProcXF86MiscGetMouseSettings(client) - ClientPtr client; +SProcXF86MiscGetMouseSettings(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscGetMouseSettingsReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86MiscGetMouseSettingsReq); @@ -759,10 +743,9 @@ } static int -SProcXF86MiscGetKbdSettings(client) - ClientPtr client; +SProcXF86MiscGetKbdSettings(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscGetKbdSettingsReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86MiscGetKbdSettingsReq); @@ -770,10 +753,9 @@ } static int -SProcXF86MiscSetMouseSettings(client) - ClientPtr client; +SProcXF86MiscSetMouseSettings(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscSetMouseSettingsReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86MiscSetMouseSettingsReq); @@ -788,10 +770,9 @@ } static int -SProcXF86MiscSetKbdSettings(client) - ClientPtr client; +SProcXF86MiscSetKbdSettings(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscSetKbdSettingsReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86MiscSetKbdSettingsReq); @@ -802,10 +783,9 @@ } static int -SProcXF86MiscSetGrabKeysState(client) - ClientPtr client; +SProcXF86MiscSetGrabKeysState(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscSetGrabKeysStateReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86MiscSetGrabKeysStateReq); @@ -816,7 +796,7 @@ static int SProcXF86MiscSetClientVersion(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscSetClientVersionReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86MiscSetClientVersionReq); @@ -826,10 +806,9 @@ } static int -SProcXF86MiscGetFilePaths(client) - ClientPtr client; +SProcXF86MiscGetFilePaths(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscGetFilePathsReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86MiscGetFilePathsReq); @@ -837,10 +816,9 @@ } static int -SProcXF86MiscPassMessage(client) - ClientPtr client; +SProcXF86MiscPassMessage(ClientPtr client) { - register int n; + int n; REQUEST(xXF86MiscPassMessageReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86MiscPassMessageReq); @@ -848,8 +826,7 @@ } static int -SProcXF86MiscDispatch (client) - register ClientPtr client; +SProcXF86MiscDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) Index: xc/programs/Xserver/Xext/xf86vmode.c diff -u xc/programs/Xserver/Xext/xf86vmode.c:3.59 xc/programs/Xserver/Xext/xf86vmode.c:3.61 --- xc/programs/Xserver/Xext/xf86vmode.c:3.59 Mon Nov 17 17:20:27 2003 +++ xc/programs/Xserver/Xext/xf86vmode.c Fri Oct 14 11:16:12 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.59 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.61 2005/10/14 15:16:12 tsi Exp $ */ /* @@ -29,20 +29,19 @@ from Kaleb S. KEITHLEY */ -/* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" #include "scrnintstr.h" #include "servermd.h" #define _XF86VIDMODE_SERVER_ -#include "xf86vmstr.h" +#include #include "swaprep.h" #include "xf86.h" #include "vidmodeproc.h" @@ -229,8 +228,7 @@ /*ARGSUSED*/ static void -XF86VidModeResetProc (extEntry) - ExtensionEntry* extEntry; +XF86VidModeResetProc(ExtensionEntry *extEntry) { } @@ -248,8 +246,7 @@ #ifdef XF86VIDMODE_EVENTS static void -CheckScreenPrivate (pScreen) - ScreenPtr pScreen; +CheckScreenPrivate(ScreenPtr pScreen) { SetupScreen (pScreen); @@ -262,8 +259,7 @@ } static XF86VidModeScreenPrivatePtr -MakeScreenPrivate (pScreen) - ScreenPtr pScreen; +MakeScreenPrivate(ScreenPtr pScreen) { SetupScreen (pScreen); @@ -279,7 +275,7 @@ } static unsigned long -getEventMask (ScreenPtr pScreen, ClientPtr client) +getEventMask(ScreenPtr pScreen, ClientPtr client) { SetupScreen(pScreen); XF86VidModeEventPtr pEv; @@ -293,7 +289,7 @@ } static Bool -setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask) +setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) { SetupScreen(pScreen); XF86VidModeEventPtr pEv, *pPrev; @@ -404,7 +400,7 @@ ProcXF86VidModeQueryVersion(ClientPtr client) { xXF86VidModeQueryVersionReply rep; - register int n; + int n; DEBUG_P("XF86VidModeQueryVersion"); @@ -431,7 +427,7 @@ xXF86VidModeGetModeLineReply rep; xXF86OldVidModeGetModeLineReply oldrep; pointer mode; - register int n; + int n; int dotClock; int ver; @@ -534,7 +530,7 @@ xXF86OldVidModeModeInfo oldmdinf; pointer mode; int modecount, dotClock; - register int n; + int n; int ver; DEBUG_P("XF86VidModeGetAllModelines"); @@ -1139,7 +1135,7 @@ rep.sequenceNumber = client->sequence; rep.status = status; if (client->swapped) { - register int n; + int n; swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); swapl(&rep.status, n); @@ -1287,7 +1283,7 @@ { REQUEST(xXF86VidModeGetMonitorReq); xXF86VidModeGetMonitorReply rep; - register int n; + int n; CARD32 *hsyncdata, *vsyncdata; int i, nHsync, nVrefresh; pointer monitor; @@ -1424,7 +1420,7 @@ { REQUEST(xXF86VidModeGetDotClocksReq); xXF86VidModeGetDotClocksReply rep; - register int n; + int n; int numClocks; CARD32 dotclock; int *Clocks = NULL; @@ -1507,7 +1503,7 @@ { REQUEST(xXF86VidModeGetGammaReq); xXF86VidModeGetGammaReply rep; - register int n; + int n; float red, green, blue; DEBUG_P("XF86VidModeGetGamma"); @@ -1756,7 +1752,7 @@ static int SProcXF86VidModeQueryVersion(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeQueryVersionReq); swaps(&stuff->length, n); return ProcXF86VidModeQueryVersion(client); @@ -1765,7 +1761,7 @@ static int SProcXF86VidModeGetModeLine(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeGetModeLineReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq); @@ -1776,7 +1772,7 @@ static int SProcXF86VidModeGetAllModeLines(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeGetAllModeLinesReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq); @@ -1790,7 +1786,7 @@ xXF86OldVidModeAddModeLineReq *oldstuff = (xXF86OldVidModeAddModeLineReq *)client->requestBuffer; int ver; - register int n; + int n; REQUEST(xXF86VidModeAddModeLineReq); ver = ClientMajorVersion(client); @@ -1835,7 +1831,7 @@ xXF86OldVidModeDeleteModeLineReq *oldstuff = (xXF86OldVidModeDeleteModeLineReq *)client->requestBuffer; int ver; - register int n; + int n; REQUEST(xXF86VidModeDeleteModeLineReq); ver = ClientMajorVersion(client); @@ -1880,7 +1876,7 @@ xXF86OldVidModeModModeLineReq *oldstuff = (xXF86OldVidModeModModeLineReq *)client->requestBuffer; int ver; - register int n; + int n; REQUEST(xXF86VidModeModModeLineReq); ver = ClientMajorVersion(client); @@ -1925,7 +1921,7 @@ xXF86OldVidModeValidateModeLineReq *oldstuff = (xXF86OldVidModeValidateModeLineReq *)client->requestBuffer; int ver; - register int n; + int n; REQUEST(xXF86VidModeValidateModeLineReq); ver = ClientMajorVersion(client); @@ -1967,7 +1963,7 @@ static int SProcXF86VidModeSwitchMode(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeSwitchModeReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq); @@ -1979,7 +1975,7 @@ static int SProcXF86VidModeSwitchToMode(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeSwitchToModeReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeSwitchToModeReq); @@ -1990,7 +1986,7 @@ static int SProcXF86VidModeLockModeSwitch(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeLockModeSwitchReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq); @@ -2002,7 +1998,7 @@ static int SProcXF86VidModeGetMonitor(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeGetMonitorReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq); @@ -2013,7 +2009,7 @@ static int SProcXF86VidModeGetViewPort(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeGetViewPortReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq); @@ -2024,7 +2020,7 @@ static int SProcXF86VidModeSetViewPort(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeSetViewPortReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq); @@ -2037,7 +2033,7 @@ static int SProcXF86VidModeGetDotClocks(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeGetDotClocksReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq); @@ -2048,7 +2044,7 @@ static int SProcXF86VidModeSetClientVersion(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeSetClientVersionReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq); @@ -2060,7 +2056,7 @@ static int SProcXF86VidModeSetGamma(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeSetGammaReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq); @@ -2074,7 +2070,7 @@ static int SProcXF86VidModeGetGamma(ClientPtr client) { - register int n; + int n; REQUEST(xXF86VidModeGetGammaReq); swaps(&stuff->length, n); REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq); Index: xc/programs/Xserver/Xext/xprint.c diff -u xc/programs/Xserver/Xext/xprint.c:1.15 xc/programs/Xserver/Xext/xprint.c:1.18 --- xc/programs/Xserver/Xext/xprint.c:1.15 Tue Oct 28 18:08:44 2003 +++ xc/programs/Xserver/Xext/xprint.c Sun Feb 19 10:51:16 2006 @@ -1,4 +1,3 @@ -/* $Xorg: xprint.c,v 1.5 2001/03/05 20:42:26 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -64,13 +63,14 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.15 2003/10/28 23:08:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xprint.c,v 1.18 2006/02/19 15:51:16 tsi Exp $ */ +#undef _XP_PRINT_SERVER_ #define _XP_PRINT_SERVER_ -#include "X.h" -#include "Xos.h" +#include +#include #define NEED_EVENTS -#include "Xproto.h" +#include #undef NEED_EVENTS #include "misc.h" #include "windowstr.h" @@ -78,9 +78,9 @@ #include "pixmapstr.h" #include "extnsionst.h" #include "dixstruct.h" -#include "Xatom.h" -#include "Print.h" -#include "Printstr.h" +#include +#include +#include #include "../Xprint/DiPrint.h" #include "../Xprint/attributes.h" #include "modinit.h" @@ -415,7 +415,8 @@ * whenever a context gets created for a particular driver on this screen. */ void -XpRegisterInitFunc(ScreenPtr pScreen, char *driverName, int (*initContext)(struct _XpContext *)) +XpRegisterInitFunc(ScreenPtr pScreen, char *driverName, + int (*initContext)(struct _XpContext *)) { XpDriverPtr pDriver; @@ -568,7 +569,7 @@ { /* REQUEST(xPrintQueryVersionReq); */ xPrintQueryVersionReply rep; - register int n; + int n; long l; REQUEST_SIZE_MATCH(xPrintQueryVersionReq); @@ -1099,8 +1100,8 @@ xPrintGetContextReply rep; XpContextPtr pContext; - register int n; - register long l; + int n; + long l; REQUEST_SIZE_MATCH(xPrintGetContextReq); @@ -1381,11 +1382,11 @@ static void InitContextPrivates(XpContextPtr context) { - register char *ptr; + char *ptr; DevUnion *ppriv; - register unsigned *sizes; - register unsigned size; - register int i; + unsigned *sizes; + unsigned size; + int i; if (totalContextSize == sizeof(XpContextRec)) ppriv = (DevUnion *)NULL; @@ -1733,9 +1734,7 @@ } static Bool -DoStartPage( - ClientPtr client, - XpStPagePtr c) +DoStartPage(ClientPtr client, XpStPagePtr c) { WindowPtr pWin = c->pWin; int result = Success; @@ -2324,7 +2323,7 @@ { REQUEST(xPrintInputSelectedReq); xPrintInputSelectedReply rep; - register int n; + int n; long l; XpClientPtr pXpClient; XpContextPtr pContext; Index: xc/programs/Xserver/Xext/xres.c diff -u xc/programs/Xserver/Xext/xres.c:1.9 xc/programs/Xserver/Xext/xres.c:1.11 --- xc/programs/Xserver/Xext/xres.c:1.9 Thu Mar 4 14:31:37 2004 +++ xc/programs/Xserver/Xext/xres.c Fri Oct 14 11:16:12 2005 @@ -1,21 +1,23 @@ /* Copyright (c) 2002 XFree86 Inc */ -/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.9 2004/03/04 19:31:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xres.c,v 1.11 2005/10/14 15:16:12 tsi Exp $ */ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" #include "extnsionst.h" #include "swaprep.h" -#include "XResproto.h" +#include #include "pixmapstr.h" #include "modinit.h" +#ifdef RES + static int ProcXResQueryVersion (ClientPtr client) { @@ -86,7 +88,7 @@ scratch.resource_mask = RESOURCE_ID_MASK; if(client->swapped) { - register int n; + int n; swapl (&scratch.resource_base, n); swapl (&scratch.resource_mask, n); } @@ -167,7 +169,7 @@ scratch.count = counts[i]; if(client->swapped) { - register int n; + int n; swapl (&scratch.resource_type, n); swapl (&scratch.count, n); } @@ -332,3 +334,5 @@ RegisterResourceName(RT_OTHERCLIENT, "OTHER CLIENT"); RegisterResourceName(RT_PASSIVEGRAB, "PASSIVE GRAB"); } + +#endif Index: xc/programs/Xserver/Xext/xtest.c diff -u xc/programs/Xserver/Xext/xtest.c:3.11 xc/programs/Xserver/Xext/xtest.c:3.13 --- xc/programs/Xserver/Xext/xtest.c:3.11 Mon Nov 17 17:20:27 2003 +++ xc/programs/Xserver/Xext/xtest.c Fri Oct 14 11:16:12 2005 @@ -1,4 +1,3 @@ -/* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -26,11 +25,11 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.11 2003/11/17 22:20:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest.c,v 3.13 2005/10/14 15:16:12 tsi Exp $ */ -#include "X.h" +#include #define NEED_EVENTS -#include "Xproto.h" +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -41,11 +40,11 @@ #include "dixevents.h" #include "sleepuntil.h" #define _XTEST_SERVER_ -#include "XTest.h" -#include "xteststr.h" +#include +#include #ifdef XINPUT -#include "XI.h" -#include "XIproto.h" +#include +#include #define EXTENSION_EVENT_BASE 64 #include "extinit.h" /* LookupDeviceIntRec */ #endif /* XINPUT */ @@ -106,14 +105,12 @@ /*ARGSUSED*/ static void -XTestResetProc (extEntry) -ExtensionEntry *extEntry; +XTestResetProc(ExtensionEntry *extEntry) { } static int -ProcXTestGetVersion(client) - register ClientPtr client; +ProcXTestGetVersion(ClientPtr client) { xXTestGetVersionReply rep; register int n; @@ -133,8 +130,7 @@ } static int -ProcXTestCompareCursor(client) - register ClientPtr client; +ProcXTestCompareCursor(ClientPtr client) { REQUEST(xXTestCompareCursorReq); xXTestCompareCursorReply rep; @@ -170,8 +166,7 @@ } static int -ProcXTestFakeInput(client) - register ClientPtr client; +ProcXTestFakeInput(ClientPtr client) { REQUEST(xXTestFakeInputReq); int nev; @@ -465,8 +460,7 @@ } static int -ProcXTestGrabControl(client) - register ClientPtr client; +ProcXTestGrabControl(ClientPtr client) { REQUEST(xXTestGrabControlReq); @@ -484,8 +478,7 @@ } static int -ProcXTestDispatch (client) - register ClientPtr client; +ProcXTestDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) @@ -504,8 +497,7 @@ } static int -SProcXTestGetVersion(client) - register ClientPtr client; +SProcXTestGetVersion(ClientPtr client) { register int n; REQUEST(xXTestGetVersionReq); @@ -517,8 +509,7 @@ } static int -SProcXTestCompareCursor(client) - register ClientPtr client; +SProcXTestCompareCursor(ClientPtr client) { register int n; REQUEST(xXTestCompareCursorReq); @@ -531,9 +522,7 @@ } static int -XTestSwapFakeInput(client, req) - register ClientPtr client; - xReq *req; +XTestSwapFakeInput(ClientPtr client, xReq *req) { register int nev; register xEvent *ev; @@ -557,8 +546,7 @@ } static int -SProcXTestFakeInput(client) - register ClientPtr client; +SProcXTestFakeInput(ClientPtr client) { register int n; REQUEST(xReq); @@ -571,8 +559,7 @@ } static int -SProcXTestGrabControl(client) - register ClientPtr client; +SProcXTestGrabControl(ClientPtr client) { register int n; REQUEST(xXTestGrabControlReq); @@ -583,8 +570,7 @@ } static int -SProcXTestDispatch (client) - register ClientPtr client; +SProcXTestDispatch(ClientPtr client) { REQUEST(xReq); switch (stuff->data) Index: xc/programs/Xserver/Xext/xtest1dd.c diff -u xc/programs/Xserver/Xext/xtest1dd.c:3.7 xc/programs/Xserver/Xext/xtest1dd.c:3.9 --- xc/programs/Xserver/Xext/xtest1dd.c:3.7 Mon Nov 17 17:20:28 2003 +++ xc/programs/Xserver/Xext/xtest1dd.c Fri Oct 14 11:16:12 2005 @@ -1,4 +1,3 @@ -/* $Xorg: xtest1dd.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* * File: xtest1dd.c * @@ -52,7 +51,7 @@ University of California. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.7 2003/11/17 22:20:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1dd.c,v 3.9 2005/10/14 15:16:12 tsi Exp $ */ /*************************************************************** * include files @@ -62,14 +61,14 @@ #define NEED_REPLIES #include -#include "Xos.h" -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include +#include #include "misc.h" #include "dixstruct.h" #define XTestSERVER_SIDE -#include "xtestext1.h" +#include #include "xtest1dd.h" @@ -337,17 +336,12 @@ * * Start stealing input actions and sending them to the passed-in client. */ -void -steal_input(client, mode) -/* - * which client is to receive the input action events - */ -ClientPtr client; /* - * what input action packing mode to use. one of 0, XTestPACKED_MOTION, + * mode: what input action packing mode to use. one of 0, XTestPACKED_MOTION, * or XTestPACKED_ACTIONS; optionally 'or'ed with XTestEXCLUSIVE, */ -CARD32 mode; +void +steal_input(ClientPtr client, CARD32 mode) { if (packet_index != 0) { @@ -449,16 +443,7 @@ * and an XTestJUMP_ACTION. */ void -XTestStealJumpData(jx, jy, dev_type) -/* - * the x and y coordinates to jump to - */ -int jx; -int jy; -/* - * which device caused the jump - */ -int dev_type; +XTestStealJumpData(int jx, int jy, int dev_type) { XTestJumpInfo *jmp_ptr; /* @@ -526,8 +511,7 @@ * current time, and then updates the passed-in time to the current time. */ static CARD32 -current_ms(otime) -struct timeval *otime; +current_ms(struct timeval *otime) { struct timeval tval; unsigned long the_ms; @@ -646,11 +630,7 @@ * */ static int -there_is_room(actsize) -/* - * the number of bytes of space needed - */ -int actsize; +there_is_room(int actsize) { if ((packet_index + actsize) > XTestACTIONS_SIZE) { @@ -671,21 +651,7 @@ * called from x_hil.c */ void -XTestStealMotionData(dx, dy, dev_type, mx, my) -/* - * the x and y delta motion of the locator - */ -int dx; -int dy; -/* - * which locator did the moving - */ -int dev_type; -/* - * the x and y position of the locator before the delta motion - */ -int mx; -int my; +XTestStealMotionData(int dx, int dy, int dev_type, int mx, int my) { /* * pointer to a XTestMOTION_ACTION input action @@ -789,24 +755,8 @@ * */ Bool -XTestStealKeyData(keycode, keystate, dev_type, locx, locy) -/* - * which key/button moved - */ -unsigned keycode; -/* - * whether the key/button was pressed or released - */ -int keystate; -/* - * which device caused the input action - */ -int dev_type; -/* - * the x and y coordinates of the locator when the action happenned - */ -int locx; -int locy; +XTestStealKeyData(unsigned keycode, int keystate, int dev_type, + int locx, int locy) { /* * pointer to key/button motion input action @@ -905,15 +855,7 @@ * from the input action array and send them to the server to be handled. */ void -parse_fake_input(client, req) -/* - * which client did the XTestFakeInput request - */ -ClientPtr client; -/* - * a pointer to the xTestFakeInputReq structure sent by the client - */ -char *req; +parse_fake_input(ClientPtr client, char *req) { /* * if set to 1, done processing input actions from the request @@ -1044,8 +986,7 @@ * pending input events. */ static void -parse_key_fake(fkey) -XTestKeyInfo *fkey; +parse_key_fake(XTestKeyInfo *fkey) { action_array[write_index].type = XTestKEY_ACTION; action_array[write_index].device = XTestUnpackDeviceID(fkey->header); @@ -1065,8 +1006,7 @@ * pending input events. */ static void -parse_motion_fake(fmotion) -XTestMotionInfo *fmotion; +parse_motion_fake(XTestMotionInfo *fmotion) { int dx; int dy; @@ -1107,8 +1047,7 @@ * pending input events. */ static void -parse_jump_fake(fjump) -XTestJumpInfo *fjump; +parse_jump_fake(XTestJumpInfo *fjump) { pmousex = fjump->jumpx; pmousey = fjump->jumpy; @@ -1130,8 +1069,7 @@ * pending input events. */ static void -parse_delay_fake(tevent) -XTestDelayInfo *tevent; +parse_delay_fake(XTestDelayInfo *tevent) { action_array[write_index].type = XTestDELAY_ACTION; action_array[write_index].delay_time = tevent->delay_time; @@ -1146,8 +1084,7 @@ * next monitor event in playback mode. */ void -XTestComputeWaitTime(waittime) -struct timeval *waittime; +XTestComputeWaitTime(struct timeval *waittime) { /* * The playback_on flag is set to 1 in parse_fake_input. It is set to @@ -1204,9 +1141,8 @@ * then take one out and process it. * */ -int -XTestProcessInputAction(readable, waittime) /* + * readable: * This is the value that a 'select' function returned just before this * routine was called. If the select timed out, this value will be 0. * @@ -1216,12 +1152,12 @@ * give it a chance to process an input action. If we have an input action * to process and the only reason that the select returned was because it * timed out, then we change the select value to 1 and return 1 instead of 0. - */ -int readable; -/* + * + * timeout: * this is the timeout value that the select was called with */ -struct timeval *waittime; +int +XTestProcessInputAction(int readable, struct timeval *waittime) { int mousex, mousey; /* @@ -1328,8 +1264,7 @@ * send an xTestFakeAck event to the client */ static void -send_ack(client) -ClientPtr client; +send_ack(ClientPtr client) { xTestFakeAckEvent rep; @@ -1366,8 +1301,7 @@ * for the delta until the time for the next input action. */ static void -compute_action_time(rtime) -struct timeval *rtime; +compute_action_time(struct timeval *rtime) { /* * holds the delay time in milliseconds @@ -1445,8 +1379,7 @@ * the current time. */ static int -find_residual_time(the_residual) -struct timeval *the_residual; +find_residual_time(struct timeval *the_residual) { /* * if > 0, there is time to wait. If < 0, then don't wait @@ -1592,11 +1525,7 @@ * Return the number of input actions in the input action array. */ void -return_input_array_size(client) -/* - * which client to send the reply to - */ -ClientPtr client; +return_input_array_size(ClientPtr client) { xTestQueryInputSizeReply rep; Index: xc/programs/Xserver/Xext/xtest1di.c diff -u xc/programs/Xserver/Xext/xtest1di.c:3.6 xc/programs/Xserver/Xext/xtest1di.c:3.8 --- xc/programs/Xserver/Xext/xtest1di.c:3.6 Mon Nov 17 17:20:28 2003 +++ xc/programs/Xserver/Xext/xtest1di.c Fri Oct 14 11:16:12 2005 @@ -1,4 +1,3 @@ -/* $Xorg: xtest1di.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ /* * File: xtest1di.c * @@ -52,7 +51,7 @@ University of California. */ -/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.6 2003/11/17 22:20:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xtest1di.c,v 3.8 2005/10/14 15:16:12 tsi Exp $ */ /***************************************************************************** * include files @@ -62,8 +61,8 @@ #define NEED_REPLIES #include -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "gcstruct.h" @@ -71,7 +70,7 @@ #include "dixstruct.h" #include "opaque.h" #define XTestSERVER_SIDE -#include "xtestext1.h" +#include #include "modinit.h" #include "xtest1dd.h" @@ -226,8 +225,7 @@ * */ static int -ProcXTestDispatch(client) - register ClientPtr client; +ProcXTestDispatch(ClientPtr client) { REQUEST(xReq); if (stuff->data == X_TestFakeInput) @@ -268,8 +266,7 @@ * */ static int -SProcXTestDispatch(client) - register ClientPtr client; +SProcXTestDispatch(ClientPtr client) { REQUEST(xReq); if (stuff->data == X_TestFakeInput) @@ -310,13 +307,12 @@ * */ static int -SProcTestFakeInput(client) - register ClientPtr client; +SProcTestFakeInput(ClientPtr client) { /* * used in the swaps and swapl macros for temporary storage space */ - register char n; + char n; /* * index counter */ @@ -432,13 +428,12 @@ * */ static int -SProcTestGetInput(client) - register ClientPtr client; +SProcTestGetInput(ClientPtr client) { /* * used in the swaps and swapl macros for temporary storage space */ - register char n; + char n; REQUEST(xTestGetInputReq); /* @@ -456,13 +451,12 @@ * */ static int -SProcTestStopInput(client) - register ClientPtr client; +SProcTestStopInput(ClientPtr client) { /* * used in the swaps and swapl macros for temporary storage space */ - register char n; + char n; REQUEST(xTestStopInputReq); /* @@ -479,13 +473,12 @@ * */ static int -SProcTestReset(client) - register ClientPtr client; +SProcTestReset(ClientPtr client) { /* * used in the swaps and swapl macros for temporary storage space */ - register char n; + char n; REQUEST(xTestResetReq); /* @@ -502,13 +495,12 @@ * */ static int -SProcTestQueryInputSize(client) - register ClientPtr client; +SProcTestQueryInputSize(ClientPtr client) { /* * used in the swaps and swapl macros for temporary storage space */ - register char n; + char n; REQUEST(xTestQueryInputSizeReq); /* @@ -525,8 +517,7 @@ * */ static int -ProcTestFakeInput(client) - register ClientPtr client; +ProcTestFakeInput(ClientPtr client) { REQUEST(xTestFakeInputReq); REQUEST_SIZE_MATCH(xTestFakeInputReq); @@ -574,8 +565,7 @@ * */ static int -ProcTestGetInput(client) - register ClientPtr client; +ProcTestGetInput(ClientPtr client) { REQUEST(xTestGetInputReq); REQUEST_SIZE_MATCH(xTestGetInputReq); @@ -628,8 +618,7 @@ * */ static int -ProcTestStopInput(client) - register ClientPtr client; +ProcTestStopInput(ClientPtr client) { REQUEST_SIZE_MATCH(xTestStopInputReq); if (on_steal_input && (current_xtest_client == client)) @@ -666,8 +655,7 @@ * */ static int -ProcTestReset(client) - register ClientPtr client; +ProcTestReset(ClientPtr client) { REQUEST_SIZE_MATCH(xTestResetReq); on_steal_input = FALSE; @@ -690,8 +678,7 @@ * */ static int -ProcTestQueryInputSize(client) - register ClientPtr client; +ProcTestQueryInputSize(ClientPtr client) { REQUEST_SIZE_MATCH(xTestQueryInputSizeReq); /* @@ -778,7 +765,7 @@ /* * used in the swaps and swapl macros for temporary storage space */ - register char n; + char n; /* * pointer to xTestQueryInputSizeReply */ @@ -811,7 +798,7 @@ /* * used in the swaps and swapl macros for temporary storage space */ - register char n; + char n; /* * index counter */ Index: xc/programs/Xserver/Xext/xvdisp.c diff -u xc/programs/Xserver/Xext/xvdisp.c:1.29 xc/programs/Xserver/Xext/xvdisp.c:1.32 --- xc/programs/Xserver/Xext/xvdisp.c:1.29 Thu Oct 2 09:29:39 2003 +++ xc/programs/Xserver/Xext/xvdisp.c Sun Feb 19 10:51:16 2006 @@ -21,7 +21,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.29 2003/10/02 13:29:39 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvdisp.c,v 1.32 2006/02/19 15:51:16 tsi Exp $ */ /* ** File: @@ -47,8 +47,8 @@ ** */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "scrnintstr.h" #include "windowstr.h" @@ -58,12 +58,12 @@ #include "resource.h" #include "opaque.h" -#include "Xv.h" -#include "Xvproto.h" +#include +#include #include "xvdix.h" #ifdef MITSHM #define _XSHM_SERVER_ -#include "shmstr.h" +#include #endif #ifdef EXTMODULE @@ -530,9 +530,9 @@ static int ProcXvPutVideo(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; XvPortPtr pPort; - register GCPtr pGC; + GCPtr pGC; int status; REQUEST(xvPutVideoReq); @@ -576,9 +576,9 @@ static int ProcXvPutStill(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; XvPortPtr pPort; - register GCPtr pGC; + GCPtr pGC; int status; REQUEST(xvPutStillReq); @@ -623,9 +623,9 @@ static int ProcXvGetVideo(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; XvPortPtr pPort; - register GCPtr pGC; + GCPtr pGC; int status; REQUEST(xvGetVideoReq); @@ -670,9 +670,9 @@ static int ProcXvGetStill(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; XvPortPtr pPort; - register GCPtr pGC; + GCPtr pGC; int status; REQUEST(xvGetStillReq); @@ -716,7 +716,7 @@ static int ProcXvSelectVideoNotify(ClientPtr client) { - register DrawablePtr pDraw; + DrawablePtr pDraw; REQUEST(xvSelectVideoNotifyReq); REQUEST_SIZE_MATCH(xvSelectVideoNotifyReq); @@ -822,7 +822,7 @@ ProcXvStopVideo(ClientPtr client) { int status; - register DrawablePtr pDraw; + DrawablePtr pDraw; XvPortPtr pPort; REQUEST(xvStopVideoReq); REQUEST_SIZE_MATCH(xvStopVideoReq); @@ -1208,7 +1208,7 @@ } #endif -#ifdef XvMCExtension +#ifdef XVMC #include "xvmcext.h" #endif @@ -1239,7 +1239,7 @@ } } -#ifdef XvMCExtension +#ifdef XVMC if(!pImage) pImage = XvMCFindXvImage(pPort, stuff->id); #endif @@ -1340,7 +1340,7 @@ static int SProcXvQueryExtension(ClientPtr client) { - register char n; + char n; REQUEST(xvQueryExtensionReq); swaps(&stuff->length, n); return ProcXvQueryExtension(client); @@ -1349,7 +1349,7 @@ static int SProcXvQueryAdaptors(ClientPtr client) { - register char n; + char n; REQUEST(xvQueryAdaptorsReq); swaps(&stuff->length, n); swapl(&stuff->window, n); @@ -1359,7 +1359,7 @@ static int SProcXvQueryEncodings(ClientPtr client) { - register char n; + char n; REQUEST(xvQueryEncodingsReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1369,7 +1369,7 @@ static int SProcXvGrabPort(ClientPtr client) { - register char n; + char n; REQUEST(xvGrabPortReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1380,7 +1380,7 @@ static int SProcXvUngrabPort(ClientPtr client) { - register char n; + char n; REQUEST(xvUngrabPortReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1391,7 +1391,7 @@ static int SProcXvPutVideo(ClientPtr client) { - register char n; + char n; REQUEST(xvPutVideoReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1411,7 +1411,7 @@ static int SProcXvPutStill(ClientPtr client) { - register char n; + char n; REQUEST(xvPutStillReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1431,7 +1431,7 @@ static int SProcXvGetVideo(ClientPtr client) { - register char n; + char n; REQUEST(xvGetVideoReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1451,7 +1451,7 @@ static int SProcXvGetStill(ClientPtr client) { - register char n; + char n; REQUEST(xvGetStillReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1471,7 +1471,7 @@ static int SProcXvPutImage(ClientPtr client) { - register char n; + char n; REQUEST(xvPutImageReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1495,7 +1495,7 @@ static int SProcXvShmPutImage(ClientPtr client) { - register char n; + char n; REQUEST(xvShmPutImageReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1522,7 +1522,7 @@ static int SProcXvSelectVideoNotify(ClientPtr client) { - register char n; + char n; REQUEST(xvSelectVideoNotifyReq); swaps(&stuff->length, n); swapl(&stuff->drawable, n); @@ -1532,7 +1532,7 @@ static int SProcXvSelectPortNotify(ClientPtr client) { - register char n; + char n; REQUEST(xvSelectPortNotifyReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1542,7 +1542,7 @@ static int SProcXvStopVideo(ClientPtr client) { - register char n; + char n; REQUEST(xvStopVideoReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1553,7 +1553,7 @@ static int SProcXvSetPortAttribute(ClientPtr client) { - register char n; + char n; REQUEST(xvSetPortAttributeReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1564,7 +1564,7 @@ static int SProcXvGetPortAttribute(ClientPtr client) { - register char n; + char n; REQUEST(xvGetPortAttributeReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1575,7 +1575,7 @@ static int SProcXvQueryBestSize(ClientPtr client) { - register char n; + char n; REQUEST(xvQueryBestSizeReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1589,7 +1589,7 @@ static int SProcXvQueryPortAttributes(ClientPtr client) { - register char n; + char n; REQUEST(xvQueryPortAttributesReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1599,7 +1599,7 @@ static int SProcXvQueryImageAttributes(ClientPtr client) { - register char n; + char n; REQUEST(xvQueryImageAttributesReq); swaps(&stuff->length, n); swapl(&stuff->id, n); @@ -1611,7 +1611,7 @@ static int SProcXvListImageFormats(ClientPtr client) { - register char n; + char n; REQUEST(xvListImageFormatsReq); swaps(&stuff->length, n); swapl(&stuff->port, n); @@ -1624,7 +1624,7 @@ ClientPtr client, xvQueryExtensionReply *rep ){ - register char n; + char n; swaps(&rep->sequenceNumber, n); swapl(&rep->length, n); @@ -1641,7 +1641,7 @@ ClientPtr client, xvQueryAdaptorsReply *rep ){ - register char n; + char n; swaps(&rep->sequenceNumber, n); swapl(&rep->length, n); @@ -1657,7 +1657,7 @@ ClientPtr client, xvQueryEncodingsReply *rep ){ - register char n; + char n; swaps(&rep->sequenceNumber, n); swapl(&rep->length, n); @@ -1673,7 +1673,7 @@ ClientPtr client, xvAdaptorInfo *pAdaptor ){ - register char n; + char n; swapl(&pAdaptor->base_id, n); swaps(&pAdaptor->name_size, n); @@ -1690,7 +1690,7 @@ ClientPtr client, xvEncodingInfo *pEncoding ){ - register char n; + char n; swapl(&pEncoding->encoding, n); swaps(&pEncoding->name_size, n); @@ -1708,7 +1708,7 @@ ClientPtr client, xvFormat *pFormat ){ - register char n; + char n; swapl(&pFormat->visual, n); (void)WriteToClient(client, sz_xvFormat, (char *)pFormat); @@ -1721,7 +1721,7 @@ ClientPtr client, xvAttributeInfo *pAtt ){ - register char n; + char n; swapl(&pAtt->flags, n); swapl(&pAtt->size, n); @@ -1737,7 +1737,7 @@ ClientPtr client, xvImageFormatInfo *pImage ){ - register char n; + char n; swapl(&pImage->id, n); swapl(&pImage->red_mask, n); @@ -1765,7 +1765,7 @@ ClientPtr client, xvGrabPortReply *rep ){ - register char n; + char n; swaps(&rep->sequenceNumber, n); swapl(&rep->length, n); @@ -1780,7 +1780,7 @@ ClientPtr client, xvGetPortAttributeReply *rep ){ - register char n; + char n; swaps(&rep->sequenceNumber, n); swapl(&rep->length, n); @@ -1796,7 +1796,7 @@ ClientPtr client, xvQueryBestSizeReply *rep ){ - register char n; + char n; swaps(&rep->sequenceNumber, n); swapl(&rep->length, n); @@ -1813,7 +1813,7 @@ ClientPtr client, xvQueryPortAttributesReply *rep ){ - register char n; + char n; swaps(&rep->sequenceNumber, n); swapl(&rep->length, n); @@ -1830,7 +1830,7 @@ ClientPtr client, xvQueryImageAttributesReply *rep ){ - register char n; + char n; swaps(&rep->sequenceNumber, n); swapl(&rep->length, n); @@ -1850,7 +1850,7 @@ ClientPtr client, xvListImageFormatsReply *rep ){ - register char n; + char n; swaps(&rep->sequenceNumber, n); swapl(&rep->length, n); Index: xc/programs/Xserver/Xext/xvdix.h diff -u xc/programs/Xserver/Xext/xvdix.h:1.8 xc/programs/Xserver/Xext/xvdix.h:1.9 --- xc/programs/Xserver/Xext/xvdix.h:1.8 Wed Jul 25 11:05:00 2001 +++ xc/programs/Xserver/Xext/xvdix.h Fri Oct 14 11:16:12 2005 @@ -21,7 +21,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.8 2001/07/25 15:05:00 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvdix.h,v 1.9 2005/10/14 15:16:12 tsi Exp $ */ #ifndef XVDIX_H #define XVDIX_H @@ -54,7 +54,7 @@ */ #include "scrnintstr.h" -#include "Xvproto.h" +#include extern int XvScreenIndex; extern unsigned long XvExtensionGeneration; Index: xc/programs/Xserver/Xext/xvmain.c diff -u xc/programs/Xserver/Xext/xvmain.c:1.16 xc/programs/Xserver/Xext/xvmain.c:1.18 --- xc/programs/Xserver/Xext/xvmain.c:1.16 Tue Oct 28 18:08:44 2003 +++ xc/programs/Xserver/Xext/xvmain.c Fri Oct 14 11:16:12 2005 @@ -21,7 +21,7 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.16 2003/10/28 23:08:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmain.c,v 1.18 2005/10/14 15:16:12 tsi Exp $ */ /* ** File: @@ -74,8 +74,8 @@ ** */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "scrnintstr.h" @@ -90,8 +90,8 @@ #define GLOBAL -#include "Xv.h" -#include "Xvproto.h" +#include +#include #include "xvdix.h" #ifdef EXTMODULE @@ -205,7 +205,6 @@ static Bool CreateResourceTypes() - { if (XvResourceGeneration == serverGeneration) return TRUE; @@ -530,12 +529,7 @@ } static int -XvdiSendVideoNotify(pPort, pDraw, reason) - -XvPortPtr pPort; -DrawablePtr pDraw; -int reason; - +XvdiSendVideoNotify(XvPortPtr pPort, DrawablePtr pDraw, int reason) { xvEvent event; XvVideoNotifyPtr pn; @@ -1170,7 +1164,6 @@ static void WriteSwappedVideoNotifyEvent(xvEvent *from, xvEvent *to) - { to->u.u.type = from->u.u.type; @@ -1185,7 +1178,6 @@ static void WriteSwappedPortNotifyEvent(xvEvent *from, xvEvent *to) - { to->u.u.type = from->u.u.type; Index: xc/programs/Xserver/Xext/xvmc.c diff -u xc/programs/Xserver/Xext/xvmc.c:1.9 xc/programs/Xserver/Xext/xvmc.c:1.11 --- xc/programs/Xserver/Xext/xvmc.c:1.9 Thu Jul 17 12:04:33 2003 +++ xc/programs/Xserver/Xext/xvmc.c Fri Oct 14 11:16:12 2005 @@ -1,9 +1,9 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.9 2003/07/17 16:04:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmc.c,v 1.11 2005/10/14 15:16:12 tsi Exp $ */ #define NEED_REPLIES #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "misc.h" #include "os.h" #include "dixstruct.h" @@ -11,11 +11,11 @@ #include "scrnintstr.h" #include "extnsionst.h" #include "servermd.h" -#include "Xfuncproto.h" +#include #include "xvdix.h" -#include "XvMC.h" -#include "Xvproto.h" -#include "XvMCproto.h" +#include +#include +#include #include "xvmcext.h" int XvMCScreenIndex = -1; @@ -557,7 +557,7 @@ }; static int -ProcXvMCDispatch (ClientPtr client) +ProcXvMCDispatch(ClientPtr client) { REQUEST(xReq); @@ -568,7 +568,7 @@ } static int -SProcXvMCDispatch (ClientPtr client) +SProcXvMCDispatch(ClientPtr client) { /* We only support local */ return BadImplementation; @@ -603,7 +603,7 @@ } static Bool -XvMCCloseScreen (int i, ScreenPtr pScreen) +XvMCCloseScreen(int i, ScreenPtr pScreen) { XvMCScreenPtr pScreenPriv = XVMC_GET_PRIVATE(pScreen); @@ -641,7 +641,8 @@ return Success; } -XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id) +XvImagePtr +XvMCFindXvImage(XvPortPtr pPort, CARD32 id) { XvImagePtr pImage = NULL; ScreenPtr pScreen = pPort->pAdaptor->pScreen; Index: xc/programs/Xserver/Xext/xvmcext.h diff -u xc/programs/Xserver/Xext/xvmcext.h:1.2 xc/programs/Xserver/Xext/xvmcext.h:1.3 --- xc/programs/Xserver/Xext/xvmcext.h:1.2 Thu Jul 17 12:04:33 2003 +++ xc/programs/Xserver/Xext/xvmcext.h Fri Oct 14 11:16:12 2005 @@ -1,8 +1,8 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.2 2003/07/17 16:04:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmcext.h,v 1.3 2005/10/14 15:16:12 tsi Exp $ */ #ifndef _XVMC_H #define _XVMC_H -#include "Xv.h" +#include #include "xvdix.h" typedef struct { Index: xc/programs/Xserver/Xext/xvmod.c diff -u xc/programs/Xserver/Xext/xvmod.c:1.2 xc/programs/Xserver/Xext/xvmod.c:1.3 --- xc/programs/Xserver/Xext/xvmod.c:1.2 Sun Mar 4 23:51:55 2001 +++ xc/programs/Xserver/Xext/xvmod.c Fri Oct 14 11:16:12 2005 @@ -1,11 +1,11 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.3 2005/10/14 15:16:12 tsi Exp $ */ -#include "X.h" +#include #include "misc.h" #include "scrnintstr.h" #include "gc.h" -#include "Xv.h" -#include "Xvproto.h" +#include +#include #include "xvdix.h" #include "xvmodproc.h" Index: xc/programs/Xserver/Xext/extmod/Imakefile diff -u xc/programs/Xserver/Xext/extmod/Imakefile:1.24 xc/programs/Xserver/Xext/extmod/Imakefile:1.27 --- xc/programs/Xserver/Xext/extmod/Imakefile:1.24 Mon May 31 20:16:59 2004 +++ xc/programs/Xserver/Xext/extmod/Imakefile Sun Feb 19 10:51:17 2006 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/programs/Xserver/Xext/extmod/Imakefile,v 1.24 2004/06/01 00:16:59 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/Xext/extmod/Imakefile,v 1.27 2006/02/19 15:51:17 tsi Exp $ /* - * Copyright (c) 1994-2004 by The XFree86 Project, Inc. + * Copyright (c) 1994-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -90,9 +90,6 @@ #if BuildFontCache FONTCACHESRCS = fontcache.c FONTCACHEOBJS = fontcache.o -#if 0 - FONTCACHEINCLUDES = -I$(XF86SRC)/os-support -#endif LinkSourceFile(fontcache.c,..) #endif @@ -106,8 +103,8 @@ #endif #if BuildXResExt - XRESSRCS = xres.c - XRESOBJS = xres.o + XRESSRCS = xres.c + XRESOBJS = xres.o LinkSourceFile(xres.c,..) #endif @@ -124,34 +121,56 @@ LinkSourceFile(cup.c,..) #endif - MODINITSRCS = modinit.c - MODINITOBJS = modinit.o - - SRCS = shape.c $(MULTIBUFSRC) \ - mitmisc.c \ - bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c $(VIDMODESRCS) \ - $(XF86MISCSRCS) $(XF86DGASRCS) \ - $(CUPSRCS) $(DPMSSRCS) $(FONTCACHESRCS) \ - $(EVISRCS) $(XVSRCS) $(MODINITSRCS) $(XRESSRCS) - - MOBJS = $(MODINITOBJS) shape.o $(MULTIBUFOBJ) mitmisc.o \ - bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o \ - $(VIDMODEOBJS) $(XF86MISCOBJS) $(XF86DGAOBJS) \ - $(CUPOBJS) $(DPMSOBJS) $(FONTCACHEOBJS) \ - $(EVIOBJS) $(XVOBJS) $(XRESOBJS) - - DEFINES = -DEXTMODULE $(EXT_DEFINES) - -XF86INCLUDES = -I$(XF86COMSRC) - INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - $(XF86INCLUDES) $(FONTCACHEINCLUDES) -I$(FONTINCSRC) - LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln - +#if BuildShapeExt + SHAPESRCS = shape.c + SHAPEOBJS = shape.o LinkSourceFile(shape.c,..) +#endif + +#if BuildMITMiscExt + MITMISCSRCS = mitmisc.c + MITMISCOBJS = mitmisc.o LinkSourceFile(mitmisc.c,..) +#endif + +#if BuildBigReqsExt + BIGREQSRCS = bigreq.c + BIGREQOBJS = bigreq.o LinkSourceFile(bigreq.c,..) +#endif + +#if BuildSyncExt + SYNCSRCS = sync.c + SYNCOBJS = sync.o LinkSourceFile(sync.c,..) +#endif + +#if BuildXCMiscExt + XCMISCSRCS = xcmisc.c + XCMISCOBJS = xcmisc.o LinkSourceFile(xcmisc.c,..) +#endif + + MODINITSRCS = modinit.c + MODINITOBJS = modinit.o + + SRCS = $(MODINITSRCS) $(SHAPESRCS) $(MULTIBUFSRC) $(MITMISCSRCS) \ + $(BIGREQSRCS) $(SYNCSRCS) $(SCRNSAVSRC) $(XCMISCSRCS) \ + $(VIDMODESRCS) $(XF86MISCSRCS) $(XF86DGASRCS) $(CUPSRCS) \ + $(DPMSSRCS) $(FONTCACHESRCS) $(EVISRCS) $(XVSRCS) \ + $(XRESSRCS) + + MOBJS = $(MODINITOBJS) $(SHAPEOBJS) $(MULTIBUFOBJ) $(MITMISCOBJS) \ + $(BIGREQOBJS) $(SYNCOBJS) $(SCRNSAVOBJ) $(XCMISCOBJS) \ + $(VIDMODEOBJS) $(XF86MISCOBJS) $(XF86DGAOBJS) $(CUPOBJS) \ + $(DPMSOBJS) $(FONTCACHEOBJS) $(EVIOBJS) $(XVOBJS) \ + $(XRESOBJS) + + DEFINES = -DEXTMODULE $(EXT_DEFINES) + + XF86INCLUDES = -I$(XF86COMSRC) + INCLUDES = -I.. -I../../include $(XF86INCLUDES) + LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln ModuleObjectRule() @@ -162,7 +181,7 @@ SpecialCObjectRule(xf86vmode,NullParameter,-O0) #endif -SpecialCObjectRule(modinit,$(ICONFIGFILES),$(EXT_DEFINES)) +SpecialCObjectRule(modinit,$(ICONFIGFILES),NullParameter) LibraryModuleTarget(extmod,$(MOBJS),extensions) NormalLintTarget($(SRCS)) Index: xc/programs/Xserver/Xext/extmod/modinit.c diff -u xc/programs/Xserver/Xext/extmod/modinit.c:1.17 xc/programs/Xserver/Xext/extmod/modinit.c:1.20 --- xc/programs/Xserver/Xext/extmod/modinit.c:1.17 Tue Jul 15 21:38:33 2003 +++ xc/programs/Xserver/Xext/extmod/modinit.c Thu Mar 16 11:49:50 2006 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.17 2003/07/16 01:38:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.c,v 1.20 2006/03/16 16:49:50 dawes Exp $ */ /* * @@ -29,7 +29,7 @@ #include "xf86Module.h" #include "xf86Opt.h" -#include "Xproto.h" +#include #include "modinit.h" @@ -181,6 +181,8 @@ XvRegister, NULL }, +#endif +#ifdef XVMC { XvMCExtensionInit, XvMCName, @@ -227,7 +229,7 @@ XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL }; static pointer -extmodSetup(pointer module, pointer opts, int *errmaj, int *errmin) +extmodSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { int i; Index: xc/programs/Xserver/Xext/extmod/modinit.h diff -u xc/programs/Xserver/Xext/extmod/modinit.h:1.2 xc/programs/Xserver/Xext/extmod/modinit.h:1.5 --- xc/programs/Xserver/Xext/extmod/modinit.h:1.2 Sat Sep 13 17:33:04 2003 +++ xc/programs/Xserver/Xext/extmod/modinit.h Sun Feb 19 10:51:17 2006 @@ -1,32 +1,30 @@ -/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.2 2003/09/13 21:33:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.5 2006/02/19 15:51:17 tsi Exp $ */ -#ifndef INITARGS -#define INITARGS void -#endif +#include "extnsionst.h" #ifdef SHAPE extern void ShapeExtensionInit(INITARGS); #define _SHAPE_SERVER_ /* don't want Xlib structures */ -#include "shapestr.h" +#include #endif #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); #define _MULTIBUF_SERVER_ /* don't want Xlib structures */ -#include "multibufst.h" +#include #endif #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); #define _MITMISC_SERVER_ -#include "mitmiscstr.h" +#include #endif #ifdef XTEST extern void XTestExtensionInit(INITARGS); #define _XTEST_SERVER_ -#include "XTest.h" -#include "xteststr.h" +#include +#include #endif #if 1 @@ -35,92 +33,92 @@ #ifdef BIGREQS extern void BigReqExtensionInit(INITARGS); -#include "bigreqstr.h" +#include #endif #ifdef XSYNC extern void SyncExtensionInit(INITARGS); #define _SYNC_SERVER -#include "sync.h" -#include "syncstr.h" +#include +#include #endif #ifdef SCREENSAVER extern void ScreenSaverExtensionInit (INITARGS); -#include "saver.h" +#include #endif #ifdef XCMISC extern void XCMiscExtensionInit(INITARGS); -#include "xcmiscstr.h" +#include #endif #ifdef XF86VIDMODE extern void XFree86VidModeExtensionInit(INITARGS); #define _XF86VIDMODE_SERVER_ -#include "xf86vmstr.h" +#include #endif #ifdef XF86MISC extern void XFree86MiscExtensionInit(INITARGS); #define _XF86MISC_SERVER_ #define _XF86MISC_SAVER_COMPAT_ -#include "xf86mscstr.h" +#include #endif #ifdef XFreeXDGA extern void XFree86DGAExtensionInit(INITARGS); extern void XFree86DGARegister(INITARGS); #define _XF86DGA_SERVER_ -#include "xf86dgastr.h" +#include #endif #ifdef DPMSExtension extern void DPMSExtensionInit(INITARGS); -#include "dpmsstr.h" +#include #endif #ifdef FONTCACHE extern void FontCacheExtensionInit(INITARGS); #define _FONTCACHE_SERVER_ -#include "fontcacheP.h" -#include "fontcachstr.h" +#include +#include #endif #ifdef TOGCUP extern void XcupExtensionInit(INITARGS); #define _XCUP_SERVER_ -#include "Xcupstr.h" +#include #endif #ifdef EVI extern void EVIExtensionInit(INITARGS); #define _XEVI_SERVER_ -#include "XEVIstr.h" +#include #endif #ifdef XV extern void XvExtensionInit(INITARGS); -extern void XvMCExtensionInit(INITARGS); extern void XvRegister(INITARGS); -#include "Xv.h" -#include "XvMC.h" +#include +#endif +#ifdef XVMC +extern void XvMCExtensionInit(INITARGS); +#include #endif #ifdef RES extern void ResExtensionInit(INITARGS); -#include "XResproto.h" +#include #endif -#ifdef SHM +#ifdef MITSHM extern void ShmExtensionInit(INITARGS); -#include "shmstr.h" +#define _XSHM_SERVER_ +#include extern void ShmSetPixmapFormat( ScreenPtr pScreen, int format); -extern void ShmRegisterFuncs( - ScreenPtr pScreen, - ShmFuncsPtr funcs); #endif #if 1 Index: xc/programs/Xserver/Xext/tiny/Imakefile diff -u xc/programs/Xserver/Xext/tiny/Imakefile:1.2 xc/programs/Xserver/Xext/tiny/Imakefile:removed --- xc/programs/Xserver/Xext/tiny/Imakefile:1.2 Thu Aug 5 16:37:42 2004 +++ xc/programs/Xserver/Xext/tiny/Imakefile Tue May 9 21:55:53 2006 @@ -1,66 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/Xext/tiny/Imakefile,v 1.2 2004/08/05 20:37:42 tsi Exp $ -/* - * Copyright (c) 2004 by 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 in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution, and in the same place and form as other copyright, - * license and disclaimer information. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: "This product - * includes software developed by The XFree86 Project, Inc - * (http://www.xfree86.org/) and its contributors", in the same - * place and form as other third-party acknowledgments. Alternately, - * this acknowledgment may appear in the software itself, in the - * same form and location as other such third-party acknowledgments. - * - * 4. Except as contained in this notice, the name of The XFree86 - * Project, Inc shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from The XFree86 Project, Inc. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#undef XF86Server -#define XF86Server NO -#undef DoLoadableServer -#define DoLoadableServer NO -#undef BuildTinyDIX -#define BuildTinyDIX YES -#define LinkDirectory .. - -/* - * The above doesn't really work because rules that depend on the symbols being - * over-ridden above have already been #define'd. Catch this at the Makefiles - * stage. - */ -IMAKE_DEFINES=-DXF86Server=NO -DBuildTinyDIX=YES - -#include "../Imakefile" - -Makefiles:: Makefile Index: xc/programs/Xserver/Xi/Imakefile diff -u xc/programs/Xserver/Xi/Imakefile:3.3 xc/programs/Xserver/Xi/Imakefile:3.5 --- xc/programs/Xserver/Xi/Imakefile:3.3 Wed Jan 17 17:13:23 2001 +++ xc/programs/Xserver/Xi/Imakefile Sun Feb 19 10:51:17 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/Xi/Imakefile,v 3.3 2001/01/17 22:13:23 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/Xi/Imakefile,v 3.5 2006/02/19 15:51:17 tsi Exp $ #include @@ -41,7 +36,6 @@ setmode.c \ setbmap.c \ setmmap.c \ - stubs.c \ ungrdev.c \ ungrdevb.c \ ungrdevk.c @@ -83,7 +77,7 @@ ungrdev.o \ ungrdevb.o \ ungrdevk.o - INCLUDES = -I../include -I$(EXTINCSRC) -I$(XINCLUDESRC) + INCLUDES = -I../include LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln NormalLibraryTarget(xinput,$(OBJS)) Index: xc/programs/Xserver/Xi/allowev.c diff -u xc/programs/Xserver/Xi/allowev.c:3.4 xc/programs/Xserver/Xi/allowev.c:3.5 --- xc/programs/Xserver/Xi/allowev.c:3.4 Fri Dec 14 14:58:54 2001 +++ xc/programs/Xserver/Xi/allowev.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: allowev.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.5 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/allowev.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/chgdctl.c diff -u xc/programs/Xserver/Xi/chgdctl.c:3.4 xc/programs/Xserver/Xi/chgdctl.c:3.5 --- xc/programs/Xserver/Xi/chgdctl.c:3.4 Fri Dec 14 14:58:54 2001 +++ xc/programs/Xserver/Xi/chgdctl.c Fri Oct 14 11:16:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: chgdctl.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.5 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ @@ -45,7 +45,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgdctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */ /******************************************************************** * @@ -55,11 +54,11 @@ #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" /* control constants */ +#include +#include /* control constants */ #include "XIstubs.h" #include "extnsionst.h" Index: xc/programs/Xserver/Xi/chgfctl.c diff -u xc/programs/Xserver/Xi/chgfctl.c:3.4 xc/programs/Xserver/Xi/chgfctl.c:3.5 --- xc/programs/Xserver/Xi/chgfctl.c:3.4 Fri Dec 14 14:58:54 2001 +++ xc/programs/Xserver/Xi/chgfctl.c Fri Oct 14 11:16:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: chgfctl.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.5 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ @@ -45,7 +45,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgfctl.c,v 3.4 2001/12/14 19:58:54 dawes Exp $ */ /******************************************************************** * @@ -55,11 +54,11 @@ #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" /* control constants */ +#include +#include /* control constants */ #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/chgkbd.c diff -u xc/programs/Xserver/Xi/chgkbd.c:3.6 xc/programs/Xserver/Xi/chgkbd.c:3.7 --- xc/programs/Xserver/Xi/chgkbd.c:3.6 Fri Dec 14 14:58:54 2001 +++ xc/programs/Xserver/Xi/chgkbd.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: chgkbd.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.7 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgkbd.c,v 3.6 2001/12/14 19:58:54 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "XIstubs.h" #include "globals.h" #include "extnsionst.h" Index: xc/programs/Xserver/Xi/chgkmap.c diff -u xc/programs/Xserver/Xi/chgkmap.c:3.3 xc/programs/Xserver/Xi/chgkmap.c:3.4 --- xc/programs/Xserver/Xi/chgkmap.c:3.3 Fri Dec 14 14:58:55 2001 +++ xc/programs/Xserver/Xi/chgkmap.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: chgkmap.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgkmap.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */ /******************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" Index: xc/programs/Xserver/Xi/chgprop.c diff -u xc/programs/Xserver/Xi/chgprop.c:3.3 xc/programs/Xserver/Xi/chgprop.c:3.4 --- xc/programs/Xserver/Xi/chgprop.c:3.3 Fri Dec 14 14:58:55 2001 +++ xc/programs/Xserver/Xi/chgprop.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: chgprop.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgprop.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */ /*********************************************************************** * @@ -55,12 +53,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/chgptr.c diff -u xc/programs/Xserver/Xi/chgptr.c:3.7 xc/programs/Xserver/Xi/chgptr.c:3.8 --- xc/programs/Xserver/Xi/chgptr.c:3.7 Fri Dec 14 14:58:55 2001 +++ xc/programs/Xserver/Xi/chgptr.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: chgptr.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.8 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/chgptr.c,v 3.7 2001/12/14 19:58:55 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "XIstubs.h" #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ Index: xc/programs/Xserver/Xi/closedev.c diff -u xc/programs/Xserver/Xi/closedev.c:3.4 xc/programs/Xserver/Xi/closedev.c:3.5 --- xc/programs/Xserver/Xi/closedev.c:3.4 Fri Dec 14 14:58:55 2001 +++ xc/programs/Xserver/Xi/closedev.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: closedev.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.5 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/closedev.c,v 3.4 2001/12/14 19:58:55 dawes Exp $ */ /*********************************************************************** * @@ -55,13 +53,13 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/devbell.c diff -u xc/programs/Xserver/Xi/devbell.c:3.3 xc/programs/Xserver/Xi/devbell.c:3.4 --- xc/programs/Xserver/Xi/devbell.c:3.3 Fri Dec 14 14:58:55 2001 +++ xc/programs/Xserver/Xi/devbell.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: devbell.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/devbell.c,v 3.3 2001/12/14 19:58:55 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/exevents.c diff -u xc/programs/Xserver/Xi/exevents.c:3.11 xc/programs/Xserver/Xi/exevents.c:3.12 --- xc/programs/Xserver/Xi/exevents.c:3.11 Mon Nov 17 17:20:29 2003 +++ xc/programs/Xserver/Xi/exevents.c Fri Oct 14 11:16:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: exevents.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.12 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -44,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/exevents.c,v 3.11 2003/11/17 22:20:29 dawes Exp $ */ /******************************************************************** * @@ -55,10 +54,10 @@ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "XI.h" -#include "XIproto.h" +#include +#include +#include +#include #include "inputstr.h" #include "windowstr.h" #include "miscstruct.h" Index: xc/programs/Xserver/Xi/extinit.c diff -u xc/programs/Xserver/Xi/extinit.c:3.7 xc/programs/Xserver/Xi/extinit.c:3.8 --- xc/programs/Xserver/Xi/extinit.c:3.7 Mon Nov 17 17:20:29 2003 +++ xc/programs/Xserver/Xi/extinit.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: extinit.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.8 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/extinit.c,v 3.7 2003/11/17 22:20:29 dawes Exp $ */ /******************************************************************** * @@ -57,13 +55,13 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" -#include "Xproto.h" +#include +#include #include "inputstr.h" #include "gcstruct.h" /* pointer for extnsionst.h*/ #include "extnsionst.h" /* extension entry */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "dixevents.h" #include "exevents.h" Index: xc/programs/Xserver/Xi/getbmap.c diff -u xc/programs/Xserver/Xi/getbmap.c:3.3 xc/programs/Xserver/Xi/getbmap.c:3.4 --- xc/programs/Xserver/Xi/getbmap.c:3.3 Fri Dec 14 14:58:56 2001 +++ xc/programs/Xserver/Xi/getbmap.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: getbmap.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getbmap.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/getdctl.c diff -u xc/programs/Xserver/Xi/getdctl.c:3.4 xc/programs/Xserver/Xi/getdctl.c:3.5 --- xc/programs/Xserver/Xi/getdctl.c:3.4 Fri Dec 14 14:58:56 2001 +++ xc/programs/Xserver/Xi/getdctl.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: getdctl.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.5 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getdctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */ /******************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/getfctl.c diff -u xc/programs/Xserver/Xi/getfctl.c:3.4 xc/programs/Xserver/Xi/getfctl.c:3.5 --- xc/programs/Xserver/Xi/getfctl.c:3.4 Fri Dec 14 14:58:56 2001 +++ xc/programs/Xserver/Xi/getfctl.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: getfctl.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.5 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getfctl.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */ /******************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/getfocus.c diff -u xc/programs/Xserver/Xi/getfocus.c:3.3 xc/programs/Xserver/Xi/getfocus.c:3.4 --- xc/programs/Xserver/Xi/getfocus.c:3.3 Fri Dec 14 14:58:56 2001 +++ xc/programs/Xserver/Xi/getfocus.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: getfocus.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getfocus.c,v 3.3 2001/12/14 19:58:56 dawes Exp $ */ /*********************************************************************** * @@ -55,12 +53,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "windowstr.h" /* focus struct */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/getkmap.c diff -u xc/programs/Xserver/Xi/getkmap.c:3.4 xc/programs/Xserver/Xi/getkmap.c:3.5 --- xc/programs/Xserver/Xi/getkmap.c:3.4 Fri Dec 14 14:58:56 2001 +++ xc/programs/Xserver/Xi/getkmap.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: getkmap.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.5 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getkmap.c,v 3.4 2001/12/14 19:58:56 dawes Exp $ */ /******************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/getmmap.c diff -u xc/programs/Xserver/Xi/getmmap.c:3.3 xc/programs/Xserver/Xi/getmmap.c:3.4 --- xc/programs/Xserver/Xi/getmmap.c:3.3 Fri Dec 14 14:58:57 2001 +++ xc/programs/Xserver/Xi/getmmap.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: getmmap.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getmmap.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ /******************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" /* Request macro */ +#include +#include /* Request macro */ #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/getprop.c diff -u xc/programs/Xserver/Xi/getprop.c:3.6 xc/programs/Xserver/Xi/getprop.c:3.7 --- xc/programs/Xserver/Xi/getprop.c:3.6 Fri Dec 14 14:58:57 2001 +++ xc/programs/Xserver/Xi/getprop.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: getprop.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.7 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getprop.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * @@ -55,12 +53,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structs */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/getselev.c diff -u xc/programs/Xserver/Xi/getselev.c:3.6 xc/programs/Xserver/Xi/getselev.c:3.7 --- xc/programs/Xserver/Xi/getselev.c:3.6 Fri Dec 14 14:58:57 2001 +++ xc/programs/Xserver/Xi/getselev.c Fri Oct 14 11:16:14 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.6 2001/12/14 19:58:57 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/getselev.c,v 3.7 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,8 +45,6 @@ ********************************************************/ -/* $Xorg: getselev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - /*********************************************************************** * * Extension function to get the current selected events for a given window. @@ -55,10 +53,10 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ -#include "XI.h" -#include "XIproto.h" +#include /* for inputstr.h */ +#include /* Request macro */ +#include +#include #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window struct */ #include "extnsionst.h" Index: xc/programs/Xserver/Xi/getvers.c diff -u xc/programs/Xserver/Xi/getvers.c:3.3 xc/programs/Xserver/Xi/getvers.c:3.4 --- xc/programs/Xserver/Xi/getvers.c:3.3 Fri Dec 14 14:58:57 2001 +++ xc/programs/Xserver/Xi/getvers.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: getvers.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/getvers.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/grabdev.c diff -u xc/programs/Xserver/Xi/grabdev.c:3.3 xc/programs/Xserver/Xi/grabdev.c:3.4 --- xc/programs/Xserver/Xi/grabdev.c:3.3 Fri Dec 14 14:58:57 2001 +++ xc/programs/Xserver/Xi/grabdev.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: grabdev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdev.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * @@ -56,12 +54,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/grabdevb.c diff -u xc/programs/Xserver/Xi/grabdevb.c:3.3 xc/programs/Xserver/Xi/grabdevb.c:3.4 --- xc/programs/Xserver/Xi/grabdevb.c:3.3 Fri Dec 14 14:58:57 2001 +++ xc/programs/Xserver/Xi/grabdevb.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: grabdevb.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdevb.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * @@ -55,12 +53,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/grabdevk.c diff -u xc/programs/Xserver/Xi/grabdevk.c:3.3 xc/programs/Xserver/Xi/grabdevk.c:3.4 --- xc/programs/Xserver/Xi/grabdevk.c:3.3 Fri Dec 14 14:58:57 2001 +++ xc/programs/Xserver/Xi/grabdevk.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: grabdevk.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/grabdevk.c,v 3.3 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * @@ -55,12 +53,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/gtmotion.c diff -u xc/programs/Xserver/Xi/gtmotion.c:3.7 xc/programs/Xserver/Xi/gtmotion.c:3.8 --- xc/programs/Xserver/Xi/gtmotion.c:3.7 Fri Dec 14 14:58:57 2001 +++ xc/programs/Xserver/Xi/gtmotion.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: gtmotion.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.8 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/gtmotion.c,v 3.7 2001/12/14 19:58:57 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" Index: xc/programs/Xserver/Xi/listdev.c diff -u xc/programs/Xserver/Xi/listdev.c:3.4 xc/programs/Xserver/Xi/listdev.c:3.5 --- xc/programs/Xserver/Xi/listdev.c:3.4 Fri Dec 14 14:58:58 2001 +++ xc/programs/Xserver/Xi/listdev.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: listdev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.5 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/listdev.c,v 3.4 2001/12/14 19:58:58 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/opendev.c diff -u xc/programs/Xserver/Xi/opendev.c:3.3 xc/programs/Xserver/Xi/opendev.c:3.4 --- xc/programs/Xserver/Xi/opendev.c:3.3 Fri Dec 14 14:58:58 2001 +++ xc/programs/Xserver/Xi/opendev.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: opendev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/opendev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "XIstubs.h" #include "windowstr.h" /* window structure */ #include "extnsionst.h" Index: xc/programs/Xserver/Xi/queryst.c diff -u xc/programs/Xserver/Xi/queryst.c:3.5 xc/programs/Xserver/Xi/queryst.c:3.6 --- xc/programs/Xserver/Xi/queryst.c:3.5 Fri Dec 14 14:58:58 2001 +++ xc/programs/Xserver/Xi/queryst.c Fri Oct 14 11:16:14 2005 @@ -1,4 +1,4 @@ -/* $Xorg: queryst.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.6 2005/10/14 15:16:14 tsi Exp $ */ /* Copyright 1998, 1998 The Open Group @@ -26,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/Xi/queryst.c,v 3.5 2001/12/14 19:58:58 dawes Exp $ */ /*********************************************************************** * @@ -36,12 +35,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" Index: xc/programs/Xserver/Xi/selectev.c diff -u xc/programs/Xserver/Xi/selectev.c:3.3 xc/programs/Xserver/Xi/selectev.c:3.4 --- xc/programs/Xserver/Xi/selectev.c:3.3 Fri Dec 14 14:58:58 2001 +++ xc/programs/Xserver/Xi/selectev.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: selectev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/selectev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */ /*********************************************************************** * @@ -56,12 +54,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" Index: xc/programs/Xserver/Xi/sendexev.c diff -u xc/programs/Xserver/Xi/sendexev.c:3.3 xc/programs/Xserver/Xi/sendexev.c:3.4 --- xc/programs/Xserver/Xi/sendexev.c:3.3 Fri Dec 14 14:58:58 2001 +++ xc/programs/Xserver/Xi/sendexev.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: sendexev.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/sendexev.c,v 3.3 2001/12/14 19:58:58 dawes Exp $ */ /*********************************************************************** * @@ -56,12 +54,12 @@ #define EXTENSION_EVENT_BASE 64 #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* Window */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" Index: xc/programs/Xserver/Xi/setbmap.c diff -u xc/programs/Xserver/Xi/setbmap.c:3.3 xc/programs/Xserver/Xi/setbmap.c:3.4 --- xc/programs/Xserver/Xi/setbmap.c:3.3 Fri Dec 14 14:58:59 2001 +++ xc/programs/Xserver/Xi/setbmap.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: setbmap.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setbmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /*********************************************************************** * @@ -58,11 +56,11 @@ #define IsOn(ptr, bit) \ (((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))) -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/setdval.c diff -u xc/programs/Xserver/Xi/setdval.c:3.3 xc/programs/Xserver/Xi/setdval.c:3.4 --- xc/programs/Xserver/Xi/setdval.c:3.3 Fri Dec 14 14:58:59 2001 +++ xc/programs/Xserver/Xi/setdval.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: setdval.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setdval.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/setfocus.c diff -u xc/programs/Xserver/Xi/setfocus.c:3.3 xc/programs/Xserver/Xi/setfocus.c:3.4 --- xc/programs/Xserver/Xi/setfocus.c:3.3 Fri Dec 14 14:58:59 2001 +++ xc/programs/Xserver/Xi/setfocus.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: setfocus.c,v 1.4 2001/02/09 02:04:34 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setfocus.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /*********************************************************************** * @@ -55,12 +53,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "windowstr.h" /* focus struct */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "dixevents.h" Index: xc/programs/Xserver/Xi/setmmap.c diff -u xc/programs/Xserver/Xi/setmmap.c:3.3 xc/programs/Xserver/Xi/setmmap.c:3.4 --- xc/programs/Xserver/Xi/setmmap.c:3.3 Fri Dec 14 14:58:59 2001 +++ xc/programs/Xserver/Xi/setmmap.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: setmmap.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setmmap.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /******************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS /* for inputstr.h */ #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "exevents.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/setmode.c diff -u xc/programs/Xserver/Xi/setmode.c:3.3 xc/programs/Xserver/Xi/setmode.c:3.4 --- xc/programs/Xserver/Xi/setmode.c:3.3 Fri Dec 14 14:58:59 2001 +++ xc/programs/Xserver/Xi/setmode.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: setmode.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/setmode.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "XIstubs.h" #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ Index: xc/programs/Xserver/Xi/stubs.c diff -u xc/programs/Xserver/Xi/stubs.c:3.6 xc/programs/Xserver/Xi/stubs.c:removed --- xc/programs/Xserver/Xi/stubs.c:3.6 Wed Jun 2 18:42:56 2004 +++ xc/programs/Xserver/Xi/stubs.c Tue May 9 21:55:54 2006 @@ -1,372 +0,0 @@ -/************************************************************ - -Copyright 1989, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - -Copyright 1989 by Hewlett-Packard Company, Palo Alto, California. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Hewlett-Packard not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -HEWLETT-PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -********************************************************/ -/* - * Copyright (c) 1996-2004 by 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 in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject - * to the following conditions: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions, and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution, and in the same place and form as other copyright, - * license and disclaimer information. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: "This product - * includes software developed by The XFree86 Project, Inc - * (http://www.xfree86.org/) and its contributors", in the same - * place and form as other third-party acknowledgments. Alternately, - * this acknowledgment may appear in the software itself, in the - * same form and location as other such third-party acknowledgments. - * - * 4. Except as contained in this notice, the name of The XFree86 - * Project, Inc shall not be used in advertising or otherwise to - * promote the sale, use or other dealings in this Software without - * prior written authorization from The XFree86 Project, Inc. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* $XFree86: xc/programs/Xserver/Xi/stubs.c,v 3.6 2004/06/02 22:42:56 dawes Exp $ */ - -/* - * stubs.c -- stub routines for the X server side of the XINPUT - * extension. This file is mainly to be used only as documentation. - * There is not much code here, and you can't get a working XINPUT - * server just using this. - * The Xvfb server uses this file so it will compile with the same - * object files as the real X server for a platform that has XINPUT. - * Xnest could do the same thing. - */ - -#define NEED_EVENTS -#include "X.h" -#include "Xproto.h" -#include "inputstr.h" -#include "XI.h" -#include "XIproto.h" -#include "XIstubs.h" - -#ifdef XINPUT - -/*********************************************************************** - * - * Caller: ProcXChangeKeyboardDevice - * - * This procedure does the implementation-dependent portion of the work - * needed to change the keyboard device. - * - * The X keyboard device has a FocusRec. If the device that has been - * made into the new X keyboard did not have a FocusRec, - * ProcXChangeKeyboardDevice will allocate one for it. - * - * If you do not want clients to be able to focus the old X keyboard - * device, call DeleteFocusClassDeviceStruct to free the FocusRec. - * - * If you support input devices with keys that you do not want to be - * used as the X keyboard, you need to check for them here and return - * a BadDevice error. - * - * The default implementation is to do nothing (assume you do want - * clients to be able to focus the old X keyboard). The commented-out - * sample code shows what you might do if you don't want the default. - * - */ - -int -ChangeKeyboardDevice (old_dev, new_dev) - DeviceIntPtr old_dev; - DeviceIntPtr new_dev; - { - /*********************************************************************** - DeleteFocusClassDeviceStruct(old_dev); * defined in xchgptr.c * - **********************************************************************/ - return BadMatch; - } - - -/*********************************************************************** - * - * Caller: ProcXChangePointerDevice - * - * This procedure does the implementation-dependent portion of the work - * needed to change the pointer device. - * - * The X pointer device does not have a FocusRec. If the device that - * has been made into the new X pointer had a FocusRec, - * ProcXChangePointerDevice will free it. - * - * If you want clients to be able to focus the old pointer device that - * has now become accessible through the input extension, you need to - * add a FocusRec to it here. - * - * The XChangePointerDevice protocol request also allows the client - * to choose which axes of the new pointer device are used to move - * the X cursor in the X- and Y- directions. If the axes are different - * than the default ones, you need to keep track of that here. - * - * If you support input devices with valuators that you do not want to be - * used as the X pointer, you need to check for them here and return a - * BadDevice error. - * - * The default implementation is to do nothing (assume you don't want - * clients to be able to focus the old X pointer). The commented-out - * sample code shows what you might do if you don't want the default. - * - */ - -int -ChangePointerDevice ( - DeviceIntPtr old_dev, - DeviceIntPtr new_dev, - unsigned char x, - unsigned char y) - { - /*********************************************************************** - InitFocusClassDeviceStruct(old_dev); * allow focusing old ptr* - - x_axis = x; * keep track of new x-axis* - y_axis = y; * keep track of new y-axis* - if (x_axis != 0 || y_axis != 1) - axes_changed = TRUE; * remember axes have changed* - else - axes_changed = FALSE; - *************************************************************************/ - return BadMatch; - } - -/*********************************************************************** - * - * Caller: ProcXCloseDevice - * - * Take care of implementation-dependent details of closing a device. - * Some implementations may actually close the device, others may just - * remove this clients interest in that device. - * - * The default implementation is to do nothing (assume all input devices - * are initialized during X server initialization and kept open). - * - */ - -void -CloseInputDevice (d, client) - DeviceIntPtr d; - ClientPtr client; - { - } - -/*********************************************************************** - * - * Caller: ProcXListInputDevices - * - * This is the implementation-dependent routine to initialize an input - * device to the point that information about it can be listed. - * Some implementations open all input devices when the server is first - * initialized, and never close them. Other implementations open only - * the X pointer and keyboard devices during server initialization, - * and only open other input devices when some client makes an - * XOpenDevice request. If some other process has the device open, the - * server may not be able to get information about the device to list it. - * - * This procedure should be used by implementations that do not initialize - * all input devices at server startup. It should do device-dependent - * initialization for any devices not previously initialized, and call - * AddInputDevice for each of those devices so that a DeviceIntRec will be - * created for them. - * - * The default implementation is to do nothing (assume all input devices - * are initialized during X server initialization and kept open). - * The commented-out sample code shows what you might do if you don't want - * the default. - * - */ - -void -AddOtherInputDevices () - { - /********************************************************************** - for each uninitialized device, do something like: - - DeviceIntPtr dev; - DeviceProc deviceProc; - pointer private; - - dev = (DeviceIntPtr) AddInputDevice(deviceProc, TRUE); - dev->public.devicePrivate = private; - RegisterOtherDevice(dev); - dev->inited = ((*dev->deviceProc)(dev, DEVICE_INIT) == Success); - ************************************************************************/ - - } - -/*********************************************************************** - * - * Caller: ProcXOpenDevice - * - * This is the implementation-dependent routine to open an input device. - * Some implementations open all input devices when the server is first - * initialized, and never close them. Other implementations open only - * the X pointer and keyboard devices during server initialization, - * and only open other input devices when some client makes an - * XOpenDevice request. This entry point is for the latter type of - * implementation. - * - * If the physical device is not already open, do it here. In this case, - * you need to keep track of the fact that one or more clients has the - * device open, and physically close it when the last client that has - * it open does an XCloseDevice. - * - * The default implementation is to do nothing (assume all input devices - * are opened during X server initialization and kept open). - * - */ - -void -OpenInputDevice (dev, client, status) - DeviceIntPtr dev; - ClientPtr client; - int *status; - { - } - -/**************************************************************************** - * - * Caller: ProcXSetDeviceMode - * - * Change the mode of an extension device. - * This function is used to change the mode of a device from reporting - * relative motion to reporting absolute positional information, and - * vice versa. - * The default implementation below is that no such devices are supported. - * - */ - -int -SetDeviceMode (client, dev, mode) - register ClientPtr client; - DeviceIntPtr dev; - int mode; - { - return BadMatch; - } - -/**************************************************************************** - * - * Caller: ProcXSetDeviceValuators - * - * Set the value of valuators on an extension input device. - * This function is used to set the initial value of valuators on - * those input devices that are capable of reporting either relative - * motion or an absolute position, and allow an initial position to be set. - * The default implementation below is that no such devices are supported. - * - */ - -int -SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators) - register ClientPtr client; - DeviceIntPtr dev; - int *valuators; - int first_valuator; - int num_valuators; - { - return BadMatch; - } - -/**************************************************************************** - * - * Caller: ProcXChangeDeviceControl - * - * Change the specified device controls on an extension input device. - * - */ - -int -ChangeDeviceControl (client, dev, control) - register ClientPtr client; - DeviceIntPtr dev; - xDeviceCtl *control; - { - switch (control->control) - { - case DEVICE_RESOLUTION: - return (BadMatch); - default: - return (BadMatch); - } - } - -#else - -int DeviceValuator = 0; - -DeviceIntPtr -LookupDeviceIntRec(int i) -{ - return NULL; -} - -#endif Index: xc/programs/Xserver/Xi/ungrdev.c diff -u xc/programs/Xserver/Xi/ungrdev.c:3.3 xc/programs/Xserver/Xi/ungrdev.c:3.4 --- xc/programs/Xserver/Xi/ungrdev.c:3.3 Fri Dec 14 14:58:59 2001 +++ xc/programs/Xserver/Xi/ungrdev.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: ungrdev.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.4 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdev.c,v 3.3 2001/12/14 19:58:59 dawes Exp $ */ /*********************************************************************** * @@ -55,11 +53,11 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XIproto.h" +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/ungrdevb.c diff -u xc/programs/Xserver/Xi/ungrdevb.c:3.4 xc/programs/Xserver/Xi/ungrdevb.c:3.5 --- xc/programs/Xserver/Xi/ungrdevb.c:3.4 Fri Dec 14 14:59:00 2001 +++ xc/programs/Xserver/Xi/ungrdevb.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: ungrdevb.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.5 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevb.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */ /*********************************************************************** * @@ -55,12 +53,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/Xi/ungrdevk.c diff -u xc/programs/Xserver/Xi/ungrdevk.c:3.4 xc/programs/Xserver/Xi/ungrdevk.c:3.5 --- xc/programs/Xserver/Xi/ungrdevk.c:3.4 Fri Dec 14 14:59:00 2001 +++ xc/programs/Xserver/Xi/ungrdevk.c Fri Oct 14 11:16:14 2005 @@ -1,5 +1,4 @@ -/* $Xorg: ungrdevk.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ - +/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.5 2005/10/14 15:16:14 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,7 +44,6 @@ SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/Xi/ungrdevk.c,v 3.4 2001/12/14 19:59:00 dawes Exp $ */ /*********************************************************************** * @@ -55,12 +53,12 @@ #define NEED_EVENTS #define NEED_REPLIES -#include "X.h" /* for inputstr.h */ -#include "Xproto.h" /* Request macro */ +#include /* for inputstr.h */ +#include /* Request macro */ #include "inputstr.h" /* DeviceIntPtr */ #include "windowstr.h" /* window structure */ -#include "XI.h" -#include "XIproto.h" +#include +#include #include "extnsionst.h" #include "extinit.h" /* LookupDeviceIntRec */ #include "exglobals.h" Index: xc/programs/Xserver/XpConfig/README diff -u xc/programs/Xserver/XpConfig/README:1.1.1.2 xc/programs/Xserver/XpConfig/README:1.2 --- xc/programs/Xserver/XpConfig/README:1.1.1.2 Tue Jan 16 17:40:23 2001 +++ xc/programs/Xserver/XpConfig/README Mon Jan 9 09:59:41 2006 @@ -315,4 +315,4 @@ -$Xorg: README,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ +$XFree86: xc/programs/Xserver/XpConfig/README,v 1.2 2006/01/09 14:59:41 dawes Exp $ Index: xc/programs/Xserver/XpConfig/C/print/Xprinters diff -u xc/programs/Xserver/XpConfig/C/print/Xprinters:1.1.1.2 xc/programs/Xserver/XpConfig/C/print/Xprinters:1.2 --- xc/programs/Xserver/XpConfig/C/print/Xprinters:1.1.1.2 Tue Jan 16 17:40:23 2001 +++ xc/programs/Xserver/XpConfig/C/print/Xprinters Mon Jan 9 09:59:41 2006 @@ -1,6 +1,6 @@ ######################################################################## # -# $Xorg: Xprinters,v 1.3 2000/08/17 19:48:02 cpqbld Exp $ +# $XFree86: xc/programs/Xserver/XpConfig/C/print/Xprinters,v 1.2 2006/01/09 14:59:41 dawes Exp $ # # X*printers sample configuration file # Index: xc/programs/Xserver/XpConfig/C/print/attributes/document diff -u xc/programs/Xserver/XpConfig/C/print/attributes/document:1.1.1.2 xc/programs/Xserver/XpConfig/C/print/attributes/document:1.2 --- xc/programs/Xserver/XpConfig/C/print/attributes/document:1.1.1.2 Tue Jan 16 17:40:23 2001 +++ xc/programs/Xserver/XpConfig/C/print/attributes/document Mon Jan 9 09:59:41 2006 @@ -1,4 +1,4 @@ -# $Xorg: document,v 1.3 2000/08/17 19:48:03 cpqbld Exp $ +# $XFree86: xc/programs/Xserver/XpConfig/C/print/attributes/document,v 1.2 2006/01/09 14:59:41 dawes Exp $ # Document DPA-Object initial attribute values # Attribute IDs must be qualified by using one of the following Index: xc/programs/Xserver/XpConfig/C/print/attributes/job diff -u xc/programs/Xserver/XpConfig/C/print/attributes/job:1.1.1.2 xc/programs/Xserver/XpConfig/C/print/attributes/job:1.2 --- xc/programs/Xserver/XpConfig/C/print/attributes/job:1.1.1.2 Tue Jan 16 17:40:24 2001 +++ xc/programs/Xserver/XpConfig/C/print/attributes/job Mon Jan 9 09:59:41 2006 @@ -1,4 +1,4 @@ -# $Xorg: job,v 1.3 2000/08/17 19:48:03 cpqbld Exp $ +# $XFree86: xc/programs/Xserver/XpConfig/C/print/attributes/job,v 1.2 2006/01/09 14:59:41 dawes Exp $ # Job DPA-Object initial attribute values # Attribute IDs must be qualified by using one of the following Index: xc/programs/Xserver/XpConfig/C/print/attributes/printer diff -u xc/programs/Xserver/XpConfig/C/print/attributes/printer:1.1.1.2 xc/programs/Xserver/XpConfig/C/print/attributes/printer:1.2 --- xc/programs/Xserver/XpConfig/C/print/attributes/printer:1.1.1.2 Tue Jan 16 17:40:24 2001 +++ xc/programs/Xserver/XpConfig/C/print/attributes/printer Mon Jan 9 09:59:41 2006 @@ -1,4 +1,4 @@ -# $Xorg: printer,v 1.3 2000/08/17 19:48:03 cpqbld Exp $ +# $XFree86: xc/programs/Xserver/XpConfig/C/print/attributes/printer,v 1.2 2006/01/09 14:59:41 dawes Exp $ # Printer DPA-Object initial attribute values # Attribute IDs must be qualified by using one of the following Index: xc/programs/Xserver/XpConfig/C/print/ddx-config/raster/pcl diff -u xc/programs/Xserver/XpConfig/C/print/ddx-config/raster/pcl:1.1.1.2 xc/programs/Xserver/XpConfig/C/print/ddx-config/raster/pcl:1.2 --- xc/programs/Xserver/XpConfig/C/print/ddx-config/raster/pcl:1.1.1.2 Tue Jan 16 17:40:24 2001 +++ xc/programs/Xserver/XpConfig/C/print/ddx-config/raster/pcl Mon Jan 9 09:59:41 2006 @@ -1,4 +1,4 @@ -# $Xorg: pcl,v 1.3 2000/08/17 19:48:03 cpqbld Exp $ +# $XFree86: xc/programs/Xserver/XpConfig/C/print/ddx-config/raster/pcl,v 1.2 2006/01/09 14:59:41 dawes Exp $ # This is the file which you should customize to include the printers that # will print through the raster driver. The early part of this file # specifies some commn useful defaults. You can override them when Index: xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/model-config diff -u xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/model-config:1.1.1.2 xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/model-config:1.2 --- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/model-config:1.1.1.2 Tue Jan 16 17:40:25 2001 +++ xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/model-config Mon Jan 9 09:59:41 2006 @@ -1,4 +1,4 @@ -# $Xorg: model-config,v 1.3 2000/08/17 19:48:04 cpqbld Exp $ +# $XFree86: xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/model-config,v 1.2 2006/01/09 14:59:41 dawes Exp $ # This is the configuration file for the HP DeskJet 1600C printer. # # The CDEnext SI supports two 1600C drivers XP-PCL-MONO and Index: xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/README diff -u xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/README:1.1.1.2 xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/README:1.2 --- xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/README:1.1.1.2 Tue Jan 16 17:40:27 2001 +++ xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/README Mon Jan 9 09:59:42 2006 @@ -1,4 +1,4 @@ -$Xorg: README,v 1.3 2000/08/17 19:48:04 cpqbld Exp $ +$XFree86: xc/programs/Xserver/XpConfig/C/print/models/HPDJ1600C/fonts/README,v 1.2 2006/01/09 14:59:42 dawes Exp $ This directory contains "printer metric files" for the X Print Server suitable for the DeskJet 1600C printer. The following Index: xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/model-config diff -u xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/model-config:1.1.1.2 xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/model-config:1.2 --- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/model-config:1.1.1.2 Tue Jan 16 17:40:45 2001 +++ xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/model-config Mon Jan 9 09:59:42 2006 @@ -1,4 +1,4 @@ -# $Xorg: model-config,v 1.3 2000/08/17 19:48:04 cpqbld Exp $ +# $XFree86: xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/model-config,v 1.2 2006/01/09 14:59:42 dawes Exp $ # This is the configuration file for the HP LaserJet 4 Printers. # # Though not a deliverable for the CDEnext SI, the XP-PCL-MONO Index: xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/README diff -u xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/README:1.1.1.2 xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/README:1.2 --- xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/README:1.1.1.2 Tue Jan 16 17:40:51 2001 +++ xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/README Mon Jan 9 09:59:42 2006 @@ -1,4 +1,4 @@ -$Xorg: README,v 1.3 2000/08/17 19:48:04 cpqbld Exp $ +$XFree86: xc/programs/Xserver/XpConfig/C/print/models/HPLJ4family/fonts/README,v 1.2 2006/01/09 14:59:42 dawes Exp $ This directory contains "printer metric files" for the X Print Server suitable for the LaserJet 4 family of printers - 4, 4L, Index: xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/model-config diff -u xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/model-config:1.1.1.2 xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/model-config:1.2 --- xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/model-config:1.1.1.2 Tue Jan 16 17:41:05 2001 +++ xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/model-config Mon Jan 9 09:59:42 2006 @@ -1,4 +1,4 @@ -# $Xorg: model-config,v 1.3 2000/08/17 19:48:04 cpqbld Exp $ +# $XFree86: xc/programs/Xserver/XpConfig/C/print/models/SPSPARC2/model-config,v 1.2 2006/01/09 14:59:42 dawes Exp $ SPSPARC2.printer-model: "SunPics SPARCprinter II" SPSPARC2.printer-resolutions-supported: 300 SPSPARC2.content-orientations-supported: portrait landscape Index: xc/programs/Xserver/Xprint/AttrValid.c diff -u xc/programs/Xserver/Xprint/AttrValid.c:1.5 xc/programs/Xserver/Xprint/AttrValid.c:1.6 --- xc/programs/Xserver/Xprint/AttrValid.c:1.5 Fri Dec 21 16:02:04 2001 +++ xc/programs/Xserver/Xprint/AttrValid.c Mon Jan 9 09:59:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: AttrValid.c,v 1.4 2001/03/14 18:43:17 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.c,v 1.5 2001/12/21 21:02:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.c,v 1.6 2006/01/09 14:59:42 dawes Exp $ */ #include Index: xc/programs/Xserver/Xprint/AttrValid.h diff -u xc/programs/Xserver/Xprint/AttrValid.h:1.7 xc/programs/Xserver/Xprint/AttrValid.h:1.8 --- xc/programs/Xserver/Xprint/AttrValid.h:1.7 Fri Dec 21 16:02:04 2001 +++ xc/programs/Xserver/Xprint/AttrValid.h Mon Jan 9 09:59:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: AttrValid.h,v 1.4 2001/03/14 18:43:40 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.h,v 1.7 2001/12/21 21:02:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/AttrValid.h,v 1.8 2006/01/09 14:59:42 dawes Exp $ */ #ifndef _Xp_AttrValid_h #define _Xp_AttrValid_h Index: xc/programs/Xserver/Xprint/DiPrint.h diff -u xc/programs/Xserver/Xprint/DiPrint.h:1.4 xc/programs/Xserver/Xprint/DiPrint.h:1.5 --- xc/programs/Xserver/Xprint/DiPrint.h:1.4 Wed Jan 17 17:36:28 2001 +++ xc/programs/Xserver/Xprint/DiPrint.h Mon Jan 9 09:59:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: DiPrint.h,v 1.3 2000/08/17 19:48:04 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/DiPrint.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/DiPrint.h,v 1.5 2006/01/09 14:59:42 dawes Exp $ */ /* * The XpDiListEntry struct is the type of each element of the array Index: xc/programs/Xserver/Xprint/Imakefile diff -u xc/programs/Xserver/Xprint/Imakefile:1.21 xc/programs/Xserver/Xprint/Imakefile:1.24 --- xc/programs/Xserver/Xprint/Imakefile:1.21 Mon Jan 31 17:54:46 2005 +++ xc/programs/Xserver/Xprint/Imakefile Sun Feb 19 10:51:17 2006 @@ -1,84 +1,120 @@ -XCOMM $Xorg: Imakefile,v 1.4 2001/03/14 18:44:11 pookie Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/Xprint/Imakefile,v 1.21 2005/01/31 22:54:46 tsi Exp $ +XCOMM $XFree86: xc/programs/Xserver/Xprint/Imakefile,v 1.24 2006/02/19 15:51:17 tsi Exp $ #include -SRCS1 = Init.c Quarks.c attributes.c Util.c mediaSizes.c \ - Oid.c AttrValid.c +#define IHaveSubdirs + +SRCS1 = Init.c Quarks.c attributes.c Util.c mediaSizes.c Oid.c AttrValid.c -OBJS1 = Init.o Quarks.o attributes.o Util.o mediaSizes.o \ - Oid.o AttrValid.o +OBJS1 = Init.o Quarks.o attributes.o Util.o mediaSizes.o Oid.o AttrValid.o #ifdef OS2Architecture SRCS_OS2 = os2_stubs.c OBJS_OS2 = os2_stubs.o #endif -#if XprtServer -#if PrintOnlyServer || defined(PrintServerExtensions) -#if PrintOnlyServer -PO_DEFINES = -DPRINT_ONLY_SERVER +#if defined(XprtServer) && XprtServer + +#undef IHaveSubdirs +#define IHaveSubdirs + +SRCS2 = ddxInit.c miinitext.c +OBJS2 = ddxInit.o miinitext.o + +#if BuildRender +RENDERDIRS = render +#endif + +#if BuildRandR +RANDRDIRS = randr #endif -#ifdef PrintServerExtensions -XPEXT_DEFINES = PrintServerExtensions -#else -XPEXT_DEFINES = $(EXT_DEFINES) + +#if BuildRECORD +RECORDDIRS = record #endif -SRCS3 = miinitext.c dpmsstubs.c -OBJS3 = miinitext.o dpmsstubs.o + +#if BuildDBE +DBEDIRS = dbe #endif -SRCS2 = ddxInit.c -OBJS2 = ddxInit.o + +#if BuildXTrap +XTRAPDIRS = XTrap #endif -SRCS = $(SRCS1) $(SRCS2) $(SRCS3) $(SRCS_OS2) + XPSUBDIRS = dix os Xext \ + $(RENDERDIRS) $(RANDRDIRS) $(RECORDDIRS) $(DBEDIRS) $(XTRAPDIRS) -OBJS = $(OBJS1) $(OBJS_OS2) +#endif #if XpRasterDDX + +#undef IHaveSubdirs +#define IHaveSubdirs + RASTDIR = raster RASTDEF = -DXPRASTERDDX + #endif + #if XpColorPclDDX + +#undef IHaveSubdirs +#define IHaveSubdirs + PCLDIR = pcl PCLDEF = -DXPPCLDDX + #endif + #if XpMonoPclDDX + +#undef IHaveSubdirs +#define IHaveSubdirs + MPCLDIR = pcl-mono MPCLDEF = -DXPMONOPCLDDX + #endif + #if XpPostScriptDDX + +#undef IHaveSubdirs +#define IHaveSubdirs + PSDIR = ps PSDEF = -DXPPSDDX + #endif #if HasMkstemp MKTMP_DEFINES = -DHAS_MKSTEMP #endif -#if XpRasterDDX || XpColorPclDDX || XpMonoPclDDX || XpPostScriptDDX + SRCS = $(SRCS1) $(SRCS2) $(SRCS_OS2) -SUBDIRS = $(RASTDIR) $(PCLDIR) $(MPCLDIR) $(PSDIR) + OBJS = $(OBJS1) $(OBJS_OS2) -#define IHaveSubdirs +#ifdef IHaveSubdirs + SUBDIRS = $(XPSUBDIRS) $(RASTDIR) $(PCLDIR) $(MPCLDIR) $(PSDIR) +#endif +#ifndef XprtExcludedExtensions +#define XprtExcludedExtensions /**/ #endif - INCLUDES = -I$(XINCLUDESRC) -I. -I../mfb -I../mi -I../cfb \ - -I../include -I$(TOP)/include -I$(LIBSRC) \ - -I$(EXTINCSRC) -I$(FONTINCSRC) -I$(XLIBSRC) + INCLUDES = -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ + -I$(SERVERSRC)/cfb -I$(SERVERSRC)/Xext \ + -I$(SERVERSRC)/include -I$(XLIBSRC) - LINTLIBS = $(TOP)/server/dix/llib-ldix.ln $(TOP)/server/os/llib-los.ln \ - $(TOP)/server/ddx/mfb/llib-lmfb.ln \ - $(TOP)/server/ddx/mi/llib-lmi.ln \ - $(TOP)/server/ddx/cfb/llib-lcfb.ln + LINTLIBS = $(TOP)/server/dix/llib-ldix.ln $(TOP)/server/os/llib-los.ln \ + $(TOP)/server/ddx/mfb/llib-lmfb.ln \ + $(TOP)/server/ddx/mi/llib-lmi.ln \ + $(TOP)/server/ddx/cfb/llib-lcfb.ln -DEFINES = -DXPRINTDIR=\"$(XPRINTDIR)\" $(RASTDEF) $(PCLDEF) $(MPCLDEF) \ - $(PSDEF) $(MKTMP_DEFINES) -UXFree86LOADER -D_XP_PRINT_SERVER_ + DEFINES = $(OS_DEFINES) $(MKTMP_DEFINES) \ + $(EXT_DEFINES) XprtExcludedExtensions \ + -DXPRINTDIR=\"$(XPRINTDIR)\" \ + $(RASTDEF) $(PCLDEF) $(MPCLDEF) $(PSDEF) /* Go ahead: Call me paranoid ... */ Makefiles:: @@ -88,22 +124,14 @@ NormalLibraryObjectRule() -#if XprtServer -all:: $(OBJS2) $(OBJS3) $(OBJS_OS2) -#endif - NormalLibraryTarget(printer,$(OBJS)) NormalLintTarget($(SRCS)) -SpecialCObjectRule(ddxInit,$(ICONFIGFILES),$(PO_DEFINES) $(OS_DEFINES) $(EXT_DEFINES)) -#if XprtServer && (PrintOnlyServer || defined(PrintServerExtensions)) +#if XprtServer +all:: $(OBJS2) +SpecialCObjectRule(ddxInit,$(ICONFIGFILES),NullParameter) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) -SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(PO_DEFINES) $(OS_DEFINES) $(XPEXT_DEFINES) -DXPRINT -UGLXEXT) -#if PrintOnlyServer -LinkSourceFile(dpmsstubs.c,$(SERVERSRC)/Xext) -LinkSourceFile(dpmsproc.h,$(SERVERSRC)/Xext) -SpecialCObjectRule(dpmsstubs,$(ICONFIGFILES),$(PO_DEFINES) $(OS_DEFINES) $(XPEXT_DEFINES) -DXPRINT) -#endif +SpecialCObjectRule(miinitext,$(ICONFIGFILES),-DXPRINT) #endif #ifdef OS2Architecture @@ -111,10 +139,10 @@ SpecialCObjectRule(os2_stubs,$(ICONFIGFILES),-DOS2NULLSELECT) #endif +DependTarget() + #ifdef IHaveSubdirs MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) MakeLintLibSubdirs($(SUBDIRS)) #endif - -DependTarget() Index: xc/programs/Xserver/Xprint/Init.c diff -u xc/programs/Xserver/Xprint/Init.c:1.15 xc/programs/Xserver/Xprint/Init.c:1.17 --- xc/programs/Xserver/Xprint/Init.c:1.15 Wed Oct 29 17:11:54 2003 +++ xc/programs/Xserver/Xprint/Init.c Sun Feb 19 10:51:17 2006 @@ -1,4 +1,4 @@ -/* $Xorg: Init.c,v 1.5 2001/03/07 17:31:33 pookie Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.17 2006/02/19 15:51:17 tsi Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -50,7 +50,6 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.15 2003/10/29 22:11:54 tsi Exp $ */ #include #include @@ -65,9 +64,9 @@ #include #endif -#include "X.h" +#include #define NEED_EVENTS 1 -#include "Xproto.h" +#include #include #include "screenint.h" @@ -78,14 +77,14 @@ #include "inputstr.h" #include "gcstruct.h" -#include "fonts/fontstruct.h" +#include #include "errno.h" typedef char *XPointer; #define HAVE_XPointer 1 #define Status int -#include +#include #include "DiPrint.h" #include "attributes.h" @@ -1231,10 +1230,18 @@ char **argv) { PrinterDbPtr pDb, pDbEntry; - int driverCount = 0, i; + int driverCount, i; char **driverNames; char *configDir; + static char beenHere = FALSE; + + if (beenHere) + return; + beenHere = TRUE; + + driverCount = 0; + /* * this little test is just a warning at startup to make sure * that the config directory exists. Index: xc/programs/Xserver/Xprint/Oid.c diff -u xc/programs/Xserver/Xprint/Oid.c:1.6 xc/programs/Xserver/Xprint/Oid.c:1.7 --- xc/programs/Xserver/Xprint/Oid.c:1.6 Wed Oct 29 17:11:54 2003 +++ xc/programs/Xserver/Xprint/Oid.c Mon Jan 9 09:59:42 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Oid.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Oid.c,v 1.6 2003/10/29 22:11:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Oid.c,v 1.7 2006/01/09 14:59:42 dawes Exp $ */ #include "attributes.h" Index: xc/programs/Xserver/Xprint/Oid.h diff -u xc/programs/Xserver/Xprint/Oid.h:1.4 xc/programs/Xserver/Xprint/Oid.h:1.5 --- xc/programs/Xserver/Xprint/Oid.h:1.4 Wed Jan 17 17:36:28 2001 +++ xc/programs/Xserver/Xprint/Oid.h Fri Oct 14 11:16:15 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Oid.h,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Oid.h,v 1.5 2005/10/14 15:16:15 tsi Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,12 +30,11 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Oid.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */ #ifndef _Xp_Oid_h #define _Xp_Oid_h -#include +#include /* * include the auto-generated XpOid enum definition Index: xc/programs/Xserver/Xprint/OidDefs.h diff -u xc/programs/Xserver/Xprint/OidDefs.h:1.2 xc/programs/Xserver/Xprint/OidDefs.h:1.3 --- xc/programs/Xserver/Xprint/OidDefs.h:1.2 Fri Dec 21 16:02:05 2001 +++ xc/programs/Xserver/Xprint/OidDefs.h Mon Jan 9 09:59:43 2006 @@ -1,4 +1,4 @@ -/* $Xorg: OidDefs.h,v 1.4 2001/03/14 18:45:13 pookie Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/OidDefs.h,v 1.3 2006/01/09 14:59:43 dawes Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. Index: xc/programs/Xserver/Xprint/OidStrs.h diff -u xc/programs/Xserver/Xprint/OidStrs.h:1.5 xc/programs/Xserver/Xprint/OidStrs.h:1.6 --- xc/programs/Xserver/Xprint/OidStrs.h:1.5 Fri Dec 21 16:02:05 2001 +++ xc/programs/Xserver/Xprint/OidStrs.h Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: OidStrs.h,v 1.4 2001/03/14 18:45:40 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/OidStrs.h,v 1.5 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/OidStrs.h,v 1.6 2006/01/09 14:59:43 dawes Exp $ */ static int XpOidStringMapCount = 127; Index: xc/programs/Xserver/Xprint/Util.c diff -u xc/programs/Xserver/Xprint/Util.c:1.13 xc/programs/Xserver/Xprint/Util.c:1.14 --- xc/programs/Xserver/Xprint/Util.c:1.13 Wed Oct 31 17:50:28 2001 +++ xc/programs/Xserver/Xprint/Util.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Util.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.13 2001/10/31 22:50:28 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.14 2006/01/09 14:59:43 dawes Exp $ */ /* To get the tempnam() prototype in */ #if defined(linux) && defined(__STRICT_ANSI__) Index: xc/programs/Xserver/Xprint/ValTree.c diff -u xc/programs/Xserver/Xprint/ValTree.c:1.2 xc/programs/Xserver/Xprint/ValTree.c:1.3 --- xc/programs/Xserver/Xprint/ValTree.c:1.2 Mon Nov 10 13:21:44 2003 +++ xc/programs/Xserver/Xprint/ValTree.c Fri Oct 14 11:16:15 2005 @@ -1,4 +1,4 @@ -/* $Xorg: ValTree.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ValTree.c,v 1.3 2005/10/14 15:16:15 tsi Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,9 +30,8 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ValTree.c,v 1.2 2003/11/10 18:21:44 tsi Exp $ */ -#include "X.h" +#include #include "scrnintstr.h" #include "validate.h" #include "windowstr.h" Index: xc/programs/Xserver/Xprint/attributes.c diff -u xc/programs/Xserver/Xprint/attributes.c:1.22 xc/programs/Xserver/Xprint/attributes.c:1.23 --- xc/programs/Xserver/Xprint/attributes.c:1.22 Sat Apr 3 17:26:22 2004 +++ xc/programs/Xserver/Xprint/attributes.c Fri Oct 14 11:16:15 2005 @@ -1,4 +1,4 @@ -/* $Xorg: attributes.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.23 2005/10/14 15:16:15 tsi Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -44,7 +44,6 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/attributes.c,v 1.22 2004/04/03 22:26:22 dawes Exp $ */ #include #include @@ -62,8 +61,8 @@ #include "attributes.h" -#include "Xlib.h" -#include "Xresource.h" +#include +#include #include "Xrm.c" static XrmDatabase CopyDb(XrmDatabase inDb); Index: xc/programs/Xserver/Xprint/attributes.h diff -u xc/programs/Xserver/Xprint/attributes.h:1.6 xc/programs/Xserver/Xprint/attributes.h:1.7 --- xc/programs/Xserver/Xprint/attributes.h:1.6 Fri Dec 21 16:02:05 2001 +++ xc/programs/Xserver/Xprint/attributes.h Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: attributes.h,v 1.4 2001/03/14 18:42:44 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/attributes.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/attributes.h,v 1.7 2006/01/09 14:59:43 dawes Exp $ */ #ifndef _Xp_attributes_h #define _Xp_attributes_h 1 Index: xc/programs/Xserver/Xprint/ddxInit.c diff -u xc/programs/Xserver/Xprint/ddxInit.c:1.16 xc/programs/Xserver/Xprint/ddxInit.c:1.18 --- xc/programs/Xserver/Xprint/ddxInit.c:1.16 Wed Jun 2 18:42:56 2004 +++ xc/programs/Xserver/Xprint/ddxInit.c Sun Feb 19 10:51:17 2006 @@ -30,7 +30,7 @@ copyright holders. */ /* - * Copyright (c) 1996-2004 by The XFree86 Project, Inc. + * Copyright (c) 1996-2006 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -76,16 +76,16 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.16 2004/06/02 22:42:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.18 2006/02/19 15:51:17 tsi Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "windowstr.h" #include "servermd.h" -#include "Xos.h" +#include #include "DiPrint.h" -/*- +/* *----------------------------------------------------------------------- * InitOutput -- * If this is built as a print-only server, then we must supply @@ -125,9 +125,7 @@ pScreenInfo->numPixmapFormats = 0; /* get them in PrinterInitOutput */ screenInfo.numVideoScreens = 0; -#ifdef PRINT_ONLY_SERVER PrinterInitOutput(pScreenInfo, argc, argv); -#endif } static void @@ -303,116 +301,9 @@ char *argv[], int i) { -#ifdef PRINT_ONLY_SERVER return XprintOptions(argc, argv, i) - i; -#else - return(0); -#endif -} - -#ifdef XINPUT - -#include "XI.h" -#include "XIproto.h" -#include "XIstubs.h" - -extern int BadDevice; - -int -ChangePointerDevice ( - DeviceIntPtr old_dev, - DeviceIntPtr new_dev, - unsigned char x, - unsigned char y) -{ - return (BadDevice); -} - -int -ChangeDeviceControl ( - register ClientPtr client, - DeviceIntPtr dev, - xDeviceCtl *control) -{ - return BadMatch; -} - -void -OpenInputDevice ( - DeviceIntPtr dev, - ClientPtr client, - int *status) -{ - return; -} - -void -AddOtherInputDevices (void) -{ - return; -} - -void -CloseInputDevice ( - DeviceIntPtr dev, - ClientPtr client) -{ - return; -} - -int -ChangeKeyboardDevice ( - DeviceIntPtr old_dev, - DeviceIntPtr new_dev) -{ - return (Success); -} - -int -SetDeviceMode ( - register ClientPtr client, - DeviceIntPtr dev, - int mode) -{ - return BadMatch; -} - -int -SetDeviceValuators ( - register ClientPtr client, - DeviceIntPtr dev, - int *valuators, - int first_valuator, - int num_valuators) -{ - return BadMatch; -} - - -#endif /* XINPUT */ - -#ifdef XTESTEXT1 - -void -XTestJumpPointer(int x, int y, int dev) -{ - return; } -void -XTestGetPointerPos(int x, int y) -{ - return; -} - -void -XTestGenerateEvent(int dev, int keycode, int keystate, int x, int y) -{ - return; -} - -#endif /* XTESTEXT1 */ - #ifdef AIXV3 /* * This is just to get the server to link on AIX, where some bits Index: xc/programs/Xserver/Xprint/mediaSizes.c diff -u xc/programs/Xserver/Xprint/mediaSizes.c:1.5 xc/programs/Xserver/Xprint/mediaSizes.c:1.6 --- xc/programs/Xserver/Xprint/mediaSizes.c:1.5 Fri Dec 21 16:02:05 2001 +++ xc/programs/Xserver/Xprint/mediaSizes.c Fri Oct 14 11:16:15 2005 @@ -1,4 +1,4 @@ -/* $Xorg: mediaSizes.c,v 1.4 2001/03/14 18:44:37 pookie Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/mediaSizes.c,v 1.6 2005/10/14 15:16:15 tsi Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +30,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/mediaSizes.c,v 1.5 2001/12/21 21:02:05 dawes Exp $ */ /******************************************************************* ** @@ -57,12 +56,12 @@ #include #include -#include "X.h" +#include #include "dixstruct.h" #include "screenint.h" #include "misc.h" #include "scrnintstr.h" -#include "fontstruct.h" +#include #include "DiPrint.h" #include "attributes.h" Index: xc/programs/Xserver/Xprint/XTrap/Imakefile diff -u /dev/null xc/programs/Xserver/Xprint/XTrap/Imakefile:1.1 --- /dev/null Tue May 9 21:55:56 2006 +++ xc/programs/Xserver/Xprint/XTrap/Imakefile Sun Feb 19 10:51:17 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/Xprint/XTrap/Imakefile,v 1.1 2006/02/19 15:51:17 tsi Exp $ +/* + * Copyright (c) 1996-2006 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XprtExcludedExtensions +#define LinkDirectory ../../XTrap + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../XTrap/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/Xprint/Xext/Imakefile diff -u /dev/null xc/programs/Xserver/Xprint/Xext/Imakefile:1.1 --- /dev/null Tue May 9 21:55:56 2006 +++ xc/programs/Xserver/Xprint/Xext/Imakefile Sun Feb 19 10:51:17 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/Xprint/Xext/Imakefile,v 1.1 2006/02/19 15:51:17 tsi Exp $ +/* + * Copyright (c) 2004-2006 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XprtExcludedExtensions +#define LinkDirectory ../../Xext + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../Xext/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/Xprint/dbe/Imakefile diff -u /dev/null xc/programs/Xserver/Xprint/dbe/Imakefile:1.1 --- /dev/null Tue May 9 21:55:56 2006 +++ xc/programs/Xserver/Xprint/dbe/Imakefile Sun Feb 19 10:51:17 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/Xprint/dbe/Imakefile,v 1.1 2006/02/19 15:51:17 tsi Exp $ +/* + * Copyright (c) 1996-2006 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XprtExcludedExtensions +#define LinkDirectory ../../dbe + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../dbe/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/Xprint/dix/Imakefile diff -u /dev/null xc/programs/Xserver/Xprint/dix/Imakefile:1.1 --- /dev/null Tue May 9 21:55:56 2006 +++ xc/programs/Xserver/Xprint/dix/Imakefile Sun Feb 19 10:51:17 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/Xprint/dix/Imakefile,v 1.1 2006/02/19 15:51:17 tsi Exp $ +/* + * Copyright (c) 1996-2006 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XprtExcludedExtensions XprintUndefines +#define LinkDirectory ../../dix + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../dix/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/Xprint/os/Imakefile diff -u /dev/null xc/programs/Xserver/Xprint/os/Imakefile:1.1 --- /dev/null Tue May 9 21:55:56 2006 +++ xc/programs/Xserver/Xprint/os/Imakefile Sun Feb 19 10:51:18 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/Xprint/os/Imakefile,v 1.1 2006/02/19 15:51:18 tsi Exp $ +/* + * Copyright (c) 2004-2006 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XprtExcludedExtensions XprintUndefines +#define LinkDirectory ../../os + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../os/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/Xprint/pcl/Imakefile diff -u xc/programs/Xserver/Xprint/pcl/Imakefile:1.8 xc/programs/Xserver/Xprint/pcl/Imakefile:1.10 --- xc/programs/Xserver/Xprint/pcl/Imakefile:1.8 Mon Nov 11 12:55:02 2002 +++ xc/programs/Xserver/Xprint/pcl/Imakefile Sun Feb 19 10:51:18 2006 @@ -1,9 +1,4 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/Xprint/pcl/Imakefile,v 1.8 2002/11/11 17:55:02 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/Xprint/pcl/Imakefile,v 1.10 2006/02/19 15:51:18 tsi Exp $ #include @@ -17,26 +12,23 @@ PCL_DRIVER = -DXP_PCL_COLOR #endif -SRCS1 = PclInit.c PclMisc.c PclWindow.c PclFonts.c PclPrint.c \ - PclArea.c PclArc.c PclGC.c PclLine.c PclPixel.c PclPolygon.c \ +#ifndef XprtExcludedExtensions +#define XprtExcludedExtensions /**/ +#endif + + SRCS = PclInit.c PclMisc.c PclWindow.c PclFonts.c PclPrint.c \ + PclArea.c PclArc.c PclGC.c PclLine.c PclPixel.c PclPolygon.c \ PclSpans.c PclText.c PclCursor.c PclAttr.c PclPixmap.c PclSFonts.c \ PclColor.c PclAttVal.c -OBJS1 = PclInit.o PclMisc.o PclWindow.o PclFonts.o PclPrint.o \ - PclArea.o PclArc.o PclGC.o PclLine.o PclPixel.o PclPolygon.o \ + OBJS = PclInit.o PclMisc.o PclWindow.o PclFonts.o PclPrint.o \ + PclArea.o PclArc.o PclGC.o PclLine.o PclPixel.o PclPolygon.o \ PclSpans.o PclText.o PclCursor.o PclAttr.o PclPixmap.o PclSFonts.o \ PclColor.o PclAttVal.o -SRCS = $(SRCS1) - -OBJS = $(OBJS1) +DEFINES = -DPSZ=PixelSize $(PCL_DRIVER) $(EXT_DEFINES) XprtExcludedExtensions -DEFINES = -DPSZ=PixelSize $(PCL_DRIVER) -UXFree86LOADER -D_XP_PRINT_SERVER_ - - INCLUDES = -I. -I$(XINCLUDESRC) -I.. -I$(LIBSRC) \ - -I../../include -I$(TOP)/include \ - -I$(TOP)/include/extensions -I$(TOP)/include/fonts \ - -I../../mi -I../../mfb -I../../cfb + INCLUDES = -I.. -I../../include -I../../mi -I../../mfb -I../../cfb LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \ ../../mfb/llib-lmfb.ln ../../mi/llib-lmi.ln \ @@ -45,7 +37,8 @@ NormalLibraryObjectRule() NormalLibraryTarget(pcl,$(OBJS)) -NormalLintTarget($(SRCS1) $(SRCS2)) +NormalLintTarget($(SRCS)) + #ifdef LinkDirectory LinkSourceFile(Pcl.h,LinkDirectory) LinkSourceFile(Pclmap.h,LinkDirectory) Index: xc/programs/Xserver/Xprint/pcl/Pcl.h diff -u xc/programs/Xserver/Xprint/pcl/Pcl.h:1.13 xc/programs/Xserver/Xprint/pcl/Pcl.h:1.14 --- xc/programs/Xserver/Xprint/pcl/Pcl.h:1.13 Tue Jul 15 21:38:34 2003 +++ xc/programs/Xserver/Xprint/pcl/Pcl.h Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Pcl.h,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.14 2005/10/14 15:16:16 tsi Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +44,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.13 2003/07/16 01:38:34 dawes Exp $ */ #ifndef _PCL_H_ #define _PCL_H_ @@ -60,7 +59,7 @@ #include #include "regionstr.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" Index: xc/programs/Xserver/Xprint/pcl/PclArc.c diff -u xc/programs/Xserver/Xprint/pcl/PclArc.c:1.5 xc/programs/Xserver/Xprint/pcl/PclArc.c:1.6 --- xc/programs/Xserver/Xprint/pcl/PclArc.c:1.5 Wed Jan 17 17:36:30 2001 +++ xc/programs/Xserver/Xprint/pcl/PclArc.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclArc.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,7 @@ copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.5 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.6 2006/01/09 14:59:43 dawes Exp $ */ #include #include Index: xc/programs/Xserver/Xprint/pcl/PclArea.c diff -u xc/programs/Xserver/Xprint/pcl/PclArea.c:1.9 xc/programs/Xserver/Xprint/pcl/PclArea.c:1.10 --- xc/programs/Xserver/Xprint/pcl/PclArea.c:1.9 Sat Oct 27 23:32:54 2001 +++ xc/programs/Xserver/Xprint/pcl/PclArea.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclArea.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.9 2001/10/28 03:32:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.10 2006/01/09 14:59:43 dawes Exp $ */ #include #include Index: xc/programs/Xserver/Xprint/pcl/PclAttVal.c diff -u xc/programs/Xserver/Xprint/pcl/PclAttVal.c:1.1.1.2 xc/programs/Xserver/Xprint/pcl/PclAttVal.c:1.2 --- xc/programs/Xserver/Xprint/pcl/PclAttVal.c:1.1.1.2 Tue Jan 16 17:41:51 2001 +++ xc/programs/Xserver/Xprint/pcl/PclAttVal.c Mon Jan 9 09:59:43 2006 @@ -1,6 +1,4 @@ -/* - * $Xorg: PclAttVal.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ - */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclAttVal.c,v 1.2 2006/01/09 14:59:43 dawes Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. Index: xc/programs/Xserver/Xprint/pcl/PclAttr.c diff -u xc/programs/Xserver/Xprint/pcl/PclAttr.c:1.1.1.2 xc/programs/Xserver/Xprint/pcl/PclAttr.c:1.2 --- xc/programs/Xserver/Xprint/pcl/PclAttr.c:1.1.1.2 Tue Jan 16 17:41:52 2001 +++ xc/programs/Xserver/Xprint/pcl/PclAttr.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PclAttr.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclAttr.c,v 1.2 2006/01/09 14:59:43 dawes Exp $ */ /******************************************************************* ** ** ********************************************************* Index: xc/programs/Xserver/Xprint/pcl/PclColor.c diff -u xc/programs/Xserver/Xprint/pcl/PclColor.c:1.10 xc/programs/Xserver/Xprint/pcl/PclColor.c:1.11 --- xc/programs/Xserver/Xprint/pcl/PclColor.c:1.10 Wed Oct 29 17:11:00 2003 +++ xc/programs/Xserver/Xprint/pcl/PclColor.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclColor.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.10 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.11 2006/01/09 14:59:43 dawes Exp $ */ #include #include Index: xc/programs/Xserver/Xprint/pcl/PclCursor.c diff -u xc/programs/Xserver/Xprint/pcl/PclCursor.c:1.4 xc/programs/Xserver/Xprint/pcl/PclCursor.c:1.5 --- xc/programs/Xserver/Xprint/pcl/PclCursor.c:1.4 Wed Jan 17 17:36:30 2001 +++ xc/programs/Xserver/Xprint/pcl/PclCursor.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclCursor.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.5 2006/01/09 14:59:43 dawes Exp $ */ #include Index: xc/programs/Xserver/Xprint/pcl/PclDef.h diff -u xc/programs/Xserver/Xprint/pcl/PclDef.h:1.1.1.2 xc/programs/Xserver/Xprint/pcl/PclDef.h:1.2 --- xc/programs/Xserver/Xprint/pcl/PclDef.h:1.1.1.2 Tue Jan 16 17:41:52 2001 +++ xc/programs/Xserver/Xprint/pcl/PclDef.h Mon Jan 9 09:59:43 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PclDef.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclDef.h,v 1.2 2006/01/09 14:59:43 dawes Exp $ */ /******************************************************************* ** ** ********************************************************* Index: xc/programs/Xserver/Xprint/pcl/PclFonts.c diff -u xc/programs/Xserver/Xprint/pcl/PclFonts.c:1.2 xc/programs/Xserver/Xprint/pcl/PclFonts.c:1.3 --- xc/programs/Xserver/Xprint/pcl/PclFonts.c:1.2 Tue Jul 15 21:38:34 2003 +++ xc/programs/Xserver/Xprint/pcl/PclFonts.c Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: PclFonts.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclFonts.c,v 1.3 2005/10/14 15:16:16 tsi Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -13,7 +13,6 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclFonts.c,v 1.2 2003/07/16 01:38:34 dawes Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -47,7 +46,7 @@ */ #include "regionstr.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "scrnintstr.h" Index: xc/programs/Xserver/Xprint/pcl/PclGC.c diff -u xc/programs/Xserver/Xprint/pcl/PclGC.c:1.10 xc/programs/Xserver/Xprint/pcl/PclGC.c:1.11 --- xc/programs/Xserver/Xprint/pcl/PclGC.c:1.10 Sat Oct 27 23:32:54 2001 +++ xc/programs/Xserver/Xprint/pcl/PclGC.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclGC.c,v 1.4 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.10 2001/10/28 03:32:54 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.11 2006/01/09 14:59:43 dawes Exp $ */ #include "gcstruct.h" Index: xc/programs/Xserver/Xprint/pcl/PclInit.c diff -u xc/programs/Xserver/Xprint/pcl/PclInit.c:1.12 xc/programs/Xserver/Xprint/pcl/PclInit.c:1.14 --- xc/programs/Xserver/Xprint/pcl/PclInit.c:1.12 Wed Oct 16 17:13:32 2002 +++ xc/programs/Xserver/Xprint/pcl/PclInit.c Sun Feb 19 10:51:18 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PclInit.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.14 2006/02/19 15:51:18 tsi Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -76,7 +76,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.12 2002/10/16 21:13:32 dawes Exp $ */ #include #include @@ -86,11 +85,16 @@ #include "Pcl.h" #include "cfb.h" -#include "Xos.h" /* for unlink() */ +#include /* for unlink() */ #include "attributes.h" #include "DiPrint.h" +#ifdef MITSHM +#define _XSHM_SERVER_ +#include +#endif + #define MODELDIRNAME "/models" static void AllocatePclPrivates(ScreenPtr pScreen); @@ -210,6 +214,10 @@ maxRes ); #endif /* XP_PCL_COLOR */ +#ifdef MITSHM + ShmRegisterMiFuncs(pScreen); +#endif + miInitializeBackingStore ( pScreen ); pScreen->defColormap = FakeClientID(0); Index: xc/programs/Xserver/Xprint/pcl/PclLine.c diff -u xc/programs/Xserver/Xprint/pcl/PclLine.c:1.7 xc/programs/Xserver/Xprint/pcl/PclLine.c:1.8 --- xc/programs/Xserver/Xprint/pcl/PclLine.c:1.7 Wed Jan 17 17:36:30 2001 +++ xc/programs/Xserver/Xprint/pcl/PclLine.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclLine.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.8 2006/01/09 14:59:43 dawes Exp $ */ #include "Pcl.h" #include "gcstruct.h" Index: xc/programs/Xserver/Xprint/pcl/PclMisc.c diff -u xc/programs/Xserver/Xprint/pcl/PclMisc.c:1.11 xc/programs/Xserver/Xprint/pcl/PclMisc.c:1.12 --- xc/programs/Xserver/Xprint/pcl/PclMisc.c:1.11 Wed Oct 29 17:11:00 2003 +++ xc/programs/Xserver/Xprint/pcl/PclMisc.c Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: PclMisc.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.12 2005/10/14 15:16:16 tsi Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,13 +44,12 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ #include #include #include #include -#include "Xos.h" /* for SIGCLD on pre-POSIX systems */ +#include /* for SIGCLD on pre-POSIX systems */ #include "Pcl.h" #include "cursor.h" Index: xc/programs/Xserver/Xprint/pcl/PclPixel.c diff -u xc/programs/Xserver/Xprint/pcl/PclPixel.c:1.7 xc/programs/Xserver/Xprint/pcl/PclPixel.c:1.8 --- xc/programs/Xserver/Xprint/pcl/PclPixel.c:1.7 Wed Oct 29 17:11:00 2003 +++ xc/programs/Xserver/Xprint/pcl/PclPixel.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclPixel.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.7 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.8 2006/01/09 14:59:43 dawes Exp $ */ #include Index: xc/programs/Xserver/Xprint/pcl/PclPixmap.c diff -u xc/programs/Xserver/Xprint/pcl/PclPixmap.c:1.4 xc/programs/Xserver/Xprint/pcl/PclPixmap.c:1.5 --- xc/programs/Xserver/Xprint/pcl/PclPixmap.c:1.4 Wed Jan 17 17:36:30 2001 +++ xc/programs/Xserver/Xprint/pcl/PclPixmap.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclPixmap.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.4 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.5 2006/01/09 14:59:43 dawes Exp $ */ #include "Pcl.h" #include "cfb.h" Index: xc/programs/Xserver/Xprint/pcl/PclPolygon.c diff -u xc/programs/Xserver/Xprint/pcl/PclPolygon.c:1.7 xc/programs/Xserver/Xprint/pcl/PclPolygon.c:1.8 --- xc/programs/Xserver/Xprint/pcl/PclPolygon.c:1.7 Wed Jan 17 17:36:30 2001 +++ xc/programs/Xserver/Xprint/pcl/PclPolygon.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclPolygon.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.7 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.8 2006/01/09 14:59:43 dawes Exp $ */ #include "Pcl.h" Index: xc/programs/Xserver/Xprint/pcl/PclPrint.c diff -u xc/programs/Xserver/Xprint/pcl/PclPrint.c:1.8 xc/programs/Xserver/Xprint/pcl/PclPrint.c:1.9 --- xc/programs/Xserver/Xprint/pcl/PclPrint.c:1.8 Wed Oct 29 17:11:00 2003 +++ xc/programs/Xserver/Xprint/pcl/PclPrint.c Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: PclPrint.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.9 2005/10/14 15:16:16 tsi Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -43,7 +43,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.8 2003/10/29 22:11:00 tsi Exp $ */ #include #include @@ -54,7 +53,7 @@ #include #define NEED_EVENTS -#include "Xproto.h" +#include #undef NEED_EVENTS #include "Pcl.h" Index: xc/programs/Xserver/Xprint/pcl/PclSFonts.c diff -u xc/programs/Xserver/Xprint/pcl/PclSFonts.c:1.8 xc/programs/Xserver/Xprint/pcl/PclSFonts.c:1.9 --- xc/programs/Xserver/Xprint/pcl/PclSFonts.c:1.8 Mon Dec 22 12:48:05 2003 +++ xc/programs/Xserver/Xprint/pcl/PclSFonts.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclSFonts.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.8 2003/12/22 17:48:05 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.9 2006/01/09 14:59:43 dawes Exp $ */ #include Index: xc/programs/Xserver/Xprint/pcl/PclSFonts.h diff -u xc/programs/Xserver/Xprint/pcl/PclSFonts.h:1.1.1.2 xc/programs/Xserver/Xprint/pcl/PclSFonts.h:1.2 --- xc/programs/Xserver/Xprint/pcl/PclSFonts.h:1.1.1.2 Tue Jan 16 17:41:56 2001 +++ xc/programs/Xserver/Xprint/pcl/PclSFonts.h Mon Jan 9 09:59:43 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PclSFonts.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.h,v 1.2 2006/01/09 14:59:43 dawes Exp $ */ #ifndef _PCLFONTS_H #define _PCLFONTS_H Index: xc/programs/Xserver/Xprint/pcl/PclSpans.c diff -u xc/programs/Xserver/Xprint/pcl/PclSpans.c:1.6 xc/programs/Xserver/Xprint/pcl/PclSpans.c:1.7 --- xc/programs/Xserver/Xprint/pcl/PclSpans.c:1.6 Wed Jan 17 17:36:30 2001 +++ xc/programs/Xserver/Xprint/pcl/PclSpans.c Mon Jan 9 09:59:43 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclSpans.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.6 2001/01/17 22:36:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.7 2006/01/09 14:59:43 dawes Exp $ */ #include "Pcl.h" Index: xc/programs/Xserver/Xprint/pcl/PclText.c diff -u xc/programs/Xserver/Xprint/pcl/PclText.c:1.11 xc/programs/Xserver/Xprint/pcl/PclText.c:1.12 --- xc/programs/Xserver/Xprint/pcl/PclText.c:1.11 Wed Oct 29 17:11:00 2003 +++ xc/programs/Xserver/Xprint/pcl/PclText.c Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: PclText.c,v 1.5 2001/03/06 16:28:48 pookie Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.12 2005/10/14 15:16:16 tsi Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +44,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ #ifdef DO_TWO_BYTE_PCL #include "iconv.h" @@ -54,7 +53,7 @@ #include "Pcl.h" #include "migc.h" -#include "Xatom.h" +#include #include "PclSFonts.h" Index: xc/programs/Xserver/Xprint/pcl/PclWindow.c diff -u xc/programs/Xserver/Xprint/pcl/PclWindow.c:1.11 xc/programs/Xserver/Xprint/pcl/PclWindow.c:1.12 --- xc/programs/Xserver/Xprint/pcl/PclWindow.c:1.11 Wed Oct 29 17:11:00 2003 +++ xc/programs/Xserver/Xprint/pcl/PclWindow.c Mon Jan 9 09:59:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PclWindow.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.11 2003/10/29 22:11:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.12 2006/01/09 14:59:44 dawes Exp $ */ #include Index: xc/programs/Xserver/Xprint/pcl/Pclmap.h diff -u xc/programs/Xserver/Xprint/pcl/Pclmap.h:1.6 xc/programs/Xserver/Xprint/pcl/Pclmap.h:1.7 --- xc/programs/Xserver/Xprint/pcl/Pclmap.h:1.6 Fri Dec 21 16:02:05 2001 +++ xc/programs/Xserver/Xprint/pcl/Pclmap.h Mon Jan 9 09:59:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: Pclmap.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.6 2001/12/21 21:02:05 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.7 2006/01/09 14:59:44 dawes Exp $ */ #ifndef _PCLMAP_H_ #define _PCLMAP_H_ Index: xc/programs/Xserver/Xprint/pcl-mono/Imakefile diff -u xc/programs/Xserver/Xprint/pcl-mono/Imakefile:1.1.1.2 xc/programs/Xserver/Xprint/pcl-mono/Imakefile:1.2 --- xc/programs/Xserver/Xprint/pcl-mono/Imakefile:1.1.1.2 Tue Jan 16 17:42:06 2001 +++ xc/programs/Xserver/Xprint/pcl-mono/Imakefile Mon Jan 9 09:59:44 2006 @@ -1,4 +1,5 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:09 cpqbld Exp $ +XCOMM $XFree86: xc/programs/Xserver/Xprint/pcl-mono/Imakefile,v 1.2 2006/01/09 14:59:44 dawes Exp $ + #define PclDriver -DXP_PCL_MONO #define LinkDirectory ../pcl Index: xc/programs/Xserver/Xprint/ps/Imakefile diff -u xc/programs/Xserver/Xprint/ps/Imakefile:1.9 xc/programs/Xserver/Xprint/ps/Imakefile:1.11 --- xc/programs/Xserver/Xprint/ps/Imakefile:1.9 Mon Nov 11 12:55:02 2002 +++ xc/programs/Xserver/Xprint/ps/Imakefile Sun Feb 19 10:51:18 2006 @@ -1,29 +1,23 @@ -XCOMM $Xorg: Imakefile,v 1.4 2000/08/17 19:48:09 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/Xprint/ps/Imakefile,v 1.9 2002/11/11 17:55:02 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/Xprint/ps/Imakefile,v 1.11 2006/02/19 15:51:18 tsi Exp $ #include -SRCS1 = PsInit.c PsPrint.c PsGC.c PsMisc.c PsSpans.c PsArea.c PsPixel.c \ - PsLine.c PsPolygon.c PsArc.c PsText.c PsWindow.c PsFonts.c \ - PsAttr.c PsAttVal.c PsColor.c PsPixmap.c psout.c PsCache.c - -OBJS1 = PsInit.o PsPrint.o PsGC.o PsMisc.o PsSpans.o PsArea.o PsPixel.o \ - PsLine.o PsPolygon.o PsArc.o PsText.o PsWindow.o PsFonts.o \ - PsAttr.o PsAttVal.o PsColor.o PsPixmap.o psout.o PsCache.o - -SRCS = $(SRCS1) - -OBJS = $(OBJS1) + SRCS = PsInit.c PsPrint.c PsGC.c PsMisc.c PsSpans.c PsArea.c PsPixel.c \ + PsLine.c PsPolygon.c PsArc.c PsText.c PsWindow.c PsFonts.c \ + PsAttr.c PsAttVal.c PsColor.c PsPixmap.c psout.c PsCache.c + + OBJS = PsInit.o PsPrint.o PsGC.o PsMisc.o PsSpans.o PsArea.o PsPixel.o \ + PsLine.o PsPolygon.o PsArc.o PsText.o PsWindow.o PsFonts.o \ + PsAttr.o PsAttVal.o PsColor.o PsPixmap.o psout.o PsCache.o + +#ifndef XprtExcludedExtensions +#define XprtExcludedExtensions /**/ +#endif - DEFINES = -UXFree86LOADER -DXP_PSTEXT -D_XP_PRINT_SERVER_ -DBM_CACHE + DEFINES = -DXP_PSTEXT -DBM_CACHE $(EXT_DEFINES) XprtExcludedExtensions - INCLUDES = -I. -I../../cfb -I../../mi -I../../mfb -I$(LIBSRC) \ - -I$(XINCLUDESRC) -I../../include -I.. -I$(TOP)/include \ - -I$(EXTINCSRC) -I$(FONTINCSRC) -I$(FONTLIBSRC)/include + INCLUDES = -I../../cfb -I../../mi -I../../mfb -I../../include -I.. \ + -I$(FONTLIBSRC)/include LINTLIBS = $(TOP)/server/dix/llib-ldix.ln $(TOP)/server/os/llib-los.ln \ $(TOP)/server/ddx/mfb/llib-lmfb.ln \ @@ -33,6 +27,6 @@ NormalLibraryObjectRule() NormalLibraryTarget(ps,$(OBJS)) -NormalLintTarget($(SRCS1) $(SRCS2)) +NormalLintTarget($(SRCS)) DependTarget() Index: xc/programs/Xserver/Xprint/ps/Ps.h diff -u xc/programs/Xserver/Xprint/ps/Ps.h:1.14 xc/programs/Xserver/Xprint/ps/Ps.h:1.15 --- xc/programs/Xserver/Xprint/ps/Ps.h:1.14 Tue Jul 15 21:38:34 2003 +++ xc/programs/Xserver/Xprint/ps/Ps.h Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Ps.h,v 1.5 2001/02/09 02:04:35 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.15 2005/10/14 15:16:16 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +73,6 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/Ps.h,v 1.14 2003/07/16 01:38:34 dawes Exp $ */ #ifndef _PS_H_ #define _PS_H_ @@ -94,7 +93,7 @@ #include #include "regionstr.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" Index: xc/programs/Xserver/Xprint/ps/PsArc.c diff -u xc/programs/Xserver/Xprint/ps/PsArc.c:1.2 xc/programs/Xserver/Xprint/ps/PsArc.c:1.3 --- xc/programs/Xserver/Xprint/ps/PsArc.c:1.2 Fri Dec 14 14:59:15 2001 +++ xc/programs/Xserver/Xprint/ps/PsArc.c Mon Jan 9 09:59:44 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PsArc.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsArc.c,v 1.3 2006/01/09 14:59:44 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/Xserver/Xprint/ps/PsArea.c diff -u xc/programs/Xserver/Xprint/ps/PsArea.c:1.3 xc/programs/Xserver/Xprint/ps/PsArea.c:1.4 --- xc/programs/Xserver/Xprint/ps/PsArea.c:1.3 Fri Dec 21 16:02:06 2001 +++ xc/programs/Xserver/Xprint/ps/PsArea.c Mon Jan 9 09:59:44 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PsArea.c,v 1.6 2001/03/14 18:27:44 pookie Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsArea.c,v 1.4 2006/01/09 14:59:44 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/Xserver/Xprint/ps/PsAttVal.c diff -u xc/programs/Xserver/Xprint/ps/PsAttVal.c:1.5 xc/programs/Xserver/Xprint/ps/PsAttVal.c:1.6 --- xc/programs/Xserver/Xprint/ps/PsAttVal.c:1.5 Wed Dec 19 16:28:44 2001 +++ xc/programs/Xserver/Xprint/ps/PsAttVal.c Mon Jan 9 09:59:44 2006 @@ -1,7 +1,4 @@ /* - * $Xorg: PsAttVal.c,v 1.5 2001/03/13 18:45:31 pookie Exp $ - */ -/* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. (c) Copyright 1996 Sun Microsystems, Inc. @@ -32,7 +29,7 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttVal.c,v 1.5 2001/12/19 21:28:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttVal.c,v 1.6 2006/01/09 14:59:44 dawes Exp $ */ #include "Ps.h" #include "AttrValid.h" Index: xc/programs/Xserver/Xprint/ps/PsAttr.c diff -u xc/programs/Xserver/Xprint/ps/PsAttr.c:1.5 xc/programs/Xserver/Xprint/ps/PsAttr.c:1.6 --- xc/programs/Xserver/Xprint/ps/PsAttr.c:1.5 Fri Dec 14 14:59:15 2001 +++ xc/programs/Xserver/Xprint/ps/PsAttr.c Mon Jan 9 09:59:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PsAttr.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -57,7 +56,7 @@ * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.5 2001/12/14 19:59:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsAttr.c,v 1.6 2006/01/09 14:59:44 dawes Exp $ */ /******************************************************************* ** Index: xc/programs/Xserver/Xprint/ps/PsColor.c diff -u xc/programs/Xserver/Xprint/ps/PsColor.c:1.3 xc/programs/Xserver/Xprint/ps/PsColor.c:1.4 --- xc/programs/Xserver/Xprint/ps/PsColor.c:1.3 Fri Dec 14 14:59:15 2001 +++ xc/programs/Xserver/Xprint/ps/PsColor.c Mon Jan 9 09:59:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PsColor.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsColor.c,v 1.3 2001/12/14 19:59:15 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsColor.c,v 1.4 2006/01/09 14:59:44 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" Index: xc/programs/Xserver/Xprint/ps/PsDef.h diff -u xc/programs/Xserver/Xprint/ps/PsDef.h:1.2 xc/programs/Xserver/Xprint/ps/PsDef.h:1.3 --- xc/programs/Xserver/Xprint/ps/PsDef.h:1.2 Fri Dec 14 14:59:15 2001 +++ xc/programs/Xserver/Xprint/ps/PsDef.h Mon Jan 9 09:59:44 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PsDef.h,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsDef.h,v 1.3 2006/01/09 14:59:44 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group Index: xc/programs/Xserver/Xprint/ps/PsFonts.c diff -u xc/programs/Xserver/Xprint/ps/PsFonts.c:1.7 xc/programs/Xserver/Xprint/ps/PsFonts.c:1.8 --- xc/programs/Xserver/Xprint/ps/PsFonts.c:1.7 Tue Jul 15 21:38:34 2003 +++ xc/programs/Xserver/Xprint/ps/PsFonts.c Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: PsFonts.c,v 1.6 2001/03/06 16:30:15 pookie Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.8 2005/10/14 15:16:16 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -57,7 +57,6 @@ * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsFonts.c,v 1.7 2003/07/16 01:38:34 dawes Exp $ */ /******************************************************************* ** @@ -76,7 +75,7 @@ ********************************************************************/ #include "regionstr.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "scrnintstr.h" #include "fontxlfd.h" Index: xc/programs/Xserver/Xprint/ps/PsGC.c diff -u xc/programs/Xserver/Xprint/ps/PsGC.c:1.8 xc/programs/Xserver/Xprint/ps/PsGC.c:1.9 --- xc/programs/Xserver/Xprint/ps/PsGC.c:1.8 Sat Oct 23 11:29:27 2004 +++ xc/programs/Xserver/Xprint/ps/PsGC.c Mon Jan 9 09:59:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PsGC.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -57,7 +56,7 @@ * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.8 2004/10/23 15:29:27 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsGC.c,v 1.9 2006/01/09 14:59:44 dawes Exp $ */ /******************************************************************* ** Index: xc/programs/Xserver/Xprint/ps/PsInit.c diff -u xc/programs/Xserver/Xprint/ps/PsInit.c:1.14 xc/programs/Xserver/Xprint/ps/PsInit.c:1.16 --- xc/programs/Xserver/Xprint/ps/PsInit.c:1.14 Wed Oct 29 17:11:55 2003 +++ xc/programs/Xserver/Xprint/ps/PsInit.c Sun Feb 19 10:51:18 2006 @@ -1,4 +1,4 @@ -/* $Xorg: PsInit.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.16 2006/02/19 15:51:18 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +73,6 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsInit.c,v 1.14 2003/10/29 22:11:55 tsi Exp $ */ #include #include @@ -90,6 +89,11 @@ #include "windowstr.h" #include "DiPrint.h" +#ifdef MITSHM +#define _XSHM_SERVER_ +#include +#endif + static void AllocatePsPrivates(ScreenPtr pScreen); static int PsInitContext(XpContextPtr pCon); static int PsDestroyContext(XpContextPtr pCon); @@ -222,6 +226,10 @@ 0, 8, nDepths, depths, visuals[1].vid, nVisuals, visuals); +#ifdef MITSHM + ShmRegisterMiFuncs(pScreen); +#endif + if( cfbCreateDefColormap(pScreen)==FALSE ) return FALSE; /*scalingScreenInit(pScreen);*/ Index: xc/programs/Xserver/Xprint/ps/PsLine.c diff -u xc/programs/Xserver/Xprint/ps/PsLine.c:1.6 xc/programs/Xserver/Xprint/ps/PsLine.c:1.7 --- xc/programs/Xserver/Xprint/ps/PsLine.c:1.6 Fri Dec 14 14:59:16 2001 +++ xc/programs/Xserver/Xprint/ps/PsLine.c Mon Jan 9 09:59:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PsLine.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsLine.c,v 1.7 2006/01/09 14:59:44 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" Index: xc/programs/Xserver/Xprint/ps/PsMisc.c diff -u xc/programs/Xserver/Xprint/ps/PsMisc.c:1.6 xc/programs/Xserver/Xprint/ps/PsMisc.c:1.7 --- xc/programs/Xserver/Xprint/ps/PsMisc.c:1.6 Fri Dec 14 14:59:16 2001 +++ xc/programs/Xserver/Xprint/ps/PsMisc.c Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: PsMisc.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.7 2005/10/14 15:16:16 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,9 +73,8 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsMisc.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ -#include "Xos.h" /* for SIGCLD on pre-POSIX systems */ +#include /* for SIGCLD on pre-POSIX systems */ #include #include "Ps.h" Index: xc/programs/Xserver/Xprint/ps/PsPixel.c diff -u xc/programs/Xserver/Xprint/ps/PsPixel.c:1.6 xc/programs/Xserver/Xprint/ps/PsPixel.c:1.7 --- xc/programs/Xserver/Xprint/ps/PsPixel.c:1.6 Fri Dec 14 14:59:16 2001 +++ xc/programs/Xserver/Xprint/ps/PsPixel.c Mon Jan 9 09:59:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PsPixel.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.6 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixel.c,v 1.7 2006/01/09 14:59:44 dawes Exp $ */ #include Index: xc/programs/Xserver/Xprint/ps/PsPixmap.c diff -u xc/programs/Xserver/Xprint/ps/PsPixmap.c:1.5 xc/programs/Xserver/Xprint/ps/PsPixmap.c:1.6 --- xc/programs/Xserver/Xprint/ps/PsPixmap.c:1.5 Fri Dec 14 14:59:16 2001 +++ xc/programs/Xserver/Xprint/ps/PsPixmap.c Mon Jan 9 09:59:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PsPixmap.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -57,7 +56,7 @@ * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.5 2001/12/14 19:59:16 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPixmap.c,v 1.6 2006/01/09 14:59:44 dawes Exp $ */ /******************************************************************* ** ** ********************************************************* Index: xc/programs/Xserver/Xprint/ps/PsPolygon.c diff -u xc/programs/Xserver/Xprint/ps/PsPolygon.c:1.7 xc/programs/Xserver/Xprint/ps/PsPolygon.c:1.8 --- xc/programs/Xserver/Xprint/ps/PsPolygon.c:1.7 Fri Dec 14 14:59:17 2001 +++ xc/programs/Xserver/Xprint/ps/PsPolygon.c Mon Jan 9 09:59:44 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PsPolygon.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.7 2001/12/14 19:59:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPolygon.c,v 1.8 2006/01/09 14:59:44 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" Index: xc/programs/Xserver/Xprint/ps/PsPrint.c diff -u xc/programs/Xserver/Xprint/ps/PsPrint.c:1.11 xc/programs/Xserver/Xprint/ps/PsPrint.c:1.12 --- xc/programs/Xserver/Xprint/ps/PsPrint.c:1.11 Fri Dec 21 16:02:06 2001 +++ xc/programs/Xserver/Xprint/ps/PsPrint.c Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: PsPrint.c,v 1.7 2001/03/14 18:28:18 pookie Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.12 2005/10/14 15:16:16 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +73,6 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsPrint.c,v 1.11 2001/12/21 21:02:06 dawes Exp $ */ #include #include @@ -85,7 +84,7 @@ #include #define NEED_EVENTS -#include "Xproto.h" +#include #undef NEED_EVENTS #include "Ps.h" Index: xc/programs/Xserver/Xprint/ps/PsSpans.c diff -u xc/programs/Xserver/Xprint/ps/PsSpans.c:1.9 xc/programs/Xserver/Xprint/ps/PsSpans.c:1.10 --- xc/programs/Xserver/Xprint/ps/PsSpans.c:1.9 Fri Dec 14 14:59:17 2001 +++ xc/programs/Xserver/Xprint/ps/PsSpans.c Mon Jan 9 09:59:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PsSpans.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.9 2001/12/14 19:59:17 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.10 2006/01/09 14:59:45 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" Index: xc/programs/Xserver/Xprint/ps/PsText.c diff -u xc/programs/Xserver/Xprint/ps/PsText.c:1.13 xc/programs/Xserver/Xprint/ps/PsText.c:1.14 --- xc/programs/Xserver/Xprint/ps/PsText.c:1.13 Wed Oct 29 17:11:55 2003 +++ xc/programs/Xserver/Xprint/ps/PsText.c Mon Jan 9 09:59:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PsText.c,v 1.7 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsText.c,v 1.14 2006/01/09 14:59:45 dawes Exp $ */ #include "Ps.h" #include "gcstruct.h" Index: xc/programs/Xserver/Xprint/ps/PsWindow.c diff -u xc/programs/Xserver/Xprint/ps/PsWindow.c:1.13 xc/programs/Xserver/Xprint/ps/PsWindow.c:1.14 --- xc/programs/Xserver/Xprint/ps/PsWindow.c:1.13 Wed Oct 29 17:11:55 2003 +++ xc/programs/Xserver/Xprint/ps/PsWindow.c Mon Jan 9 09:59:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: PsWindow.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.13 2003/10/29 22:11:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/PsWindow.c,v 1.14 2006/01/09 14:59:45 dawes Exp $ */ #include #include Index: xc/programs/Xserver/Xprint/ps/psout.c diff -u xc/programs/Xserver/Xprint/ps/psout.c:1.12 xc/programs/Xserver/Xprint/ps/psout.c:1.13 --- xc/programs/Xserver/Xprint/ps/psout.c:1.12 Fri Dec 21 16:02:06 2001 +++ xc/programs/Xserver/Xprint/ps/psout.c Mon Jan 9 09:59:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: psout.c,v 1.9 2001/03/26 15:25:12 coskrey Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,7 @@ ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.12 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.c,v 1.13 2006/01/09 14:59:45 dawes Exp $ */ /* * For XFree86 3.3.3: Index: xc/programs/Xserver/Xprint/ps/psout.h diff -u xc/programs/Xserver/Xprint/ps/psout.h:1.5 xc/programs/Xserver/Xprint/ps/psout.h:1.6 --- xc/programs/Xserver/Xprint/ps/psout.h:1.5 Fri Dec 21 16:02:06 2001 +++ xc/programs/Xserver/Xprint/ps/psout.h Mon Jan 9 09:59:45 2006 @@ -1,4 +1,3 @@ -/* $Xorg: psout.h,v 1.6 2001/02/09 02:04:37 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -57,7 +56,7 @@ * or other dealings in this Software without prior written authorization * from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.5 2001/12/21 21:02:06 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/ps/psout.h,v 1.6 2006/01/09 14:59:45 dawes Exp $ */ /******************************************************************* ** Index: xc/programs/Xserver/Xprint/randr/Imakefile diff -u /dev/null xc/programs/Xserver/Xprint/randr/Imakefile:1.1 --- /dev/null Tue May 9 21:55:57 2006 +++ xc/programs/Xserver/Xprint/randr/Imakefile Sun Feb 19 10:51:18 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/Xprint/randr/Imakefile,v 1.1 2006/02/19 15:51:18 tsi Exp $ +/* + * Copyright (c) 2004-2006 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XprtExcludedExtensions +#define LinkDirectory ../../randr + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../randr/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/Xprint/raster/Imakefile diff -u xc/programs/Xserver/Xprint/raster/Imakefile:1.7 xc/programs/Xserver/Xprint/raster/Imakefile:1.9 --- xc/programs/Xserver/Xprint/raster/Imakefile:1.7 Mon Nov 11 12:55:02 2002 +++ xc/programs/Xserver/Xprint/raster/Imakefile Sun Feb 19 10:51:18 2006 @@ -1,32 +1,25 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:11 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/Xprint/raster/Imakefile,v 1.7 2002/11/11 17:55:02 alanh Exp $ +XCOMM $XFree86: xc/programs/Xserver/Xprint/raster/Imakefile,v 1.9 2006/02/19 15:51:18 tsi Exp $ #include -SRCS1 = Raster.c RasterAttVal.c -OBJS1 = Raster.o RasterAttVal.o - -SRCS = $(SRCS1) +SRCS = Raster.c RasterAttVal.c +OBJS = Raster.o RasterAttVal.o -OBJS = $(OBJS1) +#ifndef XprtExcludedExtensions +#define XprtExcludedExtensions /**/ +#endif - INCLUDES = -I. -I$(XINCLUDESRC) -I.. -I$(LIBSRC) \ - -I../../cfb -I../../mfb -I../../mi \ - -I../../include -I$(TOP)/include -I$(FONTINCSRC) + INCLUDES = -I.. -I../../cfb -I../../mfb -I../../mi -I../../include LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln \ ../../mfb/llib-lmfb.ln ../../mi/llib-lmi.ln \ ../../cfb/llib-lcfb.ln - DEFINES = -D_XP_PRINT_SERVER_ -UXFree86LOADER + DEFINES = $(EXT_DEFINES) XprtExcludedExtensions NormalLibraryObjectRule() NormalLibraryTarget(raster,$(OBJS)) -NormalLintTarget($(SRCS1) $(SRCS2)) +NormalLintTarget($(SRCS)) DependTarget() Index: xc/programs/Xserver/Xprint/raster/Raster.c diff -u xc/programs/Xserver/Xprint/raster/Raster.c:1.12 xc/programs/Xserver/Xprint/raster/Raster.c:1.13 --- xc/programs/Xserver/Xprint/raster/Raster.c:1.12 Wed Oct 29 17:11:55 2003 +++ xc/programs/Xserver/Xprint/raster/Raster.c Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Raster.c,v 1.4 2001/03/14 18:46:12 pookie Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.13 2005/10/14 15:16:16 tsi Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -31,7 +31,6 @@ copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.12 2003/10/29 22:11:55 tsi Exp $ */ /******************************************************************* ** @@ -56,12 +55,12 @@ #include #include #include -#include "X.h" -#include "Xos.h" /* for SIGCLD on pre-POSIX systems */ +#include +#include /* for SIGCLD on pre-POSIX systems */ #define NEED_EVENTS -#include "Xproto.h" +#include #undef NEED_EVENTS -#include "Xatom.h" +#include #include "misc.h" #include "dixstruct.h" #include "scrnintstr.h" Index: xc/programs/Xserver/Xprint/raster/Raster.h diff -u xc/programs/Xserver/Xprint/raster/Raster.h:1.4 xc/programs/Xserver/Xprint/raster/Raster.h:1.5 --- xc/programs/Xserver/Xprint/raster/Raster.h:1.4 Fri Dec 21 16:02:06 2001 +++ xc/programs/Xserver/Xprint/raster/Raster.h Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: Raster.h,v 1.3 2000/08/17 19:48:12 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.h,v 1.5 2005/10/14 15:16:16 tsi Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +30,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.h,v 1.4 2001/12/21 21:02:06 dawes Exp $ */ /******************************************************************* ** @@ -59,7 +58,7 @@ #define True 1 #define False 0 #include "misc.h" -#include +#include #include #include "attributes.h" Index: xc/programs/Xserver/Xprint/raster/RasterAttVal.c diff -u xc/programs/Xserver/Xprint/raster/RasterAttVal.c:1.4 xc/programs/Xserver/Xprint/raster/RasterAttVal.c:1.5 --- xc/programs/Xserver/Xprint/raster/RasterAttVal.c:1.4 Fri Dec 21 16:02:06 2001 +++ xc/programs/Xserver/Xprint/raster/RasterAttVal.c Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -/* $Xorg: RasterAttVal.c,v 1.4 2001/03/14 18:46:34 pookie Exp $ */ +/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.5 2005/10/14 15:16:16 tsi Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,10 +30,9 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.4 2001/12/21 21:02:06 dawes Exp $ */ #include -#include "X.h" +#include #include "misc.h" #include "dixstruct.h" #include "scrnintstr.h" Index: xc/programs/Xserver/Xprint/record/Imakefile diff -u /dev/null xc/programs/Xserver/Xprint/record/Imakefile:1.1 --- /dev/null Tue May 9 21:55:57 2006 +++ xc/programs/Xserver/Xprint/record/Imakefile Sun Feb 19 10:51:18 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/Xprint/record/Imakefile,v 1.1 2006/02/19 15:51:18 tsi Exp $ +/* + * Copyright (c) 2004-2006 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XprtExcludedExtensions +#define LinkDirectory ../../record + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../record/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/Xprint/render/Imakefile diff -u /dev/null xc/programs/Xserver/Xprint/render/Imakefile:1.1 --- /dev/null Tue May 9 21:55:57 2006 +++ xc/programs/Xserver/Xprint/render/Imakefile Sun Feb 19 10:51:18 2006 @@ -0,0 +1,65 @@ +XCOMM $XFree86: xc/programs/Xserver/Xprint/render/Imakefile,v 1.1 2006/02/19 15:51:18 tsi Exp $ +/* + * Copyright (c) 2004-2006 by 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 in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject + * to the following conditions: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution, and in the same place and form as other copyright, + * license and disclaimer information. + * + * 3. The end-user documentation included with the redistribution, + * if any, must include the following acknowledgment: "This product + * includes software developed by The XFree86 Project, Inc + * (http://www.xfree86.org/) and its contributors", in the same + * place and form as other third-party acknowledgments. Alternately, + * this acknowledgment may appear in the software itself, in the + * same form and location as other such third-party acknowledgments. + * + * 4. Except as contained in this notice, the name of The XFree86 + * Project, Inc shall not be used in advertising or otherwise to + * promote the sale, use or other dealings in this Software without + * prior written authorization from The XFree86 Project, Inc. + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE XFREE86 PROJECT, INC OR ITS CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#undef XF86Server +#define XF86Server NO +#undef DoLoadableServer +#define DoLoadableServer NO +#define LinkDefines XprtExcludedExtensions +#define LinkDirectory ../../render + +/* + * The above doesn't really work because rules that depend on the symbols being + * over-ridden above have already been #define'd. Catch this at the Makefiles + * stage. + */ +IMAKE_DEFINES=-DXF86Server=NO + +#include "../../render/Imakefile" + +Makefiles:: Makefile Index: xc/programs/Xserver/afb/Imakefile diff -u xc/programs/Xserver/afb/Imakefile:3.9 xc/programs/Xserver/afb/Imakefile:3.10 --- xc/programs/Xserver/afb/Imakefile:3.9 Mon May 31 20:16:59 2004 +++ xc/programs/Xserver/afb/Imakefile Fri Oct 14 11:16:16 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/afb/Imakefile,v 3.9 2004/06/01 00:16:59 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/afb/Imakefile,v 3.10 2005/10/14 15:16:16 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -73,8 +73,7 @@ afbpushpxl.o afbplygblt.o afbtegblt.o afbpntwin.o afbpntarea.o \ afbbres.o afbhrzvert.o afbline.o afbseg.o $(MODOBJ) -INCLUDES = -I. -I../cfb -I../mfb -I../mi -I../include -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) $(EXTRAINCLUDES) +INCLUDES = -I../cfb -I../mfb -I../mi -I../include $(EXTRAINCLUDES) LINTDEFS = -DMFBPOLYGLYPHBLT=afbPolyGlyphBltWhite \ -DMFBIMAGEGLYPHBLT=afbImageGlyphBltWhite \ -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE -DOPEQ=MFB_OPEQ_WHITE Index: xc/programs/Xserver/afb/afb.h diff -u xc/programs/Xserver/afb/afb.h:3.11 xc/programs/Xserver/afb/afb.h:3.12 --- xc/programs/Xserver/afb/afb.h:3.11 Mon Nov 17 17:20:32 2003 +++ xc/programs/Xserver/afb/afb.h Sun Mar 27 21:51:02 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.11 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afb.h,v 3.12 2005/03/28 02:51:02 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,7 +47,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afb.h,v 5.31 94/04/17 20:28:15 dpw Exp $ */ /* Monochrome Frame Buffer definitions written by drewry, september 1986 */ @@ -80,6 +79,10 @@ unsigned long /*planemask*/ ); +typedef void (*afbDoBitBltProcPtr)(DrawablePtr pSrc, DrawablePtr pDst, + int alu, RegionPtr prgnDst, + DDXPointPtr pptSrc, unsigned long planemask); + extern RegionPtr afbBitBlt( DrawablePtr /*pSrc*/, DrawablePtr /*pDst*/, @@ -90,14 +93,7 @@ int /*height*/, int /*dstx*/, int /*dsty*/, - void (*doBitBlt)( - DrawablePtr /*pSrc*/, - DrawablePtr /*pDst*/, - int /*alu*/, - RegionPtr /*prgnDst*/, - DDXPointPtr /*pptSrc*/, - unsigned long /*planemask*/ - ), + afbDoBitBltProcPtr /*doBitBlt*/, unsigned long /*planemask*/ ); @@ -639,12 +635,6 @@ int /*xOrg*/, int /*yOrg*/ ); -/* afbscrclse.c */ - -extern Bool afbCloseScreen( - int /*index*/, - ScreenPtr /*pScreen*/ -); /* afbscrinit.c */ extern Bool afbAllocatePrivates( @@ -653,6 +643,13 @@ int * /*pGCIndex*/ ); +extern Bool afbCloseScreen( + int /*index*/, + ScreenPtr /*pScreen*/ +); + +extern Bool afbCreateScreenResources(ScreenPtr pScreen); + extern Bool afbScreenInit( ScreenPtr /*pScreen*/, pointer /*pbits*/, Index: xc/programs/Xserver/afb/afbbitblt.c diff -u xc/programs/Xserver/afb/afbbitblt.c:3.6 xc/programs/Xserver/afb/afbbitblt.c:3.8 --- xc/programs/Xserver/afb/afbbitblt.c:3.6 Mon Nov 10 13:21:44 2003 +++ xc/programs/Xserver/afb/afbbitblt.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.6 2003/11/10 18:21:44 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbbitblt.c,v 3.8 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,10 +47,9 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbbitblt.c,v 5.25 94/04/17 20:28:16 dpw Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "regionstr.h" #include "gcstruct.h" @@ -98,12 +97,8 @@ */ void -afbDoBitblt(pSrc, pDst, alu, prgnDst, pptSrc, planemask) - DrawablePtr pSrc, pDst; - int alu; - RegionPtr prgnDst; - DDXPointPtr pptSrc; - unsigned long planemask; +afbDoBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst, + DDXPointPtr pptSrc, unsigned long planemask) { switch (alu) { case GXcopy: @@ -125,16 +120,10 @@ } RegionPtr -afbCopyArea(pSrcDrawable, pDstDrawable, pGC, srcx, srcy, width, height, - dstx, dsty) - DrawablePtr pSrcDrawable; - DrawablePtr pDstDrawable; - GC *pGC; - int srcx, srcy; - int width, height; - int dstx, dsty; +afbCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GC *pGC, + int srcx, int srcy, int width, int height, int dstx, int dsty) { - void (*doBitBlt)(); + afbDoBitBltProcPtr doBitBlt; switch (pGC->alu) { case GXcopy: @@ -159,16 +148,9 @@ } RegionPtr -afbBitBlt(pSrcDrawable, pDstDrawable, pGC, srcx, srcy, width, height, - dstx, dsty, doBitBlt, planemask) - register DrawablePtr pSrcDrawable; - register DrawablePtr pDstDrawable; - register GC *pGC; - int srcx, srcy; - int width, height; - int dstx, dsty; - void (*doBitBlt)(); - unsigned long planemask; +afbBitBlt(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GC *pGC, + int srcx, int srcy, int width, int height, int dstx, int dsty, + afbDoBitBltProcPtr doBitBlt, unsigned long planemask) { RegionPtr prgnSrcClip = NULL; /* may be a new region, or just a copy */ Bool freeSrcClip = FALSE; @@ -176,11 +158,11 @@ RegionPtr prgnExposed; RegionRec rgnDst; DDXPointPtr pptSrc; - register DDXPointPtr ppt; - register BoxPtr pbox; + DDXPointPtr ppt; + BoxPtr pbox; int i; - register int dx; - register int dy; + int dx; + int dy; xRectangle origSource; DDXPointRec origDest; int numRects; @@ -360,14 +342,9 @@ } RegionPtr -afbCopyPlane(pSrcDrawable, pDstDrawable, pGC, srcx, srcy, width, height, - dstx, dsty, plane) -DrawablePtr pSrcDrawable, pDstDrawable; -register GC *pGC; -int srcx, srcy; -int width, height; -int dstx, dsty; -unsigned long plane; +afbCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GC *pGC, + int srcx, int srcy, int width, int height, int dstx, int dsty, + unsigned long plane) { int alu; RegionPtr prgnExposed = NULL; @@ -448,12 +425,8 @@ } void -afbCopy1ToN(pSrc, pDst, alu, prgnDst, pptSrc, planemask) - DrawablePtr pSrc, pDst; - int alu; - RegionPtr prgnDst; - DDXPointPtr pptSrc; - unsigned long planemask; +afbCopy1ToN(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst, + DDXPointPtr pptSrc, unsigned long planemask) { int numRects = REGION_NUM_RECTS(prgnDst); BoxPtr pbox = REGION_RECTS(prgnDst); Index: xc/programs/Xserver/afb/afbblt.c diff -u xc/programs/Xserver/afb/afbblt.c:3.1 xc/programs/Xserver/afb/afbblt.c:3.3 --- xc/programs/Xserver/afb/afbblt.c:3.1 Sat Oct 27 23:32:57 2001 +++ xc/programs/Xserver/afb/afbblt.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.1 2001/10/28 03:32:57 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbblt.c,v 3.3 2005/10/14 15:16:17 tsi Exp $ */ /* * afb copy area */ @@ -31,11 +31,10 @@ Author: Keith Packard */ -/* $XConsortium: afbblt.c,v 1.11 94/04/17 20:28:16 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "afb.h" #include "gcstruct.h" #include "windowstr.h" @@ -47,44 +46,41 @@ #include "mergerop.h" void -MROP_NAME(afbDoBitblt)(pSrc, pDst, alu, prgnDst, pptSrc, planemask) - DrawablePtr pSrc, pDst; - int alu; - RegionPtr prgnDst; - DDXPointPtr pptSrc; - unsigned long planemask; +MROP_NAME(afbDoBitblt)(DrawablePtr pSrc, DrawablePtr pDst, int alu, + RegionPtr prgnDst, DDXPointPtr pptSrc, + unsigned long planemask) { PixelType *psrcBase, *pdstBase; /* start of src and dst bitmaps */ - int widthSrc, widthDst; /* add to get to same position in next line */ + int widthSrc, widthDst; /* add to get to same position in next line */ int sizeSrc, sizeDst; BoxPtr pbox; int nbox; BoxPtr pboxTmp, pboxNext, pboxBase, pboxNew1, pboxNew2; - /* temporaries for shuffling rectangles */ + /* temporaries for shuffling rectangles */ DDXPointPtr pptTmp, pptNew1, pptNew2; - /* shuffling boxes entails shuffling the - source points too */ + /* shuffling boxes entails shuffling the + source points too */ int w, h; - int xdir; /* 1 = left right, -1 = right left/ */ - int ydir; /* 1 = top down, -1 = bottom up */ + int xdir; /* 1 = left right, -1 = right left/ */ + int ydir; /* 1 = top down, -1 = bottom up */ PixelType *psrcLine, *pdstLine; /* pointers to line with current src and dst */ - register PixelType *psrc; /* pointer to current src longword */ - register PixelType *pdst; /* pointer to current dst longword */ + PixelType *psrc; /* pointer to current src longword */ + PixelType *pdst; /* pointer to current dst longword */ MROP_DECLARE_REG() - /* following used for looping through a line */ - PixelType startmask, endmask; /* masks for writing ends of dst */ - int nlMiddle; /* whole longwords in dst */ + /* following used for looping through a line */ + PixelType startmask, endmask; /* masks for writing ends of dst */ + int nlMiddle; /* whole longwords in dst */ int xoffSrc, xoffDst; - register int leftShift, rightShift; - register PixelType bits; - register PixelType bits1; - register int nl; /* temp copy of nlMiddle */ + int leftShift, rightShift; + PixelType bits; + PixelType bits1; + int nl; /* temp copy of nlMiddle */ int careful; int depthSrc; @@ -93,9 +89,9 @@ MROP_INITIALIZE(alu,0); afbGetPixelWidthSizeDepthAndPointer(pSrc, widthSrc, sizeSrc, depthSrc, - psrcBase); + psrcBase); afbGetPixelWidthSizeDepthAndPointer(pDst, widthDst, sizeDst, depthDst, - pdstBase); + pdstBase); /* Special case where depth of dest pixmap is 1 but source pixmap isn't * Used for GetImage to copy a plane from a source pixmap to a particular Index: xc/programs/Xserver/afb/afbbres.c diff -u xc/programs/Xserver/afb/afbbres.c:3.0 xc/programs/Xserver/afb/afbbres.c:3.2 --- xc/programs/Xserver/afb/afbbres.c:3.0 Sat Aug 17 21:45:25 1996 +++ xc/programs/Xserver/afb/afbbres.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbres.c,v 3.0 1996/08/18 01:45:25 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbbres.c,v 3.2 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,42 +47,38 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbbres.c,v 1.22 94/04/17 20:28:17 dpw Exp $ */ -#include "X.h" +#include #include "misc.h" #include "afb.h" #include "maskbits.h" #include "miline.h" /* Solid bresenham line */ -/* NOTES - e2 is used less often than e1, so it's not in a register + +/* + PixelType *addrlbase; pointer to base of bitmap + int nlwidth; width in longwords of bitmap + int signdx, signdy; signs of directions + int axis; major axis (Y_AXIS or X_AXIS) + int x1, y1; initial point + int e; error accumulator + int e1; bresenham increments + int len; length of line */ void -afbBresS(addrlbase, nlwidth, sizeDst, depthDst, signdx, signdy, axis, x1, y1, - e, e1, e2, len, rrops) -PixelType *addrlbase; /* pointer to base of bitmap */ -int nlwidth; /* width in longwords of bitmap */ -int sizeDst; -int depthDst; -int signdx, signdy; /* signs of directions */ -int axis; /* major axis (Y_AXIS or X_AXIS) */ -int x1, y1; /* initial point */ -register int e; /* error accumulator */ -register int e1; /* bresenham increments */ -int e2; -int len; /* length of line */ -unsigned char *rrops; +afbBresS(PixelType *addrlbase, int nlwidth, int sizeDst, int depthDst, + int signdx, int signdy, int axis, int x1, int y1, int e, int e1, + int e2, int len, unsigned char *rrops) { - register int yinc; /* increment to next scanline, in bytes */ - register PixelType *addrl; /* bitmask long pointer */ - register PixelType bit; /* current bit being set/cleared/etc. */ + int yinc; /* increment to next scanline, in bytes */ + PixelType *addrl; /* bitmask long pointer */ + PixelType bit; /* current bit being set/cleared/etc. */ PixelType leftbit = mask[0]; /* leftmost bit to process in new word */ PixelType rightbit = mask[PPW-1]; /* rightmost bit to process in new word */ - register int e3 = e2-e1; + int e3 = e2-e1; PixelType tmp; int saveE; int saveLen; Index: xc/programs/Xserver/afb/afbbresd.c diff -u xc/programs/Xserver/afb/afbbresd.c:3.0 xc/programs/Xserver/afb/afbbresd.c:3.2 --- xc/programs/Xserver/afb/afbbresd.c:3.0 Sat Aug 17 21:45:26 1996 +++ xc/programs/Xserver/afb/afbbresd.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbresd.c,v 3.0 1996/08/18 01:45:26 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbbresd.c,v 3.2 2005/10/14 15:16:17 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,9 +46,8 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbbresd.c,v 1.10 94/04/17 20:28:18 dpw Exp $ */ -#include "X.h" +#include #include "misc.h" #include "afb.h" #include "maskbits.h" @@ -66,33 +65,32 @@ rop = bgrop; \ } +/* + int *pdashIndex; current dash + unsigned char *pDash; dash list + int numInDashList; total length of dash list + int *pdashOffset; offset into current dash + PixelType *addrlbase; pointer to base of bitmap + int nlwidth; width in longwords of bitmap + int signdx, signdy; signs of directions + int axis; major axis (Y_AXIS or X_AXIS) + int x1, y1; initial point + int e; error accumulator + int e1; bresenham increments + int len; length of line +*/ + void -afbBresD(pdashIndex, pDash, numInDashList, pdashOffset, isDoubleDash, - addrlbase, nlwidth, sizeDst, depthDst, - signdx, signdy, axis, x1, y1, e, e1, e2, len, rrops, bgrrops) -int *pdashIndex; /* current dash */ -unsigned char *pDash; /* dash list */ -int numInDashList; /* total length of dash list */ -int *pdashOffset; /* offset into current dash */ -int isDoubleDash; -PixelType *addrlbase; /* pointer to base of bitmap */ -int nlwidth; /* width in longwords of bitmap */ -int sizeDst; -int depthDst; -int signdx, signdy; /* signs of directions */ -int axis; /* major axis (Y_AXIS or X_AXIS) */ -int x1, y1; /* initial point */ -register int e; /* error accumulator */ -register int e1; /* bresenham increments */ -int e2; -int len; /* length of line */ -unsigned char *rrops; -unsigned char *bgrrops; +afbBresD(int *pdashIndex, unsigned char *pDash, int numInDashList, + int *pdashOffset, int isDoubleDash, PixelType *addrlbase, + int nlwidth, int sizeDst, int depthDst, int signdx, int signdy, + int axis, int x1, int y1, int e, int e1, int e2, int len, + unsigned char *rrops, unsigned char *bgrrops) { - register int yinc; /* increment to next scanline, in bytes */ - register PixelType *addrl; - register int e3 = e2-e1; - register unsigned long bit; + int yinc; /* increment to next scanline, in bytes */ + PixelType *addrl; + int e3 = e2-e1; + unsigned long bit; PixelType leftbit = mask[0]; /* leftmost bit to process in new word */ PixelType rightbit = mask[PPW-1]; /* rightmost bit to process in new word */ int dashIndex; Index: xc/programs/Xserver/afb/afbbstore.c diff -u xc/programs/Xserver/afb/afbbstore.c:3.0 xc/programs/Xserver/afb/afbbstore.c:3.2 --- xc/programs/Xserver/afb/afbbstore.c:3.0 Sat Aug 17 21:45:28 1996 +++ xc/programs/Xserver/afb/afbbstore.c Fri Oct 14 11:16:17 2005 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbbstore.c,v 3.0 1996/08/18 01:45:28 dawes Exp $ */ -/* $XConsortium: afbbstore.c,v 5.7 94/04/17 20:28:18 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbbstore.c,v 3.2 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /* @@ -32,14 +31,14 @@ */ #include "afb.h" -#include "X.h" +#include #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" -/*- +/* *----------------------------------------------------------------------- * afbSaveAreas -- * Function called by miSaveAreas to actually fetch the areas to be @@ -60,17 +59,13 @@ *----------------------------------------------------------------------- */ void -afbSaveAreas(pPixmap, prgnSave, xorg, yorg, pWin) - PixmapPtr pPixmap; /* Backing pixmap */ - RegionPtr prgnSave; /* Region to save (pixmap-relative) */ - int xorg; /* X origin of region */ - int yorg; /* Y origin of region */ - WindowPtr pWin; +afbSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg, + WindowPtr pWin) { - register DDXPointPtr pPt; - DDXPointPtr pPtsInit; - register BoxPtr pBox; - register int numRects; + DDXPointPtr pPt; + DDXPointPtr pPtsInit; + BoxPtr pBox; + int numRects; numRects = REGION_NUM_RECTS(prgnSave); pPtsInit = (DDXPointPtr)ALLOCATE_LOCAL(numRects * sizeof(DDXPointRec)); @@ -95,7 +90,7 @@ DEALLOCATE_LOCAL(pPtsInit); } -/*- +/* *----------------------------------------------------------------------- * afbRestoreAreas -- * Function called by miRestoreAreas to actually fetch the areas to be @@ -116,17 +111,13 @@ *----------------------------------------------------------------------- */ void -afbRestoreAreas(pPixmap, prgnRestore, xorg, yorg, pWin) - PixmapPtr pPixmap; /* Backing pixmap */ - RegionPtr prgnRestore; /* Region to restore (screen-relative)*/ - int xorg; /* X origin of window */ - int yorg; /* Y origin of window */ - WindowPtr pWin; +afbRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, int yorg, + WindowPtr pWin) { - register DDXPointPtr pPt; - DDXPointPtr pPtsInit; - register BoxPtr pBox; - register int numRects; + DDXPointPtr pPt; + DDXPointPtr pPtsInit; + BoxPtr pBox; + int numRects; numRects = REGION_NUM_RECTS(prgnRestore); pPtsInit = (DDXPointPtr)ALLOCATE_LOCAL(numRects*sizeof(DDXPointRec)); Index: xc/programs/Xserver/afb/afbclip.c diff -u xc/programs/Xserver/afb/afbclip.c:3.3 xc/programs/Xserver/afb/afbclip.c:3.5 --- xc/programs/Xserver/afb/afbclip.c:3.3 Tue Jul 15 21:38:35 2003 +++ xc/programs/Xserver/afb/afbclip.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.3 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbclip.c,v 3.5 2005/10/14 15:16:17 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,9 +46,8 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbclip.c,v 5.6 94/04/17 20:28:19 dpw Exp $ */ -#include "X.h" +#include #include "regionstr.h" #include "pixmapstr.h" #include "scrnintstr.h" @@ -90,19 +89,18 @@ * at the same X coordinates. */ RegionPtr -afbPixmapToRegion(pPix) - PixmapPtr pPix; +afbPixmapToRegion(PixmapPtr pPix) { - register RegionPtr pReg; - register PixelType *pw, w; - register int ib; + RegionPtr pReg; + PixelType *pw, w; + int ib; int width, h, base, rx1 = 0, crects; PixelType *pwLineEnd; int irectPrevStart, irectLineStart; - register BoxPtr prectO, prectN; + BoxPtr prectO, prectN; BoxPtr FirstRect, rects, prectLineStart; Bool fInBox, fSame; - register PixelType mask0 = mask[0]; + PixelType mask0 = mask[0]; PixelType *pwLine; int nWidth; Index: xc/programs/Xserver/afb/afbcmap.c diff -u xc/programs/Xserver/afb/afbcmap.c:3.1 xc/programs/Xserver/afb/afbcmap.c:3.3 --- xc/programs/Xserver/afb/afbcmap.c:3.1 Sun Nov 22 05:36:58 1998 +++ xc/programs/Xserver/afb/afbcmap.c Fri Oct 14 11:16:17 2005 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.1 1998/11/22 10:36:58 dawes Exp $ */ -/* $XConsortium: afbcmap.c,v 4.19 94/04/17 20:28:46 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbcmap.c,v 3.3 2005/10/14 15:16:17 tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -29,72 +28,61 @@ ********************************************************/ -#include "X.h" -#include "Xproto.h" +#include +#include #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" #include "micmap.h" +#include "afb.h" int -afbListInstalledColormaps(pScreen, pmaps) - ScreenPtr pScreen; - Colormap *pmaps; +afbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) { return miListInstalledColormaps(pScreen, pmaps); } void -afbInstallColormap(pmap) - ColormapPtr pmap; +afbInstallColormap(ColormapPtr pmap) { miInstallColormap(pmap); } void -afbUninstallColormap(pmap) - ColormapPtr pmap; +afbUninstallColormap(ColormapPtr pmap) { miUninstallColormap(pmap); } void -afbResolveColor(pred, pgreen, pblue, pVisual) - unsigned short *pred, *pgreen, *pblue; - register VisualPtr pVisual; +afbResolveColor(unsigned short *pred, unsigned short *pgreen, + unsigned short *pblue, VisualPtr pVisual) { miResolveColor(pred, pgreen, pblue, pVisual); } Bool -afbInitializeColormap(pmap) - register ColormapPtr pmap; +afbInitializeColormap(ColormapPtr pmap) { return miInitializeColormap(pmap); } int -afbExpandDirectColors(pmap, ndef, indefs, outdefs) - ColormapPtr pmap; - int ndef; - xColorItem *indefs, *outdefs; +afbExpandDirectColors(ColormapPtr pmap, int ndef, xColorItem *indefs, + xColorItem *outdefs) { return miExpandDirectColors(pmap, ndef, indefs, outdefs); } Bool -afbCreateDefColormap(pScreen) - ScreenPtr pScreen; +afbCreateDefColormap(ScreenPtr pScreen) { return miCreateDefColormap(pScreen); } Bool -afbSetVisualTypes(depth, visuals, bitsPerRGB) - int depth; - int visuals; - int bitsPerRGB; +afbSetVisualTypes(int depth, int visuals, int bitsPerRGB) { return miSetVisualTypes(depth, visuals, bitsPerRGB, -1); } @@ -106,15 +94,9 @@ */ Bool -afbInitVisuals(visualp, depthp, nvisualp, ndepthp, rootDepthp, defaultVisp, - sizes, bitsPerRGB) - VisualPtr *visualp; - DepthPtr *depthp; - int *nvisualp, *ndepthp; - int *rootDepthp; - VisualID *defaultVisp; - unsigned long sizes; - int bitsPerRGB; +afbInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, + int *ndepthp, int *rootDepthp, VisualID *defaultVisp, + unsigned long sizes, int bitsPerRGB) { return miInitVisuals(visualp, depthp, nvisualp, ndepthp, rootDepthp, defaultVisp, sizes, bitsPerRGB, -1); Index: xc/programs/Xserver/afb/afbfillarc.c diff -u xc/programs/Xserver/afb/afbfillarc.c:3.2 xc/programs/Xserver/afb/afbfillarc.c:3.4 --- xc/programs/Xserver/afb/afbfillarc.c:3.2 Tue Jul 15 21:38:35 2003 +++ xc/programs/Xserver/afb/afbfillarc.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillarc.c,v 3.4 2005/10/14 15:16:17 tsi Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium @@ -26,10 +26,8 @@ ********************************************************/ -/* $XConsortium: afbfillarc.c,v 5.14 94/04/17 20:28:20 dpw Exp $ */ - -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -40,22 +38,19 @@ #include "mi.h" static void -afbFillEllipseSolid(pDraw, arc, rrops) - DrawablePtr pDraw; - xArc *arc; - register unsigned char *rrops; +afbFillEllipseSolid(DrawablePtr pDraw, xArc *arc, unsigned char *rrops) { int x, y, e; int yk, xk, ym, xm, dx, dy, xorg, yorg; - register int slw; + int slw; miFillArcRec info; PixelType *addrlt, *addrlb; - register PixelType *pdst; + PixelType *pdst; PixelType *addrl; - register int n; - register int d; + int n; + int d; int nlwidth; - register int xpos; + int xpos; PixelType startmask, endmask; int nlmiddle; int depthDst; @@ -264,18 +259,15 @@ } static void -afbFillArcSliceSolidCopy(pDraw, pGC, arc, rrops) - DrawablePtr pDraw; - GCPtr pGC; - xArc *arc; - register unsigned char *rrops; +afbFillArcSliceSolidCopy(DrawablePtr pDraw, GCPtr pGC, xArc *arc, + unsigned char *rrops) { PixelType *addrl; - register PixelType *pdst; - register int n; - register int d; + PixelType *pdst; + int n; + int d; int yk, xk, ym, xm, dx, dy, xorg, yorg, slw; - register int x, y, e; + int x, y, e; miFillArcRec info; miArcSliceRec slice; int xl, xr, xc; @@ -317,15 +309,11 @@ } void -afbPolyFillArcSolid(pDraw, pGC, narcs, parcs) - register DrawablePtr pDraw; - GCPtr pGC; - int narcs; - xArc *parcs; +afbPolyFillArcSolid(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { afbPrivGC *priv; - register xArc *arc; - register int i; + xArc *arc; + int i; BoxRec box; RegionPtr cclip; unsigned char *rrops; Index: xc/programs/Xserver/afb/afbfillrct.c diff -u xc/programs/Xserver/afb/afbfillrct.c:3.3 xc/programs/Xserver/afb/afbfillrct.c:3.5 --- xc/programs/Xserver/afb/afbfillrct.c:3.3 Wed Oct 29 17:15:19 2003 +++ xc/programs/Xserver/afb/afbfillrct.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillrct.c,v 3.5 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,10 +47,9 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbfillrct.c,v 5.10 94/04/17 20:28:21 dpw Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -61,7 +60,6 @@ #include "maskbits.h" #define MODEQ(a, b) ((a) %= (b)) -void afbPaintOddSize(); /* filled rectangles. @@ -72,16 +70,13 @@ #define NUM_STACK_RECTS 1024 void -afbPolyFillRect(pDrawable, pGC, nrectFill, prectInit) - DrawablePtr pDrawable; - GCPtr pGC; - int nrectFill; /* number of rectangles to fill */ - xRectangle *prectInit; /* Pointer to first rectangle to fill */ +afbPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, + xRectangle *prectInit) { xRectangle *prect; RegionPtr prgnClip; - register BoxPtr pbox; - register BoxPtr pboxClipped; + BoxPtr pbox; + BoxPtr pboxClipped; BoxPtr pboxClippedBase; BoxPtr pextent; BoxRec stackRects[NUM_STACK_RECTS]; Index: xc/programs/Xserver/afb/afbfillsp.c diff -u xc/programs/Xserver/afb/afbfillsp.c:3.4 xc/programs/Xserver/afb/afbfillsp.c:3.6 --- xc/programs/Xserver/afb/afbfillsp.c:3.4 Sat Oct 27 23:32:58 2001 +++ xc/programs/Xserver/afb/afbfillsp.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.4 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfillsp.c,v 3.6 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,10 +47,9 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbfillsp.c,v 5.13 94/04/17 20:28:21 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "gcstruct.h" #include "window.h" #include "pixmapstr.h" @@ -80,26 +79,21 @@ void -afbSolidFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +afbSolidFS(DrawablePtr pDrawable, GCPtr pGC, int nInit, DDXPointPtr pptInit, + int *pwidthInit, int fSorted) { - /* next three parameters are post-clip */ - int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ - PixelType *addrlBase; /* pointer to start of bitmap */ + /* next three parameters are post-clip */ + int n; /* number of spans to fill */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ + PixelType *addrlBase; /* pointer to start of bitmap */ PixelType *pBase; - int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl;/* pointer to current longword in bitmap */ - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; - int *pwidthFree; /* copies of the pointers to free */ + int nlwidth; /* width in longwords of bitmap */ + PixelType *addrl; /* pointer to current longword in bitmap */ + int nlmiddle; + PixelType startmask; + PixelType endmask; + int *pwidthFree; /* copies of the pointers to free */ DDXPointPtr pptFree; int depthDst; int sizeDst; @@ -186,30 +180,25 @@ } void -afbStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +afbStippleFS(DrawablePtr pDrawable, GC *pGC, int nInit, DDXPointPtr pptInit, + int *pwidthInit, int fSorted) { - /* next three parameters are post-clip */ - int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ - PixelType *addrlBase; /* pointer to start of bitmap */ + /* next three parameters are post-clip */ + int n; /* number of spans to fill */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ + PixelType *addrlBase; /* pointer to start of bitmap */ PixelType *pBase; - int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl;/* pointer to current longword in bitmap */ - register PixelType src; - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; + int nlwidth; /* width in longwords of bitmap */ + PixelType *addrl; /* pointer to current longword in bitmap */ + PixelType src; + int nlmiddle; + PixelType startmask; + PixelType endmask; PixmapPtr pStipple; PixelType *psrc; int tileHeight; - int *pwidthFree; /* copies of the pointers to free */ + int *pwidthFree; /* copies of the pointers to free */ DDXPointPtr pptFree; int d; int depthDst; @@ -300,31 +289,26 @@ } void -afbTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +afbTileFS(DrawablePtr pDrawable, GC *pGC, int nInit, DDXPointPtr pptInit, + int *pwidthInit, int fSorted) { - /* next three parameters are post-clip */ - int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ - PixelType *addrlBase; /* pointer to start of bitmap */ + /* next three parameters are post-clip */ + int n; /* number of spans to fill */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ + PixelType *addrlBase; /* pointer to start of bitmap */ PixelType *pBase; - int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl; /* pointer to current longword in bitmap */ - register PixelType src; - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; + int nlwidth; /* width in longwords of bitmap */ + PixelType *addrl; /* pointer to current longword in bitmap */ + PixelType src; + int nlmiddle; + PixelType startmask; + PixelType endmask; PixmapPtr pTile; PixelType *psrc; int tileHeight; int rop; - int *pwidthFree; /* copies of the pointers to free */ + int *pwidthFree; /* copies of the pointers to free */ DDXPointPtr pptFree; int sizeDst; int depthDst; @@ -389,7 +373,7 @@ default: { - register DeclareMergeRop (); + DeclareMergeRop (); InitializeMergeRop(rop,~0); while (n--) { @@ -431,32 +415,27 @@ } void -afbOpaqueStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +afbOpaqueStippleFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - /* next three parameters are post-clip */ - int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ - PixelType *addrlBase; /* pointer to start of bitmap */ + /* next three parameters are post-clip */ + int n; /* number of spans to fill */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ + PixelType *addrlBase; /* pointer to start of bitmap */ PixelType *pBase; - int nlwidth; /* width in longwords of bitmap */ - register PixelType *addrl; /* pointer to current longword in bitmap */ - register PixelType src = 0; - register int nlmiddle; - register PixelType startmask; - register PixelType endmask; + int nlwidth; /* width in longwords of bitmap */ + PixelType *addrl; /* pointer to current longword in bitmap */ + PixelType src = 0; + int nlmiddle; + PixelType startmask; + PixelType endmask; PixmapPtr pTile; PixelType *psrc; int tileHeight; int rop; unsigned char *rropsOS; - int *pwidthFree; /* copies of the pointers to free */ + int *pwidthFree; /* copies of the pointers to free */ DDXPointPtr pptFree; int sizeDst; int depthDst; @@ -535,7 +514,7 @@ default: { - register DeclareMergeRop (); + DeclareMergeRop (); InitializeMergeRop(rop,~0); while (n--) { @@ -591,37 +570,32 @@ /* Fill spans with tiles that aren't PPW bits wide */ void -afbUnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +afbUnnaturalTileFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - int iline; /* first line of tile to use */ - /* next three parameters are post-clip */ - int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ - PixelType *addrlBase; /* pointer to start of bitmap */ + int iline; /* first line of tile to use */ + /* next three parameters are post-clip */ + int n; /* number of spans to fill */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ + PixelType *addrlBase; /* pointer to start of bitmap */ PixelType *pBase; - int nlwidth; /* width in longwords of bitmap */ - register PixelType *pdst;/* pointer to current word in bitmap */ - register PixelType *psrc;/* pointer to current word in tile */ - register int nlMiddle; - register int rop, nstart; + int nlwidth; /* width in longwords of bitmap */ + PixelType *pdst; /* pointer to current word in bitmap */ + PixelType *psrc; /* pointer to current word in tile */ + int nlMiddle; + int rop, nstart; PixelType startmask; - PixmapPtr pTile; /* pointer to tile we want to fill with */ - int w, width, x, xSrc, ySrc, srcStartOver, nend; - int tlwidth, rem, tileWidth, tileHeight, endinc; - PixelType endmask, *psrcT; - int *pwidthFree; /* copies of the pointers to free */ + PixmapPtr pTile; /* pointer to tile we want to fill with */ + int w, width, x, xSrc, ySrc, srcStartOver, nend; + int tlwidth, rem, tileWidth, tileHeight, endinc; + PixelType endmask, *psrcT; + int *pwidthFree; /* copies of the pointers to free */ DDXPointPtr pptFree; int sizeDst; int sizeTile; int depthDst; - register int d; + int d; n = nInit * miFindMaxBand(pGC->pCompositeClip); pwidthFree = (int *)ALLOCATE_LOCAL(n * sizeof(int)); @@ -736,36 +710,31 @@ /* Fill spans with stipples that aren't PPW bits wide */ void -afbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +afbUnnaturalStippleFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - /* next three parameters are post-clip */ - int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ - int iline; /* first line of tile to use */ - PixelType *addrlBase; /* pointer to start of bitmap */ - PixelType *pBase; - int nlwidth; /* width in longwords of bitmap */ - register PixelType *pdst; /* pointer to current word in bitmap */ - register PixelType *psrc; /* pointer to current word in tile */ - register int nlMiddle; - register int rop, nstart; + /* next three parameters are post-clip */ + int n; /* number of spans to fill */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ + int iline; /* first line of tile to use */ + PixelType *addrlBase; /* pointer to start of bitmap */ + PixelType *pBase; + int nlwidth; /* width in longwords of bitmap */ + PixelType *pdst; /* pointer to current word in bitmap */ + PixelType *psrc; /* pointer to current word in tile */ + int nlMiddle; + int rop, nstart; PixelType startmask; - PixmapPtr pTile; /* pointer to tile we want to fill with */ - int w, width, x, xSrc, ySrc, srcStartOver, nend; - PixelType endmask, *psrcT; - int tlwidth, rem, tileWidth, endinc; - int tileHeight; - int *pwidthFree; /* copies of the pointers to free */ + PixmapPtr pTile; /* pointer to tile we want to fill with */ + int w, width, x, xSrc, ySrc, srcStartOver, nend; + PixelType endmask, *psrcT; + int tlwidth, rem, tileWidth, endinc; + int tileHeight; + int *pwidthFree; /* copies of the pointers to free */ DDXPointPtr pptFree; unsigned char *rrops; - register int d; + int d; int sizeDst; int depthDst; @@ -881,36 +850,31 @@ /* Fill spans with OpaqueStipples that aren't PPW bits wide */ void -afbUnnaturalOpaqueStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GC *pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +afbUnnaturalOpaqueStippleFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - int iline; /* first line of tile to use */ - /* next three parameters are post-clip */ - int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ - PixelType *addrlBase; /* pointer to start of bitmap */ + int iline; /* first line of tile to use */ + /* next three parameters are post-clip */ + int n; /* number of spans to fill */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ + PixelType *addrlBase; /* pointer to start of bitmap */ PixelType *pBase; - int nlwidth; /* width in longwords of bitmap */ - register PixelType *pdst;/* pointer to current word in bitmap */ - register PixelType *psrc;/* pointer to current word in tile */ - register int nlMiddle; - register int d; - register PixelType tmpsrc = 0; - register PixelType tmpdst; - register int alu, nstart; - register unsigned char *rropsOS; + int nlwidth; /* width in longwords of bitmap */ + PixelType *pdst; /* pointer to current word in bitmap */ + PixelType *psrc; /* pointer to current word in tile */ + int nlMiddle; + int d; + PixelType tmpsrc = 0; + PixelType tmpdst; + int alu, nstart; + unsigned char *rropsOS; PixelType startmask; - PixmapPtr pTile; /* pointer to tile we want to fill with */ - int w, width, x, xSrc, ySrc, srcStartOver, nend; - int tlwidth, rem, tileWidth, tileHeight, endinc; - PixelType endmask, *psrcT; - int *pwidthFree; /* copies of the pointers to free */ + PixmapPtr pTile; /* pointer to tile we want to fill with */ + int w, width, x, xSrc, ySrc, srcStartOver, nend; + int tlwidth, rem, tileWidth, tileHeight, endinc; + PixelType endmask, *psrcT; + int *pwidthFree; /* copies of the pointers to free */ DDXPointPtr pptFree; int sizeDst; int depthDst; Index: xc/programs/Xserver/afb/afbfont.c diff -u xc/programs/Xserver/afb/afbfont.c:3.0 xc/programs/Xserver/afb/afbfont.c:3.2 --- xc/programs/Xserver/afb/afbfont.c:3.0 Sat Aug 17 21:45:35 1996 +++ xc/programs/Xserver/afb/afbfont.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbfont.c,v 3.0 1996/08/18 01:45:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbfont.c,v 3.2 2005/10/14 15:16:17 tsi Exp $ */ /* Copyright (c) 1987 X Consortium @@ -46,30 +46,25 @@ SOFTWARE. */ -/* $XConsortium: afbfont.c,v 1.18 94/04/17 20:28:22 keith Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "afb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "scrnintstr.h" /*ARGSUSED*/ Bool -afbRealizeFont( pscr, pFont) - ScreenPtr pscr; - FontPtr pFont; +afbRealizeFont(ScreenPtr pscr, FontPtr pFont) { return (TRUE); } /*ARGSUSED*/ Bool -afbUnrealizeFont( pscr, pFont) - ScreenPtr pscr; - FontPtr pFont; +afbUnrealizeFont(ScreenPtr pscr, FontPtr pFont) { return (TRUE); } Index: xc/programs/Xserver/afb/afbgc.c diff -u xc/programs/Xserver/afb/afbgc.c:3.3 xc/programs/Xserver/afb/afbgc.c:3.5 --- xc/programs/Xserver/afb/afbgc.c:3.3 Sat Oct 27 23:32:58 2001 +++ xc/programs/Xserver/afb/afbgc.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbgc.c,v 3.5 2005/10/14 15:16:17 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,14 +46,13 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbgc.c,v 5.35 94/04/17 20:28:23 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "afb.h" #include "dixfontstr.h" -#include "fontstruct.h" +#include #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" @@ -103,8 +102,7 @@ Bool -afbCreateGC(pGC) - register GCPtr pGC; +afbCreateGC(GCPtr pGC) { afbPrivGC *pPriv; @@ -147,12 +145,9 @@ /*ARGSUSED*/ void -afbValidateGC(pGC, changes, pDrawable) - register GCPtr pGC; - unsigned long changes; - DrawablePtr pDrawable; +afbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { - register afbPrivGCPtr devPriv; + afbPrivGCPtr devPriv; int mask; /* stateChanges */ int index; /* used for stepping through bitfields */ int xrot, yrot; /* rotations for tile and stipple pattern */ @@ -434,8 +429,7 @@ } void -afbDestroyGC(pGC) - GCPtr pGC; +afbDestroyGC(GCPtr pGC) { if (pGC->pRotatedPixmap) (*pGC->pScreen->DestroyPixmap)(pGC->pRotatedPixmap); @@ -465,15 +459,11 @@ }; void -afbReduceOpaqueStipple(fg, bg, planemask, depth, rop) -register PixelType fg; -register PixelType bg; -register unsigned long planemask; -int depth; -register unsigned char *rop; +afbReduceOpaqueStipple(PixelType fg, PixelType bg, unsigned long planemask, + int depth, unsigned char *rop) { - register int d; - register Pixel mask = 1; + int d; + Pixel mask = 1; bg ^= fg; @@ -497,15 +487,11 @@ } void -afbReduceRop(alu, src, planemask, depth, rop) - register int alu; - register Pixel src; - register unsigned long planemask; - int depth; - register unsigned char *rop; +afbReduceRop(int alu, Pixel src, unsigned long planemask, int depth, + unsigned char *rop) { - register int d; - register Pixel mask = 1; + int d; + Pixel mask = 1; for (d = 0; d < depth; d++, mask <<= 1) { if (!(planemask & mask)) @@ -616,9 +602,7 @@ } void -afbComputeCompositeClip(pGC, pDrawable) - GCPtr pGC; - DrawablePtr pDrawable; +afbComputeCompositeClip(GCPtr pGC, DrawablePtr pDrawable) { if (pDrawable->type == DRAWABLE_WINDOW) { WindowPtr pWin = (WindowPtr) pDrawable; Index: xc/programs/Xserver/afb/afbgetsp.c diff -u xc/programs/Xserver/afb/afbgetsp.c:3.1 xc/programs/Xserver/afb/afbgetsp.c:3.3 --- xc/programs/Xserver/afb/afbgetsp.c:3.1 Sat Oct 27 23:32:58 2001 +++ xc/programs/Xserver/afb/afbgetsp.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbgetsp.c,v 3.3 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,10 +47,9 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbgetsp.c,v 5.10 94/04/17 20:28:24 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "region.h" @@ -69,28 +68,32 @@ * Each scanline returned will be server scanline padded, i.e., it will come * out to an integral number of words. */ +/* + DrawablePtr pDrawable; drawable from which to get bits + int wMax; largest value of all *pwidths + DDXPointPtr ppt; points to start copying from + int *pwidth; list of number of bits to copy + int nspans; number of scanlines to copy + char *pchardstStart; where to put the bits +*/ + /*ARGSUSED*/ void -afbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pchardstStart) - DrawablePtr pDrawable; /* drawable from which to get bits */ - int wMax; /* largest value of all *pwidths */ - register DDXPointPtr ppt; /* points to start copying from */ - int *pwidth; /* list of number of bits to copy */ - int nspans; /* number of scanlines to copy */ - char *pchardstStart; /* where to put the bits */ +afbGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, + int nspans, char *pchardstStart) { PixelType *pdstStart = (PixelType *)pchardstStart; - register PixelType *pdst; /* where to put the bits */ - register PixelType *psrc; /* where to get the bits */ - register PixelType tmpSrc; /* scratch buffer for bits */ + PixelType *pdst; /* where to put the bits */ + PixelType *psrc; /* where to get the bits */ + PixelType tmpSrc; /* scratch buffer for bits */ PixelType *psrcBase; /* start of src bitmap */ int widthSrc; /* width of pixmap in bytes */ int sizeSrc; int depthSrc; - register DDXPointPtr pptLast; /* one past last point to get */ + DDXPointPtr pptLast; /* one past last point to get */ int xEnd; /* last pixel to copy from */ - register int nstart; - register int d; + int nstart; + int d; int nend = 0; int srcStartOver; PixelType startmask, endmask; Index: xc/programs/Xserver/afb/afbhrzvert.c diff -u xc/programs/Xserver/afb/afbhrzvert.c:3.1 xc/programs/Xserver/afb/afbhrzvert.c:3.3 --- xc/programs/Xserver/afb/afbhrzvert.c:3.1 Tue Jul 31 20:44:47 2001 +++ xc/programs/Xserver/afb/afbhrzvert.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.1 2001/08/01 00:44:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbhrzvert.c,v 3.3 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,9 +47,8 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbhrzvert.c,v 1.15 94/04/17 20:28:24 dpw Exp $ */ -#include "X.h" +#include #include "gc.h" #include "window.h" @@ -63,21 +62,14 @@ abs(len) > 1 */ void -afbHorzS(pbase, nlwidth, sizeDst, depthDst, x1, y1, len, rrops) -PixelType *pbase; /* pointer to base of bitmap */ -register int nlwidth; /* width in longwords of bitmap */ -int sizeDst; -int depthDst; -int x1; /* initial point */ -int y1; -int len; /* length of line */ -register unsigned char *rrops; +afbHorzS(PixelType *pbase, int nlwidth, int sizeDst, int depthDst, int x1, + int y1, int len, unsigned char *rrops) { - register PixelType *addrl; - register PixelType startmask; - register PixelType endmask; - register int nlmiddle; - register int d; + PixelType *addrl; + PixelType startmask; + PixelType endmask; + int nlmiddle; + int d; int saveNLmiddle; /* force the line to go left to right @@ -158,17 +150,11 @@ it's OK to use it. */ void -afbVertS(pbase, nlwidth, sizeDst, depthDst, x1, y1, len, rrops) -PixelType *pbase; /* pointer to base of bitmap */ -register int nlwidth; /* width in longwords of bitmap */ -int sizeDst; -int depthDst; -int x1, y1; /* initial point */ -register int len; /* length of line */ -unsigned char *rrops; +afbVertS(PixelType *pbase, int nlwidth, int sizeDst, int depthDst, int x1, + int y1, int len, unsigned char *rrops) { - register PixelType *addrl; - register PixelType bitmask; + PixelType *addrl; + PixelType bitmask; int saveLen; int d; Index: xc/programs/Xserver/afb/afbimage.c diff -u xc/programs/Xserver/afb/afbimage.c:3.3 xc/programs/Xserver/afb/afbimage.c:3.5 --- xc/programs/Xserver/afb/afbimage.c:3.3 Sat Oct 27 23:32:58 2001 +++ xc/programs/Xserver/afb/afbimage.c Fri Oct 14 11:16:17 2005 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbimage.c,v 3.5 2005/10/14 15:16:17 tsi Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" @@ -11,13 +11,8 @@ #include "mfb.h" void -afbPutImage(pDraw, pGC, depth, x, y, width, height, leftPad, format, pImage) - DrawablePtr pDraw; - GCPtr pGC; - int depth, x, y, width, height; - int leftPad; - int format; - char *pImage; +afbPutImage(DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y, int width, + int height, int leftPad, int format, char *pImage) { PixmapPtr pPixmap; @@ -81,17 +76,17 @@ ScreenPtr pScreen = pDraw->pScreen; int widthSrc; int start_srcshift; - register int b; - register int dstshift; - register int shift_step; - register PixelType dst; - register PixelType srcbits; - register PixelType *pdst; - register PixelType *psrc; + int b; + int dstshift; + int shift_step; + PixelType dst; + PixelType srcbits; + PixelType *pdst; + PixelType *psrc; int start_bit; - register int nl; - register int h; - register int d; + int nl; + int h; + int d; int sizeDst; PixelType *pdstBase; int widthDst; @@ -150,12 +145,8 @@ } void -afbGetImage(pDrawable, sx, sy, width, height, format, planemask, pdstLine) - DrawablePtr pDrawable; - int sx, sy, width, height; - unsigned int format; - unsigned long planemask; - char *pdstLine; +afbGetImage(DrawablePtr pDrawable, int sx, int sy, int width, int height, + unsigned int format, unsigned long planemask, char *pdstLine) { BoxRec box; DDXPointRec ptSrc; @@ -205,20 +196,20 @@ int sizeSrc; int sizeDst; int widthDst; - register PixelType *psrc; - register PixelType *pdst; - register PixelType dst; - register PixelType srcbits; - register int d; - register int b; - register int dstshift; - register int shift_step; - register int start_endbit; + PixelType *psrc; + PixelType *pdst; + PixelType dst; + PixelType srcbits; + int d; + int b; + int dstshift; + int shift_step; + int start_endbit; int start_startbit; - register int end_endbit = 0; - register int start_dstshift; - register int nl; - register int h; + int end_endbit = 0; + int start_dstshift; + int nl; + int h; int nlmiddle; widthDst = PixmapWidthInPadUnits(width, pDrawable->depth); Index: xc/programs/Xserver/afb/afbimggblt.c diff -u xc/programs/Xserver/afb/afbimggblt.c:3.2 xc/programs/Xserver/afb/afbimggblt.c:3.4 --- xc/programs/Xserver/afb/afbimggblt.c:3.2 Wed Oct 29 17:15:19 2003 +++ xc/programs/Xserver/afb/afbimggblt.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.2 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbimggblt.c,v 3.4 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,13 +47,12 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "afb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -87,68 +86,60 @@ GC. it paints a rectangle, as defined in the protocol dcoument, and the paints the characters. - the register allocations for startmask and endmask may not -be the right thing. are there two other deserving candidates? -xoff, pdst, pglyph, and tmpSrc seem like the right things, though. */ void -afbImageGlyphBlt(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GC *pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +afbImageGlyphBlt(DrawablePtr pDrawable, GC *pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { - ExtentInfoRec info; /* used by QueryGlyphExtents() */ + ExtentInfoRec info; /* used by QueryGlyphExtents() */ BoxRec bbox; /* string's bounding box */ - xRectangle backrect;/* backing rectangle to paint. - in the general case, NOT necessarily - the same as the string's bounding box - */ + xRectangle backrect; /* backing rectangle to paint. + in the general case, NOT necessarily + the same as the string's bounding box + */ CharInfoPtr pci; int xorg, yorg; /* origin of drawable in bitmap */ int widthDst; /* width of dst in longwords */ - /* these keep track of the character origin */ + /* these keep track of the character origin */ PixelType *pdstBase; - /* points to longword with character origin */ - int xchar; /* xorigin of char (mod 32) */ + /* points to longword with character origin */ + int xchar; /* xorigin of char (mod 32) */ - /* these are used for placing the glyph */ - register int xoff; /* x offset of left edge of glyph (mod 32) */ - register PixelType *pdst; - /* pointer to current longword in dst */ + /* these are used for placing the glyph */ + int xoff; /* x offset of left edge of glyph (mod 32) */ + PixelType *pdst; + /* pointer to current longword in dst */ - register int d; + int d; int depthDst; int sizeDst; int hSave; - int w; /* width of glyph in bits */ - int h; /* height of glyph */ + int w; /* width of glyph in bits */ + int h; /* height of glyph */ int widthGlyph; /* width of glyph, in bytes */ unsigned char rrops[AFB_MAX_DEPTH]; - register unsigned char *pglyph; - /* pointer to current row of glyph */ + unsigned char *pglyph; + /* pointer to current row of glyph */ unsigned char *pglyphSave; - /* used for putting down glyph */ - register PixelType tmpSrc; - /* for getting bits from glyph */ - register PixelType startmask; - register PixelType endmask; + /* used for putting down glyph */ + PixelType tmpSrc; + /* for getting bits from glyph */ + PixelType startmask; + PixelType endmask; - register int nFirst;/* bits of glyph in current longword */ + int nFirst; /* bits of glyph in current longword */ PixelType *pdstSave; int oldFill; afbPrivGC *pPriv = (afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr); xorg = pDrawable->x; yorg = pDrawable->y; - afbGetPixelWidthSizeDepthAndPointer(pDrawable, widthDst, sizeDst, depthDst, - pdstBase); + afbGetPixelWidthSizeDepthAndPointer(pDrawable, widthDst, sizeDst, + depthDst, pdstBase); QueryGlyphExtents(pGC->font, ppci, (unsigned long)nglyph, &info); Index: xc/programs/Xserver/afb/afbline.c diff -u xc/programs/Xserver/afb/afbline.c:3.2 xc/programs/Xserver/afb/afbline.c:3.4 --- xc/programs/Xserver/afb/afbline.c:3.2 Sat Oct 27 23:32:58 2001 +++ xc/programs/Xserver/afb/afbline.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbline.c,v 3.4 2005/10/14 15:16:17 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,9 +46,8 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbline.c,v 5.18 94/04/17 20:28:26 dpw Exp $ */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" @@ -92,55 +91,47 @@ void #ifdef POLYSEGMENT -afbSegmentSS(pDrawable, pGC, nseg, pSeg) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - register xSegment *pSeg; +afbSegmentSS(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) #else -afbLineSS(pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +afbLineSS(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) #endif { int nboxInit; - register int nbox; + int nbox; BoxPtr pboxInit; - register BoxPtr pbox; + BoxPtr pbox; #ifndef POLYSEGMENT - register DDXPointPtr ppt; /* pointer to list of translated points */ + DDXPointPtr ppt; /* pointer to list of translated points */ #endif - unsigned int oc1; /* outcode of point 1 */ - unsigned int oc2; /* outcode of point 2 */ + unsigned int oc1; /* outcode of point 1 */ + unsigned int oc2; /* outcode of point 2 */ - PixelType *addrlBase; /* pointer to start of drawable */ - int nlwidth; /* width in longwords of destination pixmap */ - int xorg, yorg; /* origin of window */ + PixelType *addrlBase; /* pointer to start of drawable */ + int nlwidth; /* width in longwords of destination pixmap */ + int xorg, yorg; /* origin of window */ - int adx; /* abs values of dx and dy */ + int adx; /* abs values of dx and dy */ int ady; - int signdx; /* sign of dx and dy */ + int signdx; /* sign of dx and dy */ int signdy; - int e, e1, e2; /* bresenham error and increments */ - int len; /* length of segment */ - int axis; /* major axis */ + int e, e1, e2; /* bresenham error and increments */ + int len; /* length of segment */ + int axis; /* major axis */ int octant; unsigned int bias = miGetZeroLineBias(pDrawable->pScreen); int depthDst; #ifndef POLYSEGMENT - PixelType *addrl; /* address of destination pixmap */ + PixelType *addrl; /* address of destination pixmap */ int d; #endif int sizeDst; unsigned char *rrops; - /* a bunch of temporaries */ - register int y1, y2; - register int x1, x2; + /* a bunch of temporaries */ + int y1, y2; + int x1, x2; RegionPtr cclip; cclip = pGC->pCompositeClip; @@ -189,7 +180,7 @@ endpoint semantics */ if (y1 > y2) { - register int tmp; + int tmp; tmp = y2; y2 = y1 + 1; @@ -233,7 +224,7 @@ endpoint semantics */ if (x1 > x2) { - register int tmp; + int tmp; tmp = x2; x2 = x1 + 1; @@ -427,44 +418,36 @@ void #ifdef POLYSEGMENT -afbSegmentSD(pDrawable, pGC, nseg, pSeg) - DrawablePtr pDrawable; - register GCPtr pGC; - int nseg; - register xSegment *pSeg; +afbSegmentSD(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) #else -afbLineSD(pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - register GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +afbLineSD(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) #endif { int nboxInit; - register int nbox; + int nbox; BoxPtr pboxInit; - register BoxPtr pbox; + BoxPtr pbox; #ifndef POLYSEGMENT - register DDXPointPtr ppt; /* pointer to list of translated points */ + DDXPointPtr ppt; /* pointer to list of translated points */ #endif - register unsigned int oc1; /* outcode of point 1 */ - register unsigned int oc2; /* outcode of point 2 */ + unsigned int oc1; /* outcode of point 1 */ + unsigned int oc2; /* outcode of point 2 */ - PixelType *addrlBase; /* address of destination pixmap */ - int nlwidth; /* width in longwords of destination pixmap */ + PixelType *addrlBase; /* address of destination pixmap */ + int nlwidth; /* width in longwords of destination pixmap */ int sizeDst; int depthDst; - int xorg, yorg; /* origin of window */ + int xorg, yorg; /* origin of window */ - int adx; /* abs values of dx and dy */ + int adx; /* abs values of dx and dy */ int ady; - int signdx; /* sign of dx and dy */ + int signdx; /* sign of dx and dy */ int signdy; - int e, e1, e2; /* bresenham error and increments */ - int len; /* length of segment */ - int axis; /* major axis */ + int e, e1, e2; /* bresenham error and increments */ + int len; /* length of segment */ + int axis; /* major axis */ int octant; unsigned int bias = miGetZeroLineBias(pDrawable->pScreen); int x1, x2, y1, y2; @@ -472,15 +455,15 @@ unsigned char *rrops; unsigned char bgrrops[AFB_MAX_DEPTH]; unsigned char *pDash; - int dashOffset; - int numInDashList; - int dashIndex; - int isDoubleDash; - int dashIndexTmp, dashOffsetTmp; - int unclippedlen; + int dashOffset; + int numInDashList; + int dashIndex; + int isDoubleDash; + int dashIndexTmp, dashOffsetTmp; + int unclippedlen; #ifndef POLYSEGMENT PixelType *addrl; - int d; + int d; #endif cclip = pGC->pCompositeClip; Index: xc/programs/Xserver/afb/afbmisc.c diff -u xc/programs/Xserver/afb/afbmisc.c:3.0 xc/programs/Xserver/afb/afbmisc.c:3.2 --- xc/programs/Xserver/afb/afbmisc.c:3.0 Sat Aug 17 21:45:44 1996 +++ xc/programs/Xserver/afb/afbmisc.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbmisc.c,v 3.0 1996/08/18 01:45:44 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbmisc.c,v 3.2 2005/10/14 15:16:17 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,9 +46,8 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbmisc.c,v 5.4 94/04/17 20:28:27 dpw Exp $ */ -#include "X.h" +#include #include "misc.h" #include "cursor.h" #include "scrnintstr.h" @@ -57,11 +56,8 @@ /*ARGSUSED*/ void -afbQueryBestSize(class, pwidth, pheight, pScreen) -int class; -unsigned short *pwidth; -unsigned short *pheight; -ScreenPtr pScreen; +afbQueryBestSize(int class, unsigned short *pwidth, unsigned short *pheight, + ScreenPtr pScreen) { unsigned width, test; Index: xc/programs/Xserver/afb/afbpixmap.c diff -u xc/programs/Xserver/afb/afbpixmap.c:3.1 xc/programs/Xserver/afb/afbpixmap.c:3.4 --- xc/programs/Xserver/afb/afbpixmap.c:3.1 Tue Jun 3 10:11:07 1997 +++ xc/programs/Xserver/afb/afbpixmap.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.1 1997/06/03 14:11:07 hohndel Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpixmap.c,v 3.4 2005/10/14 15:16:17 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,7 +46,6 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbpixmap.c,v 5.13 94/04/17 20:28:28 dpw Exp $ */ /* pixmap management written by drewry, september 1986 @@ -54,7 +53,7 @@ on a monchrome device, a pixmap is a bitmap. */ -#include "Xmd.h" +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "maskbits.h" @@ -66,16 +65,15 @@ #include "mfb.h" PixmapPtr -afbCreatePixmap(pScreen, width, height, depth) - ScreenPtr pScreen; - int width; - int height; - int depth; +afbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth) { PixmapPtr pPixmap; int datasize; int paddedWidth; + if ((width > MAXSHORT) || (height > MAXSHORT)) + return NullPixmap; + paddedWidth = BitmapBytePad(width); datasize = height * paddedWidth * depth; pPixmap = AllocatePixmap(pScreen, datasize); @@ -104,8 +102,7 @@ } Bool -afbDestroyPixmap(pPixmap) - PixmapPtr pPixmap; +afbDestroyPixmap(PixmapPtr pPixmap) { if(--pPixmap->refcnt) return(TRUE); @@ -115,10 +112,9 @@ PixmapPtr -afbCopyPixmap(pSrc) - register PixmapPtr pSrc; +afbCopyPixmap(PixmapPtr pSrc) { - register PixmapPtr pDst; + PixmapPtr pDst; int size; ScreenPtr pScreen; @@ -145,15 +141,14 @@ left shift and or in original as many times as needed */ void -afbPadPixmap(pPixmap) - PixmapPtr pPixmap; +afbPadPixmap(PixmapPtr pPixmap) { - register int width = pPixmap->drawable.width; - register int h; - register PixelType mask; - register PixelType *p; - register PixelType bits; /* real pattern bits */ - register int i; + int width = pPixmap->drawable.width; + int h; + PixelType mask; + PixelType *p; + PixelType bits; /* real pattern bits */ + int i; int d; int rep; /* repeat count for pattern */ @@ -187,12 +182,10 @@ * left. */ void -afbXRotatePixmap(pPix, rw) - PixmapPtr pPix; - register int rw; +afbXRotatePixmap(PixmapPtr pPix, int rw) { - register PixelType *pw, *pwFinal; - register PixelType t; + PixelType *pw, *pwFinal; + PixelType t; if (pPix == NullPixmap) return; @@ -223,9 +216,7 @@ works on any width. */ void -afbYRotatePixmap(pPix, rh) - register PixmapPtr pPix; - int rh; +afbYRotatePixmap(PixmapPtr pPix, int rh) { int nbyDown; /* bytes to move down to row 0; also offset of row rh */ @@ -260,11 +251,9 @@ } void -afbCopyRotatePixmap(psrcPix, ppdstPix, xrot, yrot) - register PixmapPtr psrcPix, *ppdstPix; - int xrot, yrot; +afbCopyRotatePixmap(PixmapPtr psrcPix, PixmapPtr *ppdstPix, int xrot, int yrot) { - register PixmapPtr pdstPix; + PixmapPtr pdstPix; if ((pdstPix = *ppdstPix) && (pdstPix->devKind == psrcPix->devKind) && Index: xc/programs/Xserver/afb/afbply1rct.c diff -u xc/programs/Xserver/afb/afbply1rct.c:3.2 xc/programs/Xserver/afb/afbply1rct.c:3.4 --- xc/programs/Xserver/afb/afbply1rct.c:3.2 Sat Oct 27 23:32:58 2001 +++ xc/programs/Xserver/afb/afbply1rct.c Fri Oct 14 11:16:17 2005 @@ -1,6 +1,5 @@ -/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbply1rct.c,v 3.4 2005/10/14 15:16:17 tsi Exp $ */ /* - * $XConsortium: afbply1rct.c,v 1.9 94/04/17 20:28:28 dpw Exp $ * Copyright (c) 1990 X Consortium @@ -28,7 +27,7 @@ * Author: Keith Packard, MIT X Consortium */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" @@ -59,20 +58,15 @@ #endif void -afbFillPolygonSolid (pDrawable, pGC, shape, mode, count, ptsIn) - DrawablePtr pDrawable; - GCPtr pGC; - int shape; - int mode; - int count; - DDXPointPtr ptsIn; +afbFillPolygonSolid(DrawablePtr pDrawable, GCPtr pGC, int shape, int mode, + int count, DDXPointPtr ptsIn) { afbPrivGCPtr devPriv; int nlwidth; PixelType *addrl, *addr; int maxy; int origin; - register int vertex1, vertex2; + int vertex1, vertex2; int c; BoxPtr extents; int clip; @@ -89,12 +83,12 @@ int l, r; PixelType mask, bits = ~((PixelType)0); int nmiddle; - register unsigned char *rrops; - register int n; - register int d; + unsigned char *rrops; + int n; + int d; int sizeDst; int depthDst; - register PixelType *pdst; + PixelType *pdst; devPriv = (afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr); Index: xc/programs/Xserver/afb/afbplygblt.c diff -u xc/programs/Xserver/afb/afbplygblt.c:3.3 xc/programs/Xserver/afb/afbplygblt.c:3.5 --- xc/programs/Xserver/afb/afbplygblt.c:3.3 Wed Oct 29 17:15:19 2003 +++ xc/programs/Xserver/afb/afbplygblt.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.3 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbplygblt.c,v 3.5 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,13 +47,12 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbimggblt.c,v 5.17 94/04/17 20:28:25 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "afb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -84,55 +83,50 @@ */ void -afbPolyGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GC *pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +afbPolyGlyphBlt(DrawablePtr pDrawable, GC *pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { - ExtentInfoRec info; /* used by QueryGlyphExtents() */ - BoxRec bbox; /* string's bounding box */ + ExtentInfoRec info; /* used by QueryGlyphExtents() */ + BoxRec bbox; /* string's bounding box */ CharInfoPtr pci; - int xorg, yorg; /* origin of drawable in bitmap */ - int widthDst; /* width of dst in longwords */ + int xorg, yorg; /* origin of drawable in bitmap */ + int widthDst; /* width of dst in longwords */ - /* these keep track of the character origin */ + /* these keep track of the character origin */ PixelType *pdstBase; - /* points to longword with character origin */ - int xchar; /* xorigin of char (mod 32) */ + /* points to longword with character origin */ + int xchar; /* xorigin of char (mod 32) */ - /* these are used for placing the glyph */ - register int xoff; /* x offset of left edge of glyph (mod 32) */ - register PixelType *pdst; /* pointer to current longword in dst */ + /* these are used for placing the glyph */ + int xoff; /* x offset of left edge of glyph (mod 32) */ + PixelType *pdst; /* pointer to current longword in dst */ - register int d; + int d; int depthDst; int sizeDst; int hSave; - int w; /* width of glyph in bits */ - int h; /* height of glyph */ - int widthGlyph; /* width of glyph, in bytes */ + int w; /* width of glyph in bits */ + int h; /* height of glyph */ + int widthGlyph; /* width of glyph, in bytes */ unsigned char *rrops; - register unsigned char *pglyph; - /* pointer to current row of glyph */ + unsigned char *pglyph; + /* pointer to current row of glyph */ unsigned char *pglyphSave; - /* used for putting down glyph */ - register PixelType tmpSrc; - /* for getting bits from glyph */ - register PixelType startmask; - register PixelType endmask; + /* used for putting down glyph */ + PixelType tmpSrc; + /* for getting bits from glyph */ + PixelType startmask; + PixelType endmask; - register int nFirst; /* bits of glyph in current longword */ + int nFirst; /* bits of glyph in current longword */ PixelType *pdstSave; xorg = pDrawable->x; yorg = pDrawable->y; - afbGetPixelWidthSizeDepthAndPointer(pDrawable, widthDst, sizeDst, depthDst, - pdstBase); + afbGetPixelWidthSizeDepthAndPointer(pDrawable, widthDst, sizeDst, + depthDst, pdstBase); QueryGlyphExtents(pGC->font, ppci, (unsigned long)nglyph, &info); Index: xc/programs/Xserver/afb/afbpntarea.c diff -u xc/programs/Xserver/afb/afbpntarea.c:3.1 xc/programs/Xserver/afb/afbpntarea.c:3.3 --- xc/programs/Xserver/afb/afbpntarea.c:3.1 Sat Oct 27 23:32:58 2001 +++ xc/programs/Xserver/afb/afbpntarea.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.1 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpntarea.c,v 3.3 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,9 +47,8 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbpntarea.c,v 5.7 94/04/17 20:28:29 dpw Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" @@ -71,32 +70,28 @@ /*ARGSUSED*/ void -afbSolidFillArea (pDraw, nbox, pbox, rrops) - DrawablePtr pDraw; - int nbox; - BoxPtr pbox; - register unsigned char *rrops; +afbSolidFillArea(DrawablePtr pDraw, int nbox, BoxPtr pbox, unsigned char *rrops) { - int nlwidth; /* width in longwords of the drawable */ - int w; /* width of current box */ - register int h; /* height of current box */ - register PixelType *p; /* pointer to bits we're writing */ - register int nlw; /* loop version of nlwMiddle */ - register PixelType startmask; - register PixelType endmask; - /* masks for reggedy bits at either end of line */ - register int nlwExtra; - /* to get from right of box to left of next span */ - int nlwMiddle; /* number of longwords between sides of boxes */ - PixelType *pbits; /* pointer to start of drawable */ + int nlwidth; /* width in longwords of the drawable */ + int w; /* width of current box */ + int h; /* height of current box */ + PixelType *p; /* pointer to bits we're writing */ + int nlw; /* loop version of nlwMiddle */ + PixelType startmask; + PixelType endmask; + /* masks for reggedy bits at either end of line */ + int nlwExtra; + /* to get from right of box to left of next span */ + int nlwMiddle; /* number of longwords between sides of boxes */ + PixelType *pbits; /* pointer to start of drawable */ PixelType *saveP; int saveH; int depthDst; int sizeDst; - register int d; + int d; afbGetPixelWidthSizeDepthAndPointer(pDraw, nlwidth, sizeDst, depthDst, - pbits); + pbits); while (nbox--) { w = pbox->x2 - pbox->x1; @@ -275,37 +270,33 @@ /*ARGSUSED*/ void -afbStippleAreaPPW (pDraw, nbox, pbox, pstipple, rrops) - DrawablePtr pDraw; - int nbox; - BoxPtr pbox; - PixmapPtr pstipple; - unsigned char *rrops; +afbStippleAreaPPW(DrawablePtr pDraw, int nbox, BoxPtr pbox, PixmapPtr pstipple, + unsigned char *rrops) { - register PixelType *psrc; - /* pointer to bits in tile, if needed */ + PixelType *psrc; + /* pointer to bits in tile, if needed */ int tileHeight; /* height of the tile */ - register PixelType srcpix; + PixelType srcpix; int nlwidth; /* width in longwords of the drawable */ - int w; /* width of current box */ - register int nlw; /* loop version of nlwMiddle */ - register PixelType *p; /* pointer to bits we're writing */ - register int h; /* height of current box */ + int w; /* width of current box */ + int nlw; /* loop version of nlwMiddle */ + PixelType *p; /* pointer to bits we're writing */ + int h; /* height of current box */ PixelType startmask; - PixelType endmask; /* masks for reggedy bits at either end of line */ + PixelType endmask; /* masks for reggedy bits at either end of line */ int nlwMiddle; /* number of longwords between sides of boxes */ int nlwExtra; /* to get from right of box to left of next span */ int sizeDst; int depthDst; int d; int saveIy; - register int iy; /* index of current scanline in tile */ - PixelType *pbits; /* pointer to start of drawable */ + int iy; /* index of current scanline in tile */ + PixelType *pbits; /* pointer to start of drawable */ PixelType *pBase; afbGetPixelWidthSizeDepthAndPointer(pDraw, nlwidth, sizeDst, depthDst, - pBase); + pBase); tileHeight = pstipple->drawable.height; psrc = (PixelType *)(pstipple->devPrivate.ptr); @@ -527,10 +518,10 @@ int yOff; unsigned char *rrops; { - register PixelType *psrc; /* pointer to bits in tile, if needed */ + PixelType *psrc; /* pointer to bits in tile, if needed */ int nlwidth; /* width in longwords of the drawable */ - register int h; /* height of current box */ - register PixelType *pdst; /* pointer to bits we're writing */ + int h; /* height of current box */ + PixelType *pdst; /* pointer to bits we're writing */ int sizeDst; int depthDst; int tileLine; @@ -538,7 +529,7 @@ int w, width, x, xSrc, ySrc, srcStartOver, nend; int tlwidth, rem, tileWidth, tileHeight, endinc; int saveW; - register int rop; + int rop; PixelType *psrcT; int d; int nstart; Index: xc/programs/Xserver/afb/afbpntwin.c diff -u xc/programs/Xserver/afb/afbpntwin.c:3.0 xc/programs/Xserver/afb/afbpntwin.c:3.2 --- xc/programs/Xserver/afb/afbpntwin.c:3.0 Sat Aug 17 21:45:50 1996 +++ xc/programs/Xserver/afb/afbpntwin.c Fri Oct 14 11:16:17 2005 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpntwin.c,v 3.0 1996/08/18 01:45:50 dawes Exp $ */ -/* $XConsortium: afbpntwin.c,v 5.12 94/04/17 20:28:30 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpntwin.c,v 3.2 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -49,7 +48,7 @@ ******************************************************************/ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" @@ -61,12 +60,9 @@ #include "mi.h" void -afbPaintWindow(pWin, pRegion, what) - WindowPtr pWin; - RegionPtr pRegion; - int what; +afbPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what) { - register afbPrivWin *pPrivWin; + afbPrivWin *pPrivWin; unsigned char rrops[AFB_MAX_DEPTH]; pPrivWin = (afbPrivWin *)(pWin->devPrivates[afbWindowPrivateIndex].ptr); Index: xc/programs/Xserver/afb/afbpolypnt.c diff -u xc/programs/Xserver/afb/afbpolypnt.c:3.2 xc/programs/Xserver/afb/afbpolypnt.c:3.4 --- xc/programs/Xserver/afb/afbpolypnt.c:3.2 Tue Jul 15 21:38:35 2003 +++ xc/programs/Xserver/afb/afbpolypnt.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpolypnt.c,v 3.4 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,10 +47,9 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbpolypnt.c,v 5.6 94/04/17 20:28:30 dpw Exp $ */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "pixmapstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -61,19 +60,15 @@ #include "maskbits.h" void -afbPolyPoint(pDrawable, pGC, mode, npt, pptInit) - register DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; - xPoint *pptInit; +afbPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + xPoint *pptInit) { - register BoxPtr pbox; - register int nbox; - register int d; + BoxPtr pbox; + int nbox; + int d; - register PixelType *addrl; + PixelType *addrl; PixelType *pBase; PixelType *pBaseSave; int nlwidth; @@ -81,11 +76,11 @@ int depthDst; int nptTmp; - register xPoint *ppt; + xPoint *ppt; - register int x; - register int y; - register unsigned char *rrops; + int x; + int y; + unsigned char *rrops; afbPrivGC *pGCPriv; pGCPriv = (afbPrivGC *) pGC->devPrivates[afbGCPrivateIndex].ptr; Index: xc/programs/Xserver/afb/afbpushpxl.c diff -u xc/programs/Xserver/afb/afbpushpxl.c:3.2 xc/programs/Xserver/afb/afbpushpxl.c:3.4 --- xc/programs/Xserver/afb/afbpushpxl.c:3.2 Tue Jul 15 21:38:35 2003 +++ xc/programs/Xserver/afb/afbpushpxl.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.2 2003/07/16 01:38:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbpushpxl.c,v 3.4 2005/10/14 15:16:17 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,9 +46,8 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbpushpxl.c,v 5.6 94/04/17 20:28:31 dpw Exp $ */ -#include "X.h" +#include #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" @@ -56,6 +55,7 @@ #include "maskbits.h" #include "afb.h" +#if 0 /* afbSolidPP is courtesy of xhacks@csri.toronto.edu For fillStyle==FillSolid, a monochrome PushPixels can be reduced to @@ -94,18 +94,15 @@ * has a zero bit or outside the area covered by the stencil. */ void -afbSolidPP(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) - GCPtr pGC; - PixmapPtr pBitMap; - DrawablePtr pDrawable; - int dx, dy, xOrg, yOrg; +afbSolidPP(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, + int dx, int dy, int xOrg, int yOrg) { unsigned char alu; RegionRec rgnDst; DDXPointPtr pptSrc; BoxRec srcBox; - register DDXPointPtr ppt; - register BoxPtr pbox; + DDXPointPtr ppt; + BoxPtr pbox; int i; if (!pGC->planemask & 1) return; @@ -141,6 +138,7 @@ } REGION_UNINIT(pGC->pScreen, &rgnDst); } +#endif #define NPT 128 @@ -152,19 +150,16 @@ * has a zero bit or outside the area covered by the stencil. */ void -afbPushPixels(pGC, pBitMap, pDrawable, dx, dy, xOrg, yOrg) - GCPtr pGC; - PixmapPtr pBitMap; - DrawablePtr pDrawable; - int dx, dy, xOrg, yOrg; +afbPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, + int dx, int dy, int xOrg, int yOrg) { int h, dxDivPPW, ibEnd; PixelType *pwLineStart; - register PixelType *pw, *pwEnd; - register PixelType mask; - register int ib; - register PixelType w; - register int ipt; /* index into above arrays */ + PixelType *pw, *pwEnd; + PixelType mask; + int ib; + PixelType w; + int ipt; /* index into above arrays */ Bool fInBox; DDXPointRec pt[NPT]; int width[NPT]; Index: xc/programs/Xserver/afb/afbscrinit.c diff -u xc/programs/Xserver/afb/afbscrinit.c:3.5 xc/programs/Xserver/afb/afbscrinit.c:3.7 --- xc/programs/Xserver/afb/afbscrinit.c:3.5 Sun Nov 22 05:36:59 1998 +++ xc/programs/Xserver/afb/afbscrinit.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.5 1998/11/22 10:36:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbscrinit.c,v 3.7 2005/10/14 15:16:17 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium @@ -46,11 +46,10 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbscrinit.c,v 5.17 94/04/17 20:28:34 dpw Exp $ */ -#include "X.h" -#include "Xproto.h" /* for xColorItem */ -#include "Xmd.h" +#include +#include /* for xColorItem */ +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" @@ -81,10 +80,20 @@ (BackingStoreGetSpansPixmapProcPtr) 0, }; +static void +StoreColorsNoop(ColormapPtr pColormap, int ndef, xColorItem * pdef) +{ + /* NOOP */ +} + +static void +DestroyColormapNoop(ColormapPtr pColormap) +{ + /* NOOP */ +} + Bool -afbCloseScreen(index, pScreen) - int index; - ScreenPtr pScreen; +afbCloseScreen(int index, ScreenPtr pScreen) { int d; DepthPtr depths = pScreen->allowedDepths; @@ -98,8 +107,7 @@ } Bool -afbCreateScreenResources(pScreen) - ScreenPtr pScreen; +afbCreateScreenResources(ScreenPtr pScreen) { Bool retval; @@ -119,9 +127,7 @@ } Bool -afbAllocatePrivates(pScreen, pWinIndex, pGCIndex) - ScreenPtr pScreen; - int *pWinIndex, *pGCIndex; +afbAllocatePrivates(ScreenPtr pScreen, int *pWinIndex, int *pGCIndex) { if (afbGeneration != serverGeneration) { #ifdef PIXMAP_PER_WINDOW @@ -144,13 +150,17 @@ } /* dts * (inch/dot) * (25.4 mm / inch) = mm */ + +/* + pointer pbits; pointer to screen bitmap + int xsize, ysize; in pixels + int dpix, dpiy; dots per inch + int width; pixel width of frame buffer +*/ + Bool -afbScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width) - register ScreenPtr pScreen; - pointer pbits; /* pointer to screen bitmap */ - int xsize, ysize; /* in pixels */ - int dpix, dpiy; /* dots per inch */ - int width; /* pixel width of frame buffer */ +afbScreenInit(ScreenPtr pScreen, pointer pbits, int xsize, int ysize, + int dpix, int dpiy, int width) { VisualPtr visuals; DepthPtr depths; @@ -194,11 +204,11 @@ pScreen->UnrealizeFont = afbUnrealizeFont; pScreen->CreateGC = afbCreateGC; pScreen->CreateColormap = afbInitializeColormap; - pScreen->DestroyColormap = (void (*)())NoopDDA; + pScreen->DestroyColormap = DestroyColormapNoop; pScreen->InstallColormap = afbInstallColormap; pScreen->UninstallColormap = afbUninstallColormap; pScreen->ListInstalledColormaps = afbListInstalledColormaps; - pScreen->StoreColors = (void (*)())NoopDDA; + pScreen->StoreColors = StoreColorsNoop; pScreen->ResolveColor = afbResolveColor; pScreen->BitmapToRegion = afbPixmapToRegion; oldDevPrivate = pScreen->devPrivate; @@ -219,8 +229,7 @@ } PixmapPtr -afbGetWindowPixmap(pWin) - WindowPtr pWin; +afbGetWindowPixmap(WindowPtr pWin) { #ifdef PIXMAP_PER_WINDOW return (PixmapPtr)(pWin->devPrivates[frameWindowPrivateIndex].ptr); @@ -232,9 +241,7 @@ } void -afbSetWindowPixmap(pWin, pPix) - WindowPtr pWin; - PixmapPtr pPix; +afbSetWindowPixmap(WindowPtr pWin, PixmapPtr pPix) { #ifdef PIXMAP_PER_WINDOW pWin->devPrivates[frameWindowPrivateIndex].ptr = (pointer)pPix; Index: xc/programs/Xserver/afb/afbsetsp.c diff -u xc/programs/Xserver/afb/afbsetsp.c:3.3 xc/programs/Xserver/afb/afbsetsp.c:3.5 --- xc/programs/Xserver/afb/afbsetsp.c:3.3 Sat Oct 27 23:32:58 2001 +++ xc/programs/Xserver/afb/afbsetsp.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.3 2001/10/28 03:32:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbsetsp.c,v 3.5 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,10 +47,9 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbsetsp.c,v 5.8 94/04/17 20:28:34 dpw Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "misc.h" #include "regionstr.h" @@ -72,27 +71,17 @@ * further on.) */ void -afbSetScanline(y, xOrigin, xStart, xEnd, psrc, alu, pdstBase, widthDst, - sizeDst, depthDst, sizeSrc) - int y; - int xOrigin; /* where this scanline starts */ - int xStart; /* first bit to use from scanline */ - int xEnd; /* last bit to use from scanline + 1 */ - register PixelType *psrc; - register int alu; /* raster op */ - PixelType *pdstBase; /* start of the drawable */ - int widthDst; /* width of drawable in words */ - int sizeDst; - int depthDst; - int sizeSrc; +afbSetScanline(int y, int xOrigin, int xStart, int xEnd, PixelType *psrc, + int alu, PixelType *pdstBase, int widthDst, int sizeDst, + int depthDst, int sizeSrc) { - int w; /* width of scanline in bits */ - register PixelType *pdst; /* where to put the bits */ - register PixelType tmpSrc; /* scratch buffer to collect bits in */ - int dstBit; /* offset in bits from beginning of - * word */ - register int nstart; /* number of bits from first partial */ - register int nend; /* " " last partial word */ + int w; /* width of scanline in bits */ + PixelType *pdst; /* where to put the bits */ + PixelType tmpSrc; /* scratch buffer to collect bits in */ + int dstBit; /* offset in bits from beginning of + * word */ + int nstart; /* number of bits from first partial */ + int nend; /* " " last partial word */ int offSrc; PixelType startmask, endmask; PixelType *savePsrc = psrc + ((xStart - xOrigin) >> PWSH); @@ -150,23 +139,17 @@ * on a word boundary. */ void -afbSetSpans(pDrawable, pGC, pcharsrc, ppt, pwidth, nspans, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - char *pcharsrc; - register DDXPointPtr ppt; - int *pwidth; - int nspans; - int fSorted; +afbSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *pcharsrc, DDXPointPtr ppt, + int *pwidth, int nspans, int fSorted) { PixelType *psrc = (PixelType *)pcharsrc; - PixelType *pdstBase; /* start of dst bitmap */ - int widthDst; /* width of bitmap in words */ + PixelType *pdstBase; /* start of dst bitmap */ + int widthDst; /* width of bitmap in words */ int sizeDst; int depthDst; int sizeSrc = 0; - register BoxPtr pbox, pboxLast, pboxTest; - register DDXPointPtr pptLast; + BoxPtr pbox, pboxLast, pboxTest; + DDXPointPtr pptLast; int alu; RegionPtr prgnDst; int xStart, xEnd; Index: xc/programs/Xserver/afb/afbtegblt.c diff -u xc/programs/Xserver/afb/afbtegblt.c:3.2 xc/programs/Xserver/afb/afbtegblt.c:3.4 --- xc/programs/Xserver/afb/afbtegblt.c:3.2 Sat Oct 27 23:32:58 2001 +++ xc/programs/Xserver/afb/afbtegblt.c Fri Oct 14 11:16:17 2005 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.2 2001/10/28 03:32:58 tsi Exp $ */ -/* $XConsortium: afbtegblt.c,v 5.14 94/04/17 20:28:35 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbtegblt.c,v 3.4 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -49,11 +48,11 @@ ******************************************************************/ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "afb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -202,49 +201,44 @@ #endif void -afbTEGlyphBlt (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GC *pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +afbTEGlyphBlt(DrawablePtr pDrawable, GC *pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { - FontPtr pfont = pGC->font; + FontPtr pfont = pGC->font; int widthDst; - PixelType *pdstBase; /* pointer to longword with top row - of current glyph */ + PixelType *pdstBase; /* pointer to longword with top row + of current glyph */ - int h; /* height of glyph and char */ - register int xpos; /* current x */ - int ypos; /* current y */ + int h; /* height of glyph and char */ + int xpos; /* current x */ + int ypos; /* current y */ int widthGlyph; - int hTmp; /* counter for height */ - register PixelType startmask, endmask; - int nfirst; /* used if glyphs spans a longword boundary */ - BoxRec bbox; /* for clipping */ + int hTmp; /* counter for height */ + PixelType startmask, endmask; + int nfirst; /* used if glyphs spans a longword boundary */ + BoxRec bbox; /* for clipping */ int widthGlyphs; int sizeDst; int depthDst; PixelType *saveDst; - register PixelType *dst; - register PixelType c; - register int d; - register int xoff1, xoff2, xoff3, xoff4; - register glyphPointer char1, char2, char3, char4; + PixelType *dst; + PixelType c; + int d; + int xoff1, xoff2, xoff3, xoff4; + glyphPointer char1, char2, char3, char4; glyphPointer schar1, schar2, schar3, schar4; #if PPW == 64 - register int xoff5, xoff6, xoff7, xoff8; - register glyphPointer char5, char6, char7, char8; + int xoff5, xoff6, xoff7, xoff8; + glyphPointer char5, char6, char7, char8; glyphPointer schar5, schar6, schar7, schar8; #endif /* PPW */ unsigned char *rrops; #ifdef USE_LEFTBITS - register PixelType glyphMask; - register PixelType tmpSrc; - register int glyphBytes; + PixelType glyphMask; + PixelType tmpSrc; + int glyphBytes; #endif afbGetPixelWidthSizeDepthAndPointer(pDrawable, widthDst, sizeDst, depthDst, Index: xc/programs/Xserver/afb/afbtile.c diff -u xc/programs/Xserver/afb/afbtile.c:3.4 xc/programs/Xserver/afb/afbtile.c:3.6 --- xc/programs/Xserver/afb/afbtile.c:3.4 Wed Oct 29 17:15:19 2003 +++ xc/programs/Xserver/afb/afbtile.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.4 2003/10/29 22:15:19 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbtile.c,v 3.6 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -47,9 +47,8 @@ SOFTWARE. ******************************************************************/ -/* $XConsortium: afbtile.c,v 5.8 94/04/17 20:28:36 dpw Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" @@ -74,40 +73,35 @@ tile area with a PPW bit wide pixmap */ void -MROP_NAME(afbTileAreaPPW)(pDraw, nbox, pbox, alu, ptile, planemask) - DrawablePtr pDraw; - int nbox; - BoxPtr pbox; - int alu; - PixmapPtr ptile; - unsigned long planemask; +MROP_NAME(afbTileAreaPPW)(DrawablePtr pDraw, int nbox, BoxPtr pbox, int alu, + PixmapPtr ptile, unsigned long planemask) { - register PixelType *psrc; - /* pointer to bits in tile, if needed */ + PixelType *psrc; + /* pointer to bits in tile, if needed */ int tileHeight; /* height of the tile */ - register PixelType srcpix; + PixelType srcpix; int nlwidth; /* width in longwords of the drawable */ - int w; /* width of current box */ + int w; /* width of current box */ MROP_DECLARE_REG () - register int h; /* height of current box */ - register int nlw; /* loop version of nlwMiddle */ - register PixelType *p; /* pointer to bits we're writing */ + int h; /* height of current box */ + int nlw; /* loop version of nlwMiddle */ + PixelType *p; /* pointer to bits we're writing */ int sizeDst; int depthDst; - register int d; + int d; PixelType startmask; - PixelType endmask; /* masks for reggedy bits at either end of line */ + PixelType endmask; /* masks for reggedy bits at either end of line */ int nlwMiddle; /* number of longwords between sides of boxes */ int nlwExtra; /* to get from right of box to left of next span */ - register int iy; /* index of current scanline in tile */ - PixelType *pbits; /* pointer to start of drawable */ + int iy; /* index of current scanline in tile */ + PixelType *pbits; /* pointer to start of drawable */ PixelType *saveP; PixelType *pSaveSrc; int saveH; int saveIY; afbGetPixelWidthSizeDepthAndPointer(pDraw, nlwidth, sizeDst, depthDst, - pbits); + pbits); MROP_INITIALIZE(alu,~0) @@ -223,25 +217,19 @@ } void -MROP_NAME(afbTileArea)(pDraw, nbox, pbox, alu, pTile, xOff, yOff, planemask) - DrawablePtr pDraw; - int nbox; - BoxPtr pbox; - int alu; - PixmapPtr pTile; - int xOff; - int yOff; - unsigned long planemask; +MROP_NAME(afbTileArea)(DrawablePtr pDraw, int nbox, BoxPtr pbox, int alu, + PixmapPtr pTile, int xOff, int yOff, + unsigned long planemask) { - register PixelType *psrc; - /* pointer to bits in tile, if needed */ + PixelType *psrc; + /* pointer to bits in tile, if needed */ int nlwidth; /* width in longwords of the drawable */ MROP_DECLARE_REG () - register int h; /* height of current box */ - register PixelType *pdst; /* pointer to bits we're writing */ - register PixelType tmpsrc; + int h; /* height of current box */ + PixelType *pdst; /* pointer to bits we're writing */ + PixelType tmpsrc; #if (MROP) != Mcopy - register PixelType tmpdst; + PixelType tmpdst; #endif int sizeDst; int depthDst; @@ -255,17 +243,17 @@ int d; int nstart; PixelType startmask; - PixelType endmask; /* masks for reggedy bits at either end of line */ + PixelType endmask; /* masks for reggedy bits at either end of line */ int nlMiddle; /* number of longwords between sides of boxes */ int iy; - PixelType *pBase; /* pointer to start of drawable */ + PixelType *pBase; /* pointer to start of drawable */ PixelType *saveP; PixelType *pStartDst; PixelType *pStartTile; int saveH; afbGetPixelWidthSizeDepthAndPointer(pDraw, nlwidth, sizeDst, depthDst, - pBase); + pBase); MROP_INITIALIZE(alu,~0) @@ -396,41 +384,36 @@ } void -MROP_NAME(afbOpaqueStippleAreaPPW)(pDraw, nbox, pbox, alu, ptile, - rropsOS, planemask) - DrawablePtr pDraw; - int nbox; - BoxPtr pbox; - int alu; - PixmapPtr ptile; - register unsigned char *rropsOS; - unsigned long planemask; +MROP_NAME(afbOpaqueStippleAreaPPW)(DrawablePtr pDraw, int nbox, BoxPtr pbox, + int alu, PixmapPtr ptile, + unsigned char *rropsOS, + unsigned long planemask) { - register PixelType *psrc; - /* pointer to bits in tile, if needed */ + PixelType *psrc; + /* pointer to bits in tile, if needed */ int tileHeight; /* height of the tile */ - register PixelType srcpix = 0; + PixelType srcpix = 0; int nlwidth; /* width in longwords of the drawable */ - int w; /* width of current box */ + int w; /* width of current box */ MROP_DECLARE_REG () - register int h; /* height of current box */ - register int nlw; /* loop version of nlwMiddle */ - register PixelType *p; /* pointer to bits we're writing */ + int h; /* height of current box */ + int nlw; /* loop version of nlwMiddle */ + PixelType *p; /* pointer to bits we're writing */ int sizeDst; int depthDst; - register int d; + int d; PixelType startmask; - PixelType endmask; /* masks for reggedy bits at either end of line */ + PixelType endmask; /* masks for reggedy bits at either end of line */ int nlwMiddle; /* number of longwords between sides of boxes */ int nlwExtra; /* to get from right of box to left of next span */ - register int iy; /* index of current scanline in tile */ - PixelType *pbits; /* pointer to start of drawable */ + int iy; /* index of current scanline in tile */ + PixelType *pbits; /* pointer to start of drawable */ PixelType *saveP; int saveH; int saveIY; afbGetPixelWidthSizeDepthAndPointer(pDraw, nlwidth, sizeDst, depthDst, - pbits); + pbits); MROP_INITIALIZE(alu,~0) @@ -610,27 +593,19 @@ } void -MROP_NAME(afbOpaqueStippleArea)(pDraw, nbox, pbox, alu, pTile, xOff, yOff, - rropsOS, planemask) - DrawablePtr pDraw; - int nbox; - BoxPtr pbox; - int alu; - PixmapPtr pTile; - int xOff; - int yOff; - register unsigned char *rropsOS; - unsigned long planemask; +MROP_NAME(afbOpaqueStippleArea)(DrawablePtr pDraw, int nbox, BoxPtr pbox, + int alu, PixmapPtr pTile, int xOff, int yOff, + unsigned char *rropsOS, unsigned long planemask) { - register PixelType *psrc; - /* pointer to bits in tile, if needed */ + PixelType *psrc; + /* pointer to bits in tile, if needed */ int nlwidth; /* width in longwords of the drawable */ MROP_DECLARE_REG () - register int h; /* height of current box */ - register PixelType *pdst; /* pointer to bits we're writing */ - register PixelType tmpsrc = 0; + int h; /* height of current box */ + PixelType *pdst; /* pointer to bits we're writing */ + PixelType tmpsrc = 0; #if (MROP) != Mcopy - register PixelType tmpdst; + PixelType tmpdst; #endif int sizeDst; int depthDst; @@ -643,17 +618,17 @@ int d; int nstart; PixelType startmask; - PixelType endmask; /* masks for reggedy bits at either end of line */ + PixelType endmask; /* masks for reggedy bits at either end of line */ int nlMiddle; /* number of longwords between sides of boxes */ int iy; - PixelType *pBase; /* pointer to start of drawable */ + PixelType *pBase; /* pointer to start of drawable */ PixelType *saveP; PixelType *pStartDst; PixelType *pStartTile; int saveH; afbGetPixelWidthSizeDepthAndPointer(pDraw, nlwidth, sizeDst, depthDst, - pBase); + pBase); MROP_INITIALIZE(alu,~0) Index: xc/programs/Xserver/afb/afbwindow.c diff -u xc/programs/Xserver/afb/afbwindow.c:3.1 xc/programs/Xserver/afb/afbwindow.c:3.3 --- xc/programs/Xserver/afb/afbwindow.c:3.1 Sat Sep 13 17:33:04 2003 +++ xc/programs/Xserver/afb/afbwindow.c Fri Oct 14 11:16:17 2005 @@ -1,5 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.1 2003/09/13 21:33:04 dawes Exp $ */ -/* $XConsortium: afbwindow.c,v 5.14 94/04/17 20:28:36 dpw Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbwindow.c,v 3.3 2005/10/14 15:16:17 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** @@ -49,7 +48,7 @@ ******************************************************************/ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "afb.h" @@ -58,10 +57,9 @@ #include "maskbits.h" Bool -afbCreateWindow(pWin) - register WindowPtr pWin; +afbCreateWindow(WindowPtr pWin) { - register afbPrivWin *pPrivWin; + afbPrivWin *pPrivWin; pPrivWin = (afbPrivWin *)(pWin->devPrivates[afbWindowPrivateIndex].ptr); pPrivWin->pRotatedBorder = NullPixmap; @@ -79,10 +77,9 @@ /* This always returns true, because Xfree can't fail. It might be possible * on some devices for Destroy to fail */ Bool -afbDestroyWindow(pWin) - WindowPtr pWin; +afbDestroyWindow(WindowPtr pWin) { - register afbPrivWin *pPrivWin; + afbPrivWin *pPrivWin; pPrivWin = (afbPrivWin *)(pWin->devPrivates[afbWindowPrivateIndex].ptr); @@ -96,8 +93,7 @@ /*ARGSUSED*/ Bool -afbMapWindow(pWindow) - WindowPtr pWindow; +afbMapWindow(WindowPtr pWindow) { return (TRUE); } @@ -112,11 +108,9 @@ /*ARGSUSED*/ Bool -afbPositionWindow(pWin, x, y) - WindowPtr pWin; - int x, y; +afbPositionWindow(WindowPtr pWin, int x, int y) { - register afbPrivWin *pPrivWin; + afbPrivWin *pPrivWin; int reset = 0; pPrivWin = (afbPrivWin *)(pWin->devPrivates[afbWindowPrivateIndex].ptr); @@ -156,8 +150,7 @@ /*ARGSUSED*/ Bool -afbUnmapWindow(pWindow) - WindowPtr pWindow; +afbUnmapWindow(WindowPtr pWindow) { return (TRUE); } @@ -171,17 +164,14 @@ void -afbCopyWindow(pWin, ptOldOrg, prgnSrc) - WindowPtr pWin; - DDXPointRec ptOldOrg; - RegionPtr prgnSrc; +afbCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) { DDXPointPtr pptSrc; - register DDXPointPtr ppt; + DDXPointPtr ppt; RegionPtr prgnDst; - register BoxPtr pbox; - register int dx, dy; - register int i, nbox; + BoxPtr pbox; + int dx, dy; + int i, nbox; WindowPtr pwinRoot; pwinRoot = WindowTable[pWin->drawable.pScreen->myNum]; @@ -218,12 +208,10 @@ of it in devPrivate. */ Bool -afbChangeWindowAttributes(pWin, mask) - register WindowPtr pWin; - register unsigned long mask; +afbChangeWindowAttributes(WindowPtr pWin, unsigned long mask) { - register unsigned long index; - register afbPrivWin *pPrivWin; + unsigned long index; + afbPrivWin *pPrivWin; WindowPtr pBgWin; pPrivWin = (afbPrivWin *)(pWin->devPrivates[afbWindowPrivateIndex].ptr); Index: xc/programs/Xserver/afb/afbzerarc.c diff -u xc/programs/Xserver/afb/afbzerarc.c:3.3 xc/programs/Xserver/afb/afbzerarc.c:3.5 --- xc/programs/Xserver/afb/afbzerarc.c:3.3 Tue Jul 15 21:38:36 2003 +++ xc/programs/Xserver/afb/afbzerarc.c Fri Oct 14 11:16:17 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.3 2003/07/16 01:38:36 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/afb/afbzerarc.c,v 3.5 2005/10/14 15:16:17 tsi Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium @@ -26,16 +26,14 @@ ********************************************************/ -/* $XConsortium: afbzerarc.c,v 5.19 94/04/17 20:28:37 dpw Exp $ */ - /* Derived from: * "Algorithm for drawing ellipses or hyperbolae with a digital plotter" * by M. L. V. Pitteway * The Computer Journal, November 1967, Volume 10, Number 3, pp. 282-289 */ -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -79,23 +77,20 @@ #define DoPix(bit,base,yoff,xoff) if (mask & bit) Pixelate(base,yoff,xoff); static void -afbZeroArcSS(pDraw, pGC, arc) - DrawablePtr pDraw; - GCPtr pGC; - xArc *arc; +afbZeroArcSS(DrawablePtr pDraw, GCPtr pGC, xArc *arc) { miZeroArcRec info; Bool do360; - register int de; - register int x, y, a, b, d, mask; - register int k1, k3, dx, dy; + int de; + int x, y, a, b, d, mask; + int k1, k3, dx, dy; PixelType *addrl; PixelType *yorgl, *yorgol; int nlwidth, yoffset, dyoffset; int sizeDst, depthDst; PixelType pmask; - register PixelType *paddr; - register unsigned char *rrops; + PixelType *paddr; + unsigned char *rrops; rrops = ((afbPrivGC *)(pGC->devPrivates[afbGCPrivateIndex].ptr))->rrops; @@ -178,14 +173,10 @@ } void -afbZeroPolyArcSS(pDraw, pGC, narcs, parcs) - DrawablePtr pDraw; - GCPtr pGC; - int narcs; - xArc *parcs; +afbZeroPolyArcSS(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc *parcs) { - register xArc *arc; - register int i; + xArc *arc; + int i; BoxRec box; RegionPtr cclip; Index: xc/programs/Xserver/cfb/Imakefile.inc diff -u xc/programs/Xserver/cfb/Imakefile.inc:1.8 xc/programs/Xserver/cfb/Imakefile.inc:1.9 --- xc/programs/Xserver/cfb/Imakefile.inc:1.8 Wed Feb 9 14:41:59 2005 +++ xc/programs/Xserver/cfb/Imakefile.inc Fri Oct 14 11:16:18 2005 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/cfb/Imakefile.inc,v 1.8 2005/02/09 19:41:59 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/cfb/Imakefile.inc,v 1.9 2005/10/14 15:16:18 tsi Exp $ /* * Copyright (c) 1994-2004 by The XFree86 Project, Inc. * All rights reserved. @@ -137,8 +137,7 @@ #endif INCLUDES = -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ - -I$(SERVERSRC)/cfb24 -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext + -I$(SERVERSRC)/cfb24 -I$(SERVERSRC)/include -I$(SERVERSRC)/Xext LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \ $(SERVERSRC)/mfb/llib-lmfb.ln $(SERVERSRC)/mi/llib-lmi.ln DEFINES = $(LMDEFINES) -DPSZ=PixelSize $(PLATFORMDEFS) Index: xc/programs/Xserver/cfb/cfb.h diff -u xc/programs/Xserver/cfb/cfb.h:3.30 xc/programs/Xserver/cfb/cfb.h:3.32 --- xc/programs/Xserver/cfb/cfb.h:3.30 Sat Jul 19 09:22:27 2003 +++ xc/programs/Xserver/cfb/cfb.h Fri Oct 14 11:16:18 2005 @@ -1,4 +1,3 @@ -/* $Xorg: cfb.h,v 1.3 2000/08/17 19:48:12 cpqbld Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -27,11 +26,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.30 2003/07/19 13:22:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb.h,v 3.32 2005/10/14 15:16:18 tsi Exp $ */ #if !defined(__CFB_H__) || defined(CFB_PROTOTYPES_ONLY) -#include "X.h" +#include #include "globals.h" #include "pixmap.h" #include "region.h" @@ -320,6 +319,13 @@ ); /* cfbbitblt.c */ +#ifndef CFB_PROTOTYPES_ONLY +typedef void (*cfbDoBitBltProcPtr)(DrawablePtr pSrc, DrawablePtr pDst, + int alu, RegionPtr prgnDst, + DDXPointPtr pptSrc, + unsigned long planemask); +#endif + extern RegionPtr cfbBitBlt( DrawablePtr /*pSrcDrawable*/, DrawablePtr /*pDstDrawable*/, @@ -330,19 +336,20 @@ int /*height*/, int /*dstx*/, int /*dsty*/, - void (* /*doBitBlt*/)( - DrawablePtr /*pSrc*/, - DrawablePtr /*pDst*/, - int /*alu*/, - RegionPtr /*prgnDst*/, - DDXPointPtr /*pptSrc*/, - unsigned long /*planemask*/ - ), + cfbDoBitBltProcPtr /*doBitBlt*/, unsigned long /*bitPlane*/ ); #define cfbCopyPlaneExpand cfbBitBlt +#ifndef CFB_PROTOTYPES_ONLY +typedef void (*cfbDoCopyPlaneProcPtr)(DrawablePtr pSrc, DrawablePtr pDst, + int alu, RegionPtr prgnDst, + DDXPointPtr pptSrc, + unsigned long planemask, + unsigned long bitPlane); +#endif + extern RegionPtr cfbCopyPlaneReduce( DrawablePtr /*pSrcDrawable*/, DrawablePtr /*pDstDrawable*/, @@ -353,15 +360,7 @@ int /*height*/, int /*dstx*/, int /*dsty*/, - void (* /*doCopyPlane*/)( - DrawablePtr /*pSrc*/, - DrawablePtr /*pDst*/, - int /*alu*/, - RegionPtr /*prgnDst*/, - DDXPointPtr /*pptSrc*/, - unsigned long /*planemask*/, - unsigned long /*bitPlane*/ /* We must know which plane to reduce! */ - ), + cfbDoCopyPlaneProcPtr /*doCopyPlane*/, unsigned long /*bitPlane*/ ); Index: xc/programs/Xserver/cfb/cfb8bit.c diff -u xc/programs/Xserver/cfb/cfb8bit.c:1.5 xc/programs/Xserver/cfb/cfb8bit.c:1.7 --- xc/programs/Xserver/cfb/cfb8bit.c:1.5 Fri Dec 14 14:59:20 2001 +++ xc/programs/Xserver/cfb/cfb8bit.c Fri Oct 14 11:16:18 2005 @@ -1,4 +1,4 @@ -/* $Xorg: cfb8bit.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.7 2005/10/14 15:16:18 tsi Exp $ */ /* Copyright 1989, 1994, 1998 The Open Group @@ -26,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.c,v 1.5 2001/12/14 19:59:20 dawes Exp $ */ /* * cfb8bit.c @@ -37,9 +36,9 @@ #if PSZ == 8 -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" @@ -192,9 +191,7 @@ PixelGroup cfb8StippleAnd[NUM_MASKS], cfb8StippleXor[NUM_MASKS]; int -cfb8SetStipple (alu, fg, planemask) -int alu; -CfbBits fg, planemask; +cfb8SetStipple(int alu, CfbBits fg, CfbBits planemask) { CfbBits and, xor, rrop; int s; @@ -221,9 +218,7 @@ int -cfb8SetOpaqueStipple (alu, fg, bg, planemask) -int alu; -CfbBits fg, bg, planemask; +cfb8SetOpaqueStipple(int alu, CfbBits fg, CfbBits bg, CfbBits planemask) { CfbBits andfg, xorfg, andbg, xorbg, rropfg, rropbg; int s; @@ -364,11 +359,8 @@ int -cfb8ComputeClipMasks32 (pBox, numRects, x, y, w, h, clips) - BoxPtr pBox; - int numRects; - int x, y, w, h; - CARD32 *clips; +cfb8ComputeClipMasks32(BoxPtr pBox, int numRects, int x, int y, int w, int h, + CARD32 *clips) { int yBand, yBandBot; int ch; Index: xc/programs/Xserver/cfb/cfb8bit.h diff -u xc/programs/Xserver/cfb/cfb8bit.h:3.8 xc/programs/Xserver/cfb/cfb8bit.h:3.9 --- xc/programs/Xserver/cfb/cfb8bit.h:3.8 Mon Nov 17 17:20:32 2003 +++ xc/programs/Xserver/cfb/cfb8bit.h Sun Mar 27 21:51:03 2005 @@ -7,7 +7,7 @@ * are used for depths other than 8. Perhaps the file should be * renamed. dpw */ -/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.8 2003/11/17 22:20:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8bit.h,v 3.9 2005/03/28 02:51:03 dawes Exp $ */ /* @@ -34,8 +34,6 @@ in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfb8bit.h,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ - #include "servermd.h" #if (BITMAP_BIT_ORDER == MSBFirst) @@ -182,14 +180,14 @@ #define WriteBitGroup(dst,pixel,bits) \ { \ - register PixelGroup _maskTmp = cfb8PixelMasks[(bits)]; \ + PixelGroup _maskTmp = cfb8PixelMasks[(bits)]; \ *(dst) = (*(dst) & ~_maskTmp) | ((pixel) & _maskTmp); \ } #define SwitchBitGroup(dst,pixel,bits) \ { \ - register PixelGroup _maskTmp = cfb8PixelMasks[(bits)]; \ - register PixelGroup _pixTmp = ((pixel) & _maskTmp); \ + PixelGroup _maskTmp = cfb8PixelMasks[(bits)]; \ + PixelGroup _pixTmp = ((pixel) & _maskTmp); \ _maskTmp = ~_maskTmp; \ SwitchBitsLoop (*(dst) = (*(dst) & _maskTmp) | _pixTmp;) \ } @@ -901,7 +899,7 @@ #if PGSZ == 32 #define WriteBitGroup(dst,pixel,bits) \ { \ - register CARD32 reg_pixel = (pixel); \ + CARD32 reg_pixel = (pixel); \ switch (bits) { \ case 0: \ break; \ Index: xc/programs/Xserver/cfb/cfb8line.c diff -u xc/programs/Xserver/cfb/cfb8line.c:3.20 xc/programs/Xserver/cfb/cfb8line.c:3.22 --- xc/programs/Xserver/cfb/cfb8line.c:3.20 Wed Sep 15 11:01:24 2004 +++ xc/programs/Xserver/cfb/cfb8line.c Fri Oct 14 11:16:18 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.20 2004/09/15 15:01:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfb8line.c,v 3.22 2005/10/14 15:16:18 tsi Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -29,7 +29,7 @@ */ /* - * Copyright (c) 2004 by The XFree86 Project, Inc. + * Copyright (c) 2004, 2005 by The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -76,7 +76,7 @@ */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" @@ -308,55 +308,48 @@ int #ifdef POLYSEGMENT -FUNC_NAME(cfb8SegmentSS1Rect) (pDrawable, pGC, nseg, pSegInit) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - xSegment *pSegInit; -#else -FUNC_NAME(cfb8LineSS1Rect) (pDrawable, pGC, mode, npt, pptInit, pptInitOrig, - x1p,y1p,x2p,y2p) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit, pptInitOrig; - int *x1p, *y1p, *x2p, *y2p; +FUNC_NAME(cfb8SegmentSS1Rect)(DrawablePtr pDrawable, GCPtr pGC, int nseg, + xSegment *pSegInit) +#else +FUNC_NAME(cfb8LineSS1Rect)(DrawablePtr pDrawable, GCPtr pGC, int mode, + int npt, DDXPointPtr pptInit, + DDXPointPtr pptInitOrig, int *x1p, int *y1p, + int *x2p, int *y2p) #endif /* POLYSEGMENT */ { - register long e; - register int y1_or_e1; - register PixelType *addrp; - register int stepmajor; - register int stepminor; + long e; + int y1_or_e1; + PixelType *addrp; + int stepmajor; + int stepminor; #ifndef REARRANGE - register long e3; + long e3; #endif #ifdef mc68000 - register short x1_or_len; + short x1_or_len; #else - register int x1_or_len; + int x1_or_len; #endif RROP_DECLARE #ifdef SAVE_X2Y2 # define c2 y2 #else - register int c2; + int c2; #endif #if !defined(ORIGIN) && !defined(POLYSEGMENT) - register int _x1 = 0, _y1 = 0, _x2 = 0, _y2 = 0; + int _x1 = 0, _y1 = 0, _x2 = 0, _y2 = 0; int extents_x1, extents_y1, extents_x2, extents_y2; #endif /* !ORIGIN */ #ifndef PREVIOUS - register int upperleft, lowerright; + int upperleft, lowerright; CARD32 ClipMask = 0x80008000; #endif /* !PREVIOUS */ #ifdef POLYSEGMENT - register int capStyle; + int capStyle; #endif /* POLYSEGMENT */ #ifdef SAVE_X2Y2 - register int x2, y2; + int x2, y2; # define X1 x1_or_len # define Y1 y1_or_e1 # define X2 x2 @@ -572,7 +565,7 @@ if (x1_or_len < y1_or_e1) { #ifdef REARRANGE - register int e3; + int e3; #endif e3 = x1_or_len; @@ -593,7 +586,7 @@ { #ifdef REARRANGE - register int e3; + int e3; RROP_DECLARE RROP_FETCH_GCPRIV(devPriv); #endif @@ -709,7 +702,7 @@ else /* Polysegment horizontal line optimization */ { # ifdef REARRANGE - register int e3; + int e3; RROP_DECLARE RROP_FETCH_GCPRIV(devPriv); # endif /* REARRANGE */ @@ -762,11 +755,11 @@ #if PSZ == 24 { #if RROP == GXcopy - register int nlmiddle; + int nlmiddle; int leftIndex = xOffset & 3; int rightIndex = (xOffset + x1_or_len) & 3; #else - register int pidx; + int pidx; #endif #if RROP == GXcopy @@ -1146,11 +1139,8 @@ #ifdef POLYSEGMENT void -cfb8SegmentSS1Rect (pDrawable, pGC, nseg, pSegInit) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - xSegment *pSegInit; +cfb8SegmentSS1Rect(DrawablePtr pDrawable, GCPtr pGC, int nseg, + xSegment *pSegInit) { int (*func)(DrawablePtr, GCPtr, int, xSegment *); void (*clip)(DrawablePtr, GCPtr, int, int, int, int, BoxPtr, Bool); @@ -1209,12 +1199,8 @@ #else /* POLYSEGMENT */ void -cfb8LineSS1Rect (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; - int npt; - DDXPointPtr pptInit; +cfb8LineSS1Rect(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) { int (*func)(DrawablePtr, GCPtr, int, int, DDXPointPtr, DDXPointPtr, @@ -1301,12 +1287,8 @@ #if !defined(POLYSEGMENT) && !defined (PREVIOUS) void -RROP_NAME (cfb8ClippedLine) (pDrawable, pGC, x1, y1, x2, y2, boxp, shorten) - DrawablePtr pDrawable; - GCPtr pGC; - int x1, y1, x2, y2; - BoxPtr boxp; - Bool shorten; +RROP_NAME(cfb8ClippedLine)(DrawablePtr pDrawable, GCPtr pGC, int x1, int y1, + int x2, int y2, BoxPtr boxp, Bool shorten) { int oc1, oc2; int e, e1, e3, len; @@ -1431,7 +1413,7 @@ x1 = new_x1; y1 = new_y1; { - register PixelType *addrp; + PixelType *addrp; RROP_DECLARE RROP_FETCH_GC(pGC); Index: xc/programs/Xserver/cfb/cfballpriv.c diff -u xc/programs/Xserver/cfb/cfballpriv.c:1.12 xc/programs/Xserver/cfb/cfballpriv.c:1.14 --- xc/programs/Xserver/cfb/cfballpriv.c:1.12 Fri Dec 14 14:59:21 2001 +++ xc/programs/Xserver/cfb/cfballpriv.c Fri Oct 14 11:16:18 2005 @@ -1,6 +1,5 @@ +/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.14 2005/10/14 15:16:18 tsi Exp $ */ /* - * $Xorg: cfballpriv.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ - * Copyright 1991, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -25,10 +24,9 @@ * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfballpriv.c,v 1.12 2001/12/14 19:59:21 dawes Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" @@ -53,9 +51,7 @@ Bool -cfbAllocatePrivates(pScreen, window_index, gc_index) - ScreenPtr pScreen; - int *window_index, *gc_index; +cfbAllocatePrivates(ScreenPtr pScreen, int *window_index, int *gc_index) { if (!window_index || !gc_index || (*window_index == -1 && *gc_index == -1)) Index: xc/programs/Xserver/cfb/cfbbitblt.c diff -u xc/programs/Xserver/cfb/cfbbitblt.c:1.21 xc/programs/Xserver/cfb/cfbbitblt.c:1.23 --- xc/programs/Xserver/cfb/cfbbitblt.c:1.21 Sun Apr 11 16:33:48 2004 +++ xc/programs/Xserver/cfb/cfbbitblt.c Fri Oct 14 11:16:18 2005 @@ -2,7 +2,7 @@ * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.21 2004/04/11 20:33:48 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbitblt.c,v 1.23 2005/10/14 15:16:18 tsi Exp $ */ /* @@ -31,11 +31,10 @@ Author: Keith Packard */ -/* $Xorg: cfbbitblt.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" @@ -72,21 +71,9 @@ /* cfbBitBltcfb == cfbCopyPlaneExpand */ RegionPtr -cfbBitBlt ( - register DrawablePtr pSrcDrawable, - register DrawablePtr pDstDrawable, - GC *pGC, - int srcx, int srcy, - int width, int height, - int dstx, int dsty, - void (*doBitBlt)( - DrawablePtr /*pSrc*/, - DrawablePtr /*pDst*/, - int /*alu*/, - RegionPtr /*prgnDst*/, - DDXPointPtr /*pptSrc*/, - unsigned long /*planemask*/), - unsigned long bitPlane) +cfbBitBlt(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GC *pGC, + int srcx, int srcy, int width, int height, int dstx, int dsty, + cfbDoBitBltProcPtr doBitBlt, unsigned long bitPlane) { RegionPtr prgnSrcClip = NULL; /* may be a new region, or just a copy */ Bool freeSrcClip = FALSE; @@ -94,11 +81,11 @@ RegionPtr prgnExposed; RegionRec rgnDst; DDXPointPtr pptSrc; - register DDXPointPtr ppt; - register BoxPtr pbox; + DDXPointPtr ppt; + BoxPtr pbox; int i; - register int dx; - register int dy; + int dx; + int dy; xRectangle origSource; DDXPointRec origDest; int numRects; @@ -334,22 +321,10 @@ RegionPtr -cfbCopyPlaneReduce ( - register DrawablePtr pSrcDrawable, - register DrawablePtr pDstDrawable, - GC *pGC, - int srcx, int srcy, - int width, int height, - int dstx, int dsty, - void (*doCopyPlane)( - DrawablePtr /*pSrc*/, - DrawablePtr /*pDst*/, - int /*alu*/, - RegionPtr /*prgnDst*/, - DDXPointPtr /*pptSrc*/, - unsigned long /*planemask*/, - unsigned long /*bitPlane*/), - unsigned long bitPlane) +cfbCopyPlaneReduce(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GC *pGC, + int srcx, int srcy, int width, int height, + int dstx, int dsty, cfbDoCopyPlaneProcPtr doCopyPlane, + unsigned long bitPlane) { RegionPtr prgnSrcClip = NULL; /* may be a new region, or just a copy */ Bool freeSrcClip = FALSE; @@ -357,11 +332,11 @@ RegionPtr prgnExposed; RegionRec rgnDst; DDXPointPtr pptSrc; - register DDXPointPtr ppt; - register BoxPtr pbox; + DDXPointPtr ppt; + BoxPtr pbox; int i; - register int dx; - register int dy; + int dx; + int dy; xRectangle origSource; DDXPointRec origDest; int numRects; @@ -597,21 +572,10 @@ void -cfbDoBitblt (pSrc, pDst, alu, prgnDst, pptSrc, planemask) - DrawablePtr pSrc, pDst; - int alu; - RegionPtr prgnDst; - DDXPointPtr pptSrc; - unsigned long planemask; +cfbDoBitblt(DrawablePtr pSrc, DrawablePtr pDst, int alu, RegionPtr prgnDst, + DDXPointPtr pptSrc, unsigned long planemask) { - void (*doBitBlt)( - DrawablePtr /*pSrc*/, - DrawablePtr /*pDst*/, - int /*alu*/, - RegionPtr /*prgnDst*/, - DDXPointPtr /*pptSrc*/, - unsigned long /*planemask*/) - = cfbDoBitbltGeneral; + cfbDoBitBltProcPtr doBitBlt = cfbDoBitbltGeneral; if ((planemask & PMSK) == PMSK) { switch (alu) { @@ -630,23 +594,12 @@ } RegionPtr -cfbCopyArea(pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty) - register DrawablePtr pSrcDrawable; - register DrawablePtr pDstDrawable; - GC *pGC; - int srcx, srcy; - int width, height; - int dstx, dsty; +cfbCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + GC *pGC, int srcx, int srcy, int width, int height, + int dstx, int dsty) { - void (*doBitBlt) ( - DrawablePtr /*pSrc*/, - DrawablePtr /*pDst*/, - int /*alu*/, - RegionPtr /*prgnDst*/, - DDXPointPtr /*pptSrc*/, - unsigned long /*planemask*/); - + cfbDoBitBltProcPtr doBitBlt; + doBitBlt = cfbDoBitbltCopy; if (pGC->alu != GXcopy || (pGC->planemask & PMSK) != PMSK) { @@ -668,18 +621,24 @@ } #if PSZ == 8 +/* + DrawablePtr pSrcDrawable; must be a bitmap + DrawablePtr pDstDrawable; must be depth 8 drawable + int rop; not used; caller must call + cfb8CheckOpaqueStipple + beforehand to get cfb8StippleRRop set correctly + RegionPtr prgnDst; region in destination to draw to; + screen relative coords. if dest is a window; + drawable relative if dest is a pixmap + DDXPointPtr pptSrc; drawable relative src coords to copy from; + must be one point for each box in prgnDst + unsigned long planemask; to apply to destination writes +*/ + void -cfbCopyPlane1to8 (pSrcDrawable, pDstDrawable, rop, prgnDst, pptSrc, planemask) - DrawablePtr pSrcDrawable; /* must be a bitmap */ - DrawablePtr pDstDrawable; /* must be depth 8 drawable */ - int rop; /* not used; caller must call cfb8CheckOpaqueStipple - * beforehand to get cfb8StippleRRop set correctly */ - RegionPtr prgnDst; /* region in destination to draw to; - * screen relative coords. if dest is a window; - * drawable relative if dest is a pixmap */ - DDXPointPtr pptSrc; /* drawable relative src coords to copy from; - * must be one point for each box in prgnDst */ - unsigned long planemask; /* to apply to destination writes */ +cfbCopyPlane1to8(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, + unsigned long planemask) { int srcx, srcy; /* upper left corner of box being copied in source */ int dstx, dsty; /* upper left corner of box being copied in dest */ @@ -691,14 +650,14 @@ int widthDst; /* # of groups of 4 pixels (8 bits/pixel) in dst */ CfbBits *psrcLine, *pdstLine; /* steps a row at a time thru src/dst; * may point into middle of row */ - register CfbBits *psrc, *pdst; /* steps within the row */ - register CfbBits bits, tmp; /* bits from source */ - register int leftShift; - register int rightShift; + CfbBits *psrc, *pdst; /* steps within the row */ + CfbBits bits, tmp; /* bits from source */ + int leftShift; + int rightShift; CfbBits startmask; /* left edge pixel mask */ CfbBits endmask; /* right edge pixel mask */ - register int nlMiddle; /* number of words in middle of the row to draw */ - register int nl; + int nlMiddle; /* number of words in middle of the row to draw */ + int nl; int firstoff = 0; int secondoff = 0; CfbBits src; @@ -1026,27 +985,27 @@ CfbBits *psrcBase, *pdstBase; int widthSrc, widthDst; unsigned int *psrcLine; - register unsigned int *psrc; + unsigned int *psrc; #if PSZ == 16 unsigned short *pdstLine; - register unsigned short *pdst; + unsigned short *pdst; #endif #if PSZ == 32 unsigned int *pdstLine; - register unsigned int *pdst; + unsigned int *pdst; #endif #if PSZ == 24 unsigned char *pdstLine; - register unsigned char *pdst; + unsigned char *pdst; #endif - register unsigned int bits, tmp; - register unsigned int fgpixel, bgpixel; - register unsigned int src; + unsigned int bits, tmp; + unsigned int fgpixel, bgpixel; + unsigned int src; #if PSZ == 24 - register unsigned int dst; + unsigned int dst; #endif - register int leftShift, rightShift; - register int i, nl; + int leftShift, rightShift; + int i, nl; int nbox; BoxPtr pbox; int result; @@ -1347,15 +1306,10 @@ /* shared among all different cfb depths through linker magic */ -RegionPtr cfbCopyPlane(pSrcDrawable, pDstDrawable, - pGC, srcx, srcy, width, height, dstx, dsty, bitPlane) - DrawablePtr pSrcDrawable; - DrawablePtr pDstDrawable; - GCPtr pGC; - int srcx, srcy; - int width, height; - int dstx, dsty; - unsigned long bitPlane; +RegionPtr +cfbCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC, + int srcx, int srcy, int width, int height, int dstx, int dsty, + unsigned long bitPlane) { RegionPtr ret; Index: xc/programs/Xserver/cfb/cfbblt.c diff -u xc/programs/Xserver/cfb/cfbblt.c:3.14 xc/programs/Xserver/cfb/cfbblt.c:3.16 --- xc/programs/Xserver/cfb/cfbblt.c:3.14 Wed Oct 29 17:44:53 2003 +++ xc/programs/Xserver/cfb/cfbblt.c Fri Oct 14 11:16:18 2005 @@ -1,7 +1,7 @@ /* * cfb copy area */ -/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.14 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbblt.c,v 3.16 2005/10/14 15:16:18 tsi Exp $ */ /* @@ -30,13 +30,12 @@ Author: Keith Packard */ -/* $Xorg: cfbblt.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ /* 24-bit bug fixes: Peter Wainwright, 1998/11/28 */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" @@ -118,13 +117,9 @@ #endif void -MROP_NAME(cfbDoBitblt)( - DrawablePtr pSrc, - DrawablePtr pDst, - int alu, - RegionPtr prgnDst, - DDXPointPtr pptSrc, - unsigned long planemask) +MROP_NAME(cfbDoBitblt)(DrawablePtr pSrc, DrawablePtr pDst, int alu, + RegionPtr prgnDst, DDXPointPtr pptSrc, + unsigned long planemask) { CfbBits *psrcBase, *pdstBase; /* start of src and dst bitmaps */ @@ -144,8 +139,8 @@ CfbBits *psrcLine, *pdstLine; /* pointers to line with current src and dst */ - register CfbBits *psrc;/* pointer to current src longword */ - register CfbBits *pdst;/* pointer to current dst longword */ + CfbBits *psrc;/* pointer to current src longword */ + CfbBits *pdst;/* pointer to current dst longword */ MROP_DECLARE_REG() @@ -153,13 +148,13 @@ CfbBits startmask, endmask; /* masks for writing ends of dst */ int nlMiddle; /* whole longwords in dst */ int xoffSrc, xoffDst; - register int nl; /* temp copy of nlMiddle */ + int nl; /* temp copy of nlMiddle */ int careful; #if (PSZ != 24) || (MROP != 0) - register int leftShift, rightShift; - register CfbBits bits; - register CfbBits bits1; + int leftShift, rightShift; + CfbBits bits; + CfbBits bits1; #endif #if PSZ == 24 @@ -380,7 +375,7 @@ /* ...otherwise, pixel by pixel operation */ while (h--) { - register int i, si, sii, di; + int i, si, sii, di; for (i = 0, si = pptSrc->x, di = pbox->x1; i < w; @@ -427,8 +422,8 @@ while (h--) { #if PSZ == 24 && MROP == 0 - register int index; - register int im3; + int index; + int im3; #endif /* PSZ == 24 && MROP == 0 */ psrc = psrcLine; pdst = pdstLine; @@ -662,7 +657,7 @@ /* ...otherwise, pixel by pixel operation */ while (h--) { - register int i, si, sii, di; + int i, si, sii, di; for (i = 0, si = pptSrc->x + w - 1, di = pbox->x2 - 1; i < w; @@ -713,8 +708,8 @@ while (h--) { #if PSZ == 24 && MROP == 0 - register int index; - register int im3; + int index; + int im3; #endif /* PSZ == 24 && MROP == 0 */ psrc = psrcLine; pdst = pdstLine; Index: xc/programs/Xserver/cfb/cfbbres.c diff -u xc/programs/Xserver/cfb/cfbbres.c:3.5 xc/programs/Xserver/cfb/cfbbres.c:3.7 --- xc/programs/Xserver/cfb/cfbbres.c:3.5 Fri Dec 14 14:59:21 2001 +++ xc/programs/Xserver/cfb/cfbbres.c Fri Oct 14 11:16:18 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.5 2001/12/14 19:59:21 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbres.c,v 3.7 2005/10/14 15:16:18 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cfbbres.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" + +#include #include "misc.h" #include "cfb.h" #include "cfbmskbits.h" @@ -54,34 +54,31 @@ #include "miline.h" /* Solid bresenham line */ -/* NOTES - e2 is used less often than e1, so it's not in a register +/* + CfbBits *addrl; pointer to base of bitmap + int nlwidth; width in longwords of bitmap + int signdx; + int signdy; signs of directions + int axis; major axis (Y_AXIS or X_AXIS) + int x1, y1; initial point + int e; error accumulator + int e1; bresenham increments + int len; length of line */ void -cfbBresS(rop, and, xor, addrl, nlwidth, signdx, signdy, axis, x1, y1, e, e1, - e2, len) - int rop; - CfbBits and, xor; - CfbBits *addrl; /* pointer to base of bitmap */ - int nlwidth; /* width in longwords of bitmap */ - register int signdx; - int signdy; /* signs of directions */ - int axis; /* major axis (Y_AXIS or X_AXIS) */ - int x1, y1; /* initial point */ - register int e; /* error accumulator */ - register int e1; /* bresenham increments */ - int e2; - int len; /* length of line */ +cfbBresS(int rop, CfbBits and, CfbBits xor, CfbBits *addrl, int nlwidth, + int signdx, int signdy, int axis, int x1, int y1, int e, int e1, + int e2, int len) { - register int e3 = e2-e1; + int e3 = e2-e1; #if PSZ == 24 CfbBits piQxelXor[3],piQxelAnd[3]; char *addrb; int nlwidth3, signdx3; #endif #ifdef PIXEL_ADDR - register PixelType *addrp; /* Pixel pointer */ + PixelType *addrp; /* Pixel pointer */ if (len == 0) return; @@ -230,7 +227,7 @@ } } #else /* !PIXEL_ADDR */ - register CfbBits tmp, bit; + CfbBits tmp, bit; CfbBits leftbit, rightbit; /* point to longword containing first point */ Index: xc/programs/Xserver/cfb/cfbbresd.c diff -u xc/programs/Xserver/cfb/cfbbresd.c:3.6 xc/programs/Xserver/cfb/cfbbresd.c:3.8 --- xc/programs/Xserver/cfb/cfbbresd.c:3.6 Fri Dec 14 14:59:22 2001 +++ xc/programs/Xserver/cfb/cfbbresd.c Fri Oct 14 11:16:18 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.6 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbbresd.c,v 3.8 2005/10/14 15:16:18 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cfbbresd.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ -#include "X.h" + +#include #include "misc.h" #include "cfb.h" #include "cfbmskbits.h" @@ -55,30 +55,15 @@ /* Dashed bresenham line */ void -cfbBresD(rrops, - pdashIndex, pDash, numInDashList, pdashOffset, isDoubleDash, - addrl, nlwidth, - signdx, signdy, axis, x1, y1, e, e1, e2, len) - cfbRRopPtr rrops; - int *pdashIndex; /* current dash */ - unsigned char *pDash; /* dash list */ - int numInDashList; /* total length of dash list */ - int *pdashOffset; /* offset into current dash */ - int isDoubleDash; - CfbBits *addrl; /* pointer to base of bitmap */ - int nlwidth; /* width in longwords of bitmap */ - int signdx, signdy; /* signs of directions */ - int axis; /* major axis (Y_AXIS or X_AXIS) */ - int x1, y1; /* initial point */ - register int e; /* error accumulator */ - register int e1; /* bresenham increments */ - int e2; - int len; /* length of line */ +cfbBresD(cfbRRopPtr rrops, int *pdashIndex, unsigned char *pDash, + int numInDashList, int *pdashOffset, int isDoubleDash, + CfbBits *addrl, int nlwidth, int signdx, int signdy, int axis, + int x1, int y1, int e, int e1, int e2, int len) { #ifdef PIXEL_ADDR - register PixelType *addrp; + PixelType *addrp; #endif - register int e3 = e2-e1; + int e3 = e2-e1; int dashIndex; int dashOffset; int dashRemaining; @@ -279,7 +264,7 @@ } #else /* !PIXEL_ADDR */ { - register CfbBits tmp; + CfbBits tmp; CfbBits startbit, bit; /* point to longword containing first point */ Index: xc/programs/Xserver/cfb/cfbbstore.c diff -u xc/programs/Xserver/cfb/cfbbstore.c:1.5 xc/programs/Xserver/cfb/cfbbstore.c:1.7 --- xc/programs/Xserver/cfb/cfbbstore.c:1.5 Wed Jan 17 17:36:34 2001 +++ xc/programs/Xserver/cfb/cfbbstore.c Fri Oct 14 11:16:18 2005 @@ -1,5 +1,5 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.5 2001/01/17 22:36:34 dawes Exp $ */ -/*- +/* $XFree86: xc/programs/Xserver/cfb/cfbbstore.c,v 1.7 2005/10/14 15:16:18 tsi Exp $ */ +/* * cfbbstore.c -- * Functions required by the backing-store implementation in MI. * @@ -15,17 +15,16 @@ * * */ -/* $Xorg: cfbbstore.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ #include "cfb.h" -#include "X.h" +#include #include "mibstore.h" #include "regionstr.h" #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" -/*- +/* *----------------------------------------------------------------------- * cfbSaveAreas -- * Function called by miSaveAreas to actually fetch the areas to be @@ -46,17 +45,13 @@ *----------------------------------------------------------------------- */ void -cfbSaveAreas(pPixmap, prgnSave, xorg, yorg, pWin) - PixmapPtr pPixmap; /* Backing pixmap */ - RegionPtr prgnSave; /* Region to save (pixmap-relative) */ - int xorg; /* X origin of region */ - int yorg; /* Y origin of region */ - WindowPtr pWin; +cfbSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg, + WindowPtr pWin) { - register DDXPointPtr pPt; + DDXPointPtr pPt; DDXPointPtr pPtsInit; - register BoxPtr pBox; - register int i; + BoxPtr pBox; + int i; ScreenPtr pScreen = pPixmap->drawable.pScreen; PixmapPtr pScrPix; @@ -83,7 +78,7 @@ DEALLOCATE_LOCAL (pPtsInit); } -/*- +/* *----------------------------------------------------------------------- * cfbRestoreAreas -- * Function called by miRestoreAreas to actually fetch the areas to be @@ -104,17 +99,13 @@ *----------------------------------------------------------------------- */ void -cfbRestoreAreas(pPixmap, prgnRestore, xorg, yorg, pWin) - PixmapPtr pPixmap; /* Backing pixmap */ - RegionPtr prgnRestore; /* Region to restore (screen-relative)*/ - int xorg; /* X origin of window */ - int yorg; /* Y origin of window */ - WindowPtr pWin; +cfbRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, int yorg, + WindowPtr pWin) { - register DDXPointPtr pPt; + DDXPointPtr pPt; DDXPointPtr pPtsInit; - register BoxPtr pBox; - register int i; + BoxPtr pBox; + int i; ScreenPtr pScreen = pPixmap->drawable.pScreen; PixmapPtr pScrPix; Index: xc/programs/Xserver/cfb/cfbcmap.c diff -u xc/programs/Xserver/cfb/cfbcmap.c:3.13 xc/programs/Xserver/cfb/cfbcmap.c:3.15 --- xc/programs/Xserver/cfb/cfbcmap.c:3.13 Wed Jan 17 17:36:34 2001 +++ xc/programs/Xserver/cfb/cfbcmap.c Fri Oct 14 11:16:18 2005 @@ -1,4 +1,4 @@ -/* $Xorg: cfbcmap.c,v 1.3 2000/08/17 19:48:13 cpqbld Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.15 2005/10/14 15:16:18 tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -27,11 +27,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbcmap.c,v 3.13 2001/01/17 22:36:34 dawes Exp $ */ -#include "X.h" -#include "Xproto.h" +#include +#include #include "scrnintstr.h" #include "colormapst.h" #include "resource.h" @@ -57,10 +56,8 @@ } void -cfbResolveColor(unsigned short *pred, - unsigned short *pgreen, - unsigned short *pblue, - VisualPtr pVisual) +cfbResolveColor(unsigned short *pred, unsigned short *pgreen, + unsigned short *pblue, VisualPtr pVisual) { miResolveColor(pred, pgreen, pblue, pVisual); } @@ -103,14 +100,9 @@ */ Bool -cfbInitVisuals (VisualPtr *visualp, - DepthPtr *depthp, - int *nvisualp, - int *ndepthp, - int *rootDepthp, - VisualID *defaultVisp, - unsigned long sizes, - int bitsPerRGB) +cfbInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp, + int *ndepthp, int *rootDepthp, VisualID *defaultVisp, + unsigned long sizes, int bitsPerRGB) { return miInitVisuals(visualp, depthp, nvisualp, ndepthp, rootDepthp, defaultVisp, sizes, bitsPerRGB, -1); Index: xc/programs/Xserver/cfb/cfbcppl.c diff -u xc/programs/Xserver/cfb/cfbcppl.c:1.7 xc/programs/Xserver/cfb/cfbcppl.c:1.9 --- xc/programs/Xserver/cfb/cfbcppl.c:1.7 Tue Jul 15 21:38:37 2003 +++ xc/programs/Xserver/cfb/cfbcppl.c Fri Oct 14 11:16:18 2005 @@ -1,6 +1,5 @@ +/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.9 2005/10/14 15:16:18 tsi Exp $ */ /* - * $TOG: cfb8cppl.c /main/16 1998/02/09 14:04:13 kaleb $ - * Copyright 1990, 1998 The Open Group Permission to use, copy, modify, distribute, and sell this software and its @@ -25,10 +24,9 @@ * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbcppl.c,v 1.7 2003/07/16 01:38:37 dawes Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "gcstruct.h" #include "window.h" #include "pixmapstr.h" @@ -46,13 +44,9 @@ void -cfbCopyImagePlane( - DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - int rop, - RegionPtr prgnDst, - DDXPointPtr pptSrc, - unsigned long planemask) +cfbCopyImagePlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, + unsigned long planemask) { /* note: there must be some sort of trick behind, passing a planemask value with all bits set @@ -95,14 +89,9 @@ } void -cfbCopyPlane8to1( - DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - int rop, - RegionPtr prgnDst, - DDXPointPtr pptSrc, - unsigned long planemask, - unsigned long bitPlane) +cfbCopyPlane8to1(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, + int rop, RegionPtr prgnDst, DDXPointPtr pptSrc, + unsigned long planemask, unsigned long bitPlane) { int srcx, srcy, dstx, dsty, width, height; unsigned char *psrcBase; @@ -110,12 +99,12 @@ int widthSrc, widthDst; unsigned char *psrcLine; PixelType *pdstLine; - register unsigned char *psrc; - register int i; - register int curBit; - register int bitPos; - register CfbBits bits; - register PixelType *pdst; + unsigned char *psrc; + int i; + int curBit; + int bitPos; + CfbBits bits; + PixelType *pdst; PixelType startmask, endmask; int niStart = 0, niEnd = 0; int bitStart = 0, bitEnd = 0; @@ -304,14 +293,9 @@ #if PSZ == 32 cfbCopyPlane32to1 #endif -( - DrawablePtr pSrcDrawable, - DrawablePtr pDstDrawable, - int rop, - RegionPtr prgnDst, - DDXPointPtr pptSrc, - unsigned long planemask, - unsigned long bitPlane) +(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, int rop, + RegionPtr prgnDst, DDXPointPtr pptSrc, unsigned long planemask, + unsigned long bitPlane) { int srcx, srcy, dstx, dsty, width, height; CfbBits *psrcBase; @@ -319,22 +303,22 @@ int widthSrc, widthDst; #if PSZ == 16 unsigned short *psrcLine; - register unsigned short *psrc; + unsigned short *psrc; #endif #if PSZ == 24 unsigned char *psrcLine; - register unsigned char *psrc; + unsigned char *psrc; #endif #if PSZ == 32 unsigned int *psrcLine; - register unsigned int *psrc; + unsigned int *psrc; #endif unsigned int *pdstLine; - register unsigned int *pdst; - register int i; - register int curBit; - register int bitPos; - register unsigned int bits; + unsigned int *pdst; + int i; + int curBit; + int bitPos; + unsigned int bits; unsigned int startmask = 0, endmask = 0; int niStart = 0, niEnd = 0; int bitStart = 0, bitEnd = 0; Index: xc/programs/Xserver/cfb/cfbfillarc.c diff -u xc/programs/Xserver/cfb/cfbfillarc.c:3.7 xc/programs/Xserver/cfb/cfbfillarc.c:3.9 --- xc/programs/Xserver/cfb/cfbfillarc.c:3.7 Wed Oct 29 17:44:53 2003 +++ xc/programs/Xserver/cfb/cfbfillarc.c Fri Oct 14 11:16:18 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.7 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillarc.c,v 3.9 2005/10/14 15:16:18 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,10 +25,8 @@ ********************************************************/ -/* $Xorg: cfbfillarc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ - -#include "X.h" -#include "Xprotostr.h" +#include +#include #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" @@ -47,10 +45,7 @@ #endif static void -RROP_NAME(cfbFillEllipseSolid)( - DrawablePtr pDraw, - GCPtr pGC, - xArc *arc) +RROP_NAME(cfbFillEllipseSolid)(DrawablePtr pDraw, GCPtr pGC, xArc *arc) { STUPID int x, y, e; STUPID int yk, xk, ym, xm, dx, dy, xorg, yorg; @@ -60,16 +55,16 @@ #else CfbBits *addrlt, *addrlb; #endif - register CfbBits *addrl; - register int n; + CfbBits *addrl; + int n; int nlwidth; RROP_DECLARE - register int xpos; - register int slw; + int xpos; + int slw; CfbBits startmask, endmask; int nlmiddle; #if PSZ == 24 - register int pidx; + int pidx; int xpos3; #endif @@ -255,13 +250,10 @@ } static void -RROP_NAME(cfbFillArcSliceSolid)( - DrawablePtr pDraw, - GCPtr pGC, - xArc *arc) +RROP_NAME(cfbFillArcSliceSolid)(DrawablePtr pDraw, GCPtr pGC, xArc *arc) { int yk, xk, ym, xm, dx, dy, xorg, yorg, slw; - register int x, y, e; + int x, y, e; miFillArcRec info; miArcSliceRec slice; int xl, xr, xc; @@ -270,13 +262,13 @@ #else CfbBits *addrlt, *addrlb; #endif - register CfbBits *addrl; - register int n; + CfbBits *addrl; + int n; int nlwidth; RROP_DECLARE CfbBits startmask, endmask; #if PSZ == 24 - register int pidx; + int pidx; #endif /* PSZ == 24 */ #if PSZ == 24 @@ -318,14 +310,11 @@ } void -RROP_NAME(cfbPolyFillArcSolid) (pDraw, pGC, narcs, parcs) - DrawablePtr pDraw; - GCPtr pGC; - int narcs; - xArc *parcs; +RROP_NAME(cfbPolyFillArcSolid)(DrawablePtr pDraw, GCPtr pGC, int narcs, + xArc *parcs) { - register xArc *arc; - register int i; + xArc *arc; + int i; int x2, y2; BoxRec box; RegionPtr cclip; Index: xc/programs/Xserver/cfb/cfbfillrct.c diff -u xc/programs/Xserver/cfb/cfbfillrct.c:3.8 xc/programs/Xserver/cfb/cfbfillrct.c:3.10 --- xc/programs/Xserver/cfb/cfbfillrct.c:3.8 Fri Dec 14 14:59:22 2001 +++ xc/programs/Xserver/cfb/cfbfillrct.c Fri Oct 14 11:16:18 2005 @@ -1,7 +1,7 @@ /* * Fill rectangles. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.8 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillrct.c,v 3.10 2005/10/14 15:16:18 tsi Exp $ */ /* @@ -28,10 +28,8 @@ in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfbfillrct.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ - -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "gcstruct.h" #include "window.h" @@ -45,12 +43,8 @@ void -cfbFillBoxTileOdd (pDrawable, n, rects, tile, xrot, yrot) - DrawablePtr pDrawable; - int n; - BoxPtr rects; - PixmapPtr tile; - int xrot, yrot; +cfbFillBoxTileOdd(DrawablePtr pDrawable, int n, BoxPtr rects, PixmapPtr tile, + int xrot, int yrot) { #if PSZ == 24 if (tile->drawable.width & 3) @@ -63,11 +57,7 @@ } void -cfbFillRectTileOdd (pDrawable, pGC, nBox, pBox) - DrawablePtr pDrawable; - GCPtr pGC; - int nBox; - BoxPtr pBox; +cfbFillRectTileOdd(DrawablePtr pDrawable, GCPtr pGC, int nBox, BoxPtr pBox) { int xrot, yrot; void (*fill)(DrawablePtr, int, BoxPtr, PixmapPtr, int, int, int, unsigned long); @@ -102,16 +92,13 @@ #define NUM_STACK_RECTS 1024 void -cfbPolyFillRect(pDrawable, pGC, nrectFill, prectInit) - DrawablePtr pDrawable; - register GCPtr pGC; - int nrectFill; /* number of rectangles to fill */ - xRectangle *prectInit; /* Pointer to first rectangle to fill */ +cfbPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, + xRectangle *prectInit) { xRectangle *prect; RegionPtr prgnClip; - register BoxPtr pbox; - register BoxPtr pboxClipped; + BoxPtr pbox; + BoxPtr pboxClipped; BoxPtr pboxClippedBase; BoxPtr pextent; BoxRec stackRects[NUM_STACK_RECTS]; Index: xc/programs/Xserver/cfb/cfbfillsp.c diff -u xc/programs/Xserver/cfb/cfbfillsp.c:3.8 xc/programs/Xserver/cfb/cfbfillsp.c:3.10 --- xc/programs/Xserver/cfb/cfbfillsp.c:3.8 Wed Oct 29 17:44:53 2003 +++ xc/programs/Xserver/cfb/cfbfillsp.c Fri Oct 14 11:16:18 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbfillsp.c,v 3.10 2005/10/14 15:16:18 tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -75,10 +75,8 @@ ******************************************************************/ -/* $Xorg: cfbfillsp.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ - -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "gcstruct.h" #include "window.h" @@ -125,10 +123,7 @@ #ifdef notdef #include static -dumpspans(n, ppt, pwidth) - int n; - DDXPointPtr ppt; - int *pwidth; +dumpspans(int n, DDXPointPtr ppt, int *pwidth) { fprintf(stderr,"%d spans\n", n); while (n--) { @@ -142,17 +137,12 @@ /* Fill spans with tiles that aren't 32 bits wide */ void -cfbUnnaturalTileFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) -DrawablePtr pDrawable; -GC *pGC; -int nInit; /* number of spans to fill */ -DDXPointPtr pptInit; /* pointer to list of start points */ -int *pwidthInit; /* pointer to list of n widths */ -int fSorted; +cfbUnnaturalTileFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ void (*fill)(DrawablePtr, int, DDXPointPtr, int *, PixmapPtr, int, int, int, unsigned long); int xrot, yrot; @@ -208,13 +198,8 @@ #if PSZ == 8 void -cfbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) -DrawablePtr pDrawable; -GC *pGC; -int nInit; /* number of spans to fill */ -DDXPointPtr pptInit; /* pointer to list of start points */ -int *pwidthInit; /* pointer to list of n widths */ -int fSorted; +cfbUnnaturalStippleFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ @@ -224,14 +209,14 @@ DDXPointPtr pptFree; CfbBits *pdstBase; /* pointer to start of bitmap */ int nlwDst; /* width in longwords of bitmap */ - register CfbBits *pdst; /* pointer to current word in bitmap */ + CfbBits *pdst; /* pointer to current word in bitmap */ PixmapPtr pStipple; /* pointer to stipple we want to fill with */ int nlw; int x, y, w, xrem, xSrc, ySrc; int stwidth, stippleWidth; int stippleHeight; - register CfbBits bits, inputBits; - register int partBitsLeft; + CfbBits bits, inputBits; + int partBitsLeft; int nextPartBits; int bitsLeft, bitsWhole; CfbBits *srcTemp, *srcStart; @@ -398,24 +383,19 @@ /* Fill spans with stipples that aren't 32 bits wide */ void -cfbUnnaturalStippleFS(pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) -DrawablePtr pDrawable; -GC *pGC; -int nInit; /* number of spans to fill */ -DDXPointPtr pptInit; /* pointer to list of start points */ -int *pwidthInit; /* pointer to list of n widths */ -int fSorted; +cfbUnnaturalStippleFS(DrawablePtr pDrawable, GC *pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ - register DDXPointPtr ppt; /* pointer to list of start points */ - register int *pwidth; /* pointer to list of n widths */ + DDXPointPtr ppt; /* pointer to list of start points */ + int *pwidth; /* pointer to list of n widths */ int iline; /* first line of tile to use */ CfbBits *addrlBase; /* pointer to start of bitmap */ int nlwidth; /* width in longwords of bitmap */ - register CfbBits *pdst; /* pointer to current word in bitmap */ + CfbBits *pdst; /* pointer to current word in bitmap */ PixmapPtr pStipple; /* pointer to stipple we want to fill with */ - register int w; + int w; int width, x, xrem, xSrc, ySrc; CfbBits tmpSrc, tmpDst1, tmpDst2; int stwidth, stippleWidth; @@ -513,8 +493,8 @@ #if PSZ != 32 || PPW != 1 int tmpx; #endif - register CfbBits *ptemp; - register CfbBits *pdsttmp; + CfbBits *ptemp; + CfbBits *pdsttmp; /* * Do a stripe through the stipple & destination w pixels * wide. w is not more than: @@ -606,13 +586,8 @@ #if PSZ == 8 void -cfb8Stipple32FS (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +cfb8Stipple32FS(DrawablePtr pDrawable, GCPtr pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { /* next three parameters are post-clip */ int n; /* number of spans to fill */ @@ -626,15 +601,15 @@ int x,y,w; /* current span */ CfbBits startmask; CfbBits endmask; - register CfbBits *dst; /* pointer to bits we're writing */ - register int nlw; + CfbBits *dst; /* pointer to bits we're writing */ + int nlw; CfbBits *dstTmp; int nlwTmp; CfbBits *pbits; /* pointer to start of pixmap */ - register CfbBits xor; - register CfbBits mask; - register CfbBits bits; /* bits from stipple */ + CfbBits xor; + CfbBits mask; + CfbBits bits; /* bits from stipple */ int wEnd; int *pwidthFree; /* copies of the pointers to free */ @@ -819,34 +794,29 @@ } void -cfb8OpaqueStipple32FS (pDrawable, pGC, nInit, pptInit, pwidthInit, fSorted) - DrawablePtr pDrawable; - GCPtr pGC; - int nInit; /* number of spans to fill */ - DDXPointPtr pptInit; /* pointer to list of start points */ - int *pwidthInit; /* pointer to list of n widths */ - int fSorted; +cfb8OpaqueStipple32FS(DrawablePtr pDrawable, GCPtr pGC, int nInit, + DDXPointPtr pptInit, int *pwidthInit, int fSorted) { - /* next three parameters are post-clip */ + /* next three parameters are post-clip */ int n; /* number of spans to fill */ DDXPointPtr ppt; /* pointer to list of start points */ int *pwidth; /* pointer to list of n widths */ - CfbBits *src; /* pointer to bits in stipple, if needed */ + CfbBits *src; /* pointer to bits in stipple, if needed */ int stippleHeight; /* height of the stipple */ PixmapPtr stipple; int nlwDst; /* width in longwords of the dest pixmap */ int x,y,w; /* current span */ - CfbBits startmask; - CfbBits endmask; - register CfbBits *dst; /* pointer to bits we're writing */ - register int nlw; - CfbBits *dstTmp; + CfbBits startmask; + CfbBits endmask; + CfbBits *dst; /* pointer to bits we're writing */ + int nlw; + CfbBits *dstTmp; int nlwTmp; - CfbBits *pbits; /* pointer to start of pixmap */ - register CfbBits xor; - register CfbBits bits; /* bits from stipple */ + CfbBits *pbits; /* pointer to start of pixmap */ + CfbBits xor; + CfbBits bits; /* bits from stipple */ int wEnd; int *pwidthFree; /* copies of the pointers to free */ Index: xc/programs/Xserver/cfb/cfbgc.c diff -u xc/programs/Xserver/cfb/cfbgc.c:1.6 xc/programs/Xserver/cfb/cfbgc.c:1.8 --- xc/programs/Xserver/cfb/cfbgc.c:1.6 Fri Dec 14 14:59:22 2001 +++ xc/programs/Xserver/cfb/cfbgc.c Fri Oct 14 11:16:18 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.6 2001/12/14 19:59:22 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbgc.c,v 1.8 2005/10/14 15:16:18 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -46,13 +46,11 @@ ******************************************************************/ -/* $Xorg: cfbgc.c,v 1.4 2001/02/09 02:04:37 xorgcvs Exp $ */ - -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "cfb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -230,9 +228,7 @@ }; GCOps * -cfbMatchCommon (pGC, devPriv) - GCPtr pGC; - cfbPrivGCPtr devPriv; +cfbMatchCommon(GCPtr pGC, cfbPrivGCPtr devPriv) { if (pGC->lineWidth != 0) return 0; @@ -274,8 +270,7 @@ } Bool -cfbCreateGC(pGC) - register GCPtr pGC; +cfbCreateGC(GCPtr pGC) { cfbPrivGC *pPriv; @@ -317,10 +312,7 @@ */ void -cfbValidateGC(pGC, changes, pDrawable) - register GCPtr pGC; - unsigned long changes; - DrawablePtr pDrawable; +cfbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { int mask; /* stateChanges */ int index; /* used for stepping through bitfields */ Index: xc/programs/Xserver/cfb/cfbgetsp.c diff -u xc/programs/Xserver/cfb/cfbgetsp.c:3.10 xc/programs/Xserver/cfb/cfbgetsp.c:3.12 --- xc/programs/Xserver/cfb/cfbgetsp.c:3.10 Wed Oct 29 17:44:53 2003 +++ xc/programs/Xserver/cfb/cfbgetsp.c Fri Oct 14 11:16:19 2005 @@ -1,4 +1,4 @@ -/* $Xorg: cfbgetsp.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.12 2005/10/14 15:16:19 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,10 +45,9 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbgetsp.c,v 3.10 2003/10/29 22:44:53 tsi Exp $ */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "misc.h" @@ -66,31 +65,35 @@ * Each scanline returned will be server scanline padded, i.e., it will come * out to an integral number of words. */ +/* + DrawablePtr pDrawable; drawable from which to get bits + int wMax; largest value of all *pwidths + DDXPointPtr ppt; points to start copying from + int *pwidth; list of number of bits to copy + int nspans; number of scanlines to copy + char *pchardstStart; where to put the bits +*/ + void -cfbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pchardstStart) - DrawablePtr pDrawable; /* drawable from which to get bits */ - int wMax; /* largest value of all *pwidths */ - register DDXPointPtr ppt; /* points to start copying from */ - int *pwidth; /* list of number of bits to copy */ - int nspans; /* number of scanlines to copy */ - char *pchardstStart; /* where to put the bits */ +cfbGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, + int *pwidth, int nspans, char *pchardstStart) { - PixelGroup *pdstStart = (PixelGroup *)pchardstStart; - register PixelGroup *pdst; /* where to put the bits */ - register PixelGroup *psrc; /* where to get the bits */ - register PixelGroup tmpSrc; /* scratch buffer for bits */ + PixelGroup *pdstStart = (PixelGroup *)pchardstStart; + PixelGroup *pdst; /* where to put the bits */ + PixelGroup *psrc; /* where to get the bits */ + PixelGroup tmpSrc; /* scratch buffer for bits */ PixelGroup *psrcBase; /* start of src bitmap */ int widthSrc; /* width of pixmap in bytes */ - register DDXPointPtr pptLast; /* one past last point to get */ + DDXPointPtr pptLast; /* one past last point to get */ int xEnd; /* last pixel to copy from */ int nl, srcBit; int w; PixelGroup *pdstNext; #if PSZ == 24 - register char *psrcb, *pdstb; - register int xIndex = 0; + char *psrcb, *pdstb; + int xIndex = 0; #else - register int nstart; + int nstart; #if PSZ != 32 || PPW != 1 int nend; #endif Index: xc/programs/Xserver/cfb/cfbglblt8.c diff -u xc/programs/Xserver/cfb/cfbglblt8.c:3.8 xc/programs/Xserver/cfb/cfbglblt8.c:3.11 --- xc/programs/Xserver/cfb/cfbglblt8.c:3.8 Wed Aug 6 10:04:02 2003 +++ xc/programs/Xserver/cfb/cfbglblt8.c Fri Feb 17 22:31:36 2006 @@ -1,4 +1,4 @@ -/* $Xorg: cfbglblt8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.11 2006/02/18 03:31:36 dawes Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -23,18 +23,17 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbglblt8.c,v 3.8 2003/08/06 14:04:02 eich Exp $ */ /* * Poly glyph blt. Accepts an arbitrary font <= 32 bits wide, in Copy mode * only. */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "cfb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -117,27 +116,24 @@ * They are only provided on some architecures. */ #ifdef USE_STIPPLE_CODE -extern void cfbStippleStack (), cfbStippleStackTE (); +extern void cfbStippleStack(CfbBits *, glyphPointer, CfbBits, int, int, int); +extern void cfbStippleStackTE(CfbBits *, glyphPointer, CfbBits, int, int, int); +typedef void (*stippleProcPtr)(CfbBits *, glyphPointer, CfbBits, int, int, int); #endif void -cfbPolyGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; /* array of character info */ - pointer pglyphBase; /* start of array of glyphs */ +cfbPolyGlyphBlt8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { #ifndef GLYPHROP - register CfbBits pixel; + CfbBits pixel; #endif #if !defined(STIPPLE) && !defined(USE_STIPPLE_CODE) - register CfbBits c; - register CfbBits *dst; + CfbBits c; + CfbBits *dst; #endif - register glyphPointer glyphBits; - register int xoff; + glyphPointer glyphBits; + int xoff; FontPtr pfont = pGC->font; CharInfoPtr pci; @@ -157,7 +153,7 @@ #endif #ifndef STIPPLE #ifdef USE_STIPPLE_CODE - void (*stipple)(); + stippleProcPtr stipple; stipple = cfbStippleStack; if (FONTCONSTMETRICS(pfont)) @@ -274,25 +270,20 @@ } static void -cfbPolyGlyphBlt8Clipped( - DrawablePtr pDrawable, - GCPtr pGC, - int x, - int y, - unsigned int nglyph, - CharInfoPtr *ppci, /* array of character info */ - unsigned char *pglyphBase) /* start of array of glyphs */ +cfbPolyGlyphBlt8Clipped(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, + unsigned char *pglyphBase) { #ifndef GLYPHROP - register CfbBits pixel; + CfbBits pixel; #endif #if !defined(STIPPLE) && !defined(USE_STIPPLE_CODE) - register CfbBits c; + CfbBits c; #endif - register glyphPointer glyphBits; - register int xoff; + glyphPointer glyphBits; + int xoff; #if defined(USE_LEFTBITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE)) - register CfbBits *dst; + CfbBits *dst; #endif CharInfoPtr pci; Index: xc/programs/Xserver/cfb/cfbhrzvert.c diff -u xc/programs/Xserver/cfb/cfbhrzvert.c:3.8 xc/programs/Xserver/cfb/cfbhrzvert.c:3.10 --- xc/programs/Xserver/cfb/cfbhrzvert.c:3.8 Mon Sep 16 14:05:30 2002 +++ xc/programs/Xserver/cfb/cfbhrzvert.c Fri Oct 14 11:16:19 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.8 2002/09/16 18:05:30 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbhrzvert.c,v 3.10 2005/10/14 15:16:19 tsi Exp $ */ /*********************************************************** Copyright 1987,1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cfbhrzvert.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" + +#include #include "gc.h" #include "window.h" @@ -60,17 +60,10 @@ abs(len) > 1 */ void -cfbHorzS(rop, and, xor, addrl, nlwidth, x1, y1, len) -register int rop; -register CfbBits and; -register CfbBits xor; -register CfbBits *addrl; /* pointer to base of bitmap */ -int nlwidth; /* width in longwords of bitmap */ -int x1; /* initial point */ -int y1; -int len; /* length of line */ +cfbHorzS(int rop, CfbBits and, CfbBits xor, CfbBits *addrl, int nlwidth, + int x1, int y1, int len) { - register int nlmiddle; + int nlmiddle; #if PSZ == 24 @@ -307,8 +300,8 @@ } } #else - register CfbBits startmask; - register CfbBits endmask; + CfbBits startmask; + CfbBits endmask; addrl = addrl + (y1 * nlwidth) + (x1 >> PWSH); @@ -363,20 +356,15 @@ /* vertical solid line */ void -cfbVertS(rop, and, xor, addrl, nlwidth, x1, y1, len) -int rop; -register CfbBits and, xor; -register CfbBits *addrl; /* pointer to base of bitmap */ -register int nlwidth; /* width in longwords of bitmap */ -int x1, y1; /* initial point */ -register int len; /* length of line */ +cfbVertS(int rop, CfbBits and, CfbBits xor, CfbBits *addrl, int nlwidth, + int x1, int y1, int len) { #if PSZ == 24 int xIdx; CfbBits and2 = 0, xor2 = 0, mask = 0, mask2; #endif #ifdef PIXEL_ADDR - register PixelType *bits = (PixelType *) addrl; + PixelType *bits = (PixelType *) addrl; #if PSZ == 24 nlwidth <<= PWSH; Index: xc/programs/Xserver/cfb/cfbigblt8.c diff -u xc/programs/Xserver/cfb/cfbigblt8.c:1.6 xc/programs/Xserver/cfb/cfbigblt8.c:1.8 --- xc/programs/Xserver/cfb/cfbigblt8.c:1.6 Fri Dec 14 14:59:23 2001 +++ xc/programs/Xserver/cfb/cfbigblt8.c Fri Oct 14 11:16:19 2005 @@ -1,5 +1,5 @@ +/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.8 2005/10/14 15:16:19 tsi Exp $ */ /* - * $Xorg: cfbigblt8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -26,14 +26,13 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbigblt8.c,v 1.6 2001/12/14 19:59:23 dawes Exp $ */ -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "mi.h" #include "cfb.h" -#include "fontstruct.h" +#include #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -44,13 +43,8 @@ #include "cfb8bit.h" void -cfbImageGlyphBlt8 (pDrawable, pGC, x, y, nglyph, ppci, pglyphBase) - DrawablePtr pDrawable; - GCPtr pGC; - int x, y; - unsigned int nglyph; - CharInfoPtr *ppci; - pointer pglyphBase; +cfbImageGlyphBlt8(DrawablePtr pDrawable, GCPtr pGC, int x, int y, + unsigned int nglyph, CharInfoPtr *ppci, pointer pglyphBase) { ExtentInfoRec info; /* used by QueryGlyphExtents() */ xRectangle backrect; Index: xc/programs/Xserver/cfb/cfbimage.c diff -u xc/programs/Xserver/cfb/cfbimage.c:1.13 xc/programs/Xserver/cfb/cfbimage.c:1.15 --- xc/programs/Xserver/cfb/cfbimage.c:1.13 Fri Dec 14 14:59:23 2001 +++ xc/programs/Xserver/cfb/cfbimage.c Fri Oct 14 11:16:19 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.13 2001/12/14 19:59:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbimage.c,v 1.15 2005/10/14 15:16:19 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,9 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cfbimage.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "pixmapstr.h" #include "scrnintstr.h" @@ -58,13 +57,8 @@ #include "mi.h" void -cfbPutImage(pDraw, pGC, depth, x, y, w, h, leftPad, format, pImage) - DrawablePtr pDraw; - GCPtr pGC; - int depth, x, y, w, h; - int leftPad; - int format; - char *pImage; +cfbPutImage(DrawablePtr pDraw, GCPtr pGC, int depth, int x, int y, + int w, int h, int leftPad, int format, char *pImage) { PixmapPtr pPixmap; @@ -126,12 +120,8 @@ } void -cfbGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine) - DrawablePtr pDrawable; - int sx, sy, w, h; - unsigned int format; - unsigned long planeMask; - char *pdstLine; +cfbGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h, + unsigned int format, unsigned long planeMask, char *pdstLine) { BoxRec box; DDXPointRec ptSrc; Index: xc/programs/Xserver/cfb/cfbline.c diff -u xc/programs/Xserver/cfb/cfbline.c:3.6 xc/programs/Xserver/cfb/cfbline.c:3.8 --- xc/programs/Xserver/cfb/cfbline.c:3.6 Fri Dec 14 14:59:23 2001 +++ xc/programs/Xserver/cfb/cfbline.c Fri Oct 14 11:16:19 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.6 2001/12/14 19:59:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbline.c,v 3.8 2005/10/14 15:16:19 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,8 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: cfbline.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ -#include "X.h" + +#include #include "gcstruct.h" #include "windowstr.h" @@ -90,26 +90,18 @@ void #ifdef POLYSEGMENT -cfbSegmentSS (pDrawable, pGC, nseg, pSeg) - DrawablePtr pDrawable; - GCPtr pGC; - int nseg; - register xSegment *pSeg; -#else -cfbLineSS (pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +cfbSegmentSS(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) +#else +cfbLineSS(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) #endif { int nboxInit; - register int nbox; + int nbox; BoxPtr pboxInit; - register BoxPtr pbox; + BoxPtr pbox; #ifndef POLYSEGMENT - register DDXPointPtr ppt; /* pointer to list of translated points */ + DDXPointPtr ppt; /* pointer to list of translated points */ #endif unsigned int oc1; /* outcode of point 1 */ @@ -131,8 +123,8 @@ /* a bunch of temporaries */ int tmp; - register int y1, y2; - register int x1, x2; + int y1, y2; + int x1, x2; RegionPtr cclip; cfbPrivGCPtr devPriv; CfbBits xor, and; @@ -188,7 +180,7 @@ */ if (y1 > y2) { - register int tmp; + int tmp; tmp = y2; y2 = y1 + 1; @@ -242,7 +234,7 @@ */ if (x1 > x2) { - register int tmp; + int tmp; tmp = x2; x2 = x1 + 1; @@ -457,30 +449,22 @@ void #ifdef POLYSEGMENT -cfbSegmentSD (pDrawable, pGC, nseg, pSeg) - DrawablePtr pDrawable; - register GCPtr pGC; - int nseg; - register xSegment *pSeg; -#else -cfbLineSD( pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - register GCPtr pGC; - int mode; /* Origin or Previous */ - int npt; /* number of points */ - DDXPointPtr pptInit; +cfbSegmentSD(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg) +#else +cfbLineSD(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + DDXPointPtr pptInit) #endif { int nboxInit; - register int nbox; + int nbox; BoxPtr pboxInit; - register BoxPtr pbox; + BoxPtr pbox; #ifndef POLYSEGMENT - register DDXPointPtr ppt; /* pointer to list of translated points */ + DDXPointPtr ppt; /* pointer to list of translated points */ #endif - register unsigned int oc1; /* outcode of point 1 */ - register unsigned int oc2; /* outcode of point 2 */ + unsigned int oc1; /* outcode of point 1 */ + unsigned int oc2; /* outcode of point 2 */ CfbBits *addrl; /* address of destination pixmap */ int nlwidth; /* width in longwords of destination pixmap */ Index: xc/programs/Xserver/cfb/cfbmap.h diff -u xc/programs/Xserver/cfb/cfbmap.h:3.12 xc/programs/Xserver/cfb/cfbmap.h:3.13 --- xc/programs/Xserver/cfb/cfbmap.h:3.12 Sat Jul 19 09:22:27 2003 +++ xc/programs/Xserver/cfb/cfbmap.h Mon Jan 9 09:59:45 2006 @@ -1,5 +1,4 @@ /* - * $Xorg: cfbmap.h,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1991, 1998 The Open Group @@ -26,7 +25,7 @@ * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.12 2003/07/19 13:22:27 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmap.h,v 3.13 2006/01/09 14:59:45 dawes Exp $ */ /* * Map names around so that multiple depths can be supported simultaneously Index: xc/programs/Xserver/cfb/cfbmodule.c diff -u xc/programs/Xserver/cfb/cfbmodule.c:1.9 xc/programs/Xserver/cfb/cfbmodule.c:1.10 --- xc/programs/Xserver/cfb/cfbmodule.c:1.9 Fri Feb 13 18:58:30 2004 +++ xc/programs/Xserver/cfb/cfbmodule.c Thu Mar 16 11:49:51 2006 @@ -1,6 +1,6 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmodule.c,v 1.9 2004/02/13 23:58:30 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmodule.c,v 1.10 2006/03/16 16:49:51 dawes Exp $ */ /* - * Copyright (C) 1998 The XFree86 Project, Inc. + * Copyright (C) 1998-2006 The XFree86 Project, Inc. * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -70,7 +70,7 @@ XF86ModuleData cfbModuleData = { &VersRec, cfbSetup, NULL }; static pointer -cfbSetup(pointer module, pointer opts, int *errmaj, int *errmin) +cfbSetup(ModuleDescPtr module, pointer opts, int *errmaj, int *errmin) { /* This modules requires mfb, so load it */ return LoadSubModule(module, "mfb", NULL, NULL, NULL, NULL, Index: xc/programs/Xserver/cfb/cfbmskbits.c diff -u xc/programs/Xserver/cfb/cfbmskbits.c:3.2 xc/programs/Xserver/cfb/cfbmskbits.c:3.3 --- xc/programs/Xserver/cfb/cfbmskbits.c:3.2 Wed Jan 17 17:36:35 2001 +++ xc/programs/Xserver/cfb/cfbmskbits.c Fri Oct 14 11:16:19 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.2 2001/01/17 22:36:35 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.c,v 3.3 2005/10/14 15:16:19 tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -28,8 +28,6 @@ ********************************************************/ -/* $Xorg: cfbmskbits.c,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ - /* * ========================================================================== * Converted to Color Frame Buffer by smarks@sun, April-May 1987. The "bit @@ -48,8 +46,8 @@ see also cfbmskbits.h */ -#include -#include +#include +#include #include #include "cfb.h" #include "cfbmskbits.h" Index: xc/programs/Xserver/cfb/cfbmskbits.h diff -u xc/programs/Xserver/cfb/cfbmskbits.h:3.14 xc/programs/Xserver/cfb/cfbmskbits.h:3.16 --- xc/programs/Xserver/cfb/cfbmskbits.h:3.14 Wed Oct 29 17:44:53 2003 +++ xc/programs/Xserver/cfb/cfbmskbits.h Fri Oct 14 11:16:19 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.14 2003/10/29 22:44:53 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbmskbits.h,v 3.16 2005/10/14 15:16:19 tsi Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -28,11 +28,10 @@ ********************************************************/ -/* $Xorg: cfbmskbits.h,v 1.3 2000/08/17 19:48:14 cpqbld Exp $ */ /* Optimizations for PSZ == 32 added by Kyle Marvin (marvin@vitec.com) */ -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #if defined(XFREE86) || ( defined(__OpenBSD__) && defined(__alpha__) ) \ || (defined(__bsdi__)) @@ -432,7 +431,7 @@ } #define getbits24(psrc, dst, index) {\ - register int idx; \ + int idx; \ switch(idx = ((index)&3)<<1){ \ case 0: \ dst = (*(psrc) &cfbmask[idx]); \ @@ -447,8 +446,8 @@ } #define putbits24(src, w, pdst, planemask, index) {\ - register PixelGroup dstpixel; \ - register unsigned int idx; \ + PixelGroup dstpixel; \ + unsigned int idx; \ switch(idx = ((index)&3)<<1){ \ case 0: \ dstpixel = (*(pdst) &cfbmask[idx]); \ @@ -481,8 +480,8 @@ #define putbitsrop24(src, x, pdst, planemask, rop) \ { \ - register PixelGroup t1, dstpixel; \ - register unsigned int idx; \ + PixelGroup t1, dstpixel; \ + unsigned int idx; \ switch(idx = (x)<<1){ \ case 0: \ dstpixel = (*(pdst) &cfbmask[idx]); \ @@ -842,8 +841,8 @@ { \ PixelGroup q; \ CfbBits src; \ - register unsigned int sidx; \ - register unsigned int didx; \ + unsigned int sidx; \ + unsigned int didx; \ sidx = ((srcindex) & 3)<<1; \ didx = ((dstindex) & 3)<<1; \ q = *(psrcstip) >> (xt); \ Index: xc/programs/Xserver/cfb/cfbpixmap.c diff -u xc/programs/Xserver/cfb/cfbpixmap.c:1.5 xc/programs/Xserver/cfb/cfbpixmap.c:1.8 --- xc/programs/Xserver/cfb/cfbpixmap.c:1.5 Fri Dec 14 14:59:23 2001 +++ xc/programs/Xserver/cfb/cfbpixmap.c Fri Oct 14 11:16:19 2005 @@ -1,4 +1,4 @@ -/* $Xorg: cfbpixmap.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.8 2005/10/14 15:16:19 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,14 +45,13 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpixmap.c,v 1.5 2001/12/14 19:59:23 dawes Exp $ */ /* pixmap management written by drewry, september 1986 on a monchrome device, a pixmap is a bitmap. */ -#include "Xmd.h" +#include #include "servermd.h" #include "scrnintstr.h" #include "pixmapstr.h" @@ -63,16 +62,15 @@ extern CfbBits endtab[]; PixmapPtr -cfbCreatePixmap (pScreen, width, height, depth) - ScreenPtr pScreen; - int width; - int height; - int depth; +cfbCreatePixmap(ScreenPtr pScreen, int width, int height, int depth) { PixmapPtr pPixmap; int datasize; int paddedWidth; + if ((width > MAXSHORT) || (height > MAXSHORT)) + return NullPixmap; + paddedWidth = PixmapBytePad(width, depth); datasize = height * paddedWidth; pPixmap = AllocatePixmap(pScreen, datasize); @@ -101,8 +99,7 @@ } Bool -cfbDestroyPixmap(pPixmap) - PixmapPtr pPixmap; +cfbDestroyPixmap(PixmapPtr pPixmap) { if(--pPixmap->refcnt) return TRUE; @@ -111,10 +108,9 @@ } PixmapPtr -cfbCopyPixmap(pSrc) - register PixmapPtr pSrc; +cfbCopyPixmap(PixmapPtr pSrc) { - register PixmapPtr pDst; + PixmapPtr pDst; int size; ScreenPtr pScreen; @@ -142,15 +138,14 @@ left shift and or in original as many times as needed */ void -cfbPadPixmap(pPixmap) - PixmapPtr pPixmap; +cfbPadPixmap(PixmapPtr pPixmap) { - register int width = (pPixmap->drawable.width) * (pPixmap->drawable.bitsPerPixel); - register int h; - register CfbBits mask; - register CfbBits *p; - register CfbBits bits; /* real pattern bits */ - register int i; + int width = (pPixmap->drawable.width) * (pPixmap->drawable.bitsPerPixel); + int h; + CfbBits mask; + CfbBits *p; + CfbBits bits; /* real pattern bits */ + int i; int rep; /* repeat count for pattern */ if (width >= PGSZ) @@ -186,8 +181,8 @@ /* * cfb debugging routine -- assumes pixmap is 1 byte deep */ -static cfbdumppixmap(pPix) - PixmapPtr pPix; +static void +cfbdumppixmap(PixmapPtr pPix) { unsigned int *pw; char *psrc, *pdst; @@ -227,12 +222,10 @@ * left. */ void -cfbXRotatePixmap(pPix, rw) - PixmapPtr pPix; - register int rw; +cfbXRotatePixmap(PixmapPtr pPix, int rw) { - register CfbBits *pw, *pwFinal; - register CfbBits t; + CfbBits *pw, *pwFinal; + CfbBits t; int rot; if (pPix == NullPixmap) @@ -264,7 +257,7 @@ { ErrorF("cfb internal error: trying to rotate odd-sized pixmap.\n"); #ifdef notdef - register CfbBits *pwTmp; + CfbBits *pwTmp; int size, tsize; tsize = PixmapBytePad(pPix->drawable.width - rot, pPix->drawable.depth); @@ -296,9 +289,7 @@ works on any width. */ void -cfbYRotatePixmap(pPix, rh) - register PixmapPtr pPix; - int rh; +cfbYRotatePixmap(PixmapPtr pPix, int rh) { int nbyDown; /* bytes to move down to row 0; also offset of row rh */ @@ -336,11 +327,9 @@ } void -cfbCopyRotatePixmap(psrcPix, ppdstPix, xrot, yrot) - register PixmapPtr psrcPix, *ppdstPix; - int xrot, yrot; +cfbCopyRotatePixmap(PixmapPtr psrcPix, PixmapPtr *ppdstPix, int xrot, int yrot) { - register PixmapPtr pdstPix; + PixmapPtr pdstPix; if ((pdstPix = *ppdstPix) && (pdstPix->devKind == psrcPix->devKind) && Index: xc/programs/Xserver/cfb/cfbply1rct.c diff -u xc/programs/Xserver/cfb/cfbply1rct.c:3.11 xc/programs/Xserver/cfb/cfbply1rct.c:3.13 --- xc/programs/Xserver/cfb/cfbply1rct.c:3.11 Thu Oct 30 09:53:39 2003 +++ xc/programs/Xserver/cfb/cfbply1rct.c Fri Oct 14 11:16:19 2005 @@ -1,5 +1,5 @@ +/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.13 2005/10/14 15:16:19 tsi Exp $ */ /* - * $Xorg: cfbply1rct.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ * Copyright 1990, 1998 The Open Group @@ -25,9 +25,8 @@ * * Author: Keith Packard, MIT X Consortium */ -/* $XFree86: xc/programs/Xserver/cfb/cfbply1rct.c,v 3.11 2003/10/30 14:53:39 tsi Exp $ */ -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" @@ -41,20 +40,15 @@ #include "cfbrrop.h" void -RROP_NAME(cfbFillPoly1Rect) (pDrawable, pGC, shape, mode, count, ptsIn) - DrawablePtr pDrawable; - GCPtr pGC; - int shape; - int mode; - int count; - DDXPointPtr ptsIn; +RROP_NAME(cfbFillPoly1Rect)(DrawablePtr pDrawable, GCPtr pGC, int shape, + int mode, int count, DDXPointPtr ptsIn) { cfbPrivGCPtr devPriv; int nwidth; CfbBits *addrl, *addr; #if PSZ == 24 CfbBits startmask, endmask; - register int pidx; + int pidx; #else #if PPW > 1 CfbBits mask, bits = ~((CfbBits)0); @@ -62,7 +56,7 @@ #endif int maxy; int origin; - register int vertex1, vertex2; + int vertex1, vertex2; int c = 0; BoxPtr extents; int clip; Index: xc/programs/Xserver/cfb/cfbpntwin.c diff -u xc/programs/Xserver/cfb/cfbpntwin.c:3.8 xc/programs/Xserver/cfb/cfbpntwin.c:3.11 --- xc/programs/Xserver/cfb/cfbpntwin.c:3.8 Wed Oct 29 17:44:53 2003 +++ xc/programs/Xserver/cfb/cfbpntwin.c Sun Feb 19 10:51:18 2006 @@ -1,4 +1,4 @@ -/* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.11 2006/02/19 15:51:18 tsi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -45,9 +45,8 @@ SOFTWARE. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/cfb/cfbpntwin.c,v 3.8 2003/10/29 22:44:53 tsi Exp $ */ -#include "X.h" +#include #include "windowstr.h" #include "regionstr.h" @@ -58,18 +57,10 @@ #include "cfbmskbits.h" #include "mi.h" -#ifdef PANORAMIX -#include "panoramiX.h" -#include "panoramiXsrv.h" -#endif - void -cfbPaintWindow(pWin, pRegion, what) - WindowPtr pWin; - RegionPtr pRegion; - int what; +cfbPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what) { - register cfbPrivWin *pPrivWin; + cfbPrivWin *pPrivWin; WindowPtr pBgWin; pPrivWin = cfbGetWindowPrivate(pWin); @@ -97,22 +88,11 @@ } else { - int xorg = pWin->drawable.x; - int yorg = pWin->drawable.y; -#ifdef PANORAMIX - if(!noPanoramiXExtension) { - int index = pWin->drawable.pScreen->myNum; - if(WindowTable[index] == pWin) { - xorg -= panoramiXdataPtr[index].x; - yorg -= panoramiXdataPtr[index].y; - } - } -#endif cfbFillBoxTileOdd ((DrawablePtr)pWin, (int)REGION_NUM_RECTS(pRegion), REGION_RECTS(pRegion), pWin->background.pixmap, - xorg, yorg); + pWin->drawable.x, pWin->drawable.y); } break; case BackgroundPixel: @@ -140,30 +120,15 @@ } else { - int xorg, yorg; - for (pBgWin = pWin; pBgWin->backgroundState == ParentRelative; pBgWin = pBgWin->parent); - xorg = pBgWin->drawable.x; - yorg = pBgWin->drawable.y; - -#ifdef PANORAMIX - if(!noPanoramiXExtension) { - int index = pWin->drawable.pScreen->myNum; - if(WindowTable[index] == pBgWin) { - xorg -= panoramiXdataPtr[index].x; - yorg -= panoramiXdataPtr[index].y; - } - } -#endif - cfbFillBoxTileOdd ((DrawablePtr)pWin, (int)REGION_NUM_RECTS(pRegion), REGION_RECTS(pRegion), pWin->border.pixmap, - xorg, yorg); + pBgWin->drawable.x, pBgWin->drawable.y); } break; } @@ -217,16 +182,13 @@ #endif void -cfbFillBoxSolid (pDrawable, nBox, pBox, pixel) - DrawablePtr pDrawable; - int nBox; - BoxPtr pBox; - unsigned long pixel; +cfbFillBoxSolid(DrawablePtr pDrawable, int nBox, BoxPtr pBox, + unsigned long pixel) { CfbBits *pdstBase; int widthDst; - register int h; - register CfbBits *pdst; + int h; + CfbBits *pdst; int nmiddle; int w; #if PSZ == 24 @@ -237,9 +199,9 @@ piQxelArray[1] = ((pixel&0xFFFF00)>>8) | ((pixel&0xFFFF)<<16); piQxelArray[2] = ((pixel&0xFFFFFF)<<8) | ((pixel&0xFF0000)>>16); #else - register CfbBits rrop_xor; - register CfbBits leftMask, rightMask; - register int m; + CfbBits rrop_xor; + CfbBits leftMask, rightMask; + int m; #endif cfbGetLongWidthAndPointer(pDrawable, widthDst, pdstBase); @@ -255,7 +217,7 @@ #if PSZ == 8 if (w == 1) { - register char *pdstb = ((char *) pdst) + pBox->x1; + char *pdstb = ((char *) pdst) + pBox->x1; int incr = widthDst * PGSZB; while (h--) @@ -480,13 +442,9 @@ } void -cfbFillBoxTile32 (pDrawable, nBox, pBox, tile) - DrawablePtr pDrawable; - int nBox; /* number of boxes to fill */ - BoxPtr pBox; /* pointer to list of boxes to fill */ - PixmapPtr tile; /* rotated, expanded tile */ +cfbFillBoxTile32(DrawablePtr pDrawable, int nBox, BoxPtr pBox, PixmapPtr tile) { - register CfbBits *pdst; + CfbBits *pdst; CfbBits *psrc; int tileHeight; @@ -502,10 +460,10 @@ int leftIndex, rightIndex; CfbBits piQxelArray[3], *pdstULC; #else - register CfbBits rrop_xor; - register CfbBits leftMask; - register CfbBits rightMask; - register int m; + CfbBits rrop_xor; + CfbBits leftMask; + CfbBits rightMask; + int m; #endif tileHeight = tile->drawable.height; Index: xc/programs/Xserver/cfb/cfbpolypnt.c diff -u xc/programs/Xserver/cfb/cfbpolypnt.c:3.6 xc/programs/Xserver/cfb/cfbpolypnt.c:3.8 --- xc/programs/Xserver/cfb/cfbpolypnt.c:3.6 Fri Dec 14 14:59:24 2001 +++ xc/programs/Xserver/cfb/cfbpolypnt.c Fri Oct 14 11:16:19 2005 @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpolypnt.c,v 3.8 2005/10/14 15:16:19 tsi Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -25,9 +25,7 @@ ********************************************************/ -/* $Xorg: cfbpolypnt.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ - -#include "X.h" +#include #include "gcstruct.h" #include "windowstr.h" #include "pixmapstr.h" @@ -64,39 +62,35 @@ #endif void -cfbPolyPoint(pDrawable, pGC, mode, npt, pptInit) - DrawablePtr pDrawable; - GCPtr pGC; - int mode; - int npt; - xPoint *pptInit; +cfbPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, + xPoint *pptInit) { - register INT32 pt; - register INT32 c1, c2; - register CARD32 ClipMask = 0x80008000; - register CfbBits xor; + INT32 pt; + INT32 c1, c2; + CARD32 ClipMask = 0x80008000; + CfbBits xor; #ifdef PIXEL_ADDR - register PixelType *addrp; - register int npwidth; + PixelType *addrp; + int npwidth; #if PSZ != 24 PixelType *addrpt; #endif #else - register CfbBits *addrl; - register int nlwidth; - register int xoffset; + CfbBits *addrl; + int nlwidth; + int xoffset; CfbBits *addrlt; #endif #if PSZ == 24 RROP_DECLARE - register int xtmp; - register PixelType *p; + int xtmp; + PixelType *p; #endif - register INT32 *ppt; + INT32 *ppt; RegionPtr cclip; int nbox; - register int i; - register BoxPtr pbox; + int i; + BoxPtr pbox; CfbBits and; int rop = pGC->alu; int off; @@ -146,7 +140,7 @@ #ifdef sun else if (npwidth == 1152) { - register int y; + int y; PointLoop(y = intToY(pt); *(addrp + (y << 10) + (y << 7) + intToX(pt)) = xor;) } #endif Index: xc/programs/Xserver/cfb/cfbpush8.c diff -u xc/programs/Xserver/cfb/cfbpush8.c:1.6 xc/programs/Xserver/cfb/cfbpush8.c:1.8 --- xc/programs/Xserver/cfb/cfbpush8.c:1.6 Fri Dec 14 14:59:24 2001 +++ xc/programs/Xserver/cfb/cfbpush8.c Fri Oct 14 11:16:19 2005 @@ -2,7 +2,7 @@ * Push Pixels for 8 bit displays. */ -/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbpush8.c,v 1.8 2005/10/14 15:16:19 tsi Exp $ */ /* @@ -28,13 +28,12 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $Xorg: cfbpush8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ #if PSZ == 8 -#include "X.h" -#include "Xmd.h" -#include "Xproto.h" +#include +#include +#include #include "gcstruct.h" #include "windowstr.h" #include "scrnintstr.h" @@ -47,15 +46,12 @@ #include "maskbits.h" void -cfbPushPixels8 (pGC, pBitmap, pDrawable, dx, dy, xOrg, yOrg) - GCPtr pGC; - PixmapPtr pBitmap; - DrawablePtr pDrawable; - int dx, dy, xOrg, yOrg; +cfbPushPixels8(GCPtr pGC, PixmapPtr pBitmap, DrawablePtr pDrawable, + int dx, int dy, int xOrg, int yOrg) { - register CfbBits *src, *dst; - register CfbBits pixel; - register CfbBits c, bits; + CfbBits *src, *dst; + CfbBits pixel; + CfbBits c, bits; CfbBits *pdstLine, *psrcLine; CfbBits *pdstBase; int srcWidth; Index: xc/programs/Xserver/cfb/cfbrctstp8.c diff -u xc/programs/Xserver/cfb/cfbrctstp8.c:3.6 xc/programs/Xserver/cfb/cfbrctstp8.c:3.8 --- xc/programs/Xserver/cfb/cfbrctstp8.c:3.6 Fri Dec 14 14:59:24 2001 +++ xc/programs/Xserver/cfb/cfbrctstp8.c Fri Oct 14 11:16:19 2005 @@ -1,7 +1,7 @@ /* * Fill 32 bit stippled rectangles for 8 bit frame buffers */ -/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.6 2001/12/14 19:59:24 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/cfb/cfbrctstp8.c,v 3.8 2005/10/14 15:16:19 tsi Exp $ */ /* Copyright 1989, 1998 The Open Group @@ -30,12 +30,10 @@ */ -/* $Xorg: cfbrctstp8.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */ - #if PSZ == 8 -#include "X.h" -#include "Xmd.h" +#include +#include #include "servermd.h" #include "gcstruct.h" #include "window.h" @@ -51,31 +49,28 @@ #include "maskbits.h" void -cfb8FillRectOpaqueStippled32 (pDrawable, pGC, nBox, pBox) - DrawablePtr pDrawable; - GCPtr pGC; - int nBox; /* number of boxes to fill */ - register BoxPtr pBox; /* pointer to list of boxes to fill */ +cfb8FillRectOpaqueStippled32(DrawablePtr pDrawable, GCPtr pGC, int nBox, + BoxPtr pBox) { CfbBits *src; int stippleHeight; int nlwDst; /* width in longwords of the dest pixmap */ int w; /* width of current box */ - register int h; /* height of current box */ + int h; /* height of current box */ CfbBits startmask; CfbBits endmask; /* masks for reggedy bits at either end of line */ int nlwMiddle; /* number of longwords between sides of boxes */ - register int nlw; /* loop version of nlwMiddle */ + int nlw; /* loop version of nlwMiddle */ CfbBits *dstLine; - register CfbBits *dst; /* pointer to bits we're writing */ + CfbBits *dst; /* pointer to bits we're writing */ CfbBits *dstTmp; int y; /* current scan line */ CfbBits *pbits;/* pointer to start of pixmap */ - register CfbBits bits; /* bits from stipple */ + CfbBits bits; /* bits from stipple */ int rot; - register CfbBits xor; + CfbBits xor; PixmapPtr stipple; int wEnd; @@ -240,26 +235,23 @@ } void -cfb8FillRectTransparentStippled32 (pDrawable, pGC, nBox, pBox) - DrawablePtr pDrawable; - GCPtr pGC; - int nBox; /* number of boxes to fill */ - BoxPtr pBox; /* pointer to list of boxes to fill */ +cfb8FillRectTransparentStippled32(DrawablePtr pDrawable, GCPtr pGC, int nBox, + BoxPtr pBox) { int x, y, w, h; int nlwMiddle, nlwDst; CfbBits startmask, endmask; - register CfbBits *dst; + CfbBits *dst; CfbBits *dstLine, *pbits, *dstTmp; CfbBits *src; - register CfbBits xor; - register CfbBits bits, mask; + CfbBits xor; + CfbBits bits, mask; int rot; int wEnd; cfbPrivGCPtr devPriv; PixmapPtr stipple; int stippleHeight; - register int nlw; + int nlw; devPriv = cfbGetGCPrivate(pGC); stipple = pGC->pRotatedPixmap; @@ -458,26 +450,23 @@ void -cfb8FillRectStippledUnnatural (pDrawable, pGC, nBox, pBox) - DrawablePtr pDrawable; - GCPtr pGC; - int nBox; - register BoxPtr pBox; +cfb8FillRectStippledUnnatural(DrawablePtr pDrawable, GCPtr pGC, int nBox, + BoxPtr pBox) { CfbBits *pdstBase; /* pointer to start of bitmap */ CfbBits *pdstLine; /* current destination line */ int nlwDst; /* width in longwords of bitmap */ PixmapPtr pStipple; /* pointer to stipple we want to fill with */ int nlwMiddle; - register int nlw; + int nlw; int x, y, w, h, xrem, xSrc, ySrc; int stwidth, stippleWidth; int stippleHeight; - register CfbBits bits, inputBits; - register int partBitsLeft; + CfbBits bits, inputBits; + int partBitsLeft; int nextPartBits; int bitsLeft, bitsWhole; - register CfbBits *pdst; /* pointer to current word in bitmap */ + CfbBits *pdst; /* pointer to current word in bitmap */ CfbBits *srcTemp, *srcStart; CfbBits *psrcBase; CfbBits startmask, endmask;