diff options
148 files changed, 505 insertions, 15062 deletions
@@ -1,56 +1,339 @@ -The software components were originally downloaded from http://www.nomachine.com/sources.php - -The software has been improved via various patches by the X2Go project. -The patches reside in the subfolder doc/applied-patches/ of this source tree. - -Copyright (c) 2015 Arctica Project, https://github.com/ArcticaProject/. -Copyright (c) 2011-2014 X2Go Project, http://www.x2go.org/. -Copyright (c) 2001-2011 NoMachine, http://www.nomachine.com/. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation; either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License along with - this program; if not, write to the Free Software Foundation, Inc., 51 - Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Parts of this software are derived from DXPC project. These copyright -notices apply to original DXPC code: - - 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. - - 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. - - Copyright (c) 1995,1996 Brian Pane - Copyright (c) 1996,1997 Zachary Vonler and Brian Pane - Copyright (c) 1999 Kevin Vigor and Brian Pane - Copyright (c) 2000,2001 Gian Filippo Pinzari and Brian Pane - -The files MD5.[ch] are copyright (C) 1999, 2000, 2002 Aladdin Enterprises. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. @@ -41,7 +41,7 @@ Release goals (phase 1) for nx-libs release series 3.6.0.x: * no bundled non-X11 libraries anymore (done) * no bundled Mesa library anymore (todo) * complete imake cleanup (work in progress) -* replace as many liNX_X* libraries by X.org's libX* libraries +* replace as many libNX_X* libraries by X.org's libX* libraries (work in progress) * support for iOS (nxproxy, complete) * Unix file socket communication for nxproxy -C <-> nxproxy -S connections diff --git a/debian/changelog b/debian/changelog index 0d56a4b96..17820e3d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -243,6 +243,37 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low Adds: - 0992_fix-DEBUG-TEST-DUMP-FLUSH-TOKEN-PING-et-al-builds.full+lite.patch + [ Vadim Troshchinskiy ] + * nxcomp: fix "negotiation in stage 10" error. + v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 0660_nxcomp_fix-negotiation-in-stage-10-error.full+lite.patch + + [ Emanuele Giaquinta ] + * nx-X11: Fix alpha premultiplication in XRenderParseColor. + Fixes: #893. + v2: backport to nx-libs 3.6.x (Mike Gabriel) + v3: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Adds: + - 0040_nx-X11_Fix-alpha-premultiplication-in-XRenderPa.full.patch + + [ Michael DePaulo ] + * {nx-X11,nxproxy}: correct manpages: --help -> -help + xorg-server does not follow the convention of using 2 dashes. + Note that --help does produce the help output. However, it + produces this additional output after it: + Error: Aborting session with 'Unrecognized option: --help'. + Session: Aborting session at 'Sun Jun 28 01:35:35 2015'. + Session: Session aborted at 'Sun Jun 28 01:35:35 2015'. + It also causes a return code of 1 rather than 0. + Therefore, we should instruct users to call -help instead. + + v2: backport to nx-libs 3.5.0.x (Mihai Moldovan) + Affects: + - 0009_nxagent_add-man-page.full.patch + - 0009_nxproxy_add-man-page.full+lite.patch + - 0209_x2goagent_add-man-page.full.patch + -- X2Go Release Manager <git-admin@x2go.org> Tue, 17 Mar 2015 19:19:32 +0100 nx-libs (2:3.5.0.31-0x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index 485c6fe0e..08e260a8b 100644 --- a/debian/control +++ b/debian/control @@ -1022,6 +1022,8 @@ Description: X2Go agent Package: nxproxy Architecture: any +Breaks: qvd-nxproxy +Replaces: qvd-nxproxy Multi-Arch: foreign Depends: ${shlibs:Depends}, @@ -1094,8 +1096,10 @@ Pre-Depends: Depends: ${shlibs:Depends}, ${misc:Depends}, -Breaks: nxcomp (<= 3.5.1) -Replaces: nxcomp +Breaks: nxcomp (<= 3.5.1), + qvd-libxcomp3, +Replaces: nxcomp, + qvd-libxcomp3, Description: nx-X11 compression library NX is a software suite which implements very efficient compression of the X11 protocol. This increases performance when diff --git a/debian/roll-tarballs.sh b/debian/roll-tarballs.sh index 954986b5f..ecaeac2e0 100755 --- a/debian/roll-tarballs.sh +++ b/debian/roll-tarballs.sh @@ -52,13 +52,13 @@ else fi if [ x"$RELEASE" == "xHEAD" ]; then - CHECKOUT="HEAD" + CHECKOUT=refs/heads/$(git rev-parse --abbrev-ref HEAD) fi if ! git rev-parse --verify -q "$CHECKOUT" >/dev/null; then echo " '${RELEASE}' is not a valid release number because there is no git tag named ${CHECKOUT}." echo " Please specify one of the following releases:" - echo "HEAD" + echo "HEAD (on branch `git rev-parse --abbrev-ref HEAD`)" git tag -l | grep "^redist" | cut -f2 -d"/" | sort -u exit 1 fi @@ -72,6 +72,7 @@ trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 # create local copy of Git project at temp location git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd "$TEMP_DIR"; tar xf - ) +git --no-pager log --after "1972-01-01" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > "${TEMP_DIR}/${PROJECT}-${RELEASE}/ChangeLog" echo "Created tarball for $CHECKOUT" @@ -81,16 +82,20 @@ mkdir -p "doc/applied-patches" # prepare patches for lite and full tarball if [ "x$MODE" = "xfull" ]; then - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+_.*\.(full|full\+lite)\.patch)" | while read file + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.(full|full\+lite)\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" echo "${file##*/}" >> "doc/applied-patches/series" done else + rm -f "bin/"{nxagent,nxauth,x2goagent} rm -Rf "nxcompshad"* rm -Rf "nxcompext"* rm -Rf "nx-X11"* - cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+_.*\.full\+lite\.patch)" | while read file + rm -Rf "etc"* + rm -Rf "doc/nx-X11_vs_XOrg69_patches"* + rm -f "README.keystrokes" + cat "debian/patches/series" | sort | grep -v '^#' | egrep "([0-9]+(_|-).*\.full\+lite\.patch)" | while read file do cp -v "debian/patches/$file" "doc/applied-patches/" echo "${file##*/}" >> "doc/applied-patches/series" @@ -104,15 +109,19 @@ else echo "No patches applied at all. Very old release?" fi +# remove folders that we do not want to roll into the tarball +rm -Rf ".pc/" +rm -Rf "debian/" +rm -Rf "nx-libs.spec" + +# some file renamings +mv README.md README.NX-Development + # very old release did not add any README for f in $(ls README* 2>/dev/null); do mv -v "$f" "doc/"; done -# remove folders that we do not want to roll into the tarball -rm -Rf ".pc/" -rm -Rf "debian/" - # remove files, that we do not want in the tarballs (build cruft) rm -Rf nx*/configure nx*/autom4te.cache* diff --git a/doc/examples/run-nxproxy2nxproxy-test b/doc/examples/run-nxproxy2nxproxy-test index b7bf64d0f..fd4d6e373 100755 --- a/doc/examples/run-nxproxy2nxproxy-test +++ b/doc/examples/run-nxproxy2nxproxy-test @@ -40,9 +40,10 @@ mkdir -p "${NX_ROOT}" # This should be randlomly generated. # -#NX_COOKIE=`xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep MIT | cut -f 5 -d ' '` -NX_COOKIE=123efa980d2cba234ef6f73deac810ff - +NX_COOKIE=`xauth -n list |grep "${HOSTNAME}/unix:${NX_PORT}" | grep MIT | cut -f 5 -d ' ' | head -n1` +if [ -z "$NX_COOKIE" ]; then + NX_COOKIE=`mcookie` +fi # # Create the directories for the NX session. diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile index 5c95a5d80..03b9f5b94 100644 --- a/nx-X11/config/Imakefile +++ b/nx-X11/config/Imakefile @@ -15,16 +15,14 @@ BOOTSTRAPSUBDIRS = \ SUBDIRS = cf $(BOOTSTRAPSUBDIRS) -#if (defined(XFree86VersionString) || defined(XorgVersionString)) \ +#if defined(XorgVersionString) \ && defined(ProjectRoot) && \ defined(BuildBindist) all:: version version: cf/version.def RemoveFile(version) -#if defined (XFree86VersionString) - echo XFree86VersionString > version -#elif defined (XorgVersionString) +#if defined (XorgVersionString) echo XorgVersionString > version #endif diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index dbc38b54c..30a0dc73b 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -651,36 +651,6 @@ NCURSESLIBDIR = NCursesLibDir #ifdef NCursesIncDir NCURSESINCDIR = NCursesIncDir #endif -#ifndef HasGlide2 -#define HasGlide2 NO -#endif -#ifndef Glide2IncDir -#if HasGlide2 -#define Glide2IncDir /usr/include/glide -#else -#define Glide2IncDir -#endif -#endif -GLIDE2INCDIR = Glide2IncDir -#ifndef HasGlide3 -#define HasGlide3 NO -#endif -#ifndef Glide3IncDir -#if HasGlide3 -#define Glide3IncDir /usr/include/glide3 -#else -#define Glide3IncDir -#endif -#endif -GLIDE3INCDIR = Glide3IncDir -#ifndef Glide3LibName -#if HasGlide3 -#define Glide3LibName glide3 -#else -#define Glide3LibName -#endif -#endif -GLIDE3LIBNAME = Glide3LibName #ifndef HasTk #define HasTk NO #endif diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile index cbcec409e..b7626590d 100644 --- a/nx-X11/config/cf/Imakefile +++ b/nx-X11/config/cf/Imakefile @@ -15,14 +15,13 @@ HOSTDEFFILES = \ host.def #endif -#if defined(XFree86Version) || defined(XorgVersion) +#if defined(XorgVersion) VERSIONDEFFILES = \ date.def \ version.def #endif DEFFILES = \ -xf86site.def \ xorgsite.def \ $(VERSIONDEFFILES) \ $(HOSTDEFFILES) \ @@ -32,115 +31,24 @@ nxversion.def RULEFILES = \ Imake.rules \ -Motif.rules \ -Win32.rules \ X11.rules \ -bsdLib.rules \ -cde.rules \ -cygwin.rules \ -mingw.rules \ -darwinLib.rules \ -gnuLib.rules \ -hpLib.rules \ -ibmLib.rules \ lnxLib.rules \ -lnxdoc.rules \ -necLib.rules \ noop.rules \ -nto.rules \ -oldlib.rules \ -os2.rules \ -os2Lib.rules \ -os2Lib.rules \ -osfLib.rules \ -scoLib.rules \ -sgiLib.rules \ -sunLib.rules \ -sv3Lib.rules \ -sv4Lib.rules \ -QNX4.rules \ xf86.rules TMPLFILES = \ Imake.tmpl \ Library.tmpl \ -Motif.tmpl \ Server.tmpl \ ServerLib.tmpl \ Threads.tmpl \ -WinLib.tmpl \ X11.tmpl \ -bsdLib.tmpl \ -cde.tmpl \ -cygwin.tmpl \ -mingw.tmpl \ -darwinLib.tmpl \ -hpLib.tmpl \ -gnuLib.tmpl \ -ibmLib.tmpl \ lnxLib.tmpl \ -lnxdoc.tmpl \ -necLib.tmpl \ -os2Lib.tmpl \ -osfLib.tmpl \ -sgiLib.tmpl \ -sunLib.tmpl \ -sv3Lib.tmpl \ -sv4Lib.tmpl \ -xf86.tmpl \ xorg.tmpl CFFILES = \ Imake.cf \ -Amoeba.cf \ -DGUX.cf \ -DragonFly.cf \ -FreeBSD.cf \ -Mips.cf \ -NetBSD.cf \ -OpenBSD.cf \ -Oki.cf \ -cygwin.cf \ -mingw.cf \ -Win32.cf \ -apollo.cf \ -bsd.cf \ -bsdi.cf \ -convex.cf \ -cray.cf \ -fujitsu.cf \ -generic.cf \ -gnu.cf \ -hp.cf \ -ibm.cf \ -isc.cf \ linux.cf \ -luna.cf \ -macII.cf \ -mach.cf \ -minix.cf \ -moto.cf \ -ncr.cf \ -nec.cf \ -nto.cf \ -os2.cf \ -osf1.cf \ -pegasus.cf \ -sco.cf \ -sco5.cf \ -sequent.cf \ -sgi.cf \ -sony.cf \ -sun.cf \ -svr3.cf \ -svr4.cf \ -ultrix.cf \ -usl.cf \ -lynx.cf \ -x386.cf \ -QNX4.cf \ -darwin.cf \ -xfree86.cf \ xorg.cf INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES) @@ -162,7 +70,7 @@ install:: $(DESTDIR)$(CONFIGDIR)/host.def; \ RemoveFile($${TMP})) -#if defined(XFree86Version) || defined(XorgVersion) +#if defined(XorgVersion) install.sdk:: @(TMP=/tmp/tmp.$$$$; \ RemoveFile($${TMP}); \ diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl index bb769c5be..3ada3087b 100644 --- a/nx-X11/config/cf/Server.tmpl +++ b/nx-X11/config/cf/Server.tmpl @@ -70,10 +70,6 @@ GLX_DEFINES = GlxDefines #define GlxUseSGISI NO #endif -#ifdef XFree86Version -#include <xf86.tmpl> -#endif - #ifdef XorgVersion #include <xorg.tmpl> #endif diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index c1b278e67..241bc267f 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -199,9 +199,6 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildXKBlib #define BuildXKBlib (BuildXKB && !BuildServersOnly) #endif -#ifndef BuildXKBuilib -#define BuildXKBuilib (BuildXKB && !BuildServersOnly) -#endif #ifndef BuildXKBfilelib #define BuildXKBfilelib (BuildXKB && !BuildServersOnly) #endif @@ -260,24 +257,15 @@ XORGRELSTRING = XorgManVersionString #ifndef BuildXF86VidModeExt #define BuildXF86VidModeExt NO #endif -#ifndef BuildXF86VidModeLibrary -#define BuildXF86VidModeLibrary (BuildXF86VidModeExt && !BuildServersOnly) -#endif #ifndef BuildXF86MiscExt #define BuildXF86MiscExt NO #endif -#ifndef BuildXF86MiscLibrary -#define BuildXF86MiscLibrary (BuildXF86MiscExt && !BuildServersOnly) -#endif #ifndef BuildXF86BigfontExt #define BuildXF86BigfontExt NO #endif #ifndef BuildXF86DGA #define BuildXF86DGA NO #endif -#ifndef BuildXF86DGALibrary -#define BuildXF86DGALibrary (BuildXF86DGA && !BuildServersOnly) -#endif #ifndef BuildXResExt #define BuildXResExt NO #endif @@ -289,29 +277,10 @@ XORGRELSTRING = XorgManVersionString #endif #ifndef BuildGlxExt #define BuildGlxExt NO -#else -#if BuildGlxExt && !defined(XFree86Version) && !defined(XorgVersion) -#undef BuildXF86DRI -#undef BuildXF86DRIDriverSupport -#define BuildXF86DRI NO -#define BuildXF86DRIDriverSupport NO -#endif -#endif -#ifndef BuildGLXLibrary -#define BuildGLXLibrary (BuildGlxExt && !BuildServersOnly) #endif #ifndef BuildOSMesaLib #define BuildOSMesaLib BuildGlxExt #endif -#ifndef BuildXDriInfo -#define BuildXDriInfo (BuildGLXLibrary && !BuildServersOnly) -#endif -#ifndef BuildXF86RushExt -#define BuildXF86RushExt NO -#endif -#ifndef BuildXF86RushLibrary -#define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly) -#endif #ifndef BuildRender #define BuildRender YES #endif @@ -1355,102 +1324,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) XLIBONLY = $(XONLYLIB) LINTXONLYLIB = $(LINTXONLY) -#if BuildXF86MiscLibrary -#ifndef SharedLibXxf86misc -#define SharedLibXxf86misc HasSharedLibraries -#endif -#ifndef NormalLibXxf86misc -#define NormalLibXxf86misc (!SharedLibXxf86misc || ForceNormalLib) -#endif -#ifndef DebugLibXxf86misc -#define DebugLibXxf86misc NO -#endif -#ifndef ProfileLibXxf86misc -#define ProfileLibXxf86misc NO -#endif -#else -#undef SharedLibXxf86misc -#define SharedLibXxf86misc NO -#undef NormalLibXxf86misc -#define NormalLibXxf86misc NO -#undef DebugLibXxf86misc -#define DebugLibXxf86misc NO -#undef ProfileLibXxf86misc -#define ProfileLibXxf86misc NO -#endif - -#if BuildXF86VidModeLibrary -#ifndef SharedLibXxf86vm -#define SharedLibXxf86vm HasSharedLibraries -#endif -#ifndef NormalLibXxf86vm -#define NormalLibXxf86vm (!SharedLibXxf86vm || ForceNormalLib) -#endif -#ifndef DebugLibXxf86vm -#define DebugLibXxf86vm NO -#endif -#ifndef ProfileLibXxf86vm -#define ProfileLibXxf86vm NO -#endif -#else -#undef SharedLibXxf86vm -#define SharedLibXxf86vm NO -#undef NormalLibXxf86vm -#define NormalLibXxf86vm NO -#undef DebugLibXxf86vm -#define DebugLibXxf86vm NO -#undef ProfileLibXxf86vm -#define ProfileLibXxf86vm NO -#endif - -#if BuildXF86DGALibrary -#ifndef SharedLibXxf86dga -#define SharedLibXxf86dga HasSharedLibraries -#endif -#ifndef NormalLibXxf86dga -#define NormalLibXxf86dga (!SharedLibXxf86dga || ForceNormalLib) -#endif -#ifndef DebugLibXxf86dga -#define DebugLibXxf86dga NO -#endif -#ifndef ProfileLibXxf86dga -#define ProfileLibXxf86dga NO -#endif -#else -#undef SharedLibXxf86dga -#define SharedLibXxf86dga NO -#undef NormalLibXxf86dga -#define NormalLibXxf86dga NO -#undef DebugLibXxf86dga -#define DebugLibXxf86dga NO -#undef ProfileLibXxf86dga -#define ProfileLibXxf86dga NO -#endif - -#if BuildXF86RushLibrary -#ifndef SharedLibXxf86rush -#define SharedLibXxf86rush HasSharedLibraries -#endif -#ifndef NormalLibXxf86rush -#define NormalLibXxf86rush (!SharedLibXxf86rush || ForceNormalLib) -#endif -#ifndef DebugLibXxf86rush -#define DebugLibXxf86rush NO -#endif -#ifndef ProfileLibXxf86rush -#define ProfileLibXxf86rush NO -#endif -#else -#undef SharedLibXxf86rush -#define SharedLibXxf86rush NO -#undef NormalLibXxf86rush -#define NormalLibXxf86rush NO -#undef DebugLibXxf86rush -#define DebugLibXxf86rush NO -#undef ProfileLibXxf86rush -#define ProfileLibXxf86rush NO -#endif - #if BuildXineramaLibrary #ifndef SharedLibXinerama #define SharedLibXinerama HasSharedLibraries @@ -1547,52 +1420,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir) #define ProfileLibXcomposite NO #endif -#if BuildGLXLibrary -#ifndef SharedLibGlx -#define SharedLibGlx HasSharedLibraries -#endif -#ifndef NormalLibGlx -#define NormalLibGlx (!SharedLibX11 | ForceNormalLib) -#endif -#ifndef DebugLibGlx -#define DebugLibGlx NO -#endif -#ifndef ProfileLibGlx -#define ProfileLibGlx NO -#endif -#ifndef BuildLibGlxWithoutPIC -#define BuildLibGlxWithoutPIC NO -#endif -#if BuildLibGlxWithoutPIC && SharedLibGlx -#define SharedLibGlxWithoutPIC YES -#else -#define SharedLibGlxWithoutPIC NO -#endif -#ifndef LinkGLToUsrLib -#define LinkGLToUsrLib NO -#endif -#if NothingOutsideProjectRoot -#undef LinkGLToUsrLib -#define LinkGLToUsrLib NO -#endif -#ifndef LinkGLToUsrInclude -#define LinkGLToUsrInclude NO -#endif -#if NothingOutsideProjectRoot -#undef LinkGLToUsrInclude -#define LinkGLToUsrInclude NO -#endif -#else -#undef SharedLibGlx -#define SharedLibGlx NO -#undef NormalLibGlx -#define NormalLibGlx NO -#undef DebugLibGlx -#define DebugLibGlx NO -#undef ProfileLibGlx -#define ProfileLibGlx NO -#endif - #ifndef SharedLibXext #define SharedLibXext HasSharedLibraries #endif @@ -1619,46 +1446,6 @@ LINTEXTENSIONLIB = $(LINTEXTENSION) XLIB = $(EXTENSIONLIB) $(XONLYLIB) LINTXLIB = $(LINTXONLYLIB) - XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -#if SharedLibXxf86misc -#ifndef SharedXxf86miscRev -#define SharedXxf86miscRev 1.1 -#endif -SharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),SOXXF86MISCREV,SharedXxf86miscRev) -#else -ProjectUnsharedLibReferences(XXF86MISC,NX_Xxf86misc,$(XXF86MISCLIBSRC),XBuildLibDir) -#endif - - XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -#if SharedLibXxf86vm -#ifndef SharedXxf86vmRev -#define SharedXxf86vmRev 1.0 -#endif -SharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),SOXXF86VMREV,SharedXxf86vmRev) -#else -ProjectUnsharedLibReferences(XXF86VM,NX_Xxf86vm,$(XXF86VMLIBSRC),XBuildLibDir) -#endif - - XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -#if SharedLibXxf86dga -#ifndef SharedXxf86dgaRev -#define SharedXxf86dgaRev 1.0 -#endif -SharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),SOXXF86DGAREV,SharedXxf86dgaRev) -#else -ProjectUnsharedLibReferences(XXF86DGA,NX_Xxf86dga,$(XXF86DGALIBSRC),XBuildLibDir) -#endif - - XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush -#if SharedLibXxf86rush -#ifndef SharedXxf86rushRev -#define SharedXxf86rushRev 1.0 -#endif -SharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),SOXXF86RUSHREV,SharedXxf86rushRev) -#else -ProjectUnsharedLibReferences(XXF86RUSH,NX_Xxf86rush,$(XXF86RUSHLIBSRC),XBuildLibDir) -#endif - XINERAMALIBSRC = $(LIBSRC)/Xinerama #if SharedLibXinerama #ifndef SharedXineramaRev @@ -1669,16 +1456,6 @@ SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedX ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir) #endif - GLXLIBSRC = $(LIBSRC)/GL -#if SharedLibGlx -#ifndef SharedGlxRev -#define SharedGlxRev 1.2 -#endif -SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev) -#else -ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir) -#endif - XRENDERLIBSRC = $(LIBSRC)/Xrender #if SharedLibXrender #ifndef SharedXrenderRev @@ -1892,50 +1669,6 @@ ProjectUnsharedLibReferences(XKBFILE,NX_xkbfile,$(XKBFILELIBSRC),XBuildLibDir) # endif #endif /* BuildXKBlib */ -#if BuildXKBlib -# ifndef SharedLibxkbui -# define SharedLibxkbui HasSharedLibraries -# endif -# ifndef NormalLibxkbui -# define NormalLibxkbui (!SharedLibxkbui || ForceNormalLib) -# endif -# ifndef DebugLibxkbui -# define DebugLibxkbui NO -# endif -# ifndef ProfileLibxkbui -# define ProfileLibxkbui NO -# endif -#else -# ifndef SharedLibxkbui -# define SharedLibxkbui NO -# endif -# ifndef NormalLibxkbui -# define NormalLibxkbui NO -# endif -# ifndef DebugLibxkbui -# define DebugLibxkbui NO -# endif -# ifndef ProfileLibxkbui -# define ProfileLibxkbui NO -# endif -#endif - XKBUILIBSRC = $(LIBSRC)/xkbui -#if SharedLibxkbui -# ifndef SharedxkbuiRev -# define SharedxkbuiRev 1.0 -# endif -SharedLibReferences(XKBUI,NX_xkbui,$(XKBUISRC),SOXKBUIREV, SharedxkbuiRev) -#else -ProjectUnsharedLibReferences(XKBUI,NX_xkbui,$(XKBUILIBSRC),XBuildLibDir) -#endif - -#ifndef XkbuiLibs -# define XkbuiLibs $(XKBUILIB) -#endif -#ifndef XkbuiDepLibs -# define XkbuiDepLibs $(DEPXKBFILELIB) -#endif - #ifndef NeedDefaultDepLibs #define NeedDefaultDepLibs YES #endif diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 02eabbb9f..1edf85de9 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -136,27 +136,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ */ /* - * Which drivers to build. When building a static server, each of these - * 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 \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ - GlideDriver fbdev i128 \ - ati DevelDrivers ark cyrix \ - siliconmotion \ - vesa vga XF86OSCardDrivers XF86ExtraCardDrivers - */ - -/* - * To add third party drivers to the standard driver list, set the - * following. - * -#define XF86ExtraCardDrivers extradriver1 extradriver2 ... - */ - -/* * Select the XInput devices you want by uncommenting this. * #define XInputDrivers mouse keyboard acecad calcomp citron \ @@ -165,11 +144,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ wacom void magictouch aiptek */ -/* To enable building of development DRI drivers (insecure, or not - * useful on the chosen architecture, uncomment this define. -#define BuildDevelDRIDrivers YES - */ - /* * To use the deprecated, old keyboard driver, uncomment this. But * even better, make the new keyboard driver (hw/xfree86/input/keyboard) @@ -211,34 +185,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define UseSeparateConfDir NO */ -/* - * To enable building the glide driver, you need to define - * HasGlide2 to YES and set the Glide2IncDir variable. - * HasGlide2 is per default NO. - * -#define HasGlide2 YES - */ - -/* - * Set the path to your Glide include files. - * -#define Glide2IncDir /usr/include/glide - */ - -/* - * Have glide 3? - * -#define HasGlide3 YES - */ - -/* - * Set the path to your Glide 3 include files. - * -#define Glide3IncDir /usr/include/glide3 - */ - - - /* * Unless you're a developer you shouldn't need to change anything * beyond this point. @@ -466,22 +412,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define GlxExtraDefines -D__GLX_ALIGN64 #endif -/* - * If you want to build the xf86rush extension, uncomment this line. - * This isn't recommended. - * -#define BuildXF86RushExt YES - */ -#define BuildXF86RushExt NO - -/* - * If you want to build the client library for the xf86rush extension, - * uncomment this line. This isn't recommended. - * -#define BuildXF86RushLibrary NO - */ -#define BuildXF86RushLibrary NO - #define BuildXKB YES #define BuildXKBlib YES diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index aa28c5c55..d1f930123 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -107,12 +107,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) /* the relative symlink created by this rule causes problems for us */ # endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot */ # define SharedLibXdmGreet NO -# define LinkGLToUsrInclude NO -# define LinkGLToUsrLib NO # define FSUseSyslog YES -# define BuildLibGlxWithoutPIC NO - # define DriverManSuffix 4x # define DriverManDir $(MANSOURCEPATH)4 @@ -149,19 +145,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # endif # define HasXdmAuth YES # define HasLatex YES -/* at present, glide2 only works on i386 */ -# if defined(__linux__) && defined(i386Architecture) -# define HasGlide2 YES -# define Glide2IncDir /usr/include/glide -# endif /* __linux__ && i386Architecture */ -/* at present, glide3 only works on alpha, amd64, i386 and ia64 */ -# if defined(__linux__) && (defined(i386Architecture) || \ - defined(AlphaArchitecture) || defined(ia64Architecture) || \ - defined(AMD64Architecture)) -# define HasGlide3 YES -# define Glide3IncDir /usr/include/glide3 -# endif /* __linux__ && (i386Architecture || AlphaArchitecture || \ - ia64Architecture || AMD64Architecture) */ /* extended instruction set support */ # ifdef i386Architecture # define HasX86Support YES @@ -325,58 +308,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # endif #endif -/* The DRM module requires kernel services that appeared in late 2.1.x - kernels and are known to be present in 2.2.x kernels. */ -#ifndef BuildXF86DRI -# if defined(AlphaArchitecture) -# define BuildXF86DRI YES -# elif defined(Arm32Architecture) -# define BuildXF86DRI NO -# elif defined(HPArchitecture) -# define BuildXF86DRI YES -# elif defined(i386Architecture) -# if (defined(__linux__) && (OSMajorVersion > 2 || (OSMajorVersion == 2 && \ - OSMinorVersion >= 2))) || \ - defined(__FreeBSD_kernel__) -# define BuildXF86DRI YES -# else -# define BuildXF86DRI NO -# endif -# elif defined(ia64Architecture) -# define BuildXF86DRI YES -# elif defined(Mc68020Architecture) -# define BuildXF86DRI NO -# elif defined(MipsArchitecture) -# define BuildXF86DRI NO -# elif defined(PpcArchitecture) -# define BuildXF86DRI YES -# elif defined(Ppc64Architecture) -# define BuildXF86DRI NO -# elif defined(s390Architecture) || defined(s390xArchitecture) -# define BuildXF86DRI NO -# elif defined(SparcArchitecture) -# define BuildXF86DRI YES -# elif defined(SuperHArchitecture) -# define BuildXF86DRI NO -# elif defined(AMD64Architecture) -# define BuildXF86DRI YES -# else -# define BuildXF86DRI NO -# endif -#endif - -/* - * Build shared libGL and the DRI modules without -fPIC on some architectures. - * This improves performance. - */ -#ifndef BuildLibGlxWithoutPIC -# if BuildXF86DRI -# if defined(i386Architecture) -# define BuildLibGlxWithoutPIC YES -# endif -# endif -#endif - #ifndef HasAgpGart # if defined(i386Architecture) || defined(ia64Architecture) || defined(AMD64Architecture) /* The AGPGART header file is included in os-support/linux, which @@ -437,13 +368,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # endif #endif -/* - * The Rush extension support. - */ -#ifndef BuildXF86RushExt -# define BuildXF86RushExt YES -#endif - #if defined(__linux__) && !defined(LinuxFBDevSupport) # define LinuxFBDevSupport YES #endif @@ -757,14 +681,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define VarDbDirectory $(VARDIR)/lib #endif -#ifndef XF86OSCardDrivers -# ifdef __linux__ -# define XF86OSCardDrivers fbdev v4l sisusb -# else -# define XF86OSCardDrivers /**/ -# endif -#endif - #ifndef OSXInputDrivers # if HasLinuxJoystick # define OSXInputDrivers1 ur98 @@ -1006,14 +922,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic #endif -#ifndef LinkGLToUsrLib -# define LinkGLToUsrLib YES -#endif -# ifndef LinkGLToUsrInclude -# define LinkGLToUsrInclude YES -#endif - - #define HasGnuMake YES #define MakeNamedTargetSubdir(dir,flags,subname)\ diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index ee372709a..186a9a8db 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -12,19 +12,10 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ #define SharedXrenderReqs $(LDPRELIB) $(XLIB) #define SharedXtstReqs $(LDPRELIB) $(XLIB) -#if GlxUseBuiltInDRIDriver -#define ExtraSharedGLReqs /**/ -#else -#define ExtraSharedGLReqs -ldl -#endif -#define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs +#define SharedGLReqs $(LDPRELIB) $(XLIB) -ldl #define SharedXineramaReqs $(LDPRELIB) $(XLIB) -#define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) -#define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) -#define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) #define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) #define SharedXfixesReqs $(LDPRELIB) $(XLIB) #define SharedXdamageReqs $(LDPRELIB) $(XLIB) #define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB) diff --git a/nx-X11/config/cf/xf86.tmpl b/nx-X11/config/cf/xf86.tmpl deleted file mode 100644 index ba352445e..000000000 --- a/nx-X11/config/cf/xf86.tmpl +++ /dev/null @@ -1,128 +0,0 @@ -XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.32 2002/11/14 21:01:14 tsi Exp $ - -#ifdef BuilderEMailAddr -BUILDERADDR = BuilderEMailAddr -#else -BUILDERADDR = "xorg@freedesktop.org" -#endif -BUGMSG = -DBUILDERADDR='$(BUILDERADDR)' - -#if defined(XF86DriverSDK) - BUILDMODULEDIR = $(DRIVERSDKMODULEDIR) - BUILDMODULETOP = .. - TOP_INCLUDES = TopIncludes - IMAKE_DEFINES = -DXF86DriverSDK=1 -#ifdef UseInstalled - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -#else - IMAKE_CMD = $(IMAKE) -I$(TOP) -I$(IRULESRC) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -#endif - -#undef ImakeSubCmdHelper -#ifdef UseInstalled -#define ImakeSubCmdHelper $(IMAKE) -DUseInstalled -I$(IMAKETOP) \ - -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -#else -#define ImakeSubCmdHelper $(IMAKEPREFIX)$(IMAKE) -I$(IMAKETOP) \ - $(IMAKE_DEFINES) $(IMAKE_WARNINGS) \ - -I$(IMAKEPREFIX)$(IRULESRC) -#endif -#endif - -#ifndef JoystickSupport -#define JoystickSupport NO -#endif - -/* - * Module support: These overrides must be here, not in xf86.rules, - * because they will replace rules after having seen the first lines - * of Imakefile (include <Server.tmpl>) - */ - - -#ifndef HasGccMergeConstants -#define HasGccMergeConstants NO -#endif - -#if HasGccMergeConstants && DoLoadableServer && !MakeDllModules -MODULE_GCC_FLAGS = -fno-merge-constants -#endif - -#if defined(IHaveModules) && MakeDllModules -MODULE_PIC_FLAGS = $(PICFLAGS) -#endif - -MODULE_CFLAGS = $(MODULE_PIC_FLAGS) $(MODULE_GCC_FLAGS) - -#if defined(IHaveModules) -# if DoLoadableServer -MODULE_DEFINES = -DIN_MODULE -DXFree86Module -# else -MODULE_DEFINES = -DXFree86Module -# endif -#endif - -#if defined(IHaveModules) && DoLoadableServer - -/* This overrides the ObjCompile in Imake.rules! */ -#undef ObjectCompile -#define ObjectCompile(options) RemoveFile($@) @@\ - ClearmakeOSName\ - $(MODCC) $(MODCFLAGS) options -c $*.c - -/* This overrides an AssembleObject in xf86.rules or in an os-dependent - * rules file (currently only minix.cf and os2.rules (uncritical)) - */ -#define ModCPPOnlyAsm(basename,options) RemoveFile(basename.i) @@\ - $(MODCPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.S | \ @@\ - grep -v '^\#' > basename.i - -#undef AssembleObject -#define AssembleObject(basename,flags) ModCPPOnlyAsm(basename,flags) @@\ - RemoveFile(basename.o) @@\ - $(MODAS) $(MODASFLAGS) -o basename.o basename.i @@\ - RemoveFile(basename.i) - -/* This overrides the NormalRelocatableTarget in Imake.rules */ -#undef NormalRelocatableTarget -#define NormalRelocatableTarget(objname,objlist) @@\ -AllTarget(objname.Osuf) @@\ - @@\ -objname.Osuf: objlist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - $(MODLD) $(MODLDCOMBINEFLAGS) objlist -o $@ - -/* This overrides the NormalDepRelocatableTarget in Imake.rules */ -#undef NormalDepRelocatableTarget -#define NormalDepRelocatableTarget(objname,deplist,objlist) @@\ -AllTarget(objname.Osuf) @@\ - @@\ -objname.Osuf: deplist $(EXTRALIBRARYDEPS) @@\ - RemoveFile($@) @@\ - $(MODLD) $(MODLDCOMBINEFLAGS) objlist -o $@ - -/* This overrides the RanLibrary in Imake.rules */ -#if DoRanlibCmd || NeedModuleRanlib -#undef RanLibrary -#define RanLibrary(args) $(MODRANLIB) args -#endif - -/* This overrides the MakeLibrary rule in Imake.rules */ -#undef MakeLibrary -#define MakeLibrary(libname,objlist) $(MODAR) libname objlist - -/* This overrides the LibraryTargetName rule in Imake.rules */ -#undef LibraryTargetName -#define LibraryTargetName(libname)Concat(lib,libname.a) - -/* This disables an OS/2 rule */ -#undef BuildLibSupportLibs -#define BuildLibSupportLibs(dummy) - -#endif /* IHaveModules */ diff --git a/nx-X11/config/cf/xf86site.def b/nx-X11/config/cf/xf86site.def deleted file mode 100644 index 6f0961252..000000000 --- a/nx-X11/config/cf/xf86site.def +++ /dev/null @@ -1,479 +0,0 @@ -XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ -/******************************************************************************/ -/* - * This file is to provide a quick method for most people to change the - * behaviour of their XFree86 installation without having to fully - * understand the workings of site.def and all the various '.cf' files. - * - * In the vast majority of cases, it should not be necessary to use this - * file at all or change it in any way. - * - * This file is divided into two sections. The first contains settings - * that end-users might reasonably change. The second contains settings - * that developers might want to change. - * - * IMPORTANT NOTE: In all cases changing the defaults may cause problems - * and/or unexpected side-effects. If you don't understand what a setting - * does, then it's best to not change it. If you make changes and have - * problems, verify that those problems are also present when using an - * empty host.def file and unchanged version of this file before reporting - * them. - * - * A good way to use this file is to copy it to host.def, and make the - * changes there. That way, future patches to this file won't fail. - * The host.def file will never be patched. - * - * The distributed version of this file MUST contain no uncommented - * definitions. Default definitions belong in xfree86.cf, or <vendor>.cf - * files. - */ -/******************************************************************************/ - -/* - * If you have build-specific modifications in your host.def file, but - * want an empty host.def file installed when doing 'make install', - * uncomment the following - * -#define InstallEmptyHostDef - */ - -/* - * Which servers to build. There is now only one XFree86 server. - * It can be disabled by the following. - * -#define XF86Server NO - */ - -/* - * Set the default server (ie the one that gets the sym-link to "X") - * -#define ServerToInstall XFree86 - */ - -/* - * Server configuration parameters. The defaults are shown here: - */ - -/* - * Which drivers to build. When building a static server, each of these - * 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 \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ - GlideDriver fbdev i128 \ - ati AgpGartDrivers DevelDrivers ark cyrix \ - siliconmotion \ - vesa vga XF86OSCardDrivers XF86ExtraCardDrivers - */ - -/* - * To add third party drivers to the standard driver list, set the - * following. - * -#define XF86ExtraCardDrivers extradriver1 extradriver2 ... - */ - -/* - * Select the XInput devices you want by uncommenting this. - * -#define XInputDrivers mouse keyboard acecad calcomp citron \ - digitaledge dmc dynapro elographics \ - microtouch mutouch penmount spaceorb summa \ - wacom void magictouch aiptek - */ - -/* - * To build only the servers with a cut-down source tree, uncomment - * this. - * -#define BuildServersOnly YES - */ - -/* - * Undefine the following if you don't want to have config files and - * app-defaults installed in a separate directory (i.e. /etc/X11). - * -#define UseSeparateConfDir NO - */ - -/* - * To enable building the glide driver, you need to define - * HasGlide2 to YES and set the Glide2IncDir variable. - * HasGlide2 is per default NO. - * -#define HasGlide2 YES - */ - -/* - * Set the path to your Glide include files. - * -#define Glide2IncDir /usr/include/glide - */ - -/* - * Have glide 3? - * -#define HasGlide3 YES - */ - -/* - * Set the path to your Glide 3 include files. - * -#define Glide3IncDir /usr/include/glide3 - */ - - - -/* - * Unless you're a developer you shouldn't need to change anything - * beyond this point. - */ - -/* - * If you want to enable some developer settings, like more verbose - * compiler warnings, uncomment this. - * -#define XFree86Devel YES -*/ - -/* - * The default optimisation flags for GCC 2.x. -fno-strength-reduce is - * here to work around a bug in -O2 for GCC 2.x on i386 platforms. - * If you are using a version that doesn't have this bug, you can - * uncomment the following line, and remove '-fno-strength-reduce' - * If you are building binaries for a 486, it may be beneficial to add - * -m486 - * -#define DefaultGcc2i386Opt -O2 -fno-strength-reduce - */ - -/* - * This allows the GCC warning flags to be set. The default is shown here. - * -#define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wredundant-decls -Wnested-externs - */ - -/* - * Sun Compiler stuff.. - * -#define HasSunC YES -#define HasSunCplusplus YES -#define CplusplusCompilerMajorVersion 5 -#define CplusplusCompilerMinorVersion 0 -#define CCompilerMajorVersion 5 -#define CCompilerMinorVersion 0 - */ - -/* - * Optimized Sun Compiler Build. - * -#define DefaultCDebugFlags -xO4 -xtarget=pentium_pro -#define OptimizedCDebugFlags -xO4 -xtarget=pentium_pro - */ - -/* - * Debuggable Sun Compiler Build. - * Note: This builds _EVERYTHING_ as debuggable - * -#define DefaultCDebugFlags -g -xs -#define OptimizedCDebugFlags -g -xs - */ - -/* - * For Linux, this should match the Binutils version you have. This example - * is for 2.6.0.7. See linux.cf for the default setting. - * - * This should automatically get set correctly by imake. - * -#define LinuxBinUtilsMajorVersion 26 - */ - -/* - * For Linux, these should match the libc version you have. This example - * is for libc.5.4.x. See linux.cf for the default setting. - * - * This should automatically get set correctly by imake. - * -#define LinuxCLibMajorVersion 5 -#define LinuxClibMinorVersion 4 - */ - -/* - * If you want to use the GNU malloc library, uncomment this - * -#define UseGnuMalloc YES - */ - -/* - * Set this to whatever is required to access the GNU malloc library. - * The default is '-lgmalloc' unless is specified in the OS's .cf file. - * -#define GnuMallocLibrary -L/usr/local/lib -lgmalloc - */ - -/* - * To enable the internal Xserver malloc, uncomment this - * -#define UseInternalMalloc YES - */ - -/* - * Some Linux releases don't have a libtermcap. In this case you may need - * to uncomment the following - * -#define TermcapLibrary -lncurses - */ - -/* - * Build a server that dynamically loads the modules by setting - * this to YES. This defaults to YES on most platforms. A static server - * can be built by setting this to NO. - * -#define DoLoadableServer NO - */ - -/* - * Build dlopen() style modules instead of the standard loader modules. - * Don't enable this unless you have specific development reasons for - * doing so and understand how to deal with the problems you'll run in to. - * - * Enabling this for regular use is NOT supported, and will almost - * certainly cause you problems. - * -#define MakeDllModules YES - */ - -/* - * Build XAA. This can be disabled with: - * -#define XF86XAA NO - */ - -/* - * Build vgahw. This can be disabled with: - * -#define XF86VgaHw NO - */ - -/* - * Build xf1bpp. This can be disabled with: - * -#define XF1Bpp NO - */ - -/* - * Build xf4bpp. This can be disabled with: - * -#define XF4Bpp NO - */ - - -/* - * BSD Console driver support (for FreeBSD and NetBSD). - * - * By default, support is included for pccons and pcvt for NetBSD, and - * pccons, syscons and pcvt for FreeBSD. - * - * To change the list of supported drivers, set the following parameter. - * Possible values are -DPCCONS_SUPPORT, -DSYSCONS_SUPPORT, -DPCVT_SUPPORT. - * The following example includes support for syscons and pcvt only. - * -#define XFree86ConsoleDefines -DSYSCONS_SUPPORT -DPCVT_SUPPORT - */ - -/* - * To disable building XInput support, uncomment this - * -#define BuildXInputExt NO - */ - -/* - * Uncomment this for joystick support. - * - * Note: Joystick support is broken, so don't enable this. - * -#define JoystickSupport YES - */ - -/* - * To disable the ScreenSaver Extension, uncomment this line. - * -#define BuildScreenSaverExt NO - */ - -/* - * If you don't want to build Xinerama support, uncomment this. - * -#define BuildXinerama NO - */ - -/* - * If you don't want to build support for the GLX extension, uncomment this. - * -#define BuildGlxExt NO - */ - -/* - * If you want to build the xf86rush extension, uncomment this line. - * This isn't recommended. - * -#define BuildXF86RushExt YES - */ - -/* - * If you want to build the client library for the xf86rush extension, - * uncomment this line. This isn't recommended. - * -#define BuildXF86RushLibrary NO - */ - -/* - * If you are running NetBSD 0.9C or later, and have the aperture driver - * installed, uncomment this. - * -#define HasNetBSDApertureDriver YES - */ - -/* - * If you are running SVR3 and have the mmap driver installed (for linear - * framebuffer access) uncomment this. - * -#define HasSVR3mmapDrv YES - */ - -/* - * If you are using an SVR3 (like ISC 4.x) which supports long file names, - * you can * uncomment this to have manual pages installed under their - * full names - * -#define ExpandManNames YES - */ - -/* - * For a POSIXized build on Interactive uncomment this - * Could be used with gcc 'till Version 2.6.3 - * Should be used with gcc 2.7.2. - * -#define UsePosix YES - */ - -/* - * If you want XDMAUTH support (if you have Wraphelp.c), uncomment this. - * -#define HasXdmAuth YES - */ - -/* - * If you have Linux DECnet support, and want to build XFree86 with support - * for connections over DECnet, uncomment this. - * -#define HasDECnet YES - */ - -/* - * To build static and shared libraries with debugging information, uncomment - * this. Assumes you have Gcc2. - * (If you don't have Gcc2, you can use the DebugLib{X11,...} variables - * to build debugging versions of the libraries separately.) - * -#define DebuggableLibraries YES -*/ - -/* - * To forceably build static libraries in addition to shared libraries, - * uncomment this. - * -#define ForceNormalLib YES - */ - -/* - * Uncomment this if your default tools (eg, gcc, ld, as, etc) are - * not the Linux ELF versions. - * -#define LinuxElfDefault NO - */ - -/* - * To use ELF format shared libraries for supported OSs, uncomment this. - * - * For Linux the default setting of this is the same as the setting of - * LinuxElfDefault. - * - * For FreeBSD this should automatically be set correctly by imake. Only - * change it here if you need to override the automatic setting. - * -#define UseElfFormat YES - */ - -/* - * For FreeBSD/ELF (FreeBSD 3.0) it is possible to also build and install - * a.out compatibility libraries. To enable that, uncomment this. - * -#define BuildAoutLibraries YES - */ - -/* - * If you have trouble with make bombing out in Xlib, try uncommenting this. - * You will not get dependencies as a result, but better than nothing. - * -#define MakeHashTableBug YES - */ - -/* - * If you do not want your man pages compress under SVR3 systems that - * support it, uncomment this. - * -#define CompressManPages NO - */ - -/* - * If you have sgmlfmt (the XFree86 doctools package) and want to build - * formatted docs from the SGML source, uncomment this. - * -#define HasSgmlFmt YES - */ - -/* - * To disable building some document formats, uncomment some of these. - * -#define BuildLinuxDocText NO -#define BuildLinuxDocHtml NO -#define BuildLinuxDocPS NO - */ - -/* - * To install Japanese versions of the documentation uncomment this. - * Note: The Japanese documentation consists of a subset of the - * XFree86 3.1 docs. - * -#define InstallJapaneseDocs YES - */ - -/* - * To build/install X specs docs, uncomment the following. - * The SpecsDocDirs setting here is recommended because it covers - * the docs that XFree86 has changed or added. - * -#define BuildSpecsDocs YES -#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xmu Xv XvMC i18n - */ - -/* - * To build all specs docs, not just those listed in SpecsDocDirs, uncomment - * the following. - * -#define BuildAllSpecsDocs YES - */ - -/* - * If your system doesn't support vm86() mode and you have - * libx86emu set library path here - * -#define X86EMU_LIBPATH /usr/local/lib - */ - - diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf deleted file mode 100644 index 673902129..000000000 --- a/nx-X11/config/cf/xfree86.cf +++ /dev/null @@ -1,1998 +0,0 @@ -XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.466 2004/01/11 18:48:11 dawes Exp $ -/* - * This configuration file contains all of the configuration - * information for the XFree86 based X Servers. - * - * Most of these settings can be overridden in a vendor.cf or the - * BeforeVendor part of the site.def file. - */ -XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ - - -/* 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 -# else /* Must be defined for bootstrapping purposes */ -# define XFree86Version 0 -# endif -#endif - -#if !defined(XFree86VersionString) && \ - defined(XF86_VERSION_MAJOR) && defined(XF86_VERSION_MINOR) && \ - defined(XF86_VERSION_PATCH) && defined(XF86_VERSION_SNAP) -# if XF86_VERSION_SNAP == 0 -#define XFree86VersionString `echo XF86_VERSION_MAJOR XF86_VERSION_MINOR XF86_VERSION_PATCH | sed 's/ /./g'` -#else -#define XFree86VersionString `echo XF86_VERSION_MAJOR XF86_VERSION_MINOR XF86_VERSION_PATCH XF86_VERSION_SNAP | sed 's/ /./g'` -# endif -#endif - -#if !defined(XFree86ManVersionString) && \ - defined(XF86_VERSION_MAJOR) && defined(XF86_VERSION_MINOR) && \ - defined(XF86_VERSION_PATCH) && defined(XF86_VERSION_SNAP) -# if XF86_VERSION_SNAP == 0 -#define XFree86ManVersionString `echo XF86_VERSION_MAJOR XF86_VERSION_MINOR XF86_VERSION_PATCH | sed -e 's/ /./g' -e 's/^/Version\\\ /'` -#else -#define XFree86ManVersionString `echo XF86_VERSION_MAJOR XF86_VERSION_MINOR XF86_VERSION_PATCH XF86_VERSION_SNAP | sed -e 's/ /./g' -e 's/^/Version\\\ /'` -# endif -#endif - -#if !defined(XFree86DateString) && defined(XF86_DATE) -# define XFree86DateString XF86_DATE -#endif - -#ifndef BuildDateCmd -# define BuildDateCmd date +%Y%m%d -#endif - -#if !defined(BuildDate) -# define BuildDate `BuildDateCmd` -#endif - -#ifndef ChangelogDateCmd -# define ChangelogDateCmd if tail $(CHANGELOGFILE) | \ @@\ - fgrep '$$XFree86:' >/dev/null 2>&1; then \ @@\ - tail $(CHANGELOGFILE) | fgrep '$$XFree86:' | \ @@\ - sed s,'.* \([0-9][0-9]*\)/\([0-9][0-9]*\)/\([0-9][0-9]*\).*,\1\2\3,'; \ @@\ - else echo 0; fi -#endif - -#if !defined(ChangelogDate) -# define ChangelogDate `ChangelogDateCmd` -#endif - -#ifndef XVendorString -# define XVendorString "The X.Org Foundation, Inc" -#endif - -#ifndef XVendorRelease -# define XVendorRelease XFree86Version -#endif - -#ifndef XVendorManVersionString -#define XVendorManVersionString XFree86ManVersionString -#endif - -#ifndef XVendorManNameString -#define XVendorManNameString XFree86 -#endif - -/* - * This enables some settings for developers. - */ - -#ifndef XFree86Devel -# if !defined(PatheticCpp) || !PatheticCpp -# if (XFree86Version % 1000) -# define XFree86Devel YES -# else -# define XFree86Devel NO -# endif -# else -# define XFree86Devel NO /* Assume the worst */ -# endif -#endif - -#ifndef BuildDebug -# define BuildDebug YES -#endif - -/* - * settings for the config file parser - */ - -#ifndef XConfigFile -#define XConfigFile XF86Config -#endif -#ifndef XConfigDir -#define XConfigDir $(LIBDIR) -#endif -#ifndef XLogFile -#define XLogFile XFree86 -#endif - -/* - * BuildXFree86ConfigTools: - * - * Turning this on allows the XFree86 config tools to build when - * BuildServersOnly is YES. This requires more than the servonly CVS - * module. This cannot be used to disable building the config tools with - * a full build. - */ -#ifndef BuildXFree86ConfigTools -#ifdef BuildServersOnly -#define BuildXFree86ConfigTools !BuildServersOnly -#else -#define BuildXFree86ConfigTools YES -#endif -#endif - -#ifndef BuildLibrariesForConfigTools -#define BuildLibrariesForConfigTools BuildXFree86ConfigTools -#endif - -#if BuildXFree86ConfigTools && BuildLibrariesForConfigTools -#define BuildLibraries YES -#define BuildXF86MiscLibrary YES -#define BuildXF86VidModeLibrary YES -#define BuildXKBlib YES -#define BuildXKBfilelib YES -#define BuildXKBuilib YES -#endif - -/* - * When this is set, modules are always built separately from the libraries - * that statically link into an Xserver. This is for platforms where the - * module and native object formats are different (e.g., OS/2). - */ -#ifndef BuildModuleInSubdir -#define BuildModuleInSubdir NO -#endif - -#ifndef MakeDllModules -#define MakeDllModules NO -#endif -#ifndef DoLoadableServer -#define DoLoadableServer NO -#endif - -/* - * Default settings for which X Servers to build. - */ - -/* OS.cf files may set this for OS-specific input drivers */ -#ifndef OSXInputDrivers -#define OSXInputDrivers /**/ -#endif - -/* This may be set in host.def for 3rd party input drivers */ -#ifndef ExtraXInputDrivers -#define ExtraXInputDrivers /**/ -#endif - -/* XInput drivers */ -#ifndef XInputDrivers -#define XInputDrivers mouse keyboard acecad calcomp citron \ - digitaledge dmc dynapro elographics tek4957 \ - microtouch mutouch penmount spaceorb summa \ - wacom void magellan /* magictouch */ hyperpen \ - jamstudio fpit \ - palmax OSXInputDrivers ExtraXInputDrivers -#endif - -/* <linux/input.h> support mainly for USB support */ -#ifndef HasLinuxInput -# define HasLinuxInput NO -#endif - -/* OS.cf files may set this for OS-specific drivers */ -#ifndef XF86OSCardDrivers -#define XF86OSCardDrivers /**/ -#endif - -/* This may be set in host.def for 3rd party drivers */ -#ifndef XF86ExtraCardDrivers -#define XF86ExtraCardDrivers /**/ -#endif - -/* OS.cf files may set this for OS-specific drivers */ -#ifndef HasAgpGart -#define HasAgpGart NO -#endif - -/* The glide driver only works for the loadable server at the moment */ -#ifndef HasGlide2 -#define HasGlide2 NO -#endif -#if HasGlide2 && DoLoadableServer -#define GlideDriver glide -#else -#define GlideDriver /**/ -#endif - -/* - * For Intel platforms, the default is to build all modules which - * are supported on this platform. - */ -#if defined(i386Architecture) || defined(ia64Architecture) -# ifndef XF86Server -# define XF86Server YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* EXA module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -/* - * Amiga framebuffer module. - * This is mostly for build testing, but the vesa driver references it. - */ -# ifndef XF86AFB -# define XF86AFB YES -# endif - -# define AgpGartDrivers /**/ - -/* - * Drivers under development, but not ready for binary releases, or - * drivers included on this platform only for build testing. - */ -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers imstt newport -# else -# define DevelDrivers /**/ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# /* Don't build the nsc driver on IA64 */ -# ifndef ia64Architecture -# define NscDriver nsc -# else -# define NscDriver /**/ -# endif -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ - GlideDriver i128 NscDriver \ - ati i810 AgpGartDrivers DevelDrivers ark \ - cyrix siliconmotion via \ - fbdev vesa vga \ - dummy XF86OSCardDrivers XF86ExtraCardDrivers -# endif - -/* - * DRI drivers under development, or drivers included on this platform - * only for build testing. - */ -# ifndef DevelDRIDrivers -# if XFree86Devel -# define DevelDRIDrivers ffb -# else -# define DevelDRIDrivers /**/ -# endif -# endif - -# ifndef DriDrivers -# define DriDrivers gamma i810 i830 mga r128 radeon r200 \ - sis tdfx DevelDRIDrivers -# endif -#endif - -#if defined(AMD64Architecture) -# ifndef XF86Server -# define XF86Server YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* EXA module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif - -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -# define AgpGartDrivers /**/ - -# define DevelDrivers /**/ - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic tdfx savage cirrus tseng trident \ - chips apm i128 ati ark cyrix siliconmotion \ - vga dummy fbdev vesa -# endif - -/* DRI tdfx driver needs Glide, which is not available for AMD64 */ -# define TdfxDriDriver /**/ - -# define DevelDRIDrivers /**/ - -# define DriDrivers gamma i810 mga r128 radeon r200 \ - TdfxDriDriver DevelDRIDrivers -#endif /*AMD64Arcitecture*/ - -/* SPARC and UltraSPARC drivers */ - -#if (defined(SparcArchitecture) || defined(Sparc64Architecture)) && \ - !defined(LynxOSArchitecture) && \ - !defined(NetBSDArchitecture) && \ - !defined(OpenBSDArchitecture) -# ifndef XF86Server -# define XF86Server YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32wid fb module */ -# ifndef XF8_32Wid -# define XF8_32Wid YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* EXA module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel - /* - * Some of these are compiled just for the fun of it. Undoubtedly some - * 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 -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure SBUS and PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ - sunbw2 glint mga tdfx ati vesa vga fbdev \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers -# endif -# ifndef DriDrivers -# define DriDrivers ffb -# endif - -#endif - -/* Sparc64 Drivers */ -#if defined(OpenBSDArchitecture) && defined(Sparc64Architecture) -# ifndef XF86Server -# define XF86Server YES -# endif -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB NO -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* EXA module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif - -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -# ifndef UseX86Emu -# define UseX86Emu NO -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati \ - DevelDrivers \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -# define TdfxDriDriver /**/ -# ifndef DriDrivers -# define DriDrivers /**/ -# endif -#endif - -/* MIPS drivers */ - -#ifdef MipsArchitecture -# ifndef XF86Server -# define XF86Server YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif - -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -# ifndef XF86CardDrivers -# define XF86CardDrivers mga glint nv s3 s3virge sis savage \ - trident chips tdfx fbdev ati \ - DevelDrivers newport \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif - -/* - * DEC Alpha drivers - */ -#ifdef AlphaArchitecture -# ifndef XF86Server -# define XF86Server YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga ati \ - savage nv cirrus DevelDrivers siliconmotion \ - vga XF86OSCardDrivers XF86ExtraCardDrivers -# endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 /*sis*/ -# endif -#endif - -/* - * Motorola 68k and PowerPC drivers - */ -#if defined(PpcArchitecture) || defined(Mc68020Architecture) -# ifndef XF86Server -# define XF86Server YES -# endif -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers imstt -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati mga glint nv s3 s3virge sis savage\ - trident chips tdfx fbdev \ - DevelDrivers vga \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 -# endif -#endif - -/* - * Intel StrongARM and Hewlett-Packard PA-RISC - */ -#if defined(Arm32Architecture) || defined(HPArchitecture) -# ifndef XF86Server -# define XF86Server YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati mga glint nv s3 s3virge sis savage\ - trident chips tdfx fbdev \ - DevelDrivers vga \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -# if HasGlide3 -# define TdfxDriDriver tdfx -# else -# define TdfxDriDriver /**/ -# endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 -# endif -#endif - -/* SuperH drivers */ - -#if defined(SuperHArchitecture) -# ifndef XF86Server -# define XF86Server YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp YES -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp YES -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -# ifndef XF86CardDrivers -# define XF86CardDrivers fbdev XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif - -/* - * For PowerPC 64bit systems - * only libraries are strictly needed - */ -#if defined(Ppc64Architecture) -# ifndef XF86Server -# define XF86Server YES -# endif -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB NO -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp NO -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp NO -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* 24/32bpp conversion module */ -# ifndef XF24_32Bpp -# define XF24_32Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw NO -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif - -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati mga \ - DevelDrivers \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -# if HasGlide3 -# define TdfxDriDriver -# else -# define TdfxDriDriver /**/ -# endif -# ifndef DriDrivers -# define DriDrivers gamma r128 -# endif -#endif - -/* - * For Mips/Arc platforms, the default is to build all modules which - * are supported on this platform. - */ -#ifdef ArcArchitecture -# ifndef XF86Server -# define XF86Server YES -# endif -#endif - -#if BuildDebug -# define DebugDefines -DBUILDDEBUG -#else -# define DebugDefines /**/ -#endif - -#ifndef XF86Server -# define XF86Server NO -#endif -#if !XF86Server -# undef DoLoadableServer -# define DoLoadableServer NO -#endif - -/* - * Fbdev module defines. They are set to indicate the fb types supported - * on different architectures. - */ -#ifndef XF86AFB -# define XF86AFB NO -#endif -#ifndef XF86ILBM -# define XF86ILBM NO -#endif -#ifndef XF86IPLAN2P2 -# define XF86IPLAN2P2 NO -#endif -#ifndef XF86IPLAN2P4 -# define XF86IPLAN2P4 NO -#endif -#ifndef XF86IPLAN2P8 -# define XF86IPLAN2P8 NO -#endif -#if XF86AFB -AFB_DEFS = -DUSE_AFB -#endif -#if XF86ILBM -ILBM_DEFS = -DUSE_ILBM -#endif -#if XF86IPLAN2P2 -IPLAN2P2_DEFS = -DUSE_IPLAN2P2 -#endif -#if XF86IPLAN2P4 -IPLAN2P4_DEFS = -DUSE_IPLAN2P4 -#endif -#if XF86IPLAN2P8 -IPLAN2P8_DEFS = -DUSE_IPLAN2P8 -#endif -#ifndef FbdevDefines -# define FbdevDefines $(AFB_DEFS) $(ILBM_DEFS) $(IPLAN2P2_DEFS) \ - $(IPLAN2P4_DEFS) $(IPLAN2P8_DEFS) -#endif - -/* - * Build GLX server interface - * --- Doesn't work for 1-bit and 4-bit servers - */ -#ifndef BuildGlxExt -# define BuildGlxExt YES -#endif - -#ifndef BuildXF86DRI -#define BuildXF86DRI NO -#endif - -#ifndef GlxUseSGISI -#define GlxUseSGISI NO -#endif - -#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 - * defined references of GLX and OpenGL functions. - */ - -/* - * The first is a built-in driver that does software rendering client-side - * and renders to the X server via Xlib. - */ - -# ifndef GlxBuiltInXMesa -# define GlxBuiltInXMesa NO -# endif - -/* - * The rest are hardware-specific DRI drivers. - */ -# ifndef GlxBuiltInGamma -# define GlxBuiltInGamma NO -# endif -# ifndef GlxBuiltInTdfx -# define GlxBuiltInTdfx NO -# endif -# ifndef GlxBuiltInMga -# define GlxBuiltInMga NO -# endif -# ifndef GlxBuiltInI810 -# define GlxBuiltInI810 NO -# endif -# ifndef GlxBuiltInI830 -# define GlxBuiltInI830 NO -# endif -# ifndef GlxBuiltInR128 -# define GlxBuiltInR128 NO -# endif -# ifndef GlxBuiltInRadeon -# define GlxBuiltInRadeon NO -# endif -# ifndef GlxBuiltInR200 -# define GlxBuiltInR200 NO -# endif -# ifndef GlxBuiltInFfb -# define GlxBuiltInFfb NO -# endif -# ifndef GlxBuiltInSIS -# define GlxBuiltInSIS NO -# endif - -# if GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI830 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxDriverUsesMesa YES -# else -# define GlxDriverUsesMesa NO -# endif - -# if GlxBuiltInGamma || \ - GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI830 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxUseBuiltInDRIDriver YES -# define DRIDynLoadDefines /**/ -# else -# define GlxUseBuiltInDRIDriver NO -# define DRIDynLoadDefines -DGLX_USE_DLOPEN -# endif - -# if GlxUseBuiltInDRIDriver -# undef DriDrivers -# if GlxBuiltInGamma -# define DriDrivers gamma -# endif -# if GlxBuiltInTdfx -# define DriDrivers tdfx -# endif -# if GlxBuiltInMga -# define DriDrivers mga -# endif -# if GlxBuiltInI810 -# define DriDrivers i810 -# endif -# if GlxBuiltInI830 -# define DriDrivers i830 -# endif -# if GlxBuiltInR128 -# define DriDrivers r128 -# endif -# if GlxBuiltInRadeon -# define DriDrivers radeon -# endif -# if GlxBuiltInR200 -# define DriDrivers r200 -# endif -# if GlxBuiltInSIS -# define DriDrivers sis -# endif -# if GlxBuiltInFfb -# define DriDrivers ffb -# endif -# endif - -#endif - -/* - * This enables building DRI support into video drivers, which can be done - * even on platforms that don't have functional DRI support. - * - * Defining BuildXF86DRIDriverSupport to YES will not work until we have a - * separate set of defines set up for building driver-only support for the - * DRI. - */ -#ifndef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO -#endif - -#if BuildGlxExt - -# if BuildXF86DRI -# define DRIDefines -DXF86DRI -DGLX_DIRECT_RENDERING DRIDynLoadDefines -# else -# define DRIDefines /**/ -# endif -# if defined(GlxUseSGISI) && GlxUseSGISI -# define GlxCoreLibDefines -DGLX_USE_SGI_SI -# else -# define GlxCoreLibDefines -DGLX_USE_MESA -# endif - -# if defined(SparcArchitecture) \ - || defined (Sparc64Architecture) \ - || defined(ia64Architecture) \ - || defined(s390xArchitecture) \ - || defined(AMD64Architecture) -# define GlxArchDefines -D__GLX_ALIGN64 -# elif defined(AlphaArchitecture) -/* On the Alpha we need to ensure floating point accuracy for 3D */ -# define GlxArchDefines -D__GLX_ALIGN64 -mieee -# elif defined(DarwinArchitecture) -/* GLX contains lots of uninitialized globals, which can upset Darwin */ -# define GlxArchDefines -fno-common -# else -# define GlxArchDefines /**/ -# endif - -# ifndef GlxExtraDefines -# define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines -# endif - -#else - -/* If we are not building GLX, then make sure the DRI is not built */ -# undef BuildXF86DRI -# define BuildXF86DRI NO -# undef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO - -#endif - -#if !BuildXF86DRI -# define GlxUseBuiltInDRIDriver NO /* For libOSmesa */ -#endif - -# ifndef UseX86Emu -# define UseX86Emu YES -# endif - -#define X86INT10_STUB 0 -#define X86EMU_GENERIC 1 -#define X86VM 2 -#define X86EMU_OS 3 - -#ifndef XF86INT10_BUILD -# if UseX86Emu -# define XF86INT10_BUILD X86EMU_GENERIC -# else -# 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 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 -# define JoystickSupport NO -#endif -#endif - -#if 0 -/* - * Build the extra extension libs even when not including the extra extensions - * in the servers - */ -#ifndef BuildXF86MiscLibrary -# define BuildXF86MiscLibrary YES -#endif -#ifndef BuildXF86DGALibrary -# define BuildXF86DGALibrary YES -#endif -#ifndef BuildXF86VidModeLibrary -# define BuildXF86VidModeLibrary YES -#endif -#ifndef BuildGLXLibrary -# define BuildGLXLibrary YES -#endif -#endif - -/* - * Build the XFree86-VidMode extension - */ -#ifndef BuildXF86VidModeExt -# define BuildXF86VidModeExt YES -#endif - -/* Don't build this now because the interface hasn't been done yet */ -/* - * Build the XFree86-Misc extension - */ -#ifndef BuildXF86MiscExt -# define BuildXF86MiscExt YES -#endif - -/* - * Build the XFree86-Bigfont extension - */ -#ifndef BuildXF86BigfontExt -# define BuildXF86BigfontExt YES -#endif - -/* - * Build the XFree86 DGA support - */ -#ifndef BuildXF86DGA -# define BuildXF86DGA YES -#endif - -/* - * Build the DPMS extension support - */ -#ifndef BuildDPMSExt -# define BuildDPMSExt YES -#endif - -/* - * Build the X Video Extension - */ -#ifndef BuildXvExt -# define BuildXvExt YES -#endif - -/* - * Build the X Video Motion Compensation Extension - */ -#ifndef BuildXvMCExt -# define BuildXvMCExt YES -#endif - -/* - * Build the X-Resource Extension - */ -#ifndef BuildXResExt -# define BuildXResExt YES -#endif - -#if Malloc0ReturnsNull -# ifndef XtMalloc0ReturnsNullDefines -# define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC -# endif -#endif - -#ifndef UseInternalMalloc -# define UseInternalMalloc NO -#endif - -#ifndef HasDlsymBug -# define HasDlsymBug NO -#endif - -#ifndef HasMTRRSupport -# define HasMTRRSupport NO -#endif - -/* - * Build scanpci? - */ -#ifndef SystemV -#define SystemV NO -#endif -#ifndef SystemV4 -#define SystemV4 NO -#endif -#ifndef BuildScanpci -# if SystemV || SystemV4 || \ - (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ - defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ - defined(OS2Architecture) || defined(GNUMachArchitecture) || \ - (defined(KFreeBSDArchitecture) && defined(i386Architecture)) -# define BuildScanpci YES -# else -# define BuildScanpci NO -# endif -#endif - -/* Disable stripping installed programs for this release. */ -#ifndef StripInstalledPrograms -# define StripInstalledPrograms NO -#endif - -#ifndef InstallJapaneseDocs -#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 -#endif - -#if DoLoadableServer -# define XFree86LoaderDefines -DXFree86LOADER ExtraLoaderDefines -#else -# define XFree86LoaderDefines /**/ -#endif - -#ifndef HasBsdMake -#define HasBsdMake NO -#endif - -#ifndef MakeHasPosixVariableSubstitutions -# if !HasBsdMake && !defined(SunArchitecture) -# define MakeHasPosixVariableSubstitutions NO -# else -# define MakeHasPosixVariableSubstitutions YES -# endif -#endif - -#ifndef UseSmartScheduler -#define UseSmartScheduler YES -#endif - -#if UseSmartScheduler -#define SmartScheduleDefines -DSMART_SCHEDULE -#else -#define SmartScheduleDefines /**/ -#endif - -/* Server defines required for all OSs */ -#ifndef XFree86ServerDefines -# define XFree86ServerDefines -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH \ - XFree86DGADefines XFree86XvDefines \ - XFree86LoaderDefines -DXFree86Server \ - VidModeExtensionDefines \ - XFree86XvMCDefines \ - SmartScheduleDefines \ - DebugDefines XFree86XResDefines \ - -DX_BYTE_ORDER=$(X_BYTE_ORDER) -#endif - -#ifndef XFree86ServerOSDefines -# define XFree86ServerOSDefines -DDDXOSINIT -DSERVER_LOCK -DDDXOSFATALERROR \ - -DDDXOSVERRORF -#endif - -#ifndef XFree86ConsoleDefines -# if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) || (defined(KFreeBSDArchitecture) && defined(i386Architecture)) -# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DSYSCONS_SUPPORT -DPCVT_SUPPORT -# elif defined(KFreeBSDArchitecture) -# define XFree86ConsoleDefines -DSYSCONS_SUPPORT -# else -# define XFree86ConsoleDefines /**/ -# endif -#endif - -/* Support for USB mouse */ -#ifndef UsbMouseSupport -# define UsbMouseSupport NO -#endif -/* Does this OS have libusb ? */ -#ifndef HasLibUsb -# define HasLibUsb NO -#endif - -#ifndef UseServerLock -# define UseServerLock YES -#endif - -#ifndef ServerExtraDefines -# define ServerExtraDefines XFree86ServerDefines -#endif - -#ifndef ServerOSDefines -# define ServerOSDefines XFree86ServerOSDefines -#endif - -#ifndef DriverSDKDir -# define DriverSDKDir $(USRLIBDIR)/Server -#endif - -#ifndef DriverSDKModuleDir -# define DriverSDKModuleDir $(USRLIBDIR)/Server/modules -#endif - -#ifndef DriverSDKIncludeDir -# define DriverSDKIncludeDir $(USRLIBDIR)/Server/include -#endif - -DRIVERSDKDIR = DriverSDKDir -DRIVERSDKMODULEDIR = DriverSDKModuleDir -DRIVERSDKINCLUDEDIR = DriverSDKIncludeDir - -/* - * Some commonly refered to directories are defined here. - */ - - XF86SRC = $(SERVERSRC)/hw/xfree86 - XF86COMSRC = $(XF86SRC)/common - XF86PARSERSRC = $(XF86SRC)/parser - XF86OSSRC = $(XF86SRC)/os-support - XF86DRIVERSRC = $(XF86SRC)/drivers - DRIVERSRC = $(XF86DRIVERSRC) - -/* - * Installed location of the XFree86 documentation - */ - - XFREE86DOCDIR = $(DOCDIR) - XFREE86PSDOCDIR = $(DOCPSDIR) - XFREE86PDFDOCDIR = $(DOCPDFDIR) - XFREE86HTMLDOCDIR = $(DOCHTMLDIR) -XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese - -/* - * Other stuff used in the X Server source. - */ - -#ifndef OtherIConfigFiles -# define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules -#endif - -#ifndef UseRgbTxt -# define UseRgbTxt YES -#endif - -#ifndef ManSuffix -# define ManSuffix 1 -#endif - -/* - * GNU Compiler stuff - */ -#ifndef HasGcc3 -# define HasGcc3 NO -#endif -#ifndef HasGcc2 -# define HasGcc2 HasGcc3 -#endif -#ifndef HasGcc -# define HasGcc HasGcc2 -#endif -#ifndef HasGcc2ForCplusplus -# define HasGcc2ForCplusplus HasGcc2 -#endif - -#if HasGcc -# ifndef Gcc28Warnings -# if (GccMajorVersion > 2) || \ - ((GccMajorVersion == 2) && (GccMinorVersion >= 8)) -# define Gcc28Warnings -Wundef -# else -# define Gcc28Warnings /* */ -# endif -# endif -# ifndef GccWarningOptions -# if XFree86Devel -# define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \ - -Wmissing-prototypes -Wmissing-declarations \ - -Wredundant-decls -Wnested-externs Gcc28Warnings -# else -# define GccWarningOptions -Wall -Wpointer-arith Gcc28Warnings -# endif -# endif -# ifndef DefaultCCOptions -# if defined(UseInstalled) -# define DefaultCCOptions /* -ansi */ -# else -# define DefaultCCOptions -ansi GccWarningOptions -# endif -# endif -# if defined(UseInstalled) -# ifndef UseGccMakeDepend -# define UseGccMakeDepend YES -# endif -# endif -#endif - -/* Make imake noisier. Note that this is ineffective for 3.0 <= GCC <= 3.2 */ -#ifndef ImakeWarningFlags -# ifdef Gcc28Warnings -# define ImakeWarningFlags Gcc28Warnings -# else -# define ImakeWarningFlags /* */ -# endif -#endif - -#if (GccMajorVersion == 3) && (GccMinorVersion >= 1) -# define GccAliasingArgs -fno-strict-aliasing -#else -# define GccAliasingArgs /* */ -#endif - -#if HasGcc2 && defined(i386Architecture) -# ifndef DefaultGcc2i386Opt -# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs -# endif -#endif - -#if HasGcc2 && defined(AMD64Architecture) -# ifndef DefaultGcc2AMD64Opt -# define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs -# endif -#endif - -#if HasGcc2 && defined(AlphaArchitecture) -# ifndef DefaultGcc2AxpOpt -# define DefaultGcc2AxpOpt -O2 GccAliasingArgs -# endif -#endif - -#if HasGcc2 && defined(Ppc64Architecture) -# ifndef DefaultGcc2Ppc64Opt -# define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs -# endif -#endif - -#if HasGcc2 && defined(PpcArchitecture) -# ifndef DefaultGcc2PpcOpt -# define DefaultGcc2PpcOpt -O2 GccAliasingArgs -# endif -#endif - -#ifndef DefaultGcc2DebugOpt -# define DefaultGcc2DebugOpt -g -#endif - -#ifndef DebuggableLibraries -# define DebuggableLibraries NO -#endif - -#if HasGcc2 && DebuggableLibraries -# define LibraryDebugOpt DefaultGcc2DebugOpt -#endif - -/* - * Some versions of gcc have optimisation bugs that cause problems building - * some files. The definitions here cover those. - */ - -#ifndef Egcs112Bug - /* Not exactly precise, but it'll do for now... */ -# if HasGcc2 && defined(i386Architecture) && \ - (GccMajorVersion == 2) && (GccMinorVersion > 8) -# define Egcs112Bug YES -# else -# define Egcs112Bug NO -# endif -#endif - -#ifdef i386Architecture -# ifndef HasX86Support -# define HasX86Support YES -# endif -# ifndef HasMMXSupport -# define HasMMXSupport YES -# endif -# ifndef HasSSESupport -# define HasSSESupport NO -# endif -# ifndef Has3DNowSupport -# define Has3DNowSupport NO -# endif -#elif defined (AMD64Architecture) -# ifndef HasX86Support -# define HasX86Support NO -# endif -# ifndef HasMMXSupport -# define HasMMXSupport NO -# endif -# ifndef HasSSESupport -# define HasSSESupport NO -# endif -# ifndef Has3DNowSupport -# define Has3DNowSupport NO -# endif -#else -# ifndef HasX86Support -# define HasX86Support NO -# endif -# ifndef HasMMXSupport -# define HasMMXSupport NO -# endif -# ifndef HasSSESupport -# define HasSSESupport NO -# endif -# ifndef Has3DNowSupport -# define Has3DNowSupport NO -# endif -#endif - -#ifndef StaticNeedsPicForShared -# if defined (AMD64Architecture)\ - || defined (AlphaArchitecture) \ - || defined (ia64Architecture) \ - || defined (PpcArchitecture) \ - || defined (SparcArchitecture) \ - || defined (s390xArchitecture) -# define StaticNeedsPicForShared YES -# else -# define StaticNeedsPicForShared NO -# endif -#endif - -#ifndef XF8_32Wid -# define XF8_32Wid NO -#endif - -#if CrossCompiling -#include <cross.def> -#endif -#include <xf86.rules> - diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 1ef1260b4..8e2604c4a 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -192,11 +192,8 @@ NX_VERSION_CURRENT_STRING = nxVersionString #if BuildXFree86ConfigTools && BuildLibrariesForConfigTools #define BuildLibraries YES -#define BuildXF86MiscLibrary YES -#define BuildXF86VidModeLibrary YES #define BuildXKBlib YES #define BuildXKBfilelib YES -#define BuildXKBuilib YES #endif /* @@ -255,38 +252,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString # define HasLinuxInput NO #endif -/* OS.cf files may set this for OS-specific drivers */ -#ifndef XF86OSCardDrivers -#define XF86OSCardDrivers /**/ -#endif - -/* This may be set in host.def for 3rd party drivers */ -#ifndef XF86ExtraCardDrivers -#define XF86ExtraCardDrivers /**/ -#endif - -/* OS.cf files may set this for OS-specific drivers */ -#ifndef HasAgpGart -#define HasAgpGart NO -#endif - -/* Some DRI drivers are disabled because they are either insecure or unusable on - * this architecture. This switch allows you to enable building these drivers. - */ -#ifndef BuildDevelDRIDrivers -#define BuildDevelDRIDrivers NO -#endif - -/* The glide driver only works for the loadable server at the moment */ -#ifndef HasGlide2 -#define HasGlide2 NO -#endif -#if HasGlide2 && DoLoadableServer -#define GlideDriver glide -#else -#define GlideDriver /**/ -#endif - /* * Many architectures share common X Server pieces. List them here. */ @@ -358,406 +323,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString #endif /* - * Intel x86 and ia64 drivers - */ -#if defined(i386Architecture) || defined(ia64Architecture) -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* Amiga framebuffer module. Required by vesa module. */ -# ifndef XF86AFB -# define XF86AFB YES -# endif - -/* - * Drivers under development, but not ready for binary releases, or - * drivers included on this platform only for build testing. - */ -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers imstt newport -# else -# define DevelDrivers /**/ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# /* Don't build the nsc driver on IA64 */ -# ifndef ia64Architecture -# define i386Drivers nsc i810 -# else -# define i386Drivers /**/ -# endif -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ - GlideDriver i128 i386Drivers \ - ati DevelDrivers ark \ - cyrix siliconmotion via \ - vesa vga \ - dummy XF86OSCardDrivers XF86ExtraCardDrivers -# endif - -# ifndef DevelDRIDrivers -# define DevelDRIDrivers ffb mach64 unichrome -# endif - -# ifndef DriDrivers -# ifndef ia64Architecture -# define i386DRIDrivers i810 i915 sis -# else - /* SiS is 64-bit unclean as of this writing. */ -# define i386DRIDrivers /**/ -# endif -# define DriDrivers i386DRIDrivers mga r128 radeon r200 tdfx -# endif -#endif /* i386Architecture || ia64Architecture */ - -#if defined(AMD64Architecture) -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* Amiga framebuffer module. Required by vesa module. */ -# ifndef XF86AFB -# define XF86AFB YES -# endif - -/* - * Drivers under development, but not ready for binary releases, or - * drivers included on this platform only for build testing. - */ -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /**/ -# else -# define DevelDrivers /**/ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \ - neomagic tdfx savage cirrus tseng trident \ - chips apm i128 ati ark cyrix siliconmotion \ - vga dummy vesa i810 vmware \ - XF86OSCardDrivers XF86ExtraCardDrivers DevelDrivers -# endif - -/* SiS is 64-bit unclean as of this writing. */ -# ifndef DriDrivers -# define DriDrivers i915 mga r128 radeon r200 tdfx -# endif -#endif /*AMD64Arcitecture*/ - -/* SPARC and UltraSPARC drivers */ - -#if (defined(SparcArchitecture) || defined(Sparc64Architecture)) && \ - !defined(LynxOSArchitecture) && \ - !defined(NetBSDArchitecture) && \ - !defined(OpenBSDArchitecture) -/* 8/32wid fb module */ -# ifndef XF8_32Wid -# define XF8_32Wid YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* Amiga framebuffer module. Required by vesa module. */ -# ifndef XF86AFB -# define XF86AFB YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel - /* - * Some of these are compiled just for the fun of it. Undoubtedly some - * 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 -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure SBUS and PCI drivers should go first */ -# ifndef XF86CardDrivers -# ifdef SunArchitecture -# define XF86CardDrivers /* sunffb */ sunleo suncg6 suncg3 suncg14 \ - suntcx sunbw2 glint mga tdfx ati vesa vga \ - dummy XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers -# else -# define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 suntcx \ - sunbw2 glint mga tdfx ati vesa vga dummy \ - XF86OSCardDrivers XF86ExtraCardDrivers \ - DevelDrivers -# endif -# endif -# ifndef DriDrivers -# define DriDrivers ffb -# endif - -#endif - -/* Sparc64 Drivers */ -#if defined(OpenBSDArchitecture) && defined(Sparc64Architecture) -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB NO -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -# ifndef UseX86Emu -# define UseX86Emu NO -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati dummy \ - DevelDrivers \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif /* OpenBSDArchitecture && Sparc64Architecture */ - -/* MIPS drivers */ - -#ifdef MipsArchitecture -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -# ifndef XF86CardDrivers -# define XF86CardDrivers mga glint nv s3 s3virge sis savage \ - trident chips tdfx ati dummy \ - DevelDrivers newport \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif /* MipsArchitecture */ - -/* - * DEC Alpha drivers - */ -#ifdef AlphaArchitecture -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga ati \ - savage nv cirrus DevelDrivers siliconmotion \ - vga dummy XF86OSCardDrivers \ - XF86ExtraCardDrivers -# endif -/* - * Glide is available for Alpha, therefore build tdfx DRM module. - * SiS is 64-bit unclean as of this writing. - */ -# ifndef DriDrivers -# define DriDrivers tdfx mga r128 radeon r200 -# endif -#endif /* AlphaArchitecture */ - -/* - * Motorola 68k and PowerPC drivers - */ -#if defined(PpcArchitecture) || defined(Mc68020Architecture) -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB YES -# endif -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers imstt -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati mga glint nv s3 s3virge sis savage\ - trident chips tdfx \ - DevelDrivers vga dummy \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -/* The tdfx driver needs Glide, which is not available for PPC. */ -# ifndef DriDrivers -# define DriDrivers mga r128 radeon r200 -# endif -#endif /* PpcArchitecture || Mc68020Architecture */ - -/* - * Intel StrongARM and Hewlett-Packard PA-RISC - */ -#if defined(Arm32Architecture) || defined(HPArchitecture) -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers /* */ -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati mga glint nv s3 s3virge sis savage\ - trident chips tdfx \ - DevelDrivers vga dummy \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -# ifndef DriDrivers -# define DriDrivers mga r128 radeon r200 -# endif -#endif - -/* SuperH drivers */ -#if defined(SuperHArchitecture) -# ifndef XF86CardDrivers -# define XF86CardDrivers XF86OSCardDrivers XF86ExtraCardDrivers -# endif -#endif - -/* - * For PowerPC 64bit systems - * only libraries are strictly needed - */ -#if defined(Ppc64Architecture) -# ifndef XorgServer -# define XorgServer YES -# endif -/* 1bpp module */ -# ifndef XF1Bpp -# define XF1Bpp NO -# endif -/* 4bpp module */ -# ifndef XF4Bpp -# define XF4Bpp NO -# endif -/* 8/32bpp overlay module */ -# ifndef XF8_32Bpp -# define XF8_32Bpp YES -# endif -/* 8/16bpp dual fb module */ -# ifndef XF8_16Bpp -# define XF8_16Bpp YES -# endif -/* shadow fb module */ -# ifndef XFShadowFB -# define XFShadowFB YES -# endif -/* fbdevhw module */ -# ifndef XF86FBDevHw -# define XF86FBDevHw YES -# endif -/* XAA module */ -# ifndef XF86XAA -# define XF86XAA YES -# endif -/* Exa module */ -# ifndef XF86EXA -# define XF86EXA YES -# endif -/* ramdac module */ -# ifndef XF86Ramdac -# define XF86Ramdac YES -# endif -/* I2C module */ -# ifndef XF86I2C -# define XF86I2C YES -# endif -/* DDC module */ -# ifndef XF86DDC -# define XF86DDC YES -# endif -/* RAC (Resource Access Control) module */ -# ifndef XF86RAC -# define XF86RAC YES -# endif -/* int10 module */ -# ifndef XF86Int10 -# define XF86Int10 YES -# endif -/* vbe module */ -# ifndef XF86VBE -# define XF86VBE YES -# endif - -/* vgahw module */ -# ifndef XF86VgaHw -# define XF86VgaHw YES -# endif -/* Amiga framebuffer module */ -# ifndef XF86AFB -# define XF86AFB NO -# endif - -# ifndef DevelDrivers -# if XFree86Devel -# define DevelDrivers -# else -# define DevelDrivers /* */ -# endif -# endif - -/* Pure PCI drivers should go first */ -# ifndef XF86CardDrivers -# define XF86CardDrivers ati mga dummy \ - DevelDrivers \ - XF86OSCardDrivers XF86ExtraCardDrivers -# endif -# define TdfxDriDriver /**/ -# ifndef DriDrivers -# define DriDrivers r128 -# endif -#endif /* Ppc64Architecture */ - -/* * For Mips/Arc platforms, the default is to build all modules which * are supported on this platform. */ @@ -828,205 +393,30 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define BuildGlxExt YES #endif -#ifndef BuildXF86DRI -#define BuildXF86DRI NO -#endif - -#ifndef GlxUseSGISI -#define GlxUseSGISI NO -#endif - -#if BuildXF86DRI - -#ifndef DriDrivers -#define DriDrivers /**/ -#endif - -#ifndef DevelDRIDrivers -#define DevelDRIDrivers /**/ -#endif - -#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 - * defined references of GLX and OpenGL functions. - */ - -/* - * The first is a built-in driver that does software rendering client-side - * and renders to the X server via Xlib. - */ - -# ifndef GlxBuiltInXMesa -# define GlxBuiltInXMesa NO -# endif - -/* - * The rest are hardware-specific DRI drivers. - */ -# ifndef GlxBuiltInGamma -# define GlxBuiltInGamma NO -# endif -# ifndef GlxBuiltInTdfx -# define GlxBuiltInTdfx NO -# endif -# ifndef GlxBuiltInMga -# define GlxBuiltInMga NO -# endif -# ifndef GlxBuiltInI810 -# define GlxBuiltInI810 NO -# endif -# ifndef GlxBuiltInI915 -# define GlxBuiltInI915 NO -# endif -# ifndef GlxBuiltInR128 -# define GlxBuiltInR128 NO -# endif -# ifndef GlxBuiltInRadeon -# define GlxBuiltInRadeon NO -# endif -# ifndef GlxBuiltInR200 -# define GlxBuiltInR200 NO -# endif -# ifndef GlxBuiltInFfb -# define GlxBuiltInFfb NO -# endif -# ifndef GlxBuiltInSIS -# define GlxBuiltInSIS NO -# endif - -# if GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI915 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxDriverUsesMesa YES -# else -# define GlxDriverUsesMesa NO -# endif - -# if GlxBuiltInGamma || \ - GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI915 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxUseBuiltInDRIDriver YES -# define DRIDynLoadDefines /**/ -# else -# define GlxUseBuiltInDRIDriver NO -# define DRIDynLoadDefines -DGLX_USE_DLOPEN -# endif - -# if GlxUseBuiltInDRIDriver -# undef DriDrivers -# if GlxBuiltInGamma -# define DriDrivers gamma -# endif -# if GlxBuiltInTdfx -# define DriDrivers tdfx -# endif -# if GlxBuiltInMga -# define DriDrivers mga -# endif -# if GlxBuiltInI810 -# define DriDrivers i810 -# endif -# if GlxBuiltInI915 -# define DriDrivers i915 -# endif -# if GlxBuiltInR128 -# define DriDrivers r128 -# endif -# if GlxBuiltInRadeon -# define DriDrivers radeon -# endif -# if GlxBuiltInR200 -# define DriDrivers r200 -# endif -# if GlxBuiltInSIS -# define DriDrivers sis -# endif -# if GlxBuiltInFfb -# define DriDrivers ffb -# endif -# endif - -#endif - -/* - * This enables building DRI support into video drivers, which can be done - * even on platforms that don't have functional DRI support. - * - * Defining BuildXF86DRIDriverSupport to YES will not work until we have a - * separate set of defines set up for building driver-only support for the - * DRI. - */ -#ifndef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO -#endif - #if BuildGlxExt -# if BuildXF86DRI -# define DRIDefines -DXF86DRI -DGLX_DIRECT_RENDERING DRIDynLoadDefines -# else -# define DRIDefines /**/ -# endif -# if defined(GlxUseSGISI) && GlxUseSGISI -# define GlxCoreLibDefines -DGLX_USE_SGI_SI -# else -# define GlxCoreLibDefines -DGLX_USE_MESA -# endif +# define GlxCoreLibDefines -DGLX_USE_MESA -# if defined(SparcArchitecture) \ +# if defined(SparcArchitecture) \ || defined (Sparc64Architecture) \ || defined(ia64Architecture) \ || defined(s390xArchitecture) \ || defined(AMD64Architecture) -# define GlxArchDefines -D__GLX_ALIGN64 -# elif defined(AlphaArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 +# elif defined(AlphaArchitecture) /* On the Alpha we need to ensure floating point accuracy for 3D */ -# define GlxArchDefines -D__GLX_ALIGN64 -mieee -# elif defined(DarwinArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 -mieee +# elif defined(DarwinArchitecture) /* GLX contains lots of uninitialized globals, which can upset Darwin */ -# define GlxArchDefines -fno-common -# else -# define GlxArchDefines /**/ -# endif - -# ifndef GlxExtraDefines -# define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines -# endif - -#else - -/* If we are not building GLX, then make sure the DRI is not built */ -# undef BuildXF86DRI -# define BuildXF86DRI NO -# undef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO +# define GlxArchDefines -fno-common +# else +# define GlxArchDefines /**/ +# endif -#endif +# ifndef GlxExtraDefines +# define GlxExtraDefines GlxCoreLibDefines GlxArchDefines +# endif -#if !BuildXF86DRI -# define GlxUseBuiltInDRIDriver NO /* For libOSmesa */ #endif # ifndef UseX86Emu @@ -1045,13 +435,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # 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 BuildRECORDlib # define BuildRECORDlib YES @@ -1088,25 +471,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 #endif #endif -#if 0 -/* - * Build the extra extension libs even when not including the extra extensions - * in the servers - */ -#ifndef BuildXF86MiscLibrary -# define BuildXF86MiscLibrary YES -#endif -#ifndef BuildXF86DGALibrary -# define BuildXF86DGALibrary YES -#endif -#ifndef BuildXF86VidModeLibrary -# define BuildXF86VidModeLibrary YES -#endif -#ifndef BuildGLXLibrary -# define BuildGLXLibrary YES -#endif -#endif - /* * Build the XFree86-VidMode extension */ @@ -1367,7 +731,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese */ #ifndef OtherIConfigFiles -# define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules +# define OtherIConfigFiles $(IRULESRC)/xf86.rules #endif #ifndef UseRgbTxt @@ -1572,6 +936,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # define LargePositionIndependentCFlags -fPIC #endif + #ifndef XF8_32Wid # define XF8_32Wid NO #endif diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index a4d22b4b8..8a0c805c2 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -55,27 +55,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ */ /* - * Which drivers to build. When building a static server, each of these - * 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 \ - neomagic i740 tdfx savage \ - cirrus vmware tseng trident chips apm \ - GlideDriver fbdev i128 \ - ati DevelDrivers ark cyrix \ - siliconmotion \ - vesa vga XF86OSCardDrivers XF86ExtraCardDrivers - */ - -/* - * To add third party drivers to the standard driver list, set the - * following. - * -#define XF86ExtraCardDrivers extradriver1 extradriver2 ... - */ - -/* * Select the XInput devices you want by uncommenting this. * #define XInputDrivers mouse keyboard acecad calcomp citron \ @@ -84,11 +63,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ wacom void magictouch aiptek */ -/* To enable building of development DRI drivers (insecure, or not - * useful on the chosen architecture, uncomment this define. -#define BuildDevelDRIDrivers YES - */ - /* * To use the deprecated, old keyboard driver, uncomment this. But * even better, make the new keyboard driver (hw/xfree86/input/keyboard) @@ -112,34 +86,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ #define UseSeparateConfDir NO */ -/* - * To enable building the glide driver, you need to define - * HasGlide2 to YES and set the Glide2IncDir variable. - * HasGlide2 is per default NO. - * -#define HasGlide2 YES - */ - -/* - * Set the path to your Glide include files. - * -#define Glide2IncDir /usr/include/glide - */ - -/* - * Have glide 3? - * -#define HasGlide3 YES - */ - -/* - * Set the path to your Glide 3 include files. - * -#define Glide3IncDir /usr/include/glide3 - */ - - - /* * Unless you're a developer you shouldn't need to change anything * beyond this point. @@ -330,20 +276,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ */ /* - * If you want to build the xf86rush extension, uncomment this line. - * This isn't recommended. - * -#define BuildXF86RushExt YES - */ - -/* - * If you want to build the client library for the xf86rush extension, - * uncomment this line. This isn't recommended. - * -#define BuildXF86RushLibrary NO - */ - -/* * If you are running NetBSD 0.9C or later, and have the aperture driver * installed, uncomment this. * diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile index e46abbdfd..26520eab0 100644 --- a/nx-X11/include/Imakefile +++ b/nx-X11/include/Imakefile @@ -10,7 +10,7 @@ NULL = #define IHaveSubdirs #define PassCDebugFlags /**/ -#if BuildGlxExt || BuildGLXLibrary +#if BuildGlxExt GLXDIR = GL #endif @@ -82,7 +82,7 @@ clean:: -$(RM) Xpoll.h XCOMM For the Linux/OpenGL base standard -#if LinkGLToUsrInclude && AlternateIncRoot +#if AlternateIncRoot install:: MakeDir($(DESTDIR)$(SYSTEMUSRINCDIR)) -$(RM) $(DESTDIR)$(SYSTEMUSRINCDIR)/GL diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 68198698f..ec6c10b98 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -12,16 +12,16 @@ NULL = SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h #endif -#if BuildXF86MiscExt || BuildXF86MiscLibrary +#if BuildXF86MiscExt XF86MISCHEADERS = xf86misc.h xf86mscstr.h #endif #if BuildXF86BigfontExt XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfstr.h #endif -#if BuildXF86VidModeExt || BuildXF86VidModeLibrary +#if BuildXF86VidModeExt XF86VIDMODEHEADERS = xf86vmode.h xf86vmstr.h #endif -#if BuildXF86DGA || BuildXF86DGALibrary +#if BuildXF86DGA XF86DGAHEADERS = xf86dga.h xf86dgastr.h xf86dga1.h xf86dga1str.h #endif #if BuildXextLib @@ -32,9 +32,6 @@ LBXHEADERS = XLbx.h lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h \ XVHEADERS = Xv.h Xvlib.h Xvproto.h XVMCHEADERS = XvMC.h XvMClib.h XvMCproto.h vldXvMC.h #endif -#if BuildXF86RushExt || BuildXF86RushLibrary -XF86RUSHHEADERS = xf86rush.h xf86rushstr.h -#endif #if BuildFontCache FONTCACHEHEADERS = fontcache.h fontcacheP.h fontcachstr.h #endif @@ -71,7 +68,6 @@ EXTRAHEADERS = \ $(LBXHEADERS) \ $(XVHEADERS) \ $(XVMCHEADERS) \ - $(XF86RUSHHEADERS) \ $(FONTCACHEHEADERS) \ $(RENDERHEADERS) \ $(XFIXESHEADERS) \ @@ -119,8 +115,6 @@ InstallDriverSDKNonExecFile(dpms.h,$(DRIVERSDKINCLUDEDIR)/extensions) InstallDriverSDKNonExecFile(xf86dga1str.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(xf86dgastr.h,$(DRIVERSDKINCLUDEDIR)/extensions) InstallDriverSDKNonExecFile(xf86misc.h,$(DRIVERSDKINCLUDEDIR)/extensions) -InstallDriverSDKNonExecFile(xf86rush.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(xf86rushstr.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions) InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR)) diff --git a/nx-X11/include/extensions/xf86rush.h b/nx-X11/include/extensions/xf86rush.h deleted file mode 100644 index 1db7d13ec..000000000 --- a/nx-X11/include/extensions/xf86rush.h +++ /dev/null @@ -1,113 +0,0 @@ -/* $XFree86: xc/include/extensions/xf86rush.h,v 1.4 2000/02/29 03:09:00 dawes Exp $ */ -/* - -Copyright (c) 1998 Daryll Strauss - -*/ - -#ifndef _XF86RUSH_H_ -#define _XF86RUSH_H_ - -#include <X11/extensions/Xv.h> -#include <X11/Xfuncproto.h> - -#define X_XF86RushQueryVersion 0 -#define X_XF86RushLockPixmap 1 -#define X_XF86RushUnlockPixmap 2 -#define X_XF86RushUnlockAllPixmaps 3 -#define X_XF86RushGetCopyMode 4 -#define X_XF86RushSetCopyMode 5 -#define X_XF86RushGetPixelStride 6 -#define X_XF86RushSetPixelStride 7 -#define X_XF86RushOverlayPixmap 8 -#define X_XF86RushStatusRegOffset 9 -#define X_XF86RushAT3DEnableRegs 10 -#define X_XF86RushAT3DDisableRegs 11 - -#define XF86RushNumberEvents 0 - -#define XF86RushClientNotLocal 0 -#define XF86RushNumberErrors (XF86RushClientNotLocal + 1) - -#ifndef _XF86RUSH_SERVER_ - -_XFUNCPROTOBEGIN - -Bool XF86RushQueryVersion( - Display* /* dpy */, - int* /* majorVersion */, - int* /* minorVersion */ -); - -Bool XF86RushQueryExtension( - Display* /* dpy */, - int* /* event_base */, - int* /* error_base */ -); - -Bool XF86RushLockPixmap( - Display * /* dpy */, - int /* screen */, - Pixmap /* Pixmap */, - void ** /* Return address */ -); - -Bool XF86RushUnlockPixmap( - Display * /* dpy */, - int /* screen */, - Pixmap /* Pixmap */ -); - -Bool XF86RushUnlockAllPixmaps( - Display * /* dpy */ -); - -Bool XF86RushSetCopyMode( - Display * /* dpy */, - int /* screen */, - int /* copy mode */ -); - -Bool XF86RushSetPixelStride( - Display * /* dpy */, - int /* screen */, - int /* pixel stride */ -); - -Bool XF86RushOverlayPixmap( - Display * /* dpy */, - XvPortID /* port */, - Drawable /* d */, - GC /* gc */, - Pixmap /* pixmap */, - int /* src_x */, - int /* src_y */, - unsigned int /* src_w */, - unsigned int /* src_h */, - int /* dest_x */, - int /* dest_y */, - unsigned int /* dest_w */, - unsigned int /* dest_h */, - unsigned int /* id */ -); - -int XF86RushStatusRegOffset( - Display * /* dpy */, - int /* screen */ -); - -Bool XF86RushAT3DEnableRegs( - Display * /* dpy */, - int /* screen */ -); - -Bool XF86RushAT3DDisableRegs( - Display * /* dpy */, - int /* screen */ -); - -_XFUNCPROTOEND - -#endif /* _XF86RUSH_SERVER_ */ - -#endif /* _XF86RUSH_H_ */ diff --git a/nx-X11/include/extensions/xf86rushstr.h b/nx-X11/include/extensions/xf86rushstr.h deleted file mode 100644 index 8dca46a76..000000000 --- a/nx-X11/include/extensions/xf86rushstr.h +++ /dev/null @@ -1,163 +0,0 @@ -/* $XFree86: xc/include/extensions/xf86rushstr.h,v 1.4 2000/02/29 03:09:02 dawes Exp $ */ -/* - -Copyright (c) 1998 Daryll Strauss - -*/ - -#ifndef _XF86RUSHSTR_H_ -#define _XF86RUSHSTR_H_ - -#include <X11/extensions/xf86rush.h> - -#define XF86RUSHNAME "XFree86-Rush" - -#define XF86RUSH_MAJOR_VERSION 1 /* current version numbers */ -#define XF86RUSH_MINOR_VERSION 1 - -typedef struct _XF86RushQueryVersion { - CARD8 reqType; /* always RushReqCode */ - CARD8 rushReqType; /* always X_RushQueryVersion */ - CARD16 length B16; -} xXF86RushQueryVersionReq; -#define sz_xXF86RushQueryVersionReq 4 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of Rush protocol */ - CARD16 minorVersion B16; /* minor version of Rush protocol */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xXF86RushQueryVersionReply; -#define sz_xXF86RushQueryVersionReply 32 - -typedef struct _XF86RushLockPixmap { - CARD8 reqType; /* always RushReqCode */ - CARD8 rushReqType; /* always X_RushLockPixmap */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 pixmap B32; -} xXF86RushLockPixmapReq; -#define sz_xXF86RushLockPixmapReq 12 - -typedef struct { - BYTE type; - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 addr B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xXF86RushLockPixmapReply; -#define sz_xXF86RushLockPixmapReply 32 - -typedef struct _XF86RushUnlockPixmap { - CARD8 reqType; /* always RushReqCode */ - CARD8 rushReqType; /* always X_RushUnlockPixmap */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 pixmap B32; -} xXF86RushUnlockPixmapReq; -#define sz_xXF86RushUnlockPixmapReq 12 - -typedef struct _XF86RushUnlockAllPixmaps { - CARD8 reqType; /* always RushReqCode */ - CARD8 rushReqType; /* always X_RushUnlockAllPixmaps */ - CARD16 length B16; -} xXF86RushUnlockAllPixmapsReq; -#define sz_xXF86RushUnlockAllPixmapsReq 4 - -typedef struct _XF86RushSetCopyMode { - CARD8 reqType; /* always RushReqCode */ - CARD8 rushReqType; /* always X_RushSetCopyMode */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 CopyMode B32; -} xXF86RushSetCopyModeReq; -#define sz_xXF86RushSetCopyModeReq 12 - - -typedef struct _XF86RushSetPixelStride { - CARD8 reqType; /* always RushReqCode */ - CARD8 rushReqType; /* always X_RushSetCopyMode */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; - CARD32 PixelStride B32; -} xXF86RushSetPixelStrideReq; -#define sz_xXF86RushSetPixelStrideReq 12 - -typedef struct { - CARD8 reqType; /* always RushReqCode */ - CARD8 rushReqType; /* always X_RushOverlayPixmap */ - CARD16 length B16; - XvPortID port B32; - Drawable drawable B32; - GContext gc B32; - Pixmap pixmap B32; - CARD32 id B32; - INT16 src_x B16; - INT16 src_y B16; - CARD16 src_w B16; - CARD16 src_h B16; - INT16 drw_x B16; - INT16 drw_y B16; - CARD16 drw_w B16; - CARD16 drw_h B16; -} xXF86RushOverlayPixmapReq; -#define sz_xXF86RushOverlayPixmapReq 40 - -typedef struct _XF86RushStatusRegOffset { - CARD8 reqType; /* always RushReqCode */ - CARD8 rushReqType; /* always X_RushStatusRegOffset */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; -} xXF86RushStatusRegOffsetReq; -#define sz_xXF86RushStatusRegOffsetReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - BOOL pad1; - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD32 offset B32; /* Offset of Rush status reg in mem */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xXF86RushStatusRegOffsetReply; -#define sz_xXF86RushStatusRegOffsetReply 32 - -typedef struct _XF86RushAT3DEnableRegs { - CARD8 reqType; /* always RushReqCode */ - CARD8 rushReqType; /* always X_RushAT3DEnableRegs */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; -} xXF86RushAT3DEnableRegsReq; -#define sz_xXF86RushAT3DEnableRegsReq 8 - -typedef struct _XF86RushAT3DDisableRegs { - CARD8 reqType; /* always RushReqCode */ - CARD8 rushReqType; /* always X_RushAT3DDisableRegs */ - CARD16 length B16; - CARD16 screen B16; - CARD16 pad B16; -} xXF86RushAT3DDisableRegsReq; -#define sz_xXF86RushAT3DDisableRegsReq 8 - -#endif /* _XF86RUSHSTR_H_ */ diff --git a/nx-X11/lib/GL/GL/GL-def.cpp b/nx-X11/lib/GL/GL/GL-def.cpp deleted file mode 100644 index 74549ebed..000000000 --- a/nx-X11/lib/GL/GL/GL-def.cpp +++ /dev/null @@ -1,493 +0,0 @@ -LIBRARY libGL -VERSION LIBRARY_VERSION -EXPORTS - glClearIndex @ 1 - glClearColor @ 2 - glClear @ 3 - glIndexMask @ 4 - glColorMask @ 5 - glAlphaFunc @ 6 - glBlendFunc @ 7 - glLogicOp @ 8 - glCullFace @ 9 - glFrontFace @ 10 - glPointSize @ 11 - glLineWidth @ 12 - glLineStipple @ 13 - glPolygonMode @ 14 - glPolygonStipple @ 15 - glGetPolygonStipple @ 16 - glEdgeFlag @ 17 - glEdgeFlagv @ 18 - glScissor @ 19 - glClipPlane @ 20 - glGetClipPlane @ 21 - glDrawBuffer @ 22 - glReadBuffer @ 23 - glEnable @ 24 - glDisable @ 25 - glIsEnabled @ 26 - glGetBooleanv @ 27 - glGetDoublev @ 28 - glGetFloatv @ 29 - glGetIntegerv @ 30 - glPushAttrib @ 31 - glPopAttrib @ 32 - glRenderMode @ 33 - glGetError @ 34 - glGetString @ 35 - glFinish @ 36 - glFlush @ 37 - glHint @ 38 - glClearDepth @ 39 - glDepthFunc @ 40 - glDepthMask @ 41 - glDepthRange @ 42 - glClearAccum @ 43 - glAccum @ 44 - glMatrixMode @ 45 - glOrtho @ 46 - glFrustum @ 47 - glViewport @ 48 - glPushMatrix @ 49 - glPopMatrix @ 50 - glLoadIdentity @ 51 - glLoadMatrixd @ 52 - glLoadMatrixf @ 53 - glMultMatrixd @ 54 - glMultMatrixf @ 55 - glRotated @ 56 - glRotatef @ 57 - glScaled @ 58 - glScalef @ 59 - glTranslated @ 60 - glTranslatef @ 61 - glIsList @ 62 - glDeleteLists @ 63 - glGenLists @ 64 - glNewList @ 65 - glEndList @ 66 - glCallList @ 67 - glCallLists @ 68 - glListBase @ 69 - glBegin @ 70 - glEnd @ 71 - glVertex2d @ 72 - glVertex2f @ 73 - glVertex2i @ 74 - glVertex2s @ 75 - glVertex3d @ 76 - glVertex3f @ 77 - glVertex3i @ 78 - glVertex3s @ 79 - glVertex4d @ 80 - glVertex4f @ 81 - glVertex4i @ 82 - glVertex4s @ 83 - glVertex2dv @ 84 - glVertex2fv @ 85 - glVertex2iv @ 86 - glVertex2sv @ 87 - glVertex3dv @ 88 - glVertex3fv @ 89 - glVertex3iv @ 90 - glVertex3sv @ 91 - glVertex4dv @ 92 - glVertex4fv @ 93 - glVertex4iv @ 94 - glVertex4sv @ 95 - glNormal3b @ 96 - glNormal3d @ 97 - glNormal3f @ 98 - glNormal3i @ 99 - glNormal3s @ 100 - glNormal3bv @ 101 - glNormal3dv @ 102 - glNormal3fv @ 103 - glNormal3iv @ 104 - glNormal3sv @ 105 - glIndexd @ 106 - glIndexf @ 107 - glIndexi @ 108 - glIndexs @ 109 - glIndexdv @ 110 - glIndexfv @ 111 - glIndexiv @ 112 - glIndexsv @ 113 - glColor3b @ 114 - glColor3d @ 115 - glColor3f @ 116 - glColor3i @ 117 - glColor3s @ 118 - glColor3ub @ 119 - glColor3ui @ 120 - glColor3us @ 121 - glColor4b @ 122 - glColor4d @ 123 - glColor4f @ 124 - glColor4i @ 125 - glColor4s @ 126 - glColor4ub @ 127 - glColor4ui @ 128 - glColor4us @ 129 - glColor3bv @ 130 - glColor3dv @ 131 - glColor3fv @ 132 - glColor3iv @ 133 - glColor3sv @ 134 - glColor3ubv @ 135 - glColor3uiv @ 136 - glColor3usv @ 137 - glColor4bv @ 138 - glColor4dv @ 139 - glColor4fv @ 140 - glColor4iv @ 141 - glColor4sv @ 142 - glColor4ubv @ 143 - glColor4uiv @ 144 - glColor4usv @ 145 - glTexCoord1d @ 146 - glTexCoord1f @ 147 - glTexCoord1i @ 148 - glTexCoord1s @ 149 - glTexCoord2d @ 150 - glTexCoord2f @ 151 - glTexCoord2i @ 152 - glTexCoord2s @ 153 - glTexCoord3d @ 154 - glTexCoord3f @ 155 - glTexCoord3i @ 156 - glTexCoord3s @ 157 - glTexCoord4d @ 158 - glTexCoord4f @ 159 - glTexCoord4i @ 160 - glTexCoord4s @ 161 - glTexCoord1dv @ 162 - glTexCoord1fv @ 163 - glTexCoord1iv @ 164 - glTexCoord1sv @ 165 - glTexCoord2dv @ 166 - glTexCoord2fv @ 167 - glTexCoord2iv @ 168 - glTexCoord2sv @ 169 - glTexCoord3dv @ 170 - glTexCoord3fv @ 171 - glTexCoord3iv @ 172 - glTexCoord3sv @ 173 - glTexCoord4dv @ 174 - glTexCoord4fv @ 175 - glTexCoord4iv @ 176 - glTexCoord4sv @ 177 - glRasterPos2d @ 178 - glRasterPos2f @ 179 - glRasterPos2i @ 180 - glRasterPos2s @ 181 - glRasterPos3d @ 182 - glRasterPos3f @ 183 - glRasterPos3i @ 184 - glRasterPos3s @ 185 - glRasterPos4d @ 186 - glRasterPos4f @ 187 - glRasterPos4i @ 188 - glRasterPos4s @ 189 - glRasterPos2dv @ 190 - glRasterPos2fv @ 191 - glRasterPos2iv @ 192 - glRasterPos2sv @ 193 - glRasterPos3dv @ 194 - glRasterPos3fv @ 195 - glRasterPos3iv @ 196 - glRasterPos3sv @ 197 - glRasterPos4dv @ 198 - glRasterPos4fv @ 199 - glRasterPos4iv @ 200 - glRasterPos4sv @ 201 - glRectd @ 202 - glRectf @ 203 - glRecti @ 204 - glRects @ 205 - glRectdv @ 206 - glRectfv @ 207 - glRectiv @ 208 - glRectsv @ 209 - glShadeModel @ 210 - glLightf @ 211 - glLighti @ 212 - glLightfv @ 213 - glLightiv @ 214 - glGetLightfv @ 215 - glGetLightiv @ 216 - glLightModelf @ 217 - glLightModeli @ 218 - glLightModelfv @ 219 - glLightModeliv @ 220 - glMaterialf @ 221 - glMateriali @ 222 - glMaterialfv @ 223 - glMaterialiv @ 224 - glGetMaterialfv @ 225 - glGetMaterialiv @ 226 - glColorMaterial @ 227 - glPixelZoom @ 228 - glPixelStoref @ 229 - glPixelStorei @ 230 - glPixelTransferf @ 231 - glPixelTransferi @ 232 - glPixelMapfv @ 233 - glPixelMapuiv @ 234 - glPixelMapusv @ 235 - glGetPixelMapfv @ 236 - glGetPixelMapuiv @ 237 - glGetPixelMapusv @ 238 - glBitmap @ 239 - glReadPixels @ 240 - glDrawPixels @ 241 - glCopyPixels @ 242 - glStencilFunc @ 243 - glStencilMask @ 244 - glStencilOp @ 245 - glClearStencil @ 246 - glTexGend @ 247 - glTexGenf @ 248 - glTexGeni @ 249 - glTexGendv @ 250 - glTexGenfv @ 251 - glTexGeniv @ 252 - glGetTexGendv @ 253 - glGetTexGenfv @ 254 - glGetTexGeniv @ 255 - glTexEnvf @ 256 - glTexEnvi @ 257 - glTexEnvfv @ 258 - glTexEnviv @ 259 - glGetTexEnvfv @ 260 - glGetTexEnviv @ 261 - glTexParameterf @ 262 - glTexParameteri @ 263 - glTexParameterfv @ 264 - glTexParameteriv @ 265 - glGetTexParameterfv @ 266 - glGetTexParameteriv @ 267 - glGetTexLevelParameterfv @ 268 - glGetTexLevelParameteriv @ 269 - glTexImage1D @ 270 - glTexImage2D @ 271 - glGetTexImage @ 272 - glMap1d @ 273 - glMap1f @ 274 - glMap2d @ 275 - glMap2f @ 276 - glGetMapdv @ 277 - glGetMapfv @ 278 - glGetMapiv @ 279 - glEvalCoord1d @ 280 - glEvalCoord1f @ 281 - glEvalCoord1dv @ 282 - glEvalCoord1fv @ 283 - glEvalCoord2d @ 284 - glEvalCoord2f @ 285 - glEvalCoord2dv @ 286 - glEvalCoord2fv @ 287 - glMapGrid1d @ 288 - glMapGrid1f @ 289 - glMapGrid2d @ 290 - glMapGrid2f @ 291 - glEvalPoint1 @ 292 - glEvalPoint2 @ 293 - glEvalMesh1 @ 294 - glEvalMesh2 @ 295 - glFogf @ 296 - glFogi @ 297 - glFogfv @ 298 - glFogiv @ 299 - glFeedbackBuffer @ 300 - glPassThrough @ 301 - glSelectBuffer @ 302 - glInitNames @ 303 - glLoadName @ 304 - glPushName @ 305 - glPopName @ 306 -; glBlendEquationEXT @ 307 -; glBlendColorEXT @ 308 - glPolygonOffset @ 309 -#ifndef __UNIXOS2__ -; glVertexPointerEXT @ 310 -; glNormalPointerEXT @ 311 -#else - glVertexPointerEXT @ 310 - glNormalPointerEXT @ 311 -#endif -; glColorPointerEXT @ 312 -; glIndexPointerEXT @ 313 -; glTexCoordPointerEXT @ 314 -; glEdgeFlagPointerEXT @ 315 -; glGetPointervEXT @ 316 -; glArrayElementEXT @ 317 -#ifndef __UNIXOS2__ -; glDrawArraysEXT @ 318 -#else - glDrawArraysEXT @ 318 -#endif -; OSMesaCreateContext @ 319 -; OSMesaDestroyContext @ 320 -; OSMesaMakeCurrent @ 321 -; XMesaCreateContext @ 322 -; XMesaDestroyContext @ 323 -; XMesaMakeCurrent @ 326 -; XMesaGetCurrentContext @ 327 -; XMesaSwapBuffers @ 328 -; XMesaGetBackBuffer @ 329 - glXChooseVisual @ 330 - glXCreateContext @ 331 - glXDestroyContext @ 332 - glXMakeCurrent @ 333 - glXCopyContext @ 334 - glXSwapBuffers @ 335 - glXCreateGLXPixmap @ 336 - glXDestroyGLXPixmap @ 337 - glXQueryExtension @ 338 - glXQueryVersion @ 339 - glXIsDirect @ 340 - glXGetConfig @ 341 - glXGetCurrentContext @ 342 - glXGetCurrentDrawable @ 343 - glXWaitGL @ 344 - glXWaitX @ 345 - glXUseXFont @ 346 - glXQueryExtensionsString @ 347 - glXQueryServerString @ 348 - glXGetClientString @ 349 - glPushClientAttrib @ 350 - glPopClientAttrib @ 351 - glIndexub @ 352 - glIndexubv @ 353 - glVertexPointer @ 354 - glNormalPointer @ 355 - glColorPointer @ 356 - glIndexPointer @ 357 - glTexCoordPointer @ 358 - glEdgeFlagPointer @ 359 - glGetPointerv @ 360 - glArrayElement @ 361 - glDrawArrays @ 362 - glDrawElements @ 363 - glInterleavedArrays @ 364 - glGenTextures @ 365 - glDeleteTextures @ 366 - glBindTexture @ 367 - glPrioritizeTextures @ 368 - glAreTexturesResident @ 369 - glIsTexture @ 370 - glTexSubImage1D @ 371 - glTexSubImage2D @ 372 - glCopyTexImage1D @ 373 - glCopyTexImage2D @ 374 - glCopyTexSubImage1D @ 375 - glCopyTexSubImage2D @ 376 -; glWindowPos2iMESA @ 377 -; glWindowPos2sMESA @ 378 -#ifndef __UNIXOS2__ -; glWindowPos2fMESA @ 379 -#else - glWindowPos2fMESA @ 379 -#endif -; glWindowPos2dMESA @ 380 -; glWindowPos2ivMESA @ 381 -; glWindowPos2svMESA @ 382 -; glWindowPos2fvMESA @ 383 -; glWindowPos2dvMESA @ 384 -; glWindowPos3iMESA @ 385 -; glWindowPos3sMESA @ 386 -; glWindowPos3fMESA @ 387 -; glWindowPos3dMESA @ 388 -; glWindowPos3ivMESA @ 389 -; glWindowPos3svMESA @ 390 -; glWindowPos3fvMESA @ 391 -; glWindowPos3dvMESA @ 392 -; glWindowPos4iMESA @ 393 -; glWindowPos4sMESA @ 394 -; glWindowPos4fMESA @ 395 -; glWindowPos4dMESA @ 396 -; glWindowPos4ivMESA @ 397 -; glWindowPos4svMESA @ 398 -; glWindowPos4fvMESA @ 399 -; glWindowPos4dvMESA @ 400 -#ifndef __UNIXOS2__ -; glXCreateGLXPixmapMESA @ 401 -#else - glXCreateGLXPixmapMESA @ 401 -#endif -; glXReleaseBuffersMESA @ 402 -; OSMesaGetCurrentContext @ 403 -; OSMesaPixelStore @ 404 -; OSMesaGetIntegerv @ 405 -; XMesaCreateVisual @ 406 -; XMesaDestroyVisual @ 407 -; XMesaCreateWindowBuffer @ 408 -; XMesaCreatePixmapBuffer @ 409 -; XMesaDestroyBuffer @ 410 -; XMesaGetCurrentBuffer @ 411 -; XMesaFlush @ 412 -; XMesaGetString @ 413 -; glPolygonOffsetEXT @ 414 - glDisableClientState @ 450 - glEnableClientState @ 451 - glXFreeContextEXT @ 452 - glXGetContextIDEXT @ 453 - glXGetCurrentDisplay @ 454 - glXImportContextEXT @ 455 - glXQueryContextInfoEXT @ 456 -#ifndef __UNIXOS2__ - glXGetCurrentDrawableEXT @ 457 -#endif - glCopyTexSubImage3D @ 458 - glDrawRangeElements @ 459 - glTexSubImage3D @ 460 - glBlendColorEXT @ 461 - glBlendEquationEXT @ 462 - glTexImage3D @ 463 -#ifdef __UNIXOS2__ - _glapi_Context @ 500 - _glapi_Dispatch @ 501 - glMultiTexCoord1svARB @ 502 - glMultiTexCoord1ivARB @ 503 - glMultiTexCoord1fvARB @ 504 - glMultiTexCoord1dvARB @ 505 - glMultiTexCoord2svARB @ 506 - glMultiTexCoord2ivARB @ 507 - glMultiTexCoord2fvARB @ 508 - glMultiTexCoord2dvARB @ 509 - glMultiTexCoord3svARB @ 510 - glMultiTexCoord3ivARB @ 511 - glMultiTexCoord3fvARB @ 512 - glMultiTexCoord3dvARB @ 513 - glMultiTexCoord4svARB @ 514 - glMultiTexCoord4ivARB @ 515 - glMultiTexCoord4fvARB @ 516 - glMultiTexCoord4dvARB @ 517 - glMultiTexCoord1fARB @ 518 - glMultiTexCoord2fARB @ 519 - glMultiTexCoord3fARB @ 520 - glMultiTexCoord4fARB @ 521 - _glapi_set_dispatch @ 522 - _glapi_noop_enable_warnings @ 523 - _glapi_add_entrypoint @ 524 - _glapi_get_dispatch_table_size @ 525 - _glapi_check_multithread @ 526 - _glapi_set_context @ 527 - _glapi_get_context @ 528 - glColorTable @ 529 - glColorSubTable @ 530 - glConvolutionFilter1D @ 531 - glConvolutionFilter2D @ 532 - glXGetProcAddressARB @ 533 - glLockArraysEXT @ 534 - glUnlockArraysEXT @ 535 - glActiveTextureARB @ 536 - glColorTableEXT @ 537 - glPointParameterfEXT @ 538 - glPointParameterfvEXT @ 539 - glXMakeContextCurrent @ 540 -#endif - -/* $XFree86: xc/lib/GL/GL/GL-def.cpp,v 1.2 2003/03/25 04:18:07 dawes Exp $ */ diff --git a/nx-X11/lib/GL/GL/Imakefile b/nx-X11/lib/GL/GL/Imakefile deleted file mode 100644 index 8c3ac0af4..000000000 --- a/nx-X11/lib/GL/GL/Imakefile +++ /dev/null @@ -1,244 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/GL/Imakefile,v 1.23 2003/11/17 03:10:41 dawes Exp $ - -#include <Threads.tmpl> - -#define DoNormalLib NormalLibGlx -#define DoSharedLib SharedLibGlx -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx - -#ifndef ShLibBindGlobals -#if !HasGcc2 || (GccMajorVersion > 2) || (GccMinorVersion > 7) -#define ShlibBindGlobals YES -#endif -#endif - - LIBNAME = GL - SOREV = $(SOGLREV) - -#ifdef SharedGLReqs -BASEREQUIREDLIBS = SharedGLReqs -#endif - -#include "../mesa/array_cache/Imakefile.inc" -#include "../mesa/math/Imakefile.inc" -#include "../mesa/swrast/Imakefile.inc" -#include "../mesa/swrast_setup/Imakefile.inc" -#include "../mesa/tnl/Imakefile.inc" -#include "../mesa/tnl_dd/Imakefile.inc" -#include "../mesa/Imakefile.inc" -#ifdef i386Architecture -#include "../mesa/x86/Imakefile.inc" -#endif -#ifdef SparcArchitecture -#include "../mesa/sparc/Imakefile.inc" -#endif - - -#if BuildXF86DRI && defined(i386Architecture) && MesaUseX86Asm - GLAPI_OBJ = $(GLXLIBSRC)/glx/glapi_x86.o -#endif - - GLXOBJS = $(GLXLIBSRC)/glx/?*.o - GLXUOBJS = $(GLXLIBSRC)/glx/unshared/?*.o $(GLAPI_OBJ) - GLXDOBJS = $(GLXLIBSRC)/glx/debugger/?*.o $(GLAPI_OBJ) - GLXPOBJS = $(GLXLIBSRC)/glx/profiled/?*.o $(GLAPI_OBJ) - -#if BuildXF86DRI - DRMOBJS = $(GLXLIBSRC)/dri/drm/?*.o - DRMUOBJS = $(GLXLIBSRC)/dri/drm/unshared/?*.o - DRMDOBJS = $(GLXLIBSRC)/dri/drm/debugger/?*.o - DRMPOBJS = $(GLXLIBSRC)/dri/drm/profiled/?*.o - - MESAOBJS = $(COREMESAOBJS) $(MESA_ASM_OBJS) - MESAUOBJS = $(COREMESAUOBJS) $(MESA_ASM_UOBJS) - MESADOBJS = $(COREMESADOBJS) $(MESA_ASM_DOBJS) - MESAPOBJS = $(COREMESAPOBJS) $(MESA_ASM_POBJS) - -#if GlxUseBuiltInDRIDriver -#include "../mesa/drivers/dri/common/Imakefile.inc" -#endif - - -#if GlxUseSGISI - -XCOMM nothing - -#elif GlxBuiltInGamma - -#define MesaDrvGammaBuildDir $(GLXLIBSRC)/mesa/drivers/dri/gamma/ -#include "../mesa/drivers/dri/gamma/Imakefile.inc" - - DRVOBJS = $(GAMMAOBJS) $(MESAOBJS) - DRVUOBJS = $(GAMMAUOBJS) $(MESAUOBJS) - DRVDOBJS = $(GAMMADOBJS) $(MESADOBJS) - DRVPOBJS = $(GAMMAPOBJS) $(MESAPOBJS) - -#elif GlxBuiltInTdfx - -#define MesaDrvTdfxBuildDir $(GLXLIBSRC)/mesa/drivers/dri/tdfx/ -#include "../mesa/drivers/dri/tdfx/Imakefile.inc" - - DRVOBJS = $(TDFXOBJS) $(MESAOBJS) - DRVUOBJS = $(TDFXUOBJS) $(MESAUOBJS) - DRVDOBJS = $(TDFXDOBJS) $(MESADOBJS) - DRVPOBJS = $(TDFXPOBJS) $(MESAPOBJS) - -OTHERREQUIREDLIBS = -lglide3 -ldl - -#elif GlxBuiltInI810 - -#define MesaDrvI810BuildDir $(GLXLIBSRC)/mesa/drivers/dri/i810/ -#include "../mesa/drivers/dri/i810/Imakefile.inc" - - DRVOBJS = $(I810OBJS) $(COMMONOBJS) $(MESAOBJS) - DRVUOBJS = $(I810UOBJS) $(COMMONUOBJS) $(MESAUOBJS) - DRVDOBJS = $(I810DOBJS) $(COMMONDOBJS) $(MESADOBJS) - DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS) - -#elif GlxBuiltInI915 -#define MesaDrvI915BuildDir $(GLXLIBSRC)/mesa/drivers/dri/i915/ -#include "../mesa/drivers/dri/i915/Imakefile.inc" - - DRVOBJS = $(I915OBJS) $(COMMONOBJS) $(MESAOBJS) - DRVUOBJS = $(I915UOBJS) $(COMMONUOBJS) $(MESAUOBJS) - DRVDOBJS = $(I915DOBJS) $(COMMONDOBJS) $(MESADOBJS) - DRVPOBJS = $(I915POBJS) $(COMMONPOBJS) $(MESAPOBJS) - -#elif GlxBuiltInMga - -#define MesaDrvMgaBuildDir $(GLXLIBSRC)/mesa/drivers/dri/mga/ -#include "../mesa/drivers/dri/mga/Imakefile.inc" - - DRVOBJS = $(MGAOBJS) $(COMMONOBJS) $(MESAOBJS) - DRVUOBJS = $(MGAUOBJS) $(COMMONUOBJS) $(MESAUOBJS) - DRVDOBJS = $(MGADOBJS) $(COMMONDOBJS) $(MESADOBJS) - DRVPOBJS = $(MGAPOBJS) $(COMMONPOBJS) $(MESAPOBJS) - -#elif GlxBuiltInR128 - -#define MesaDrvR128BuildDir $(GLXLIBSRC)/mesa/drivers/dri/r128/ -#include "../mesa/drivers/dri/r128/Imakefile.inc" - - DRVOBJS = $(R128OBJS) $(COMMONOBJS) $(MESAOBJS) - DRVUOBJS = $(R128UOBJS) $(COMMONUOBJS) $(MESAUOBJS) - DRVDOBJS = $(R128DOBJS) $(COMMONDOBJS) $(MESADOBJS) - DRVPOBJS = $(R128POBJS) $(COMMONPOBJS) $(MESAPOBJS) - -#elif GlxBuiltInRadeon - -#define MesaDrvRadeonBuildDir $(GLXLIBSRC)/mesa/drivers/dri/radeon/ -#include "../mesa/drivers/dri/radeon/Imakefile.inc" - - DRVOBJS = $(RADEONOBJS) $(COMMONOBJS) $(MESAOBJS) - DRVUOBJS = $(RADEONUOBJS) $(COMMONUOBJS) $(MESAUOBJS) - DRVDOBJS = $(RADEONDOBJS) $(COMMONDOBJS) $(MESADOBJS) - DRVPOBJS = $(RADEONPOBJS) $(COMMONPOBJS) $(MESAPOBJS) - -#elif GlxBuiltInFfb - -#define MesaDrvFfbBuildDir $(GLXLIBSRC)/mesa/drivers/dri/ffb/ -#include "../mesa/drivers/dri/ffb/Imakefile.inc" - - DRVOBJS = $(FFBOBJS) $(MESAOBJS) - DRVUOBJS = $(FFBUOBJS) $(MESAUOBJS) - DRVDOBJS = $(FFBDOBJS) $(MESADOBJS) - DRVPOBJS = $(FFBPOBJS) $(MESAPOBJS) - -#elif GlxBuiltInSIS - -#define MesaDrvSisBuildDir $(GLXLIBSRC)/mesa/drivers/dri/sis/ -#include "../mesa/drivers/dri/sis/Imakefile.inc" - - DRVOBJS = $(SISOBJS) $(MESAOBJS) - DRVUOBJS = $(SISUOBJS) $(MESAUOBJS) - DRVDOBJS = $(SISDOBJS) $(MESADOBJS) - DRVPOBJS = $(SISPOBJS) $(MESAPOBJS) - -#elif GlxBuiltInXMesa - -#include "../mesa/drivers/x11/Imakefile.inc" - - DRVOBJS = $(MESAOBJS) $(XMESA_OBJS) - DRVUOBJS = $(MESAUOBJS) $(XMESA_UOBJS) - DRVDOBJS = $(MESADOBJS) $(XMESA_DOBJS) - DRVPOBJS = $(MESAPOBJS) $(XMESA_POBJS) - -#else - -XCOMM No built-in drivers. This is the usual case. - -#endif - -#endif /* BuildXF86DRI */ - -#if defined(DarwinArchitecture) && BuildAppleDRI - APPLEOBJS = appledri.o dri_dispatch.o dri_driver.o dri_glx.o x-list.o x-hash.o - DRIOBJS = $(APPLEOBJS:%.o=$(GLXLIBSRC)/apple/%.o) - DRIUOBJS = $(APPLEOBJS:%.o=$(GLXLIBSRC)/apple/unshared/%.o) - DRIDOBJS = $(APPLEOBJS:%.o=$(GLXLIBSRC)/apple/debugger/%.o) - DRIPOBJS = $(APPLEOBJS:%.o=$(GLXLIBSRC)/apple/profiled/%.o) - -NATIVE_GL = /System/Library/Frameworks/OpenGL.framework - -OTHERREQUIREDLIBS = \ - XpluginLibrary $(NATIVE_GL)/Libraries/libGL.dylib -sub_library libGL \ - -framework ApplicationServices -framework CoreFoundation \ - -framework OpenGL -#endif - -#if BuildXF86DRI && BuildXF86VidModeExt -VMODEREQUIREDLIBS = $(LDPRELIBS) $(XXF86VMLIB) -#endif - -/* - * Note: DRIDIRS is empty for !BuildXF86DRI, and DRVSUBDIRS is empty - * for no built-in drivers. - */ - -REQUIREDLIBS = $(OTHERREQUIREDLIBS) $(VMODEREQUIREDLIBS) $(BASEREQUIREDLIBS) - - OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(DRMOBJS) -#if HasSharedLibraries && !SharedLibGlxWithoutPIC - UOBJS = $(GLXUOBJS) $(DRIUOBJS) $(DRVUOBJS) $(DRMUOBJS) -#else - UOBJS = $(OBJS) -#endif - DOBJS = $(GLXDOBJS) $(DRIDOBJS) $(DRVDOBJS) $(DRMDOBJS) - POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) $(DRMPOBJS) - -#if LocalThreads - THREADOBJS = $(THREADS_LIBS) -#endif - -#include <Library.tmpl> - -#undef _LinkBuildLibrary -#define _LinkBuildLibrary(lib) LinkBuildLibrary(lib) - - -#if NormalLibGlx -NormalLibraryTarget($(LIBNAME),$(UOBJS)) -InstallLibrary($(LIBNAME),$(USRLIBDIR)) -#endif -#if SharedLibGlx -SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(OBJS),$(OBJS) $(THREADOBJS),.,.) -InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) -#if LinkGLToUsrLib && AlternateUsrLibDir -install:: - MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR)) - $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so - $(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so || true - $(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 - $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 || true -#endif -#endif -#if DebugLibGlx -DebuggedLibraryTarget($(LIBNAME),$(DOBJS)) -InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) -#endif -#if ProfileLibGlx -ProfiledLibraryTarget($(LIBNAME),$(POBJS)) -InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) -#endif diff --git a/nx-X11/lib/GL/Imakefile b/nx-X11/lib/GL/Imakefile deleted file mode 100644 index 6b350203c..000000000 --- a/nx-X11/lib/GL/Imakefile +++ /dev/null @@ -1,133 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.43 2003/06/30 01:45:10 torrey Exp $ - -XCOMM -XCOMM Imake tokens which are significant to building libGL: -XCOMM -XCOMM BuildGLXLibrary - if defined, build libs in xc/lib/GL and xc/lib/GLw -XCOMM -XCOMM BuildXF86DRI - if defined, build libGL with DRI capability -XCOMM -XCOMM Only zero or one of the following can be defined at once: -XCOMM GlxBuiltInGamma - if defined, build gamma_dri.so driver into libGL -XCOMM GlxBuiltInTdfx - if defined, build tdfx_dri.so driver into libGL -XCOMM GlxBuiltInMga - if defined, build mga_dri.so driver into libGL -XCOMM GlxBuiltInI810 - if defined, build i810_dri.so driver into libGL -XCOMM GlxBuiltInR128 - if defined, build r128_dri.so driver into libGL -XCOMM GlxBuiltInRadeon - if defined, build radeon_dri.so driver into libGL -XCOMM GlxBuiltInR200 - if defined, build r200_dri.so driver into libGL -XCOMM GlxBuiltInFfb - if defined, build ffb_dri.so driver into libGL -XCOMM GlxBuiltInSIS - if defined, build sis_dri.so driver into libGL -XCOMM -XCOMM GlxUseBuiltInDRIDriver - automatically defined if any of the -XCOMM GlxBuiltIn[Gamma,Tdfx,Mga,I810,R128,Radeon,R200,Ffb,SIS] tokens is -XCOMM defined -XCOMM -XCOMM GlxBuiltInXMesa - if defined, build XMesa (Xlib Mesa driver) into libGL -XCOMM to enable rendering to displays that lack the GLX extension. -XCOMM -XCOMM GlxDriverUsesMesa - will be defined if building a DRI driver into -XCOMM libGL and it uses Mesa. -XCOMM -XCOMM GlxUseSGISI - if defined, use the SGI OpenGL Sample Implementation -XCOMM to build the GLX server extension (not fully implemented yet). -XCOMM -XCOMM NormalLibGlx - if defined, build static libGL.a library -XCOMM -XCOMM SharedLibGlx - if defined, build dynamic libGL.so library -XCOMM -XCOMM DebugLibGlx - if defined, build libGL with debug info -XCOMM -XCOMM ProfileLibGlx - if defined, build libGL with profiling info -XCOMM -XCOMM SharedGlxRev - dynamic library version, currently defined to be "1.2" -XCOMM -XCOMM GlxSoProf - if defined, build dynamic libGL for profiling with soprof -XCOMM -XCOMM GlxStubLib - purpose??? -XCOMM -XCOMM -XCOMM Server-side tokens: -XCOMM BuildGlxExt -XCOMM GlxUseSGISI - -NULL = - -#include <Threads.tmpl> - -#define IHaveSubdirs - -#define PassCDebugFlags - -LIBGLBUILDDIR = GL - GLXDIRS = glx - -/* - * Need to build the Mesa + XMesa source in the following cases: - * BuildXF86DRI && defined(DriDrivers) - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - */ -#if BuildOSMesaLib || \ - (BuildXF86DRI && \ - (defined(DriDrivers) || GlxDriverUsesMesa || GlxBuiltInXMesa)) - MESADIRS = mesa -#endif - -/* - * Only need the OSmesa code in the following case: - * BuildOSMesaLib - */ -#if BuildOSMesaLib - OSMESADIRS = mesa/drivers/osmesa -#endif - -/* - * Need to build the DRI code in the following cases: - * BuildXF86DRI - */ -#if BuildXF86DRI - DRIDIRS = dri/drm -#endif - -/* - * Need to build the DRI drivers in the following cases: - * BuildXF86DRI && defined(DriDrivers) - */ -#if BuildXF86DRI && defined(DriDrivers) - DRIVERDIRS = mesa/drivers/dri -#endif - -#if defined(DarwinArchitecture) && BuildAppleDRI - DRIDIRS = apple -#endif - -/* - * The build order depends on whether the drivers are loaded into libGL or - * built-in to libGL. In the former case, libGL needs to be built before - * the drivers, and in the latter case, it needs to be built after the driver. - */ -#if BuildXF86DRI && GlxUseBuiltInDRIDriver -SUBDIRS = \ - $(MESADIRS) \ - $(DRIDIRS) \ - $(DRIVERDIRS) \ - $(GLXDIRS) \ - $(LIBGLBUILDDIR) \ - $(OSMESADIRS) \ - $(NULL) -#else -SUBDIRS = \ - $(MESADIRS) \ - $(GLXDIRS) \ - $(DRIDIRS) \ - $(LIBGLBUILDDIR) \ - $(OSMESADIRS) \ - $(DRIVERDIRS) \ - $(NULL) -#endif - -MakeSubdirs($(SUBDIRS)) - -DependSubdirs($(SUBDIRS)) - diff --git a/nx-X11/lib/GL/glx/Imakefile b/nx-X11/lib/GL/glx/Imakefile deleted file mode 100644 index 97d3b3224..000000000 --- a/nx-X11/lib/GL/glx/Imakefile +++ /dev/null @@ -1,233 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.22 2003/11/12 00:10:24 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., -XCOMM attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 -XCOMM or at http://www.sgi.com/software/opensource/glx/license.html. -XCOMM -XCOMM Software distributed under the License is distributed on an "AS IS" -XCOMM basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY -XCOMM IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR -XCOMM PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific -XCOMM language governing rights and limitations under the License. -XCOMM -XCOMM The Original Software is GLX version 1.2 source code, released February, -XCOMM 1999. The developer of the Original Software is Silicon Graphics, Inc. -XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc. -XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. - -XCOMM $XdotOrg: xc/lib/GL/glx/Imakefile,v 1.12 2005/08/23 04:03:51 airlied Exp $ - -#include <Threads.tmpl> - -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -XCOMM #define IHaveSubdirs -XCOMM #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' -XCOMM -XCOMM SUBDIRS = \ -XCOMM glu \ -XCOMM glw - -/* Files from Mesa */ - -LinkSourceFile(glapi.c, $(MESASRCDIR)/src/mesa/glapi) -LinkSourceFile(glthread.c, $(MESASRCDIR)/src/mesa/glapi) -LinkSourceFile(glcontextmodes.c, $(MESASRCDIR)/src/mesa/drivers/dri/common) -LinkSourceFile(glcontextmodes.h, $(MESASRCDIR)/src/mesa/drivers/dri/common) -LinkSourceFile(dispatch.c, $(MESASRCDIR)/src/mesa/main) - -#ifdef i386Architecture -LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/mesa/x86) -#endif -#ifdef SparcArchitecture -LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/mesa/sparc) -#endif - -LinkSourceFile(XF86dri.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(clientattrib.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(compsize.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(dri_glx.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(dri_glx.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(eval.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(glx_pbuffer.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(glx_query.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(glx_texture_compression.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(glxclient.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(glxcmds.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(glxext.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(glxextensions.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(glxextensions.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_init.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_init.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_size.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_size.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_transpose_matrix.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_va_private.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_vertex_array.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_vertex_array.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_vertex_program.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(indirect_window_pos.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(packrender.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(packsingle.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(pixel.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(pixelstore.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(render2.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(renderpix.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(single2.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(singlepix.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(vertarr.c, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(xf86dri.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(xf86dristr.h, $(MESASRCDIR)/src/glx/x11) -LinkSourceFile(xfont.c, $(MESASRCDIR)/src/glx/x11) - -/* - * Maybe some of these could come from - * xc/extras/ogl-sample/main/glx/lib at some point. - */ - GLX_SRCS = \ - clientattrib.c \ - compsize.c \ - dispatch.c \ - eval.c \ - glapi.c \ - glthread.c \ - glx_pbuffer.c \ - glx_query.c \ - glx_texture_compression.c \ - glxcmds.c \ - glxext.c \ - glxextensions.c \ - glcontextmodes.c \ - indirect.c \ - indirect_init.c \ - indirect_size.c \ - indirect_transpose_matrix.c \ - indirect_vertex_array.c \ - indirect_vertex_program.c \ - indirect_window_pos.c \ - pixel.c \ - pixelstore.c \ - render2.c \ - renderpix.c \ - single2.c \ - singlepix.c \ - vertarr.c \ - xfont.c - - GLX_OBJS = \ - clientattrib.o \ - compsize.o \ - eval.o \ - dispatch.o \ - glapi.o \ - glthread.o \ - glx_pbuffer.o \ - glx_query.o \ - glx_texture_compression.o \ - glxcmds.o \ - glxext.o \ - glxextensions.o \ - glcontextmodes.o \ - indirect.o \ - indirect_init.o \ - indirect_size.o \ - indirect_transpose_matrix.o \ - indirect_vertex_array.o \ - indirect_vertex_program.o \ - indirect_window_pos.o \ - pixel.o \ - pixelstore.o \ - render2.o \ - renderpix.o \ - single2.o \ - singlepix.o \ - vertarr.o \ - xfont.o - - GLX_DEFS = GlxDefines VidModeExtensionDefines \ - -DDEFAULT_DRIVER_DIR=\"$(MODULEDIR)/dri\" - -#ifdef i386Architecture - ASM_DIR = x86 -#endif -#ifdef SparcArchitecture - ASM_DIR = sparc -#endif - -#if BuildXF86DRI - DRI_SRCS = dri_glx.c XF86dri.c - DRI_OBJS = dri_glx.o XF86dri.o - - DRI_INCS = -I$(SERVERSRC)/GL/dri -#if defined(i386Architecture) && MesaUseX86Asm - ASM_SRCS = glapi_x86.S - ASM_OBJS = glapi_x86.o - ASM_DEFS = -DUSE_X86_ASM -#endif -#if defined(SparcArchitecture) - ASM_SRCS = glapi_sparc.S - ASM_OBJS = glapi_sparc.o - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#if GlxBuiltInXMesa - XMESA_DEFINES = -DGLX_BUILT_IN_XMESA -#endif -#endif - -#if defined(DarwinArchitecture) || defined(OS2Architecture) || \ -defined(LynxOSArchitecture) -ALIAS_DEFINES = -DGLX_ALIAS_UNSUPPORTED -#endif -#if defined(DarwinArchitecture) && BuildAppleDRI - DRI_SRCS = XF86dri.c - DRI_OBJS = XF86dri.o - - DRI_INCS = -I$(SERVERSRC)/GL/dri -#endif - - SRCS = $(GLX_SRCS) $(ASM_SRCS) $(DRI_SRCS) - OBJS = $(GLX_OBJS) $(ASM_OBJS) $(DRI_OBJS) - DEFINES = $(GLX_DEFS) $(ASM_DEFS) $(XMESA_DEFINES) $(ALIAS_DEFINES) \ - $(THREADS_DEFINES) - - INCLUDES = -I$(XINCLUDESRC) \ - -I$(MESASRCDIR)/include \ - -I$(EXTINCSRC) \ - -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$(DRMSRCDIR)/shared-core \ - $(DRI_INCS) - -#include <Library.tmpl> - -LibraryObjectRule() - -#if BuildXF86DRI && defined(i386Architecture) && MesaUseX86Asm -ObjectFromAsmSource(glapi_x86, NullParameter) -#endif -#if BuildXF86DRI && defined(SparcArchitecture) -STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES) -ObjectFromAsmSource(glapi_sparc, NullParameter) -#endif - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/Imakefile b/nx-X11/lib/GL/mesa/Imakefile deleted file mode 100644 index 9e1db00a0..000000000 --- a/nx-X11/lib/GL/mesa/Imakefile +++ /dev/null @@ -1,84 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -NULL = - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if defined(i386Architecture) && MesaUseX86Asm -#define MesaX86BuildDir /**/ -ASM_SUBDIRS = x86 -#endif -#ifdef SparcArchitecture -#define MesaSparcBuildDir /**/ -ASM_SUBDIRS = sparc -#endif -#define MesaBuildDir /**/ -#define NeedToLinkMesaSrc - -#ifdef UseCompaqMathLibrary - MATH_DEFINES = -DCCPML -#endif - - DEFINES = $(ALLOC_DEFINES) GlxDefines \ - $(MESA_ASM_DEFINES) $(MATH_DEFINES) - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(GLXLIBSRC)/dri \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include - -#include <Library.tmpl> - -LibraryObjectRule() - -#define IHaveSubdirs -#define PassCDebugFlags - -SUBDIRS = \ - $(ASM_SUBDIRS) \ - array_cache \ - main \ - math \ - swrast \ - swrast_setup \ - tnl \ - tnl_dd \ - shader \ - $(NULL) - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/array_cache/Imakefile b/nx-X11/lib/GL/mesa/array_cache/Imakefile deleted file mode 100644 index 40c9c6b52..000000000 --- a/nx-X11/lib/GL/mesa/array_cache/Imakefile +++ /dev/null @@ -1,91 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - - -#define MesaACBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/array_cache \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_AC_SRCS) - OBJS = $(MESA_AC_OBJS) - - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile deleted file mode 100644 index 5c910489f..000000000 --- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile +++ /dev/null @@ -1,44 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile,v 1.6 2001/04/03 02:29:34 dawes Exp $ - -#include <Threads.tmpl> - -#if GlxUseBuiltInDRIDriver -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtrasLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -#if defined(i386Architecture) && MesaUseX86Asm -#include "../../../x86/Imakefile.inc" -#endif -#ifdef SparcArchitecture -#include "../../../sparc/Imakefile.inc" -#endif - -#define NeedToLinkMesaSrc -#define MesaDrvCommonBuildDir /**/ -#include "Imakefile.inc" - - DEFINES = $(ALLOC_DEFINES) $(COMMON_DRI_DEFINES) $(MESA_ASM_DEFINES) - INCLUDES = $(COMMON_X_INCLUDES) $(COMMON_MESA_INCLUDES) \ - $(COMMON_DRI_INCLUDES) - - SRCS = $(COMMONSRCS) - OBJS = $(COMMONOBJS) - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc deleted file mode 100644 index 388b724b2..000000000 --- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc +++ /dev/null @@ -1,105 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile.inc,v 1.3 2003/05/27 16:34:32 tsi Exp $ - -#ifndef MesaDrvSrcDir -#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri -#endif - -MESADRVSRCDIR = MesaDrvSrcDir - -#ifndef MesaDrvCommonBuildDir -#define MesaDrvCommonBuildDir $(MESADRVSRCDIR)/common/ -#endif - -MESADRVCOMMONBUILDDIR = MesaDrvCommonBuildDir - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - COMMON_DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) -DIN_DRI_DRIVER - COMMON_DRI_INCLUDES = -I$(GLXLIBSRC)/dri \ - -I$(XINCLUDESRC) \ - -I$(GLXLIBSRC)/glx \ - -I$(GLXLIBSRC)/include \ - -I$(SERVERSRC)/GL/dri \ - -I$(XF86OSSRC) \ - -I$(XF86COMSRC) \ - -I$(GLXLIBSRC)/dri/drm \ - -I$(GLXLIBSRC)/include \ - -I$(DRMSRCDIR)/shared-core \ - -I$(MESASRCDIR)/include/GL/internal -#endif - -COMMON_MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESADRVSRCDIR)/common \ - -I$(MESADRVSRCDIR)/../common \ - -I$(MESASRCDIR)/include - COMMON_X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) - - COMMONSRCS = $(MESADRVCOMMONBUILDDIR)utils.c \ - $(MESADRVCOMMONBUILDDIR)vblank.c \ - $(MESADRVCOMMONBUILDDIR)texmem.c \ - $(MESADRVCOMMONBUILDDIR)xmlconfig.c \ - $(MESADRVCOMMONBUILDDIR)driverfuncs.c \ - $(MESADRVCOMMONBUILDDIR)dri_util.c \ - $(MESADRVCOMMONBUILDDIR)glcontextmodes.c \ - $(MESADRVCOMMONBUILDDIR)drirenderbuffer.c - - COMMONOBJS = $(MESADRVCOMMONBUILDDIR)utils.o \ - $(MESADRVCOMMONBUILDDIR)vblank.o \ - $(MESADRVCOMMONBUILDDIR)texmem.o \ - $(MESADRVCOMMONBUILDDIR)xmlconfig.o \ - $(MESADRVCOMMONBUILDDIR)driverfuncs.o \ - $(MESADRVCOMMONBUILDDIR)dri_util.o \ - $(MESADRVCOMMONBUILDDIR)glcontextmodes.o \ - $(MESADRVCOMMONBUILDDIR)drirenderbuffer.o - - COMMONUOBJS = $(MESADRVCOMMONBUILDDIR)unshared/utils.o \ - $(MESADRVCOMMONBUILDDIR)unshared/vblank.o \ - $(MESADRVCOMMONBUILDDIR)unshared/texmem.o \ - $(MESADRVCOMMONBUILDDIR)unshared/xmlconfig.o \ - $(MESADRVCOMMONBUILDDIR)unshared/driverfuncs.o \ - $(MESADRVCOMMONBUILDDIR)unshared/dri_util.o \ - $(MESADRVCOMMONBUILDDIR)unshared/glcontextmodes.o \ - $(MESADRVCOMMONBUILDDIR)unshared/drirenderbuffer.o - - COMMONDOBJS = $(MESADRVCOMMONBUILDDIR)debugger/utils.o \ - $(MESADRVCOMMONBUILDDIR)debugger/vblank.o \ - $(MESADRVCOMMONBUILDDIR)debugger/texmem.o \ - $(MESADRVCOMMONBUILDDIR)debugger/xmlconfig.o \ - $(MESADRVCOMMONBUILDDIR)debugger/driverfuncs.o \ - $(MESADRVCOMMONBUILDDIR)debugger/dri_util.o \ - $(MESADRVCOMMONBUILDDIR)debugger/glcontextmodes.o \ - $(MESADRVCOMMONBUILDDIR)debugger/drirenderbuffer.o - - COMMONPOBJS = $(MESADRVCOMMONBUILDDIR)profiled/utils.o \ - $(MESADRVCOMMONBUILDDIR)profiled/vblank.o \ - $(MESADRVCOMMONBUILDDIR)profiled/texmem.o \ - $(MESADRVCOMMONBUILDDIR)profiled/xmlconfig.o \ - $(MESADRVCOMMONBUILDDIR)profiled/driverfuncs.o \ - $(MESADRVCOMMONBUILDDIR)profiled/dri_util.o \ - $(MESADRVCOMMONBUILDDIR)profiled/glcontextmodes.o \ - $(MESADRVCOMMONBUILDDIR)profiled/drirenderbuffer.o - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(texmem.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(texmem.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(utils.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(utils.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(vblank.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(vblank.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(xmlconfig.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(xmlconfig.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(driverfuncs.c, $(MESADRVSRCDIR)/../common) -LinkSourceFile(driverfuncs.h, $(MESADRVSRCDIR)/../common) -LinkSourceFile(dri_util.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(dri_util.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(glcontextmodes.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(glcontextmodes.h, $(MESADRVSRCDIR)/common) -LinkSourceFile(drirenderbuffer.c, $(MESADRVSRCDIR)/common) -LinkSourceFile(drirenderbuffer.h, $(MESADRVSRCDIR)/common) -#endif diff --git a/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile b/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile deleted file mode 100644 index 014945699..000000000 --- a/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile +++ /dev/null @@ -1,111 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.16 2002/11/25 14:04:50 eich Exp $ - -#include <Threads.tmpl> - -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#include "../../array_cache/Imakefile.inc" -#include "../../math/Imakefile.inc" -#include "../../main/Imakefile.inc" -#include "../../shader/Imakefile.inc" -#include "../../shader/grammar/Imakefile.inc" -#include "../../shader/slang/Imakefile.inc" -#include "../../swrast/Imakefile.inc" -#include "../../swrast_setup/Imakefile.inc" -#include "../../tnl/Imakefile.inc" -#include "../../tnl_dd/Imakefile.inc" -#include "../../Imakefile.inc" -#if defined(i386Architecture) && !SystemV4 && MesaUseX86Asm -#include "../../x86/Imakefile.inc" -#endif -#ifdef SparcArchitecture -#include "../../sparc/Imakefile.inc" -#endif - -LinkSourceFile(osmesa.c, $(MESASRCDIR)/src/mesa/drivers/osmesa) -LinkSourceFile(driverfuncs.c, $(MESASRCDIR)/src/mesa/drivers/common) -LinkSourceFile(driverfuncs.h, $(MESASRCDIR)/src/mesa/drivers/common) - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/include - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) - INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) $(MESA_INCLUDES) \ - $(DRI_INCLUDES) -I$(GLXLIBSRC)/include - - MESAOBJS = $(COREMESAOBJS) $(MESA_ASM_OBJS) - MESAUOBJS = $(COREMESAUOBJS) $(MESA_ASM_UOBJS) - MESADOBJS = $(COREMESADOBJS) $(MESA_ASM_DOBJS) - MESAPOBJS = $(COREMESAPOBJS) $(MESA_ASM_POBJS) - - SRCS = osmesa.c driverfuncs.c - OBJS = osmesa.o driverfuncs.o $(MESAOBJS) -#if DoSharedLib - UOBJS = unshared/osmesa.o unshared/driverfuncs.o $(MESAUOBJS) -#else - UOBJS = $(OBJS) -#endif - DOBJS = debugger/osmesa.o debugger/driverfuncs.o $(MESADOBJS) - POBJS = profiled/osmesa.o profiled/driverfuncs.o $(MESAPOBJS) - -#if LocalThreads - THREADOBJS = $(THREADS_LIBS) -#endif - -#if !GlxUseBuiltInDRIDriver -# ifdef SharedOSMesaReqs - REQUIREDLIBS = SharedOSMesaReqs -# else - REQUIREDLIBS = MathLibrary $(LDPRELIB) $(XLIB) $(GLXLIB) -# endif -#endif - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -LIBNAME = OSMesa -SOREV = 4.0 - - -#if DoNormalLib -NormalLibraryTarget($(LIBNAME), $(UOBJS)) -InstallLibrary($(LIBNAME),$(USRLIBDIR)) -#endif - -#if SharedLibGlx -SharedLibraryTarget($(LIBNAME),$(SOREV), $(OBJS), ., .) -InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) -#endif - -#if DoDebugLib -DebuggedLibraryTarget($(LIBNAME),$(DOBJS)) -InstallLibrary($(LIBNAME_d,$(USRLIBDIR)) -#endif - -#if DoProfileLib -ProfiledLibraryTarget($(LIBNAME), $(POBJS)) -InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) -#endif - -DependTarget() - diff --git a/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp b/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp deleted file mode 100644 index e69de29bb..000000000 --- a/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp +++ /dev/null diff --git a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile deleted file mode 100644 index ab9a91970..000000000 --- a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile +++ /dev/null @@ -1,70 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.12tsi Exp $ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - - -#define MesaXBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/X \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -#if BuildXF86DRI && GlxBuiltInXMesa - XMESA_DEFINES = -DGLX_BUILT_IN_XMESA -#endif - - SRCS = $(XMESA_SRCS) - OBJS = $(XMESA_OBJS) - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MATHDEF) $(XMESA_DEFINES) - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(XMESA_OBJS)) -NormalLintTarget($(XMESA_SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/main/Imakefile b/nx-X11/lib/GL/mesa/main/Imakefile deleted file mode 100644 index 3093cedd1..000000000 --- a/nx-X11/lib/GL/mesa/main/Imakefile +++ /dev/null @@ -1,66 +0,0 @@ -XCOMM $XdotOrg: xc/lib/GL/mesa/main/Imakefile,v 1.3 2005/12/20 22:30:49 alanc Exp $ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris/SPARC builds */ -#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) -# define LargePICTable YES -#endif - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#define MesaBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#ifdef UseCompaqMathLibrary - MATH_DEFINES = -DCCPML -#endif - - DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER \ - $(MESA_ASM_DEFINES) $(MATH_DEFINES) - INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC) */ -I$(XINCLUDESRC) \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa -I$(GLXLIBSRC)/dri \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include - SRCS = $(COREMESABASESRCS) - OBJS = $(COREMESABASEOBJS) - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/math/Imakefile b/nx-X11/lib/GL/mesa/math/Imakefile deleted file mode 100644 index ab00ae76f..000000000 --- a/nx-X11/lib/GL/mesa/math/Imakefile +++ /dev/null @@ -1,98 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - - -#define MesaMathBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_MATH_SRCS) - OBJS = $(MESA_MATH_OBJS) - - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/Imakefile b/nx-X11/lib/GL/mesa/shader/Imakefile deleted file mode 100644 index d46834740..000000000 --- a/nx-X11/lib/GL/mesa/shader/Imakefile +++ /dev/null @@ -1,107 +0,0 @@ -XCOMM $XFree86$ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaShaderBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader/grammar \ - -I$(MESASRCDIR)/src/mesa/shader/slang \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_SHADER_SRCS) - OBJS = $(MESA_SHADER_OBJS) - - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -#define IHaveSubdirs -#define PassCDebugFlags - -SUBDIRS = grammar slang - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile deleted file mode 100644 index bbdec9764..000000000 --- a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile +++ /dev/null @@ -1,98 +0,0 @@ -XCOMM $XFree86$ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaGrammarBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader/grammar \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_GRAMMAR_SRCS) - OBJS = $(MESA_GRAMMAR_OBJS) - - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/slang/Imakefile b/nx-X11/lib/GL/mesa/shader/slang/Imakefile deleted file mode 100644 index 096a8ea63..000000000 --- a/nx-X11/lib/GL/mesa/shader/slang/Imakefile +++ /dev/null @@ -1,108 +0,0 @@ -XCOMM $XFree86$ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaSlangBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader/grammar \ - -I$(MESASRCDIR)/src/mesa/shader/slang \ - -I$(MESASRCDIR)/src/mesa/shader/slang/library \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_SLANG_SRCS) - OBJS = $(MESA_SLANG_OBJS) - - -#include <Library.tmpl> - -#define IHaveSubdirs -#define PassCDebugFlags - -SUBDIRS = library - -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile deleted file mode 100644 index de32171ae..000000000 --- a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile +++ /dev/null @@ -1,97 +0,0 @@ -XCOMM $XFree86$ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaShaderBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/shader/slang \ - -I$(MESASRCDIR)/src/mesa/shader/slang/library \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_SLANG_SRCS) - OBJS = $(MESA_SLANG_OBJS) - - -#include <Library.tmpl> - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/sparc/Imakefile b/nx-X11/lib/GL/mesa/sparc/Imakefile deleted file mode 100644 index 8cd9c9f8b..000000000 --- a/nx-X11/lib/GL/mesa/sparc/Imakefile +++ /dev/null @@ -1,68 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile,v 1.3 2002/11/22 22:55:58 tsi Exp $ -XCOMM $XdotOrg: xc/lib/GL/mesa/sparc/Imakefile,v 1.3 2004/11/13 04:39:16 gisburn Exp $ - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#define MesaSPARCBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES) - INCLUDES = -I$(INCLUDESRC) -I$(EXTINCSRC) -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/SPARC \ - -I../../../include \ - -I$(MESASRCDIR)/include \ - -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/sparc \ - -I$(MESASRCDIR)/src/mesa/glapi - - SRCS = $(MESA_ASM_SRCS) - OBJS = $(MESA_ASM_OBJS) - -#include <Library.tmpl> - -LibraryObjectRule() - -STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES) - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -ObjectFromAsmSource(xform, NullParameter) -ObjectFromAsmSource(clip, NullParameter) -ObjectFromAsmSource(norm, NullParameter) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/sparc/Imakefile.inc b/nx-X11/lib/GL/mesa/sparc/Imakefile.inc deleted file mode 100644 index 6bd006749..000000000 --- a/nx-X11/lib/GL/mesa/sparc/Imakefile.inc +++ /dev/null @@ -1,58 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile.inc,v 1.2 2002/11/14 21:01:16 tsi Exp $ - -#ifndef MesaSPARCBuildDir -#define MesaSPARCBuildDir $(GLXLIBSRC)/mesa/sparc/ -#endif - -MESASPARCBUILDDIR = MesaSPARCBuildDir - -MESA_SPARC_SRCS = $(MESASPARCBUILDDIR)sparc.c \ - $(MESASPARCBUILDDIR)xform.S \ - $(MESASPARCBUILDDIR)clip.S - -#ifdef NeedToLinkMesaSrc -/* If $(MESASRCDIR)/src/mesa/sparc isn't in the INCLUDES, it should be. */ -LinkSourceFile(sparc.c, $(MESASRCDIR)/src/mesa/sparc) -LinkSourceFile(xform.S, $(MESASRCDIR)/src/mesa/sparc) -LinkSourceFile(clip.S, $(MESASRCDIR)/src/mesa/sparc) -LinkSourceFile(norm.S, $(MESASRCDIR)/src/mesa/sparc) -#endif - -MESA_SPARC_OBJS = $(MESASPARCBUILDDIR)sparc.o \ - $(MESASPARCBUILDDIR)xform.o \ - $(MESASPARCBUILDDIR)clip.o \ - $(MESASPARCBUILDDIR)norm.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_SPARC_UOBJS = $(MESASPARCBUILDDIR)unshared/sparc.o \ - $(MESASPARCBUILDDIR)xform.o \ - $(MESASPARCBUILDDIR)clip.o \ - $(MESASPARCBUILDDIR)norm.o -#else -MESA_SPARC_UOBJS = $(MESA_SPARC_OBJS) -#endif - -MESA_SPARC_DOBJS = $(MESASPARCBUILDDIR)debugger/sparc.o \ - $(MESASPARCBUILDDIR)xform.o \ - $(MESASPARCBUILDDIR)clip.o \ - $(MESASPARCBUILDDIR)norm.o - -MESA_SPARC_POBJS = $(MESAX86BUILDDIR)profiled/sparc.o \ - $(MESAX86BUILDDIR)xform.o \ - $(MESAX86BUILDDIR)clip.o \ - $(MESAX86BUILDDIR)norm.o - -MESA_SPARC_DEFS = -DUSE_SPARC_ASM - -MESA_ASM_SRCS = $(MESA_SPARC_SRCS) - -MESA_ASM_OBJS = $(MESA_SPARC_OBJS) - -MESA_ASM_UOBJS = $(MESA_SPARC_UOBJS) - -MESA_ASM_DOBJS = $(MESA_SPARC_DOBJS) - -MESA_ASM_POBJS = $(MESA_SPARC_POBJS) - -MESA_ASM_DEFINES = $(MESA_SPARC_DEFS) - diff --git a/nx-X11/lib/GL/mesa/swrast/Imakefile b/nx-X11/lib/GL/mesa/swrast/Imakefile deleted file mode 100644 index 105615b82..000000000 --- a/nx-X11/lib/GL/mesa/swrast/Imakefile +++ /dev/null @@ -1,100 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaSwrastBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/array_cache \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/swrast \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_SWRAST_SRCS) - OBJS = $(MESA_SWRAST_OBJS) - - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile deleted file mode 100644 index 58766149d..000000000 --- a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile +++ /dev/null @@ -1,99 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - - -#define MesaSwrastSetupBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/swrast_setup \ - -I$(MESASRCDIR)/src/mesa/tnl \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_SWR_SETUP_SRCS) - OBJS = $(MESA_SWR_SETUP_OBJS) - - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/tnl/Imakefile b/nx-X11/lib/GL/mesa/tnl/Imakefile deleted file mode 100644 index 99ec7525c..000000000 --- a/nx-X11/lib/GL/mesa/tnl/Imakefile +++ /dev/null @@ -1,101 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaTnlBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/src/mesa/array_cache \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa/swrast_setup \ - -I$(MESASRCDIR)/src/mesa/shader \ - -I$(MESASRCDIR)/src/mesa/tnl \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_TNL_SRCS) - OBJS = $(MESA_TNL_OBJS) - - -#include <Library.tmpl> - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile deleted file mode 100644 index 93b8c8877..000000000 --- a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile +++ /dev/null @@ -1,63 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile,v 1.6 2002/11/25 12:58:55 tsi Exp $ - -#include <Threads.tmpl> - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - -#define MesaTnlDdBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \ - -I$(XINCLUDESRC) -I$(INCLUDESRC)/GL \ - -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src \ - -I$(MESASRCDIR)/src/math \ - -I$(MESASRCDIR)/src/tnl_dd \ - -I$(MESASRCDIR)/include \ - -I../../../include - - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - -#include <Library.tmpl> - -LibraryObjectRule() - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc deleted file mode 100644 index 8d5d3da2d..000000000 --- a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc +++ /dev/null @@ -1,40 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc,v 1.1tsi Exp $ - -#ifndef MesaTnlDdBuildDir -#define MesaTnlDdBuildDir $(GLXLIBSRC)/mesa/tnl_dd/ -#endif - -MESATNLDDBUILDDIR = MesaTnlDdBuildDir - - MESA_TNL_DD_SRCS = $(MESATNLDDBUILDDIR)t_dd.c \ - $(MESATNLDDBUILDDIR)t_dd_vb.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(t_dd.c, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_vb.c, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_dmatmp2.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_dmatmp.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_rendertmp.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_triemit.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_tritmp.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_unfilled.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_vbtmp.h, $(MESASRCDIR)/src/mesa/tnl_dd) -LinkSourceFile(t_dd_vertex.h, $(MESASRCDIR)/src/mesa/tnl_dd) -#endif - - MESA_TNL_DD_OBJS = $(MESATNLDDBUILDDIR)t_dd.o \ - $(MESATNLDDBUILDDIR)t_dd_vb.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_TNL_DD_UOBJS = $(MESATNLDDBUILDDIR)unshared/t_dd.o \ - $(MESATNLDDBUILDDIR)unshared/t_dd_vb.o -#else -MESA_TNL_DD_UOBJS = $(MESA_TNL_DD_OBJS) -#endif - -MESA_TNL_DD_DOBJS = $(MESATNLDDBUILDDIR)debugger/t_dd.o \ - $(MESATNLDDBUILDDIR)debugger/t_dd_vb.o - -MESA_TNL_DD_POBJS = $(MESATNLDDBUILDDIR)profiled/t_dd.o \ - $(MESATNLDDBUILDDIR)profiled/t_dd_vb.o - diff --git a/nx-X11/lib/GL/mesa/x86/Imakefile b/nx-X11/lib/GL/mesa/x86/Imakefile deleted file mode 100644 index 543c05143..000000000 --- a/nx-X11/lib/GL/mesa/x86/Imakefile +++ /dev/null @@ -1,108 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.23 2002/07/14 17:08:16 alanh Exp $ - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#define MesaX86BuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER $(MESA_ASM_DEFINES) - INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC)*/ -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/include \ - -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/x86 \ - -I$(MESASRCDIR)/src/mesa/glapi - - SRCS = $(MESA_ASM_SRCS) gen_matypes.c - OBJS = $(MESA_ASM_OBJS) - -#include <Library.tmpl> - -LibraryObjectRule() - -STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES) - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -ObjectFromAsmSource(common_x86_asm, NullParameter) -ObjectFromAsmSource(read_rgba_span_x86, NullParameter) -ObjectFromAsmSource(x86_cliptest, NullParameter) -ObjectFromAsmSource(x86_xform2, NullParameter) -ObjectFromAsmSource(x86_xform3, NullParameter) -ObjectFromAsmSource(x86_xform4, NullParameter) - -#if MesaUseMMX -ObjectFromAsmSource(mmx_blend, NullParameter) -#endif - -#if MesaUse3DNow -ObjectFromAsmSource(3dnow_normal, NullParameter) -ObjectFromAsmSource(3dnow_xform1, NullParameter) -ObjectFromAsmSource(3dnow_xform2, NullParameter) -ObjectFromAsmSource(3dnow_xform3, NullParameter) -ObjectFromAsmSource(3dnow_xform4, NullParameter) -#endif - -#if MesaUseSSE -ObjectFromAsmSource(sse_normal, NullParameter) -ObjectFromAsmSource(sse_xform1, NullParameter) -ObjectFromAsmSource(sse_xform2, NullParameter) -ObjectFromAsmSource(sse_xform3, NullParameter) -ObjectFromAsmSource(sse_xform4, NullParameter) -#endif - -LinkSourceFile(gen_matypes.c, $(MESASRCDIR)/src/mesa/x86) - -#if CrossCompiling -HOST_CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) \ - $(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES) -#else -HOST_CFLAGS=$(CFLAGS) -#endif - -MATYPES = ./gen_matypes - -matypes.h: gen_matypes.c - RemoveFiles($@ HostProgramTargetName(gen_matypes)) - -HostLinkRule(HostProgramTargetName(gen_matypes),$(HOST_CFLAGS) $(LOCAL_LDFLAGS),gen_matypes.c,$(LDLIBS)) - RunProgram(MATYPES,> matypes_h) - $(MV) matypes_h $@ - RemoveFiles(HostProgramTargetName(gen_matypes)) - -includes:: matypes.h - -depend:: matypes.h - -clean:: - RemoveFiles(matypes.h HostProgramTargetName(gen_matypes)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/x86/Imakefile.inc b/nx-X11/lib/GL/mesa/x86/Imakefile.inc deleted file mode 100644 index b21c6f659..000000000 --- a/nx-X11/lib/GL/mesa/x86/Imakefile.inc +++ /dev/null @@ -1,217 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile.inc,v 1.5 2002/11/14 21:01:16 tsi Exp $ - -#ifndef MesaX86BuildDir -#define MesaX86BuildDir $(GLXLIBSRC)/mesa/x86/ -#endif - -MESAX86BUILDDIR = MesaX86BuildDir - -MESA_X86_SRCS = $(MESAX86BUILDDIR)common_x86.c \ - $(MESAX86BUILDDIR)common_x86_asm.S \ - $(MESAX86BUILDDIR)glapi_x86.S \ - $(MESAX86BUILDDIR)read_rgba_span_x86.S \ - $(MESAX86BUILDDIR)x86.c \ - $(MESAX86BUILDDIR)x86_cliptest.S \ - $(MESAX86BUILDDIR)x86_xform2.S \ - $(MESAX86BUILDDIR)x86_xform3.S \ - $(MESAX86BUILDDIR)x86_xform4.S \ - $(MESAX86BUILDDIR)x86sse.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(common_x86.c, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(common_x86_asm.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(read_rgba_span_x86.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(read_rgba_span_x86.h, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86.c, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86_cliptest.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86_xform2.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86_xform3.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86_xform4.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(x86sse.c, $(MESASRCDIR)/src/mesa/x86/rtasm) -LinkSourceFile(x86sse.h, $(MESASRCDIR)/src/mesa/x86/rtasm) -#endif - -MESA_X86_OBJS = $(MESAX86BUILDDIR)common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)read_rgba_span_x86.o \ - $(MESAX86BUILDDIR)x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o \ - $(MESAX86BUILDDIR)x86sse.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_X86_UOBJS = $(MESAX86BUILDDIR)unshared/common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)read_rgba_span_x86.o \ - $(MESAX86BUILDDIR)unshared/x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o \ - $(MESAX86BUILDDIR)x86sse.o -#else -MESA_X86_UOBJS = $(MESA_X86_OBJS) -#endif - -MESA_X86_DOBJS = $(MESAX86BUILDDIR)debugger/common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)read_rgba_span_x86.o \ - $(MESAX86BUILDDIR)debugger/x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o \ - $(MESAX86BUILDDIR)x86sse.o - -MESA_X86_POBJS = $(MESAX86BUILDDIR)profiled/common_x86.o \ - $(MESAX86BUILDDIR)common_x86_asm.o \ - $(MESAX86BUILDDIR)read_rgba_span_x86.o \ - $(MESAX86BUILDDIR)profiled/x86.o \ - $(MESAX86BUILDDIR)x86_cliptest.o \ - $(MESAX86BUILDDIR)x86_xform2.o \ - $(MESAX86BUILDDIR)x86_xform3.o \ - $(MESAX86BUILDDIR)x86_xform4.o \ - $(MESAX86BUILDDIR)x86sse.o - -MESA_X86_DEFS = -DUSE_X86_ASM - - -#if MesaUseMMX -MESA_MMX_SRCS = $(MESAX86BUILDDIR)mmx_blend.S - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(mmx_blend.S, $(MESASRCDIR)/src/mesa/x86) -#endif - -MESA_MMX_OBJS = $(MESAX86BUILDDIR)mmx_blend.o - -MESA_MMX_UOBJS = $(MESA_MMX_OBJS) -MESA_MMX_DOBJS = $(MESA_MMX_OBJS) -MESA_MMX_POBJS = $(MESA_MMX_OBJS) - -MESA_MMX_DEFS = -DUSE_MMX_ASM -#endif - -#if MesaUse3DNow -MESA_3DNOW_SRCS = $(MESAX86BUILDDIR)3dnow.c \ - $(MESAX86BUILDDIR)3dnow_normal.S \ - $(MESAX86BUILDDIR)3dnow_xform1.S \ - $(MESAX86BUILDDIR)3dnow_xform2.S \ - $(MESAX86BUILDDIR)3dnow_xform3.S \ - $(MESAX86BUILDDIR)3dnow_xform4.S - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(3dnow.c, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(3dnow_normal.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(3dnow_xform1.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(3dnow_xform2.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(3dnow_xform3.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(3dnow_xform4.S, $(MESASRCDIR)/src/mesa/x86) -#endif -MESA_3DNOW_OBJS = $(MESAX86BUILDDIR)3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_3DNOW_UOBJS = $(MESAX86BUILDDIR)unshared/3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o -#else -MESA_3DNOW_UOBJS = $(MESA_3DNOW_OBJS) -#endif - -MESA_3DNOW_DOBJS = $(MESAX86BUILDDIR)debugger/3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o - -MESA_3DNOW_POBJS = $(MESAX86BUILDDIR)profiled/3dnow.o \ - $(MESAX86BUILDDIR)3dnow_normal.o \ - $(MESAX86BUILDDIR)3dnow_xform1.o \ - $(MESAX86BUILDDIR)3dnow_xform2.o \ - $(MESAX86BUILDDIR)3dnow_xform3.o \ - $(MESAX86BUILDDIR)3dnow_xform4.o - -MESA_3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif - -#if MesaUseSSE -MESA_SSE_SRCS = $(MESAX86BUILDDIR)sse.c \ - $(MESAX86BUILDDIR)sse_normal.S \ - $(MESAX86BUILDDIR)sse_xform1.S \ - $(MESAX86BUILDDIR)sse_xform2.S \ - $(MESAX86BUILDDIR)sse_xform3.S \ - $(MESAX86BUILDDIR)sse_xform4.S - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(sse.c, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(sse_normal.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(sse_xform1.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(sse_xform2.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(sse_xform3.S, $(MESASRCDIR)/src/mesa/x86) -LinkSourceFile(sse_xform4.S, $(MESASRCDIR)/src/mesa/x86) -#endif - -MESA_SSE_OBJS = $(MESAX86BUILDDIR)sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o - -#if defined(DoSharedLib) && DoSharedLib -MESA_SSE_UOBJS = $(MESAX86BUILDDIR)unshared/sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o -#else -MESA_SSE_UOBJS = $(MESA_SSE_OBJS) -#endif - -MESA_SSE_DOBJS = $(MESAX86BUILDDIR)debugger/sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o - -MESA_SSE_POBJS = $(MESAX86BUILDDIR)profiled/sse.o \ - $(MESAX86BUILDDIR)sse_normal.o \ - $(MESAX86BUILDDIR)sse_xform1.o \ - $(MESAX86BUILDDIR)sse_xform2.o \ - $(MESAX86BUILDDIR)sse_xform3.o \ - $(MESAX86BUILDDIR)sse_xform4.o - -MESA_SSE_DEFS = -DUSE_SSE_ASM -#endif - -MESA_ASM_SRCS = $(MESA_X86_SRCS) $(MESA_MMX_SRCS) $(MESA_3DNOW_SRCS) \ - $(MESA_SSE_SRCS) - -MESA_ASM_OBJS = $(MESA_X86_OBJS) $(MESA_MMX_OBJS) $(MESA_3DNOW_OBJS) \ - $(MESA_SSE_OBJS) - -MESA_ASM_UOBJS = $(MESA_X86_UOBJS) $(MESA_MMX_UOBJS) $(MESA_3DNOW_UOBJS) \ - $(MESA_SSE_UOBJS) - -MESA_ASM_DOBJS = $(MESA_X86_DOBJS) $(MESA_MMX_DOBJS) $(MESA_3DNOW_DOBJS) \ - $(MESA_SSE_DOBJS) - -MESA_ASM_POBJS = $(MESA_X86_POBJS) $(MESA_MMX_POBJS) $(MESA_3DNOW_POBJS) \ - $(MESA_SSE_POBJS) - -MESA_ASM_DEFINES = $(MESA_X86_DEFS) $(MESA_MMX_DEFS) $(MESA_3DNOW_DEFS) $(MESA_SSE_DEFS) - diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile index 76dfb8359..20c68f97e 100644 --- a/nx-X11/lib/Imakefile +++ b/nx-X11/lib/Imakefile @@ -15,34 +15,10 @@ NULL = XKBLIBDIR = xkbfile #endif -#if BuildXKBuilib -XKBUILIBDIR = xkbui -#endif - -#if BuildXF86MiscLibrary -XF86MISCLIBDIR = Xxf86misc -#endif - -#if BuildXF86VidModeLibrary -XF86VMLIBDIR = Xxf86vm -#endif - -#if BuildXF86DGALibrary -XF86DGALIBDIR = Xxf86dga -#endif - -#if BuildXF86RushLibrary -XF86RUSHLIBDIR = Xxf86rush -#endif - #if BuildXineramaLibrary XINERAMADIR=Xinerama #endif -#if BuildGLXLibrary -GLXLIBDIR = GL -#endif - #if BuildRenderLibrary RENDERLIBDIR = Xrender #endif @@ -55,13 +31,6 @@ XFIXESLIBDIR = Xfixes COMPOSITELIBDIR = Xcomposite #endif -XF86EXTLIBS = \ - $(XF86MISCLIBDIR) \ - $(XF86VMLIBDIR) \ - $(XF86DGALIBDIR) \ - $(XF86RUSHLIBDIR) \ - $(NULL) - #if BuildXauLib XAULIBDIR = Xau #endif @@ -85,14 +54,8 @@ LINTSUBDIRS = \ $(X11LIBDIR) \ $(OLDXLIBDIR) \ $(XEXTLIBDIR) \ - $(XF86MISCLIBDIR) \ - $(XF86VMLIBDIR) \ - $(XF86DGALIBDIR) \ - $(XF86RUSHLIBDIR) \ $(XTSTLIBDIR) \ $(XKBLIBDIR) \ - $(XKBUILIBDIR) \ - $(GLXLIBDIR) \ $(XINERAMADIR) \ $(RENDERLIBDIR) \ $(XFIXESLIBDIR) \ diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index e00351169..212216f46 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -27,7 +27,7 @@ XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.52 2003/05/27 16:53:15 tsi Exp $ HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \ Xcms.h Xlocale.h XKBlib.h XlibConf.h Xregion.h ImUtil.h -#if BuildServersOnly && !BuildGLXLibrary && !BuildClients && !NXAgentServer +#if BuildServersOnly && !BuildClients && !NXAgentServer all:: BuildIncludes($(HEADERS),IncSubdir,..) diff --git a/nx-X11/lib/Xcomposite/AUTHORS b/nx-X11/lib/Xcomposite/AUTHORS deleted file mode 100644 index 8e18f9b42..000000000 --- a/nx-X11/lib/Xcomposite/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Keith Packard, HP diff --git a/nx-X11/lib/Xcomposite/COPYING b/nx-X11/lib/Xcomposite/COPYING deleted file mode 100644 index e85d981e7..000000000 --- a/nx-X11/lib/Xcomposite/COPYING +++ /dev/null @@ -1,22 +0,0 @@ -$Id: COPYING,v 1.1 2004/07/31 05:50:39 anholt Exp $ - -Copyright © 2001,2003 Keith Packard - -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. - diff --git a/nx-X11/lib/Xcomposite/ChangeLog b/nx-X11/lib/Xcomposite/ChangeLog deleted file mode 100644 index f70ce6605..000000000 --- a/nx-X11/lib/Xcomposite/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2004-07-08 Keith Packard <keithp@keithp.com> - - * Makefile.am: - * Xcomposite.c: (XCompositeVersion), (XCompositeNameWindowPixmap): - * Xcomposite.h: - * configure.ac: - Add library API for Composite 0.2 changes - Add XCompositeVersion to get the run-time library version number - Fix package version number in configure.ac and Xcomposite.h - -2004-02-03 Jim Gettys <jg@handhelds.org> - - * AUTHORS: Add authors to AUTHORS file - -2004-01-15 Daniel Stone <daniel@fooishbar.org> - * Tag release 1.0 for first freedesktop.org clientside lib release. - -2004-01-15 Harold L Hunt II <huntharo@msu.edu> - * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. diff --git a/nx-X11/lib/Xcomposite/INSTALL b/nx-X11/lib/Xcomposite/INSTALL deleted file mode 100644 index 25a014e2e..000000000 --- a/nx-X11/lib/Xcomposite/INSTALL +++ /dev/null @@ -1,8 +0,0 @@ -Xcomposite is built with the traditional configure script: - - $ ./configure --prefix=/usr/X11R6 - -This should generate valid Makefiles, then: - - $ make - $ make install diff --git a/nx-X11/lib/Xcomposite/Imakefile b/nx-X11/lib/Xcomposite/Imakefile index 0f3c44da4..a8e4077fa 100644 --- a/nx-X11/lib/Xcomposite/Imakefile +++ b/nx-X11/lib/Xcomposite/Imakefile @@ -54,15 +54,3 @@ SUBSTVARS=prefix="$(PROJECTROOT)" \ #include <Library.tmpl> DependTarget() - -all:: xcomposite.pc - -xcomposite.pc: xcomposite.pc.in - RemoveFile($@) - sh ../Xrender/config-subst $(SUBSTVARS) < xcomposite.pc.in > $@ - -InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig) - -clean:: - RemoveFile(xcomposite.pc) - diff --git a/nx-X11/lib/Xcomposite/NEWS b/nx-X11/lib/Xcomposite/NEWS deleted file mode 100644 index e69de29bb..000000000 --- a/nx-X11/lib/Xcomposite/NEWS +++ /dev/null diff --git a/nx-X11/lib/Xcomposite/README b/nx-X11/lib/Xcomposite/README deleted file mode 100644 index 9968c6bdf..000000000 --- a/nx-X11/lib/Xcomposite/README +++ /dev/null @@ -1,10 +0,0 @@ - RandR - X RandR Extension - Version 1.0 - 2002-10-4 - -This package contains header files and documentation for the X RandR -extension. Library and server implementations are separate. - -Keith Packard -keithp@keithp.com diff --git a/nx-X11/lib/Xcomposite/autogen.sh b/nx-X11/lib/Xcomposite/autogen.sh deleted file mode 100755 index b1376df5a..000000000 --- a/nx-X11/lib/Xcomposite/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -autoreconf -v --install || exit 1 -./configure --enable-maintainer-mode "$@" diff --git a/nx-X11/lib/Xcomposite/configure.ac b/nx-X11/lib/Xcomposite/configure.ac deleted file mode 100644 index 8e8848194..000000000 --- a/nx-X11/lib/Xcomposite/configure.ac +++ /dev/null @@ -1,102 +0,0 @@ -dnl -dnl $Id: configure.ac,v 1.1 2004/07/31 05:50:39 anholt Exp $ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. - -AC_PREREQ([2.57]) - -dnl -dnl Version should match the current XComposite version. XCompositeQueryVersion -dnl returns the version from xcompositewire.h, NOT the version we set here. But we -dnl try to keep these the same. Note that the library has an extra -dnl digit in the version number to track changes which don't affect the -dnl protocol, so Xcomposite version l.n.m corresponds to protocol version l.n -dnl that 'revision' number appears in Xcomposite.h and has to be manually -dnl synchronized. -dnl -AC_INIT(libXcomposite, 0.2.0, [keithp@keithp.com], libXcomposite) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) -AC_CONFIG_AUX_DIR(.) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL - -# Check for X -PKG_CHECK_MODULES(X, x11, - [x_found_with_pkgconfig=yes], - [x_found_with_pkgconfig=no]) -AC_SUBST(X_CFLAGS) -AC_SUBST(X_LIBS) - -if test "$x_found_with_pkgconfig" = "no" -then - AC_PATH_XTRA - X_LIBS="$X_LIBS -lX11" - - if test "x$no_x" = "xyes" - then - AC_MSG_ERROR([X is required, but it was either disabled or not found.]) - fi - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" - - AC_MSG_CHECKING([for XTHREADS in Xlib]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], - [[return XInitThreads() == 0 ? 0 : 1;]])], - [xthreads=no], - [xthreads=yes], - [xthreads=yes]) - - AC_MSG_RESULT($xthreads) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - if test "x$xthreads" = "xyes" - then - X_CFLAGS="$X_CFLAGS -DXTHREADS" - fi -fi - -# Check compositeext configuration, strip extra digits from package version to -# find the required protocol version - -if test "$VERSION" = "" ; then - VERSION=$PACKAGE_VERSION; -fi -COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(XCOMPOSITE, [compositeext >= $COMPOSITEEXT_VERSION] xfixes) -AC_SUBST(XCOMPOSITE_CFLAGS) -AC_SUBST(XCOMPOSITE_LIBS) - -AC_OUTPUT([Makefile - xcomposite.pc]) - diff --git a/nx-X11/lib/Xcomposite/xcomposite.pc.in b/nx-X11/lib/Xcomposite/xcomposite.pc.in deleted file mode 100644 index c319694f1..000000000 --- a/nx-X11/lib/Xcomposite/xcomposite.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Xcomposite -Description: X Composite Library -Version: @VERSION@ -Cflags: -I${includedir} @XCOMPOSITE_CFLAGS@ @X_CFLAGS@ -Libs: -L${libdir} -lNX_Xcomposite @XCOMPOSITE_LIBS@ @X_LIBS@ diff --git a/nx-X11/lib/Xfixes/AUTHORS b/nx-X11/lib/Xfixes/AUTHORS deleted file mode 100644 index ab0e01b06..000000000 --- a/nx-X11/lib/Xfixes/AUTHORS +++ /dev/null @@ -1 +0,0 @@ -Keith Packard, HP and XFree86. diff --git a/nx-X11/lib/Xfixes/COPYING b/nx-X11/lib/Xfixes/COPYING deleted file mode 100644 index e85d981e7..000000000 --- a/nx-X11/lib/Xfixes/COPYING +++ /dev/null @@ -1,22 +0,0 @@ -$Id: COPYING,v 1.1 2004/07/31 05:50:39 anholt Exp $ - -Copyright © 2001,2003 Keith Packard - -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. - diff --git a/nx-X11/lib/Xfixes/ChangeLog b/nx-X11/lib/Xfixes/ChangeLog deleted file mode 100644 index cf2da5a94..000000000 --- a/nx-X11/lib/Xfixes/ChangeLog +++ /dev/null @@ -1,102 +0,0 @@ -Tue May 17 13:00:21 2005 Søren Sandmann <sandmann@redhat.com> - - * *.c: Conditionally include <config.h> - -2004-07-26 Keith Packard <keithp@keithp.com> - - * Makefile.am: - * Region.c: (XFixesFetchRegion), (XFixesFetchRegionAndBounds), - (XFixesExpandRegion): - * Xfixes.c: (XFixesVersion): - * Xfixes.h: - * configure.ac: - Add XFixesExpandRegion and XFixesFetchRegionAndBounds - -2004-04-13 Daniel Stone <daniel@freedesktop.org> - - * Bump version to 2.0.2 for xlibs 1.0.1; no other changes. - -2004-04-01 Keith Packard <keithp@keithp.com> - - reviewed by: Bill Haneman - - * Region.c: (XFixesFetchRegion): - Forgot to store the region operand in the protocol request. - Made this function completely broken. - -2004-03-08 Keith Packard <keithp@keithp.com> - - * Cursor.c: (XFixesGetCursorImage), (XFixesSetCursorName), - (XFixesChangeCursorByName): - * Xfixes.h: - Use 'const' in API to make C++ happy - -2004-02-03 Jim Gettys <jg@freedesktop.org.org> - - * AUTHORS: Get a author file with contents. - -2004-01-15 Daniel Stone <daniel@fooishbar.org> - * Tag release 2.0.1 for first freedesktop.org clientside lib release. - -2004-01-15 Harold L Hunt II <huntharo@msu.edu> - * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. - -2003-11-21 Keith Packard <keithp@keithp.com> - - * Region.c: (XFixesCopyRegion), (XFixesUnionRegion), - (XFixesIntersectRegion), (XFixesSubtractRegion), - (XFixesInvertRegion), (XFixesTranslateRegion): - * Xfixes.h: - Eliminate offset arguments in combining operators, - create separate XFixesCopyRegion and XFixesTranslateRegion functions. - -2003-11-02 Keith Packard <keithp@keithp.com> - - * Cursor.c: (XFixesSelectCursorInput), (XFixesGetCursorImage), - (XFixesSetCursorName), (XFixesGetCursorName), (XFixesChangeCursor), - (XFixesChangeCursorByName): - * Makefile.am: - * Region.c: (XFixesCreateRegion), (XFixesCreateRegionFromBitmap), - (XFixesCreateRegionFromWindow), (XFixesCreateRegionFromGC), - (XFixesCreateRegionFromPicture), (XFixesDestroyRegion), - (XFixesSetRegion), (XFixesUnionRegion), (XFixesIntersectRegion), - (XFixesSubtractRegion), (XFixesInvertRegion), - (XFixesRegionExtents), (XFixesFetchRegion), - (XFixesSetGCClipRegion), (XFixesSetWindowShapeRegion), - (XFixesSetPictureClipRegion): - * SaveSet.c: (XFixesChangeSaveSet): - * Selection.c: (XFixesSelectSelectionInput): - * Xfixes.c: (XFixesExtAddDisplay), (XFixesExtRemoveDisplay), - (XFixesExtFindDisplay), (XFixesFindDisplay), (XFixesCloseDisplay), - (XFixesWireToEvent), (XFixesEventToWire), (XFixesQueryExtension), - (XFixesQueryVersion): - * Xfixes.h: - * Xfixesint.h: - * configure.ac: - * xfixes.pc.in: - Merge in xfixes_2_branch - -2003-10-19 Keith Packard <keithp@keithp.com> - - * Cursor.c - * Region.c - * Makefile.am - * SaveSet.c - * Selection.c - * Xfixes.c - * Xfixes.h - * Xfixesint.h - * configure.ac - * xfixes.pc.in - Eliminate dependency on libXext by in-lining trivial code. - Switch to Xfixes 2.0, adding region and cursor name functions - -2003-09-16 Anders Carlsson <andersca@gnome.org> - - * configure.ac: - * randr-uninstalled.pc.in: - Add uninstalled pc file. - -2003-04-21 Keith Packard <keithp@keithp.com> - - + Added ChangeLog diff --git a/nx-X11/lib/Xfixes/INSTALL b/nx-X11/lib/Xfixes/INSTALL deleted file mode 100644 index 557b5e871..000000000 --- a/nx-X11/lib/Xfixes/INSTALL +++ /dev/null @@ -1,8 +0,0 @@ -Xfixes is built with the traditional configure script: - - $ ./configure --prefix=/usr/X11R6 - -This should generate valid Makefiles, then: - - $ make - $ make install diff --git a/nx-X11/lib/Xfixes/Imakefile b/nx-X11/lib/Xfixes/Imakefile index 3dc1bd983..ca1fe046b 100644 --- a/nx-X11/lib/Xfixes/Imakefile +++ b/nx-X11/lib/Xfixes/Imakefile @@ -61,15 +61,3 @@ MANSUFFIX=$(LIBMANSUFFIX) InstallManPage(Xfixes,$(LIBMANDIR)) DependTarget() - -all:: xfixes.pc - -xfixes.pc: xfixes.pc.in - RemoveFile($@) - sh ../Xrender/config-subst $(SUBSTVARS) < xfixes.pc.in > $@ - -InstallNonExecFile(xfixes.pc,$(USRLIBDIR)/pkgconfig) - -clean:: - RemoveFile(xfixes.pc) - diff --git a/nx-X11/lib/Xfixes/NEWS b/nx-X11/lib/Xfixes/NEWS deleted file mode 100644 index e69de29bb..000000000 --- a/nx-X11/lib/Xfixes/NEWS +++ /dev/null diff --git a/nx-X11/lib/Xfixes/README b/nx-X11/lib/Xfixes/README deleted file mode 100644 index 67cf1d8be..000000000 --- a/nx-X11/lib/Xfixes/README +++ /dev/null @@ -1,10 +0,0 @@ - Xfixes - XFIXES Extension - Version 2.0.1 - 2002-10-4 - -This package contains header files and documentation for the XFIXES -extension. Library and server implementations are separate. - -Keith Packard -keithp@keithp.com diff --git a/nx-X11/lib/Xfixes/autogen.sh b/nx-X11/lib/Xfixes/autogen.sh deleted file mode 100755 index b1376df5a..000000000 --- a/nx-X11/lib/Xfixes/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -autoreconf -v --install || exit 1 -./configure --enable-maintainer-mode "$@" diff --git a/nx-X11/lib/Xfixes/configure.ac b/nx-X11/lib/Xfixes/configure.ac deleted file mode 100644 index 37b123516..000000000 --- a/nx-X11/lib/Xfixes/configure.ac +++ /dev/null @@ -1,99 +0,0 @@ -dnl -dnl $Id: configure.ac,v 1.1 2004/07/31 05:50:39 anholt Exp $ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. - -AC_PREREQ([2.57]) - -dnl -dnl Version should match the current XFixes version. XFixesQueryVersion -dnl returns the version from xfixeswire.h, NOT the version we set here. But we -dnl try to keep these the same. Note that the library has an extra -dnl digit in the version number to track changes which don't affect the -dnl protocol, so Xfixes version l.n.m corresponds to protocol version l.n, -dnl that 'revision' number appears in Xfixes.h and has to be manually -dnl synchronized. -dnl -AC_INIT(libXfixes, 3.0.0, [keithp@keithp.com], libXfixes) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) -AC_CONFIG_AUX_DIR(.) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL - -# Check for X -PKG_CHECK_MODULES(X, x11, - [x_found_with_pkgconfig=yes], - [x_found_with_pkgconfig=no]) -AC_SUBST(X_CFLAGS) -AC_SUBST(X_LIBS) - -if test "$x_found_with_pkgconfig" = "no" -then - AC_PATH_XTRA - X_LIBS="$X_LIBS -lX11" - - if test "x$no_x" = "xyes" - then - AC_MSG_ERROR([X is required, but it was either disabled or not found.]) - fi - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" - - AC_MSG_CHECKING([for XTHREADS in Xlib]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], - [[return XInitThreads() == 0 ? 0 : 1;]])], - [xthreads=no], - [xthreads=yes], - [xthreads=yes]) - - AC_MSG_RESULT($xthreads) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - if test "x$xthreads" = "xyes" - then - X_CFLAGS="$X_CFLAGS -DXTHREADS" - fi -fi - -# Check fixesext configuration, strip extra digits from package version to -# find the required protocol version - -FIXESEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(FIXESEXT, [fixesext >= $FIXESEXT_VERSION]) -AC_SUBST(FIXESEXT_CFLAGS) -AC_SUBST(FIXESEXT_LIBS) - -AC_OUTPUT([Makefile - xfixes.pc]) - diff --git a/nx-X11/lib/Xfixes/xfixes.pc.in b/nx-X11/lib/Xfixes/xfixes.pc.in deleted file mode 100644 index 54e9ac709..000000000 --- a/nx-X11/lib/Xfixes/xfixes.pc.in +++ /dev/null @@ -1,10 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Xfixes -Description: X Fixes Library -Version: @VERSION@ -Cflags: -I${includedir} @X_CFLAGS@ -Libs: -L${libdir} -lNX_Xfixes @X_LIBS@ diff --git a/nx-X11/lib/Xrender/AUTHORS b/nx-X11/lib/Xrender/AUTHORS deleted file mode 100644 index 5f6c46a80..000000000 --- a/nx-X11/lib/Xrender/AUTHORS +++ /dev/null @@ -1,3 +0,0 @@ -Keith Packard, of SuSE, XFree86 and Hewlett-Packard - -Noah Levitt, autotooling. diff --git a/nx-X11/lib/Xrender/COPYING b/nx-X11/lib/Xrender/COPYING deleted file mode 100644 index a232c2bea..000000000 --- a/nx-X11/lib/Xrender/COPYING +++ /dev/null @@ -1,22 +0,0 @@ -$Id: COPYING,v 1.2 2004/04/23 18:43:50 eich Exp $ - -Copyright © 2001,2003 Keith Packard - -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. - diff --git a/nx-X11/lib/Xrender/ChangeLog b/nx-X11/lib/Xrender/ChangeLog deleted file mode 100644 index 1fae6e0d2..000000000 --- a/nx-X11/lib/Xrender/ChangeLog +++ /dev/null @@ -1,456 +0,0 @@ -Thu May 19 15:22:19 2005 Søren Sandmann <sandmann@redhat.com> - - * *.c: Conditionallyu include config.h - -2004-02-03 Jim Gettys <jg@freedesktop.org> - - * AUTHORS: Get a author's list going. - -2004-01-15 Daniel Stone <daniel@fooishbar.org> - * Tag release 0.8.4 for first freedesktop.org clientside lib release. - -2004-01-15 Harold L Hunt II <huntharo@msu.edu> - * Makefile.am: Pass -no-undefined to libtool via LDFLAGS. - -2003-12-12 Keith Packard <keithp@keithp.com> - - * configure.ac: - * xrender.pc.in: - Use Requires: in xrender.pc when x11.pc exists - -2003-06-08 10:56 keithp - - * Filter.c, Makefile.am, Xrender.c, Xrenderint.h, configure.ac: - Bail on bogus Xsun servers, compile with -DXTHREADS if necessary, - get rid of unecessary cast to XRenderInfo * - -2003-05-06 09:05 branden - - * ChangeLog: Huh. Did Keith tag xrender-0_8_2 *before* running - cvs2cl? Running it again. - -2003-05-05 20:56 keithp - - * ChangeLog: Update ChangeLog with spiffy cvs2cl script (thanks - Branden) - -2003-05-05 20:49 keithp - - * configure.ac: Update version to 0.8.2, add some version-related - comments - -2003-05-05 20:18 branden - - * debian/: changelog, compat, control, copyright, - libxrender-dev.install, libxrender-dev.postrm, - libxrender-dev.preinst, libxrender1-dbg.install, - libxrender1-dbg.postrm, libxrender1-dbg.preinst, - libxrender1.install, libxrender1.postrm, libxrender1.preinst, - rules: Check in Debian packaging infrastructure per Keith's - request. This is the stuff that corresponds to Debian's xrender - 0.8.1-1 package. - -2003-05-05 19:06 keithp - - * Xrenderint.h, configure.ac: Remove bogus Xext.h include. Fix - Render version comparison - -2003-05-03 13:00 keithp - - * Makefile.am, configure.ac: Bump to version 0.8.1, library version - 1.2.2 after extutil was removed - -2003-04-26 08:52 nlevitt - - * Xrenderint.h: Get rid of reference to XMissingExtension. It's in - libXext, which we don't link, and we don't want to print an error - message anyway. - -2003-04-23 20:29 nlevitt - - * ChangeLog, Composite.c, Cursor.c, FillRect.c, FillRects.c, - Filter.c, Glyph.c, Makefile.am, Picture.c, Trap.c, Tri.c, - Xrender.c, Xrenderint.h, configure.ac, extutil.h, xrender.pc.in: - Get rid of libXext dependency. - -2003-04-22 09:59 nlevitt - - * .cvsignore: Testing syncmail. - -2003-04-21 23:41 nlevitt - - * xrender.pc.in: Xrender.h #includes render.h, so it needs the - Render CFLAGS. - -2003-04-21 23:12 nlevitt - - * xrender.pc.in: s/@PACKAGE_VERSION@/@VERSION@/ (Jeff Waugh, bug - #71) - -2003-04-21 21:46 nlevitt - - * Makefile.am, Xrenderint.h, configure.ac: Use local extutil.h if - not installed on the system. - -2003-04-21 10:36 keithp - - * COPYING, ChangeLog, INSTALL, configure.ac: Fix render header - version check to use VERSION, eliminate duplicate version numbers - from configure.ac - -2003-04-21 10:22 keithp - - * Color.c, Composite.c, Cursor.c, FillRects.c, Filter.c, Glyph.c, - Picture.c, Poly.c, Trap.c, Tri.c, Xrender-def.cpp, Xrender.h, - Xrenderint.h, extutil.h: Switch CVS id tags so regular CVS can cope - -2003-04-21 09:47 keithp - - * Makefile.am: Xrender .so is 1.2. switch order of dependent - libraries - -2003-04-20 23:49 nlevitt - - * FillRect.c: Testing syncmail again. - -2003-04-20 23:44 nlevitt - - * Xrender.c: Testing syncmail. - -2003-04-19 16:02 nlevitt - - * xrender.pc.in: Add X libs to pkg-config --libs. - -2003-04-19 11:32 nlevitt - - * Makefile.am: Link with -lX11 -lXext. - -2003-04-19 11:21 nlevitt - - * Makefile.am, Xrenderint.h, configure.ac: Use installed - <X11/extenstions/extutil.h>. (Thanks, jdub). Make sure X is found - at ./configure time. Bump .so version to 1.1.1. - -2003-04-17 17:43 nlevitt - - * configure.ac: Xrender version is the same as Render. - -2003-04-17 16:41 nlevitt - - * .cvsignore: Quiet, please. - -2003-04-17 15:53 nlevitt - - * xrender.pc.in: Fix typo - -2003-04-17 15:49 nlevitt - - * Imakefile, Makefile.am, Xrenderint.h, autogen.sh, configure.ac, - extutil.h, region.h, xrender.pc.in: Initial automake support. - -2003-03-24 20:18 dawes - - * Xrender-def.cpp: 26. Updates for building on OS/2 (#5650, Frank - Giessler). - -2002-11-24 13:46 tsi - - * Cursor.c: Warning fix - -2002-11-22 18:34 keithp - - * Cursor.c, Xrender.h: Add animate cursor support, client side - -2002-11-21 18:10 keithp - - * Xrender.c: Skip unexpected data in QueryFormats. Deal with - broken X servers a bit better - -2002-11-14 13:01 tsi - - * Imakefile: First pass at imake warnings. + some ATI driver - formatting changes. - - Please ensure these changes are reflected in DRI's CVS. - -2002-11-06 14:47 keithp - - * Xrender.c, Xrender.h: XRenderQueryPictIndexValues support (from - Olivier Chapuis). Bump Render version to 0.7 - -2002-11-05 15:22 keithp - - * Glyph.c, Trap.c, Tri.c, Xrenderint.h: Render uses int for 32 - bits, Xlib uses long. This matters on alpha - -2002-10-17 18:13 keithp - - * Glyph.c: Miscomputing request length for String16 and String32 - -2002-10-01 07:31 alanh - - * Xrender-def.cpp: 358. Enable version controlled .dll's on - Cygwin/XFree86 (Alexander Gottwald). - 357. Some build fixes for Cygwin/XFree86 (Alan Hourihane). - -2002-09-29 16:39 keithp - - * Xrender.c, Xrender.h: Update RandR to 1.0 (library version 2.0) - -2002-09-27 09:40 keithp - - * Trap.c: Obey max request length even with BIG-REQUESTS - -2002-09-25 19:56 keithp - - * Filter.c, Imakefile, Picture.c, Xrender.c, Xrender.h, - Xrenderint.h: Add image transformation and sub-pixel ordering to - Render - -2002-08-31 11:15 keithp - - * Glyph.c: Remember not to write code at 1am. - CompositeText{8,16,32} werent switching glyphsets at the right - time. - -2002-08-30 23:52 keithp - - * Glyph.c: CompositeGlyphs functions were re-using overwritten data - and trashing the output buffer - -2002-08-22 22:48 keithp - - * Cursor.c, Imakefile, Xrender.h: Add CreateCursor request to - Render - -2002-07-24 08:26 tsi - - * Imakefile: Make libXrender buildable in non-XFree86 environments. - -2002-06-07 11:04 keithp - - * Imakefile: Get Xrender to build out of the XFree86 environment - -2002-06-04 16:22 keithp - - * Poly.c: Free edges structure after drawing Render polygons - -2002-05-30 23:38 keithp - - * Imakefile: Fix up support for building Xft1, Xrender and - fontconfig out of the tree - -2002-05-21 13:39 keithp - - * Poly.c: Xrender library didnt render some concave polygons right - -2002-05-17 16:54 keithp - - * Xrender.c: standard 1-bit render format had incorrect depth in - spec - -2002-05-17 15:34 keithp - - * Color.c, Imakefile, Xrender.h: Add Render color parse routine for - rgba colorspace - -2002-05-16 23:54 keithp - - * Poly.c: Another tesselation fix for Rendered polygons - -2002-05-16 08:28 tsi - - * Poly.c: Warning fix - -2002-05-14 23:43 keithp - - * Tri.c: Fix up triangle request encodings - -2002-05-14 23:42 keithp - - * Xrender.c, Xrender.h: Add XRenderFindStandardFormat - -2002-05-14 23:39 keithp - - * Poly.c: Redo tesselation to match foley and vanDam - -2002-05-13 00:21 keithp - - * Poly.c: Make tesselation function do something reasonable - -2002-05-12 22:21 keithp - - * Imakefile, Xrender.h, Poly.c, Trap.c, Tri.c: Update render - extension to include trapezoids - -2002-02-11 23:17 keithp - - * Glyph.c: XRenderFreeGlyphs wasnt sending the glyphset - -2002-01-02 11:57 tsi - - * Glyph.c, Xrender.h: Resync with today's trunk. - -2001-12-26 17:16 keithp - - * Glyph.c, Xrender.h: Add Render equivalents of XPolyText* - -2001-12-18 09:08 tsi - - * FillRect.c, FillRects.c, Glyph.c, Picture.c, Xrender.c, - Xrender.h: Another resync with HEAD branch. - -2001-12-16 10:27 keithp - - * FillRect.c, FillRects.c, Glyph.c, Picture.c, Xrender.c, - Xrender.h: lib/Xrender: add a bunch of _Xconst to make c++ happier - -2001-10-10 20:26 keithp - - * Xrender.c: Check malloc return for Xrender query reply temp data - -2001-09-05 13:13 mvojkovi - - * Xrender.c: - Missing SyncHandle() in XRenderQueryFormats. - -2001-07-31 17:44 tsi - - * Xrender.h: 168. Fix 16bpp colour maps on Mach64's (Marc La - France). - 167. Fix Mach64 DPMS bug (Marc La France). - 166. Fix bug that prevented hardware cursors on Mach64 CT's (Marc - La France). - 165. Document what a ChipAdjustFrame() function should to to - prevent moving - of hardware cursors during mode switches (Marc La France). - 164. -Wimplicit warning cleanup [`make World` >required<] (Marc La - France). - 163. Ensure installed headers can find the headers they, in turn, - #include - (Marc La France). - 162. Make imake pass its -W* flags to cpp (Marc La France). - 161. More accomodations for newer GCC's (Mike A. Harris). - -2001-07-06 13:46 keithp - - * Xrender.c: Fix a couple of locking bugs in Xrender library - -2001-05-16 03:33 keithp - - * Xrender.c: Clean up memory leaks in Xrender library - -2001-02-13 11:19 dawes - - * Xrender-def.cpp: 135. Updates for Cygwin support (#4433, Suhaib - M. Siddiqi). - 134. Fix a bug in the fonts.sgml doc (#4432, Juliusz Chroboczek). - 133. Fix the xdpyinfo so that it will build when the XKB extension - isn't - defined (#4422, Jim Gettys). - 132. Fix the xdm greeter so that it will build when the XKB - extension isn't - defined (#4421, Jim Gettys). - 131. Only build setxkbmap when building the XKB lib support (based - on #4420, - Jim Gettys). - 130. Improve the mga driver messages when the HAL module isn't - available - (#4451, David Woodhouse). - 129. Add G450 support to the mga driver (#4416, Luugi Marsan - (Matrox), - 4449, David Woodhouse). - 128. Mga driver updates, including HAL cleanups, add a Crtc2Ram - option, - and merge with Matrox beta4 source (#4415, Antii Tapaninen, - #4423, - Simon Hosie). - 127. Fix a rounding problem in the wacom driver that was causing - some - position instability (#4417, Hannes Eriksson). - -2000-12-07 15:55 keithp - - * Picture.c: Xrender: missing mask field in ChangePictureAttributes - request encoding - -2000-12-04 23:42 keithp - - * Picture.c: Xft,Xrender: make clip rectangles actually work - -2000-12-04 19:13 keithp - - * Picture.c, Xrender.h: Xft,Xrender,Render: c++ support, clip - rectangles, warnings - -2000-12-04 13:01 dawes - - * Xrender-def.cpp: missing ident lines - -2000-12-04 10:49 dawes - - * Xrender-def.cpp: 1085. Updates for Hurd support (#A.209, Marcus - Brinkmann). 1084. Bump the minor revisions of libXmu (UTF8_STRING) - and libX11 (Xutf8LookupString). 1083. Fixes for all known - bugs in the CompoundText parser and generator, (#4333, Bruno - Haible). 1082. Fix documentation for XSetOMValues() (#4332, Bruno - Haible). 1081. Fix namespace polution in <X11/Xlib.h> introduced - with patch #4293 (#4331, Bruno Haible). 1080. Fix a bug in - the newly introduced Xutf8LookupString() function that loses - input not representable in the locale encoding (#4330, Bruno - Haible). 1079. Avoid four new gcc warnings about const in lcUTF8.c - introduced by patch #4293 (#4329, Bruno Haible). 1078. Fix - some additional cases of confusing local typedef for wchar_t - (#4328, Bruno Haible). 1077. Fix some round-trip conversion errors - in COMPOUND_TEXT -> UTF8_STRING -> COMPOUND_TEXT due to wrong - tables introduced by patches #4214, 4215 (#4327, Pablo - Saratxaga). 1076. Cygwin update for building Xrender DLL (#4326, - Suhaib M. Siddiqi). 1075. Fix an undefined SUBDIRS in - xc/lib/GL/mesa/src/drv/Imakefile when compiling on something - other than x86, alpha or sparc (#4325, Brian Paul). 1074. - Don't have the neomagic driver disable stretching when a mode that - fills the panel is selected (#4324, Andrew C. Aitchison). - 1073. Fix a bug in Xlib's _XimLocalMbLookupString() that causes a - crash when a zero keycode keypress event is received (#4322, - HIBINO Kei). - -2000-12-03 15:41 keithp - - * Xrender.h: Xrender: prototype using "template" collides with - reserved c++ word - -2000-12-02 01:38 keithp - - * Glyph.c: Xrender: 16/32 bit glyph functions using wrong minor - request code - -2000-12-01 13:31 keithp - - * Glyph.c, Picture.c, Xrender.c, Xrender.h: Xrender/Xft: handle - long strings, use unsigned int for 32-bit glyphs - -2000-11-29 00:25 keithp - - * Glyph.c, Xrender.h: add 16/32 bit glyph rendering to Xrender - library - -2000-11-19 23:13 keithp - - * FillRect.c, FillRects.c, Imakefile, Picture.c, Xrender.h: Add - component alpha to Render extension - -2000-08-27 19:43 tsi - - * Composite.c, Glyph.c, Picture.c, Xrender.c, Xrender.h, - Xrenderint.h: Ident lines - -2000-08-26 09:37 keithp - - * Imakefile: Get render library to actually build and install - correctly - -2000-08-25 17:38 keithp - - * Composite.c, Glyph.c, Imakefile, Picture.c, Xrender.c, Xrender.h, - Xrenderint.h: Add Xrender library - diff --git a/nx-X11/lib/Xrender/Color.c b/nx-X11/lib/Xrender/Color.c index 4f934f038..6875204e6 100644 --- a/nx-X11/lib/Xrender/Color.c +++ b/nx-X11/lib/Xrender/Color.c @@ -85,8 +85,8 @@ XRenderParseColor(Display *dpy, char *spec, XRenderColor *def) def->blue = coreColor.blue; def->alpha = 0xffff; } - def->red = (def->red * def->alpha) / 65535; - def->green = (def->green * def->alpha) / 65535; - def->blue = (def->blue * def->alpha) / 65535; + def->red = (def->red * def->alpha) / 0xffffU; + def->green = (def->green * def->alpha) / 0xffffU; + def->blue = (def->blue * def->alpha) / 0xffffU; return 1; } diff --git a/nx-X11/lib/Xrender/INSTALL b/nx-X11/lib/Xrender/INSTALL deleted file mode 100644 index 835f6080a..000000000 --- a/nx-X11/lib/Xrender/INSTALL +++ /dev/null @@ -1,8 +0,0 @@ -Xrender is built with the traditional configure script: - - $ ./configure --prefix=/usr/X11R6 - -This should generate valid Makefiles, then: - - $ make - $ make install diff --git a/nx-X11/lib/Xrender/Imakefile b/nx-X11/lib/Xrender/Imakefile index 72d149a20..35d826b22 100644 --- a/nx-X11/lib/Xrender/Imakefile +++ b/nx-X11/lib/Xrender/Imakefile @@ -147,14 +147,3 @@ DependTarget() distclean:: clean RemoveFile(Makefile) #endif - -all:: xrender.pc - -xrender.pc: xrender.pc.in - RemoveFile($@) - sh config-subst $(SUBSTVARS) < xrender.pc.in > $@ - -InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig) - -clean:: - RemoveFile(xrender.pc) diff --git a/nx-X11/lib/Xrender/NEWS b/nx-X11/lib/Xrender/NEWS deleted file mode 100644 index e69de29bb..000000000 --- a/nx-X11/lib/Xrender/NEWS +++ /dev/null diff --git a/nx-X11/lib/Xrender/README b/nx-X11/lib/Xrender/README deleted file mode 100644 index e69de29bb..000000000 --- a/nx-X11/lib/Xrender/README +++ /dev/null diff --git a/nx-X11/lib/Xrender/autogen.sh b/nx-X11/lib/Xrender/autogen.sh deleted file mode 100755 index b1376df5a..000000000 --- a/nx-X11/lib/Xrender/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -autoreconf -v --install || exit 1 -./configure --enable-maintainer-mode "$@" diff --git a/nx-X11/lib/Xrender/config-subst b/nx-X11/lib/Xrender/config-subst deleted file mode 100644 index 5907e0328..000000000 --- a/nx-X11/lib/Xrender/config-subst +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -script=config-subst.$$ -trap "rm $script" 0 -rm -f $script -for i in ${1+"$@"}; do - var="`echo "$i" | sed 's/=.*$//'`" - val="`echo "$i" | sed 's/^[^=]*=//'`" - echo "s;@$var@;$val;" >> $script -done -sed -f $script diff --git a/nx-X11/lib/Xrender/configure.ac b/nx-X11/lib/Xrender/configure.ac deleted file mode 100644 index a190657f3..000000000 --- a/nx-X11/lib/Xrender/configure.ac +++ /dev/null @@ -1,113 +0,0 @@ -dnl -dnl $Id: configure.ac,v 1.3 2004/08/07 00:40:40 keithp Exp $ -dnl -dnl Copyright © 2003 Keith Packard, Noah Levitt -dnl -dnl Permission to use, copy, modify, distribute, and sell this software and its -dnl documentation for any purpose is hereby granted without fee, provided that -dnl the above copyright notice appear in all copies and that both that -dnl copyright notice and this permission notice appear in supporting -dnl documentation, and that the name of Keith Packard not be used in -dnl advertising or publicity pertaining to distribution of the software without -dnl specific, written prior permission. Keith Packard makes no -dnl representations about the suitability of this software for any purpose. It -dnl is provided "as is" without express or implied warranty. -dnl -dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -dnl PERFORMANCE OF THIS SOFTWARE. -dnl -dnl Process this file with autoconf to create configure. - -AC_PREREQ([2.57]) - -dnl -dnl Version should match the current Render version. XRenderQueryVersion -dnl returns the version from render.h, NOT the version we set here. But we -dnl try to keep these the same. Note that the library has an extra -dnl digit in the version number to track changes which don't affect the -dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n -dnl -AC_INIT(libXrender, 0.9.0, [keithp@keithp.com], libXrender) -AM_INIT_AUTOMAKE([dist-bzip2]) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) -AC_CONFIG_AUX_DIR(.) - -# Check for progs -AC_PROG_CC -AC_PROG_LIBTOOL - -# Check for X -PKG_CHECK_MODULES(X, x11, - [x_found_with_pkgconfig=yes], - [x_found_with_pkgconfig=no]) - -if test "$x_found_with_pkgconfig" = "yes" -then - X_REQUIRES="x11" - X_NON_PKG_CFLAGS="" - X_NON_PKG_LIBS="" -else - AC_PATH_XTRA - - if test "x$no_x" = "xyes" - then - AC_MSG_ERROR([X is required, but it was either disabled or not found.]) - fi - - # pkg-config adds the -l flag while AC_PATH_XTRA does not - - X_LIBS="$X_LIBS -lX11" - - # - # Check for XTHREADS support - # - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $X_CFLAGS" - LIBS="$LIBS $X_LIBS" - - AC_MSG_CHECKING([for XTHREADS in Xlib]) - AC_RUN_IFELSE( - [AC_LANG_PROGRAM([[#include <X11/Xlib.h>]], - [[return XInitThreads() == 0 ? 0 : 1;]])], - [xthreads=no], - [xthreads=yes], - [xthreads=yes]) - - AC_MSG_RESULT($xthreads) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - if test "x$xthreads" = "xyes" - then - X_CFLAGS="$X_CFLAGS -DXTHREADS" - fi - - X_REQUIRES="" - X_NON_PKG_CFLAGS="$X_CFLAGS" - X_NON_PKG_LIBS="$X_LIBS" -fi -AC_SUBST(X_REQUIRES) -AC_SUBST(X_NON_PKG_CFLAGS) -AC_SUBST(X_NON_PKG_LIBS) - -# Check render configuration, strip extra digits from package version to -# find the required protocol version - -if test "$VERSION" = "" ; then - VERSION=$PACKAGE_VERSION; -fi -RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] -PKG_CHECK_MODULES(RENDER, render >= $RENDER_VERSION) - -AC_OUTPUT([Makefile - xrender.pc]) - diff --git a/nx-X11/lib/Xrender/xrender.pc.in b/nx-X11/lib/Xrender/xrender.pc.in deleted file mode 100644 index ec8abb5aa..000000000 --- a/nx-X11/lib/Xrender/xrender.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: Xrender -Description: X Render Library -Version: @VERSION@ -Requires: @X_REQUIRES@ -Cflags: -I${includedir} @RENDER_CFLAGS@ @X_NON_PKG_CFLAGS@ -Libs: -L${libdir} -lNX_Xrender @X_NON_PKG_LIBS@ diff --git a/nx-X11/lib/Xxf86dga/Imakefile b/nx-X11/lib/Xxf86dga/Imakefile deleted file mode 100644 index 0be675720..000000000 --- a/nx-X11/lib/Xxf86dga/Imakefile +++ /dev/null @@ -1,63 +0,0 @@ -XCOMM $XdotOrg: xc/lib/Xxf86dga/Imakefile,v 1.3 2005/10/18 14:58:52 alanc Exp $ -XCOMM $XFree86: xc/lib/Xxf86dga/Imakefile,v 3.6 2003/05/05 20:42:30 tsi Exp $ - -#define DoNormalLib NormalLibXxf86dga -#define DoSharedLib SharedLibXxf86dga -#define DoExtraLib SharedLibXxf86dga -#define DoDebugLib DebugLibXxf86dga -#define DoProfileLib ProfileLibXxf86dga -#define LibName Xxf86dga -#define SoRev SOXXF86DGAREV -#define LibHeaders NO - -#include <Threads.tmpl> - -#ifdef SharedXxf86dgaReqs -REQUIREDLIBS = SharedXxf86dgaReqs -#endif - -XF86DGASRCS = XF86DGA.c XF86DGA2.c -XF86DGAOBJS = XF86DGA.o XF86DGA2.o - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if defined(HasNetBSDApertureDriver) && HasNetBSDApertureDriver -APERTURE_DEFINES = -DHAS_APERTURE_DRV -#endif - - DEFINES = $(ALLOC_DEFINES) $(APERTURE_DEFINES) - SRCS = $(XF86DGASRCS) - OBJS = $(XF86DGAOBJS) - LINTLIBS = $(LINTXLIB) - -#define IncludeSharedObjectInNormalLib - -#include <Library.tmpl> - -InstallGenManPage(XDGA,$(LIBMANDIR),$(LIBMANSUFFIX)) -#if ExpandManNames -DGAFUNCS = XDGAQueryExtension \ - XDGAQueryVersion \ - XDGAQueryModes \ - XDGASetMode \ - XDGAOpenFramebuffer \ - XDGACloseFramebuffer \ - XDGASetViewport \ - XDGAInstallColormap \ - XDGACreateColormap \ - XDGASelectInput \ - XDGAFillRectangle \ - XDGACopyArea \ - XDGACopyTransparentArea \ - XDGAGetViewportStatus \ - XDGASync \ - XDGASetClientVersion \ - XDGAChangePixmapMode \ - XDGAKeyEventToXKeyEvent - -InstallGenManPageAliases(XDGA,$(LIBMANDIR),$(LIBMANSUFFIX),XF86DGA XFree86-DGA $(DGAFUNCS)) -#endif - -DependTarget() diff --git a/nx-X11/lib/Xxf86dga/XDGA.man b/nx-X11/lib/Xxf86dga/XDGA.man deleted file mode 100644 index 9c7beefbb..000000000 --- a/nx-X11/lib/Xxf86dga/XDGA.man +++ /dev/null @@ -1,673 +0,0 @@ -.\" $XFree86$ -.\" -.TH XDGA 3 __vendorversion__ -.SH NAME -XDGA \- Client library for the XFree86-DGA extension. -.SH SYNOPSIS -.B #include <X11/extensions/xf86dga.h> -.HP -Bool -.BR XDGAQueryExtension ( -.br -.RI "Display *" dpy , -.br -.RI "int *" eventBase , -.br -.RI "int *" errorBase ) -.HP -Bool -.BR XDGAQueryVersion ( -.br -.RI "Display *" dpy , -.br -.RI "int *" majorVersion , -.br -.RI "int *" minorVersion ) -.HP -XDGAMode -.RB * XDGAQueryModes ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen , -.br -.RI "int *" num ) -.HP -XDGADevice -.RB * XDGASetMode ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen , -.br -.RI "int " mode ) -.HP -Bool -.BR XDGAOpenFramebuffer ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen ) -.HP -void -.BR XDGACloseFramebuffer ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen ) -.HP -void -.BR XDGASetViewport ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen , -.br -.RI "int " x , -.br -.RI "int " y , -.br -.RI "int " flags ) -.HP -void -.BR XDGAInstallColormap ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen , -.br -.RI "Colormap " cmap ) -.HP -Colormap -.BR XDGACreateColormap ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen , -.br -.RI "XDGADevice *" device , -.br -.RI "int " alloc ) -.HP -void -.BR XDGASelectInput ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen , -.br -.RI "long " event_mask ) -.HP -void -.BR XDGAFillRectangle ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen , -.br -.RI "int " x , -.br -.RI "int " y , -.br -.RI "unsigned int " width , -.br -.RI "unsigned int " height , -.br -.RI "unsigned long " color ) -.HP -void -.BR XDGACopyArea ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen , -.br -.RI "int " srcx , -.br -.RI "int " srcy , -.br -.RI "unsigned int " width , -.br -.RI "unsigned int " height , -.br -.RI "int " dstx , -.br -.RI "int " dsty ) -.HP -void -.BR XDGACopyTransparentArea ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen , -.br -.RI "int " srcx , -.br -.RI "int " srcy , -.br -.RI "unsigned int " width , -.br -.RI "unsigned int " height , -.br -.RI "int " dstx , -.br -.RI "int " dsty , -.br -.RI "unsigned long " key ) -.HP -int -.BR XDGAGetViewportStatus ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen ) -.HP -void -.BR XDGASync ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen ) -.HP -Bool -.BR XDGASetClientVersion ( -.br -.RI "Display *" dpy ) -.HP -void -.BR XDGAChangePixmapMode ( -.br -.RI "Display *" dpy , -.br -.RI "int " screen , -.br -.RI "int *" x , -.br -.RI "int *" y , -.br -.RI "int " mode ) -.HP -void -.BR XDGAKeyEventToXKeyEvent ( -.br -.RI "XDGAKeyEvent *" dk , -.br -.RI "XKeyEvent *" xk ) - -.SH DESCRIPTION -The -.B XFree86-DGA -extension is an X server extension for allowing client programs direct -access to the video frame buffer. This is a brief description of the -programming interface for version 2.0 of the -.B XFree86-DGA -extension. -.PP -.B XFree86-DGA -is not intended as a direct rendering API, but rather, as a mechanism -to "get the X Server out of the way" so that some other direct rendering -API can have full access to the hardware. With this in mind, DGA does -provide clients some direct access to the hardware without requiring a -separate rendering API, but this access is limited to direct linear -framebuffer access. -.PP -Most of the reasons for the -.B XFree86-DGA -extension's existence are now better served in other ways. Further -development of this extension is not expected, and it may be deprecated -in a future release. The features that continue to be useful will either -be provided through other existing mechanisms, or through an extension -that address those needs more specifically. -.PP -.B XFree86-DGA -is initialized by passing a number corresponding to a valid -.I XDGAMode -to -.BR XDGASetMode (). -Clients can get a list of valid modes from -.BR XDGAQueryModes (). -Each -.I XDGAMode -corresponds to a different framebuffer layout. -.PP -.BR XDGAQueryModes () -returns a pointer to an array of -.IR XDGAMode s -which are valid for the given screen. -.I num -is the number of elements in the array. The returned array can be freed -with XFree(3). The -.I XDGAMode -structure is as follows: -.PP -.nf -.ta .5i 2i -typedef struct { - int num; - char *name; - float verticalRefresh; - int flags; - int imageWidth; - int imageHeight; - int pixmapWidth; - int pixmapHeight; - int bytesPerScanline; - int byteOrder; - int depth; - int bitsPerPixel; - unsigned long redMask; - unsigned long greenMask; - unsigned long blueMask; - short visualClass; - int viewportWidth; - int viewportHeight; - int xViewportStep; - int yViewportStep; - int maxViewportX; - int maxViewportY; - int viewportFlags; - int reserved1; - int reserved2; -.br -} XDGAMode; -.fi -.TP 8 -.I num -A unique identifying number -.RI ( num -> 0) for the mode. This is the number referenced when initializing the mode. -.TP 8 -.I name -The name of the corresponding modeline as given in the __xconfigfile__ file. -.TP 8 -.I verticalRefresh -The vertical refresh rate for the modeline (in Hz). -.TP 8 -.I flags -Any of the following may be OR'd together: -.RS 8 -.TP 4 -.B XDGAConcurrentAccess -Indicates that concurrent client/server access to the framebuffer is -possible. If this flag is not set it is very important to call -.BR XDGASync () -before directly accessing the framebuffer if a call to -.BR XDGAFillRectangle (), -.BR XDGACopyArea () -or -.BR XDGACopyTransparentArea () -or any Xlib rendering function has been made prior to such accesses. -.TP 4 -.B XDGASolidFillRect -Indicates that -.BR XDGAFillRectangle () -is supported. -.TP 4 -.B XDGABlitRect -Indicates that -.BR XDGACopyArea () -is supported. -.TP 4 -.B XDGABlitTransRect -Indicates that -.BR XDGACopyTransparentArea () -is supported. -.TP 4 -.B XDGAPixmap -Indicates that a Pixmap will be returned when the mode is initialized. -This means that rendering with Xlib is possible for this mode. -.TP 4 -.B XDGAInterlaced -.TP 4 -.B XDGADoublescan -Indicates that the mode is an interlaced or doublescan mode. -.RE -.TP 8 -.I imageWidth -.TP 8 -.I imageHeight -The width and height of the framebuffer area accessible by the client. -This rectangle is always justified to the upper left-hand corner. -.TP 8 -.I pixmapWidth -.TP 8 -.I pixmapHeight -The width and height of the framebuffer area accessible by Xlib. This -rectangle is always justified to the upper left-hand corner. These -fields are only valid if the -.B XDGAPixmap -flag is set in the -.I flags -field. -.TP 8 -.I bytesPerScanline -The pitch of the framebuffer in bytes. -.TP 8 -.I byteOrder -.B MSBFirst -or -.BR LSBFirst . -.TP 8 -.I depth -The number of bits in each pixel which contain usable data. -.TP 8 -.I bitsPerPixel -The number of bits taken up by each pixel. -.TP 8 -.I redMask -.TP 8 -.I greenMask -.TP 8 -.I blueMask -The RGB masks. These do not apply to color-indexed modes. -.TP 8 -.I visualClass -.BR TrueColor , -.BR PseudoColor , -.BR DirectColor , -etc. -.TP 8 -.I viewportWidth -.TP 8 -.I viewportHeight -The dimensions of the portion of the framebuffer which will be displayed -on the screen. -.TP 8 -.I xViewPortStep -.TP 8 -.I yViewPortStep -The granularity of the x,y viewport positioning possible with the -.BR XDGASetViewport () -function. -.TP 8 -.I maxViewportX -.TP 8 -.I maxViewportY -The maximum x and y positions possible with the -.BR XDGASetViewport () -function. -.TP 8 -.I viewportFlags -Any of the following may be OR'd together -.RS 8 -.TP 4 -.B XDGAFlipRetrace -Indicates that the hardware can switch viewports during the vertical -retrace. -.TP 4 -.B XDGAFlipImmediate -Indicates that the hardware can switch viewports immediately without -waiting for the vertical retrace. -.RE -.PP -.BR XDGASetMode () -initialises the -.I XDGAMode -corresponding to -.IR num . -To exit DGA mode and return to normal server operation, call -.BR XDGASetMode () -with -.I num -set to zero. -.BR XDGASetMode () -returns a pointer to an -.I XDGADevice -if successful. The XDGADevice can be freed with XFree(3). The -.I XDGADevice -structure is as follows: -.PP -.nf -.ta .5i 2i -typedef struct { - XDGAMode mode; - unsigned char *data; - Pixmap pixmap; -.br -} XDGADevice; -.fi -.TP 8 -.I mode -The -.I XDGAMode -structure, identical to the information returned by -.BR XDGAQueryModes (). -.TP 8 -.I data -If direct framebuffer access is desired and possible, this field will -contain a pointer to the mapped framebuffer memory. Generally, this -field will be zero unless a call to -.BR XDGAOpenFramebuffer () -is made prior to initialization of the mode. -.TP 8 -.I pixmap -If the mode supports Xlib rendering as indicated by -.B XDGAPixmap -in the -.I flags -field, this will contain a Pixmap handle suitable for passing as the -drawable argument to Xlib functions. This field will be zero if Xlib -rendering is not supported. -.PP -.BR XDGAQueryExtension () -checks for the presence of the extension and returns the event and error bases. -.PP -.BR XDGAQueryVersion () -returns the -.B XFree86-DGA -major and minor version numbers. -.PP -.BR XDGAOpenFramebuffer () -maps the framebuffer memory. The client needs sufficient privileges to be -able to do this. -.BR XDGAOpenFramebuffer () -should be called prior to initializing a DGA mode if direct framebuffer -access is desired for that mode. -.BR XDGAOpenFramebuffer () -does not need to be called if direct framebuffer access is not required. -If the framebuffer is opened, -.PP -.BR XDGACloseFramebuffer () -should be called prior to client exit to unmap the memory. -.PP -.BR XDGAChangePixmapMode () -can be used to change between two pixmap sizes in cases where a Pixmap is -available for Xlib rendering. The following values for the -.I mode -parameter are available: -.RS 8 -.TP 4 -.B XDGAPixmapModeLarge -The pixmap size is defined by the -.I pixmapWidth -and -.I pixmapHeight -fields in the -.I XDGAMode -structure. The -.I x -and -.I y -values are ignored in this case. -.TP 4 -.B XDGAPixmapModeSmall -The pixmap size is defined by the -.I viewportWidth -and -.I viewportHeight -fields in the -.I XDGAMode -structure. In this mode, the -.I x -and -.I y -values specify where in the framebuffer this pixmap rectangle is located. -It may be placed anywhere within the Xlib renderable region described -by the -.I pixmapWidth -and -.I pixmapHeight -fields in the -.IR XDGAMode . -The -.I x -and -.I y -values returned are the resultant location of the pixmap and may be -different from the requested x,y location due to platform specific -alignment constraints. All Xlib rendering is clipped to this pixmap -rectangle. -.RE -.PP -.BR XDGASetViewport () -sets the upper left-hand corner of the rectangle of framebuffer that is -to be displayed on the screen. Not all locations may be supported by -the hardware and requested locations will be adjusted according to the -.I xViewPortStep -and -.I yViewPortStep -fields in the -.IR XDGAMode . -.PP -.I flags -can be -.B XDGAFlipRetrace -or -.B XDGAFlipImmediate -to adjust the viewport location at the next vertical retrace or -immediately. Values other than the supported values advertised in the -mode's -.I viewportFlags -field will result in hardware-specific default behavior. -.B XDGAFlipImmediate -will block until the flip is completed. -.B XDGAFlipRetrace -will generally NOT block so it is necessary to monitor the viewport -status with -.BR XDGAGetViewportStatus (). -.B XDGAFlipImmediate -requests during pending -.B XDGAFlipRetrace -requests will be ignored. -.PP -.BR XDGAGetViewportStatus () -keeps track of the -.BR XDGASetViewport () -requests still pending. The return value of the function will have -consecutive bits set (LSB justified), each bit representing a pending -viewport change. For example: -.PP -.nf - while(XDGAGetViewportStatus(dpy, screen)); -.fi -.PP -waits for all pending viewport changes to finish. -.PP -.nf - while(0x2 & XDGAGetViewportStatus(dpy, screen)); -.fi -.PP -waits until all but the last viewport changes have completed. -.PP -.BR XDGACreateColormap () -is similar to the Xlib function XCreateColormap(3) except that it takes -an -.I XDGADevice -as an argument instead of a Window and Visual. Though XCreateColormap(3) -may create usable colormaps in some cases, -.BR XDGACreateColormap () -is the preferred method for creating colormaps in DGA since there may -not be an advertised visual compatible with the DGA device. -.PP -.BR XDGAInstallColormap () -must be used to install colormaps in DGA mode. XInstallColormap(3) will -not work. -.PP -.BR XDGASelectInput () -enables DGA's own event mechanism. This function is similar to -XSelectInput(3), and all Xlib Key, Button and Motion masks are supported. -The following DGA events are defined: -.PP -.nf -.ta .5i 2i -typedef struct { - int type; /\(** ButtonPress or ButtonRelease + the DGA event base*/ - unsigned long serial; /\(** # or last request processed by the server */ - Display *display; /\(** Display the event was read from */ - int screen; /\(** The screen number the event came from */ - Time time; /\(** milliseconds */ - unsigned int state; /\(** key or button mask */ - unsigned int button; /\(** detail */ -.br -} XDGAButtonEvent; -.fi -.PP -.nf -.ta .5i 2i -typedef struct { - int type; /\(** KeyPress or KeyRelease + the DGA event base*/ - unsigned long serial; /\(** # or last request processed by the server */ - Display *display; /\(** Display the event was read from */ - int screen; /\(** The screen number the event came from */ - Time time; /\(** milliseconds */ - unsigned int state; /\(** key or button mask */ - unsigned int keycode; /\(** detail */ -.br -} XDGAKeyEvent; -.fi -.PP -.nf -.ta .5i 2i -typedef struct { - int type; /\(** MotionNotify + the DGA event base*/ - unsigned long serial; /\(** # or last request processed by the server */ - Display *display; /\(** Display the event was read from */ - int screen; /\(** The screen number the event came from */ - Time time; /\(** milliseconds */ - unsigned int state; /\(** key or button mask */ - int dx; /\(** relative pointer motion */ - int dy; /\(** relative pointer motion */ -.br -} XDGAMotionEvent; -.fi -.PP -.BR XDGAKeyEventToXKeyEvent () -is a helper function to translate -.IR XDGAKeyEvent s -into -.IR XKeyEvent s -suitable for use with XLookupKeysym(3). -.PP -.BR XDGAFillRectangle (), -.BR XDGACopyArea (), -and -.BR XDGACopyTransparentArea () -are included with some reservation since DGA is not intended as a -rendering API. These are merely convenience routines and are optionally -supported. The associated flags will be set in the -.IR XDGAMode 's -.I flags -field if these functions are supported. These functions will be no-ops -otherwise. they do not provide direct access to the hardware, but are -simply context-less operations performed by the server. -.PP -.BR XDGASync () -blocks until all server rendering to the framebuffer completes. If Xlib -or the 3 rendering functions above are used, -.BR XDGASync () -must be called before the client directly accesses the framebuffer as -the server rendering is asynchronous with the client and may have not -completed. This is especially important if the -.B XDGAConcurrentAccess -flag is not set in the -.IR XDGAMode 's -.I flags -field since concurrent access by the server and client may result in a -system lockup. -.SH SEE ALSO -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__) -.SH AUTHORS -.B XFree86-DGA -version 2 was written by Mark Vojkovich. Version 1 was written by Jon -Tombs, Harm Hanemaayer, Mark Vojkovich. - diff --git a/nx-X11/lib/Xxf86dga/XF86DGA.c b/nx-X11/lib/Xxf86dga/XF86DGA.c deleted file mode 100644 index 95d7596e2..000000000 --- a/nx-X11/lib/Xxf86dga/XF86DGA.c +++ /dev/null @@ -1,722 +0,0 @@ -/* $XFree86: xc/lib/Xxf86dga/XF86DGA.c,v 3.23tsi Exp $ */ -/* - -Copyright (c) 1995 Jon Tombs -Copyright (c) 1995,1996 The XFree86 Project, Inc - -*/ - -/* THIS IS NOT AN X CONSORTIUM STANDARD */ - -#ifdef __UNIXOS2__ /* needed here to override certain constants in X headers */ -#define INCL_DOS -#define INCL_DOSIOCTL -#define I_NEED_OS2_H -#include <os2.h> -#endif - -#if defined(linux) -#define HAS_MMAP_ANON -#include <sys/types.h> -#include <sys/mman.h> -/* kernel header doesn't work with -ansi */ -/* #include <asm/page.h> */ /* PAGE_SIZE */ -#define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */ -#define HAS_GETPAGESIZE -#endif /* linux */ - -#if defined(CSRG_BASED) -#define HAS_MMAP_ANON -#define HAS_GETPAGESIZE -#include <sys/types.h> -#include <sys/mman.h> -#endif /* CSRG_BASED */ - -#if defined(DGUX) -#define HAS_GETPAGESIZE -#define MMAP_DEV_ZERO -#include <sys/types.h> -#include <sys/mman.h> -#include <unistd.h> -#endif /* DGUX */ - -#if defined(SVR4) && !defined(DGUX) -#define MMAP_DEV_ZERO -#include <sys/types.h> -#include <sys/mman.h> -#include <unistd.h> -#endif /* SVR4 && !DGUX */ - -#if defined(sun) && !defined(SVR4) /* SunOS */ -#define MMAP_DEV_ZERO /* doesn't SunOS have MAP_ANON ?? */ -#define HAS_GETPAGESIZE -#include <sys/types.h> -#include <sys/mman.h> -#endif /* sun && !SVR4 */ - -#ifdef XNO_SYSCONF -#undef _SC_PAGESIZE -#endif - - -#define NEED_EVENTS -#define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/xf86dga.h> -#include <X11/extensions/xf86dgastr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> - -extern XExtDisplayInfo* xdga_find_display(Display*); -extern char *xdga_extension_name; - -#define XF86DGACheckExtension(dpy,i,val) \ - XextCheckExtension (dpy, i, xdga_extension_name, val) - -/***************************************************************************** - * * - * public XFree86-DGA Extension routines * - * * - *****************************************************************************/ - -Bool XF86DGAQueryExtension ( - Display *dpy, - int *event_basep, - int *error_basep -){ - return XDGAQueryExtension(dpy, event_basep, error_basep); -} - -Bool XF86DGAQueryVersion( - Display* dpy, - int* majorVersion, - int* minorVersion -){ - return XDGAQueryVersion(dpy, majorVersion, minorVersion); -} - -Bool XF86DGAGetVideoLL( - Display* dpy, - int screen, - int *offset, - int *width, - int *bank_size, - int *ram_size -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXF86DGAGetVideoLLReply rep; - xXF86DGAGetVideoLLReq *req; - - XF86DGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86DGAGetVideoLL, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XF86DGAGetVideoLL; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - - *offset = /*(char *)*/rep.offset; - *width = rep.width; - *bank_size = rep.bank_size; - *ram_size = rep.ram_size; - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - - -Bool XF86DGADirectVideoLL( - Display* dpy, - int screen, - int enable -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXF86DGADirectVideoReq *req; - - XF86DGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86DGADirectVideo, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XF86DGADirectVideo; - req->screen = screen; - req->enable = enable; - UnlockDisplay(dpy); - SyncHandle(); - XSync(dpy,False); - return True; -} - -Bool XF86DGAGetViewPortSize( - Display* dpy, - int screen, - int *width, - int *height -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXF86DGAGetViewPortSizeReply rep; - xXF86DGAGetViewPortSizeReq *req; - - XF86DGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86DGAGetViewPortSize, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XF86DGAGetViewPortSize; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - - *width = rep.width; - *height = rep.height; - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - - -Bool XF86DGASetViewPort( - Display* dpy, - int screen, - int x, - int y -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXF86DGASetViewPortReq *req; - - XF86DGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86DGASetViewPort, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XF86DGASetViewPort; - req->screen = screen; - req->x = x; - req->y = y; - UnlockDisplay(dpy); - SyncHandle(); - XSync(dpy,False); - return True; -} - - -Bool XF86DGAGetVidPage( - Display* dpy, - int screen, - int *vpage -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXF86DGAGetVidPageReply rep; - xXF86DGAGetVidPageReq *req; - - XF86DGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86DGAGetVidPage, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XF86DGAGetVidPage; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - - *vpage = rep.vpage; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - - -Bool XF86DGASetVidPage( - Display* dpy, - int screen, - int vpage -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXF86DGASetVidPageReq *req; - - XF86DGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86DGASetVidPage, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XF86DGASetVidPage; - req->screen = screen; - req->vpage = vpage; - UnlockDisplay(dpy); - SyncHandle(); - XSync(dpy,False); - return True; -} - -Bool XF86DGAInstallColormap( - Display* dpy, - int screen, - Colormap cmap -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXF86DGAInstallColormapReq *req; - - XF86DGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86DGAInstallColormap, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XF86DGAInstallColormap; - req->screen = screen; - req->id = cmap; - UnlockDisplay(dpy); - SyncHandle(); - XSync(dpy,False); - return True; -} - -Bool XF86DGAQueryDirectVideo( - Display *dpy, - int screen, - int *flags -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXF86DGAQueryDirectVideoReply rep; - xXF86DGAQueryDirectVideoReq *req; - - XF86DGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86DGAQueryDirectVideo, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XF86DGAQueryDirectVideo; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - *flags = rep.flags; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86DGAViewPortChanged( - Display *dpy, - int screen, - int n -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXF86DGAViewPortChangedReply rep; - xXF86DGAViewPortChangedReq *req; - - XF86DGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86DGAViewPortChanged, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XF86DGAViewPortChanged; - req->screen = screen; - req->n = n; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - UnlockDisplay(dpy); - SyncHandle(); - return rep.result; -} - - - -/* Helper functions */ - -#include <X11/Xmd.h> -#include <X11/extensions/xf86dga.h> -#include <stdlib.h> -#include <stdio.h> -#include <fcntl.h> -#if defined(ISC) -# define HAS_SVR3_MMAP -# include <sys/types.h> -# include <errno.h> - -# include <sys/at_ansi.h> -# include <sys/kd.h> - -# include <sys/sysmacros.h> -# include <sys/immu.h> -# include <sys/region.h> - -# include <sys/mmap.h> -#else -# if defined(Lynx) && defined(NO_MMAP) -# include <sys/types.h> -# include <errno.h> -# include <smem.h> -# else -# if !defined(__UNIXOS2__) -# include <sys/mman.h> -# endif -# endif -#endif -#include <sys/wait.h> -#include <signal.h> -#include <unistd.h> - -#if defined(SVR4) && !defined(sun) -#define DEV_MEM "/dev/pmem" -#elif defined(SVR4) && defined(sun) -#define DEV_MEM "/dev/xsvc" -#elif defined(HAS_APERTURE_DRV) -#define DEV_MEM "/dev/xf86" -#else -#define DEV_MEM "/dev/mem" -#endif - -typedef struct { - unsigned long physaddr; /* actual requested physical address */ - unsigned long size; /* actual requested map size */ - unsigned long delta; /* delta to account for page alignment */ - void * vaddr; /* mapped address, without the delta */ - int refcount; /* reference count */ -} MapRec, *MapPtr; - -typedef struct { - Display * display; - int screen; - MapPtr map; -} ScrRec, *ScrPtr; - -static int mapFd = -1; -static int numMaps = 0; -static int numScrs = 0; -static MapPtr *mapList = NULL; -static ScrPtr *scrList = NULL; - -static MapPtr -AddMap(void) -{ - MapPtr *old; - - old = mapList; - mapList = realloc(mapList, sizeof(MapPtr) * (numMaps + 1)); - if (!mapList) { - mapList = old; - return NULL; - } - mapList[numMaps] = malloc(sizeof(MapRec)); - if (!mapList[numMaps]) - return NULL; - return mapList[numMaps++]; -} - -static ScrPtr -AddScr(void) -{ - ScrPtr *old; - - old = scrList; - scrList = realloc(scrList, sizeof(ScrPtr) * (numScrs + 1)); - if (!scrList) { - scrList = old; - return NULL; - } - scrList[numScrs] = malloc(sizeof(ScrRec)); - if (!scrList[numScrs]) - return NULL; - return scrList[numScrs++]; -} - -static MapPtr -FindMap(unsigned long address, unsigned long size) -{ - int i; - - for (i = 0; i < numMaps; i++) { - if (mapList[i]->physaddr == address && - mapList[i]->size == size) - return mapList[i]; - } - return NULL; -} - -static ScrPtr -FindScr(Display *display, int screen) -{ - int i; - - for (i = 0; i < numScrs; i++) { - if (scrList[i]->display == display && - scrList[i]->screen == screen) - return scrList[i]; - } - return NULL; -} - -static void * -MapPhysAddress(unsigned long address, unsigned long size) -{ - unsigned long offset, delta; - int pagesize = -1; - void *vaddr; - MapPtr mp; -#if defined(ISC) && defined(HAS_SVR3_MMAP) - struct kd_memloc mloc; -#elif defined(__UNIXOS2__) - APIRET rc; - ULONG action; - HFILE hfd; -#endif - - if ((mp = FindMap(address, size))) { - mp->refcount++; - return (void *)((unsigned long)mp->vaddr + mp->delta); - } - -#if defined(_SC_PAGESIZE) && defined(HAS_SC_PAGESIZE) - pagesize = sysconf(_SC_PAGESIZE); -#endif -#ifdef _SC_PAGE_SIZE - if (pagesize == -1) - pagesize = sysconf(_SC_PAGE_SIZE); -#endif -#ifdef HAS_GETPAGESIZE - if (pagesize == -1) - pagesize = getpagesize(); -#endif -#ifdef PAGE_SIZE - if (pagesize == -1) - pagesize = PAGE_SIZE; -#endif - if (pagesize == -1) - pagesize = 4096; - - delta = address % pagesize; - offset = address - delta; - -#if defined(ISC) && defined(HAS_SVR3_MMAP) - if (mapFd < 0) { - if ((mapFd = open("/dev/mmap", O_RDWR)) < 0) - return NULL; - } - mloc.vaddr = (char *)0; - mloc.physaddr = (char *)offset; - mloc.length = size + delta; - mloc.ioflg=1; - - if ((vaddr = (void *)ioctl(mapFd, MAP, &mloc)) == (void *)-1) - return NULL; -#elif defined (__UNIXOS2__) - /* - * Dragon warning here! /dev/pmap$ is never closed, except on progam exit. - * Consecutive calling of this routine will make PMAP$ driver run out - * of memory handles. Some umap/close mechanism should be provided - */ - - rc = DosOpen("/dev/pmap$", &hfd, &action, 0, FILE_NORMAL, FILE_OPEN, - OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYNONE, (PEAOP2)NULL); - if (rc != 0) - return NULL; - { - struct map_ioctl { - union { - ULONG phys; - void* user; - } a; - ULONG size; - } pmap,dmap; - ULONG plen,dlen; -#define XFREE86_PMAP 0x76 -#define PMAP_MAP 0x44 - - pmap.a.phys = offset; - pmap.size = size + delta; - rc = DosDevIOCtl(hfd, XFREE86_PMAP, PMAP_MAP, - (PULONG)&pmap, sizeof(pmap), &plen, - (PULONG)&dmap, sizeof(dmap), &dlen); - if (rc == 0) { - vaddr = dmap.a.user; - } - } - if (rc != 0) - return NULL; -#elif defined(Lynx) && defined(NO_MMAP) - vaddr = (void *)smem_create("XF86DGA", (char *)offset, - size + delta, SM_READ|SM_WRITE); -#else -#ifndef MAP_FILE -#define MAP_FILE 0 -#endif - if (mapFd < 0) { - if ((mapFd = open(DEV_MEM, O_RDWR)) < 0) - return NULL; - } - vaddr = (void *)mmap(NULL, size + delta, PROT_READ | PROT_WRITE, - MAP_FILE | MAP_SHARED, mapFd, (off_t)offset); - if (vaddr == (void *)-1) - return NULL; -#endif - - if (!vaddr) { - if (!(mp = AddMap())) - return NULL; - mp->physaddr = address; - mp->size = size; - mp->delta = delta; - mp->vaddr = vaddr; - mp->refcount = 1; - } - return (void *)((unsigned long)vaddr + delta); -} - -/* - * Still need to find a clean way of detecting the death of a DGA app - * and returning things to normal - Jon - * This is here to help debugging without rebooting... Also C-A-BS - * should restore text mode. - */ - -int -XF86DGAForkApp(int screen) -{ - pid_t pid; - int status; - int i; - - /* fork the app, parent hangs around to clean up */ - if ((pid = fork()) > 0) { - ScrPtr sp; - - waitpid(pid, &status, 0); - for (i = 0; i < numScrs; i++) { - sp = scrList[i]; - XF86DGADirectVideoLL(sp->display, sp->screen, 0); - XSync(sp->display, False); - } - if (WIFEXITED(status)) - _exit(0); - else - _exit(-1); - } - return pid; -} - - -Bool -XF86DGADirectVideo( - Display *dis, - int screen, - int enable -){ - ScrPtr sp; - MapPtr mp = NULL; - - if ((sp = FindScr(dis, screen))) - mp = sp->map; - - if (enable & XF86DGADirectGraphics) { -#if !defined(ISC) && !defined(HAS_SVR3_MMAP) \ - && !(defined(Lynx) && defined(NO_MMAP)) \ - && !defined(__UNIXOS2__) - if (mp && mp->vaddr) - mprotect(mp->vaddr, mp->size + mp->delta, PROT_READ | PROT_WRITE); -#endif - } else { -#if !defined(ISC) && !defined(HAS_SVR3_MMAP) \ - && !(defined(Lynx) && defined(NO_MMAP)) \ - && !defined(__UNIXOS2__) - if (mp && mp->vaddr) - mprotect(mp->vaddr, mp->size + mp->delta, PROT_READ); -#elif defined(Lynx) && defined(NO_MMAP) - /* XXX this doesn't allow enable after disable */ - smem_create(NULL, mp->vaddr, mp->size + mp->delta, SM_DETACH); - smem_remove("XF86DGA"); -#endif - } - - XF86DGADirectVideoLL(dis, screen, enable); - return 1; -} - - -static void -XF86cleanup(int sig) -{ - ScrPtr sp; - int i; - static char beenhere = 0; - - if (beenhere) - _exit(3); - beenhere = 1; - - for (i = 0; i < numScrs; i++) { - sp = scrList[i]; - XF86DGADirectVideo(sp->display, sp->screen, 0); - XSync(sp->display, False); - } - _exit(3); -} - -Bool -XF86DGAGetVideo( - Display *dis, - int screen, - char **addr, - int *width, - int *bank, - int *ram -){ - /*unsigned long*/ int offset; - static int beenHere = 0; - ScrPtr sp; - MapPtr mp; - - if (!(sp = FindScr(dis, screen))) { - if (!(sp = AddScr())) { - fprintf(stderr, "XF86DGAGetVideo: malloc failure\n"); - exit(-2); - } - sp->display = dis; - sp->screen = screen; - sp->map = NULL; - } - - XF86DGAGetVideoLL(dis, screen , &offset, width, bank, ram); - - *addr = MapPhysAddress(offset, *bank); - if (*addr == NULL) { - fprintf(stderr, "XF86DGAGetVideo: failed to map video memory (%s)\n", - strerror(errno)); - exit(-2); - } - - if ((mp = FindMap(offset, *bank))) - sp->map = mp; - - if (!beenHere) { - beenHere = 1; - atexit((void(*)(void))XF86cleanup); - /* one shot XF86cleanup attempts */ - signal(SIGSEGV, XF86cleanup); -#ifdef SIGBUS - signal(SIGBUS, XF86cleanup); -#endif - signal(SIGHUP, XF86cleanup); - signal(SIGFPE, XF86cleanup); - } - - return 1; -} - diff --git a/nx-X11/lib/Xxf86dga/XF86DGA2.c b/nx-X11/lib/Xxf86dga/XF86DGA2.c deleted file mode 100644 index 533901fca..000000000 --- a/nx-X11/lib/Xxf86dga/XF86DGA2.c +++ /dev/null @@ -1,968 +0,0 @@ -/* $XFree86: xc/lib/Xxf86dga/XF86DGA2.c,v 1.23 2003/05/05 20:42:30 tsi Exp $ */ -/* - -Copyright (c) 1995 Jon Tombs -Copyright (c) 1995,1996 The XFree86 Project, Inc - -*/ - -/* THIS IS NOT AN X CONSORTIUM STANDARD */ - -#ifdef __UNIXOS2__ /* needed here to override certain constants in X headers */ -#define INCL_DOS -#define INCL_DOSIOCTL -#define I_NEED_OS2_H -#include <os2.h> -#endif - -#define NEED_EVENTS -#define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/xf86dga.h> -#include <X11/extensions/xf86dgastr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> -#include <stdio.h> - - -/* If you change this, change the Bases[] array below as well */ -#define MAX_HEADS 16 - -char *xdga_extension_name = XF86DGANAME; - -static XExtensionInfo _xdga_info_data; -static XExtensionInfo *xdga_info = &_xdga_info_data; - - -Bool XDGAMapFramebuffer(int, char *, unsigned char*, CARD32, CARD32, CARD32); -void XDGAUnmapFramebuffer(int); -unsigned char* XDGAGetMappedMemory(int); - -#define XDGACheckExtension(dpy,i,val) \ - XextCheckExtension (dpy, i, xdga_extension_name, val) - -/***************************************************************************** - * * - * private utility routines * - * * - *****************************************************************************/ - -static int xdga_close_display(Display *dpy, XExtCodes *codes); -static Bool xdga_wire_to_event(Display *dpy, XEvent *event, xEvent *wire_ev); -static Status xdga_event_to_wire(Display *dpy, XEvent *event, xEvent *wire_ev); - -static XExtensionHooks xdga_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ - NULL, /* flush_gc */ - NULL, /* free_gc */ - NULL, /* create_font */ - NULL, /* free_font */ - xdga_close_display, /* close_display */ - xdga_wire_to_event, /* wire_to_event */ - xdga_event_to_wire, /* event_to_wire */ - NULL, /* error */ - NULL, /* error_string */ -}; - -static XEXT_GENERATE_CLOSE_DISPLAY (xdga_close_display, xdga_info) - - -XExtDisplayInfo* xdga_find_display(Display*); -XEXT_GENERATE_FIND_DISPLAY (xdga_find_display, xdga_info, - "XFree86-DGA", - &xdga_extension_hooks, - 0, NULL) - - -static Status -xdga_event_to_wire( - Display *dpy, - XEvent *event, - xEvent *wire_ev -){ - return True; -} - -static Bool -xdga_wire_to_event( - Display *dpy, - XEvent *event, - xEvent *wire_ev -){ - dgaEvent *wire = (dgaEvent *) wire_ev; - XDGAButtonEvent *bevent; - XDGAKeyEvent *kevent; - XDGAMotionEvent *mevent; - XExtDisplayInfo *info = xdga_find_display (dpy); - - XDGACheckExtension (dpy, info, False); - - switch((wire->u.u.type & 0x7f) - info->codes->first_event) { - case MotionNotify: - mevent = (XDGAMotionEvent*)event; - mevent->type = wire->u.u.type & 0x7F; - mevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *)wire); - mevent->display = dpy; - mevent->screen = wire->u.event.screen; - mevent->time = wire->u.event.time; - mevent->state = wire->u.event.state; - mevent->dx = wire->u.event.dx; - mevent->dy = wire->u.event.dy; - return True; - case ButtonPress: - case ButtonRelease: - bevent = (XDGAButtonEvent*)event; - bevent->type = wire->u.u.type & 0x7F; - bevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *)wire); - bevent->display = dpy; - bevent->screen = wire->u.event.screen; - bevent->time = wire->u.event.time; - bevent->state = wire->u.event.state; - bevent->button = wire->u.u.detail; - return True; - case KeyPress: - case KeyRelease: - kevent = (XDGAKeyEvent*)event; - kevent->type = wire->u.u.type & 0x7F; - kevent->serial = _XSetLastRequestRead(dpy, (xGenericReply *)wire); - kevent->display = dpy; - kevent->screen = wire->u.event.screen; - kevent->time = wire->u.event.time; - kevent->state = wire->u.event.state; - kevent->keycode = wire->u.u.detail; - return True; - } - - return False; -} - - -Bool XDGAQueryExtension ( - Display *dpy, - int *event_basep, - int *error_basep -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - - if (XextHasExtension(info)) { - *event_basep = info->codes->first_event; - *error_basep = info->codes->first_error; - return True; - } else { - return False; - } -} - - -Bool XDGAQueryVersion( - Display *dpy, - int *majorVersion, - int *minorVersion -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGAQueryVersionReply rep; - xXDGAQueryVersionReq *req; - - XDGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XDGAQueryVersion, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGAQueryVersion; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - *majorVersion = rep.majorVersion; - *minorVersion = rep.minorVersion; - UnlockDisplay(dpy); - SyncHandle(); - if (*majorVersion >= 2) - { - int i, j; - - for (i = 0, j = info->codes->first_event; - i < XF86DGANumberEvents; - i++, j++) - { - XESetWireToEvent (dpy, j, xdga_wire_to_event); - XESetEventToWire (dpy, j, xdga_event_to_wire); - } - XDGASetClientVersion(dpy); - } - return True; -} - -Bool XDGASetClientVersion( - Display *dpy -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGASetClientVersionReq *req; - - XDGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XDGASetClientVersion, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGASetClientVersion; - req->major = XDGA_MAJOR_VERSION; - req->minor = XDGA_MINOR_VERSION; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XDGAOpenFramebuffer( - Display *dpy, - int screen -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGAOpenFramebufferReply rep; - xXDGAOpenFramebufferReq *req; - char *deviceName = NULL; - Bool ret; - - XDGACheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XDGAOpenFramebuffer, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGAOpenFramebuffer; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - - if(rep.length) { - deviceName = Xmalloc(rep.length << 2); - _XRead(dpy, deviceName, rep.length << 2); - } - - ret = XDGAMapFramebuffer(screen, deviceName, - (unsigned char*)(long)rep.mem1, - rep.size, rep.offset, rep.extra); - - if(deviceName) - Xfree(deviceName); - - UnlockDisplay(dpy); - SyncHandle(); - return ret; -} - -void XDGACloseFramebuffer( - Display *dpy, - int screen -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGACloseFramebufferReq *req; - - XextSimpleCheckExtension (dpy, info, xdga_extension_name); - - XDGAUnmapFramebuffer(screen); - - LockDisplay(dpy); - GetReq(XDGACloseFramebuffer, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGACloseFramebuffer; - req->screen = screen; - UnlockDisplay(dpy); - SyncHandle(); -} - - - -XDGAMode* XDGAQueryModes( - Display *dpy, - int screen, - int *num -){ - XExtDisplayInfo *dinfo = xdga_find_display (dpy); - xXDGAQueryModesReply rep; - xXDGAQueryModesReq *req; - XDGAMode *modes = NULL; - - *num = 0; - - XDGACheckExtension (dpy, dinfo, NULL); - - LockDisplay(dpy); - GetReq(XDGAQueryModes, req); - req->reqType = dinfo->codes->major_opcode; - req->dgaReqType = X_XDGAQueryModes; - req->screen = screen; - - if (_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - if(rep.length) { - xXDGAModeInfo info; - int i, size; - char *offset; - - size = rep.length << 2; - size -= rep.number * sz_xXDGAModeInfo; /* find text size */ - modes = (XDGAMode*)Xmalloc((rep.number * sizeof(XDGAMode)) + size); - offset = (char*)(&modes[rep.number]); /* start of text */ - - - if(modes) { - for(i = 0; i < rep.number; i++) { - _XRead(dpy, (char*)(&info), sz_xXDGAModeInfo); - - modes[i].num = info.num; - modes[i].verticalRefresh = - (float)info.vsync_num / (float)info.vsync_den; - modes[i].flags = info.flags; - modes[i].imageWidth = info.image_width; - modes[i].imageHeight = info.image_height; - modes[i].pixmapWidth = info.pixmap_width; - modes[i].pixmapHeight = info.pixmap_height; - modes[i].bytesPerScanline = info.bytes_per_scanline; - modes[i].byteOrder = info.byte_order; - modes[i].depth = info.depth; - modes[i].bitsPerPixel = info.bpp; - modes[i].redMask = info.red_mask; - modes[i].greenMask = info.green_mask; - modes[i].blueMask = info.blue_mask; - modes[i].visualClass = info.visual_class; - modes[i].viewportWidth = info.viewport_width; - modes[i].viewportHeight = info.viewport_height; - modes[i].xViewportStep = info.viewport_xstep; - modes[i].yViewportStep = info.viewport_ystep; - modes[i].maxViewportX = info.viewport_xmax; - modes[i].maxViewportY = info.viewport_ymax; - modes[i].viewportFlags = info.viewport_flags; - modes[i].reserved1 = info.reserved1; - modes[i].reserved2 = info.reserved2; - - _XRead(dpy, offset, info.name_size); - modes[i].name = offset; - offset += info.name_size; - } - *num = rep.number; - } else - _XEatData(dpy, rep.length << 2); - } - } - - UnlockDisplay(dpy); - SyncHandle(); - - return modes; -} - - -XDGADevice * -XDGASetMode( - Display *dpy, - int screen, - int mode -){ - XExtDisplayInfo *dinfo = xdga_find_display (dpy); - xXDGASetModeReply rep; - xXDGASetModeReq *req; - XDGADevice *dev = NULL; - Pixmap pid; - - XDGACheckExtension (dpy, dinfo, NULL); - - LockDisplay(dpy); - GetReq(XDGASetMode, req); - req->reqType = dinfo->codes->major_opcode; - req->dgaReqType = X_XDGASetMode; - req->screen = screen; - req->mode = mode; - req->pid = pid = XAllocID(dpy); - - if (_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - if(rep.length) { - xXDGAModeInfo info; - int size; - - size = rep.length << 2; - size -= sz_xXDGAModeInfo; /* get text size */ - - dev = (XDGADevice*)Xmalloc(sizeof(XDGADevice) + size); - - if(dev) { - _XRead(dpy, (char*)(&info), sz_xXDGAModeInfo); - - dev->mode.num = info.num; - dev->mode.verticalRefresh = - (float)info.vsync_num / (float)info.vsync_den; - dev->mode.flags = info.flags; - dev->mode.imageWidth = info.image_width; - dev->mode.imageHeight = info.image_height; - dev->mode.pixmapWidth = info.pixmap_width; - dev->mode.pixmapHeight = info.pixmap_height; - dev->mode.bytesPerScanline = info.bytes_per_scanline; - dev->mode.byteOrder = info.byte_order; - dev->mode.depth = info.depth; - dev->mode.bitsPerPixel = info.bpp; - dev->mode.redMask = info.red_mask; - dev->mode.greenMask = info.green_mask; - dev->mode.blueMask = info.blue_mask; - dev->mode.visualClass = info.visual_class; - dev->mode.viewportWidth = info.viewport_width; - dev->mode.viewportHeight = info.viewport_height; - dev->mode.xViewportStep = info.viewport_xstep; - dev->mode.yViewportStep = info.viewport_ystep; - dev->mode.maxViewportX = info.viewport_xmax; - dev->mode.maxViewportY = info.viewport_ymax; - dev->mode.viewportFlags = info.viewport_flags; - dev->mode.reserved1 = info.reserved1; - dev->mode.reserved2 = info.reserved2; - - dev->mode.name = (char*)(&dev[1]); - _XRead(dpy, dev->mode.name, info.name_size); - - dev->pixmap = (rep.flags & XDGAPixmap) ? pid : 0; - dev->data = XDGAGetMappedMemory(screen); - - if(dev->data) - dev->data += rep.offset; - } - /* not sure what to do if the allocation fails */ - } - } - - UnlockDisplay(dpy); - SyncHandle(); - - return dev; -} - - -void XDGASetViewport( - Display *dpy, - int screen, - int x, - int y, - int flags -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGASetViewportReq *req; - - XextSimpleCheckExtension (dpy, info, xdga_extension_name); - - LockDisplay(dpy); - GetReq(XDGASetViewport, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGASetViewport; - req->screen = screen; - req->x = x; - req->y = y; - req->flags = flags; - UnlockDisplay(dpy); - SyncHandle(); -} - - -void XDGAInstallColormap( - Display *dpy, - int screen, - Colormap cmap -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGAInstallColormapReq *req; - - XextSimpleCheckExtension (dpy, info, xdga_extension_name); - - LockDisplay(dpy); - GetReq(XDGAInstallColormap, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGAInstallColormap; - req->screen = screen; - req->cmap = cmap; - UnlockDisplay(dpy); - SyncHandle(); -} - -void XDGASelectInput( - Display *dpy, - int screen, - long mask -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGASelectInputReq *req; - - XextSimpleCheckExtension (dpy, info, xdga_extension_name); - - LockDisplay(dpy); - GetReq(XDGASelectInput, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGASelectInput; - req->screen = screen; - req->mask = mask; - UnlockDisplay(dpy); - SyncHandle(); -} - -void XDGAFillRectangle( - Display *dpy, - int screen, - int x, - int y, - unsigned int width, - unsigned int height, - unsigned long color -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGAFillRectangleReq *req; - - XextSimpleCheckExtension (dpy, info, xdga_extension_name); - - LockDisplay(dpy); - GetReq(XDGAFillRectangle, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGAFillRectangle; - req->screen = screen; - req->x = x; - req->y = y; - req->width = width; - req->height = height; - req->color = color; - UnlockDisplay(dpy); - SyncHandle(); -} - -void XDGACopyArea( - Display *dpy, - int screen, - int srcx, - int srcy, - unsigned int width, - unsigned int height, - int dstx, - int dsty -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGACopyAreaReq *req; - - XextSimpleCheckExtension (dpy, info, xdga_extension_name); - - LockDisplay(dpy); - GetReq(XDGACopyArea, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGACopyArea; - req->screen = screen; - req->srcx = srcx; - req->srcy = srcy; - req->width = width; - req->height = height; - req->dstx = dstx; - req->dsty = dsty; - UnlockDisplay(dpy); - SyncHandle(); -} - -void XDGACopyTransparentArea( - Display *dpy, - int screen, - int srcx, - int srcy, - unsigned int width, - unsigned int height, - int dstx, - int dsty, - unsigned long key -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGACopyTransparentAreaReq *req; - - XextSimpleCheckExtension (dpy, info, xdga_extension_name); - - LockDisplay(dpy); - GetReq(XDGACopyTransparentArea, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGACopyTransparentArea; - req->screen = screen; - req->srcx = srcx; - req->srcy = srcy; - req->width = width; - req->height = height; - req->dstx = dstx; - req->dsty = dsty; - req->key = key; - UnlockDisplay(dpy); - SyncHandle(); -} - - -int XDGAGetViewportStatus( - Display *dpy, - int screen -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGAGetViewportStatusReply rep; - xXDGAGetViewportStatusReq *req; - int status = 0; - - XDGACheckExtension (dpy, info, 0); - - LockDisplay(dpy); - GetReq(XDGAGetViewportStatus, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGAGetViewportStatus; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) - status = rep.status; - UnlockDisplay(dpy); - SyncHandle(); - return status; -} - -void XDGASync( - Display *dpy, - int screen -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGASyncReply rep; - xXDGASyncReq *req; - - XextSimpleCheckExtension (dpy, info, xdga_extension_name); - - LockDisplay(dpy); - GetReq(XDGASync, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGASync; - req->screen = screen; - _XReply(dpy, (xReply *)&rep, 0, xFalse); - UnlockDisplay(dpy); - SyncHandle(); -} - - -void XDGAChangePixmapMode( - Display *dpy, - int screen, - int *x, - int *y, - int mode -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGAChangePixmapModeReq *req; - xXDGAChangePixmapModeReply rep; - - XextSimpleCheckExtension (dpy, info, xdga_extension_name); - - LockDisplay(dpy); - GetReq(XDGAChangePixmapMode, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGAChangePixmapMode; - req->screen = screen; - req->x = *x; - req->y = *y; - req->flags = mode; - _XReply(dpy, (xReply *)&rep, 0, xFalse); - *x = rep.x; - *y = rep.y; - UnlockDisplay(dpy); - SyncHandle(); -} - -Colormap XDGACreateColormap( - Display *dpy, - int screen, - XDGADevice *dev, - int alloc -){ - XExtDisplayInfo *info = xdga_find_display (dpy); - xXDGACreateColormapReq *req; - Colormap cid; - - XDGACheckExtension (dpy, info, -1); - - LockDisplay(dpy); - GetReq(XDGACreateColormap, req); - req->reqType = info->codes->major_opcode; - req->dgaReqType = X_XDGACreateColormap; - req->screen = screen; - req->mode = dev->mode.num; - req->alloc = alloc; - cid = req->id = XAllocID(dpy); - UnlockDisplay(dpy); - SyncHandle(); - - return cid; -} - - -void XDGAKeyEventToXKeyEvent( - XDGAKeyEvent* dk, - XKeyEvent* xk -){ - xk->type = dk->type; - xk->serial = dk->serial; - xk->send_event = False; - xk->display = dk->display; - xk->window = RootWindow(dk->display, dk->screen); - xk->root = xk->window; - xk->subwindow = None; - xk->time = dk->time; - xk->x = xk->y = xk->x_root = xk->y_root = 0; - xk->state = dk->state; - xk->keycode = dk->keycode; - xk->same_screen = True; -} - -#include <X11/Xmd.h> -#include <X11/extensions/xf86dga.h> -#include <stdlib.h> -#include <stdio.h> -#include <fcntl.h> -#if defined(ISC) -# define HAS_SVR3_MMAP -# include <sys/types.h> -# include <errno.h> - -# include <sys/at_ansi.h> -# include <sys/kd.h> - -# include <sys/sysmacros.h> -# include <sys/immu.h> -# include <sys/region.h> - -# include <sys/mmap.h> -#else -# if defined(Lynx) && defined(NO_MMAP) -# include <sys/types.h> -# include <errno.h> -# include <smem.h> -# else -# if !defined(__UNIXOS2__) -# include <sys/mman.h> -# endif -# endif -#endif -#include <sys/wait.h> -#include <signal.h> -#include <unistd.h> - -#if defined(SVR4) && !defined(sun) -#define DEV_MEM "/dev/pmem" -#elif defined(SVR4) && defined(sun) -#define DEV_MEM "/dev/xsvc" -#elif defined(HAS_APERTURE_DRV) -#define DEV_MEM "/dev/xf86" -#else -#define DEV_MEM "/dev/mem" -#endif - - - -typedef struct _DGAMapRec{ - unsigned char *physical; - unsigned char *virtual; - CARD32 size; - int fd; - int screen; - struct _DGAMapRec *next; -} DGAMapRec, *DGAMapPtr; - -static Bool -DGAMapPhysical(int, char*, unsigned char*, CARD32, CARD32, CARD32, DGAMapPtr); -static void DGAUnmapPhysical(DGAMapPtr); - -static DGAMapPtr _Maps = NULL; - - -unsigned char* -XDGAGetMappedMemory(int screen) -{ - DGAMapPtr pMap = _Maps; - unsigned char *pntr = NULL; - - while(pMap != NULL) { - if(pMap->screen == screen) { - pntr = pMap->virtual; - break; - } - pMap = pMap->next; - } - - return pntr; -} - -Bool -XDGAMapFramebuffer( - int screen, - char *name, /* optional device name */ - unsigned char* base, /* physical memory */ - CARD32 size, /* size */ - CARD32 offset, /* optional offset */ - CARD32 extra /* optional extra data */ -){ - DGAMapPtr pMap = _Maps; - Bool result; - - /* is it already mapped ? */ - while(pMap != NULL) { - if(pMap->screen == screen) - return True; - pMap = pMap->next; - } - - if(extra & XDGANeedRoot) { - /* we should probably check if we have root permissions and - return False here */ - - } - - pMap = (DGAMapPtr)Xmalloc(sizeof(DGAMapRec)); - - result = DGAMapPhysical(screen, name, base, size, offset, extra, pMap); - - if(result) { - pMap->next = _Maps; - _Maps = pMap; - } else - Xfree(pMap); - - return result; -} - -void -XDGAUnmapFramebuffer(int screen) -{ - DGAMapPtr pMap = _Maps; - DGAMapPtr pPrev = NULL; - - /* is it already mapped */ - while(pMap != NULL) { - if(pMap->screen == screen) - break; - pPrev = pMap; - pMap = pMap->next; - } - - if(!pMap) - return; - - DGAUnmapPhysical(pMap); - - if(!pPrev) - _Maps = pMap->next; - else - pPrev->next = pMap->next; - - Xfree(pMap); -} - - -static Bool -DGAMapPhysical( - int screen, - char *name, /* optional device name */ - unsigned char* base, /* physical memory */ - CARD32 size, /* size */ - CARD32 offset, /* optional offset */ - CARD32 extra, /* optional extra data */ - DGAMapPtr pMap -) { -#if defined(ISC) && defined(HAS_SVR3_MMAP) - struct kd_memloc mloc; -#elif defined(__UNIXOS2__) - APIRET rc; - ULONG action; - HFILE hfd; -#endif - - base += offset; - - pMap->screen = screen; - pMap->physical = base; - pMap->size = size; - -#if defined(ISC) && defined(HAS_SVR3_MMAP) - if ((pMap->fd = open("/dev/mmap", O_RDWR)) < 0) - return False; - mloc.vaddr = (char *)0; - mloc.physaddr = (char *)base; - mloc.length = size; - mloc.ioflg=1; - - if ((pMap->virtual = (void *)ioctl(pMap->fd, MAP, &mloc)) == (void *)-1) - return False; -#elif defined (__UNIXOS2__) - /* - * Dragon warning here! /dev/pmap$ is never closed, except on progam exit. - * Consecutive calling of this routine will make PMAP$ driver run out - * of memory handles. Some umap/close mechanism should be provided - */ - - rc = DosOpen("/dev/pmap$", &hfd, &action, 0, FILE_NORMAL, FILE_OPEN, - OPEN_ACCESS_READWRITE | OPEN_SHARE_DENYNONE, (PEAOP2)NULL); - if (rc != 0) - return False; - { - struct map_ioctl { - union { - ULONG phys; - void* user; - } a; - ULONG size; - } pmap,dmap; - ULONG plen,dlen; -#define XFREE86_PMAP 0x76 -#define PMAP_MAP 0x44 - - pmap.a.phys = base; - pmap.size = size; - rc = DosDevIOCtl(hfd, XFREE86_PMAP, PMAP_MAP, - (PULONG)&pmap, sizeof(pmap), &plen, - (PULONG)&dmap, sizeof(dmap), &dlen); - if (rc == 0) { - pMap->virtual = dmap.a.user; - } - } - if (rc != 0) - return False; -#elif defined (Lynx) && defined(NO_MMAP) - pMap->virtual = smem_create("XF86DGA", (char*)base, size, SM_READ|SM_WRITE); -#else -#ifndef MAP_FILE -#define MAP_FILE 0 -#endif - if (!name) - name = DEV_MEM; - if ((pMap->fd = open(name, O_RDWR)) < 0) - return False; - 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); -#endif - - return True; -} - - - -static void -DGAUnmapPhysical(DGAMapPtr pMap) -{ -#if defined(ISC) && defined(HAS_SVR3_MMAP) - /* XXX Add unmapping code here. */ -#elif defined (__UNIXOS2__) - /* XXX Add unmapping code here. */ -#elif defined(Lynx) && defined(NO_MMAP) - /* XXX this doesn't allow enable after disable */ - smem_create(NULL, pMap->virtual, pMap->size, SM_DETACH); - smem_remove("XF86DGA"); -#else - if (pMap->virtual && pMap->virtual != (void *)-1) { - mprotect(pMap->virtual,pMap->size, PROT_READ); - munmap(pMap->virtual, pMap->size); - pMap->virtual = 0; - } - if (pMap->fd >= 0) { - close(pMap->fd); - pMap->fd = -1; - } -#endif -} diff --git a/nx-X11/lib/Xxf86dga/Xxf86dga-def.cpp b/nx-X11/lib/Xxf86dga/Xxf86dga-def.cpp deleted file mode 100644 index 2318b39c3..000000000 --- a/nx-X11/lib/Xxf86dga/Xxf86dga-def.cpp +++ /dev/null @@ -1,16 +0,0 @@ -LIBRARY libXxf86dga -EXPORTS - XF86DGAQueryExtension - XF86DGAQueryDirectVideo - XF86DGAQueryVersion - XF86DGAInstallColormap - XF86DGAGetVideoLL - XF86DGADirectVideoLL -; XF86DGAGetViewPort - XF86DGASetViewPort - XF86DGAGetVidPage - XF86DGASetVidPage - XF86DGADirectVideo - XF86DGAGetVideo - -/* $XFree86$ */ diff --git a/nx-X11/lib/Xxf86misc/Imakefile b/nx-X11/lib/Xxf86misc/Imakefile deleted file mode 100644 index db46af416..000000000 --- a/nx-X11/lib/Xxf86misc/Imakefile +++ /dev/null @@ -1,40 +0,0 @@ -XCOMM $XFree86: xc/lib/Xxf86misc/Imakefile,v 3.3 2002/10/16 00:37:34 dawes Exp $ -XCOMM $XdotOrg: xc/lib/Xxf86misc/Imakefile,v 1.3 2005/05/14 18:35:56 alanc Exp $ - -#define DoNormalLib NormalLibXxf86misc -#define DoSharedLib SharedLibXxf86misc -#define DoExtraLib SharedLibXxf86misc -#define DoDebugLib DebugLibXxf86misc -#define DoProfileLib ProfileLibXxf86misc -#define LibName Xxf86misc -#define SoRev SOXXF86MISCREV -#define LibHeaders NO - -#include <Threads.tmpl> - -#ifdef SharedXxf86miscReqs -REQUIREDLIBS = SharedXxf86miscReqs -#endif - -XF86MISCSRCS = XF86Misc.c -XF86MISCOBJS = XF86Misc.o - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - - DEFINES = $(ALLOC_DEFINES) - SRCS = $(XF86MISCSRCS) - OBJS = $(XF86MISCOBJS) - LINTLIBS = $(LINTXLIB) - -#define IncludeSharedObjectInNormalLib - -#include <Library.tmpl> - -InstallGenManPage(XF86Misc,$(LIBMANDIR),$(LIBMANSUFFIX)) -#if ExpandManNames -InstallGenManPageAliases(XF86Misc,$(LIBMANDIR),$(LIBMANSUFFIX),XF86MiscQueryExtension XF86MiscQueryVersion XF86MiscGetSaver XF86MiscSetSaver XF86MiscGetMouseSettings XF86MiscSetMouseSettings XF86MiscGetKbdSettings XF86MiscSetKbdSettings) -#endif - -DependTarget() diff --git a/nx-X11/lib/Xxf86misc/XF86Misc.c b/nx-X11/lib/Xxf86misc/XF86Misc.c deleted file mode 100644 index b0669d527..000000000 --- a/nx-X11/lib/Xxf86misc/XF86Misc.c +++ /dev/null @@ -1,406 +0,0 @@ -/* $XFree86: xc/lib/Xxf86misc/XF86Misc.c,v 3.12 2002/11/20 04:04:57 dawes Exp $ */ - -/* - * Copyright (c) 1995, 1996 The XFree86 Project, Inc - */ - -/* THIS IS NOT AN X CONSORTIUM STANDARD */ - -#define NEED_EVENTS -#define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/xf86mscstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> - -static XExtensionInfo _xf86misc_info_data; -static XExtensionInfo *xf86misc_info = &_xf86misc_info_data; -static char *xf86misc_extension_name = XF86MISCNAME; - -#define XF86MiscCheckExtension(dpy,i,val) \ - XextCheckExtension (dpy, i, xf86misc_extension_name, val) - -/***************************************************************************** - * * - * private utility routines * - * * - *****************************************************************************/ - -static int close_display(Display *dpy, XExtCodes *codes); - -static /* const */ XExtensionHooks xf86misc_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ - NULL, /* flush_gc */ - NULL, /* free_gc */ - NULL, /* create_font */ - NULL, /* free_font */ - close_display, /* close_display */ - NULL, /* wire_to_event */ - NULL, /* event_to_wire */ - NULL, /* error */ - NULL, /* error_string */ -}; - -static XEXT_GENERATE_FIND_DISPLAY (find_display, xf86misc_info, - xf86misc_extension_name, - &xf86misc_extension_hooks, - 0, NULL) - -static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86misc_info) - - -/***************************************************************************** - * * - * public XFree86-Misc Extension routines * - * * - *****************************************************************************/ - -Bool XF86MiscQueryExtension (dpy, event_basep, error_basep) - Display *dpy; - int *event_basep, *error_basep; -{ - XExtDisplayInfo *info = find_display (dpy); - - if (XextHasExtension(info)) { - *event_basep = info->codes->first_event; - *error_basep = info->codes->first_error; - return True; - } else { - return False; - } -} - -Bool XF86MiscQueryVersion(dpy, majorVersion, minorVersion) - Display* dpy; - int* majorVersion; - int* minorVersion; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86MiscQueryVersionReply rep; - xXF86MiscQueryVersionReq *req; - - XF86MiscCheckExtension (dpy, info, False); - LockDisplay(dpy); - GetReq(XF86MiscQueryVersion, req); - req->reqType = info->codes->major_opcode; - req->xf86miscReqType = X_XF86MiscQueryVersion; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - *majorVersion = rep.majorVersion; - *minorVersion = rep.minorVersion; - UnlockDisplay(dpy); - SyncHandle(); - if (*majorVersion > 0 || *minorVersion > 5) - XF86MiscSetClientVersion(dpy); - - return True; -} - -Bool -XF86MiscSetClientVersion(Display *dpy) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86MiscSetClientVersionReq *req; - - XF86MiscCheckExtension(dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86MiscSetClientVersion, req); - req->reqType = info->codes->major_opcode; - req->xf86miscReqType = X_XF86MiscSetClientVersion; - req->major = XF86MISC_MAJOR_VERSION; - req->minor = XF86MISC_MINOR_VERSION; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86MiscGetMouseSettings(dpy, mouseinfo) - Display* dpy; - XF86MiscMouseSettings *mouseinfo; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86MiscGetMouseSettingsReply rep; - xXF86MiscGetMouseSettingsReq *req; - - XF86MiscCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86MiscGetMouseSettings, req); - req->reqType = info->codes->major_opcode; - req->xf86miscReqType = X_XF86MiscGetMouseSettings; - if (!_XReply(dpy, (xReply *)&rep, - (SIZEOF(xXF86MiscGetMouseSettingsReply) - SIZEOF(xReply))>>2, - xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - - mouseinfo->type = rep.mousetype; - mouseinfo->baudrate = rep.baudrate; - mouseinfo->samplerate = rep.samplerate; - mouseinfo->resolution = rep.resolution; - mouseinfo->buttons = rep.buttons; - mouseinfo->emulate3buttons = rep.emulate3buttons; - mouseinfo->emulate3timeout = rep.emulate3timeout; - mouseinfo->chordmiddle = rep.chordmiddle; - mouseinfo->flags = rep.flags; - if (rep.devnamelen > 0) { - if (!(mouseinfo->device = Xcalloc(rep.devnamelen + 1, 1))) { - _XEatData(dpy, (rep.devnamelen+3) & ~3); - Xfree(mouseinfo->device); - return False; - } - _XReadPad(dpy, mouseinfo->device, rep.devnamelen); - } else - mouseinfo->device = NULL; - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86MiscGetKbdSettings(dpy, kbdinfo) - Display* dpy; - XF86MiscKbdSettings *kbdinfo; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86MiscGetKbdSettingsReply rep; - xXF86MiscGetKbdSettingsReq *req; - - XF86MiscCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86MiscGetKbdSettings, req); - req->reqType = info->codes->major_opcode; - req->xf86miscReqType = X_XF86MiscGetKbdSettings; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - - kbdinfo->type = rep.kbdtype; - kbdinfo->rate = rep.rate; - kbdinfo->delay = rep.delay; - kbdinfo->servnumlock = rep.servnumlock; - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86MiscSetMouseSettings(dpy, mouseinfo) - Display* dpy; - XF86MiscMouseSettings *mouseinfo; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86MiscSetMouseSettingsReq *req; - int majorVersion, minorVersion; - - XF86MiscCheckExtension (dpy, info, False); - XF86MiscQueryVersion(dpy, &majorVersion, &minorVersion); - - LockDisplay(dpy); - GetReq(XF86MiscSetMouseSettings, req); - - req->reqType = info->codes->major_opcode; - req->xf86miscReqType = X_XF86MiscSetMouseSettings; - req->mousetype = mouseinfo->type; - req->baudrate = mouseinfo->baudrate; - req->samplerate = mouseinfo->samplerate; - req->resolution = mouseinfo->resolution; - req->buttons = mouseinfo->buttons; - req->emulate3buttons = mouseinfo->emulate3buttons; - req->emulate3timeout = mouseinfo->emulate3timeout; - req->chordmiddle = mouseinfo->chordmiddle; - req->flags = mouseinfo->flags; - if (majorVersion > 0 || minorVersion > 5) { - int len; - if ((len = strlen(mouseinfo->device))) { - req->devnamelen = len + 1; - len = (req->devnamelen + 3) >> 2; - SetReqLen(req,len,len); - Data(dpy, mouseinfo->device, req->devnamelen); - } - } - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86MiscSetKbdSettings(dpy, kbdinfo) - Display* dpy; - XF86MiscKbdSettings *kbdinfo; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86MiscSetKbdSettingsReq *req; - - XF86MiscCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86MiscSetKbdSettings, req); - req->reqType = info->codes->major_opcode; - req->xf86miscReqType = X_XF86MiscSetKbdSettings; - req->kbdtype = kbdinfo->type; - req->rate = kbdinfo->rate; - req->delay = kbdinfo->delay; - req->servnumlock = kbdinfo->servnumlock; - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -int XF86MiscSetGrabKeysState(dpy, enable) - Display* dpy; - Bool enable; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86MiscSetGrabKeysStateReply rep; - xXF86MiscSetGrabKeysStateReq *req; - - XF86MiscCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86MiscSetGrabKeysState, req); - req->reqType = info->codes->major_opcode; - req->xf86miscReqType = X_XF86MiscSetGrabKeysState; - req->enable = enable; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return 0; - } - - UnlockDisplay(dpy); - SyncHandle(); - return rep.status; -} - -Bool XF86MiscGetFilePaths(dpy, filpaths) - Display* dpy; - XF86MiscFilePaths *filpaths; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86MiscGetFilePathsReply rep; - xXF86MiscGetFilePathsReq *req; - - XF86MiscCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86MiscGetFilePaths, req); - req->reqType = info->codes->major_opcode; - req->xf86miscReqType = X_XF86MiscGetFilePaths; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - - if (rep.configlen) { - if (!(filpaths->configfile = Xcalloc(rep.configlen + 1, 1))) { - _XEatData(dpy, ((rep.configlen+3) & ~3) + ((rep.modulelen+3) & ~3) - + ((rep.loglen+3) & ~3)); - return False; - } - } - - if (rep.modulelen) { - if (!(filpaths->modulepath = Xcalloc(rep.modulelen + 1, 1))) { - _XEatData(dpy, ((rep.configlen+3) & ~3) + ((rep.modulelen+3) & ~3) - + ((rep.loglen+3) & ~3)); - if (filpaths->configfile) - Xfree(filpaths->configfile); - return False; - } - } - - if (rep.loglen) { - if (!(filpaths->logfile = Xcalloc(rep.loglen + 1, 1))) { - _XEatData(dpy, ((rep.configlen+3) & ~3) + ((rep.modulelen+3) & ~3) - + ((rep.loglen+3) & ~3)); - if (filpaths->configfile) - Xfree(filpaths->configfile); - if (filpaths->modulepath) - Xfree(filpaths->modulepath); - return False; - } - } - - if (rep.configlen) - _XReadPad(dpy, filpaths->configfile, rep.configlen); - else - filpaths->configfile = ""; - - if (rep.modulelen) - _XReadPad(dpy, filpaths->modulepath, rep.modulelen); - else - filpaths->modulepath = ""; - - if (rep.loglen) - _XReadPad(dpy, filpaths->logfile, rep.loglen); - else - filpaths->logfile = ""; - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Status XF86MiscPassMessage(dpy, screen, msgtype, msgval, retmsg) - Display* dpy; - int screen; - const char* msgtype; - const char* msgval; - char** retmsg; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86MiscPassMessageReply rep; - xXF86MiscPassMessageReq *req; - int len; - - XF86MiscCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86MiscPassMessage, req); - req->reqType = info->codes->major_opcode; - req->xf86miscReqType = X_XF86MiscPassMessage; - req->screen = screen; - if ((len = strlen(msgtype))) { - req->typelen = len + 1; - len = (req->typelen + 3) >> 2; - SetReqLen(req,len,len); - Data(dpy, msgtype, req->typelen); - } - if ((len = strlen(msgval))) { - req->vallen = len + 1; - len = (req->vallen + 3) >> 2; - SetReqLen(req,len,len); - Data(dpy, msgval, req->vallen); - } - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return BadImplementation; - } - - if (rep.mesglen) { - if (!(*retmsg = Xcalloc(rep.mesglen + 1, 1))) { - _XEatData(dpy, ((rep.mesglen+3) & ~3)); - return BadAlloc; - } - _XReadPad(dpy, *retmsg, rep.mesglen); - } - - UnlockDisplay(dpy); - SyncHandle(); - return rep.status; -} - diff --git a/nx-X11/lib/Xxf86misc/XF86Misc.man b/nx-X11/lib/Xxf86misc/XF86Misc.man deleted file mode 100644 index 2c80dff0b..000000000 --- a/nx-X11/lib/Xxf86misc/XF86Misc.man +++ /dev/null @@ -1,217 +0,0 @@ -.\" $XdotOrg: xc/lib/Xxf86misc/XF86Misc.man,v 1.2 2004/04/23 19:23:08 eich Exp $ -.\" $TOG: XF86Misc.man /main/7 1997/07/19 10:30:32 kaleb $ -.\" -.\" -.\" -.\" Copyright (c) 1996 Joe Moss, The XFree86 Project -.\" -.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86Misc.man,v 3.12 2002/12/22 00:46:54 dawes Exp $ -.de ZN -.ie t \fB\^\\$1\^\fR\\$2 -.el \fI\^\\$1\^\fP\\$2 -.. -.TH XF86MISC __libmansuffix__ __vendorversion__ "X FUNCTIONS" -.SH NAME -XF86MiscQueryExtension, XF86MiscQueryVersion, XF86MiscGetMouseSettings, XF86MiscSetMouseSettings, XF86MiscGetKbdSettings, XF86MiscSetKbdSettings \- Extension library for the XFree86-Misc X extension. -.SH SYNTAX -.nf -.LP -\&#include <X11/extensions/xf86misc.h> -.LP -Bool XF86MiscQueryExtension( - Display *\fIdisplay\fP\^, - int *\fIevent_base_return\fP\^, - int *\fIerror_base_return\fP\^); -.LP -Bool XF86MiscQueryVersion( - Display *\fIdisplay\fP\^, - int *\fImajor_version_return\fP\^, - int *\fIminor_version_return\fP\^); -.ig -.LP -Status XF86MiscGetSaver( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int *\fIsuspend_time_return\fP\^, - int *\fIoff_time_return\fP\^); -.LP -Status XF86MiscSetSaver( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int \fIsuspend_time\fP\^, - int \fIoff_time\fP\^); -.. -.LP -Status XF86MiscGetMouseSettings( - Display *\fIdisplay\fP\^, - XF86MiscMouseSettings *\fImseinfo\fP\^); -.LP -Status XF86MiscSetMouseSettings( - Display *\fIdisplay\fP\^, - XF86MiscMouseSettings *\fImseinfo\fP\^); -.LP -Status XF86MiscGetKbdSettings( - Display *\fIdisplay\fP\^, - XF86MiscKbdSettings *\fIkbdinfo\fP\^); -.LP -Status XF86MiscSetKbdSettings( - Display *\fIdisplay\fP\^, - XF86MiscKbdSettings *\fIkbdinfo\fP\^); -.fi -.SH ARGUMENTS -.IP \fIdisplay\fP 2i -Specifies the connection to the X server. -.IP \fIscreen\fP 2i -Specifies which screen number the setting apply to. -.IP \fIevent_base_return\fP 2i -Returns the base event number for the extension. -.IP \fIerror_base_return\fP 2i -Returns the base error number for the extension. -.IP \fImajor_version_return\fP 2i -Returns the major version number of the extension. -.IP \fIminor_version_return\fP 2i -Returns the minor version number of the extension. -.ig -.IP \fIsuspend_time_return\fP 2i -Returns the number of seconds of idle time the server -will wait before activating the monitor's suspend mode. -.IP \fIoff_time_return\fP 2i -Returns the number of seconds of idle time the server -will wait before causing the monitor to powerdown. -.IP \fIsuspend_time\fP 2i -Specifies the number of seconds of idle time the server -should wait before activating the monitor's suspend mode. -.IP \fIoff_time\fP 2i -Specifies the number of seconds of idle time the server -should wait before causing the monitor to powerdown. -.. -.IP \fImseinfo\fP 2i -Specifies a structure which contains the mouse parameters. -.IP \fIkbdinfo\fP 2i -Specifies a structure which contains the keyboard parameters. -.SH STRUCTURES -.nf -.ta 3i -\fIMouse:\fP -typedef struct { - char *device; /\(** returned path to device */ - int type; /\(** mouse protocol */ - int baudrate; /\(** 1200, 2400, 4800, or 9600 */ - int samplerate; /\(** samples per second */ - int resolution; /\(** resolution, count per inch */ - int buttons; /\(** number of buttons */ - Bool emulate3buttons; /\(** Button1+Button3 -> Button2 ? */ - int emulate3timeout; /\(** in milliseconds */ - Bool chordmiddle; /\(** Button1+Button3 == Button2 ? */ - int flags; /\(** Device open flags */ -} XF86MiscMouseSettings; -.LP -\fIKeyboard:\fP -typedef struct { - int type; /\(** of keyboard: 84-key, 101-key, Xqueue */ - int rate; /\(** repeat rate */ - int delay; /\(** delay until repeat starts */ - Bool servnumlock; /\(** Server handles NumLock ? */ -} XF86MiscKbdSettings; -.fi -.SH DESCRIPTION -These functions provide an interface to the -\fIXFree86-Misc\fP extension -which allows various server settings to be -queried and changed dynamically. -Applications that use these functions must be linked with -.ZN -lXxf86misc -.SS "POWER-SAVER FUNCTIONS" -The -.ZN XF86MiscGetSaver -and -.ZN XF86MiscSetSaver -functions have been removed. This functionality is now provided by -the DPMS extension. -.SS "MOUSE FUNCTIONS" -Mouse parameters can be queried using the function -.ZN XF86MiscGetMouseSettings . -The structure pointed to by its second argument is filled in -with the current mouse settings. -.PP -Not all fields are valid in all cases. -For example, when the protocol indicates a bus mouse (i.e. the -type field has value -.ZN MTYPE_BUSMOUSE -as defined in -.ZN xf86misc.h ), -then the value in the -.ZN baudrate -field should be ignored as it does not apply to bus mice. -.PP -The -.ZN samplerate -field contains the resolution in lines per inch when -using the Hitachi tablet protocol. -.PP -The device field of the structure points to dynamically -allocated storage which should be freed by the caller. -.PP -Any of the fields of the structure can be altered and then passed -to the -.ZN XF86MiscSetMouseSettings -function to change their value in the server, -with the following restrictions: -.RS 5 -.IP 1) 3 -The device can not be changed -.IP 2) 3 -The protocol can not be changed to or from Xqueue or OsMouse -.IP 3) 3 -The buttons field can not be changed -.IP 4) 3 -Invalid combinations of parameters are not allowed -.RE -.PP -The server will generate an error if any of the above is attempted, -except the first \- the contents of the device field are simply ignored. -.PP -A change of the protocol causes the device to be closed and reopened. -Changes to the baud rate, sample rate, resolution or flags, -when applicable to the -selected protocol, also cause a reopen of the device. -A reopen can be forced by using the MF_REOPEN flag, except in the -case of the OsMouse and Xqueue protocols which ignore all attempts -to reopen the device. -.SS "KEYBOARD FUNCTIONS" -The -.ZN XF86MiscGetKbdSettings -function allows you to retrieve the current keyboard-related -settings from the server. -.PP -Using the -.ZN XF86MiscSetKbdSettings -function, the keyboard autorepeat delay and rate can be set. -Requests to change the -.ZN type -and -.ZN servnumlock -fields are ignored (except for checking for an invalid keyboard type). -This is expected to change in a future release. -.SS "OTHER FUNCTIONS" -Two functions, -.ZN XF86MiscQueryExtension -and -.ZN XF86MiscQueryVersion , -are provided which allow the client to query some information -regarding the extension itself. -.SH PREDEFINED VALUES -The header file -.ZN X11/extensions/xf86misc.h -contains definitions for -.IP \fBMTYPE_\fP* 1i -Mouse protocols -.IP \fBKTYPE_\fP* 1i -Keyboard types -.IP \fBMF_\fP* 1i -Mouse flags -.SH "SEE ALSO" -xset(__appmansuffix__), __xconfigfile__(__filemansuffix__) -.SH AUTHORS -Joe Moss and David Dawes, The XFree86 Project, Inc. - diff --git a/nx-X11/lib/Xxf86misc/Xxf86misc-def.cpp b/nx-X11/lib/Xxf86misc/Xxf86misc-def.cpp deleted file mode 100644 index 74b1df8e6..000000000 --- a/nx-X11/lib/Xxf86misc/Xxf86misc-def.cpp +++ /dev/null @@ -1,14 +0,0 @@ -LIBRARY XXF86MISC -EXPORTS - XF86MiscQueryExtension - XF86MiscQueryVersion - XF86MiscSetKbdSettings - XF86MiscGetKbdSettings - XF86MiscSetMouseSettings - XF86MiscGetMouseSettings - XF86MiscGetFilePaths -; XF86MiscSetSaver -; XF86MiscGetSaver - - -/* $XFree86: xc/lib/Xxf86misc/Xxf86misc-def.cpp,v 1.1 2000/08/09 23:40:14 dawes Exp $ */ diff --git a/nx-X11/lib/Xxf86rush/Imakefile b/nx-X11/lib/Xxf86rush/Imakefile deleted file mode 100644 index 40eb1dd52..000000000 --- a/nx-X11/lib/Xxf86rush/Imakefile +++ /dev/null @@ -1,30 +0,0 @@ -XCOMM $XFree86: xc/lib/Xxf86rush/Imakefile,v 1.1 1999/09/04 09:14:09 dawes Exp $ -#define DoNormalLib NormalLibXxf86rush -#define DoSharedLib SharedLibXxf86rush -#define DoDebugLib DebugLibXxf86rush -#define DoProfileLib ProfileLibXxf86rush -#define LibName Xxf86rush -#define SoRev SOXXF86RUSHREV -#define LibHeaders NO - -#include <Threads.tmpl> - -#ifdef SharedXxf86rushReqs -REQUIREDLIBS = SharedXxf86rushReqs -#endif - -XF86RUSHSRCS = XF86Rush.c -XF86RUSHOBJS = XF86Rush.o - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - - DEFINES = $(ALLOC_DEFINES) - SRCS = $(XF86RUSHSRCS) - OBJS = $(XF86RUSHOBJS) - LINTLIBS = $(LINTXLIB) - -#include <Library.tmpl> - -DependTarget() diff --git a/nx-X11/lib/Xxf86rush/XF86Rush.c b/nx-X11/lib/Xxf86rush/XF86Rush.c deleted file mode 100644 index df3a71de1..000000000 --- a/nx-X11/lib/Xxf86rush/XF86Rush.c +++ /dev/null @@ -1,291 +0,0 @@ -/* $XFree86: xc/lib/Xxf86rush/XF86Rush.c,v 1.5 2000/09/26 15:56:59 tsi Exp $ */ -/* - -Copyright (c) 1998 Daryll Strauss - -*/ - -/* THIS IS NOT AN X CONSORTIUM STANDARD */ - -#define NEED_EVENTS -#define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/xf86rushstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> - -static XExtensionInfo _xf86rush_info_data; -static XExtensionInfo *xf86rush_info = &_xf86rush_info_data; -static char *xf86rush_extension_name = XF86RUSHNAME; - -#define XF86RushCheckExtension(dpy,i,val) \ - XextCheckExtension (dpy, i, xf86rush_extension_name, val) - -/***************************************************************************** - * * - * private utility routines * - * * - *****************************************************************************/ - -static int close_display(); -static /* const */ XExtensionHooks xf86rush_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ - NULL, /* flush_gc */ - NULL, /* free_gc */ - NULL, /* create_font */ - NULL, /* free_font */ - close_display, /* close_display */ - NULL, /* wire_to_event */ - NULL, /* event_to_wire */ - NULL, /* error */ - NULL, /* error_string */ -}; - -static XEXT_GENERATE_FIND_DISPLAY (find_display, xf86rush_info, - xf86rush_extension_name, - &xf86rush_extension_hooks, - 0, NULL) - -static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86rush_info) - - -/***************************************************************************** - * * - * public XFree86-DGA Extension routines * - * * - *****************************************************************************/ - -Bool XF86RushQueryExtension (Display *dpy, int *event_basep, int *error_basep) -{ - XExtDisplayInfo *info = find_display (dpy); - - if (XextHasExtension(info)) { - *event_basep = info->codes->first_event; - *error_basep = info->codes->first_error; - return True; - } else { - return False; - } -} - -Bool XF86RushQueryVersion(Display *dpy, int *majorVersion, int *minorVersion) -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86RushQueryVersionReply rep; - xXF86RushQueryVersionReq *req; - - XF86RushCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86RushQueryVersion, req); - req->reqType = info->codes->major_opcode; - req->rushReqType = X_XF86RushQueryVersion; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - *majorVersion = rep.majorVersion; - *minorVersion = rep.minorVersion; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86RushLockPixmap(Display *dpy, int screen, Pixmap pixmap, void **addr) -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86RushLockPixmapReply rep; - xXF86RushLockPixmapReq *req; - - XF86RushCheckExtension (dpy, info, False); - LockDisplay(dpy); - GetReq(XF86RushLockPixmap, req); - req->reqType = info->codes->major_opcode; - req->rushReqType = X_XF86RushLockPixmap; - req->screen = screen; - req->pixmap = pixmap; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - if (addr) - *addr = (void *)(long)rep.addr; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86RushUnlockPixmap(Display *dpy, int screen, Pixmap pixmap) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86RushUnlockPixmapReq *req; - - XF86RushCheckExtension (dpy, info, False); - LockDisplay(dpy); - GetReq(XF86RushUnlockPixmap, req); - req->reqType = info->codes->major_opcode; - req->rushReqType = X_XF86RushUnlockPixmap; - req->screen=screen; - req->pixmap=pixmap; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86RushUnlockAllPixmaps(Display *dpy) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86RushUnlockAllPixmapsReq *req; - - XF86RushCheckExtension (dpy, info, False); - LockDisplay(dpy); - GetReq(XF86RushUnlockAllPixmaps, req); - req->reqType = info->codes->major_opcode; - req->rushReqType = X_XF86RushUnlockAllPixmaps; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86RushSetCopyMode(Display *dpy, int screen, int mode) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86RushSetCopyModeReq *req; - - XF86RushCheckExtension (dpy, info, False); - LockDisplay(dpy); - GetReq(XF86RushSetCopyMode, req); - req->reqType = info->codes->major_opcode; - req->rushReqType = X_XF86RushSetCopyMode; - req->screen = screen; - req->CopyMode = mode; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86RushSetPixelStride(Display *dpy, int screen, int stride) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86RushSetPixelStrideReq *req; - - XF86RushCheckExtension (dpy, info, False); - LockDisplay(dpy); - GetReq(XF86RushSetPixelStride, req); - req->reqType = info->codes->major_opcode; - req->rushReqType = X_XF86RushSetPixelStride; - req->screen = screen; - req->PixelStride = stride; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -int XF86RushOverlayPixmap (Display *dpy, XvPortID port, Drawable d, - GC gc, Pixmap pixmap, int src_x, int src_y, - unsigned int src_w, unsigned int src_h, - int dest_x, int dest_y, - unsigned int dest_w, unsigned int dest_h, - unsigned int id) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86RushOverlayPixmapReq *req; - - XF86RushCheckExtension (dpy, info, False); - - FlushGC(dpy, gc); - - LockDisplay(dpy); - GetReq(XF86RushOverlayPixmap, req); - - req->reqType = info->codes->major_opcode; - req->rushReqType = X_XF86RushOverlayPixmap; - req->port = port; - req->drawable = d; - req->gc = gc->gid; - req->id = id; - req->pixmap = pixmap; - req->src_x = src_x; - req->src_y = src_y; - req->src_w = src_w; - req->src_h = src_h; - req->drw_x = dest_x; - req->drw_y = dest_y; - req->drw_w = dest_w; - req->drw_h = dest_h; - - UnlockDisplay(dpy); - SyncHandle(); - return Success; -} - -int XF86RushStatusRegOffset (Display *dpy, int screen) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86RushStatusRegOffsetReq *req; - xXF86RushStatusRegOffsetReply rep; - - XF86RushCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86RushStatusRegOffset, req); - - req->reqType = info->codes->major_opcode; - req->rushReqType = X_XF86RushStatusRegOffset; - req->screen = screen; - - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - - UnlockDisplay(dpy); - SyncHandle(); - return rep.offset; -} - -Bool XF86RushAT3DEnableRegs (Display *dpy, int screen) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86RushAT3DEnableRegsReq *req; - - XF86RushCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86RushAT3DEnableRegs, req); - - req->reqType = info->codes->major_opcode; - req->rushReqType = X_XF86RushAT3DEnableRegs; - req->screen = screen; - - UnlockDisplay(dpy); - SyncHandle(); - /* - * The request has to be processed to stay in sync... - */ - XSync(dpy, False); - return Success; -} - -Bool XF86RushAT3DDisableRegs (Display *dpy, int screen) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86RushAT3DDisableRegsReq *req; - - XF86RushCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86RushAT3DDisableRegs, req); - - req->reqType = info->codes->major_opcode; - req->rushReqType = X_XF86RushAT3DDisableRegs; - req->screen = screen; - - UnlockDisplay(dpy); - SyncHandle(); - return Success; -} diff --git a/nx-X11/lib/Xxf86vm/Imakefile b/nx-X11/lib/Xxf86vm/Imakefile deleted file mode 100644 index 84a29eb1d..000000000 --- a/nx-X11/lib/Xxf86vm/Imakefile +++ /dev/null @@ -1,40 +0,0 @@ -XCOMM $XFree86: xc/lib/Xxf86vm/Imakefile,v 3.3 2002/10/16 00:37:34 dawes Exp $ -XCOMM $XdotOrg: xc/lib/Xxf86vm/Imakefile,v 1.3 2005/05/14 18:35:56 alanc Exp $ - -#define DoNormalLib NormalLibXxf86vm -#define DoSharedLib SharedLibXxf86vm -#define DoExtraLib SharedLibXxf86vm -#define DoDebugLib DebugLibXxf86vm -#define DoProfileLib ProfileLibXxf86vm -#define LibName Xxf86vm -#define SoRev SOXXF86VMREV -#define LibHeaders NO - -#include <Threads.tmpl> - -#ifdef SharedXxf86vmReqs -REQUIREDLIBS = SharedXxf86vmReqs -#endif - -VIDMODESRCS = XF86VMode.c -VIDMODEOBJS = XF86VMode.o - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - - DEFINES = $(ALLOC_DEFINES) - SRCS = $(VIDMODESRCS) - OBJS = $(VIDMODEOBJS) - LINTLIBS = $(LINTXLIB) - -#define IncludeSharedObjectInNormalLib - -#include <Library.tmpl> - -InstallGenManPageLong(XF86VM,$(LIBMANDIR),XF86VidMode,$(LIBMANSUFFIX)) -#if ExpandManNames -InstallGenManPageAliases(XF86VidMode,$(LIBMANDIR),$(LIBMANSUFFIX),XF86VidModeQueryExtension XF86VidModeQueryVersion XF86VidModeGetModeLine XF86VidModeGetAllModeLines XF86VidModeDeleteModeLine XF86VidModeModModeLine XF86VidModeSwitchMode XF86VidModeSwitchToMode XF86VidModeLockModeSwitch XF86VidModeGetMonitor XF86VidModeGetViewPort XF86VidModeSetViewPort XF86VidModeValidateModeLine XF86VidModeSetClientVersion XF86VidModeGetDotClocks XF86VidModeGetGamma XF86VidModeSetGamma XF86VidModeSetGammaRamp XF86VidModeGetGammaRamp XF86VidModeGetGammaRampSize XF86VidModeGetPermissions) -#endif - -DependTarget() diff --git a/nx-X11/lib/Xxf86vm/XF86VM.man b/nx-X11/lib/Xxf86vm/XF86VM.man deleted file mode 100644 index 6e53ad158..000000000 --- a/nx-X11/lib/Xxf86vm/XF86VM.man +++ /dev/null @@ -1,425 +0,0 @@ -.\" $XdotOrg: xc/lib/Xxf86vm/XF86VM.man,v 1.2 2004/04/23 19:23:08 eich Exp $ -.\" $TOG: XF86VM.man /main/6 1997/07/19 10:30:39 kaleb $ -.\" -.\" -.\" -.\" -.\" Copyright (c) 1996 Joe Moss, The XFree86 Project -.\" $XFree86: xc/programs/Xserver/hw/xfree86/doc/man/XF86VM.man,v 3.14 2003/10/02 13:29:56 eich Exp $ -.\" -.de ZN -.ie t \fB\^\\$1\^\fR\\$2 -.el \fI\^\\$1\^\fP\\$2 -.. -.TH XF86VIDMODE __libmansuffix__ __vendorversion__ -.SH NAME -XF86VidModeQueryExtension, XF86VidModeQueryVersion, XF86VidModeSetClientVersion, XF86VidModeGetModeLine, XF86VidModeGetAllModeLines, XF86VidModeDeleteModeLine, XF86VidModeModModeLine, XF86VidModeValidateModeLine, XF86VidModeSwitchMode, XF86VidModeSwitchToMode, XF86VidModeLockModeSwitch, XF86VidModeGetMonitor, XF86VidModeGetViewPort, XF86VidModeSetViewPort, XF86VidModeGetDotClocks, XF86VidModeGetGamma, XF86VidModeSetGamma, XF86VidModeGetGammaRamp, XF86VidModeSetGammaRamp, XF86VidModeGetGammaRampSize, XF86VidModeGetPermissions \- Extension libary for the XFree86-VidMode X extension -.SH SYNTAX -.nf -.LP -\&#include <X11/extensions/xf86vmode.h> -.LP -Bool XF86VidModeQueryExtension( - Display *\fIdisplay\fP\^, - int *\fIevent_base_return\fP\^, - int *\fIerror_base_return\fP\^); -.LP -Bool XF86VidModeQueryVersion( - Display *\fIdisplay\fP\^, - int *\fImajor_version_return\fP\^, - int *\fIminor_version_return\fP\^); -.LP -Bool XF86VidModeSetClientVersion( - Display *\fIdisplay\fP\^); -.LP -Bool XF86VidModeGetModeLine( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int *\fIdotclock_return\fP\^, - XF86VidModeModeLine *\fImodeline\fP\^); -.LP -Bool XF86VidModeGetAllModeLines( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int *\fImodecount_return\fP\^, - XF86VidModeModeInfo ***\fImodesinfo\fP\^); -.ig -.LP -Bool XF86VidModeAddModeLine( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - XF86VidModeModeInfo *\fImodeline\fP\, - XF86VidModeModeInfo *\fIaftermode\fP\^); -.. -.LP -Bool XF86VidModeDeleteModeLine( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - XF86VidModeModeInfo *\fImodeline\fP\^); -.LP -Bool XF86VidModeModModeLine( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - XF86VidModeModeLine *\fImodeline\fP\^); -.LP -Status XF86VidModeValidateModeLine( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - XF86VidModeModeLine *\fImodeline\fP\^); -.LP -Bool XF86VidModeSwitchMode( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int \fIzoom\fP\^); -.LP -Bool XF86VidModeSwitchToMode( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - XF86VidModeModeInfo *\fImodeline\fP\^); -.LP -Bool XF86VidModeLockModeSwitch( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int \fIlock\fP\^); -.LP -Bool XF86VidModeGetMonitor( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - XF86VidModeMonitor *\fImonitor\fP\^); -.LP -Bool XF86VidModeGetViewPort( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int *\fIx_return\fP\^, - int *\fIy_return\fP\^); -.LP -Bool XF86VidModeSetViewPort( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int \fIx\fP\^, - int \fIy\fP\^); -.LP -XF86VidModeGetDotClocks( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int *\fIflags return\fP\^, - int *\fInumber of clocks return\fP\^, - int *\fImax dot clock return\fP\^, - int **\fIclocks return\fP\^); -.LP -XF86VidModeGetGamma( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - XF86VidModeGamma *\fIGamma\fP\^); -.LP -XF86VidModeSetGamma( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - XF86VidModeGamma *\fIGamma\fP\^); -.LP -XF86VidModeGetGammaRamp( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int \fIsize\fP\^, - unsigned short *\fIred array\fP\^, - unsigned short *\fIgreen array\fP\^, - unsigned short *\fIblue array\fP\^); -.LP -XF86VidModeSetGammaRamp( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int \fIsize\fP\^, - unsigned short *\fIred array\fP\^, - unsigned short *\fIgreen array\fP\^, - unsigned short *\fIblue array\fP\^); -.LP -XF86VidModeGetGammaRampSize( - Display *\fIdisplay\fP\^, - int \fIscreen\fP\^, - int *\fIsize\fP\^); -.fi -.SH ARGUMENTS -.IP \fIdisplay\fP 2i -Specifies the connection to the X server. -.IP \fIscreen\fP 2i -Specifies which screen number the setting apply to. -.IP \fIevent_base_return\fP 2i -Returns the base event number for the extension. -.IP \fIerror_base_return\fP 2i -Returns the base error number for the extension. -.IP \fImajor_version_return\fP 2i -Returns the major version number of the extension. -.IP \fIminor_version_return\fP 2i -Returns the minor version number of the extension. -.IP \fIdotclock_return\fP 2i -Returns the clock for the mode line. -.IP \fImodecount_return\fP 2i -Returns the number of video modes available in the server. -.IP \fIzoom\fP 2i -If greater than zero, indicates that the server should switch to -the next mode, otherwise switch to the previous mode. -.IP \fIlock\fP 2i -Indicates that mode switching should be locked, if non-zero. -.IP \fImodeline\fP 2i -Specifies or returns the timing values for a video mode. -.ig -.IP \fIaftermode\fP 2i -Specifies the timing values for the video mode after which the -new mode will added. -.. -.IP \fImodesinfo\fP 2i -Returns the timing values and dotclocks for all of the available -video modes. -.IP \fImonitor\fP 2i -Returns information about the monitor. -.IP \fIx\fP 2i -Specifies the desired X location for the viewport. -.IP \fIx_return\fP 2i -Returns the current X location of the viewport. -.IP \fIy\fP 2i -Specifies the desired Y location for the viewport. -.IP \fIy_return\fP 2i -Returns the current Y location of the viewport. -.SH STRUCTURES -.nf -.ta 2.25i 3.5i -\fIVideo Mode Settings:\fP -typedef struct { - unsigned short hdisplay; /\(** Number of display pixels horizontally */ - unsigned short hsyncstart; /\(** Horizontal sync start */ - unsigned short hsyncend; /\(** Horizontal sync end */ - unsigned short htotal; /\(** Total horizontal pixels */ - unsigned short vdisplay; /\(** Number of display pixels vertically */ - unsigned short vsyncstart; /\(** Vertical sync start */ - unsigned short vsyncend; /\(** Vertical sync start */ - unsigned short vtotal; /\(** Total vertical pixels */ - unsigned int flags; /\(** Mode flags */ - int privsize; /\(** Size of private */ - INT32 *private; /\(** Server privates */ -} XF86VidModeModeLine; -.sp -typedef struct { - unsigned int dotclock; /\(** Pixel clock */ - unsigned short hdisplay; /\(** Number of display pixels horizontally */ - unsigned short hsyncstart; /\(** Horizontal sync start */ - unsigned short hsyncend; /\(** Horizontal sync end */ - unsigned short htotal; /\(** Total horizontal pixels */ - unsigned short vdisplay; /\(** Number of display pixels vertically */ - unsigned short vsyncstart; /\(** Vertical sync start */ - unsigned short vsyncend; /\(** Vertical sync start */ - unsigned short vtotal; /\(** Total vertical pixels */ - unsigned int flags; /\(** Mode flags */ - int privsize; /\(** Size of private */ - INT32 *private; /\(** Server privates */ -} XF86VidModeModeInfo; -.LP -\fIMonitor information:\fP -typedef struct { - char* vendor; /\(** Name of manufacturer */ - char* model; /\(** Model name */ - float EMPTY; /\(** unused, for backward compatibility */ - unsigned char nhsync; /\(** Number of horiz sync ranges */ - XF86VidModeSyncRange* hsync; /\(** Horizontal sync ranges */ - unsigned char nvsync; /\(** Number of vert sync ranges */ - XF86VidModeSyncRange* vsync; /\(** Vertical sync ranges */ -} XF86VidModeMonitor; -.sp -typedef struct { - float hi; /\(** Top of range */ - float lo; /\(** Bottom of range */ -} XF86VidModeSyncRange; -.LP -typedef struct { - int type; /\(** of event */ - unsigned long serial; /\(** # of last request processed by server */ - Bool send_event; /\(** true if this came from a SendEvent req */ - Display *display; /\(** Display the event was read from */ - Window root; /\(** root window of event screen */ - int state; /\(** What happened */ - int kind; /\(** What happened */ - Bool forced; /\(** extents of new region */ - Time time; /\(** event timestamp */ -} XF86VidModeNotifyEvent; -.LP -typedef struct { - float red; /\(** Red Gamma value */ - float green; /\(** Green Gamma value */ - float blue; /\(** Blue Gamma value */ -} XF86VidModeGamma; -.fi -.SH DESCRIPTION -These functions provide an interface to the server extension -\fIXFree86-VidModeExtension\fP -which allows the video modes to be -queried and adjusted dynamically and mode switching to be controlled. -Applications that use these functions must be linked with -.ZN -lXxf86vm -.SS "MODELINE FUNCTIONS" -The -.ZN XF86VidModeGetModeLine -function is used to query the settings for the currently selected -video mode. The calling program should pass a pointer to a -.ZN XF86VidModeModeLine -structure that it has already allocated. The function fills in -the fields of the structure. -.PP -If there are any server private values (currently only applicable to -the S3 server) the function will allocate storage for them. -Therefore, if the -.ZN privsize -field is non-zero, the calling program should call -.ZN Xfree(private) -to free the storage. -.PP -.ZN XF86VidModeGetAllModeLines -returns the settings for all video modes. -The calling program supplies the address of a pointer which will be -set by the function to point to an array of -.ZN XF86VidModeModeInfo -structures. The memory occupied by the array is dynamically allocated -by the -.ZN XF86VidModeGetAllModeLines -function and should be freed by the caller. -The first element of the array corresponds to the current video mode. -.PP -The -.ZN XF86VidModeModModeLine -function can be used to change the settings of the current video mode -provided the requested settings are valid (e.g. they don't exceed the -capabilities of the monitor). -.PP -.ig -To add a mode to the list of available modes, the -.ZN XF86VidModeAddModeLine -function can be used. -Assuming the settings are valid, the video mode will be added after -the existing mode which matches the timings specified by the -.ZN aftermode -parameter. -To be considered a match, all of the fields of the given -.ZN XF86VidModeModeInfo -structure must match, except the -.ZN privsize -and -.ZN private -fields. -If the -.ZN aftermode -parameter is zero, the mode will be added -after the current mode. -.PP -.. -Modes can be deleted with the -.ZN XF86VidModeDeleteModeLine -function. The specified mode must match an existing mode. -To be considered a match, all of the fields of the given -.ZN XF86VidModeModeInfo -structure must match, except the -.ZN privsize -and -.ZN private -fields. -If the mode to be deleted is the current mode, a mode switch -to the next mode will occur first. The last remaining mode can not -be deleted. -.PP -The validity of a mode can be checked with the -.ZN XF86VidModeValidateModeLine -function. -If the specified mode can be used by the server (i.e. meets all the -constraints placed upon a mode by the combination of the server, card, -and monitor) the function returns -.ZN MODE_OK , -otherwise it returns a value indicating the reason why the mode is -invalid (as defined in \fIxf86.h\fP) -.SS "MODE SWITCH FUNCTIONS" -When the function -.ZN XF86VidModeSwitchMode -is called, the server will change the video mode to next (or previous) -video mode. The -.ZN XF86VidModeSwitchToMode -function can be used to switch directly to the specified mode. -Matching is as specified in the description of the -.ZN XF86VidModeAddModeLine -function above. -The -.ZN XF86VidModeLockModeSwitch -function can be used to allow or disallow mode switching whether -the request to switch modes comes from a call to the -.ZN XF86VidModeSwitchMode -or -.ZN XF86VidModeSwitchToMode -functions or from one of the mode switch key sequences. -.PP -.RB Note: -Because of the asynchronous nature of the X protocol, a call to -.ZN XFlush -is needed if the application wants to see the mode change immediately. -To be informed of the execution status of the request, a -custom error handler should be installed using -.ZN XSetErrorHandler -before calling the mode switching function. -.SS "MONITOR FUNCTIONS" -Information known to the server about the monitor is returned by the -.ZN XF86VidModeGetMonitor -function. The -.ZN hsync -and -.ZN vsync -fields each point to an array of -.ZN XF86VidModeSyncRange -structures. The arrays contain -.ZN nhsync -and -.ZN nvsync -elements, respectively. -The -.ZN hi -and -.ZN low -values will be equal if a discreate value was given in the -.ZN XF86Config -file. -.PP -The -.ZN vendor , -.ZN model , -.ZN hsync , -and -.ZN vsync -fields point to dynamically allocated storage that should be freed -by the caller. -.SS "VIEWPORT FUNCTIONS" -The -.ZN XF86VidModeGetViewPort -and -.ZN XF86VidModeSetViewPort -functions can be used to, respectively, query and change the location -of the upper left corner of the viewport into the virtual screen. -.SS "OTHER FUNCTIONS" -The -.ZN XF86VidModeQueryVersion -function can be used to determine the version of the extension -built into the server. -.PP -The function -.ZN XF86VidModeQueryExtension -returns the lowest numbered error and event values -assigned to the extension. -.SH BUGS -The -XF86VidModeSetClientVersion, -XF86VidModeGetDotClocks, -XF86VidModeGetGamma, -XF86VidModeSetGamma, -XF86VidModeSetGammaRamp, -XF86VidModeGetGammaRamp, -XF86VidModeGetGammaRampSize, -and -XF86VidModeGetPermissions -functions need to be documented. In the meantime, check the source -code for information about how to use them. -.SH SEE ALSO -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), XFlush(__libmansuffix__), XSetErrorHandler(__libmansuffix__), xvidtune(__appmansuffix__) -.SH AUTHORS -Kaleb Keithley, Jon Tombs, David Dawes, and Joe Moss diff --git a/nx-X11/lib/Xxf86vm/XF86VMode.c b/nx-X11/lib/Xxf86vm/XF86VMode.c deleted file mode 100644 index edff93fe5..000000000 --- a/nx-X11/lib/Xxf86vm/XF86VMode.c +++ /dev/null @@ -1,1231 +0,0 @@ -/* $XConsortium: XF86VMode.c /main/2 1995/11/14 18:17:58 kaleb $ */ -/* $XFree86: xc/lib/Xxf86vm/XF86VMode.c,v 3.33 2002/10/16 00:37:34 dawes Exp $ */ -/* - -Copyright (c) 1995 Kaleb S. KEITHLEY - -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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -from Kaleb S. KEITHLEY. - -*/ -/* $XConsortium: XF86VMode.c /main/4 1996/01/16 07:52:25 kaleb CHECKEDOUT $ */ - -/* THIS IS NOT AN X CONSORTIUM STANDARD */ - -#define NEED_EVENTS -#define NEED_REPLIES -#include <X11/Xlibint.h> -#include <X11/extensions/xf86vmstr.h> -#include <X11/extensions/Xext.h> -#include <X11/extensions/extutil.h> - -#ifdef DEBUG -#include <stdio.h> -#endif - -#ifndef MODE_BAD -#define MODE_BAD 255 -#endif - -static XExtensionInfo _xf86vidmode_info_data; -static XExtensionInfo *xf86vidmode_info = &_xf86vidmode_info_data; -static char *xf86vidmode_extension_name = XF86VIDMODENAME; - -#define XF86VidModeCheckExtension(dpy,i,val) \ - XextCheckExtension (dpy, i, xf86vidmode_extension_name, val) - -/***************************************************************************** - * * - * private utility routines * - * * - *****************************************************************************/ - -static XEXT_CLOSE_DISPLAY_PROTO(close_display); -static /* const */ XExtensionHooks xf86vidmode_extension_hooks = { - NULL, /* create_gc */ - NULL, /* copy_gc */ - NULL, /* flush_gc */ - NULL, /* free_gc */ - NULL, /* create_font */ - NULL, /* free_font */ - close_display, /* close_display */ - NULL, /* wire_to_event */ - NULL, /* event_to_wire */ - NULL, /* error */ - NULL, /* error_string */ -}; - -static XEXT_GENERATE_FIND_DISPLAY (find_display, xf86vidmode_info, - xf86vidmode_extension_name, - &xf86vidmode_extension_hooks, - 0, NULL) - -static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86vidmode_info) - - -/***************************************************************************** - * * - * public XFree86-VidMode Extension routines * - * * - *****************************************************************************/ - -Bool -XF86VidModeQueryExtension (dpy, event_basep, error_basep) - Display *dpy; - int *event_basep, *error_basep; -{ - XExtDisplayInfo *info = find_display (dpy); - - if (XextHasExtension(info)) { - *event_basep = info->codes->first_event; - *error_basep = info->codes->first_error; - return True; - } else { - return False; - } -} - -Bool -XF86VidModeQueryVersion(dpy, majorVersion, minorVersion) - Display* dpy; - int* majorVersion; - int* minorVersion; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeQueryVersionReply rep; - xXF86VidModeQueryVersionReq *req; - - XF86VidModeCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeQueryVersion, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeQueryVersion; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - *majorVersion = rep.majorVersion; - *minorVersion = rep.minorVersion; - UnlockDisplay(dpy); - SyncHandle(); - if (*majorVersion >= 2) - XF86VidModeSetClientVersion(dpy); - return True; -} - -Bool -XF86VidModeSetClientVersion(Display *dpy) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86VidModeSetClientVersionReq *req; - - XF86VidModeCheckExtension(dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeSetClientVersion, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeSetClientVersion; - req->major = XF86VIDMODE_MAJOR_VERSION; - req->minor = XF86VIDMODE_MINOR_VERSION; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeSetGamma(Display *dpy, int screen, XF86VidModeGamma *Gamma) -{ - XExtDisplayInfo *info = find_display(dpy); - xXF86VidModeSetGammaReq *req; - - XF86VidModeCheckExtension(dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeSetGamma, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeSetGamma; - req->screen = screen; - req->red = (CARD32)(Gamma->red * 10000.); - req->green = (CARD32)(Gamma->green * 10000.); - req->blue = (CARD32)(Gamma->blue * 10000.); - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeGetGamma(Display *dpy, int screen, XF86VidModeGamma *Gamma) -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeGetGammaReply rep; - xXF86VidModeGetGammaReq *req; - - XF86VidModeCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeGetGamma, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeGetGamma; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - Gamma->red = ((float)rep.red) / 10000.; - Gamma->green = ((float)rep.green) / 10000.; - Gamma->blue = ((float)rep.blue) / 10000.; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeGetModeLine(dpy, screen, dotclock, modeline) - Display* dpy; - int screen; - int* dotclock; - XF86VidModeModeLine* modeline; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeGetModeLineReply rep; - xXF86OldVidModeGetModeLineReply oldrep; - xXF86VidModeGetModeLineReq *req; - int majorVersion, minorVersion; - - XF86VidModeCheckExtension (dpy, info, False); - XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion); - - LockDisplay(dpy); - GetReq(XF86VidModeGetModeLine, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeGetModeLine; - req->screen = screen; - - if (majorVersion < 2) { - if (!_XReply(dpy, (xReply *)&oldrep, - (SIZEOF(xXF86OldVidModeGetModeLineReply) - SIZEOF(xReply)) >> 2, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - *dotclock = oldrep.dotclock; - modeline->hdisplay = oldrep.hdisplay; - modeline->hsyncstart = oldrep.hsyncstart; - modeline->hsyncend = oldrep.hsyncend; - modeline->htotal = oldrep.htotal; - modeline->hskew = 0; - modeline->vdisplay = oldrep.vdisplay; - modeline->vsyncstart = oldrep.vsyncstart; - modeline->vsyncend = oldrep.vsyncend; - modeline->vtotal = oldrep.vtotal; - modeline->flags = oldrep.flags; - modeline->privsize = oldrep.privsize; - } else { - if (!_XReply(dpy, (xReply *)&rep, - (SIZEOF(xXF86VidModeGetModeLineReply) - SIZEOF(xReply)) >> 2, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - *dotclock = rep.dotclock; - modeline->hdisplay = rep.hdisplay; - modeline->hsyncstart = rep.hsyncstart; - modeline->hsyncend = rep.hsyncend; - modeline->htotal = rep.htotal; - modeline->hskew = rep.hskew; - modeline->vdisplay = rep.vdisplay; - modeline->vsyncstart = rep.vsyncstart; - modeline->vsyncend = rep.vsyncend; - modeline->vtotal = rep.vtotal; - modeline->flags = rep.flags; - modeline->privsize = rep.privsize; - } - - if (modeline->privsize > 0) { - if (!(modeline->private = Xcalloc(modeline->privsize, sizeof(INT32)))) { - _XEatData(dpy, (modeline->privsize) * sizeof(INT32)); - Xfree(modeline->private); - return False; - } - _XRead(dpy, (char*)modeline->private, modeline->privsize * sizeof(INT32)); - } else { - modeline->private = NULL; - } - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeGetAllModeLines(dpy, screen, modecount, modelinesPtr) - Display* dpy; - int screen; - int* modecount; - XF86VidModeModeInfo ***modelinesPtr; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeGetAllModeLinesReply rep; - xXF86VidModeGetAllModeLinesReq *req; - XF86VidModeModeInfo *mdinfptr, **modelines; - xXF86VidModeModeInfo xmdline; - xXF86OldVidModeModeInfo oldxmdline; - int i; - int majorVersion, minorVersion; - Bool protocolBug = False; - - XF86VidModeCheckExtension (dpy, info, False); - - /* - * Note: There was a bug in the protocol implementation in versions - * 0.x with x < 8 (the .private field wasn't being passed over the wire). - * Check the server's version, and accept the old format if appropriate. - */ - - XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion); - if (majorVersion == 0 && minorVersion < 8) { - protocolBug = True; -#ifdef DEBUG - fprintf(stderr, "XF86VidModeGetAllModeLines: Warning: Xserver is" - "running an old version (%d.%d)\n", majorVersion, - minorVersion); -#endif - } - - LockDisplay(dpy); - GetReq(XF86VidModeGetAllModeLines, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeGetAllModeLines; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, - (SIZEOF(xXF86VidModeGetAllModeLinesReply) - SIZEOF(xReply)) >> 2, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - - *modecount = rep.modecount; - - if (!(modelines = (XF86VidModeModeInfo **) Xcalloc(rep.modecount, - sizeof(XF86VidModeModeInfo *) - +sizeof(XF86VidModeModeInfo)))) { - if (majorVersion < 2) - _XEatData(dpy, (rep.modecount) * sizeof(xXF86OldVidModeModeInfo)); - else - _XEatData(dpy, (rep.modecount) * sizeof(xXF86VidModeModeInfo)); - Xfree(modelines); - return False; - } - mdinfptr = (XF86VidModeModeInfo *) ( - (char *) modelines - + rep.modecount*sizeof(XF86VidModeModeInfo *) - ); - - for (i = 0; i < rep.modecount; i++) { - modelines[i] = mdinfptr++; - if (majorVersion < 2) { - _XRead(dpy, (char*)&oldxmdline, sizeof(xXF86OldVidModeModeInfo)); - modelines[i]->dotclock = oldxmdline.dotclock; - modelines[i]->hdisplay = oldxmdline.hdisplay; - modelines[i]->hsyncstart = oldxmdline.hsyncstart; - modelines[i]->hsyncend = oldxmdline.hsyncend; - modelines[i]->htotal = oldxmdline.htotal; - modelines[i]->hskew = 0; - modelines[i]->vdisplay = oldxmdline.vdisplay; - modelines[i]->vsyncstart = oldxmdline.vsyncstart; - modelines[i]->vsyncend = oldxmdline.vsyncend; - modelines[i]->vtotal = oldxmdline.vtotal; - modelines[i]->flags = oldxmdline.flags; - if (protocolBug) { - modelines[i]->privsize = 0; - modelines[i]->private = NULL; - } else { - modelines[i]->privsize = oldxmdline.privsize; - if (oldxmdline.privsize > 0) { - if (!(modelines[i]->private = - Xcalloc(oldxmdline.privsize, sizeof(INT32)))) { - _XEatData(dpy, (oldxmdline.privsize) * sizeof(INT32)); - Xfree(modelines[i]->private); - } else { - _XRead(dpy, (char*)modelines[i]->private, - oldxmdline.privsize * sizeof(INT32)); - } - } else { - modelines[i]->private = NULL; - } - } - } else { - _XRead(dpy, (char*)&xmdline, sizeof(xXF86VidModeModeInfo)); - modelines[i]->dotclock = xmdline.dotclock; - modelines[i]->hdisplay = xmdline.hdisplay; - modelines[i]->hsyncstart = xmdline.hsyncstart; - modelines[i]->hsyncend = xmdline.hsyncend; - modelines[i]->htotal = xmdline.htotal; - modelines[i]->hskew = xmdline.hskew; - modelines[i]->vdisplay = xmdline.vdisplay; - modelines[i]->vsyncstart = xmdline.vsyncstart; - modelines[i]->vsyncend = xmdline.vsyncend; - modelines[i]->vtotal = xmdline.vtotal; - modelines[i]->flags = xmdline.flags; - if (protocolBug) { - modelines[i]->privsize = 0; - modelines[i]->private = NULL; - } else { - modelines[i]->privsize = xmdline.privsize; - if (xmdline.privsize > 0) { - if (!(modelines[i]->private = - Xcalloc(xmdline.privsize, sizeof(INT32)))) { - _XEatData(dpy, (xmdline.privsize) * sizeof(INT32)); - Xfree(modelines[i]->private); - } else { - _XRead(dpy, (char*)modelines[i]->private, - xmdline.privsize * sizeof(INT32)); - } - } else { - modelines[i]->private = NULL; - } - } - } - } - *modelinesPtr = modelines; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -/* - * GetReq replacement for use with VidMode protocols earlier than 2.0 - */ -#if !defined(UNIXCPP) || defined(ANSICPP) -#define GetOldReq(name, oldname, req) \ - if ((dpy->bufptr + SIZEOF(x##oldname##Req)) > dpy->bufmax)\ - _XFlush(dpy);\ - req = (x##oldname##Req *)(dpy->last_req = dpy->bufptr);\ - req->reqType = X_##name;\ - req->length = (SIZEOF(x##oldname##Req))>>2;\ - dpy->bufptr += SIZEOF(x##oldname##Req);\ - dpy->request++ - -#else /* non-ANSI C uses empty comment instead of "##" for token concatenation */ -#define GetOldReq(name, oldname, req) \ - if ((dpy->bufptr + SIZEOF(x/**/oldname/**/Req)) > dpy->bufmax)\ - _XFlush(dpy);\ - req = (x/**/oldname/**/Req *)(dpy->last_req = dpy->bufptr);\ - req->reqType = X_/**/name;\ - req->length = (SIZEOF(x/**/oldname/**/Req))>>2;\ - dpy->bufptr += SIZEOF(x/**/oldname/**/Req);\ - dpy->request++ -#endif - -Bool -XF86VidModeAddModeLine (dpy, screen, newmodeline, aftermodeline) - Display *dpy; - int screen; - XF86VidModeModeInfo* newmodeline; - XF86VidModeModeInfo* aftermodeline; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeAddModeLineReq *req; - xXF86OldVidModeAddModeLineReq *oldreq; - int majorVersion, minorVersion; - - XF86VidModeCheckExtension (dpy, info, False); - XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion); - - LockDisplay(dpy); - if (majorVersion < 2) { - GetOldReq(XF86VidModeAddModeLine, XF86OldVidModeAddModeLine, oldreq); - oldreq->reqType = info->codes->major_opcode; - oldreq->xf86vidmodeReqType = X_XF86VidModeAddModeLine; - oldreq->screen = screen; - oldreq->dotclock = newmodeline->dotclock; - oldreq->hdisplay = newmodeline->hdisplay; - oldreq->hsyncstart = newmodeline->hsyncstart; - oldreq->hsyncend = newmodeline->hsyncend; - oldreq->htotal = newmodeline->htotal; - oldreq->vdisplay = newmodeline->vdisplay; - oldreq->vsyncstart = newmodeline->vsyncstart; - oldreq->vsyncend = newmodeline->vsyncend; - oldreq->vtotal = newmodeline->vtotal; - oldreq->flags = newmodeline->flags; - oldreq->privsize = newmodeline->privsize; - if (aftermodeline != NULL) { - oldreq->after_dotclock = aftermodeline->dotclock; - oldreq->after_hdisplay = aftermodeline->hdisplay; - oldreq->after_hsyncstart = aftermodeline->hsyncstart; - oldreq->after_hsyncend = aftermodeline->hsyncend; - oldreq->after_htotal = aftermodeline->htotal; - oldreq->after_vdisplay = aftermodeline->vdisplay; - oldreq->after_vsyncstart = aftermodeline->vsyncstart; - oldreq->after_vsyncend = aftermodeline->vsyncend; - oldreq->after_vtotal = aftermodeline->vtotal; - oldreq->after_flags = aftermodeline->flags; - } else { - oldreq->after_dotclock = 0; - oldreq->after_hdisplay = 0; - oldreq->after_hsyncstart = 0; - oldreq->after_hsyncend = 0; - oldreq->after_htotal = 0; - oldreq->after_vdisplay = 0; - oldreq->after_vsyncstart = 0; - oldreq->after_vsyncend = 0; - oldreq->after_vtotal = 0; - oldreq->after_flags = 0; - } - if (newmodeline->privsize) { - oldreq->length += newmodeline->privsize; - Data32(dpy, (long *) newmodeline->private, - newmodeline->privsize * sizeof(INT32)); - } - } else { - GetReq(XF86VidModeAddModeLine, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeAddModeLine; - req->screen = screen; - req->dotclock = newmodeline->dotclock; - req->hdisplay = newmodeline->hdisplay; - req->hsyncstart = newmodeline->hsyncstart; - req->hsyncend = newmodeline->hsyncend; - req->htotal = newmodeline->htotal; - req->hskew = newmodeline->hskew; - req->vdisplay = newmodeline->vdisplay; - req->vsyncstart = newmodeline->vsyncstart; - req->vsyncend = newmodeline->vsyncend; - req->vtotal = newmodeline->vtotal; - req->flags = newmodeline->flags; - req->privsize = newmodeline->privsize; - if (aftermodeline != NULL) { - req->after_dotclock = aftermodeline->dotclock; - req->after_hdisplay = aftermodeline->hdisplay; - req->after_hsyncstart = aftermodeline->hsyncstart; - req->after_hsyncend = aftermodeline->hsyncend; - req->after_htotal = aftermodeline->htotal; - req->after_hskew = aftermodeline->hskew; - req->after_vdisplay = aftermodeline->vdisplay; - req->after_vsyncstart = aftermodeline->vsyncstart; - req->after_vsyncend = aftermodeline->vsyncend; - req->after_vtotal = aftermodeline->vtotal; - req->after_flags = aftermodeline->flags; - } else { - req->after_dotclock = 0; - req->after_hdisplay = 0; - req->after_hsyncstart = 0; - req->after_hsyncend = 0; - req->after_htotal = 0; - req->after_hskew = 0; - req->after_vdisplay = 0; - req->after_vsyncstart = 0; - req->after_vsyncend = 0; - req->after_vtotal = 0; - req->after_flags = 0; - } - if (newmodeline->privsize) { - req->length += newmodeline->privsize; - Data32(dpy, (long *) newmodeline->private, - newmodeline->privsize * sizeof(INT32)); - } - } - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeDeleteModeLine (dpy, screen, modeline) - Display *dpy; - int screen; - XF86VidModeModeInfo* modeline; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeDeleteModeLineReq *req; - xXF86OldVidModeDeleteModeLineReq *oldreq; - int majorVersion, minorVersion; - - XF86VidModeCheckExtension (dpy, info, 0); - XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion); - - LockDisplay(dpy); - if (majorVersion < 2) { - GetOldReq(XF86VidModeDeleteModeLine, XF86OldVidModeDeleteModeLine, oldreq); - oldreq->reqType = info->codes->major_opcode; - oldreq->xf86vidmodeReqType = X_XF86VidModeDeleteModeLine; - oldreq->screen = screen; - oldreq->dotclock = modeline->dotclock; - oldreq->hdisplay = modeline->hdisplay; - oldreq->hsyncstart = modeline->hsyncstart; - oldreq->hsyncend = modeline->hsyncend; - oldreq->htotal = modeline->htotal; - oldreq->vdisplay = modeline->vdisplay; - oldreq->vsyncstart = modeline->vsyncstart; - oldreq->vsyncend = modeline->vsyncend; - oldreq->vtotal = modeline->vtotal; - oldreq->flags = modeline->flags; - oldreq->privsize = modeline->privsize; - if (modeline->privsize) { - oldreq->length += modeline->privsize; - Data32(dpy, (long *) modeline->private, - modeline->privsize * sizeof(INT32)); - } - } else { - GetReq(XF86VidModeDeleteModeLine, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeDeleteModeLine; - req->screen = screen; - req->dotclock = modeline->dotclock; - req->hdisplay = modeline->hdisplay; - req->hsyncstart = modeline->hsyncstart; - req->hsyncend = modeline->hsyncend; - req->htotal = modeline->htotal; - req->hskew = modeline->hskew; - req->vdisplay = modeline->vdisplay; - req->vsyncstart = modeline->vsyncstart; - req->vsyncend = modeline->vsyncend; - req->vtotal = modeline->vtotal; - req->flags = modeline->flags; - req->privsize = modeline->privsize; - if (modeline->privsize) { - req->length += modeline->privsize; - Data32(dpy, (long *) modeline->private, - modeline->privsize * sizeof(INT32)); - } - } - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeModModeLine (dpy, screen, modeline) - Display *dpy; - int screen; - XF86VidModeModeLine* modeline; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeModModeLineReq *req; - xXF86OldVidModeModModeLineReq *oldreq; - int majorVersion, minorVersion; - - XF86VidModeCheckExtension (dpy, info, 0); - XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion); - - LockDisplay(dpy); - if (majorVersion < 2) { - GetOldReq(XF86VidModeModModeLine, XF86OldVidModeModModeLine, oldreq); - oldreq->reqType = info->codes->major_opcode; - oldreq->xf86vidmodeReqType = X_XF86VidModeModModeLine; - oldreq->screen = screen; - oldreq->hdisplay = modeline->hdisplay; - oldreq->hsyncstart = modeline->hsyncstart; - oldreq->hsyncend = modeline->hsyncend; - oldreq->htotal = modeline->htotal; - oldreq->vdisplay = modeline->vdisplay; - oldreq->vsyncstart = modeline->vsyncstart; - oldreq->vsyncend = modeline->vsyncend; - oldreq->vtotal = modeline->vtotal; - oldreq->flags = modeline->flags; - oldreq->privsize = modeline->privsize; - if (modeline->privsize) { - oldreq->length += modeline->privsize; - Data32(dpy, (long *) modeline->private, - modeline->privsize * sizeof(INT32)); - } - } else { - GetReq(XF86VidModeModModeLine, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeModModeLine; - req->screen = screen; - req->hdisplay = modeline->hdisplay; - req->hsyncstart = modeline->hsyncstart; - req->hsyncend = modeline->hsyncend; - req->htotal = modeline->htotal; - req->hskew = modeline->hskew; - req->vdisplay = modeline->vdisplay; - req->vsyncstart = modeline->vsyncstart; - req->vsyncend = modeline->vsyncend; - req->vtotal = modeline->vtotal; - req->flags = modeline->flags; - req->privsize = modeline->privsize; - if (modeline->privsize) { - req->length += modeline->privsize; - Data32(dpy, (long *) modeline->private, - modeline->privsize * sizeof(INT32)); - } - } - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Status -XF86VidModeValidateModeLine (dpy, screen, modeline) - Display *dpy; - int screen; - XF86VidModeModeInfo* modeline; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeValidateModeLineReq *req; - xXF86OldVidModeValidateModeLineReq *oldreq; - xXF86VidModeValidateModeLineReply rep; - int majorVersion, minorVersion; - - XF86VidModeCheckExtension (dpy, info, 0); - XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion); - - LockDisplay(dpy); - - if (majorVersion < 2) { - GetOldReq(XF86VidModeValidateModeLine, XF86OldVidModeValidateModeLine, oldreq); - oldreq->reqType = info->codes->major_opcode; - oldreq->xf86vidmodeReqType = X_XF86VidModeValidateModeLine; - oldreq->screen = screen; - oldreq->dotclock = modeline->dotclock; - oldreq->hdisplay = modeline->hdisplay; - oldreq->hsyncstart = modeline->hsyncstart; - oldreq->hsyncend = modeline->hsyncend; - oldreq->htotal = modeline->htotal; - oldreq->vdisplay = modeline->vdisplay; - oldreq->vsyncstart = modeline->vsyncstart; - oldreq->vsyncend = modeline->vsyncend; - oldreq->vtotal = modeline->vtotal; - oldreq->flags = modeline->flags; - oldreq->privsize = modeline->privsize; - if (modeline->privsize) { - oldreq->length += modeline->privsize; - Data32(dpy, (long *) modeline->private, - modeline->privsize * sizeof(INT32)); - } - } else { - GetReq(XF86VidModeValidateModeLine, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeValidateModeLine; - req->screen = screen; - req->dotclock = modeline->dotclock; - req->hdisplay = modeline->hdisplay; - req->hsyncstart = modeline->hsyncstart; - req->hsyncend = modeline->hsyncend; - req->htotal = modeline->htotal; - req->hskew = modeline->hskew; - req->vdisplay = modeline->vdisplay; - req->vsyncstart = modeline->vsyncstart; - req->vsyncend = modeline->vsyncend; - req->vtotal = modeline->vtotal; - req->flags = modeline->flags; - req->privsize = modeline->privsize; - if (modeline->privsize) { - req->length += modeline->privsize; - Data32(dpy, (long *) modeline->private, - modeline->privsize * sizeof(INT32)); - } - } - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return MODE_BAD; - } - UnlockDisplay(dpy); - SyncHandle(); - return rep.status; -} - -Bool -XF86VidModeSwitchMode(dpy, screen, zoom) - Display* dpy; - int screen; - int zoom; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeSwitchModeReq *req; - - XF86VidModeCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeSwitchMode, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeSwitchMode; - req->screen = screen; - req->zoom = zoom; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeSwitchToMode(dpy, screen, modeline) - Display* dpy; - int screen; - XF86VidModeModeInfo* modeline; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeSwitchToModeReq *req; - xXF86OldVidModeSwitchToModeReq *oldreq; - int majorVersion, minorVersion; - Bool protocolBug = False; - - XF86VidModeCheckExtension (dpy, info, False); - - /* - * Note: There was a bug in the protocol implementation in versions - * 0.x with x < 8 (the .private field wasn't expected to be sent over - * the wire). Check the server's version, and accept the old format - * if appropriate. - */ - - XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion); - if (majorVersion == 0 && minorVersion < 8) { - protocolBug = True; -#ifdef DEBUG - fprintf(stderr, "XF86VidModeSwitchToMode: Warning: Xserver is" - "running an old version (%d.%d)\n", majorVersion, - minorVersion); -#endif - } - - LockDisplay(dpy); - if (majorVersion < 2) { - GetOldReq(XF86VidModeSwitchToMode, XF86OldVidModeSwitchToMode, oldreq); - oldreq->reqType = info->codes->major_opcode; - oldreq->xf86vidmodeReqType = X_XF86VidModeSwitchToMode; - oldreq->screen = screen; - oldreq->dotclock = modeline->dotclock; - oldreq->hdisplay = modeline->hdisplay; - oldreq->hsyncstart = modeline->hsyncstart; - oldreq->hsyncend = modeline->hsyncend; - oldreq->htotal = modeline->htotal; - oldreq->vdisplay = modeline->vdisplay; - oldreq->vsyncstart = modeline->vsyncstart; - oldreq->vsyncend = modeline->vsyncend; - oldreq->vtotal = modeline->vtotal; - oldreq->flags = modeline->flags; - if (protocolBug) { - oldreq->privsize = 0; - } else { - oldreq->privsize = modeline->privsize; - if (modeline->privsize) { - oldreq->length += modeline->privsize; - Data32(dpy, (long *) modeline->private, - modeline->privsize * sizeof(INT32)); - } - } - } else { - GetReq(XF86VidModeSwitchToMode, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeSwitchToMode; - req->screen = screen; - req->dotclock = modeline->dotclock; - req->hdisplay = modeline->hdisplay; - req->hsyncstart = modeline->hsyncstart; - req->hsyncend = modeline->hsyncend; - req->htotal = modeline->htotal; - req->hskew = modeline->hskew; - req->vdisplay = modeline->vdisplay; - req->vsyncstart = modeline->vsyncstart; - req->vsyncend = modeline->vsyncend; - req->vtotal = modeline->vtotal; - req->flags = modeline->flags; - if (protocolBug) { - req->privsize = 0; - } else { - req->privsize = modeline->privsize; - if (modeline->privsize) { - req->length += modeline->privsize; - Data32(dpy, (long *) modeline->private, - modeline->privsize * sizeof(INT32)); - } - } - } - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeLockModeSwitch(dpy, screen, lock) - Display* dpy; - int screen; - int lock; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeLockModeSwitchReq *req; - - XF86VidModeCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeLockModeSwitch, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeLockModeSwitch; - req->screen = screen; - req->lock = lock; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeGetMonitor(dpy, screen, monitor) - Display* dpy; - int screen; - XF86VidModeMonitor* monitor; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeGetMonitorReply rep; - xXF86VidModeGetMonitorReq *req; - CARD32 syncrange; - int i; - - XF86VidModeCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeGetMonitor, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeGetMonitor; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - monitor->nhsync = rep.nhsync; - monitor->nvsync = rep.nvsync; -#if 0 - monitor->bandwidth = (float)rep.bandwidth / 1e6; -#endif - if (rep.vendorLength) { - if (!(monitor->vendor = (char *)Xcalloc(rep.vendorLength + 1, 1))) { - _XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 + - ((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3)); - return False; - } - } else { - monitor->vendor = NULL; - } - if (rep.modelLength) { - if (!(monitor->model = Xcalloc(rep.modelLength + 1, 1))) { - _XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 + - ((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3)); - if (monitor->vendor) - Xfree(monitor->vendor); - return False; - } - } else { - monitor->model = NULL; - } - if (!(monitor->hsync = Xcalloc(rep.nhsync, sizeof(XF86VidModeSyncRange)))) { - _XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 + - ((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3)); - - if (monitor->vendor) - Xfree(monitor->vendor); - if (monitor->model) - Xfree(monitor->model); - return False; - } - if (!(monitor->vsync = Xcalloc(rep.nvsync, sizeof(XF86VidModeSyncRange)))) { - _XEatData(dpy, (rep.nhsync + rep.nvsync) * 4 + - ((rep.vendorLength+3) & ~3) + ((rep.modelLength+3) & ~3)); - if (monitor->vendor) - Xfree(monitor->vendor); - if (monitor->model) - Xfree(monitor->model); - Xfree(monitor->hsync); - return False; - } - for (i = 0; i < rep.nhsync; i++) { - _XRead(dpy, (char *)&syncrange, 4); - monitor->hsync[i].lo = (float)(syncrange & 0xFFFF) / 100.0; - monitor->hsync[i].hi = (float)(syncrange >> 16) / 100.0; - } - for (i = 0; i < rep.nvsync; i++) { - _XRead(dpy, (char *)&syncrange, 4); - monitor->vsync[i].lo = (float)(syncrange & 0xFFFF) / 100.0; - monitor->vsync[i].hi = (float)(syncrange >> 16) / 100.0; - } - if (rep.vendorLength) - _XReadPad(dpy, monitor->vendor, rep.vendorLength); - else - monitor->vendor = ""; - if (rep.modelLength) - _XReadPad(dpy, monitor->model, rep.modelLength); - else - monitor->model = ""; - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeGetViewPort(dpy, screen, x, y) - Display* dpy; - int screen; - int *x, *y; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeGetViewPortReply rep; - xXF86VidModeGetViewPortReq *req; - int majorVersion, minorVersion; - Bool protocolBug = False; - - XF86VidModeCheckExtension (dpy, info, False); - - /* - * Note: There was a bug in the protocol implementation in versions - * 0.x with x < 8 (no reply was sent, so the client would hang) - * Check the server's version, and don't wait for a reply with older - * versions. - */ - - XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion); - if (majorVersion == 0 && minorVersion < 8) { - protocolBug = True; -#ifdef DEBUG - fprintf(stderr, "XF86VidModeGetViewPort: Warning: Xserver is" - "running an old version (%d.%d)\n", majorVersion, - minorVersion); -#endif - } - LockDisplay(dpy); - GetReq(XF86VidModeGetViewPort, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeGetViewPort; - req->screen = screen; - if (protocolBug) { - *x = 0; - *y = 0; - } else { - if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - *x = rep.x; - *y = rep.y; - } - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeSetViewPort(dpy, screen, x, y) - Display* dpy; - int screen; - int x, y; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeSetViewPortReq *req; - - XF86VidModeCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeSetViewPort, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeSetViewPort; - req->screen = screen; - req->x = x; - req->y = y; - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeGetDotClocks(dpy, screen, - flagsPtr, numclocksPtr, maxclocksPtr, clocksPtr) - Display* dpy; - int screen; - int *flagsPtr, *numclocksPtr, *maxclocksPtr, *clocksPtr[]; -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeGetDotClocksReply rep; - xXF86VidModeGetDotClocksReq *req; - int i, *dotclocks; - CARD32 dotclk; - - XF86VidModeCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeGetDotClocks, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeGetDotClocks; - req->screen = screen; - if (!_XReply(dpy, (xReply *)&rep, - (SIZEOF(xXF86VidModeGetDotClocksReply) - SIZEOF(xReply)) >> 2, xFalse)) - { - UnlockDisplay(dpy); - SyncHandle(); - return False; - } - *numclocksPtr = rep.clocks; - *maxclocksPtr = rep.maxclocks; - *flagsPtr = rep.flags; - - if (!(dotclocks = (int*) Xcalloc(rep.clocks, sizeof(int)))) { - _XEatData(dpy, (rep.clocks) * 4); - Xfree(dotclocks); - return False; - } - - for (i = 0; i < rep.clocks; i++) { - _XRead(dpy, (char*)&dotclk, 4); - dotclocks[i] = dotclk; - } - *clocksPtr = dotclocks; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool -XF86VidModeSetGammaRamp ( - Display *dpy, - int screen, - int size, - unsigned short *red, - unsigned short *green, - unsigned short *blue -) -{ - int length = (size + 1) & ~1; - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeSetGammaRampReq *req; - - XF86VidModeCheckExtension (dpy, info, False); - LockDisplay(dpy); - GetReq(XF86VidModeSetGammaRamp, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeSetGammaRamp; - req->screen = screen; - req->length += (length >> 1) * 3; - req->size = size; - _XSend(dpy, (char*)red, size * 2); - _XSend(dpy, (char*)green, size * 2); - _XSend(dpy, (char*)blue, size * 2); - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - - -Bool -XF86VidModeGetGammaRamp ( - Display *dpy, - int screen, - int size, - unsigned short *red, - unsigned short *green, - unsigned short *blue -) -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeGetGammaRampReq *req; - xXF86VidModeGetGammaRampReply rep; - - XF86VidModeCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeGetGammaRamp, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeGetGammaRamp; - req->screen = screen; - req->size = size; - if (!_XReply (dpy, (xReply *) &rep, 0, xFalse)) { - UnlockDisplay (dpy); - SyncHandle (); - return False; - } - if(rep.size) { - _XRead(dpy, (char*)red, rep.size << 1); - _XRead(dpy, (char*)green, rep.size << 1); - _XRead(dpy, (char*)blue, rep.size << 1); - } - - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86VidModeGetGammaRampSize( - Display *dpy, - int screen, - int *size -) -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeGetGammaRampSizeReq *req; - xXF86VidModeGetGammaRampSizeReply rep; - - *size = 0; - - XF86VidModeCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeGetGammaRampSize, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeGetGammaRampSize; - req->screen = screen; - if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { - UnlockDisplay (dpy); - SyncHandle (); - return False; - } - *size = rep.size; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - -Bool XF86VidModeGetPermissions( - Display *dpy, - int screen, - int *permissions -) -{ - XExtDisplayInfo *info = find_display (dpy); - xXF86VidModeGetPermissionsReq *req; - xXF86VidModeGetPermissionsReply rep; - - *permissions = 0; - - XF86VidModeCheckExtension (dpy, info, False); - - LockDisplay(dpy); - GetReq(XF86VidModeGetPermissions, req); - req->reqType = info->codes->major_opcode; - req->xf86vidmodeReqType = X_XF86VidModeGetPermissions; - req->screen = screen; - if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { - UnlockDisplay (dpy); - SyncHandle (); - return False; - } - *permissions = rep.permissions; - UnlockDisplay(dpy); - SyncHandle(); - return True; -} - diff --git a/nx-X11/lib/Xxf86vm/Xxf86vm-def.cpp b/nx-X11/lib/Xxf86vm/Xxf86vm-def.cpp deleted file mode 100644 index 0f7b4f335..000000000 --- a/nx-X11/lib/Xxf86vm/Xxf86vm-def.cpp +++ /dev/null @@ -1,16 +0,0 @@ -LIBRARY XXF86VM -EXPORTS - XF86VidModeQueryExtension - XF86VidModeQueryVersion - XF86VidModeGetModeLine - XF86VidModeGetAllModeLines - XF86VidModeModModeLine - XF86VidModeSwitchMode - XF86VidModeLockModeSwitch - XF86VidModeGetMonitor - XF86VidModeGetGamma - XF86VidModeSetGamma - XF86VidModeSwitchToMode - XF86VidModeAddModeLine - -/* $XFree86$ */ diff --git a/nx-X11/lib/xkbui/Imakefile b/nx-X11/lib/xkbui/Imakefile deleted file mode 100644 index a017d681c..000000000 --- a/nx-X11/lib/xkbui/Imakefile +++ /dev/null @@ -1,25 +0,0 @@ -XCOMM $XConsortium: Imakefile /main/1 1995/11/30 19:00:42 kaleb $ -XCOMM $XFree86: xc/lib/xkbui/Imakefile,v 3.4 2003/10/15 21:23:38 herrb Exp $ -#define DoNormalLib NormalLibxkbui -#define DoSharedLib SharedLibxkbui -#define DoExtraLib SharedLibxkbui -#define DoDebugLib DebugLibxkbui -#define DoProfileLib ProfileLibxkbui -#define HasSharedData NO -#define LibName NX_xkbui -#define SoRev SOXKBUIREV -#define IncSubdir X11 -#define IncSubSubdir extensions - -#ifdef SharedxkbuiReqs -REQUIREDLIBS = SharedxkbuiReqs -#endif - - SRCS = XKBui.c - OBJS = XKBui.o - HEADERS = XKBui.h - INCLUDES = -I. -I$(EXTINCSRC) -I../xkbfile - -#include <Library.tmpl> - -DependTarget() diff --git a/nx-X11/lib/xkbui/XKBui.c b/nx-X11/lib/xkbui/XKBui.c deleted file mode 100644 index 747071690..000000000 --- a/nx-X11/lib/xkbui/XKBui.c +++ /dev/null @@ -1,666 +0,0 @@ -/* $XConsortium: XKBui.c /main/2 1995/12/07 21:18:19 kaleb $ */ -/************************************************************ - Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc. - - 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 Silicon Graphics not be - used in advertising or publicity pertaining to distribution - of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability - of this software for any purpose. It is provided "as is" - without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS 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/lib/xkbui/XKBui.c,v 3.6 1999/06/20 07:14:08 dawes Exp $ */ - -#include <X11/Xos.h> -#include <stdio.h> -#include <stdlib.h> - -#if defined(SVR4) && defined(i386) && !defined(_XOPEN_SOURCE) -# define _XOPEN_SOURCE -# include <math.h> -# undef _XOPEN_SOURCE -#else -# include <math.h> -#endif /* _XOPEN_SOURCE */ - -#include <X11/Xfuncs.h> -#include "XKBuiPriv.h" -#include <X11/extensions/XKBfile.h> - -#ifndef M_PI -# define M_PI 3.141592653589793238462 -#endif - -/* This function is an internal function in the xkbfile library */ -extern int _XkbStrCaseCmp( - char * /* str1 */, - char * /* str2 */ -); - - -static XkbUI_ViewOptsRec dfltOpts = { - XkbUI_AllViewOptsMask /* present */, - 1 /* fg */, - 0 /* bg */, - XkbUI_KeyNames /* label_mode */, - 0 /* color_mode */, - { - 0 /* viewport.x */, - 0 /* viewport.y */, - 640 /* viewport.width */, - 480 /* viewport.height */ - }, - 10, 10, /* margin_width, margin_height */ - None -}; - -XkbUI_ViewPtr -XkbUI_SimpleInit(Display *dpy,Window win,int width,int height) -{ -XkbDescPtr xkb; - - if ((!dpy)||(win==None)||(width<1)||(height<1)) - return NULL; - xkb= XkbGetKeyboard(dpy,XkbGBN_AllComponentsMask,XkbUseCoreKbd); - if (!xkb) - return NULL; - return XkbUI_Init(dpy,win,width,height,xkb,NULL); -} - -static void -_XkbUI_AllocateColors(XkbUI_ViewPtr view) -{ -register int i; -Display * dpy; -XColor sdef,xdef; -XkbDescPtr xkb; - - dpy= view->dpy; - xkb= view->xkb; - if (view->opts.cmap==None) - view->opts.cmap= DefaultColormap(dpy,DefaultScreen(dpy)); - for (i=0;i<xkb->geom->num_colors;i++) { - char *spec; - Bool found; - - spec= xkb->geom->colors[i].spec; - found= False; - if (XAllocNamedColor(view->dpy,view->opts.cmap,spec,&sdef,&xdef)) { - xkb->geom->colors[i].pixel= sdef.pixel; -#ifdef DEBUG - fprintf(stderr,"got pixel %d for \"%s\"\n",sdef.pixel,spec); -#endif - found= True; - } - if ((!found)&&(XkbLookupCanonicalRGBColor(spec,&sdef))) { - char buf[20]; - sprintf(buf,"#%02x%02x%02x",(sdef.red>>8)&0xff, - (sdef.green>>8)&0xff, - (sdef.blue>>8)&&0xff); - if (XAllocNamedColor(view->dpy,view->opts.cmap,buf,&sdef,&xdef)) { - xkb->geom->colors[i].pixel= sdef.pixel; -#ifdef DEBUG - fprintf(stderr,"got pixel %d for \"%s\"\n",sdef.pixel,spec); -#endif - found= True; - } - } - if (!found) { - xkb->geom->colors[i].pixel= view->opts.fg; - fprintf(stderr,"Couldn't allocate color \"%s\"\n",spec); - } - } - return; -} - -XkbUI_ViewPtr -XkbUI_Init( Display * dpy, - Window win, - int width, - int height, - XkbDescPtr xkb, - XkbUI_ViewOptsPtr opts) -{ -XGCValues xgcv; -XkbUI_ViewPtr view; -int scrn; - - if ((!dpy)||(!xkb)||(!xkb->geom)||(win==None)||(width<1)||(height<1)) - return NULL; - view= _XkbTypedCalloc(1,XkbUI_ViewRec); - if (!view) - return NULL; - scrn= DefaultScreen(dpy); - view->dpy= dpy; - view->xkb= xkb; - view->win= win; - view->opts= dfltOpts; - view->opts.fg= WhitePixel(dpy,scrn); - view->opts.bg= BlackPixel(dpy,scrn); - view->opts.viewport.x= 0; - view->opts.viewport.y= 0; - view->opts.viewport.width= width; - view->opts.viewport.height= height; - if ((opts)&&(opts->present)) { - if (opts->present&XkbUI_BackgroundMask) - view->opts.bg= opts->bg; - if (opts->present&XkbUI_ForegroundMask) - view->opts.fg= opts->fg; - if (opts->present&XkbUI_LabelModeMask) - view->opts.label_mode= opts->label_mode; - if (opts->present&XkbUI_ColorModeMask) - view->opts.color_mode= opts->color_mode; - if (opts->present&XkbUI_WidthMask) - view->opts.viewport.width= opts->viewport.width; - if (opts->present&XkbUI_HeightMask) - view->opts.viewport.height= opts->viewport.height; - if (opts->present&XkbUI_XOffsetMask) - view->opts.viewport.x= opts->viewport.x; - if (opts->present&XkbUI_YOffsetMask) - view->opts.viewport.y= opts->viewport.y; - if (opts->present&XkbUI_MarginWidthMask) - view->opts.margin_width= opts->margin_width; - if (opts->present&XkbUI_MarginHeightMask) - view->opts.margin_height= opts->margin_height; - if (opts->present&XkbUI_ColormapMask) - view->opts.cmap= opts->cmap; - } - view->canvas_width= width+(2*view->opts.margin_width); - view->canvas_height= height+(2*view->opts.margin_height); - if (view->opts.viewport.width>view->canvas_width) { - int tmp; - tmp= (view->opts.viewport.width-view->canvas_width)/2; - view->opts.margin_width+= tmp; - } - if (view->opts.viewport.height>view->canvas_height) { - int tmp; - tmp= (view->opts.viewport.height-view->canvas_height)/2; - view->opts.margin_height+= tmp; - } - bzero(view->state,XkbMaxLegalKeyCode+1); - - xgcv.foreground= view->opts.fg; - xgcv.background= view->opts.bg; - view->gc= XCreateGC(view->dpy,view->win,GCForeground|GCBackground,&xgcv); - view->xscale= ((double)width)/((double)xkb->geom->width_mm); - view->yscale= ((double)height)/((double)xkb->geom->height_mm); - - _XkbUI_AllocateColors(view); - return view; -} - -Status -XkbUI_SetViewOpts(XkbUI_ViewPtr view,XkbUI_ViewOptsPtr opts) -{ - if ((!view)||(!opts)) - return BadValue; - if (opts->present==0) - return Success; - if (opts->present&XkbUI_BackgroundMask) - view->opts.bg= opts->bg; - if (opts->present&XkbUI_ForegroundMask) - view->opts.fg= opts->fg; - if (opts->present&XkbUI_LabelModeMask) - view->opts.label_mode= opts->label_mode; - if (opts->present&XkbUI_ColorModeMask) - view->opts.color_mode= opts->color_mode; - if (opts->present&XkbUI_WidthMask) - view->opts.viewport.width= opts->viewport.width; - if (opts->present&XkbUI_HeightMask) - view->opts.viewport.height= opts->viewport.height; - if (opts->present&XkbUI_XOffsetMask) - view->opts.viewport.x= opts->viewport.x; - if (opts->present&XkbUI_YOffsetMask) - view->opts.viewport.y= opts->viewport.y; - if (opts->present&XkbUI_MarginWidthMask) - view->opts.margin_width= opts->margin_width; - if (opts->present&XkbUI_MarginHeightMask) - view->opts.margin_height= opts->margin_height; - if (opts->present&XkbUI_ColormapMask) { - view->opts.cmap= opts->cmap; - _XkbUI_AllocateColors(view); - } - return Success; -} - -Status -XbUI_GetViewOpts(XkbUI_ViewPtr view,XkbUI_ViewOptsPtr opts_rtrn) -{ - if ((!view)||(!opts_rtrn)) - return BadValue; - *opts_rtrn= view->opts; - return Success; -} - -Status -XkbUI_SetCanvasSize(XkbUI_ViewPtr view,int width,int height) -{ - if ((!view)||(!view->xkb)||(!view->xkb->geom)) - return BadValue; - view->canvas_width= width; - view->canvas_height= height; - view->xscale= ((double)width)/((double)view->xkb->geom->width_mm); - view->yscale= ((double)height)/((double)view->xkb->geom->height_mm); - return Success; -} - -Status -XkbUI_GetCanvasSize(XkbUI_ViewPtr view,int *width_rtrn,int *height_rtrn) -{ - if (!view) - return BadValue; - if (width_rtrn) *width_rtrn= view->canvas_width; - if (height_rtrn) *height_rtrn= view->canvas_height; - return Success; -} - -/***====================================================================***/ - -static void -_RotatePoints( double rangle, - int corner_x, - int corner_y, - int nPts, - XkbUI_PointPtr pts) -{ -register int i; -double rr,rx,ry,rt; - - for (i=0;i<nPts;i++,pts++) { - rx= pts->x-corner_x; ry= pts->y-corner_y; /* translate */ - rr= hypot(rx,ry); - rt= atan2(ry,rx)+rangle; - rx= rr*cos(rt); - ry= rr*sin(rt); - pts->x= rx+corner_x; pts->y= ry+corner_y; - } - return; -} - -static void -_DrawPoints(XkbUI_ViewPtr view,int nPts,XkbUI_PointPtr pts,XPoint *xpts) -{ -register int i; - - for (i=0;i<nPts;i++) { - if (pts[i].x>=0.0) xpts[i].x= pts[i].x*view->xscale+0.5; - else xpts[i].x= pts[i].x*view->xscale-0.5; - xpts[i].x+= view->opts.viewport.x; - if (pts[i].y>=0.0) xpts[i].y= pts[i].y*view->yscale+0.5; - else xpts[i].x= pts[i].y*view->yscale-0.5; - xpts[i].y+= view->opts.viewport.y; - } - if ((xpts[nPts-1].x!=xpts[0].x)||(xpts[nPts-1].y!=xpts[0].y)) - xpts[nPts++]= xpts[0]; /* close the shape, if necessary */ - XDrawLines(view->dpy,view->win,view->gc,xpts,nPts,CoordModeOrigin); -XFlush(view->dpy); - return; -} - -static void -_DrawSolidPoints(XkbUI_ViewPtr view,int nPts,XkbUI_PointPtr pts,XPoint *xpts) -{ -register int i; - - for (i=0;i<nPts;i++) { - if (pts[i].x>=0.0) xpts[i].x= pts[i].x*view->xscale+0.5; - else xpts[i].x= pts[i].x*view->xscale-0.5; - xpts[i].x+= view->opts.viewport.x; - if (pts[i].y>=0.0) xpts[i].y= pts[i].y*view->yscale+0.5; - else xpts[i].x= pts[i].y*view->yscale-0.5; - xpts[i].y+= view->opts.viewport.y; - } - if ((xpts[nPts-1].x!=xpts[0].x)||(xpts[nPts-1].y!=xpts[0].y)) - xpts[nPts++]= xpts[0]; /* close the shape, if necessary */ - XFillPolygon(view->dpy,view->win,view->gc,xpts,nPts,Nonconvex, - CoordModeOrigin); -XFlush(view->dpy); - return; -} - -static void -_DrawShape( XkbUI_ViewPtr view, - double rangle, - int xoff, - int yoff, - int rotx, - int roty, - XkbShapePtr shape, - Bool key) -{ -XkbOutlinePtr ol; -register int o; -int maxPts; -XkbUI_PointPtr uipts; -XPoint * xpts; - - for (maxPts=4,o=0,ol=shape->outlines;o<shape->num_outlines;o++,ol++) { - if ((shape->num_outlines>1)&&(ol==shape->approx)) - continue; - if (ol->num_points>maxPts) - maxPts= ol->num_points; - } - uipts= _XkbTypedCalloc(maxPts,XkbUI_PointRec); - xpts= _XkbTypedCalloc(maxPts+1,XPoint); - XSetForeground(view->dpy,view->gc,view->xkb->geom->label_color->pixel); - for (o=0,ol=shape->outlines;o<shape->num_outlines;o++,ol++) { - XkbPointPtr gpts; - register int p; - if ((shape->num_outlines>1)&&(ol==shape->approx)) - continue; - gpts= ol->points; - if (ol->num_points==1) { - uipts[0].x= xoff; uipts[0].y= yoff; - uipts[1].x= xoff+gpts[0].x; uipts[1].y= yoff; - uipts[2].x= xoff+gpts[0].x; uipts[2].y= yoff+gpts[0].y; - uipts[3].x= xoff; uipts[3].y= yoff+gpts[0].y; - p= 4; - } - else if (ol->num_points==2) { - uipts[0].x= xoff+gpts[0].x; uipts[0].y= yoff+gpts[0].y; - uipts[1].x= xoff+gpts[1].x; uipts[1].y= yoff+gpts[0].y; - uipts[2].x= xoff+gpts[1].x; uipts[2].y= yoff+gpts[1].y; - uipts[3].x= xoff+gpts[0].x; uipts[3].y= yoff+gpts[1].y; - p= 4; - } - else { - for (p=0;p<ol->num_points;p++) { - uipts[p].x= xoff+gpts[p].x; - uipts[p].y= yoff+gpts[p].y; - } - p= ol->num_points; - } - if (rangle!=0.0) - _RotatePoints(rangle,rotx,roty,p,uipts); - if (key) { - if (o==0) { - XSetForeground(view->dpy,view->gc, - view->xkb->geom->base_color->pixel); - _DrawSolidPoints(view,p,uipts,xpts); - XSetForeground(view->dpy,view->gc, - view->xkb->geom->label_color->pixel); - } - _DrawPoints(view,p,uipts,xpts); - } - else { - _DrawPoints(view,p,uipts,xpts); - } - } - _XkbFree(uipts); - _XkbFree(xpts); - return; -} - -static void -_DrawRect( XkbUI_ViewPtr view, - double rangle, - int x1, - int y1, - int x2, - int y2, - Bool key) -{ -XkbUI_PointRec uipts[4]; -XPoint xpts[4]; - - XSetForeground(view->dpy,view->gc,view->xkb->geom->label_color->pixel); - uipts[0].x= x1; uipts[0].y= y1; - uipts[1].x= x2; uipts[1].y= y1; - uipts[2].x= x2; uipts[2].y= y2; - uipts[3].x= x1; uipts[3].y= y2; - if (rangle!=0.0) - _RotatePoints(rangle,0,0,4,uipts); - if (key) { - XSetForeground(view->dpy,view->gc,view->xkb->geom->base_color->pixel); - _DrawSolidPoints(view,4,uipts,xpts); - XSetForeground(view->dpy,view->gc,view->xkb->geom->label_color->pixel); - _DrawPoints(view,4,uipts,xpts); - } - else { - _DrawPoints(view,4,uipts,xpts); - } - return; -} - -static void -_DrawDoodad( XkbUI_ViewPtr view, - double rangle, - int xoff, - int yoff, - XkbDoodadPtr doodad) -{ -int x; -int y; -XkbShapePtr shape; -Bool solid; - - x= doodad->any.left+xoff; - y= doodad->any.top+yoff; - shape= NULL; - solid= False; - switch (doodad->any.type) { - case XkbOutlineDoodad: - shape= XkbShapeDoodadShape(view->xkb->geom,(&doodad->shape)); - break; - case XkbSolidDoodad: - shape= XkbShapeDoodadShape(view->xkb->geom,(&doodad->shape)); - solid= True; - break; - case XkbTextDoodad: - break; - case XkbIndicatorDoodad: - shape= XkbIndicatorDoodadShape(view->xkb->geom,&doodad->indicator); - solid= True; - break; - case XkbLogoDoodad: - shape= XkbLogoDoodadShape(view->xkb->geom,&doodad->logo); - solid= True; - break; - } - if (shape) - _DrawShape(view,rangle,x,y,x,y,shape,solid); - return; -} - -static void -_DrawRow( XkbUI_ViewPtr view, - double rangle, - int xoff, - int yoff, - XkbRowPtr row) -{ -register int k,x,y; -XkbKeyPtr key; - - x= xoff+row->left; y= yoff+row->top; - for (k=0,key=row->keys;k<row->num_keys;k++,key++) { - XkbShapePtr shape; - shape= XkbKeyShape(view->xkb->geom,key); - if (row->vertical) { - y+= key->gap; - _DrawShape(view,rangle,x,y,xoff,yoff,shape,True); - y+= shape->bounds.y2; - } - else { - x+= key->gap; - _DrawShape(view,rangle,x,y,xoff,yoff,shape,True); - x+= shape->bounds.x2; - } - } - return; -} - -static void -_DrawSection(XkbUI_ViewPtr view,XkbSectionPtr section) -{ -double rangle; - - rangle= ((((double)(section->angle%3600))/3600.0)*(2.0*M_PI)); - if (section->doodads) { - XkbDrawablePtr first,draw; - first= XkbGetOrderedDrawables(NULL,section); - if (first) { - for (draw=first;draw!=NULL;draw=draw->next) { - _DrawDoodad(view,rangle,section->left,section->top,draw->u.doodad); - } - XkbFreeOrderedDrawables(first); - } - } - if (section->rows) { - register int r; - XkbRowPtr row; - for (r=0,row=section->rows;r<section->num_rows;r++,row++) { - _DrawRow(view,rangle,section->left,section->top,row); - } - } - return; -} - -static void -_DrawAll(XkbUI_ViewPtr view) -{ -XkbGeometryPtr geom; -XkbDrawablePtr first,draw; -Bool dfltBorder; - - geom= view->xkb->geom; - first= XkbGetOrderedDrawables(geom,NULL); - if (first) { - dfltBorder= True; - for (draw=first;draw!=NULL;draw=draw->next) { - char *name; - if ((draw->type!=XkbDW_Doodad)|| - ((draw->u.doodad->any.type!=XkbOutlineDoodad)&& - (draw->u.doodad->any.type!=XkbSolidDoodad))) { - continue; - } - name= XkbAtomGetString(view->dpy,draw->u.doodad->any.name); - if ((name!=NULL)&&(_XkbStrCaseCmp(name,"edges")==0)) { - dfltBorder= False; - break; - } - } - if (dfltBorder) - _DrawRect(view,0.0,0,0,geom->width_mm,geom->height_mm,True); - for (draw=first;draw!=NULL;draw=draw->next) { - switch (draw->type) { - case XkbDW_Section: - _DrawSection(view,draw->u.section); - break; - case XkbDW_Doodad: - _DrawDoodad(view,0.0,0,0,draw->u.doodad); - break; - } - } - XkbFreeOrderedDrawables(first); - } - XFlush(view->dpy); - return; -} - -static void -_RedrawKey(XkbUI_ViewPtr view,KeyCode kc) -{ -/* _DrawAll(view);*/ - return; -} - -/***====================================================================***/ - -Bool -XkbUI_SetKeyAppearance(XkbUI_ViewPtr view,KeyCode kc,unsigned int flags) -{ -XkbDescPtr xkb; -unsigned old; - - if ((!view)||(!view->xkb)) - return False; - xkb= view->xkb; - if ((kc<xkb->min_key_code)||(kc>xkb->max_key_code)) - return False; - old= view->state[kc]; - view->state[kc]= (flags&(~XkbUI_Obscured)); - if (old&XkbUI_Obscured) - view->state[kc]|= XkbUI_Obscured; - else if (old!=view->state[kc]) - _RedrawKey(view,kc); - return True; -} - -Bool -XkbUI_SetKeyAppearanceByName( XkbUI_ViewPtr view, - XkbKeyNamePtr name, - unsigned int flags) -{ -KeyCode kc; - - if ((!view)||(!view->xkb)||(!name)) - return False; - kc= XkbFindKeycodeByName(view->xkb,name->name,True); - if (!kc) - return False; - return XkbUI_SetKeyAppearance(view,kc,flags); -} - -Bool -XkbUI_ResetKeyAppearance( XkbUI_ViewPtr view, - unsigned int mask, - unsigned int values) -{ -register int i; -unsigned new_val; - - if ((!view)||(!view->xkb)) - return False; - if (!mask) - return True; - for (i=view->xkb->min_key_code;i<=view->xkb->max_key_code;i++) { - new_val= (view->state[i]&(~mask)); - new_val|= (mask&values); - XkbUI_SetKeyAppearance(view,i,new_val); - } - return True; -} - -Bool -XkbUI_DrawRegion(XkbUI_ViewPtr view,XRectangle *viewport) -{ - if (!view) - return False; - _DrawAll(view); - return True; -} - -Bool -XkbUI_DrawChanged( XkbUI_ViewPtr view, - XRectangle * viewport, - XkbChangesPtr changes, - int num_keys, - XkbKeyNamePtr keys) -{ - return False; -} - -Bool -XkbUI_Select( XkbUI_ViewPtr view, - XPoint * coord, - unsigned int which, - XkbSectionPtr section) -{ - return False; -} diff --git a/nx-X11/lib/xkbui/XKBui.h b/nx-X11/lib/xkbui/XKBui.h deleted file mode 100644 index 36c66df59..000000000 --- a/nx-X11/lib/xkbui/XKBui.h +++ /dev/null @@ -1,194 +0,0 @@ -#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. - - 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 Silicon Graphics not be - used in advertising or publicity pertaining to distribution - of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability - of this software for any purpose. It is provided "as is" - without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS 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$ */ - -#include <X11/Xlib.h> -#include <X11/XKBlib.h> -#include <X11/extensions/XKBgeom.h> - -typedef struct _XkbUI_View *XkbUI_ViewPtr; - -typedef struct _XkbUI_ViewOpts { - unsigned int present; - unsigned int fg; - unsigned int bg; - unsigned int label_mode; - unsigned int color_mode; - XRectangle viewport; - unsigned int margin_width; - unsigned int margin_height; - Colormap cmap; -} XkbUI_ViewOptsRec,*XkbUI_ViewOptsPtr; - - /* - * legal values for present field of a view options - */ -#define XkbUI_BackgroundMask (1<<0) -#define XkbUI_ForegroundMask (1<<1) -#define XkbUI_LabelModeMask (1<<2) -#define XkbUI_ColorModeMask (1<<3) -#define XkbUI_WidthMask (1<<4) -#define XkbUI_HeightMask (1<<5) -#define XkbUI_XOffsetMask (1<<6) -#define XkbUI_YOffsetMask (1<<7) -#define XkbUI_ColormapMask (1<<8) -#define XkbUI_MarginWidthMask (1<<9) -#define XkbUI_MarginHeightMask (1<<10) - -#define XkbUI_SizeMask (XkbUI_WidthMask|XkbUI_HeightMask) -#define XkbUI_OffsetMask (XkbUI_XOffsetMask|XkbUI_YOffsetMask) -#define XkbUI_MarginMask (XkbUI_MarginWidthMask|XkbUI_MarginHeightMask) -#define XkbUI_AllViewOptsMask (0x7ff) - - /* - * legal values for the label_mode of a view options - */ -#define XkbUI_NoLabels 0 -#define XkbUI_KeyCodes 1 -#define XkbUI_KeyNames 2 -#define XkbUI_StateSyms 3 -#define XkbUI_MultiSyms 4 - -typedef struct _XkbUI_Select { - unsigned type; - XkbSectionPtr section; - XkbKeyPtr key; - XkbDoodadPtr doodad; -} XkbUI_SelectRec,*XkbUI_SelectPtr; - - /* - * legal values for 'type' field of a selection report - */ - -#define XkbUI_Keys 0 -#define XkbUI_Indicators 1 -#define XkbUI_TextLabels 2 -#define XkbUI_SolidShapes 3 -#define XkbUI_Outlines 4 -#define XkbUI_Logos 5 -#define XkbUI_Sections 6 - - /* - * legal values for 'which' field of a select call - */ -#define XkbUI_KeysMask (1<<0) -#define XkbUI_IndicatorsMask (1<<1) -#define XkbUI_TextLabelsMask (1<<2) -#define XkbUI_SolidShapesMask (1<<3) -#define XkbUI_OutlinesMask (1<<4) -#define XkbUI_LogosMask (1<<5) -#define XkbUI_SectionsMask (1<<6) - - /* - * legal values for key appearance flag - */ -#define XkbUI_KeyDown (1<<0) -#define XkbUI_Highlight (1<<1) - -_XFUNCPROTOBEGIN - -extern XkbUI_ViewPtr XkbUI_SimpleInit( - Display * /* dpy */, - Window /* win */, - int /* width */, - int /* height */ -); - -extern XkbUI_ViewPtr XkbUI_Init( - Display * /* dpy */, - Window /* win */, - int /* width */, - int /* height */, - XkbDescPtr /* xkb */, - XkbUI_ViewOptsPtr /* view */ -); - -extern Status XkbUI_SetViewOpts( - XkbUI_ViewPtr /* view */, - XkbUI_ViewOptsPtr /* opts */ -); - -extern Status XbUI_GetViewOpts( - XkbUI_ViewPtr /* view */, - XkbUI_ViewOptsPtr /* opts_rtrn */ -); - -extern Status XkbUI_SetCanvasSize( - XkbUI_ViewPtr /* view */, - int /* width */, - int /* height */ -); - -extern Status XkbUI_GetCanvasSize( - XkbUI_ViewPtr /* view */, - int * /* width_rtrn */, - int * /* height_rtrn */ -); - -extern Bool XkbUI_SetKeyAppearance( - XkbUI_ViewPtr /* view */, - KeyCode /* kc */, - unsigned /* flags */ -); - -extern Bool XkbUI_SetKeyAppearanceByName( - XkbUI_ViewPtr /* view */, - XkbKeyNamePtr /* name */, - unsigned /* flags */ -); - -extern Bool XkbUI_ResetKeyAppearance( - XkbUI_ViewPtr /* view */, - unsigned int /* mask */, - unsigned int /* values */ -); - -extern Bool XkbUI_DrawRegion( - XkbUI_ViewPtr /* view */, - XRectangle * /* viewport */ -); - -extern Bool XkbUI_DrawChanged( - XkbUI_ViewPtr /* view */, - XRectangle * /* viewport */, - XkbChangesPtr /* changes */, - int /* num_keys */, - XkbKeyNamePtr /* keys */ -); - -extern Bool XkbUI_Select( - XkbUI_ViewPtr /* view */, - XPoint * /* coord */, - unsigned int /* which */, - XkbSectionPtr /* section */ -); - -_XFUNCPROTOEND - -#endif /* XKBUI_H */ diff --git a/nx-X11/lib/xkbui/XKBuiPriv.h b/nx-X11/lib/xkbui/XKBuiPriv.h deleted file mode 100644 index c78b08e5c..000000000 --- a/nx-X11/lib/xkbui/XKBuiPriv.h +++ /dev/null @@ -1,71 +0,0 @@ -#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. - - 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 Silicon Graphics not be - used in advertising or publicity pertaining to distribution - of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability - of this software for any purpose. It is provided "as is" - without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS 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 "XKBui.h" - -typedef struct _XkbUI_Point { - double x; - double y; -} XkbUI_PointRec,*XkbUI_PointPtr; - -typedef struct _XkbUI_View { - Display * dpy; - XkbDescPtr xkb; - Window win; - GC gc; - XkbUI_ViewOptsRec opts; - unsigned int canvas_width; - unsigned int canvas_height; - unsigned char state[XkbMaxLegalKeyCode]; - - double xscale; - double yscale; -} XkbUI_ViewRec; - -#define _XkbAlloc(s) malloc((s)) -#define _XkbCalloc(n,s) calloc((n),(s)) -#define _XkbRealloc(o,s) realloc((o),(s)) -#define _XkbTypedAlloc(t) ((t *)malloc(sizeof(t))) -#define _XkbTypedCalloc(n,t) ((t *)calloc((n),sizeof(t))) -#define _XkbTypedRealloc(o,n,t) \ - ((o)?(t *)realloc((o),(n)*sizeof(t)):_XkbTypedCalloc(n,t)) -#define _XkbClearElems(a,f,l,t) bzero(&(a)[f],((l)-(f)+1)*sizeof(t)) -#define _XkbFree(p) free(p) - - /* - * private values for key appearance flags - * must not conflict with values from XKBui.h - */ -#define XkbUI_Obscured (1<<7) - -_XFUNCPROTOBEGIN - -_XFUNCPROTOEND - -#endif /* XKBUIPRIV_H */ diff --git a/nx-X11/lib/xkbui/xkbui-def.cpp b/nx-X11/lib/xkbui/xkbui-def.cpp deleted file mode 100644 index 4facda60e..000000000 --- a/nx-X11/lib/xkbui/xkbui-def.cpp +++ /dev/null @@ -1,16 +0,0 @@ -LIBRARY xkbui -VERSION LIBRARY_VERSION -EXPORTS - XbUI_GetViewOpts - XkbUI_DrawChanged - XkbUI_DrawRegion - XkbUI_GetCanvasSize - XkbUI_Init - XkbUI_ResetKeyAppearance - XkbUI_Select - XkbUI_SetCanvasSize - XkbUI_SetKeyAppearance - XkbUI_SetKeyAppearanceByName - XkbUI_SetViewOpts - XkbUI_SimpleInit -/* $XFree86$ */ diff --git a/nx-X11/programs/Xserver/GL/Imakefile b/nx-X11/programs/Xserver/GL/Imakefile index 47134e0a1..c681d23e0 100644 --- a/nx-X11/programs/Xserver/GL/Imakefile +++ b/nx-X11/programs/Xserver/GL/Imakefile @@ -5,24 +5,9 @@ XCOMM $XFree86: xc/programs/Xserver/GL/Imakefile,v 1.12 2003/08/06 14:04:01 eich #define IHaveSubdirs -#if GlxUseSGISI - CORE_SUBDIR = /* opengl */ -#elif defined(DarwinArchitecture) && DarwinQuartzSupport - CORE_SUBDIR = apple mesa -#elif defined(cygwinArchitecture) && GlxUseWindows - CORE_SUBDIR = windows mesa -#elif defined(Win32Architecture) && GlxUseWindows - CORE_SUBDIR = windows -#else CORE_SUBDIR = mesa -#endif - -#if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \ - || (defined(XorgServer) && XorgServer)) -DRI_SUBDIR = dri -#endif -SUBDIRS = glx $(DRI_SUBDIR) $(CORE_SUBDIR) +SUBDIRS = glx $(CORE_SUBDIR) #if DoLoadableServer MSRCS = glxmodule.c @@ -39,7 +24,7 @@ OBJS = glx/?*.o $(MOBJS) DONES = glx/DONE -INCLUDES = -Iinclude -Idri -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \ +INCLUDES = -Iinclude -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \ -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(XF86OSSRC) DEPEND_DEFINES = $(EXT_DEFINES) DependDefines DEFINES = $(GLX_DEFINES) diff --git a/nx-X11/programs/Xserver/GL/glx/module/Imakefile b/nx-X11/programs/Xserver/GL/glx/module/Imakefile deleted file mode 100644 index d063bc28d..000000000 --- a/nx-X11/programs/Xserver/GL/glx/module/Imakefile +++ /dev/null @@ -1,4 +0,0 @@ -#define IHaveModules -#define LinkDirectory .. - -#include "../Imakefile" diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile index 154a5c1a0..e3e91cdb5 100644 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.3 2002/05/31 18:12:36 dawes Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -24,17 +19,17 @@ SUBDIRS = module #define MesaSlangBuildDir ../shader/slang/ #define MesaXBuildDir ../X/ -#include "../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#include "../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#include "../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#include "../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#include "../../../../../lib/GL/mesa/main/Imakefile.inc" -#include "../../../../../lib/GL/mesa/math/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/slang/Imakefile.inc" -#include "../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#include "../../../../../lib/GL/mesa/Imakefile.inc" +#include "../array_cache/Imakefile.inc" +#include "../swrast/Imakefile.inc" +#include "../swrast_setup/Imakefile.inc" +#include "../tnl/Imakefile.inc" +#include "../main/Imakefile.inc" +#include "../math/Imakefile.inc" +#include "../shader/Imakefile.inc" +#include "../shader/grammar/Imakefile.inc" +#include "../shader/slang/Imakefile.inc" +#include "../X/Imakefile.inc" +#include "../Imakefile.inc" #ifdef IHaveModules MSRCS = GLcoremodule.c @@ -51,7 +46,7 @@ SUBDIRS = module ../shader/slang/DONE INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ + -I$(MESASRCDIR)/include \ -I$(MESASRCDIR)/src/mesa \ -I$(SERVERSRC)/include @@ -74,4 +69,3 @@ InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile deleted file mode 100644 index 18dcdf0a1..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile +++ /dev/null @@ -1,53 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.2 2002/02/25 18:00:38 dawes Exp $ - -#define IHaveModules -#include <Server.tmpl> - -#define NeedAllMesaSrc -#define MesaInXServer -#define MesaBuildDir ../../main/module/ -#define MesaACBuildDir ../../array_cache/module/ -#define MesaMathBuildDir ../../math/module/ -#define MesaSwrastBuildDir ../../swrast/module/ -#define MesaSwrastSetupBuildDir ../../swrast_setup/module/ -#define MesaTnlBuildDir ../../tnl/module/ -#define MesaXBuildDir ../../X/module/ - -#include "../../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/math/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/Imakefile.inc" - -#if DoLoadableServer - MSRCS = GLcoremodule.c - MOBJS = GLcoremodule.o -#endif - - XOBJS = ../../X/module/?*.o - - OBJS = $(COREMESAOBJS) $(MOBJS) - - DONES = ../../module/DONE ../../X/module/DONE \ - ../../array_cache/module/DONE ../../math/module/DONE \ - ../../swrast/module/DONE \ - ../../swrast_setup/module/DONE ../../tnl/module/DONE - - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src/mesa \ - -I$(SERVERSRC)/include - - DEFINES = $(GLX_DEFINES) - -ModuleObjectRule() - -DepLibraryModuleTarget(GLcore, $(DONES) $(OBJS),$(OBJS) $(XOBJS)) -InstallLibraryModule(GLcore,$(MODULEDIR),extensions) - -InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) - -LinkSourceFile(GLcoremodule.c,..) - diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile b/nx-X11/programs/Xserver/GL/mesa/Imakefile index ea7d18aa2..41acce9f4 100644 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile @@ -1,17 +1,11 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:56:00 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) - MODSUBDIR = module -#endif #endif -#if !defined(IHaveModules) || !BuildModuleInSubdir #define IHaveSubdirs SUBDIRS = main math array_cache swrast swrast_setup tnl shader X GLcore $(MODSUBDIR) -#endif #include <Server.tmpl> @@ -19,11 +13,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:5 #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../lib/GL/mesa/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/Imakefile.inc" -#endif +#include "Imakefile.inc" INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ @@ -44,4 +34,3 @@ DependSubdirs($(SUBDIRS)) #endif DependTarget() - diff --git a/nx-X11/lib/GL/mesa/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc index 03a7971f8..99e9c71c2 100644 --- a/nx-X11/lib/GL/mesa/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ -#ifndef MesaBuildDir -#define MesaBuildDir $(GLXLIBSRC)/mesa/ -#endif - MESABUILDDIR = MesaBuildDir COREMESASRCS = $(COREMESABASESRCS) \ diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile index f0e722f00..ee728b556 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.16 2002/11/22 22:56:01 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -15,11 +10,7 @@ SUBDIRS = module #define NeedToLinkMesaSrc #define MesaXBuildDir /**/ #define MesaInXServer -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#endif +#include "Imakefile.inc" LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11) @@ -30,13 +21,6 @@ LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11) COMMON_SRCS = driverfuncs.c COMMON_OBJS = driverfuncs.o -#ifndef XFree86Version - -/* This appears to be the quickest way to build a non-XFree86 server */ -GLXSRV_DEFINES = -DXFree86Server - -#endif - GLX_SRCS = xf86glx.c xf86glx_util.c compsize.c GLX_OBJS = xf86glx.o xf86glx_util.o compsize.o @@ -67,7 +51,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc index d62800e7d..8e589c69a 100644 --- a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.3tsi Exp $ -#ifndef MesaXBuildDir -#define MesaXBuildDir $(GLXLIBSRC)/src/mesa/drivers/x11/ -#endif - MESAXBUILDDIR = MesaXBuildDir #ifndef MesaInXServer diff --git a/nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile deleted file mode 100644 index eee4c7556..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/module/Imakefile,v 1.1 2002/05/31 18:12:38 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile index 8126c3f30..188972b3b 100644 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -14,11 +9,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaACBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_AC_SRCS) OBJS = $(MESA_AC_OBJS) @@ -44,7 +35,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/lib/GL/mesa/array_cache/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc index 9a5044791..3964bdc48 100644 --- a/nx-X11/lib/GL/mesa/array_cache/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaACBuildDir -#define MesaACBuildDir $(GLXLIBSRC)/mesa/array_cache/ -#endif - MESAACBUILDDIR = MesaACBuildDir MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/array_cache/module/Imakefile deleted file mode 100644 index 86c585012..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/module/Imakefile,v 1.1 2002/05/31 18:12:39 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile index 6287b92de..2dd59ea8f 100644 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile @@ -2,12 +2,7 @@ XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/main/Imakefile,v 1.2 2004/08/19 07:3 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif /* Large PIC tables needed for Solaris/SPARC builds */ @@ -20,11 +15,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/main/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/main/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(COREMESABASESRCS) OBJS = $(COREMESABASEOBJS) @@ -49,7 +40,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/lib/GL/mesa/main/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc index 80b3aef07..8927152aa 100644 --- a/nx-X11/lib/GL/mesa/main/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc @@ -3,10 +3,6 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ /* gcc on ppc64 defines this, causes macro recursion with pixel below */ #undef pixel -#ifndef MesaBuildDir -#define MesaBuildDir $(GLXLIBSRC)/mesa/main/ -#endif - MESABUILDDIR = MesaBuildDir #ifdef NeedAllMesaSrc diff --git a/nx-X11/programs/Xserver/GL/mesa/main/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/main/module/Imakefile deleted file mode 100644 index e21afd5e5..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/main/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/module/Imakefile,v 1.1 2002/05/31 18:12:40 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile index 49720974c..df30ab909 100644 --- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -14,11 +9,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaMathBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/math/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/math/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_MATH_SRCS) OBJS = $(MESA_MATH_OBJS) @@ -43,7 +34,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/lib/GL/mesa/math/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc index cd1dcc427..7356a4617 100644 --- a/nx-X11/lib/GL/mesa/math/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaMathBuildDir -#define MesaMathBuildDir $(GLXLIBSRC)/mesa/math/ -#endif - MESAMATHBUILDDIR = MesaMathBuildDir MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/math/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/module/Imakefile deleted file mode 100644 index e21afd5e5..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/math/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/module/Imakefile,v 1.1 2002/05/31 18:12:40 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile index 7b14ab7b9..b52d193d3 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile @@ -1,27 +1,16 @@ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif -#if !defined(IHaveModules) || !BuildModuleInSubdir #define IHaveSubdirs SUBDIRS = grammar slang -#endif #include <Server.tmpl> #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaShaderBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/shader/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/shader/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_SHADER_SRCS) OBJS = $(MESA_SHADER_OBJS) @@ -48,7 +37,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc index 7d0032e56..383bdc008 100644 --- a/nx-X11/lib/GL/mesa/shader/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86:$ -#ifndef MesaShaderBuildDir -#define MesaShaderBuildDir $(GLXLIBSRC)/mesa/shader/ -#endif - MESASHADERBUILDDIR = MesaShaderBuildDir MESA_SHADER_SRCS = $(MESASHADERBUILDDIR)arbprogparse.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile index c16b3ddad..56cfb4bc9 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile @@ -1,10 +1,5 @@ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -12,11 +7,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaGrammarBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc" -#else -#include "../../../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_GRAMMAR_SRCS) OBJS = $(MESA_GRAMMAR_OBJS) @@ -42,7 +33,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc index b2e885f89..e1196201d 100644 --- a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86$ -#ifndef MesaGrammarBuildDir -#define MesaGrammarBuildDir $(GLXLIBSRC)/mesa/shader/grammar/ -#endif - MESAGRAMMARBUILDDIR=MesaGrammarBuildDir MESA_GRAMMAR_SRCS = $(MESAGRAMMARBUILDDIR)grammar_mesa.c diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile index 0bee2b774..572000f26 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile @@ -1,27 +1,16 @@ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif -#if !defined(IHaveModules) || !BuildModuleInSubdir #define IHaveSubdirs SUBDIRS = library -#endif #include <Server.tmpl> #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaSlangBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../../lib/GL/mesa/shader/slang/Imakefile.inc" -#else -#include "../../../../../../../lib/GL/mesa/shader/slang/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_SLANG_SRCS) OBJS = $(MESA_SLANG_OBJS) @@ -47,7 +36,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc index d824ca797..4358b8975 100644 --- a/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86$ -#ifndef MesaSlangBuildDir -#define MesaSlangBuildDir $(GLXLIBSRC)/mesa/shader/slang/ -#endif - MESASLANGBUILDDIR=MesaSlangBuildDir MESA_SLANG_SRCS = $(MESASLANGBUILDDIR)slang_assemble_assignment.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile index e332121c9..d6de08e1b 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile @@ -1,10 +1,5 @@ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -12,11 +7,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaLibraryBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../../../lib/GL/mesa/shader/slang/library/Imakefile.inc" -#else -#include "../../../../../../../../lib/GL/mesa/shader/slang/library/Imakefile.inc" -#endif +#include "Imakefile.inc" INCLUDES = -I$(MESASRCDIR)/src/mesa \ -I$(MESASRCDIR)/src/mesa/shader \ diff --git a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc index 3489b7a28..3489b7a28 100644 --- a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile index 817fead69..c4c55a86f 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif /* Large PIC tables needed for Solaris/SPARC builds */ @@ -19,11 +14,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaSwrastBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_SWRAST_SRCS) @@ -51,7 +42,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() @@ -60,4 +50,3 @@ DependTarget() MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif - diff --git a/nx-X11/lib/GL/mesa/swrast/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc index 683b8f0a7..c57416d85 100644 --- a/nx-X11/lib/GL/mesa/swrast/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaSwrastBuildDir -#define MesaSwrastBuildDir $(GLXLIBSRC)/mesa/swrast/ -#endif - MESASWRASTBUILDDIR = MesaSwrastBuildDir MESA_SWRAST_SRCS = $(MESASWRASTBUILDDIR)s_aaline.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast/module/Imakefile deleted file mode 100644 index 7d9974ed0..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/module/Imakefile,v 1.1 2002/05/31 18:12:40 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile index b530457e9..52be70141 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -14,11 +9,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaSwrastSetupBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_SWR_SETUP_SRCS) OBJS = $(MESA_SWR_SETUP_OBJS) @@ -43,7 +34,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() @@ -52,4 +42,3 @@ DependTarget() MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif - diff --git a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc index 8d32aedb3..4fb10763a 100644 --- a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaSwrastSetupBuildDir -#define MesaSwrastSetupBuildDir $(GLXLIBSRC)/mesa/swrast_setup/ -#endif - MESASWRSETUPDIR = MesaSwrastSetupBuildDir MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/module/Imakefile deleted file mode 100644 index 5221debc0..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/module/Imakefile,v 1.1 2002/05/31 18:12:41 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile index c52696e4f..3f1c4bbc5 100644 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile @@ -2,12 +2,7 @@ XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/tnl/Imakefile,v 1.2 2004/08/19 07:34 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/22 22:56:02 tsi Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif /* Large PIC tables needed for Solaris/SPARC builds */ @@ -21,11 +16,7 @@ SUBDIRS = module #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaTnlBuildDir /**/ -#if !defined(IHaveModules) || !BuildModuleInSubdir -#include "../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#else -#include "../../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#endif +#include "Imakefile.inc" SRCS = $(MESA_TNL_SRCS) @@ -54,7 +45,6 @@ NormalLibraryObjectRule() SubdirLibraryRule($(OBJS)) -LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() diff --git a/nx-X11/lib/GL/mesa/tnl/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc index a294a6fbf..3a124c195 100644 --- a/nx-X11/lib/GL/mesa/tnl/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaTnlBuildDir -#define MesaTnlBuildDir $(GLXLIBSRC)/mesa/tnl/ -#endif - MESATNLBUILDDIR = MesaTnlBuildDir MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/module/Imakefile deleted file mode 100644 index 5d2a4489d..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/module/Imakefile +++ /dev/null @@ -1,6 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/module/Imakefile,v 1.1 2002/05/31 18:12:42 dawes Exp $ - -#define IHaveModules - -#include "../Imakefile" - diff --git a/nx-X11/programs/Xserver/GL/opengl/Imakefile b/nx-X11/programs/Xserver/GL/opengl/Imakefile deleted file mode 100644 index 420405d9c..000000000 --- a/nx-X11/programs/Xserver/GL/opengl/Imakefile +++ /dev/null @@ -1,140 +0,0 @@ -XCOMM $XFree86$ - -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., -XCOMM attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 -XCOMM or at http://www.sgi.com/software/opensource/glx/license.html. -XCOMM -XCOMM Software distributed under the License is distributed on an "AS IS" -XCOMM basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY -XCOMM IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR -XCOMM PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific -XCOMM language governing rights and limitations under the License. -XCOMM -XCOMM The Original Software is GLX version 1.2 source code, released February, -XCOMM 1999. The developer of the Original Software is Silicon Graphics, Inc. -XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc. -XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. - -#include <Library.tmpl> - -OBJS = \ - ddxci.o \ - ddxcx.o \ - ddxrgb.o \ - ddxscreens.o \ - dl_block.o \ - dl_heap.o \ - dl_init.o \ - dl_list.o \ - dl_mopt.o \ - dl_opt.o \ - dl_pplst.o \ - dl_splc.o \ - dl_splst.o \ - dl_table.o \ - g_api.o \ - g_disp.o \ - g_lcmpex.o \ - g_lcomp.o \ - g_lexec.o \ - g_ltab.o \ - g_noptab.o \ - g_splcmp.o \ - px_api.o \ - px_mod.o \ - px_pack.o \ - px_paths.o \ - px_read.o \ - px_rend.o \ - px_upack.o \ - s_accum.o \ - s_atest.o \ - s_attrib.o \ - s_bitmap.o \ - s_blend.o \ - s_btdraw.o \ - s_buffer.o \ - s_capi.o \ - s_ci.o \ - s_clear.o \ - s_clip.o \ - s_contxt.o \ - s_cpydsp.o \ - s_ctable.o \ - s_depth.o \ - s_dlist.o \ - s_eval.o \ - s_export.o \ - s_feed.o \ - s_finish.o \ - s_fog.o \ - s_get.o \ - s_global.o \ - s_image.o \ - s_lcache.o \ - s_lcomp.o \ - s_light.o \ - s_lnclip.o \ - s_lndraw.o \ - s_lnfast.o \ - s_lnfin.o \ - s_lnspan.o \ - s_math.o \ - s_memmgr.o \ - s_names.o \ - s_napi.o \ - s_pgaa.o \ - s_pgclip.o \ - s_pgdraw.o \ - s_pgfin.o \ - s_pgmode.o \ - s_pgspan.o \ - s_pick.o \ - s_prim.o \ - s_ptaa.o \ - s_ptdraw.o \ - s_ptfin.o \ - s_rapi.o \ - s_rect.o \ - s_rgb.o \ - s_rpos.o \ - s_select.o \ - s_size.o \ - s_span.o \ - s_sten.o \ - s_store.o \ - s_tapi.o \ - s_tex.o \ - s_texel.o \ - s_texmgr.o \ - s_trap.o \ - s_vapi.o \ - s_varray.o \ - s_vertex.o \ - s_xform.o \ - s_zfuncs.o \ - vc_cache.o \ - vc_line.o \ - vc_point.o \ - 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) - -DEFINES = \ - -D_LANGUAGE_C \ - -Dunix - -NormalLibraryTarget(GL, $(OBJS)) -NormalLibraryObjectRule() - -DependTarget() diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 9f730cb97..43d49d085 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -34,7 +34,7 @@ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey #define dependLib(x) #endif -#if (defined (XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) /* Do not strip server binaries */ INSTPGMFLAGS = #endif @@ -71,39 +71,15 @@ INSTPGMFLAGS = #define AllFBLibs PreFbLibs $(FB) $(CFB) PostFbLibs #if BuildGlxExt -# if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \ - || (defined(XorgServer) && XorgServer)) - DRILIB = GL/dri/ModuleLibraryTargetName(dri) -# else - DRILIB = -# endif -# if GlxUseSGISI +# if DoLoadableServer GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/sgi-si/ModuleLibraryTargetName(GLcore) \ - $(DRILIB) + GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) # else -# if defined(GlxUseWindows) && GlxUseWindows - XWin_GL.exe.GLXLIB = GL/glx/ModuleLibraryTargetName(glx_stdcall) \ - GL/windows/ModuleLibraryTargetName(GLcore) -# endif /* GlxUseWindows */ -# if defined(Win32Architecture) && defined(GlxUseWindows) && GlxUseWindows - GLXLIB = GL/glx/ModuleLibraryTargetName(glx_stdcall) \ - GL/windows/ModuleLibraryTargetName(GLcore) -# elif DoLoadableServer GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) -# else - GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) \ - $(DRILIB) -# endif # endif GLXDIR = GL -# if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows - GLXEXT = $(if $($@.GLXLIB),$($@.GLXLIB), $(GLXLIB)) -# else GLXEXT = $(GLXLIB) -# endif #endif #if BuildXInputExt @@ -113,7 +89,7 @@ INSTPGMFLAGS = #if BuildXKB XKBEXT = xkb/LibraryTargetName(xkb) dependLib($(OS)) XKBDIR = xkb -#if (defined(XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o #endif #endif @@ -526,11 +502,7 @@ XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config) XWINPARSERDIR = XWINPARSERLIB = #endif -#if defined(GlxUseWindows) && GlxUseWindows -XWINOPENGLLIB = -lopengl32 -#else XWINOPENGLLIB = -#endif NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(NXWin) NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \ @@ -545,10 +517,7 @@ PTHREADLIB = -lpthreadGC # endif #endif #if defined(Win32Architecture) -# if defined(GlxUseWindows) && GlxUseWindows -XWINGL32 = -lopengl32 -# endif -XWINW32 = -lgdi32 -lwsock32 $(XWINGL32) $(PTHREADLIB) +XWINW32 = -lgdi32 -lwsock32 $(PTHREADLIB) #else XWINW32 = -lgdi32 #endif @@ -577,18 +546,11 @@ $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDI #ifdef mingwArchitecture NXWINSERVERNAME=NXming -NXWINGLSERVERNAME=NXmingGL #else NXWINSERVERNAME=NXWin -NXWINGLSERVERNAME=NXWin_GL #endif ServerTarget($(NXWINSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \ $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)) -#if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows -ServerTarget($(NXWINGLSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \ - $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)\ - $(XWINOPENGLLIB)) -#endif #ifndef ServerToInstall # define ServerToInstall $(NXWINSERVERNAME) diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index f44edb172..eb4588e37 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -55,15 +55,13 @@ SUBDIRS = extmod #endif #if BuildXF86VidModeExt && \ - ((defined(XF86Server) && XF86Server) || \ - (defined(XorgServer) && XorgServer)) + (defined(XorgServer) && XorgServer) VIDMODESRCS = xf86vmode.c VIDMODEOBJS = xf86vmode.o #endif #if BuildXF86MiscExt && \ - ((defined(XF86Server) && XF86Server) || \ - (defined(XorgServer) && XorgServer)) + (defined(XorgServer) && XorgServer) XF86MISCSRCS = xf86misc.c XF86MISCOBJS = xf86misc.o #endif @@ -157,7 +155,7 @@ NX_DEFINES = -DNXAGENT_SERVER #endif -#if (defined(XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) /* XXX Check if this can be eliminated */ XF86INCLUDES = -I$(XF86COMSRC) #endif diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 index 198632312..f92393893 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1 @@ -23,7 +23,7 @@ NoMachine's \fBnxclient\fR or the community projects \fBqtnx\fR and \fBremmina\f .SH OPTIONS .TP -.B \--help +.B \-help Lists all others options that are not listed here. .SH FURTHER READINGS diff --git a/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 b/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 index b9e8ddab5..a78855584 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 +++ b/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1 @@ -23,7 +23,7 @@ Python X2Go API). .SH OPTIONS .TP -.B \--help +.B \-help Lists all others options that are not listed here. .SH FURTHER READINGS diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 210067635..d68ef940c 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 HEADERS = os.h misc.h -#if defined(XorgVersion) || defined(XFree86Version) \ +#if defined(XorgVersion) \ || defined(BSDOSArchitecture) #if DoLoadableServer LinkSourceFile(xf86Module.h,$(XF86COMSRC)) diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile index 24caa0299..e62fb0005 100644 --- a/nx-X11/programs/Xserver/mi/Imakefile +++ b/nx-X11/programs/Xserver/mi/Imakefile @@ -62,7 +62,7 @@ OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \ mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \ micmap.o mioverlay.o -#if (defined (XFree86Version) || defined(XorgVersion)) +#if defined(XorgVersion) /* * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o * used by Xnest, Xvfb diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile index a718545b1..2ac6fe32d 100644 --- a/nx-X11/programs/Xserver/xkb/Imakefile +++ b/nx-X11/programs/Xserver/xkb/Imakefile @@ -29,7 +29,7 @@ XKB_DDXDEFS = XkbServerDefines NX_DEFINES = -DNXAGENT_SERVER #endif -#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer) +#if (defined(XorgServer) && XorgServer) XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o #endif @@ -62,7 +62,7 @@ NormalLibraryTarget(xkb,$(OBJS)) LintLibraryTarget(xkb,$(SRCS)) NormalLintTarget($(SRCS)) -#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer) +#if (defined(XorgServer) && XorgServer) ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS) ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS) diff --git a/nxcomp/Loop.cpp b/nxcomp/Loop.cpp index f25aed353..7d17c19c8 100644 --- a/nxcomp/Loop.cpp +++ b/nxcomp/Loop.cpp @@ -8100,16 +8100,52 @@ int ReadRemoteData(int fd, char *buffer, int size, char stop) int WriteLocalData(int fd, const char *buffer, int size) { int position = 0; + int ret = 0; + fd_set writeSet; + struct timeval selectTs = {30, 0}; while (position < size) { + + // A write to a non-blocking socket may fail with EAGAIN. The problem is + // that cache data is done in several writes, and there's no easy way + // to handle failure without rewriting a significant amount of code. + // + // Bailing out of the outer loop would result in restarting the sending + // of the entire cache list, which would confuse the other side. + + FD_ZERO(&writeSet); + FD_SET(fd, &writeSet); + + ret = select(fd+1, NULL, &writeSet, NULL, &selectTs); + + #ifdef DEBUG + *logofs << "Loop: WriteLocalData: select() returned with a code of " << ret << " and remaining timeout of " + << selectTs.tv_sec << " sec, " << selectTs.tv_usec << "usec\n" << logofs_flush; + #endif + + if ( ret < 0 ) + { + *logofs << "Loop: Error in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush; + + if ( EGET() == EINTR ) + continue; + + return -1; + } + else if ( ret == 0 ) + { + *logofs << "Loop: Timeout expired in select() when writing data to FD#" << fd << ": " << strerror(EGET()) << "\n" << logofs_flush; + return -1; + } + int result = write(fd, buffer + position, size - position); getNewTimestamp(); if (result <= 0) { - if (result < 0 && EGET() == EINTR) + if (result < 0 && (EGET() == EINTR || EGET() == EAGAIN || EGET() == EWOULDBLOCK)) { continue; } diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1 index 0432380f8..d389d1068 100644 --- a/nxproxy/man/nxproxy.1 +++ b/nxproxy/man/nxproxy.1 @@ -20,7 +20,7 @@ the NX compression libraries. \fBnxproxy\fR is a backend application utilized by the X2GoClient GUI and some other NX/X2Go clients. .PP .SH OPTIONS -For an insight in \fBnxproxy\fR options use \fBnxproxy \-\-help\fR on the command line. +For an insight in \fBnxproxy\fR options use \fBnxproxy \-help\fR on the command line. .PP .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel@das\-netzwerkteam.de> for the X2Go project |