small changes based on shaver's (partial) review

git-svn-id: svn://10.0.0.236/branches/XPCDOM_20010329_BRANCH@94219 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/LEGAL

@@ -0,0 +1,43 @@
+Please be apprised of the following Legal Notices:
+
+A) The U.S. District Court for the Eastern District of Virginia has
+ruled that the Netscape Navigator code does not infringe Wang's U.S.
+Patent No. 4,751,669 ("the '669 Patent") because: 1) HTML is not
+Videotex as defined by the '669 patent; 2) web servers are not central
+suppliers; and 3) Navigator does not "connect," as defined by the '669
+Patent, to web servers on the Internet. Wang may appeal this decision to
+the Federal Circuit. Wang contended that its Patent disclosing a
+"Videotext" system, is infringed by the following functionality in the
+Netscape Navigator code: 1) the animated logo and status line indicators
+--See Claims 1,8 and 9; 2)  the "File Save As" function --See Claims
+23-27; 3) Bookmarks and Rename Bookmarks in the Properties window --See
+Claims 20-22; 4) storing HTML, GIF, and JPEG files and adding filename
+extensions --See Claim 38
+
+B)   Intermind owns pending U.S. patent applications on communications
+systems which employ metadata ("channel objects") to define a control
+structure for information transfer.  The Netscape code does not infringe
+as released; however, modifications which utilize channel objects as
+described by Intermind should be considered carefully. The following is
+a statement from Intermind:  "Intermind's claims fundamentally involve
+the use of a control structure to automate communications. ...The
+essence of Intermind's top claim is that two devices sender and
+receiver have persistent storage, communicate over a network,
+and exchange a control structure including metadata which describes: 1)
+what information is to be updated, 2) when to update this information,
+and 3) how to transfer the updated information. In addition, at  least
+the receiving device must be able to process the metadata in order to
+perform the update determination and transfer. Any digital
+communications system which incorporates all of these elements will be
+covered by Intermind's patents."  See Intermind.com.
+
+C) Stac, Inc., and its licensing agent Hi/fn, own several patents which
+disclose data compression methods implementing an LZS compression
+algorithm, including U.S. Patent Nos.  4,701,745 and 5,016, 009 ("the
+Stac Patents").  The Netscape Communicator code  does not perform
+compression. If you modify the Netscape source code to perform
+compression, please take notice of the Stac Patents.
+
+D) Netscape Communications Corporation ("Netscape") does not guarantee
+that any source code or executable code available from the mozilla.org
+domain is Year 2000 compliant.

mozilla/LICENSE

@@ -0,0 +1,567 @@
+                          MOZILLA PUBLIC LICENSE
+                                Version 1.1
+
+                              ---------------
+
+1. Definitions.
+
+     1.0.1. "Commercial Use" means distribution or otherwise making the
+     Covered Code available to a third party.
+
+     1.1. "Contributor" means each entity that creates or contributes to
+     the creation of Modifications.
+
+     1.2. "Contributor Version" means the combination of the Original
+     Code, prior Modifications used by a Contributor, and the Modifications
+     made by that particular Contributor.
+
+     1.3. "Covered Code" means the Original Code or Modifications or the
+     combination of the Original Code and Modifications, in each case
+     including portions thereof.
+
+     1.4. "Electronic Distribution Mechanism" means a mechanism generally
+     accepted in the software development community for the electronic
+     transfer of data.
+
+     1.5. "Executable" means Covered Code in any form other than Source
+     Code.
+
+     1.6. "Initial Developer" means the individual or entity identified
+     as the Initial Developer in the Source Code notice required by Exhibit
+     A.
+
+     1.7. "Larger Work" means a work which combines Covered Code or
+     portions thereof with code not governed by the terms of this License.
+
+     1.8. "License" means this document.
+
+     1.8.1. "Licensable" means having the right to grant, to the maximum
+     extent possible, whether at the time of the initial grant or
+     subsequently acquired, any and all of the rights conveyed herein.
+
+     1.9. "Modifications" means any addition to or deletion from the
+     substance or structure of either the Original Code or any previous
+     Modifications. When Covered Code is released as a series of files, a
+     Modification is:
+          A. Any addition to or deletion from the contents of a file
+          containing Original Code or previous Modifications.
+
+          B. Any new file that contains any part of the Original Code or
+          previous Modifications.
+
+     1.10. "Original Code" means Source Code of computer software code
+     which is described in the Source Code notice required by Exhibit A as
+     Original Code, and which, at the time of its release under this
+     License is not already Covered Code governed by this License.
+
+     1.10.1. "Patent Claims" means any patent claim(s), now owned or
+     hereafter acquired, including without limitation,  method, process,
+     and apparatus claims, in any patent Licensable by grantor.
+
+     1.11. "Source Code" means the preferred form of the Covered Code for
+     making modifications to it, including all modules it contains, plus
+     any associated interface definition files, scripts used to control
+     compilation and installation of an Executable, or source code
+     differential comparisons against either the Original Code or another
+     well known, available Covered Code of the Contributor's choice. The
+     Source Code can be in a compressed or archival form, provided the
+     appropriate decompression or de-archiving software is widely available
+     for no charge.
+
+     1.12. "You" (or "Your")  means an individual or a legal entity
+     exercising rights under, and complying with all of the terms of, this
+     License or a future version of this License issued under Section 6.1.
+     For legal entities, "You" includes any entity which controls, is
+     controlled by, or is under common control with You. For purposes of
+     this definition, "control" means (a) the power, direct or indirect,
+     to cause the direction or management of such entity, whether by
+     contract or otherwise, or (b) ownership of more than fifty percent
+     (50%) of the outstanding shares or beneficial ownership of such
+     entity.
+
+2. Source Code License.
+
+     2.1. The Initial Developer Grant.
+     The Initial Developer hereby grants You a world-wide, royalty-free,
+     non-exclusive license, subject to third party intellectual property
+     claims:
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Initial Developer to use, reproduce,
+          modify, display, perform, sublicense and distribute the Original
+          Code (or portions thereof) with or without Modifications, and/or
+          as part of a Larger Work; and
+
+          (b) under Patents Claims infringed by the making, using or
+          selling of Original Code, to make, have made, use, practice,
+          sell, and offer for sale, and/or otherwise dispose of the
+          Original Code (or portions thereof).
+
+          (c) the licenses granted in this Section 2.1(a) and (b) are
+          effective on the date Initial Developer first distributes
+          Original Code under the terms of this License.
+
+          (d) Notwithstanding Section 2.1(b) above, no patent license is
+          granted: 1) for code that You delete from the Original Code; 2)
+          separate from the Original Code;  or 3) for infringements caused
+          by: i) the modification of the Original Code or ii) the
+          combination of the Original Code with other software or devices.
+
+     2.2. Contributor Grant.
+     Subject to third party intellectual property claims, each Contributor
+     hereby grants You a world-wide, royalty-free, non-exclusive license
+
+          (a)  under intellectual property rights (other than patent or
+          trademark) Licensable by Contributor, to use, reproduce, modify,
+          display, perform, sublicense and distribute the Modifications
+          created by such Contributor (or portions thereof) either on an
+          unmodified basis, with other Modifications, as Covered Code
+          and/or as part of a Larger Work; and
+
+          (b) under Patent Claims infringed by the making, using, or
+          selling of  Modifications made by that Contributor either alone
+          and/or in combination with its Contributor Version (or portions
+          of such combination), to make, use, sell, offer for sale, have
+          made, and/or otherwise dispose of: 1) Modifications made by that
+          Contributor (or portions thereof); and 2) the combination of
+          Modifications made by that Contributor with its Contributor
+          Version (or portions of such combination).
+
+          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+          effective on the date Contributor first makes Commercial Use of
+          the Covered Code.
+
+          (d)    Notwithstanding Section 2.2(b) above, no patent license is
+          granted: 1) for any code that Contributor has deleted from the
+          Contributor Version; 2)  separate from the Contributor Version;
+          3)  for infringements caused by: i) third party modifications of
+          Contributor Version or ii)  the combination of Modifications made
+          by that Contributor with other software  (except as part of the
+          Contributor Version) or other devices; or 4) under Patent Claims
+          infringed by Covered Code in the absence of Modifications made by
+          that Contributor.
+
+3. Distribution Obligations.
+
+     3.1. Application of License.
+     The Modifications which You create or to which You contribute are
+     governed by the terms of this License, including without limitation
+     Section 2.2. The Source Code version of Covered Code may be
+     distributed only under the terms of this License or a future version
+     of this License released under Section 6.1, and You must include a
+     copy of this License with every copy of the Source Code You
+     distribute. You may not offer or impose any terms on any Source Code
+     version that alters or restricts the applicable version of this
+     License or the recipients' rights hereunder. However, You may include
+     an additional document offering the additional rights described in
+     Section 3.5.
+
+     3.2. Availability of Source Code.
+     Any Modification which You create or to which You contribute must be
+     made available in Source Code form under the terms of this License
+     either on the same media as an Executable version or via an accepted
+     Electronic Distribution Mechanism to anyone to whom you made an
+     Executable version available; and if made available via Electronic
+     Distribution Mechanism, must remain available for at least twelve (12)
+     months after the date it initially became available, or at least six
+     (6) months after a subsequent version of that particular Modification
+     has been made available to such recipients. You are responsible for
+     ensuring that the Source Code version remains available even if the
+     Electronic Distribution Mechanism is maintained by a third party.
+
+     3.3. Description of Modifications.
+     You must cause all Covered Code to which You contribute to contain a
+     file documenting the changes You made to create that Covered Code and
+     the date of any change. You must include a prominent statement that
+     the Modification is derived, directly or indirectly, from Original
+     Code provided by the Initial Developer and including the name of the
+     Initial Developer in (a) the Source Code, and (b) in any notice in an
+     Executable version or related documentation in which You describe the
+     origin or ownership of the Covered Code.
+
+     3.4. Intellectual Property Matters
+          (a) Third Party Claims.
+          If Contributor has knowledge that a license under a third party's
+          intellectual property rights is required to exercise the rights
+          granted by such Contributor under Sections 2.1 or 2.2,
+          Contributor must include a text file with the Source Code
+          distribution titled "LEGAL" which describes the claim and the
+          party making the claim in sufficient detail that a recipient will
+          know whom to contact. If Contributor obtains such knowledge after
+          the Modification is made available as described in Section 3.2,
+          Contributor shall promptly modify the LEGAL file in all copies
+          Contributor makes available thereafter and shall take other steps
+          (such as notifying appropriate mailing lists or newsgroups)
+          reasonably calculated to inform those who received the Covered
+          Code that new knowledge has been obtained.
+
+          (b) Contributor APIs.
+          If Contributor's Modifications include an application programming
+          interface and Contributor has knowledge of patent licenses which
+          are reasonably necessary to implement that API, Contributor must
+          also include this information in the LEGAL file.
+
+               (c)    Representations.
+          Contributor represents that, except as disclosed pursuant to
+          Section 3.4(a) above, Contributor believes that Contributor's
+          Modifications are Contributor's original creation(s) and/or
+          Contributor has sufficient rights to grant the rights conveyed by
+          this License.
+
+     3.5. Required Notices.
+     You must duplicate the notice in Exhibit A in each file of the Source
+     Code.  If it is not possible to put such notice in a particular Source
+     Code file due to its structure, then You must include such notice in a
+     location (such as a relevant directory) where a user would be likely
+     to look for such a notice.  If You created one or more Modification(s)
+     You may add your name as a Contributor to the notice described in
+     Exhibit A.  You must also duplicate this License in any documentation
+     for the Source Code where You describe recipients' rights or ownership
+     rights relating to Covered Code.  You may choose to offer, and to
+     charge a fee for, warranty, support, indemnity or liability
+     obligations to one or more recipients of Covered Code. However, You
+     may do so only on Your own behalf, and not on behalf of the Initial
+     Developer or any Contributor. You must make it absolutely clear than
+     any such warranty, support, indemnity or liability obligation is
+     offered by You alone, and You hereby agree to indemnify the Initial
+     Developer and every Contributor for any liability incurred by the
+     Initial Developer or such Contributor as a result of warranty,
+     support, indemnity or liability terms You offer.
+
+     3.6. Distribution of Executable Versions.
+     You may distribute Covered Code in Executable form only if the
+     requirements of Section 3.1-3.5 have been met for that Covered Code,
+     and if You include a notice stating that the Source Code version of
+     the Covered Code is available under the terms of this License,
+     including a description of how and where You have fulfilled the
+     obligations of Section 3.2. The notice must be conspicuously included
+     in any notice in an Executable version, related documentation or
+     collateral in which You describe recipients' rights relating to the
+     Covered Code. You may distribute the Executable version of Covered
+     Code or ownership rights under a license of Your choice, which may
+     contain terms different from this License, provided that You are in
+     compliance with the terms of this License and that the license for the
+     Executable version does not attempt to limit or alter the recipient's
+     rights in the Source Code version from the rights set forth in this
+     License. If You distribute the Executable version under a different
+     license You must make it absolutely clear that any terms which differ
+     from this License are offered by You alone, not by the Initial
+     Developer or any Contributor. You hereby agree to indemnify the
+     Initial Developer and every Contributor for any liability incurred by
+     the Initial Developer or such Contributor as a result of any such
+     terms You offer.
+
+     3.7. Larger Works.
+     You may create a Larger Work by combining Covered Code with other code
+     not governed by the terms of this License and distribute the Larger
+     Work as a single product. In such a case, You must make sure the
+     requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+     If it is impossible for You to comply with any of the terms of this
+     License with respect to some or all of the Covered Code due to
+     statute, judicial order, or regulation then You must: (a) comply with
+     the terms of this License to the maximum extent possible; and (b)
+     describe the limitations and the code they affect. Such description
+     must be included in the LEGAL file described in Section 3.4 and must
+     be included with all distributions of the Source Code. Except to the
+     extent prohibited by statute or regulation, such description must be
+     sufficiently detailed for a recipient of ordinary skill to be able to
+     understand it.
+
+5. Application of this License.
+
+     This License applies to code to which the Initial Developer has
+     attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+     6.1. New Versions.
+     Netscape Communications Corporation ("Netscape") may publish revised
+     and/or new versions of the License from time to time. Each version
+     will be given a distinguishing version number.
+
+     6.2. Effect of New Versions.
+     Once Covered Code has been published under a particular version of the
+     License, You may always continue to use it under the terms of that
+     version. You may also choose to use such Covered Code under the terms
+     of any subsequent version of the License published by Netscape. No one
+     other than Netscape has the right to modify the terms applicable to
+     Covered Code created under this License.
+
+     6.3. Derivative Works.
+     If You create or use a modified version of this License (which you may
+     only do in order to apply it to code which is not already Covered Code
+     governed by this License), You must (a) rename Your license so that
+     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+     "MPL", "NPL" or any confusingly similar phrase do not appear in your
+     license (except to note that your license differs from this License)
+     and (b) otherwise make it clear that Your version of the license
+     contains terms which differ from the Mozilla Public License and
+     Netscape Public License. (Filling in the name of the Initial
+     Developer, Original Code or Contributor in the notice described in
+     Exhibit A shall not of themselves be deemed to be modifications of
+     this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+     8.1.  This License and the rights granted hereunder will terminate
+     automatically if You fail to comply with terms herein and fail to cure
+     such breach within 30 days of becoming aware of the breach. All
+     sublicenses to the Covered Code which are properly granted shall
+     survive any termination of this License. Provisions which, by their
+     nature, must remain in effect beyond the termination of this License
+     shall survive.
+
+     8.2.  If You initiate litigation by asserting a patent infringement
+     claim (excluding declatory judgment actions) against Initial Developer
+     or a Contributor (the Initial Developer or Contributor against whom
+     You file such action is referred to as "Participant")  alleging that:
+
+     (a)  such Participant's Contributor Version directly or indirectly
+     infringes any patent, then any and all rights granted by such
+     Participant to You under Sections 2.1 and/or 2.2 of this License
+     shall, upon 60 days notice from Participant terminate prospectively,
+     unless if within 60 days after receipt of notice You either: (i)
+     agree in writing to pay Participant a mutually agreeable reasonable
+     royalty for Your past and future use of Modifications made by such
+     Participant, or (ii) withdraw Your litigation claim with respect to
+     the Contributor Version against such Participant.  If within 60 days
+     of notice, a reasonable royalty and payment arrangement are not
+     mutually agreed upon in writing by the parties or the litigation claim
+     is not withdrawn, the rights granted by Participant to You under
+     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+     the 60 day notice period specified above.
+
+     (b)  any software, hardware, or device, other than such Participant's
+     Contributor Version, directly or indirectly infringes any patent, then
+     any rights granted to You by such Participant under Sections 2.1(b)
+     and 2.2(b) are revoked effective as of the date You first made, used,
+     sold, distributed, or had made, Modifications made by that
+     Participant.
+
+     8.3.  If You assert a patent infringement claim against Participant
+     alleging that such Participant's Contributor Version directly or
+     indirectly infringes any patent where such claim is resolved (such as
+     by license or settlement) prior to the initiation of patent
+     infringement litigation, then the reasonable value of the licenses
+     granted by such Participant under Sections 2.1 or 2.2 shall be taken
+     into account in determining the amount or value of any payment or
+     license.
+
+     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
+     all end user license agreements (excluding distributors and resellers)
+     which have been validly granted by You or any distributor hereunder
+     prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+     The Covered Code is a "commercial item," as that term is defined in
+     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+     software" and "commercial computer software documentation," as such
+     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+     all U.S. Government End Users acquire Covered Code with only those
+     rights set forth herein.
+
+11. MISCELLANEOUS.
+
+     This License represents the complete agreement concerning subject
+     matter hereof. If any provision of this License is held to be
+     unenforceable, such provision shall be reformed only to the extent
+     necessary to make it enforceable. This License shall be governed by
+     California law provisions (except to the extent applicable law, if
+     any, provides otherwise), excluding its conflict-of-law provisions.
+     With respect to disputes in which at least one party is a citizen of,
+     or an entity chartered or registered to do business in the United
+     States of America, any litigation relating to this License shall be
+     subject to the jurisdiction of the Federal Courts of the Northern
+     District of California, with venue lying in Santa Clara County,
+     California, with the losing party responsible for costs, including
+     without limitation, court costs and reasonable attorneys' fees and
+     expenses. The application of the United Nations Convention on
+     Contracts for the International Sale of Goods is expressly excluded.
+     Any law or regulation which provides that the language of a contract
+     shall be construed against the drafter shall not apply to this
+     License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+     As between Initial Developer and the Contributors, each party is
+     responsible for claims and damages arising, directly or indirectly,
+     out of its utilization of rights under this License and You agree to
+     work with Initial Developer and Contributors to distribute such
+     responsibility on an equitable basis. Nothing herein is intended or
+     shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+     Initial Developer may designate portions of the Covered Code as
+     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
+     Developer permits you to utilize portions of the Covered Code under
+     Your choice of the NPL or the alternative licenses, if any, specified
+     by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A -Mozilla Public License.
+
+     ``The contents of this file are subject to the Mozilla Public License
+     Version 1.1 (the "License"); you may not use this file except in
+     compliance with the License. You may obtain a copy of the License at
+     http://www.mozilla.org/MPL/
+
+     Software distributed under the License is distributed on an "AS IS"
+     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+     License for the specific language governing rights and limitations
+     under the License.
+
+     The Original Code is ______________________________________.
+
+     The Initial Developer of the Original Code is ________________________.
+     Portions created by ______________________ are Copyright (C) ______
+     _______________________. All Rights Reserved.
+
+     Contributor(s): ______________________________________.
+
+     Alternatively, the contents of this file may be used under the terms
+     of the _____ license (the  "[___] License"), in which case the
+     provisions of [______] License are applicable instead of those
+     above.  If you wish to allow use of your version of this file only
+     under the terms of the [____] License and not to allow others to use
+     your version of this file under the MPL, indicate your decision by
+     deleting  the provisions above and replace  them with the notice and
+     other provisions required by the [___] License.  If you do not delete
+     the provisions above, a recipient may use your version of this file
+     under either the MPL or the [___] License."
+
+     [NOTE: The text of this Exhibit A may differ slightly from the text of
+     the notices in the Source Code files of the Original Code. You should
+     use the text of this Exhibit A rather than the text found in the
+     Original Code Source Code for Your Modifications.]
+
+     ----------------------------------------------------------------------
+
+     AMENDMENTS
+
+     The Netscape Public License Version 1.1 ("NPL") consists of the
+     Mozilla Public License Version 1.1 with the following Amendments,
+     including Exhibit A-Netscape Public License.  Files identified with
+     "Exhibit A-Netscape Public License" are governed by the Netscape
+     Public License Version 1.1.
+
+     Additional Terms applicable to the Netscape Public License.
+          I. Effect.
+          These additional terms described in this Netscape Public
+          License -- Amendments shall apply to the Mozilla Communicator
+          client code and to all Covered Code under this License.
+
+          II. "Netscape's Branded Code" means Covered Code that Netscape
+          distributes and/or permits others to distribute under one or more
+          trademark(s) which are controlled by Netscape but which are not
+          licensed for use under this License.
+
+          III. Netscape and logo.
+          This License does not grant any rights to use the trademarks
+          "Netscape", the "Netscape N and horizon" logo or the "Netscape
+          lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
+          "Smart Browsing" even if such marks are included in the Original
+          Code or Modifications.
+
+          IV. Inability to Comply Due to Contractual Obligation.
+          Prior to licensing the Original Code under this License, Netscape
+          has licensed third party code for use in Netscape's Branded Code.
+          To the extent that Netscape is limited contractually from making
+          such third party code available under this License, Netscape may
+          choose to reintegrate such code into Covered Code without being
+          required to distribute such code in Source Code form, even if
+          such code would otherwise be considered "Modifications" under
+          this License.
+
+          V. Use of Modifications and Covered Code by Initial Developer.
+               V.1. In General.
+               The obligations of Section 3 apply to Netscape, except to
+               the extent specified in this Amendment, Section V.2 and V.3.
+
+               V.2. Other Products.
+               Netscape may include Covered Code in products other than the
+               Netscape's Branded Code which are released by Netscape
+               during the two (2) years following the release date of the
+               Original Code, without such additional products becoming
+               subject to the terms of this License, and may license such
+               additional products on different terms from those contained
+               in this License.
+
+               V.3. Alternative Licensing.
+               Netscape may license the Source Code of Netscape's Branded
+               Code, including Modifications incorporated therein, without
+               such Netscape Branded Code becoming subject to the terms of
+               this License, and may license such Netscape Branded Code on
+               different terms from those contained in this License.
+
+          VI. Litigation.
+          Notwithstanding the limitations of Section 11 above, the
+          provisions regarding litigation in Section 11(a), (b) and (c) of
+          the License shall apply to all disputes relating to this License.
+
+     EXHIBIT A-Netscape Public License.
+
+          "The contents of this file are subject to the Netscape Public
+          License Version 1.1 (the "License"); you may not use this file
+          except in compliance with the License. You may obtain a copy of
+          the License at http://www.mozilla.org/NPL/
+
+          Software distributed under the License is distributed on an "AS
+          IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+          implied. See the License for the specific language governing
+          rights and limitations under the License.
+
+          The Original Code is Mozilla Communicator client code, released
+          March 31, 1998.
+
+          The Initial Developer of the Original Code is Netscape
+          Communications Corporation. Portions created by Netscape are
+          Copyright (C) 1998-1999 Netscape Communications Corporation. All
+          Rights Reserved.
+
+          Contributor(s): ______________________________________.
+
+          Alternatively, the contents of this file may be used under the
+          terms of the _____ license (the "[___] License"), in which case
+          the provisions of [______] License are applicable  instead of
+          those above.  If you wish to allow use of your version of this
+          file only under the terms of the [____] License and not to allow
+          others to use your version of this file under the NPL, indicate
+          your decision by deleting  the provisions above and replace  them
+          with the notice and other provisions required by the [___]
+          License.  If you do not delete the provisions above, a recipient
+          may use your version of this file under either the NPL or the
+          [___] License."

mozilla/Makefile.in

@@ -0,0 +1,187 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= .
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/build/unix/modules.mk
+
+ifneq ($(BUILD_MODULES),all)
+
+DIRS		= $(BUILD_MODULE_DIRS)
+EXPORT_DIRS	= $(BUILD_MODULE_DEP_DIRS)
+
+else
+
+DIRS		= config build
+
+ifdef MOZ_JAVA_SUPPLEMENT
+DIRS += 			\
+  java/util			\
+  java/webclient		\
+  $(NULL)
+endif
+
+# boehm needs to be built before XPCOM
+ifdef GC_LEAK_DETECTOR
+DIRS += gc/boehm
+endif
+
+DIRS	+= $(NSPRPUB_DIR)
+
+DIRS		+= dbm modules/libreg js string xpcom js/src/xpconnect
+
+ifdef MOZ_OJI
+DIRS		+= js/src/liveconnect
+endif
+
+ifndef MOZ_NATIVE_ZLIB
+DIRS		+= modules/zlib
+endif
+
+ifndef MOZ_NATIVE_JPEG
+DIRS		+= jpeg
+endif
+
+ifdef MOZ_ENABLE_XLIB
+DIRS           += gfx/src/xlibrgb widget/src/xlibxtbin
+endif
+
+ifdef MOZ_ENABLE_GTK
+DIRS           += widget/src/gtksuperwin widget/src/gtkxtbin
+endif
+
+# Linux and Solaris installer needs standalone libjar, hence standalone zlib
+ifneq (,$(filter Linux SunOS,$(OS_ARCH)))
+DIRS		+= modules/zlib/standalone
+endif
+
+DIRS		+= \
+		widget/timer \
+		include \
+		modules/libutil \
+		netwerk \
+		modules/mpfilelocprovider \
+		uriloader \
+		intl \
+		modules/libpref \
+		modules/libimg \
+		modules/oji \
+		modules/libjar \
+		caps \
+		rdf \
+		expat \
+		htmlparser \
+		gfx \
+		$(NULL)
+
+ifdef USE_IMG2
+DIRS		+= gfx2 modules/libpr0n
+endif
+
+DIRS		+= \
+		modules/plugin \
+		dom \
+		view \
+		widget \
+		content \
+		layout \
+		db \
+		docshell \
+		webshell \
+		embedding \
+		editor \
+		sun-java \
+		profile \
+		themes \
+		accessible \
+		$(NULL)
+
+# This must preceed xpfe
+ifdef MOZ_JPROF
+DIRS        += tools/jprof
+endif
+
+ifdef MOZ_BUILD_XPFE
+DIRS		+= xpfe
+endif
+
+DIRS		+= xpinstall
+
+ifdef MOZ_PSM
+DIRS		+= security/nss security/manager
+endif
+
+ifdef MOZ_EXTENSIONS
+DIRS		+= extensions
+endif
+
+ifdef MOZ_MAIL_NEWS
+DIRS		+= mailnews
+endif
+
+ifdef MOZ_LEAKY
+DIRS        += tools/leaky
+endif
+
+ifdef ENABLE_TESTS
+DIRS		+= xpcom/tests
+endif
+
+ifdef MOZ_LDAP_XPCOM
+DIRS	+=	directory/c-sdk/ldap directory/xpcom
+endif
+
+DIRS	+= l10n
+
+ifdef MOZ_STATIC_COMPONENTS
+DIRS   += modules/staticmod
+endif
+
+DIRS	+= xpfe/bootstrap
+
+endif # BUILD_MODULES == all
+
+STATIC_MAKEFILES := $(NSPRPUB_DIR) directory/c-sdk/ldap
+
+ifdef MOZ_PSM
+STATIC_MAKEFILES += security/nss 
+endif
+
+GARBAGE_DIRS += dist
+DIST_GARBAGE = config.cache config.log config.status config-defs.h \
+   dependencies.beos config/autoconf.mk config/myrules.mk config/myconfig.mk \
+   unallmakefiles \
+   $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out 
+
+include $(topsrcdir)/config/rules.mk
+
+export::
+	+$(LOOP_OVER_EXPORT_DIRS)
+
+distclean::
+	cat unallmakefiles | $(XARGS) rm -f
+	rm -f unallmakefiles $(DIST_GARBAGE)
+

mozilla/README/IBMChangeLog

@@ -0,0 +1,2 @@
+Pursuant to section 3.3 of the MPL, this file will contain a list of the files
+that have been modified by IBM Corporation.

mozilla/README/mozilla/README.build

@@ -0,0 +1,3 @@
+For mozilla-the-client build instructions, please read:
+http://www.mozilla.org/build/
+

mozilla/accessible/Makefile.in

@@ -0,0 +1,32 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= public src build
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/accessible/build/Makefile.in

@@ -0,0 +1,51 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= accessibility
+LIBRARY_NAME	= accessibility
+EXPORT_LIBRARY = 1
+SHORT_LIBNAME	= access
+IS_COMPONENT	= 1
+REQUIRES	= xpcom string dom
+
+CPPSRCS		= nsAccessibilityFactory.cpp
+
+LOCAL_INCLUDES	= -I$(srcdir)/../src
+
+SHARED_LIBRARY_LIBS = \
+		$(DIST)/lib/libaccessibility_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libchrome_s.$(LIB_SUFFIX) \
+		$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+		$(MOZ_COMPONENT_LIBS) \
+		-lgkgfx \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/accessible/build/makefile.win

@@ -0,0 +1,47 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..
+MODULE=accessibility
+
+MAKE_OBJ_TYPE=DLL
+DLLNAME=accessibility
+DLL=.\$(OBJDIR)\$(DLLNAME).dll
+
+CPP_OBJS=\
+        .\$(OBJDIR)\nsAccessibilityFactory.obj    \
+	$(NULL)
+
+LINCS = $(LINCS) -I..\src         # for implementation headers
+
+LLIBS=\
+ $(DIST)\lib\xpcom.lib         \
+ $(DIST)\lib\accessibility_s.lib      \
+ $(DIST)\lib\timer_s.lib       \
+ $(DIST)\lib\gkgfxwin.lib \
+ $(LIBNSPR)  
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
+

mozilla/accessible/build/nsAccessibilityFactory.cpp

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsCOMPtr.h"
+#include "nsIModule.h"
+#include "nsIGenericFactory.h"
+
+#include "nsIServiceManager.h"
+#include "nsIComponentManager.h"
+#include "nsIAccessibilityService.h"
+#include "nscore.h"
+
+static NS_IMETHODIMP
+NS_ConstructAccessibilityService(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+    nsresult rv;
+    NS_ASSERTION(aOuter == nsnull, "no aggregation");
+    nsIAccessibilityService* accessibility;
+    rv = NS_NewAccessibilityService(&accessibility);
+    if (NS_FAILED(rv)) {
+        NS_ERROR("Unable to construct chrome registry");
+        return rv;
+    }
+    rv = accessibility->QueryInterface(aIID, aResult);
+    NS_ASSERTION(NS_SUCCEEDED(rv), "unable to find correct interface");
+    NS_RELEASE(accessibility);
+    return rv;
+}
+
+// The list of components we register
+static nsModuleComponentInfo components[] = 
+{
+    { "AccessibilityService", 
+      NS_ACCESSIBILITY_SERVICE_CID,
+      "@mozilla.org/accessibilityService;1", 
+      NS_ConstructAccessibilityService
+    },
+};
+
+NS_IMPL_NSGETMODULE("nsAccessibilityModule", components);
+

mozilla/accessible/makefile.win

@@ -0,0 +1,26 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..
+
+DIRS= public src build
+
+include <$(DEPTH)\config\rules.mak>

mozilla/accessible/public/MANIFEST

@@ -0,0 +1,3 @@
+nsIAccessibilityService.idl
+nsIAccessible.idl
+nsIMutableAccessible.idl

mozilla/accessible/public/Makefile.in

@@ -0,0 +1,41 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= accessibility
+XPIDL_MODULE= accessibility
+
+XPIDLSRCS	= \
+			nsIAccessibilityService.idl \
+			nsIAccessible.idl \
+			nsIMutableAccessible.idl \
+			nsIAccessibleEventReceiver.idl \
+			nsIAccessibleEventListener.idl \
+			$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/accessible/public/makefile.win

@@ -0,0 +1,34 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..
+MODULE=accessibility
+XPIDL_MODULE=accessibility
+
+XPIDLSRCS =               \
+  .\nsIAccessibilityService.idl \
+  .\nsIAccessible.idl \
+  .\nsIMutableAccessible.idl \
+  .\nsIAccessibleEventReceiver.idl \
+  .\nsIAccessibleEventListener.idl \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/accessible/public/nsIAccessibilityService.idl

@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: Eric Vaughan (evaughan@netscape.com)
+ * 
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+#include "domstubs.idl"
+#include "nsIMutableAccessible.idl"
+#include "nsIAtom.idl"
+
+[scriptable, uuid(68D9720A-0984-42b6-A3F5-8237ED925727)]
+interface nsIAccessibilityService : nsISupports
+{
+  nsIAccessible createRootAccessible(in nsISupports aPresShell, in nsISupports aFrame);
+  nsIMutableAccessible createMutableAccessible(in nsISupports aNode);
+  nsIAccessible createHTMLBlockAccessible(in nsIAccessible aAccessible, in nsIDOMNode aNode, in nsISupports aPresShell);
+  nsIAccessible createHTMLSelectAccessible(in nsIAtom aAccessible, in nsIDOMNode aNode, in nsISupports aPresShell);
+  nsIAccessible createHTMLCheckboxAccessible(in nsISupports aFrame);
+  nsIAccessible createHTMLRadioButtonAccessible(in nsISupports aFrame);
+  nsIAccessible createHTMLButtonAccessible(in nsISupports aFrame);
+  nsIAccessible createHTMLTextAccessible(in nsISupports aFrame);
+};
+
+
+%{ C++
+
+// for component registration
+// {DE401C37-9A7F-4278-A6F8-3DE2833989EF}
+#define NS_ACCESSIBILITY_SERVICE_CID \
+{ 0xde401c37, 0x9a7f, 0x4278, { 0xa6, 0xf8, 0x3d, 0xe2, 0x83, 0x39, 0x89, 0xef } }
+
+extern nsresult
+NS_NewAccessibilityService(nsIAccessibilityService** aResult);
+%}

mozilla/accessible/public/nsIAccessible.idl

@@ -0,0 +1,205 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: Eric D Vaughan (evaughan@netscape.com)
+ * 
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(B26FBE47-9A5F-42a1-822B-082461AE4D6D)]
+interface nsIAccessible : nsISupports
+{
+  /* Can't use these javascript can't tell us if properties are undefined 
+     
+  readonly attribute nsIAccessible accParent;
+  readonly attribute nsIAccessible accNextSibling;
+  readonly attribute nsIAccessible accPreviousSibling;
+  readonly attribute nsIAccessible accFirstChild;
+  readonly attribute nsIAccessible accLastChild;
+  readonly attribute long accChildCount;
+
+  attribute wstring accName;
+  attribute wstring accValue;
+  readonly attribute wstring accDescription;
+  readonly attribute wstring accRole;
+  readonly attribute unsigned long accState;
+  readonly attribute wstring accHelp;
+  readonly attribute wstring accDefaultAction;
+  readonly attribute boolean accFocused;
+  */
+
+  nsIAccessible getAccParent();
+  nsIAccessible getAccNextSibling();
+  nsIAccessible getAccPreviousSibling();
+  nsIAccessible getAccFirstChild();
+  nsIAccessible getAccLastChild();
+
+  long getAccChildCount();
+  wstring getAccName();
+  wstring getAccValue();
+  void setAccName(in wstring name);
+  void setAccValue(in wstring value);
+
+  wstring getAccDescription();
+  wstring getAccRole();
+  unsigned long getAccState();
+  unsigned long getAccExtState();
+  wstring getAccDefaultAction();
+  wstring getAccHelp();
+  boolean getAccFocused();
+
+  nsIAccessible accGetAt(in long x, in long y);
+
+  nsIAccessible accNavigateRight();
+  nsIAccessible accNavigateLeft();
+  nsIAccessible accNavigateUp();
+  nsIAccessible accNavigateDown();
+
+  void accGetBounds(out long x, 
+                    out long y, 
+					out long width, 
+					out long height);
+
+  void accAddSelection();
+  void accRemoveSelection();
+  void accExtendSelection();
+  void accTakeSelection();
+  void accTakeFocus();
+  void accDoDefaultAction();
+
+ // MSAA State flags - used for bitfield. More than 1 allowed.
+  const unsigned long  STATE_UNAVAILABLE        = 0x00000001;  // Disabled, maps to opposite of Java ENABLED, Gnome/ATK SENSITIVE?
+  const unsigned long  STATE_SELECTED           = 0x00000002;
+  const unsigned long  STATE_FOCUSED            = 0x00000004;
+  const unsigned long  STATE_PRESSED            = 0x00000008;
+  const unsigned long  STATE_CHECKED            = 0x00000010;
+  const unsigned long  STATE_MIXED              = 0x00000020; // 3-state checkbox or toolbar button
+  const unsigned long  STATE_READONLY           = 0x00000040; // Maps to opposite of Java/Gnome/ATK EDITABLE state
+  const unsigned long  STATE_HOTTRACKED         = 0x00000080;
+  const unsigned long  STATE_DEFAULT            = 0x00000100;
+  const unsigned long  STATE_EXPANDED           = 0x00000200;
+  const unsigned long  STATE_COLLAPSED          = 0x00000400;
+  const unsigned long  STATE_BUSY               = 0x00000800;
+  const unsigned long  STATE_FLOATING           = 0x00001000;  // Children "owned" not "contained" by parent
+  const unsigned long  STATE_MARQUEED           = 0x00002000;
+  const unsigned long  STATE_ANIMATED           = 0x00004000;
+  const unsigned long  STATE_INVISIBLE          = 0x00008000;
+  const unsigned long  STATE_OFFSCREEN          = 0x00010000;
+  const unsigned long  STATE_SIZEABLE           = 0x00020000;
+  const unsigned long  STATE_MOVEABLE           = 0x00040000;
+  const unsigned long  STATE_SELFVOICING        = 0x00080000;
+  const unsigned long  STATE_FOCUSABLE          = 0x00100000;
+  const unsigned long  STATE_SELECTABLE         = 0x00200000;
+  const unsigned long  STATE_LINKED             = 0x00400000;
+  const unsigned long  STATE_TRAVERSED          = 0x00800000;
+  const unsigned long  STATE_MULTISELECTABLE    = 0x01000000;  // Supports multiple selection
+  const unsigned long  STATE_EXTSELECTABLE      = 0x02000000;  // Supports extended selection
+  const unsigned long  STATE_ALERT_LOW          = 0x04000000;  // This information is of low priority
+  const unsigned long  STATE_ALERT_MEDIUM       = 0x08000000;  // This information is of medium priority
+  const unsigned long  STATE_ALERT_HIGH         = 0x10000000;  // This information is of high priority
+  const unsigned long  STATE_PROTECTED          = 0x20000000;  // Maps to Gnome's *Role* ATK_ROLE_PASSWD_TEXT, nothing for Java?
+  const unsigned long  STATE_HASPOPUP           = 0x40000000;  // New in MSAA 2.0
+
+// Extended state flags (for now non-MSAA, for Java and Gnome/ATK support)
+// This is only the states that there isn't already a mapping for in MSAA
+// See www.accessmozilla.org/article.php?sid=11 for information on the mappings between accessibility API states
+  const unsigned long  STATE_INVALID            = 0x00200000;  // No explanation given    
+  const unsigned long  STATE_ACTIVE             = 0x00400000;  // This window is currently the active window    
+  const unsigned long  STATE_EXPANDABLE         = 0x00800000;  // An item that can be expanded, such as a tree item with children    
+  const unsigned long  STATE_MODAL              = 0x01000000;  // Must do something with control before leaving it    
+  const unsigned long  STATE_MULTI_LINE         = 0x02000000;  // Edit control that can take multiple lines    
+  const unsigned long  STATE_SENSITIVE          = 0x04000000;  // No explanation given    
+  const unsigned long  STATE_RESIZABLE          = 0x08000000;  // Object can be resized    
+  const unsigned long  STATE_SHOWING            = 0x10000000;  // This object and all of it's ancestors are visible    
+  const unsigned long  STATE_SINGLE_LINE        = 0x20000000;  // This text object can only contain 1 line of text    
+  const unsigned long  STATE_TRANSIENT          = 0x40000000;  // Tells accessibility aid "Don't add event listener - this object doesn't generate any". For example, could be used with higher level containers.    
+  const unsigned long  STATE_VERTICAL           = 0x80000000;  // Especially used for sliders and scrollbars  
+
+
+/*
+// MSAA Roles - only one per nsIAccessible or IAccessible
+  const unsigned long  ROLE_TITLEBAR            = 0x00000001;
+  const unsigned long  ROLE_MENUBAR             = 0x00000002;
+  const unsigned long  ROLE_SCROLLBAR           = 0x00000003;
+  const unsigned long  ROLE_GRIP                = 0x00000004;
+  const unsigned long  ROLE_SOUND               = 0x00000005;
+  const unsigned long  ROLE_CURSOR              = 0x00000006;
+  const unsigned long  ROLE_CARET               = 0x00000007;
+  const unsigned long  ROLE_ALERT               = 0x00000008;
+  const unsigned long  ROLE_WINDOW              = 0x00000009;
+  const unsigned long  ROLE_CLIENT              = 0x0000000A;
+  const unsigned long  ROLE_MENUPOPUP           = 0x0000000B;
+  const unsigned long  ROLE_MENUITEM            = 0x0000000C;
+  const unsigned long  ROLE_TOOLTIP             = 0x0000000D;
+  const unsigned long  ROLE_APPLICATION         = 0x0000000E;
+  const unsigned long  ROLE_DOCUMENT            = 0x0000000F;
+  const unsigned long  ROLE_PANE                = 0x00000010;
+  const unsigned long  ROLE_CHART               = 0x00000011;
+  const unsigned long  ROLE_DIALOG              = 0x00000012;
+  const unsigned long  ROLE_BORDER              = 0x00000013;
+  const unsigned long  ROLE_GROUPING            = 0x00000014;
+  const unsigned long  ROLE_SEPARATOR           = 0x00000015;
+  const unsigned long  ROLE_TOOLBAR             = 0x00000016;
+  const unsigned long  ROLE_STATUSBAR           = 0x00000017;
+  const unsigned long  ROLE_TABLE               = 0x00000018;
+  const unsigned long  ROLE_COLUMNHEADER        = 0x00000019;
+  const unsigned long  ROLE_ROWHEADER           = 0x0000001A;
+  const unsigned long  ROLE_COLUMN              = 0x0000001B;
+  const unsigned long  ROLE_ROW                 = 0x0000001C;
+  const unsigned long  ROLE_CELL                = 0x0000001D;
+  const unsigned long  ROLE_LINK                = 0x0000001E;
+  const unsigned long  ROLE_HELPBALLOON         = 0x0000001F;
+  const unsigned long  ROLE_CHARACTER           = 0x00000020;
+  const unsigned long  ROLE_LIST                = 0x00000021;
+  const unsigned long  ROLE_LISTITEM            = 0x00000022;
+  const unsigned long  ROLE_OUTLINE             = 0x00000023;
+  const unsigned long  ROLE_OUTLINEITEM         = 0x00000024;
+  const unsigned long  ROLE_PAGETAB             = 0x00000025;
+  const unsigned long  ROLE_PROPERTYPAGE        = 0x00000026;
+  const unsigned long  ROLE_INDICATOR           = 0x00000027;
+  const unsigned long  ROLE_GRAPHIC             = 0x00000028;
+  const unsigned long  ROLE_STATICTEXT          = 0x00000029;
+  const unsigned long  ROLE_TEXT                = 0x0000002A;  // Editable, selectable, etc.
+  const unsigned long  ROLE_PUSHBUTTON          = 0x0000002B;
+  const unsigned long  ROLE_CHECKBUTTON         = 0x0000002C;
+  const unsigned long  ROLE_RADIOBUTTON         = 0x0000002D;
+  const unsigned long  ROLE_COMBOBOX            = 0x0000002E;
+  const unsigned long  ROLE_DROPLIST            = 0x0000002F;
+  const unsigned long  ROLE_PROGRESSBAR         = 0x00000030;
+  const unsigned long  ROLE_DIAL                = 0x00000031;
+  const unsigned long  ROLE_HOTKEYFIELD         = 0x00000032;
+  const unsigned long  ROLE_SLIDER              = 0x00000033;
+  const unsigned long  ROLE_SPINBUTTON          = 0x00000034;
+  const unsigned long  ROLE_DIAGRAM             = 0x00000035;
+  const unsigned long  ROLE_ANIMATION           = 0x00000036;
+  const unsigned long  ROLE_EQUATION            = 0x00000037;
+  const unsigned long  ROLE_BUTTONDROPDOWN      = 0x00000038;
+  const unsigned long  ROLE_BUTTONMENU          = 0x00000039;
+  const unsigned long  ROLE_BUTTONDROPDOWNGRID  = 0x0000003A;
+  const unsigned long  ROLE_WHITESPACE          = 0x0000003B;
+  const unsigned long  ROLE_PAGETABLIST         = 0x0000003C;
+  const unsigned long  ROLE_CLOCK               = 0x0000003D;
+  const unsigned long  ROLE_SPLITBUTTON         = 0x0000003E;   // New in MSAA 2.0 
+  const unsigned long  ROLE_IPADDRESS           = 0x0000003F;   // New in MSAA 2.0 
+
+  */
+
+};

mozilla/accessible/public/nsIAccessibleEventListener.idl

@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: Eric D Vaughan (evaughan@netscape.com)
+ * 
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+#include "nsIAccessible.idl"
+
+[scriptable, uuid(BEE49E7D-9D06-49bf-8984-1694C697D74F)]
+interface nsIAccessibleEventListener : nsISupports
+{
+  const unsigned long EVENT_FOCUS = 0x8005;
+
+  void handleEvent(in unsigned long aEvent, in nsIAccessible aTarget);
+};

mozilla/accessible/public/nsIAccessibleEventReceiver.idl

@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: Eric D Vaughan (evaughan@netscape.com)
+ * 
+ * Contributor(s): 
+ */
+
+#include "nsIAccessibleEventListener.idl"
+
+[scriptable, uuid(AB331E47-4FAA-4a12-9480-9B480DD78B39)]
+interface nsIAccessibleEventReceiver : nsISupports
+{
+  void addAccessibleEventListener(in nsIAccessibleEventListener aListener);
+  void removeAccessibleEventListener(in nsIAccessibleEventListener aListener);
+};

mozilla/accessible/public/nsIMutableAccessible.idl

@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ * 
+ * Contributor(s): pav
+ */
+
+#include "nsIAccessible.idl"
+#include "nsIAtom.idl"
+
+[scriptable, uuid(AD3274E5-9DD1-4614-81C8-BFF992869CBE)]
+interface nsIMutableAccessible : nsIAccessible
+{
+  void SetNameAsNodeValue();
+  void SetName(in wstring aName);
+  void SetNameAsAttribute(in nsIAtom aAtom);
+  void SetRole(in wstring aRole);
+  void SetIsLeaf(in boolean aLeaf);
+};

mozilla/accessible/src/Makefile.in

@@ -0,0 +1,49 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= accessibility
+LIBRARY_NAME	= accessibility_s
+REQUIRES	= xpcom string layout widget dom view locale gfx2
+
+CPPSRCS		= \
+		nsAccessible.cpp \
+		nsAccessibilityService.cpp \
+		nsMutableAccessible.cpp \
+		nsRootAccessible.cpp \
+		nsHTMLFormControlAccessible.cpp \
+		nsHTMLTextAccessible.cpp \
+		nsSelectAccessible.cpp \
+		nsGenericAccessible.cpp \
+		$(NULL)
+
+# we don't want the shared lib, but we want to force the creation of a static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/accessible/src/base/nsAccessibilityService.cpp

@@ -0,0 +1,252 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+
+#include "nsIAccessibilityService.h"
+#include "nsAccessibilityService.h"
+#include "nsAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsRootAccessible.h"
+#include "nsINameSpaceManager.h"
+#include "nsMutableAccessible.h"
+#include "nsHTMLFormControlAccessible.h"
+#include "nsLayoutAtoms.h"
+#include "nsSelectAccessible.h"
+#include "nsHTMLTextAccessible.h"
+
+//--------------------
+
+
+nsAccessibilityService::nsAccessibilityService()
+{
+	NS_INIT_REFCNT();
+}
+
+nsAccessibilityService::~nsAccessibilityService()
+{
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsAccessibilityService, nsIAccessibilityService);
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIAccessibilityService methods:
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateRootAccessible(nsISupports* aPresContext, nsISupports* aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* f = NS_STATIC_CAST(nsIFrame*, aFrame);
+
+  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
+  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> s;
+  c->GetShell(getter_AddRefs(s));
+
+  NS_ASSERTION(s,"Error not presshell!!");
+
+  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
+
+  *_retval = new nsRootAccessible(wr,f);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateMutableAccessible(nsISupports* aNode, nsIMutableAccessible **_retval)
+{
+  *_retval = new nsMutableAccessible(aNode);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateHTMLBlockAccessible(nsIAccessible* aAccessible, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
+  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
+  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> s;
+  c->GetShell(getter_AddRefs(s));
+
+  NS_ASSERTION(s,"Error not presshell!!");
+
+  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
+
+  *_retval = new nsHTMLBlockAccessible(aAccessible, n,wr);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateHTMLSelectAccessible(nsIAtom* aPopupAtom, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
+  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
+  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> s;
+  c->GetShell(getter_AddRefs(s)); 
+
+  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
+
+  *_retval = new nsSelectAccessible(aPopupAtom, nsnull, n, wr);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLCheckboxAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIPresShell> shell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLCheckboxAccessible(shell,node);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLRadioButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIPresShell> shell;
+  GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
+
+  *_retval = new nsHTMLRadioButtonAccessible(shell,node);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIPresShell> shell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLButtonAccessible(shell,node);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+/* nsIAccessible createHTMLTextAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLTextAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIPresShell> shell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLTextAccessible(shell, node);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP nsAccessibilityService::GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aNode)
+{
+  *aRealFrame = NS_STATIC_CAST(nsIFrame*, aFrame);
+  nsCOMPtr<nsIContent> content;
+  (*aRealFrame)->GetContent(getter_AddRefs(content));
+  nsCOMPtr<nsIDOMNode> node = do_QueryInterface(content);
+  *aNode = node;
+  NS_ADDREF(*aNode);
+
+  nsCOMPtr<nsIDocument> document;
+  content->GetDocument(*getter_AddRefs(document));
+
+#ifdef DEBUG
+  PRInt32 shells = document->GetNumberOfShells();
+  NS_ASSERTION(shells > 0,"Error no shells!");
+#endif
+
+  *aShell = document->GetShellAt(0);
+  NS_IF_ADDREF(*aShell);
+
+  return NS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+nsresult
+NS_NewAccessibilityService(nsIAccessibilityService** aResult)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    nsAccessibilityService* a = new nsAccessibilityService();
+    if (a == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(a);
+    *aResult = a;
+    return NS_OK;
+}
+

mozilla/accessible/src/base/nsAccessibilityService.h

@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+
+#ifndef __nsAccessibilityService_h__
+#define __nsAccessibilityService_h__
+
+#include "nsIAccessibilityService.h"
+class nsIFrame;
+class nsIPresShell;
+class nsIDOMNode;
+
+class nsAccessibilityService : public nsIAccessibilityService
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIAccessibilityService methods:
+  NS_DECL_NSIACCESSIBILITYSERVICE
+
+  // nsAccessibilityService methods:
+  nsAccessibilityService();
+  virtual ~nsAccessibilityService();
+
+public:
+
+private:
+  NS_IMETHOD GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aContent);
+
+};
+
+#endif /* __nsIccessibilityService_h__ */

mozilla/accessible/src/base/nsAccessible.cpp

@@ -0,0 +1,968 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsIScrollableView.h"
+#include "nsRootAccessible.h"
+
+//#define DEBUG_LEAKS
+
+#ifdef DEBUG_LEAKS
+static gnsAccessibles = 0;
+#endif
+
+
+class nsFrameTreeWalker {
+public:
+  nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner);
+  nsIFrame* GetNextSibling(nsIFrame* aFrame);
+  nsIFrame* GetPreviousSibling(nsIFrame* aFrame);
+  nsIFrame* GetParent(nsIFrame* aFrame);
+  nsIFrame* GetFirstChild(nsIFrame* aFrame);
+  nsIFrame* GetLastChild(nsIFrame* aFrame);
+  nsIFrame* GetChildBefore(nsIFrame* aParent, nsIFrame* aChild);
+  PRInt32 GetCount(nsIFrame* aFrame);
+
+  static PRBool IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2);
+  static void GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent);
+
+  nsCOMPtr<nsIPresContext> mPresContext;
+  nsCOMPtr<nsIAccessible> mAccessible;
+  nsCOMPtr<nsIContent> mContent;
+  nsAccessible* mOwner;
+};
+
+nsFrameTreeWalker::nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner)
+{
+  mPresContext = aPresContext;
+  mOwner = aOwner;
+}
+
+nsIFrame* nsFrameTreeWalker::GetParent(nsIFrame* aFrame)
+{
+  //printf("Get parent\n");
+
+  nsIFrame* parent = nsnull;
+  aFrame->GetParent(&parent);
+
+  // if no parent then we hit the root
+  // just return that top frame
+  if (!parent) {
+    mAccessible = nsnull;
+    mContent = nsnull;
+    return aFrame;
+  }
+
+  GetAccessible(parent, mAccessible, mContent);
+  if (mAccessible)
+    return parent;
+  
+  return GetParent(parent);
+}
+
+nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
+{
+  //printf("Get next\n");
+
+  // get next sibling
+  nsIFrame* next = nsnull;
+  aFrame->GetNextSibling(&next);
+
+  // skip any frames with the same content node
+  while(IsSameContent(aFrame,next)) 
+    next->GetNextSibling(&next);
+
+  // if failed
+  if (!next)
+  {
+    // if parent has content
+    nsIFrame* parent = nsnull;
+    aFrame->GetParent(&parent);
+    
+    // if no parent fail
+    if (!parent) {
+      mAccessible = nsnull;
+      mContent = nsnull;
+      return nsnull;
+    }
+
+    // fail if we reach a parent that is accessible
+    GetAccessible(parent, mAccessible, mContent);
+    if (mAccessible)
+    {
+      // fail
+      mAccessible = nsnull;
+      mContent = nsnull;
+      return nsnull;
+    } else {
+      // next on parent
+      return GetNextSibling(parent);
+    }
+  }
+
+  // if next has content
+  GetAccessible(next, mAccessible, mContent);
+  if (mAccessible)
+  {
+    // done
+    return next;
+  }
+
+  // if next doesn't have node
+
+  // call first on next
+  nsIFrame* first = GetFirstChild(next);
+
+  // if found
+  if (first)
+    return first;
+
+  // call next on next
+  return GetNextSibling(next);
+}
+
+nsIFrame* nsFrameTreeWalker::GetFirstChild(nsIFrame* aFrame)
+{
+
+  //printf("Get first\n");
+
+  // get first child
+  nsIFrame* child = nsnull;
+  nsIAtom* list = nsnull;
+  mOwner->GetListAtomForFrame(aFrame, list);
+  aFrame->FirstChild(mPresContext, list, &child);
+
+  while(child)
+  {
+    // if first has a content node
+    GetAccessible(child, mAccessible, mContent);
+    if (mAccessible)
+    {
+      // done
+      return child;
+    } else {
+      // call first on child
+      nsIFrame* first = GetFirstChild(child);
+
+      // if succeeded
+      if (first)
+      {
+        // return child
+        return first;
+      }
+    }
+
+    // get next sibling
+    nsIFrame* next;
+    child->GetNextSibling(&next);
+
+    // skip children with duplicate content nodes
+    while(IsSameContent(child,next)) 
+      next->GetNextSibling(&next);
+
+    child = next;
+  }
+
+  // fail
+  mAccessible = nsnull;
+  mContent = nsnull;
+  return nsnull;
+}
+
+nsIFrame* nsFrameTreeWalker::GetChildBefore(nsIFrame* aParent, nsIFrame* aChild)
+{
+  nsIFrame* child = GetFirstChild(aParent);
+
+  // if the child is not us
+  if (child == aChild) {
+    mAccessible = nsnull;
+    mContent = nsnull;
+    return nsnull;
+  }
+
+  nsIFrame* prev = child;
+  nsCOMPtr<nsIContent> prevContent = mContent;
+  nsCOMPtr<nsIAccessible> prevAccessible = mAccessible;
+
+  while(child) 
+  {
+    child = GetNextSibling(child);
+
+    if (child == aChild)
+      break;
+
+    prev = child;
+    prevContent = mContent;
+    prevAccessible = mAccessible;
+  }
+
+  mAccessible = prevAccessible;
+  mContent = prevContent;
+  return prev;
+}
+
+nsIFrame* nsFrameTreeWalker::GetPreviousSibling(nsIFrame* aFrame)
+{
+  //printf("Get previous\n");
+
+  nsIFrame* parent = GetParent(aFrame);
+  
+  return GetChildBefore(parent, aFrame);
+}
+
+nsIFrame* nsFrameTreeWalker::GetLastChild(nsIFrame* aFrame)
+{
+  //printf("Get last\n");
+
+  return GetChildBefore(aFrame, nsnull);
+}
+
+PRInt32 nsFrameTreeWalker::GetCount(nsIFrame* aFrame)
+{
+
+  //printf("Get count\n");
+  nsIFrame* child = GetFirstChild(aFrame);
+
+  PRInt32 count = 0;
+  while(child) 
+  {
+    count++;
+    child = GetNextSibling(child);
+  }
+
+  return count;
+}
+
+void nsFrameTreeWalker::GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent)
+{
+  aContent = nsnull;
+  aAccessible = nsnull;
+
+  aFrame->GetContent(getter_AddRefs(aContent));
+
+  if (!aContent)
+    return;
+
+  nsCOMPtr<nsIDocument> document;
+  aContent->GetDocument(*getter_AddRefs(document));
+  if (!document)
+    return;
+
+  PRInt32 shells = document->GetNumberOfShells();
+  NS_ASSERTION(shells > 0,"Error no shells!");
+  nsIPresShell* shell = document->GetShellAt(0);
+  nsIFrame* frame = nsnull;
+  shell->GetPrimaryFrameFor(aContent, &frame);
+
+  if (!frame)
+    return;
+
+  aAccessible = do_QueryInterface(aFrame);
+
+  if (!aAccessible)
+    aAccessible = do_QueryInterface(aContent);
+
+  if (aAccessible)
+    printf("Found accessible!\n");
+}
+
+PRBool nsFrameTreeWalker::IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2)
+{
+  if (!aFrame1 || !aFrame2)
+    return PR_FALSE;
+
+  nsCOMPtr<nsIContent> content1;
+  nsCOMPtr<nsIContent> content2;
+
+  aFrame1->GetContent(getter_AddRefs(content1));
+  aFrame2->GetContent(getter_AddRefs(content2));
+
+  if (content1 == content2 && content1 != nsnull)
+    return PR_TRUE;
+  
+  return PR_FALSE;
+}
+
+/*
+ * Class nsAccessible
+ */
+
+//-----------------------------------------------------
+// construction 
+//-----------------------------------------------------
+nsAccessible::nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+   NS_INIT_REFCNT();
+
+   // get frame and node
+   mContent = aContent;
+   mAccessible = aAccessible;
+   mPresShell = aShell;
+
+#ifdef DEBUG_LEAKS
+  printf("nsAccessibles=%d\n", ++gnsAccessibles);
+#endif
+
+}
+
+//-----------------------------------------------------
+// destruction
+//-----------------------------------------------------
+nsAccessible::~nsAccessible()
+{
+#ifdef DEBUG_LEAKS
+  printf("nsAccessibles=%d\n", --gnsAccessibles);
+#endif
+}
+
+//NS_IMPL_ISUPPORTS2(nsAccessible, nsIAccessible, nsIAccessibleWidgetAccess);
+NS_IMPL_ISUPPORTS1(nsAccessible, nsIAccessible);
+
+  /* readonly attribute nsIAccessible accParent; */
+NS_IMETHODIMP nsAccessible::GetAccParent(nsIAccessible * *aAccParent) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccParent(aAccParent);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+    nsFrameTreeWalker walker(context, this); 
+
+    // failed? Lets do some default behavior
+    walker.GetParent(GetFrame());
+
+    // if no content or accessible then we hit the root
+    if (!walker.mContent || !walker.mAccessible)
+    {
+      *aAccParent = new nsRootAccessible(mPresShell);
+      NS_ADDREF(*aAccParent);
+      return NS_OK;
+    }
+
+    *aAccParent = CreateNewParentAccessible(walker.mAccessible, walker.mContent, mPresShell);
+    NS_ADDREF(*aAccParent);
+    return NS_OK;
+  }
+
+  *aAccParent = nsnull;
+  return NS_OK;
+}
+  /* readonly attribute nsIAccessible accNextSibling; */
+NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) 
+{ 
+  // delegate
+ 
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccNextSibling(aAccNextSibling);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  // failed? Lets do some default behavior
+
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+    nsFrameTreeWalker walker(context, this);
+
+    nsIFrame* next = walker.GetNextSibling(GetFrame());
+  
+    if (next && walker.mAccessible && walker.mContent) 
+    {
+      *aAccNextSibling = CreateNewNextAccessible(walker.mAccessible, walker.mContent, mPresShell);
+      NS_ADDREF(*aAccNextSibling);
+      return NS_OK;
+    }
+  }
+
+  *aAccNextSibling = nsnull;
+
+  return NS_OK;  
+}
+
+  /* readonly attribute nsIAccessible accPreviousSibling; */
+NS_IMETHODIMP nsAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling) 
+{ 
+// delegate
+ 
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccPreviousSibling(aAccPreviousSibling);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+ 
+  // failed? Lets do some default behavior
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+    nsFrameTreeWalker walker(context, this); 
+    nsIFrame* prev = walker.GetPreviousSibling(GetFrame());
+
+    if (prev && walker.mAccessible && walker.mContent) 
+    {
+      *aAccPreviousSibling = CreateNewPreviousAccessible(walker.mAccessible, walker.mContent, mPresShell);
+      NS_ADDREF(*aAccPreviousSibling);
+      return NS_OK;
+    }
+  }
+
+  *aAccPreviousSibling = nsnull;
+
+  return NS_OK;  
+}
+
+  /* readonly attribute nsIAccessible accFirstChild; */
+NS_IMETHODIMP nsAccessible::GetAccFirstChild(nsIAccessible * *aAccFirstChild) 
+{ 
+    
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccFirstChild(aAccFirstChild);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+
+    nsFrameTreeWalker walker(context, this); 
+    nsIFrame* child = walker.GetFirstChild(GetFrame());
+
+    if (child && walker.mAccessible && walker.mContent) 
+    {
+      *aAccFirstChild = CreateNewFirstAccessible(walker.mAccessible, walker.mContent, mPresShell);
+      NS_ADDREF(*aAccFirstChild);
+      return NS_OK;
+    }
+  }
+
+  *aAccFirstChild = nsnull;
+
+  return NS_OK;  
+}
+
+  /* readonly attribute nsIAccessible accFirstChild; */
+NS_IMETHODIMP nsAccessible::GetAccLastChild(nsIAccessible * *aAccLastChild)
+{  
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccLastChild(aAccLastChild);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+    nsFrameTreeWalker walker(context, this); 
+    nsIFrame* last = walker.GetLastChild(GetFrame());
+
+    if (last && walker.mAccessible && walker.mContent) 
+    {
+      *aAccLastChild = CreateNewLastAccessible(walker.mAccessible, walker.mContent, mPresShell);
+      NS_ADDREF(*aAccLastChild);
+      return NS_OK;
+    }
+  }
+
+  *aAccLastChild = nsnull;
+
+  return NS_OK;
+}
+
+/* readonly attribute long accChildCount; */
+NS_IMETHODIMP nsAccessible::GetAccChildCount(PRInt32 *aAccChildCount) 
+{
+  
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccChildCount(aAccChildCount);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+  
+
+  // failed? Lets do some default behavior
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+    nsFrameTreeWalker walker(context, this); 
+    *aAccChildCount = walker.GetCount(GetFrame());
+  } else 
+    *aAccChildCount = 0;
+
+  return NS_OK;  
+}
+
+
+  /* attribute wstring accName; */
+NS_IMETHODIMP nsAccessible::GetAccName(PRUnichar * *aAccName) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccName(aAccName);
+    if (NS_SUCCEEDED(rv) && *aAccName != nsnull)
+      return rv;
+  }
+
+  *aAccName = 0;
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+  /* attribute wstring accName; */
+NS_IMETHODIMP nsAccessible::GetAccDefaultAction(PRUnichar * *aDefaultAction) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccDefaultAction(aDefaultAction);
+    if (NS_SUCCEEDED(rv) && *aDefaultAction != nsnull)
+      return rv;
+  }
+
+  *aDefaultAction = 0;
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+NS_IMETHODIMP nsAccessible::SetAccName(const PRUnichar * aAccName) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->SetAccName(aAccName);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+  /* attribute wstring accValue; */
+NS_IMETHODIMP nsAccessible::GetAccValue(PRUnichar * *aAccValue) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccValue(aAccValue);
+
+    if (NS_SUCCEEDED(rv) && *aAccValue != nsnull)
+      return rv;
+  }
+
+  *aAccValue = 0;
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+NS_IMETHODIMP nsAccessible::SetAccValue(const PRUnichar * aAccValue) { return NS_ERROR_NOT_IMPLEMENTED;  }
+
+  /* readonly attribute wstring accDescription; */
+NS_IMETHODIMP nsAccessible::GetAccDescription(PRUnichar * *aAccDescription) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccDescription(aAccDescription);
+    if (NS_SUCCEEDED(rv) && *aAccDescription != nsnull)
+      return rv;
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+  /* readonly attribute wstring accRole; */
+NS_IMETHODIMP nsAccessible::GetAccRole(PRUnichar * *aAccRole) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccRole(aAccRole);
+    if (NS_SUCCEEDED(rv) && *aAccRole != nsnull)
+      return rv;
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+  /* readonly attribute wstring accState; */
+NS_IMETHODIMP nsAccessible::GetAccState(PRUint32 *aAccState) 
+{ 
+  // delegate
+  if (mAccessible) 
+    return mAccessible->GetAccState(aAccState);
+
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+NS_IMETHODIMP nsAccessible::GetAccExtState(PRUint32 *aAccExtState) 
+{ 
+  // delegate
+  if (mAccessible) 
+    return mAccessible->GetAccExtState(aAccExtState);
+
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+  /* readonly attribute wstring accHelp; */
+NS_IMETHODIMP nsAccessible::GetAccHelp(PRUnichar * *aAccHelp) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccHelp(aAccHelp);
+    if (NS_SUCCEEDED(rv) && *aAccHelp != nsnull)
+      return rv;
+  }
+
+  // failed? Lets do some default behavior
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+  /* readonly attribute boolean accFocused; */
+NS_IMETHODIMP nsAccessible::GetAccFocused(PRBool *aAccFocused) { return NS_OK;  }
+
+  /* nsIAccessible accGetChildAt (in long x, in long y); */
+NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
+{
+  PRInt32 x,y,w,h;
+  AccGetBounds(&x,&y,&w,&h);
+  if (tx > x && tx < x + w && ty > y && ty < y + h)
+  {
+    nsCOMPtr<nsIAccessible> child;
+    nsCOMPtr<nsIAccessible> next;
+    GetAccFirstChild(getter_AddRefs(child));
+    PRInt32 cx,cy,cw,ch;
+
+    while(child) {
+      child->AccGetBounds(&cx,&cy,&cw,&ch);
+      
+      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
+      {
+        *_retval = child;
+        NS_ADDREF(*_retval);
+        return NS_OK;
+      }
+      child->GetAccNextSibling(getter_AddRefs(next));
+      child = next;
+    }
+
+
+    *_retval = this;
+    NS_ADDREF(this);
+    return NS_OK;
+  }
+
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+  /* void accNavigateRight (); */
+NS_IMETHODIMP nsAccessible::AccNavigateRight(nsIAccessible **_retval) { return NS_OK;  }
+
+  /* void navigateLeft (); */
+NS_IMETHODIMP nsAccessible::AccNavigateLeft(nsIAccessible **_retval) { return NS_OK;  }
+
+  /* void navigateUp (); */
+
+NS_IMETHODIMP nsAccessible::AccNavigateUp(nsIAccessible **_retval) { return NS_OK;  }
+
+  /* void navigateDown (); */
+NS_IMETHODIMP nsAccessible::AccNavigateDown(nsIAccessible **_retval) { return NS_OK;  }
+
+
+  /* void addSelection (); */
+NS_IMETHODIMP nsAccessible::AccAddSelection(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccAddSelection();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void removeSelection (); */
+NS_IMETHODIMP nsAccessible::AccRemoveSelection(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccRemoveSelection();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void extendSelection (); */
+NS_IMETHODIMP nsAccessible::AccExtendSelection(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccExtendSelection();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void takeSelection (); */
+NS_IMETHODIMP nsAccessible::AccTakeSelection(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccTakeSelection();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void takeFocus (); */
+NS_IMETHODIMP nsAccessible::AccTakeFocus(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccTakeFocus();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void doDefaultAction (); */
+NS_IMETHODIMP nsAccessible::AccDoDefaultAction(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccDoDefaultAction();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void accGetBounds (out long x, out long y, out long width, out long height); */
+NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  nsIFrame* frame = GetBoundsFrame();
+
+  if (!frame || !context)
+  {
+    *x = *y = *width = *height = 0;
+    return NS_OK;
+  }
+
+   // sum up all rects of frames with the same content node
+  nsRect r;
+  nsIFrame* start = frame;
+  nsIFrame* next = nsnull;
+  start->GetNextSibling(&next);
+
+  start->GetRect(r);
+  
+  while (nsFrameTreeWalker::IsSameContent(start, next))
+  {
+    nsRect r2;
+    next->GetRect(r2);
+    r.UnionRect(r,r2);
+    next->GetNextSibling(&next);
+  }
+
+  nsPoint offset(r.x,r.y);
+
+  frame->GetParent(&frame);
+
+  nsPoint pos(0,0);
+  while(frame) {
+    nsIScrollableView* scrollingView;
+    nsIView*           view;
+    // XXX hack
+    frame->GetView(context, &view);
+    if (view) {
+     nsresult result = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView);
+     if (NS_SUCCEEDED(result)) {
+         nscoord xoff = 0;
+         nscoord yoff = 0;
+         scrollingView->GetScrollPosition(xoff, yoff);
+         offset.x -= xoff;
+         offset.y -= yoff;
+     }
+    }
+
+    frame->GetOrigin(pos);
+    offset += pos;
+    frame->GetParent(&frame);
+  }
+
+  float t2p;
+  context->GetTwipsToPixels(&t2p);
+
+  *x = (PRInt32)(offset.x*t2p);
+  *y = (PRInt32)(offset.y*t2p);
+  *width = (PRInt32)(r.width*t2p);
+  *height = (PRInt32)(r.height*t2p);
+
+  return NS_OK;
+}
+
+// helpers
+
+nsIFrame* nsAccessible::GetBoundsFrame()
+{
+   return GetFrame();
+}
+
+nsIFrame* nsAccessible::GetFrame()
+{
+   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+   nsIFrame* frame = nsnull;
+   shell->GetPrimaryFrameFor(mContent, &frame);
+   return frame;
+}
+
+void nsAccessible::GetPresContext(nsCOMPtr<nsIPresContext>& aContext)
+{
+  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+
+  if (shell) {
+    shell->GetPresContext(getter_AddRefs(aContext));
+  } else
+    aContext = nsnull;
+}
+
+nsIAccessible* nsAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsAccessible::CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsAccessible(aAccessible, aContent, aShell);
+}
+
+
+// ------- nsHTMLBlockAccessible ------
+
+nsHTMLBlockAccessible::nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):nsAccessible(aAccessible, aContent, aShell)
+{
+
+}
+
+nsIAccessible* nsHTMLBlockAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
+}
+
+/* nsIAccessible accGetAt (in long x, in long y); */
+NS_IMETHODIMP nsHTMLBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
+{
+  PRInt32 x,y,w,h;
+  AccGetBounds(&x,&y,&w,&h);
+  if (tx > x && tx < x + w && ty > y && ty < y + h)
+  {
+    nsCOMPtr<nsIAccessible> child;
+    nsCOMPtr<nsIAccessible> smallestChild;
+    PRInt32 smallestArea = -1;
+    nsCOMPtr<nsIAccessible> next;
+    GetAccFirstChild(getter_AddRefs(child));
+    PRInt32 cx,cy,cw,ch;
+
+    while(child) {
+      child->AccGetBounds(&cx,&cy,&cw,&ch);
+      
+      // ok if there are multiple frames the contain the point 
+      // and they overlap then pick the smallest. We need to do this
+      // for text frames.
+      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
+      {
+        if (smallestArea == -1 || cw*ch < smallestArea) {
+          smallestArea = cw*ch;
+          smallestChild = child;
+        }
+      }
+      child->GetAccNextSibling(getter_AddRefs(next));
+      child = next;
+    }
+
+    if (smallestChild != nsnull)
+    {
+      *_retval = smallestChild;
+      NS_ADDREF(*_retval);
+      return NS_OK;
+    }
+
+    *_retval = this;
+    NS_ADDREF(this);
+    return NS_OK;
+  }
+
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+
+
+
+

mozilla/accessible/src/base/nsAccessible.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef _nsAccessible_H_
+#define _nsAccessible_H_
+
+#include "nsISupports.h"
+#include "nsIAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIContent.h"
+#include "nsIDOMNode.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsWeakReference.h"
+
+class nsIFrame;
+
+class nsAccessible : public nsIAccessible
+//                     public nsIAccessibleWidgetAccess
+{
+  NS_DECL_ISUPPORTS
+
+  // nsIAccessibilityService methods:
+  NS_DECL_NSIACCESSIBLE
+
+  //NS_IMETHOD AccGetWidget(nsIWidget**);
+
+	public:
+		nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+		virtual ~nsAccessible();
+
+    virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList) { aList = nsnull; }
+
+protected:
+  virtual nsIFrame* GetFrame();
+  virtual nsIFrame* GetBoundsFrame();
+  virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
+  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+
+  nsCOMPtr<nsIContent> mContent;
+  nsCOMPtr<nsIWeakReference> mPresShell;
+  nsCOMPtr<nsIAccessible> mAccessible;
+};
+
+/* Special Accessible that knows how to handle hit detection for flowing text */
+class nsHTMLBlockAccessible : public nsAccessible
+{
+public:
+   nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+   NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
+protected:
+   virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aFrame, nsIWeakReference* aShell);
+};
+
+#endif  

mozilla/accessible/src/base/nsGenericAccessible.cpp

@@ -0,0 +1,335 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Author: Eric Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsGenericAccessible.h"
+#include "nsIEventStateManager.h"
+#include "nsIFrame.h"
+#include "nsCOMPtr.h"
+#include "nsIWeakReference.h"
+
+/* Implementation file */
+NS_IMPL_ISUPPORTS1(nsGenericAccessible, nsIAccessible)
+
+nsGenericAccessible::nsGenericAccessible()
+{
+  NS_INIT_ISUPPORTS();
+  /* member initializers and constructor code */
+}
+
+nsGenericAccessible::~nsGenericAccessible()
+{
+  /* destructor code */
+}
+
+/* nsIAccessible getAccParent (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccParent(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccNextSibling (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccPreviousSibling (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccFirstChild (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccLastChild (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* long getAccChildCount (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccName(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccValue (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccValue(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void setAccName (in wstring name); */
+NS_IMETHODIMP nsGenericAccessible::SetAccName(const PRUnichar *name)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void setAccValue (in wstring value); */
+NS_IMETHODIMP nsGenericAccessible::SetAccValue(const PRUnichar *value)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccDescription (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccDescription(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccRole(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccState (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccState(PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccDefaultAction (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccDefaultAction(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccHelp (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccHelp(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* boolean getAccFocused (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccFocused(PRBool *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accGetAt (in long x, in long y); */
+NS_IMETHODIMP nsGenericAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateRight (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateRight(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateLeft (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateLeft(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateUp (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateUp(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateDown (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateDown(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accGetBounds (out long x, out long y, out long width, out long height); */
+NS_IMETHODIMP nsGenericAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accAddSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccAddSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accRemoveSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccRemoveSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accExtendSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccExtendSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accTakeSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccTakeSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accTakeFocus (); */
+NS_IMETHODIMP nsGenericAccessible::AccTakeFocus()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accDoDefaultAction (); */
+NS_IMETHODIMP nsGenericAccessible::AccDoDefaultAction()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* unsigned long getAccExtState (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccExtState(PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//-------------
+// nsDOMAccessible
+//-------------
+
+nsDOMAccessible::nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode)
+{
+  mPresShell = getter_AddRefs(NS_GetWeakReference(aShell));
+  mNode = aNode;
+}
+
+
+/* void accRemoveSelection (); */
+NS_IMETHODIMP nsDOMAccessible::AccRemoveSelection()
+{
+    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
+    nsCOMPtr<nsISelection> selection;
+    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
+    if (NS_FAILED(rv))
+      return rv;
+
+    nsCOMPtr<nsIDOMNode> parent;
+    rv = mNode->GetParentNode(getter_AddRefs(parent));
+    if (NS_FAILED(rv))
+      return rv;
+
+    rv = selection->Collapse(parent, 0);
+    if (NS_FAILED(rv))
+      return rv;
+
+    return NS_OK;
+}
+
+/* void accTakeSelection (); */
+NS_IMETHODIMP nsDOMAccessible::AccTakeSelection()
+{
+    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
+    nsCOMPtr<nsISelection> selection;
+    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
+    if (NS_FAILED(rv))
+      return rv;
+
+    nsCOMPtr<nsIDOMNode> parent;
+    rv = mNode->GetParentNode(getter_AddRefs(parent));
+    if (NS_FAILED(rv))
+      return rv;
+
+    PRInt32 offsetInParent = 0;
+    nsCOMPtr<nsIDOMNode> child;
+    rv = parent->GetFirstChild(getter_AddRefs(child));
+    if (NS_FAILED(rv))
+      return rv;
+
+    nsCOMPtr<nsIDOMNode> next; 
+
+    while(child)
+    {
+      if (child == mNode) {
+        // Collapse selection to just before desired element,
+        rv = selection->Collapse(parent, offsetInParent);
+        if (NS_FAILED(rv))
+          return rv;
+
+        // then extend it to just after
+        rv = selection->Extend(parent, offsetInParent+1);
+        return rv;
+      }
+
+       child->GetNextSibling(getter_AddRefs(next));
+       child = next;
+       offsetInParent++;
+    }
+
+    // didn't find a child
+    return NS_ERROR_FAILURE;
+}
+
+/* void accTakeFocus (); */
+NS_IMETHODIMP nsDOMAccessible::AccTakeFocus()
+{ 
+  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+  nsCOMPtr<nsIPresContext> context;
+  shell->GetPresContext(getter_AddRefs(context));
+  nsCOMPtr<nsIContent> content = do_QueryInterface(mNode);
+  content->SetFocus(context);
+  
+  return NS_OK;
+}
+
+//-------------
+// nsLeafFrameAccessible
+//-------------
+
+nsLeafDOMAccessible::nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
+nsDOMAccessible(aShell, aNode)
+{
+}
+
+/* nsIAccessible getAccFirstChild (); */
+NS_IMETHODIMP nsLeafDOMAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/* nsIAccessible getAccLastChild (); */
+NS_IMETHODIMP nsLeafDOMAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/* long getAccChildCount (); */
+NS_IMETHODIMP nsLeafDOMAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 0;
+  return NS_OK;
+}
+

mozilla/accessible/src/base/nsGenericAccessible.h

@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Author: Eric D Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#ifndef _nsGenericAccessible_H_
+#define _nsGenericAccessible_H_
+
+#include "nsISupports.h"
+#include "nsIAccessible.h"
+#include "nsIContent.h"
+#include "nsIDOMNode.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsCOMPtr.h"
+
+class nsIWeakReference;
+
+/**
+ * Basic implementation
+ * supports nothing
+ */
+class nsGenericAccessible : public nsIAccessible
+{
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIACCESSIBLE
+
+	public:
+    nsGenericAccessible();
+    virtual ~nsGenericAccessible();
+};
+
+/**
+ * And accessible that observes a dom node
+ * supports:
+ * - selection
+ * - focus
+ */
+class nsDOMAccessible : public nsGenericAccessible
+{
+  public:
+    nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+
+    NS_IMETHOD AccTakeSelection(void); 
+    NS_IMETHOD AccTakeFocus(void); 
+    NS_IMETHOD AccRemoveSelection(void);
+
+  protected:
+    nsIWeakReference* mPresShell;
+    nsCOMPtr<nsIDOMNode> mNode;
+};
+
+/* Leaf version of DOM Accessible
+ * has no children
+ */
+class nsLeafDOMAccessible : public nsDOMAccessible
+{
+  public:
+    nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+
+    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+};
+
+#endif  

mozilla/accessible/src/base/nsRootAccessible.cpp

@@ -0,0 +1,199 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsRootAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsIDOMEventTarget.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMEventReceiver.h"
+#include "nsReadableUtils.h"
+
+NS_INTERFACE_MAP_BEGIN(nsRootAccessible)
+  NS_INTERFACE_MAP_ENTRY(nsIAccessibleEventReceiver)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAccessibleEventReceiver)
+NS_INTERFACE_MAP_END_INHERITING(nsAccessible)
+
+NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsAccessible);
+NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsAccessible);
+
+//-----------------------------------------------------
+// construction 
+//-----------------------------------------------------
+nsRootAccessible::nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame):nsAccessible(nsnull,nsnull,aShell)
+{
+ // mFrame = aFrame;
+ mListener = nsnull;
+}
+
+//-----------------------------------------------------
+// destruction
+//-----------------------------------------------------
+nsRootAccessible::~nsRootAccessible()
+{
+  RemoveAccessibleEventListener(mListener);
+}
+
+  /* attribute wstring accName; */
+NS_IMETHODIMP nsRootAccessible::GetAccName(PRUnichar * *aAccName) 
+{ 
+  *aAccName = ToNewUnicode(NS_LITERAL_STRING("Mozilla Document"));
+  return NS_OK;  
+}
+
+// helpers
+nsIFrame* nsRootAccessible::GetFrame()
+{
+  //if (!mFrame) {
+    nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+    nsIFrame* root = nsnull;
+    if (shell) 
+      shell->GetRootFrame(&root);
+  
+    return root;
+  //}
+ 
+ // return mFrame;
+}
+
+nsIAccessible* nsRootAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
+}
+
+  /* readonly attribute nsIAccessible accParent; */
+NS_IMETHODIMP nsRootAccessible::GetAccParent(nsIAccessible * *aAccParent) 
+{ 
+  *aAccParent = nsnull;
+  return NS_OK;
+}
+
+  /* readonly attribute wstring accRole; */
+NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUnichar * *aAccRole) 
+{ 
+  *aAccRole = ToNewUnicode(NS_LITERAL_STRING("client"));
+  return NS_OK;  
+}
+
+/* void addAccessibleEventListener (in nsIAccessibleEventListener aListener); */
+NS_IMETHODIMP nsRootAccessible::AddAccessibleEventListener(nsIAccessibleEventListener *aListener)
+{
+  if (!mListener)
+  {
+     // add an event listener to the document
+     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+     nsCOMPtr<nsIDocument> document;
+     shell->GetDocument(getter_AddRefs(document));
+
+     nsCOMPtr<nsIDOMEventReceiver> receiver;
+     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(receiver))) && receiver)
+     {
+        nsresult rv = receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+     }
+  }
+
+  // create a weak reference to the listener
+  mListener =  aListener;
+
+  return NS_OK;
+}
+
+/* void removeAccessibleEventListener (in nsIAccessibleEventListener aListener); */
+NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener)
+{
+  if (mListener)
+  {
+     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+     nsCOMPtr<nsIDocument> document;
+     if (!shell)
+       return NS_OK;
+
+     shell->GetDocument(getter_AddRefs(document));
+
+     nsCOMPtr<nsIDOMEventReceiver> erP;
+     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP))) && erP)
+     {
+        nsresult rv = erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+     }
+  }
+
+  mListener = nsnull;
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
+{
+  if (mListener) {
+     nsCOMPtr<nsIDOMEventTarget> t;
+     aEvent->GetOriginalTarget(getter_AddRefs(t));
+  
+     // create and accessible for the target
+     nsCOMPtr<nsIContent> content = do_QueryInterface(t); 
+
+     if (!content)
+       return NS_OK;
+
+     if (mCurrentFocus == content)
+       return NS_OK;
+
+     mCurrentFocus = content;
+
+     nsIFrame* frame = nsnull;
+     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+     shell->GetPrimaryFrameFor(content, &frame);
+
+     if (!frame)
+       return NS_OK;
+
+     nsCOMPtr<nsIAccessible> a = do_QueryInterface(frame);
+
+     if (!a)
+       a = do_QueryInterface(content);
+
+     nsCOMPtr<nsIAccessible> na = CreateNewAccessible(a, content, mPresShell);
+
+     mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, na);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRootAccessible::Focus(nsIDOMEvent* aEvent) 
+{ 
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsRootAccessible::Blur(nsIDOMEvent* aEvent) 
+{ 
+  return NS_OK;
+}
+
+
+

mozilla/accessible/src/base/nsRootAccessible.h

@@ -0,0 +1,70 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef _nsRootAccessible_H_
+#define _nsRootAccessible_H_
+
+#include "nsAccessible.h"
+#include "nsIAccessibleEventReceiver.h"
+#include "nsIAccessibleEventListener.h"
+#include "nsIDOMFocusListener.h"
+
+class nsRootAccessible : public nsAccessible,
+                         public nsIAccessibleEventReceiver,
+                         public nsIDOMFocusListener
+
+{
+  
+  NS_DECL_ISUPPORTS_INHERITED
+
+  public:
+    nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame = nsnull);
+    virtual ~nsRootAccessible();
+
+    /* attribute wstring accName; */
+    NS_IMETHOD GetAccName(PRUnichar * *aAccName);
+    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
+    NS_IMETHOD GetAccRole(PRUnichar * *aAccRole);
+
+    // ----- nsIAccessibleEventReceiver ------
+
+    NS_IMETHOD AddAccessibleEventListener(nsIAccessibleEventListener *aListener);
+    NS_IMETHOD RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener);
+
+    // ----- nsIDOMEventListener --------
+    NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent);
+    NS_IMETHOD Focus(nsIDOMEvent* aEvent);
+    NS_IMETHOD Blur(nsIDOMEvent* aEvent);
+
+protected:
+  virtual nsIFrame* GetFrame();
+  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+
+  // not a com pointer. We don't own the listener
+  // it is the callers responsibility to remove the listener
+  // otherwise we will get into circular referencing problems
+  nsIAccessibleEventListener* mListener;
+  nsCOMPtr<nsIContent> mCurrentFocus;
+};
+
+
+#endif  

mozilla/accessible/src/base/nsSelectAccessible.cpp

@@ -0,0 +1,717 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+
+#include "nsSelectAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsRootAccessible.h"
+#include "nsINameSpaceManager.h"
+#include "nsMutableAccessible.h"
+#include "nsLayoutAtoms.h"
+#include "nsIDOMMenuListener.h"
+#include "nsIDOMEventReceiver.h"
+#include "nsReadableUtils.h"
+
+class nsSelectChildAccessible : public nsAccessible,
+                                public nsIDOMMenuListener
+{
+public:
+  
+  NS_DECL_ISUPPORTS_INHERITED
+
+  nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual ~nsSelectChildAccessible();
+
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(PRUnichar **_retval);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval);
+  NS_IMETHOD GetAccValue(PRUnichar **_retval);
+
+  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  // popup listener
+  NS_IMETHOD Create(nsIDOMEvent* aEvent);
+  NS_IMETHOD Close(nsIDOMEvent* aEvent);
+  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
+  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
+
+  nsCOMPtr<nsIAtom> mPopupAtom;
+  nsCOMPtr<nsIContent> mSelectContent;
+  PRBool mRegistered;
+  PRBool mOpen;
+};
+
+NS_IMPL_ISUPPORTS_INHERITED(nsSelectChildAccessible, nsAccessible, nsIDOMMenuListener)
+
+class nsSelectWindowAccessible : public nsAccessible,
+                                 public nsIDOMMenuListener
+{
+public:
+  NS_DECL_ISUPPORTS_INHERITED
+
+  nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual ~nsSelectWindowAccessible();
+
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+  NS_IMETHOD GetAccName(PRUnichar **_retval);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+  NS_IMETHOD GetAccExtState(PRUint32 *_retval);
+
+  // popup listener
+  NS_IMETHOD Create(nsIDOMEvent* aEvent);
+  NS_IMETHOD Close(nsIDOMEvent* aEvent);
+  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
+  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
+
+  // helpers
+  virtual nsIFrame* GetBoundsFrame();
+
+  nsCOMPtr<nsIAccessible> mParent;
+  nsCOMPtr<nsIAccessible> mPrev;
+  nsCOMPtr<nsIAtom> mPopupAtom;
+  PRBool mRegistered;
+  PRBool mOpen;
+};
+
+NS_IMPL_ISUPPORTS_INHERITED(nsSelectWindowAccessible, nsAccessible, nsIDOMMenuListener)
+
+class nsSelectListAccessible : public nsAccessible
+{
+public:
+  
+  nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual ~nsSelectListAccessible() {}
+
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(PRUnichar **_retval);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
+
+  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
+  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+
+  nsCOMPtr<nsIAtom> mPopupAtom;
+  nsCOMPtr<nsIAccessible> mParent;
+};
+
+class nsListChildAccessible : public nsAccessible
+{
+public:
+  
+  nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual ~nsListChildAccessible() {}
+
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval);
+
+  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
+  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+
+  nsCOMPtr<nsIAccessible> mParent;
+  nsCOMPtr<nsIAtom> mPopupAtom;
+  nsCOMPtr<nsIContent> mSelectContent;
+};
+
+//---------
+ 
+nsSelectAccessible::nsSelectAccessible(nsIAtom* aPopupAtom, 
+                                       nsIAccessible* aAccessible, 
+                                       nsIContent* aContent, 
+                                       nsIWeakReference* aShell)
+                                               :nsAccessible(aAccessible, aContent, aShell)
+{
+  mPopupAtom = aPopupAtom;
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccValue(PRUnichar **_retval)
+{
+  // our value is our first child's value. Which is the combo boxes text.
+  nsCOMPtr<nsIAccessible> text;
+  nsresult rv = GetAccFirstChild(getter_AddRefs(text));
+
+  if (NS_FAILED(rv)) {
+     *_retval = nsnull;
+     return rv;
+  }
+
+  if (!text) {
+     *_retval = nsnull;
+     return NS_ERROR_FAILURE;
+  }
+
+  // look at our role
+  return text->GetAccValue(_retval);
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccName(PRUnichar **_retval)
+{
+   *_retval = nsnull;
+   return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccRole(PRUnichar **_retval)
+{
+  *_retval = ToNewUnicode(NS_LITERAL_STRING("combo box"));
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  // get the last child. Wrap it with a connector that connects it to the window accessible
+  nsCOMPtr<nsIAccessible> last;
+  nsresult rv = nsAccessible::GetAccLastChild(getter_AddRefs(last));
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (!last) {
+    // we have a parent but not previous
+    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
+  } else {
+    *_retval = last;
+  }
+
+  NS_ADDREF(*_retval);
+
+   return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  // get the last child. Wrap it with a connector that connects it to the window accessible
+  nsCOMPtr<nsIAccessible> first;
+  nsresult rv = nsAccessible::GetAccFirstChild(getter_AddRefs(first));
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (!first) {
+    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
+  } else {
+    *_retval = first;
+  }
+
+  NS_ADDREF(*_retval);
+
+  return NS_OK;
+}
+
+nsIAccessible* nsSelectAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewLastAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsSelectAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsSelectChildAccessible(mPopupAtom, mContent, aAccessible, aContent, aShell);
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  nsresult rv = nsAccessible::GetAccChildCount(_retval);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // always have one more that is our window child
+  (*_retval)++;
+  return NS_OK;
+}
+
+//--------------------
+
+nsSelectChildAccessible::nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
+nsAccessible(aAccessible, aContent, aShell)
+{
+  mPopupAtom = aPopupAtom;
+  mSelectContent = aSelectContent;
+  mRegistered = PR_FALSE;
+  mOpen = PR_FALSE;
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::GetAccValue(PRUnichar **_retval)
+{
+  nsresult rv = NS_OK;
+  PRUnichar* string = nsnull;
+
+  // look at our role
+  rv = nsAccessible::GetAccRole(&string);
+  if (NS_FAILED(rv)) {
+   *_retval = nsnull;
+   return rv;
+  }
+
+  nsAutoString role(string);
+
+  // if its the text in the combo box then
+  // its value should be its name.
+  if (role.EqualsIgnoreCase("text")) {
+    rv = nsAccessible::GetAccName(_retval);
+  } else {
+    rv = nsAccessible::GetAccValue(_retval);
+  }
+
+  delete string;
+  return rv;
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::GetAccRole(PRUnichar **_retval)
+{
+  nsresult rv = NS_OK;
+  PRUnichar* string = nsnull;
+
+  // look at our role
+  rv = nsAccessible::GetAccRole(&string);
+  if (NS_FAILED(rv)) {
+   *_retval = nsnull;
+   return rv;
+  }
+
+  nsAutoString role(string);
+
+  // any text in the combo box is static
+  if (role.EqualsIgnoreCase("text")) {
+    // if it the comboboxes text. Make it static
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("static text"));
+  } else {
+    rv = nsAccessible::GetAccRole(_retval);
+  }
+
+  delete string;
+  return rv;
+}
+
+
+NS_IMETHODIMP nsSelectChildAccessible::GetAccName(PRUnichar **_retval)
+{
+  nsresult rv = NS_OK;
+  PRUnichar* string = nsnull;
+
+  // look at our role
+  nsAccessible::GetAccRole(&string);
+  nsAutoString role(string);
+
+  // if button then we need to make the name be open or close
+  if (role.EqualsIgnoreCase("push button"))
+  {
+     // if its a button and not already registered, 
+     // register ourselves as a popup listener   
+     if (!mRegistered) {
+       nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
+       if (!eventReceiver) {
+         *_retval = nsnull;
+         return NS_ERROR_NOT_IMPLEMENTED;
+       }
+
+       eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
+
+       mRegistered = PR_TRUE;
+     }
+
+     // get the current state open or closed
+     // set _retval to it.
+     // notice its supposed to be reversed. Close if opened
+     // and Open if closed.
+
+     if (mOpen)
+         *_retval = ToNewUnicode(NS_LITERAL_STRING("Close"));
+     else
+         *_retval = ToNewUnicode(NS_LITERAL_STRING("Open"));
+
+  } else {
+    /*rv = nsAccessible::GetAccName(_retval);*/
+    rv = NS_ERROR_NOT_IMPLEMENTED;
+    *_retval = nsnull;
+  }
+
+  delete string;
+
+  return rv;
+}
+
+
+nsSelectChildAccessible::~nsSelectChildAccessible()
+{
+  if (mRegistered) {
+     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
+     if (eventReceiver) 
+       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
+  }
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::Create(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_TRUE;
+  printf("Open\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::Destroy(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+  printf("Close\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::Close(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+  printf("Close\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+nsIAccessible* nsSelectChildAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewPreviousAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsSelectChildAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsSelectChildAccessible(mPopupAtom, mSelectContent, aAccessible, aContent, aShell);
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{ 
+  nsCOMPtr<nsIAccessible> next;
+  nsresult rv = nsAccessible::GetAccNextSibling(getter_AddRefs(next));
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (!next) {
+    // ok no more siblings. Lets create our window
+    nsCOMPtr<nsIAccessible> parent;
+    GetAccParent(getter_AddRefs(parent));
+
+    *_retval = new nsSelectWindowAccessible(mPopupAtom, parent, nsnull, nsnull, mSelectContent, mPresShell);
+  } else {
+    *_retval = next;
+  }
+
+  NS_ADDREF(*_retval);
+
+  return NS_OK;
+} 
+
+
+//---------------------
+
+
+nsSelectWindowAccessible::nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+:nsAccessible(aAccessible, aContent, aShell)
+{
+  mParent = aParent;
+  mPrev = aPrev;
+  mPopupAtom = aPopupAtom;
+  mRegistered = PR_FALSE;
+  mOpen = PR_FALSE;
+}
+
+nsSelectWindowAccessible::~nsSelectWindowAccessible()
+{
+  if (mRegistered) {
+     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
+     if (eventReceiver) 
+       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
+  }
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::Create(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_TRUE;
+  printf("Open\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::Destroy(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+  printf("Close\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::Close(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+  printf("Close\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccState(PRUint32 *_retval)
+{
+  // not not already one register ourselves as a popup listener
+   
+  if (!mRegistered) {
+
+     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
+     if (!eventReceiver) {
+       *_retval = 0;
+       return NS_ERROR_NOT_IMPLEMENTED;
+     }
+
+     nsresult rv = eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
+
+     if (NS_FAILED(rv)) {
+       *_retval = 0;
+       return rv;
+     }
+
+     mRegistered = PR_TRUE;
+  }
+
+  // if open we are visible if closed we are invisible
+   // set _retval to it.
+   if (mOpen)
+     *_retval |= STATE_DEFAULT;
+   else
+     *_retval |= STATE_INVISIBLE;
+
+   return NS_OK;
+}
+
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccExtState(PRUint32 *_retval)
+{
+	*_retval=0;
+   return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccName(PRUnichar **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+ 
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccRole(PRUnichar **_retval)
+{
+  *_retval = ToNewUnicode(NS_LITERAL_STRING("window"));
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_IF_ADDREF(*_retval);
+    return NS_OK;
+}
+ 
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  *_retval = mPrev;
+  NS_IF_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;
+}
+
+/*
+NS_IMETHODIMP nsSelectWindowAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+  *x = *y = *width = *height = 0;
+  return NS_OK;
+}
+*/
+
+nsIFrame* nsSelectWindowAccessible::GetBoundsFrame()
+{
+  // get our frame
+  nsIFrame* frame = GetFrame();
+
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  // get its first popup child that should be the window
+  frame->FirstChild(context, mPopupAtom, &frame);
+
+  return frame;
+}
+
+//----------
+
+
+nsSelectListAccessible::nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+:nsAccessible(aAccessible, aContent, aShell)
+{
+    mPopupAtom = aPopupAtom;
+    mParent = aParent;
+}
+
+void nsSelectListAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
+{
+   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+   nsIFrame* frame = nsnull;
+   shell->GetPrimaryFrameFor(mContent, &frame);
+   if (aFrame == frame)
+     aList = mPopupAtom;
+   else
+     aList = nsnull;
+}
+
+NS_IMETHODIMP nsSelectListAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+  return mParent->AccGetBounds(x,y,width,height);
+}
+
+NS_IMETHODIMP nsSelectListAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_ADDREF(*_retval);
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectListAccessible::GetAccName(PRUnichar **_retval)
+{
+  *_retval = nsnull;
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsSelectListAccessible::GetAccRole(PRUnichar **_retval)
+{
+  *_retval = ToNewUnicode(NS_LITERAL_STRING("list"));
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectListAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectListAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+nsIAccessible* nsSelectListAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsSelectListAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
+}
+ 
+//--------
+
+nsListChildAccessible::nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
+nsAccessible(aAccessible, aContent, aShell)
+{
+  mParent = aParent;
+  mPopupAtom = aPopupAtom;
+  mSelectContent = aSelectContent;
+}
+
+nsIAccessible* nsListChildAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsListChildAccessible(mPopupAtom, mSelectContent, mParent, aAccessible, aContent, aShell);
+}
+
+void nsListChildAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
+{
+   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+   nsIFrame* frame = nsnull;
+   shell->GetPrimaryFrameFor(mSelectContent, &frame);
+   if (aFrame == frame)
+     aList = mPopupAtom;
+   else
+     aList = nsnull;
+}
+
+NS_IMETHODIMP nsListChildAccessible::GetAccRole(PRUnichar **_retval)
+{
+  *_retval = ToNewUnicode(NS_LITERAL_STRING("list item"));
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsListChildAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_IF_ADDREF(*_retval);
+    return NS_OK;
+}
+

mozilla/accessible/src/base/nsSelectAccessible.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+#ifndef __nsSelectAccessible_h__
+#define __nsSelectAccessible_h__
+
+#include "nsAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIAtom.h"
+
+class nsSelectAccessible : public nsAccessible
+{
+public:
+  
+  nsSelectAccessible(nsIAtom* aPopupAtom, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(PRUnichar **_retval);
+  NS_IMETHOD GetAccValue(PRUnichar **_retval);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+
+  virtual ~nsSelectAccessible() {}
+  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+
+  nsCOMPtr<nsIAtom> mPopupAtom;
+};
+
+
+#endif

mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp

@@ -0,0 +1,175 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Author: Eric Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsHTMLFormControlAccessible.h"
+#include "nsWeakReference.h"
+#include "nsIFrame.h"
+#include "nsIDOMHTMLInputElement.h"
+#include "nsINameSpaceManager.h"
+#include "nsHTMLAtoms.h"
+#include "nsIDOMHTMLButtonElement.h"
+#include "nsReadableUtils.h"
+
+nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
+nsLeafDOMAccessible(aShell, aNode)
+{ 
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccName(PRUnichar **_retval)
+{
+  // go up tree get name of label if there is one.
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccState (); */
+NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccState(PRUint32 *_retval)
+{
+    // can be
+    // focusable, focused, checked
+    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
+
+    PRBool checked = PR_FALSE;
+    element->GetChecked(&checked);
+    *_retval = (checked ? STATE_CHECKED : 0);
+    return NS_OK;
+}
+
+// --- checkbox -----
+
+nsHTMLCheckboxAccessible::nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
+nsHTMLFormControlAccessible(aShell, aNode)
+{ 
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccRole(PRUnichar **_retval)
+{
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("check box"));
+    return NS_OK;
+}
+
+/* wstring getAccDefaultAction (); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccDefaultAction(PRUnichar **_retval)
+{
+    // check or uncheck
+    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
+
+    PRBool checked = PR_FALSE;
+    element->GetChecked(&checked);
+    if (checked)
+        *_retval = ToNewUnicode(NS_LITERAL_STRING("Check"));
+    else
+        *_retval = ToNewUnicode(NS_LITERAL_STRING("UnCheck"));
+
+    return NS_OK;
+}
+
+/* void accDoDefaultAction (); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoDefaultAction()
+{
+  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
+  PRBool checked = PR_FALSE;
+  element->GetChecked(&checked);
+  element->SetChecked(checked ? PR_FALSE : PR_TRUE);
+
+  return NS_OK;
+}
+
+
+//------ Radio button -------
+
+nsHTMLRadioButtonAccessible::nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
+nsHTMLFormControlAccessible(aShell, aNode)
+{ 
+}
+
+/* wstring getAccDefaultAction (); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
+{
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("Select"));
+    return NS_OK;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccRole(PRUnichar **_retval)
+{
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("radio button"));
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoDefaultAction()
+{
+  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
+  element->Click();
+
+  return NS_OK;
+}
+
+// ----- Button -----
+
+nsHTMLButtonAccessible::nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
+nsHTMLFormControlAccessible(aShell, aNode)
+{ 
+}
+
+/* wstring getAccDefaultAction (); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
+{
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("Press"));
+    return NS_OK;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUnichar **_retval)
+{
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("push button"));
+    return NS_OK;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(PRUnichar **_retval)
+{
+    *_retval = nsnull;
+    nsCOMPtr<nsIDOMHTMLInputElement> button = do_QueryInterface(mNode);
+
+    if (!button)
+      return NS_ERROR_FAILURE;
+
+    nsAutoString name;
+    button->GetValue(name);
+    name.CompressWhitespace();
+
+    *_retval = name.ToNewUnicode();
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLButtonAccessible::AccDoDefaultAction()
+{
+  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
+  element->Click();
+
+  return NS_OK;
+}

mozilla/accessible/src/html/nsHTMLFormControlAccessible.h

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Author: Eric D Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#ifndef _nsHTMLFormControlAccessible_H_
+#define _nsHTMLFormControlAccessible_H_
+
+#include "nsGenericAccessible.h"
+
+class nsICheckboxControlFrame;
+
+/* Accessible for supporting for controls
+ * supports:
+ * - walking up to get name from label
+ * - support basic state
+ */
+class nsHTMLFormControlAccessible : public nsLeafDOMAccessible
+{
+
+public:
+  nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+  NS_IMETHOD GetAccName(PRUnichar **_retval); 
+  NS_IMETHOD GetAccState(PRUint32 *_retval); 
+};
+
+class nsHTMLCheckboxAccessible : public nsHTMLFormControlAccessible
+{
+
+public:
+  nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
+  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
+  NS_IMETHOD AccDoDefaultAction(void); 
+};
+
+class nsHTMLRadioButtonAccessible : public nsHTMLFormControlAccessible
+{
+
+public:
+  nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
+  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
+  NS_IMETHOD AccDoDefaultAction(void); 
+};
+
+class nsHTMLButtonAccessible : public nsHTMLFormControlAccessible
+{
+
+public:
+  nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
+  NS_IMETHOD GetAccName(PRUnichar **_retval); 
+  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
+  NS_IMETHOD AccDoDefaultAction(void); 
+
+};
+
+#endif  

mozilla/accessible/src/html/nsHTMLTextAccessible.cpp

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Author: Eric Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsHTMLTextAccessible.h"
+#include "nsICheckboxControlFrame.h"
+#include "nsWeakReference.h"
+#include "nsIFrame.h"
+
+nsHTMLTextAccessible::nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode):
+nsLeafDOMAccessible(aShell, aDomNode)
+{ 
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(PRUnichar **_retval)
+{
+  nsAutoString value;
+  mNode->GetNodeValue(value);
+  value.CompressWhitespace();
+  *_retval = value.ToNewUnicode();
+  return NS_OK;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccRole(PRUnichar **_retval)
+{
+    nsAutoString role(NS_LITERAL_STRING("text"));
+    *_retval = role.ToNewUnicode();
+
+    return NS_OK;
+}

mozilla/accessible/src/html/nsHTMLTextAccessible.h

@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef _nsHTMLTextAccessible_H_
+#define _nsHTMLTextAccessible_H_
+
+#include "nsGenericAccessible.h"
+
+class nsIWeakReference;
+class nsITextControlFrame;
+
+class nsHTMLTextAccessible : public nsLeafDOMAccessible
+{
+
+public:
+  nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode);
+  NS_IMETHOD GetAccName(PRUnichar **_retval); 
+  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
+
+private:
+  nsCOMPtr<nsIDOMNode> mDomNode;
+};
+
+#endif  

mozilla/accessible/src/makefile.win

@@ -0,0 +1,53 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..
+MODULE=accessibility
+LIBRARY_NAME=accessibility_s
+
+CPP_OBJS=\
+        .\$(OBJDIR)\nsAccessible.obj    \
+        .\$(OBJDIR)\nsRootAccessible.obj    \
+        .\$(OBJDIR)\nsMutableAccessible.obj    \
+        .\$(OBJDIR)\nsAccessibilityService.obj    \
+        .\$(OBJDIR)\nsSelectAccessible.obj    \
+        .\$(OBJDIR)\nsGenericAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLFormControlAccessible.obj    \
+        .\$(OBJDIR)\nsHTMLTextAccessible.obj    \
+	$(NULL)
+
+LINCS=                                  \
+	-I..\..\layout\html\forms\public \
+	-I..\..\layout\html\forms\src \
+	-I..\..\layout\html\base\src \
+	$(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+        $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+
+
+
+

mozilla/accessible/src/nsAccessibilityService.cpp

@@ -0,0 +1,252 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+
+#include "nsIAccessibilityService.h"
+#include "nsAccessibilityService.h"
+#include "nsAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsRootAccessible.h"
+#include "nsINameSpaceManager.h"
+#include "nsMutableAccessible.h"
+#include "nsHTMLFormControlAccessible.h"
+#include "nsLayoutAtoms.h"
+#include "nsSelectAccessible.h"
+#include "nsHTMLTextAccessible.h"
+
+//--------------------
+
+
+nsAccessibilityService::nsAccessibilityService()
+{
+	NS_INIT_REFCNT();
+}
+
+nsAccessibilityService::~nsAccessibilityService()
+{
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsAccessibilityService, nsIAccessibilityService);
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// nsIAccessibilityService methods:
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateRootAccessible(nsISupports* aPresContext, nsISupports* aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* f = NS_STATIC_CAST(nsIFrame*, aFrame);
+
+  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
+  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> s;
+  c->GetShell(getter_AddRefs(s));
+
+  NS_ASSERTION(s,"Error not presshell!!");
+
+  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
+
+  *_retval = new nsRootAccessible(wr,f);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateMutableAccessible(nsISupports* aNode, nsIMutableAccessible **_retval)
+{
+  *_retval = new nsMutableAccessible(aNode);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateHTMLBlockAccessible(nsIAccessible* aAccessible, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
+  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
+  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> s;
+  c->GetShell(getter_AddRefs(s));
+
+  NS_ASSERTION(s,"Error not presshell!!");
+
+  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
+
+  *_retval = new nsHTMLBlockAccessible(aAccessible, n,wr);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP 
+nsAccessibilityService::CreateHTMLSelectAccessible(nsIAtom* aPopupAtom, nsIDOMNode* node, nsISupports* aPresContext, nsIAccessible **_retval)
+{
+  nsCOMPtr<nsIContent> n = do_QueryInterface(node);
+  NS_ASSERTION(n,"Error non nsIContent passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresContext> c = do_QueryInterface(aPresContext);
+  NS_ASSERTION(c,"Error non prescontext passed to accessible factory!!!");
+
+  nsCOMPtr<nsIPresShell> s;
+  c->GetShell(getter_AddRefs(s)); 
+
+  nsCOMPtr<nsIWeakReference> wr = getter_AddRefs(NS_GetWeakReference(s));
+
+  *_retval = new nsSelectAccessible(aPopupAtom, nsnull, n, wr);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLCheckboxAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIPresShell> shell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLCheckboxAccessible(shell,node);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLRadioButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIPresShell> shell;
+  GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
+
+  *_retval = new nsHTMLRadioButtonAccessible(shell,node);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+/* nsIAccessible createHTMLCheckboxAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLButtonAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIPresShell> shell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLButtonAccessible(shell,node);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+/* nsIAccessible createHTMLTextAccessible (in nsISupports aPresShell, in nsISupports aFrame); */
+NS_IMETHODIMP nsAccessibilityService::CreateHTMLTextAccessible(nsISupports *aFrame, nsIAccessible **_retval)
+{
+  nsIFrame* frame;
+  nsCOMPtr<nsIDOMNode> node;
+  nsCOMPtr<nsIPresShell> shell;
+  nsresult rv = GetInfo(aFrame, &frame, getter_AddRefs(shell), getter_AddRefs(node));
+  if (NS_FAILED(rv))
+    return rv;
+
+  *_retval = new nsHTMLTextAccessible(shell, node);
+  if (*_retval) {
+    NS_ADDREF(*_retval);
+    return NS_OK;
+  } else 
+    return NS_ERROR_OUT_OF_MEMORY;
+}
+
+NS_IMETHODIMP nsAccessibilityService::GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aNode)
+{
+  *aRealFrame = NS_STATIC_CAST(nsIFrame*, aFrame);
+  nsCOMPtr<nsIContent> content;
+  (*aRealFrame)->GetContent(getter_AddRefs(content));
+  nsCOMPtr<nsIDOMNode> node = do_QueryInterface(content);
+  *aNode = node;
+  NS_ADDREF(*aNode);
+
+  nsCOMPtr<nsIDocument> document;
+  content->GetDocument(*getter_AddRefs(document));
+
+#ifdef DEBUG
+  PRInt32 shells = document->GetNumberOfShells();
+  NS_ASSERTION(shells > 0,"Error no shells!");
+#endif
+
+  *aShell = document->GetShellAt(0);
+  NS_IF_ADDREF(*aShell);
+
+  return NS_OK;
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+nsresult
+NS_NewAccessibilityService(nsIAccessibilityService** aResult)
+{
+    NS_PRECONDITION(aResult != nsnull, "null ptr");
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    nsAccessibilityService* a = new nsAccessibilityService();
+    if (a == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    NS_ADDREF(a);
+    *aResult = a;
+    return NS_OK;
+}
+

mozilla/accessible/src/nsAccessibilityService.h

@@ -0,0 +1,53 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+
+#ifndef __nsAccessibilityService_h__
+#define __nsAccessibilityService_h__
+
+#include "nsIAccessibilityService.h"
+class nsIFrame;
+class nsIPresShell;
+class nsIDOMNode;
+
+class nsAccessibilityService : public nsIAccessibilityService
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  // nsIAccessibilityService methods:
+  NS_DECL_NSIACCESSIBILITYSERVICE
+
+  // nsAccessibilityService methods:
+  nsAccessibilityService();
+  virtual ~nsAccessibilityService();
+
+public:
+
+private:
+  NS_IMETHOD GetInfo(nsISupports* aFrame, nsIFrame** aRealFrame, nsIPresShell** aShell, nsIDOMNode** aContent);
+
+};
+
+#endif /* __nsIccessibilityService_h__ */

mozilla/accessible/src/nsAccessible.cpp

@@ -0,0 +1,968 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsIScrollableView.h"
+#include "nsRootAccessible.h"
+
+//#define DEBUG_LEAKS
+
+#ifdef DEBUG_LEAKS
+static gnsAccessibles = 0;
+#endif
+
+
+class nsFrameTreeWalker {
+public:
+  nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner);
+  nsIFrame* GetNextSibling(nsIFrame* aFrame);
+  nsIFrame* GetPreviousSibling(nsIFrame* aFrame);
+  nsIFrame* GetParent(nsIFrame* aFrame);
+  nsIFrame* GetFirstChild(nsIFrame* aFrame);
+  nsIFrame* GetLastChild(nsIFrame* aFrame);
+  nsIFrame* GetChildBefore(nsIFrame* aParent, nsIFrame* aChild);
+  PRInt32 GetCount(nsIFrame* aFrame);
+
+  static PRBool IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2);
+  static void GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent);
+
+  nsCOMPtr<nsIPresContext> mPresContext;
+  nsCOMPtr<nsIAccessible> mAccessible;
+  nsCOMPtr<nsIContent> mContent;
+  nsAccessible* mOwner;
+};
+
+nsFrameTreeWalker::nsFrameTreeWalker(nsIPresContext* aPresContext, nsAccessible* aOwner)
+{
+  mPresContext = aPresContext;
+  mOwner = aOwner;
+}
+
+nsIFrame* nsFrameTreeWalker::GetParent(nsIFrame* aFrame)
+{
+  //printf("Get parent\n");
+
+  nsIFrame* parent = nsnull;
+  aFrame->GetParent(&parent);
+
+  // if no parent then we hit the root
+  // just return that top frame
+  if (!parent) {
+    mAccessible = nsnull;
+    mContent = nsnull;
+    return aFrame;
+  }
+
+  GetAccessible(parent, mAccessible, mContent);
+  if (mAccessible)
+    return parent;
+  
+  return GetParent(parent);
+}
+
+nsIFrame* nsFrameTreeWalker::GetNextSibling(nsIFrame* aFrame)
+{
+  //printf("Get next\n");
+
+  // get next sibling
+  nsIFrame* next = nsnull;
+  aFrame->GetNextSibling(&next);
+
+  // skip any frames with the same content node
+  while(IsSameContent(aFrame,next)) 
+    next->GetNextSibling(&next);
+
+  // if failed
+  if (!next)
+  {
+    // if parent has content
+    nsIFrame* parent = nsnull;
+    aFrame->GetParent(&parent);
+    
+    // if no parent fail
+    if (!parent) {
+      mAccessible = nsnull;
+      mContent = nsnull;
+      return nsnull;
+    }
+
+    // fail if we reach a parent that is accessible
+    GetAccessible(parent, mAccessible, mContent);
+    if (mAccessible)
+    {
+      // fail
+      mAccessible = nsnull;
+      mContent = nsnull;
+      return nsnull;
+    } else {
+      // next on parent
+      return GetNextSibling(parent);
+    }
+  }
+
+  // if next has content
+  GetAccessible(next, mAccessible, mContent);
+  if (mAccessible)
+  {
+    // done
+    return next;
+  }
+
+  // if next doesn't have node
+
+  // call first on next
+  nsIFrame* first = GetFirstChild(next);
+
+  // if found
+  if (first)
+    return first;
+
+  // call next on next
+  return GetNextSibling(next);
+}
+
+nsIFrame* nsFrameTreeWalker::GetFirstChild(nsIFrame* aFrame)
+{
+
+  //printf("Get first\n");
+
+  // get first child
+  nsIFrame* child = nsnull;
+  nsIAtom* list = nsnull;
+  mOwner->GetListAtomForFrame(aFrame, list);
+  aFrame->FirstChild(mPresContext, list, &child);
+
+  while(child)
+  {
+    // if first has a content node
+    GetAccessible(child, mAccessible, mContent);
+    if (mAccessible)
+    {
+      // done
+      return child;
+    } else {
+      // call first on child
+      nsIFrame* first = GetFirstChild(child);
+
+      // if succeeded
+      if (first)
+      {
+        // return child
+        return first;
+      }
+    }
+
+    // get next sibling
+    nsIFrame* next;
+    child->GetNextSibling(&next);
+
+    // skip children with duplicate content nodes
+    while(IsSameContent(child,next)) 
+      next->GetNextSibling(&next);
+
+    child = next;
+  }
+
+  // fail
+  mAccessible = nsnull;
+  mContent = nsnull;
+  return nsnull;
+}
+
+nsIFrame* nsFrameTreeWalker::GetChildBefore(nsIFrame* aParent, nsIFrame* aChild)
+{
+  nsIFrame* child = GetFirstChild(aParent);
+
+  // if the child is not us
+  if (child == aChild) {
+    mAccessible = nsnull;
+    mContent = nsnull;
+    return nsnull;
+  }
+
+  nsIFrame* prev = child;
+  nsCOMPtr<nsIContent> prevContent = mContent;
+  nsCOMPtr<nsIAccessible> prevAccessible = mAccessible;
+
+  while(child) 
+  {
+    child = GetNextSibling(child);
+
+    if (child == aChild)
+      break;
+
+    prev = child;
+    prevContent = mContent;
+    prevAccessible = mAccessible;
+  }
+
+  mAccessible = prevAccessible;
+  mContent = prevContent;
+  return prev;
+}
+
+nsIFrame* nsFrameTreeWalker::GetPreviousSibling(nsIFrame* aFrame)
+{
+  //printf("Get previous\n");
+
+  nsIFrame* parent = GetParent(aFrame);
+  
+  return GetChildBefore(parent, aFrame);
+}
+
+nsIFrame* nsFrameTreeWalker::GetLastChild(nsIFrame* aFrame)
+{
+  //printf("Get last\n");
+
+  return GetChildBefore(aFrame, nsnull);
+}
+
+PRInt32 nsFrameTreeWalker::GetCount(nsIFrame* aFrame)
+{
+
+  //printf("Get count\n");
+  nsIFrame* child = GetFirstChild(aFrame);
+
+  PRInt32 count = 0;
+  while(child) 
+  {
+    count++;
+    child = GetNextSibling(child);
+  }
+
+  return count;
+}
+
+void nsFrameTreeWalker::GetAccessible(nsIFrame* aFrame, nsCOMPtr<nsIAccessible>& aAccessible, nsCOMPtr<nsIContent>& aContent)
+{
+  aContent = nsnull;
+  aAccessible = nsnull;
+
+  aFrame->GetContent(getter_AddRefs(aContent));
+
+  if (!aContent)
+    return;
+
+  nsCOMPtr<nsIDocument> document;
+  aContent->GetDocument(*getter_AddRefs(document));
+  if (!document)
+    return;
+
+  PRInt32 shells = document->GetNumberOfShells();
+  NS_ASSERTION(shells > 0,"Error no shells!");
+  nsIPresShell* shell = document->GetShellAt(0);
+  nsIFrame* frame = nsnull;
+  shell->GetPrimaryFrameFor(aContent, &frame);
+
+  if (!frame)
+    return;
+
+  aAccessible = do_QueryInterface(aFrame);
+
+  if (!aAccessible)
+    aAccessible = do_QueryInterface(aContent);
+
+  if (aAccessible)
+    printf("Found accessible!\n");
+}
+
+PRBool nsFrameTreeWalker::IsSameContent(nsIFrame* aFrame1, nsIFrame* aFrame2)
+{
+  if (!aFrame1 || !aFrame2)
+    return PR_FALSE;
+
+  nsCOMPtr<nsIContent> content1;
+  nsCOMPtr<nsIContent> content2;
+
+  aFrame1->GetContent(getter_AddRefs(content1));
+  aFrame2->GetContent(getter_AddRefs(content2));
+
+  if (content1 == content2 && content1 != nsnull)
+    return PR_TRUE;
+  
+  return PR_FALSE;
+}
+
+/*
+ * Class nsAccessible
+ */
+
+//-----------------------------------------------------
+// construction 
+//-----------------------------------------------------
+nsAccessible::nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+   NS_INIT_REFCNT();
+
+   // get frame and node
+   mContent = aContent;
+   mAccessible = aAccessible;
+   mPresShell = aShell;
+
+#ifdef DEBUG_LEAKS
+  printf("nsAccessibles=%d\n", ++gnsAccessibles);
+#endif
+
+}
+
+//-----------------------------------------------------
+// destruction
+//-----------------------------------------------------
+nsAccessible::~nsAccessible()
+{
+#ifdef DEBUG_LEAKS
+  printf("nsAccessibles=%d\n", --gnsAccessibles);
+#endif
+}
+
+//NS_IMPL_ISUPPORTS2(nsAccessible, nsIAccessible, nsIAccessibleWidgetAccess);
+NS_IMPL_ISUPPORTS1(nsAccessible, nsIAccessible);
+
+  /* readonly attribute nsIAccessible accParent; */
+NS_IMETHODIMP nsAccessible::GetAccParent(nsIAccessible * *aAccParent) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccParent(aAccParent);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+    nsFrameTreeWalker walker(context, this); 
+
+    // failed? Lets do some default behavior
+    walker.GetParent(GetFrame());
+
+    // if no content or accessible then we hit the root
+    if (!walker.mContent || !walker.mAccessible)
+    {
+      *aAccParent = new nsRootAccessible(mPresShell);
+      NS_ADDREF(*aAccParent);
+      return NS_OK;
+    }
+
+    *aAccParent = CreateNewParentAccessible(walker.mAccessible, walker.mContent, mPresShell);
+    NS_ADDREF(*aAccParent);
+    return NS_OK;
+  }
+
+  *aAccParent = nsnull;
+  return NS_OK;
+}
+  /* readonly attribute nsIAccessible accNextSibling; */
+NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) 
+{ 
+  // delegate
+ 
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccNextSibling(aAccNextSibling);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  // failed? Lets do some default behavior
+
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+    nsFrameTreeWalker walker(context, this);
+
+    nsIFrame* next = walker.GetNextSibling(GetFrame());
+  
+    if (next && walker.mAccessible && walker.mContent) 
+    {
+      *aAccNextSibling = CreateNewNextAccessible(walker.mAccessible, walker.mContent, mPresShell);
+      NS_ADDREF(*aAccNextSibling);
+      return NS_OK;
+    }
+  }
+
+  *aAccNextSibling = nsnull;
+
+  return NS_OK;  
+}
+
+  /* readonly attribute nsIAccessible accPreviousSibling; */
+NS_IMETHODIMP nsAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling) 
+{ 
+// delegate
+ 
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccPreviousSibling(aAccPreviousSibling);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+ 
+  // failed? Lets do some default behavior
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+    nsFrameTreeWalker walker(context, this); 
+    nsIFrame* prev = walker.GetPreviousSibling(GetFrame());
+
+    if (prev && walker.mAccessible && walker.mContent) 
+    {
+      *aAccPreviousSibling = CreateNewPreviousAccessible(walker.mAccessible, walker.mContent, mPresShell);
+      NS_ADDREF(*aAccPreviousSibling);
+      return NS_OK;
+    }
+  }
+
+  *aAccPreviousSibling = nsnull;
+
+  return NS_OK;  
+}
+
+  /* readonly attribute nsIAccessible accFirstChild; */
+NS_IMETHODIMP nsAccessible::GetAccFirstChild(nsIAccessible * *aAccFirstChild) 
+{ 
+    
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccFirstChild(aAccFirstChild);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+
+    nsFrameTreeWalker walker(context, this); 
+    nsIFrame* child = walker.GetFirstChild(GetFrame());
+
+    if (child && walker.mAccessible && walker.mContent) 
+    {
+      *aAccFirstChild = CreateNewFirstAccessible(walker.mAccessible, walker.mContent, mPresShell);
+      NS_ADDREF(*aAccFirstChild);
+      return NS_OK;
+    }
+  }
+
+  *aAccFirstChild = nsnull;
+
+  return NS_OK;  
+}
+
+  /* readonly attribute nsIAccessible accFirstChild; */
+NS_IMETHODIMP nsAccessible::GetAccLastChild(nsIAccessible * *aAccLastChild)
+{  
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccLastChild(aAccLastChild);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+    nsFrameTreeWalker walker(context, this); 
+    nsIFrame* last = walker.GetLastChild(GetFrame());
+
+    if (last && walker.mAccessible && walker.mContent) 
+    {
+      *aAccLastChild = CreateNewLastAccessible(walker.mAccessible, walker.mContent, mPresShell);
+      NS_ADDREF(*aAccLastChild);
+      return NS_OK;
+    }
+  }
+
+  *aAccLastChild = nsnull;
+
+  return NS_OK;
+}
+
+/* readonly attribute long accChildCount; */
+NS_IMETHODIMP nsAccessible::GetAccChildCount(PRInt32 *aAccChildCount) 
+{
+  
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccChildCount(aAccChildCount);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+  
+
+  // failed? Lets do some default behavior
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  if (context) {
+    nsFrameTreeWalker walker(context, this); 
+    *aAccChildCount = walker.GetCount(GetFrame());
+  } else 
+    *aAccChildCount = 0;
+
+  return NS_OK;  
+}
+
+
+  /* attribute wstring accName; */
+NS_IMETHODIMP nsAccessible::GetAccName(PRUnichar * *aAccName) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccName(aAccName);
+    if (NS_SUCCEEDED(rv) && *aAccName != nsnull)
+      return rv;
+  }
+
+  *aAccName = 0;
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+  /* attribute wstring accName; */
+NS_IMETHODIMP nsAccessible::GetAccDefaultAction(PRUnichar * *aDefaultAction) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccDefaultAction(aDefaultAction);
+    if (NS_SUCCEEDED(rv) && *aDefaultAction != nsnull)
+      return rv;
+  }
+
+  *aDefaultAction = 0;
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+NS_IMETHODIMP nsAccessible::SetAccName(const PRUnichar * aAccName) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->SetAccName(aAccName);
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+  /* attribute wstring accValue; */
+NS_IMETHODIMP nsAccessible::GetAccValue(PRUnichar * *aAccValue) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccValue(aAccValue);
+
+    if (NS_SUCCEEDED(rv) && *aAccValue != nsnull)
+      return rv;
+  }
+
+  *aAccValue = 0;
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+NS_IMETHODIMP nsAccessible::SetAccValue(const PRUnichar * aAccValue) { return NS_ERROR_NOT_IMPLEMENTED;  }
+
+  /* readonly attribute wstring accDescription; */
+NS_IMETHODIMP nsAccessible::GetAccDescription(PRUnichar * *aAccDescription) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccDescription(aAccDescription);
+    if (NS_SUCCEEDED(rv) && *aAccDescription != nsnull)
+      return rv;
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+  /* readonly attribute wstring accRole; */
+NS_IMETHODIMP nsAccessible::GetAccRole(PRUnichar * *aAccRole) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccRole(aAccRole);
+    if (NS_SUCCEEDED(rv) && *aAccRole != nsnull)
+      return rv;
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+  /* readonly attribute wstring accState; */
+NS_IMETHODIMP nsAccessible::GetAccState(PRUint32 *aAccState) 
+{ 
+  // delegate
+  if (mAccessible) 
+    return mAccessible->GetAccState(aAccState);
+
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+NS_IMETHODIMP nsAccessible::GetAccExtState(PRUint32 *aAccExtState) 
+{ 
+  // delegate
+  if (mAccessible) 
+    return mAccessible->GetAccExtState(aAccExtState);
+
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+  /* readonly attribute wstring accHelp; */
+NS_IMETHODIMP nsAccessible::GetAccHelp(PRUnichar * *aAccHelp) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->GetAccHelp(aAccHelp);
+    if (NS_SUCCEEDED(rv) && *aAccHelp != nsnull)
+      return rv;
+  }
+
+  // failed? Lets do some default behavior
+  return NS_ERROR_NOT_IMPLEMENTED;  
+}
+
+  /* readonly attribute boolean accFocused; */
+NS_IMETHODIMP nsAccessible::GetAccFocused(PRBool *aAccFocused) { return NS_OK;  }
+
+  /* nsIAccessible accGetChildAt (in long x, in long y); */
+NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
+{
+  PRInt32 x,y,w,h;
+  AccGetBounds(&x,&y,&w,&h);
+  if (tx > x && tx < x + w && ty > y && ty < y + h)
+  {
+    nsCOMPtr<nsIAccessible> child;
+    nsCOMPtr<nsIAccessible> next;
+    GetAccFirstChild(getter_AddRefs(child));
+    PRInt32 cx,cy,cw,ch;
+
+    while(child) {
+      child->AccGetBounds(&cx,&cy,&cw,&ch);
+      
+      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
+      {
+        *_retval = child;
+        NS_ADDREF(*_retval);
+        return NS_OK;
+      }
+      child->GetAccNextSibling(getter_AddRefs(next));
+      child = next;
+    }
+
+
+    *_retval = this;
+    NS_ADDREF(this);
+    return NS_OK;
+  }
+
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+  /* void accNavigateRight (); */
+NS_IMETHODIMP nsAccessible::AccNavigateRight(nsIAccessible **_retval) { return NS_OK;  }
+
+  /* void navigateLeft (); */
+NS_IMETHODIMP nsAccessible::AccNavigateLeft(nsIAccessible **_retval) { return NS_OK;  }
+
+  /* void navigateUp (); */
+
+NS_IMETHODIMP nsAccessible::AccNavigateUp(nsIAccessible **_retval) { return NS_OK;  }
+
+  /* void navigateDown (); */
+NS_IMETHODIMP nsAccessible::AccNavigateDown(nsIAccessible **_retval) { return NS_OK;  }
+
+
+  /* void addSelection (); */
+NS_IMETHODIMP nsAccessible::AccAddSelection(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccAddSelection();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void removeSelection (); */
+NS_IMETHODIMP nsAccessible::AccRemoveSelection(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccRemoveSelection();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void extendSelection (); */
+NS_IMETHODIMP nsAccessible::AccExtendSelection(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccExtendSelection();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void takeSelection (); */
+NS_IMETHODIMP nsAccessible::AccTakeSelection(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccTakeSelection();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void takeFocus (); */
+NS_IMETHODIMP nsAccessible::AccTakeFocus(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccTakeFocus();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void doDefaultAction (); */
+NS_IMETHODIMP nsAccessible::AccDoDefaultAction(void) 
+{ 
+  // delegate
+  if (mAccessible) {
+    nsresult rv = mAccessible->AccDoDefaultAction();
+    if (NS_SUCCEEDED(rv))
+      return rv;
+  }
+
+  return NS_ERROR_FAILURE;  
+}
+
+  /* void accGetBounds (out long x, out long y, out long width, out long height); */
+NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  nsIFrame* frame = GetBoundsFrame();
+
+  if (!frame || !context)
+  {
+    *x = *y = *width = *height = 0;
+    return NS_OK;
+  }
+
+   // sum up all rects of frames with the same content node
+  nsRect r;
+  nsIFrame* start = frame;
+  nsIFrame* next = nsnull;
+  start->GetNextSibling(&next);
+
+  start->GetRect(r);
+  
+  while (nsFrameTreeWalker::IsSameContent(start, next))
+  {
+    nsRect r2;
+    next->GetRect(r2);
+    r.UnionRect(r,r2);
+    next->GetNextSibling(&next);
+  }
+
+  nsPoint offset(r.x,r.y);
+
+  frame->GetParent(&frame);
+
+  nsPoint pos(0,0);
+  while(frame) {
+    nsIScrollableView* scrollingView;
+    nsIView*           view;
+    // XXX hack
+    frame->GetView(context, &view);
+    if (view) {
+     nsresult result = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView);
+     if (NS_SUCCEEDED(result)) {
+         nscoord xoff = 0;
+         nscoord yoff = 0;
+         scrollingView->GetScrollPosition(xoff, yoff);
+         offset.x -= xoff;
+         offset.y -= yoff;
+     }
+    }
+
+    frame->GetOrigin(pos);
+    offset += pos;
+    frame->GetParent(&frame);
+  }
+
+  float t2p;
+  context->GetTwipsToPixels(&t2p);
+
+  *x = (PRInt32)(offset.x*t2p);
+  *y = (PRInt32)(offset.y*t2p);
+  *width = (PRInt32)(r.width*t2p);
+  *height = (PRInt32)(r.height*t2p);
+
+  return NS_OK;
+}
+
+// helpers
+
+nsIFrame* nsAccessible::GetBoundsFrame()
+{
+   return GetFrame();
+}
+
+nsIFrame* nsAccessible::GetFrame()
+{
+   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+   nsIFrame* frame = nsnull;
+   shell->GetPrimaryFrameFor(mContent, &frame);
+   return frame;
+}
+
+void nsAccessible::GetPresContext(nsCOMPtr<nsIPresContext>& aContext)
+{
+  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+
+  if (shell) {
+    shell->GetPresContext(getter_AddRefs(aContext));
+  } else
+    aContext = nsnull;
+}
+
+nsIAccessible* nsAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsAccessible::CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsAccessible(aAccessible, aContent, aShell);
+}
+
+
+// ------- nsHTMLBlockAccessible ------
+
+nsHTMLBlockAccessible::nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):nsAccessible(aAccessible, aContent, aShell)
+{
+
+}
+
+nsIAccessible* nsHTMLBlockAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
+}
+
+/* nsIAccessible accGetAt (in long x, in long y); */
+NS_IMETHODIMP nsHTMLBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval)
+{
+  PRInt32 x,y,w,h;
+  AccGetBounds(&x,&y,&w,&h);
+  if (tx > x && tx < x + w && ty > y && ty < y + h)
+  {
+    nsCOMPtr<nsIAccessible> child;
+    nsCOMPtr<nsIAccessible> smallestChild;
+    PRInt32 smallestArea = -1;
+    nsCOMPtr<nsIAccessible> next;
+    GetAccFirstChild(getter_AddRefs(child));
+    PRInt32 cx,cy,cw,ch;
+
+    while(child) {
+      child->AccGetBounds(&cx,&cy,&cw,&ch);
+      
+      // ok if there are multiple frames the contain the point 
+      // and they overlap then pick the smallest. We need to do this
+      // for text frames.
+      if (tx > cx && tx < cx + cw && ty > cy && ty < cy + ch) 
+      {
+        if (smallestArea == -1 || cw*ch < smallestArea) {
+          smallestArea = cw*ch;
+          smallestChild = child;
+        }
+      }
+      child->GetAccNextSibling(getter_AddRefs(next));
+      child = next;
+    }
+
+    if (smallestChild != nsnull)
+    {
+      *_retval = smallestChild;
+      NS_ADDREF(*_retval);
+      return NS_OK;
+    }
+
+    *_retval = this;
+    NS_ADDREF(this);
+    return NS_OK;
+  }
+
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+
+
+
+

mozilla/accessible/src/nsAccessible.h

@@ -0,0 +1,79 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef _nsAccessible_H_
+#define _nsAccessible_H_
+
+#include "nsISupports.h"
+#include "nsIAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIContent.h"
+#include "nsIDOMNode.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsWeakReference.h"
+
+class nsIFrame;
+
+class nsAccessible : public nsIAccessible
+//                     public nsIAccessibleWidgetAccess
+{
+  NS_DECL_ISUPPORTS
+
+  // nsIAccessibilityService methods:
+  NS_DECL_NSIACCESSIBLE
+
+  //NS_IMETHOD AccGetWidget(nsIWidget**);
+
+	public:
+		nsAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+		virtual ~nsAccessible();
+
+    virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList) { aList = nsnull; }
+
+protected:
+  virtual nsIFrame* GetFrame();
+  virtual nsIFrame* GetBoundsFrame();
+  virtual void GetPresContext(nsCOMPtr<nsIPresContext>& aContext);
+  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewParentAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+
+  nsCOMPtr<nsIContent> mContent;
+  nsCOMPtr<nsIWeakReference> mPresShell;
+  nsCOMPtr<nsIAccessible> mAccessible;
+};
+
+/* Special Accessible that knows how to handle hit detection for flowing text */
+class nsHTMLBlockAccessible : public nsAccessible
+{
+public:
+   nsHTMLBlockAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+   NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval);
+protected:
+   virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aFrame, nsIWeakReference* aShell);
+};
+
+#endif  

mozilla/accessible/src/nsGenericAccessible.cpp

@@ -0,0 +1,335 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Author: Eric Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsGenericAccessible.h"
+#include "nsIEventStateManager.h"
+#include "nsIFrame.h"
+#include "nsCOMPtr.h"
+#include "nsIWeakReference.h"
+
+/* Implementation file */
+NS_IMPL_ISUPPORTS1(nsGenericAccessible, nsIAccessible)
+
+nsGenericAccessible::nsGenericAccessible()
+{
+  NS_INIT_ISUPPORTS();
+  /* member initializers and constructor code */
+}
+
+nsGenericAccessible::~nsGenericAccessible()
+{
+  /* destructor code */
+}
+
+/* nsIAccessible getAccParent (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccParent(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccNextSibling (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccPreviousSibling (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccFirstChild (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible getAccLastChild (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* long getAccChildCount (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccName(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccValue (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccValue(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void setAccName (in wstring name); */
+NS_IMETHODIMP nsGenericAccessible::SetAccName(const PRUnichar *name)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void setAccValue (in wstring value); */
+NS_IMETHODIMP nsGenericAccessible::SetAccValue(const PRUnichar *value)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccDescription (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccDescription(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccRole(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccState (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccState(PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccDefaultAction (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccDefaultAction(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccHelp (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccHelp(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* boolean getAccFocused (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccFocused(PRBool *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accGetAt (in long x, in long y); */
+NS_IMETHODIMP nsGenericAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateRight (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateRight(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateLeft (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateLeft(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateUp (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateUp(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* nsIAccessible accNavigateDown (); */
+NS_IMETHODIMP nsGenericAccessible::AccNavigateDown(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accGetBounds (out long x, out long y, out long width, out long height); */
+NS_IMETHODIMP nsGenericAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accAddSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccAddSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accRemoveSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccRemoveSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accExtendSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccExtendSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accTakeSelection (); */
+NS_IMETHODIMP nsGenericAccessible::AccTakeSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accTakeFocus (); */
+NS_IMETHODIMP nsGenericAccessible::AccTakeFocus()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* void accDoDefaultAction (); */
+NS_IMETHODIMP nsGenericAccessible::AccDoDefaultAction()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* unsigned long getAccExtState (); */
+NS_IMETHODIMP nsGenericAccessible::GetAccExtState(PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//-------------
+// nsDOMAccessible
+//-------------
+
+nsDOMAccessible::nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode)
+{
+  mPresShell = getter_AddRefs(NS_GetWeakReference(aShell));
+  mNode = aNode;
+}
+
+
+/* void accRemoveSelection (); */
+NS_IMETHODIMP nsDOMAccessible::AccRemoveSelection()
+{
+    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
+    nsCOMPtr<nsISelection> selection;
+    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
+    if (NS_FAILED(rv))
+      return rv;
+
+    nsCOMPtr<nsIDOMNode> parent;
+    rv = mNode->GetParentNode(getter_AddRefs(parent));
+    if (NS_FAILED(rv))
+      return rv;
+
+    rv = selection->Collapse(parent, 0);
+    if (NS_FAILED(rv))
+      return rv;
+
+    return NS_OK;
+}
+
+/* void accTakeSelection (); */
+NS_IMETHODIMP nsDOMAccessible::AccTakeSelection()
+{
+    nsCOMPtr<nsISelectionController> control = do_QueryReferent(mPresShell);
+    nsCOMPtr<nsISelection> selection;
+    nsresult rv = control->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(selection));
+    if (NS_FAILED(rv))
+      return rv;
+
+    nsCOMPtr<nsIDOMNode> parent;
+    rv = mNode->GetParentNode(getter_AddRefs(parent));
+    if (NS_FAILED(rv))
+      return rv;
+
+    PRInt32 offsetInParent = 0;
+    nsCOMPtr<nsIDOMNode> child;
+    rv = parent->GetFirstChild(getter_AddRefs(child));
+    if (NS_FAILED(rv))
+      return rv;
+
+    nsCOMPtr<nsIDOMNode> next; 
+
+    while(child)
+    {
+      if (child == mNode) {
+        // Collapse selection to just before desired element,
+        rv = selection->Collapse(parent, offsetInParent);
+        if (NS_FAILED(rv))
+          return rv;
+
+        // then extend it to just after
+        rv = selection->Extend(parent, offsetInParent+1);
+        return rv;
+      }
+
+       child->GetNextSibling(getter_AddRefs(next));
+       child = next;
+       offsetInParent++;
+    }
+
+    // didn't find a child
+    return NS_ERROR_FAILURE;
+}
+
+/* void accTakeFocus (); */
+NS_IMETHODIMP nsDOMAccessible::AccTakeFocus()
+{ 
+  nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+  nsCOMPtr<nsIPresContext> context;
+  shell->GetPresContext(getter_AddRefs(context));
+  nsCOMPtr<nsIContent> content = do_QueryInterface(mNode);
+  content->SetFocus(context);
+  
+  return NS_OK;
+}
+
+//-------------
+// nsLeafFrameAccessible
+//-------------
+
+nsLeafDOMAccessible::nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
+nsDOMAccessible(aShell, aNode)
+{
+}
+
+/* nsIAccessible getAccFirstChild (); */
+NS_IMETHODIMP nsLeafDOMAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/* nsIAccessible getAccLastChild (); */
+NS_IMETHODIMP nsLeafDOMAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+/* long getAccChildCount (); */
+NS_IMETHODIMP nsLeafDOMAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 0;
+  return NS_OK;
+}
+

mozilla/accessible/src/nsGenericAccessible.h

@@ -0,0 +1,84 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Author: Eric D Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#ifndef _nsGenericAccessible_H_
+#define _nsGenericAccessible_H_
+
+#include "nsISupports.h"
+#include "nsIAccessible.h"
+#include "nsIContent.h"
+#include "nsIDOMNode.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsCOMPtr.h"
+
+class nsIWeakReference;
+
+/**
+ * Basic implementation
+ * supports nothing
+ */
+class nsGenericAccessible : public nsIAccessible
+{
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIACCESSIBLE
+
+	public:
+    nsGenericAccessible();
+    virtual ~nsGenericAccessible();
+};
+
+/**
+ * And accessible that observes a dom node
+ * supports:
+ * - selection
+ * - focus
+ */
+class nsDOMAccessible : public nsGenericAccessible
+{
+  public:
+    nsDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+
+    NS_IMETHOD AccTakeSelection(void); 
+    NS_IMETHOD AccTakeFocus(void); 
+    NS_IMETHOD AccRemoveSelection(void);
+
+  protected:
+    nsIWeakReference* mPresShell;
+    nsCOMPtr<nsIDOMNode> mNode;
+};
+
+/* Leaf version of DOM Accessible
+ * has no children
+ */
+class nsLeafDOMAccessible : public nsDOMAccessible
+{
+  public:
+    nsLeafDOMAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+
+    NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+    NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+    NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+};
+
+#endif  

mozilla/accessible/src/nsHTMLFormControlAccessible.cpp

@@ -0,0 +1,175 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Author: Eric Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsHTMLFormControlAccessible.h"
+#include "nsWeakReference.h"
+#include "nsIFrame.h"
+#include "nsIDOMHTMLInputElement.h"
+#include "nsINameSpaceManager.h"
+#include "nsHTMLAtoms.h"
+#include "nsIDOMHTMLButtonElement.h"
+#include "nsReadableUtils.h"
+
+nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
+nsLeafDOMAccessible(aShell, aNode)
+{ 
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccName(PRUnichar **_retval)
+{
+  // go up tree get name of label if there is one.
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+/* wstring getAccState (); */
+NS_IMETHODIMP nsHTMLFormControlAccessible::GetAccState(PRUint32 *_retval)
+{
+    // can be
+    // focusable, focused, checked
+    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
+
+    PRBool checked = PR_FALSE;
+    element->GetChecked(&checked);
+    *_retval = (checked ? STATE_CHECKED : 0);
+    return NS_OK;
+}
+
+// --- checkbox -----
+
+nsHTMLCheckboxAccessible::nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
+nsHTMLFormControlAccessible(aShell, aNode)
+{ 
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccRole(PRUnichar **_retval)
+{
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("check box"));
+    return NS_OK;
+}
+
+/* wstring getAccDefaultAction (); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccDefaultAction(PRUnichar **_retval)
+{
+    // check or uncheck
+    nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
+
+    PRBool checked = PR_FALSE;
+    element->GetChecked(&checked);
+    if (checked)
+        *_retval = ToNewUnicode(NS_LITERAL_STRING("Check"));
+    else
+        *_retval = ToNewUnicode(NS_LITERAL_STRING("UnCheck"));
+
+    return NS_OK;
+}
+
+/* void accDoDefaultAction (); */
+NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoDefaultAction()
+{
+  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
+  PRBool checked = PR_FALSE;
+  element->GetChecked(&checked);
+  element->SetChecked(checked ? PR_FALSE : PR_TRUE);
+
+  return NS_OK;
+}
+
+
+//------ Radio button -------
+
+nsHTMLRadioButtonAccessible::nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
+nsHTMLFormControlAccessible(aShell, aNode)
+{ 
+}
+
+/* wstring getAccDefaultAction (); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
+{
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("Select"));
+    return NS_OK;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccRole(PRUnichar **_retval)
+{
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("radio button"));
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoDefaultAction()
+{
+  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
+  element->Click();
+
+  return NS_OK;
+}
+
+// ----- Button -----
+
+nsHTMLButtonAccessible::nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode):
+nsHTMLFormControlAccessible(aShell, aNode)
+{ 
+}
+
+/* wstring getAccDefaultAction (); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccDefaultAction(PRUnichar **_retval)
+{
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("Press"));
+    return NS_OK;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUnichar **_retval)
+{
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("push button"));
+    return NS_OK;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(PRUnichar **_retval)
+{
+    *_retval = nsnull;
+    nsCOMPtr<nsIDOMHTMLInputElement> button = do_QueryInterface(mNode);
+
+    if (!button)
+      return NS_ERROR_FAILURE;
+
+    nsAutoString name;
+    button->GetValue(name);
+    name.CompressWhitespace();
+
+    *_retval = name.ToNewUnicode();
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsHTMLButtonAccessible::AccDoDefaultAction()
+{
+  nsCOMPtr<nsIDOMHTMLInputElement> element = do_QueryInterface(mNode);
+  element->Click();
+
+  return NS_OK;
+}

mozilla/accessible/src/nsHTMLFormControlAccessible.h

@@ -0,0 +1,77 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Author: Eric D Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#ifndef _nsHTMLFormControlAccessible_H_
+#define _nsHTMLFormControlAccessible_H_
+
+#include "nsGenericAccessible.h"
+
+class nsICheckboxControlFrame;
+
+/* Accessible for supporting for controls
+ * supports:
+ * - walking up to get name from label
+ * - support basic state
+ */
+class nsHTMLFormControlAccessible : public nsLeafDOMAccessible
+{
+
+public:
+  nsHTMLFormControlAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+  NS_IMETHOD GetAccName(PRUnichar **_retval); 
+  NS_IMETHOD GetAccState(PRUint32 *_retval); 
+};
+
+class nsHTMLCheckboxAccessible : public nsHTMLFormControlAccessible
+{
+
+public:
+  nsHTMLCheckboxAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
+  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
+  NS_IMETHOD AccDoDefaultAction(void); 
+};
+
+class nsHTMLRadioButtonAccessible : public nsHTMLFormControlAccessible
+{
+
+public:
+  nsHTMLRadioButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
+  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
+  NS_IMETHOD AccDoDefaultAction(void); 
+};
+
+class nsHTMLButtonAccessible : public nsHTMLFormControlAccessible
+{
+
+public:
+  nsHTMLButtonAccessible(nsIPresShell* aShell, nsIDOMNode* aNode);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
+  NS_IMETHOD GetAccName(PRUnichar **_retval); 
+  NS_IMETHOD GetAccDefaultAction(PRUnichar **_retval); 
+  NS_IMETHOD AccDoDefaultAction(void); 
+
+};
+
+#endif  

mozilla/accessible/src/nsHTMLTextAccessible.cpp

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Author: Eric Vaughan (evaughan@netscape.com)
+ * Contributor(s): 
+ */
+
+#include "nsHTMLTextAccessible.h"
+#include "nsICheckboxControlFrame.h"
+#include "nsWeakReference.h"
+#include "nsIFrame.h"
+
+nsHTMLTextAccessible::nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode):
+nsLeafDOMAccessible(aShell, aDomNode)
+{ 
+}
+
+/* wstring getAccName (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(PRUnichar **_retval)
+{
+  nsAutoString value;
+  mNode->GetNodeValue(value);
+  value.CompressWhitespace();
+  *_retval = value.ToNewUnicode();
+  return NS_OK;
+}
+
+/* wstring getAccRole (); */
+NS_IMETHODIMP nsHTMLTextAccessible::GetAccRole(PRUnichar **_retval)
+{
+    nsAutoString role(NS_LITERAL_STRING("text"));
+    *_retval = role.ToNewUnicode();
+
+    return NS_OK;
+}

mozilla/accessible/src/nsHTMLTextAccessible.h

@@ -0,0 +1,43 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef _nsHTMLTextAccessible_H_
+#define _nsHTMLTextAccessible_H_
+
+#include "nsGenericAccessible.h"
+
+class nsIWeakReference;
+class nsITextControlFrame;
+
+class nsHTMLTextAccessible : public nsLeafDOMAccessible
+{
+
+public:
+  nsHTMLTextAccessible(nsIPresShell* aShell, nsIDOMNode* aDomNode);
+  NS_IMETHOD GetAccName(PRUnichar **_retval); 
+  NS_IMETHOD GetAccRole(PRUnichar **_retval); 
+
+private:
+  nsCOMPtr<nsIDOMNode> mDomNode;
+};
+
+#endif  

mozilla/accessible/src/nsMutableAccessible.cpp

@@ -0,0 +1,263 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsMutableAccessible.h"
+#include "nsINameSpaceManager.h"
+
+NS_IMPL_ISUPPORTS1(nsMutableAccessible, nsIAccessible)
+
+nsMutableAccessible::nsMutableAccessible(nsISupports* aNode)
+{
+  NS_INIT_ISUPPORTS();
+  NS_ASSERTION(aNode,"We must have a valid node!!");
+  mNode = aNode;
+  mNameNodeValue = PR_FALSE;
+  mNameStringSet = PR_FALSE;
+  mRole = NS_LITERAL_STRING("unknown");
+  mIsLeaf = PR_FALSE;
+}
+
+nsMutableAccessible::~nsMutableAccessible()
+{
+}
+
+NS_IMETHODIMP nsMutableAccessible::SetIsLeaf(PRBool aLeaf)
+{
+    mIsLeaf = aLeaf;
+    return NS_OK;
+}
+
+/* void SetNodeAsNodeValue (); */
+NS_IMETHODIMP nsMutableAccessible::SetNameAsNodeValue()
+{
+    mNameNodeValue = PR_TRUE;
+    return NS_OK;
+}
+
+/* void SetName (in wstring name); */
+NS_IMETHODIMP nsMutableAccessible::SetName(const PRUnichar *aName)
+{
+    mName = aName; 
+    mNameStringSet = PR_TRUE;
+    return NS_OK;
+}
+
+/* void SetNameAsAttribute (in nsIAtom atom); */
+NS_IMETHODIMP nsMutableAccessible::SetNameAsAttribute(nsIAtom *aAttribute)
+{
+   mNameAttribute = aAttribute;
+   return NS_OK;
+}
+
+/* void SetNameAsAttribute (in nsIAtom atom); */
+NS_IMETHODIMP nsMutableAccessible::SetRole(const PRUnichar *aRole)
+{
+   mRole = aRole;
+   return NS_OK;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccParent(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{ 
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  if (mIsLeaf) {
+    *_retval = nsnull;
+    return NS_OK;
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  if (mIsLeaf) {
+    *_retval = nsnull;
+    return NS_OK;
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  if (mIsLeaf) {
+    *_retval = 0;
+    return NS_OK;
+  }
+
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccName(PRUnichar **_retval)
+{
+  nsAutoString value;
+
+  if (mNameNodeValue) {
+    // see if we can get nodevalue
+    nsCOMPtr<nsIDOMNode> node = do_QueryInterface(mNode);
+    if (node) {
+      node->GetNodeValue(value);
+      value.CompressWhitespace();
+    } else {
+      *_retval = nsnull;
+      return NS_ERROR_NOT_IMPLEMENTED;
+    }
+  } else if (mNameStringSet) {
+    value = mName;
+  } else if (mNameAttribute) {
+    nsCOMPtr<nsIContent> content = do_QueryInterface(mNode);
+    content->GetAttribute(kNameSpaceID_None, mNameAttribute, value);
+    value.CompressWhitespace();
+  } else {
+     *_retval = nsnull;
+     return NS_ERROR_NOT_IMPLEMENTED;
+  }
+    
+  *_retval = value.ToNewUnicode();
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccValue(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::SetAccName(const PRUnichar *name)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::SetAccValue(const PRUnichar *value)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccDescription(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccRole(PRUnichar **_retval)
+{
+  *_retval = mRole.ToNewUnicode();
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccState(PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccExtState(PRUint32 *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccDefaultAction(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccHelp(PRUnichar **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::GetAccFocused(PRBool *_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccNavigateRight(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccNavigateLeft(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccNavigateUp(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccNavigateDown(nsIAccessible **_retval)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccAddSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccRemoveSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccExtendSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccTakeSelection()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccTakeFocus()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsMutableAccessible::AccDoDefaultAction()
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+

mozilla/accessible/src/nsMutableAccessible.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef _nsMutableAccessible_H_
+#define _nsMutableAccessible_H_
+
+#include "nsIMutableAccessible.h"
+#include "nsAccessible.h"
+#include "nsString.h"
+
+class nsMutableAccessible : public nsIMutableAccessible
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIACCESSIBLE
+  NS_DECL_NSIMUTABLEACCESSIBLE
+
+  nsMutableAccessible(nsISupports* aNode);
+  virtual ~nsMutableAccessible();
+
+private:
+  nsCOMPtr<nsISupports> mNode;
+  nsString mName;
+  nsString mRole;
+  nsCOMPtr<nsIAtom> mNameAttribute;
+  PRPackedBool mNameNodeValue;
+  PRPackedBool mNameStringSet;
+  PRPackedBool mIsLeaf;
+};
+
+#endif
+

mozilla/accessible/src/nsRootAccessible.cpp

@@ -0,0 +1,199 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsRootAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsIDOMEventTarget.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMEventReceiver.h"
+#include "nsReadableUtils.h"
+
+NS_INTERFACE_MAP_BEGIN(nsRootAccessible)
+  NS_INTERFACE_MAP_ENTRY(nsIAccessibleEventReceiver)
+  NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIAccessibleEventReceiver)
+NS_INTERFACE_MAP_END_INHERITING(nsAccessible)
+
+NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsAccessible);
+NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsAccessible);
+
+//-----------------------------------------------------
+// construction 
+//-----------------------------------------------------
+nsRootAccessible::nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame):nsAccessible(nsnull,nsnull,aShell)
+{
+ // mFrame = aFrame;
+ mListener = nsnull;
+}
+
+//-----------------------------------------------------
+// destruction
+//-----------------------------------------------------
+nsRootAccessible::~nsRootAccessible()
+{
+  RemoveAccessibleEventListener(mListener);
+}
+
+  /* attribute wstring accName; */
+NS_IMETHODIMP nsRootAccessible::GetAccName(PRUnichar * *aAccName) 
+{ 
+  *aAccName = ToNewUnicode(NS_LITERAL_STRING("Mozilla Document"));
+  return NS_OK;  
+}
+
+// helpers
+nsIFrame* nsRootAccessible::GetFrame()
+{
+  //if (!mFrame) {
+    nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+    nsIFrame* root = nsnull;
+    if (shell) 
+      shell->GetRootFrame(&root);
+  
+    return root;
+  //}
+ 
+ // return mFrame;
+}
+
+nsIAccessible* nsRootAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return new nsHTMLBlockAccessible(aAccessible, aContent, aShell);
+}
+
+  /* readonly attribute nsIAccessible accParent; */
+NS_IMETHODIMP nsRootAccessible::GetAccParent(nsIAccessible * *aAccParent) 
+{ 
+  *aAccParent = nsnull;
+  return NS_OK;
+}
+
+  /* readonly attribute wstring accRole; */
+NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUnichar * *aAccRole) 
+{ 
+  *aAccRole = ToNewUnicode(NS_LITERAL_STRING("client"));
+  return NS_OK;  
+}
+
+/* void addAccessibleEventListener (in nsIAccessibleEventListener aListener); */
+NS_IMETHODIMP nsRootAccessible::AddAccessibleEventListener(nsIAccessibleEventListener *aListener)
+{
+  if (!mListener)
+  {
+     // add an event listener to the document
+     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+     nsCOMPtr<nsIDocument> document;
+     shell->GetDocument(getter_AddRefs(document));
+
+     nsCOMPtr<nsIDOMEventReceiver> receiver;
+     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(receiver))) && receiver)
+     {
+        nsresult rv = receiver->AddEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+     }
+  }
+
+  // create a weak reference to the listener
+  mListener =  aListener;
+
+  return NS_OK;
+}
+
+/* void removeAccessibleEventListener (in nsIAccessibleEventListener aListener); */
+NS_IMETHODIMP nsRootAccessible::RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener)
+{
+  if (mListener)
+  {
+     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+     nsCOMPtr<nsIDocument> document;
+     if (!shell)
+       return NS_OK;
+
+     shell->GetDocument(getter_AddRefs(document));
+
+     nsCOMPtr<nsIDOMEventReceiver> erP;
+     if (NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP))) && erP)
+     {
+        nsresult rv = erP->RemoveEventListenerByIID(NS_STATIC_CAST(nsIDOMFocusListener *, this), NS_GET_IID(nsIDOMFocusListener));
+        NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register listener");
+     }
+  }
+
+  mListener = nsnull;
+
+  return NS_OK;
+}
+
+
+NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent)
+{
+  if (mListener) {
+     nsCOMPtr<nsIDOMEventTarget> t;
+     aEvent->GetOriginalTarget(getter_AddRefs(t));
+  
+     // create and accessible for the target
+     nsCOMPtr<nsIContent> content = do_QueryInterface(t); 
+
+     if (!content)
+       return NS_OK;
+
+     if (mCurrentFocus == content)
+       return NS_OK;
+
+     mCurrentFocus = content;
+
+     nsIFrame* frame = nsnull;
+     nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+     shell->GetPrimaryFrameFor(content, &frame);
+
+     if (!frame)
+       return NS_OK;
+
+     nsCOMPtr<nsIAccessible> a = do_QueryInterface(frame);
+
+     if (!a)
+       a = do_QueryInterface(content);
+
+     nsCOMPtr<nsIAccessible> na = CreateNewAccessible(a, content, mPresShell);
+
+     mListener->HandleEvent(nsIAccessibleEventListener::EVENT_FOCUS, na);
+  }
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsRootAccessible::Focus(nsIDOMEvent* aEvent) 
+{ 
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsRootAccessible::Blur(nsIDOMEvent* aEvent) 
+{ 
+  return NS_OK;
+}
+
+
+

mozilla/accessible/src/nsRootAccessible.h

@@ -0,0 +1,70 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef _nsRootAccessible_H_
+#define _nsRootAccessible_H_
+
+#include "nsAccessible.h"
+#include "nsIAccessibleEventReceiver.h"
+#include "nsIAccessibleEventListener.h"
+#include "nsIDOMFocusListener.h"
+
+class nsRootAccessible : public nsAccessible,
+                         public nsIAccessibleEventReceiver,
+                         public nsIDOMFocusListener
+
+{
+  
+  NS_DECL_ISUPPORTS_INHERITED
+
+  public:
+    nsRootAccessible(nsIWeakReference* aShell, nsIFrame* aFrame = nsnull);
+    virtual ~nsRootAccessible();
+
+    /* attribute wstring accName; */
+    NS_IMETHOD GetAccName(PRUnichar * *aAccName);
+    NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent);
+    NS_IMETHOD GetAccRole(PRUnichar * *aAccRole);
+
+    // ----- nsIAccessibleEventReceiver ------
+
+    NS_IMETHOD AddAccessibleEventListener(nsIAccessibleEventListener *aListener);
+    NS_IMETHOD RemoveAccessibleEventListener(nsIAccessibleEventListener *aListener);
+
+    // ----- nsIDOMEventListener --------
+    NS_IMETHOD HandleEvent(nsIDOMEvent* anEvent);
+    NS_IMETHOD Focus(nsIDOMEvent* aEvent);
+    NS_IMETHOD Blur(nsIDOMEvent* aEvent);
+
+protected:
+  virtual nsIFrame* GetFrame();
+  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+
+  // not a com pointer. We don't own the listener
+  // it is the callers responsibility to remove the listener
+  // otherwise we will get into circular referencing problems
+  nsIAccessibleEventListener* mListener;
+  nsCOMPtr<nsIContent> mCurrentFocus;
+};
+
+
+#endif  

mozilla/accessible/src/nsSelectAccessible.cpp

@@ -0,0 +1,717 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+
+#include "nsSelectAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIDocument.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsIContent.h"
+#include "nsIFrame.h"
+#include "nsRootAccessible.h"
+#include "nsINameSpaceManager.h"
+#include "nsMutableAccessible.h"
+#include "nsLayoutAtoms.h"
+#include "nsIDOMMenuListener.h"
+#include "nsIDOMEventReceiver.h"
+#include "nsReadableUtils.h"
+
+class nsSelectChildAccessible : public nsAccessible,
+                                public nsIDOMMenuListener
+{
+public:
+  
+  NS_DECL_ISUPPORTS_INHERITED
+
+  nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual ~nsSelectChildAccessible();
+
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(PRUnichar **_retval);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval);
+  NS_IMETHOD GetAccValue(PRUnichar **_retval);
+
+  virtual nsIAccessible* CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  // popup listener
+  NS_IMETHOD Create(nsIDOMEvent* aEvent);
+  NS_IMETHOD Close(nsIDOMEvent* aEvent);
+  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
+  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
+
+  nsCOMPtr<nsIAtom> mPopupAtom;
+  nsCOMPtr<nsIContent> mSelectContent;
+  PRBool mRegistered;
+  PRBool mOpen;
+};
+
+NS_IMPL_ISUPPORTS_INHERITED(nsSelectChildAccessible, nsAccessible, nsIDOMMenuListener)
+
+class nsSelectWindowAccessible : public nsAccessible,
+                                 public nsIDOMMenuListener
+{
+public:
+  NS_DECL_ISUPPORTS_INHERITED
+
+  nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual ~nsSelectWindowAccessible();
+
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+  NS_IMETHOD GetAccName(PRUnichar **_retval);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval);
+  NS_IMETHOD GetAccState(PRUint32 *_retval);
+  NS_IMETHOD GetAccExtState(PRUint32 *_retval);
+
+  // popup listener
+  NS_IMETHOD Create(nsIDOMEvent* aEvent);
+  NS_IMETHOD Close(nsIDOMEvent* aEvent);
+  NS_IMETHOD Destroy(nsIDOMEvent* aEvent);
+  NS_IMETHOD Action(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD Broadcast(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD CommandUpdate(nsIDOMEvent* aEvent) { return NS_OK; }
+  NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent) { return NS_OK; }
+
+  // helpers
+  virtual nsIFrame* GetBoundsFrame();
+
+  nsCOMPtr<nsIAccessible> mParent;
+  nsCOMPtr<nsIAccessible> mPrev;
+  nsCOMPtr<nsIAtom> mPopupAtom;
+  PRBool mRegistered;
+  PRBool mOpen;
+};
+
+NS_IMPL_ISUPPORTS_INHERITED(nsSelectWindowAccessible, nsAccessible, nsIDOMMenuListener)
+
+class nsSelectListAccessible : public nsAccessible
+{
+public:
+  
+  nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual ~nsSelectListAccessible() {}
+
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(PRUnichar **_retval);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval);
+  NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval);
+  NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval);
+  NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height);
+
+  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
+  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+
+  nsCOMPtr<nsIAtom> mPopupAtom;
+  nsCOMPtr<nsIAccessible> mParent;
+};
+
+class nsListChildAccessible : public nsAccessible
+{
+public:
+  
+  nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual ~nsListChildAccessible() {}
+
+  NS_IMETHOD GetAccParent(nsIAccessible **_retval);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval);
+
+  virtual void GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList);
+  virtual nsIAccessible* CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+
+  nsCOMPtr<nsIAccessible> mParent;
+  nsCOMPtr<nsIAtom> mPopupAtom;
+  nsCOMPtr<nsIContent> mSelectContent;
+};
+
+//---------
+ 
+nsSelectAccessible::nsSelectAccessible(nsIAtom* aPopupAtom, 
+                                       nsIAccessible* aAccessible, 
+                                       nsIContent* aContent, 
+                                       nsIWeakReference* aShell)
+                                               :nsAccessible(aAccessible, aContent, aShell)
+{
+  mPopupAtom = aPopupAtom;
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccValue(PRUnichar **_retval)
+{
+  // our value is our first child's value. Which is the combo boxes text.
+  nsCOMPtr<nsIAccessible> text;
+  nsresult rv = GetAccFirstChild(getter_AddRefs(text));
+
+  if (NS_FAILED(rv)) {
+     *_retval = nsnull;
+     return rv;
+  }
+
+  if (!text) {
+     *_retval = nsnull;
+     return NS_ERROR_FAILURE;
+  }
+
+  // look at our role
+  return text->GetAccValue(_retval);
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccName(PRUnichar **_retval)
+{
+   *_retval = nsnull;
+   return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccRole(PRUnichar **_retval)
+{
+  *_retval = ToNewUnicode(NS_LITERAL_STRING("combo box"));
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  // get the last child. Wrap it with a connector that connects it to the window accessible
+  nsCOMPtr<nsIAccessible> last;
+  nsresult rv = nsAccessible::GetAccLastChild(getter_AddRefs(last));
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (!last) {
+    // we have a parent but not previous
+    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
+  } else {
+    *_retval = last;
+  }
+
+  NS_ADDREF(*_retval);
+
+   return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  // get the last child. Wrap it with a connector that connects it to the window accessible
+  nsCOMPtr<nsIAccessible> first;
+  nsresult rv = nsAccessible::GetAccFirstChild(getter_AddRefs(first));
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (!first) {
+    *_retval = new nsSelectWindowAccessible(mPopupAtom, this, nsnull, nsnull, mContent, mPresShell);
+  } else {
+    *_retval = first;
+  }
+
+  NS_ADDREF(*_retval);
+
+  return NS_OK;
+}
+
+nsIAccessible* nsSelectAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewLastAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsSelectAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsSelectChildAccessible(mPopupAtom, mContent, aAccessible, aContent, aShell);
+}
+
+NS_IMETHODIMP nsSelectAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  nsresult rv = nsAccessible::GetAccChildCount(_retval);
+  if (NS_FAILED(rv))
+    return rv;
+
+  // always have one more that is our window child
+  (*_retval)++;
+  return NS_OK;
+}
+
+//--------------------
+
+nsSelectChildAccessible::nsSelectChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
+nsAccessible(aAccessible, aContent, aShell)
+{
+  mPopupAtom = aPopupAtom;
+  mSelectContent = aSelectContent;
+  mRegistered = PR_FALSE;
+  mOpen = PR_FALSE;
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::GetAccValue(PRUnichar **_retval)
+{
+  nsresult rv = NS_OK;
+  PRUnichar* string = nsnull;
+
+  // look at our role
+  rv = nsAccessible::GetAccRole(&string);
+  if (NS_FAILED(rv)) {
+   *_retval = nsnull;
+   return rv;
+  }
+
+  nsAutoString role(string);
+
+  // if its the text in the combo box then
+  // its value should be its name.
+  if (role.EqualsIgnoreCase("text")) {
+    rv = nsAccessible::GetAccName(_retval);
+  } else {
+    rv = nsAccessible::GetAccValue(_retval);
+  }
+
+  delete string;
+  return rv;
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::GetAccRole(PRUnichar **_retval)
+{
+  nsresult rv = NS_OK;
+  PRUnichar* string = nsnull;
+
+  // look at our role
+  rv = nsAccessible::GetAccRole(&string);
+  if (NS_FAILED(rv)) {
+   *_retval = nsnull;
+   return rv;
+  }
+
+  nsAutoString role(string);
+
+  // any text in the combo box is static
+  if (role.EqualsIgnoreCase("text")) {
+    // if it the comboboxes text. Make it static
+    *_retval = ToNewUnicode(NS_LITERAL_STRING("static text"));
+  } else {
+    rv = nsAccessible::GetAccRole(_retval);
+  }
+
+  delete string;
+  return rv;
+}
+
+
+NS_IMETHODIMP nsSelectChildAccessible::GetAccName(PRUnichar **_retval)
+{
+  nsresult rv = NS_OK;
+  PRUnichar* string = nsnull;
+
+  // look at our role
+  nsAccessible::GetAccRole(&string);
+  nsAutoString role(string);
+
+  // if button then we need to make the name be open or close
+  if (role.EqualsIgnoreCase("push button"))
+  {
+     // if its a button and not already registered, 
+     // register ourselves as a popup listener   
+     if (!mRegistered) {
+       nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
+       if (!eventReceiver) {
+         *_retval = nsnull;
+         return NS_ERROR_NOT_IMPLEMENTED;
+       }
+
+       eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
+
+       mRegistered = PR_TRUE;
+     }
+
+     // get the current state open or closed
+     // set _retval to it.
+     // notice its supposed to be reversed. Close if opened
+     // and Open if closed.
+
+     if (mOpen)
+         *_retval = ToNewUnicode(NS_LITERAL_STRING("Close"));
+     else
+         *_retval = ToNewUnicode(NS_LITERAL_STRING("Open"));
+
+  } else {
+    /*rv = nsAccessible::GetAccName(_retval);*/
+    rv = NS_ERROR_NOT_IMPLEMENTED;
+    *_retval = nsnull;
+  }
+
+  delete string;
+
+  return rv;
+}
+
+
+nsSelectChildAccessible::~nsSelectChildAccessible()
+{
+  if (mRegistered) {
+     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mSelectContent);
+     if (eventReceiver) 
+       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
+  }
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::Create(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_TRUE;
+  printf("Open\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::Destroy(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+  printf("Close\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::Close(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+  printf("Close\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+nsIAccessible* nsSelectChildAccessible::CreateNewNextAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  return CreateNewPreviousAccessible(aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsSelectChildAccessible::CreateNewPreviousAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsSelectChildAccessible(mPopupAtom, mSelectContent, aAccessible, aContent, aShell);
+}
+
+NS_IMETHODIMP nsSelectChildAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{ 
+  nsCOMPtr<nsIAccessible> next;
+  nsresult rv = nsAccessible::GetAccNextSibling(getter_AddRefs(next));
+  if (NS_FAILED(rv))
+    return rv;
+
+  if (!next) {
+    // ok no more siblings. Lets create our window
+    nsCOMPtr<nsIAccessible> parent;
+    GetAccParent(getter_AddRefs(parent));
+
+    *_retval = new nsSelectWindowAccessible(mPopupAtom, parent, nsnull, nsnull, mSelectContent, mPresShell);
+  } else {
+    *_retval = next;
+  }
+
+  NS_ADDREF(*_retval);
+
+  return NS_OK;
+} 
+
+
+//---------------------
+
+
+nsSelectWindowAccessible::nsSelectWindowAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aPrev, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+:nsAccessible(aAccessible, aContent, aShell)
+{
+  mParent = aParent;
+  mPrev = aPrev;
+  mPopupAtom = aPopupAtom;
+  mRegistered = PR_FALSE;
+  mOpen = PR_FALSE;
+}
+
+nsSelectWindowAccessible::~nsSelectWindowAccessible()
+{
+  if (mRegistered) {
+     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
+     if (eventReceiver) 
+       eventReceiver->RemoveEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
+  }
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::Create(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_TRUE;
+  printf("Open\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::Destroy(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+  printf("Close\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::Close(nsIDOMEvent* aEvent)
+{ 
+  mOpen = PR_FALSE;
+  printf("Close\n");
+
+  /* TBD send state change event */ 
+
+  return NS_OK; 
+}
+
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccState(PRUint32 *_retval)
+{
+  // not not already one register ourselves as a popup listener
+   
+  if (!mRegistered) {
+
+     nsCOMPtr<nsIDOMEventReceiver> eventReceiver = do_QueryInterface(mContent);
+     if (!eventReceiver) {
+       *_retval = 0;
+       return NS_ERROR_NOT_IMPLEMENTED;
+     }
+
+     nsresult rv = eventReceiver->AddEventListener(NS_LITERAL_STRING("create"), this, PR_TRUE);   
+
+     if (NS_FAILED(rv)) {
+       *_retval = 0;
+       return rv;
+     }
+
+     mRegistered = PR_TRUE;
+  }
+
+  // if open we are visible if closed we are invisible
+   // set _retval to it.
+   if (mOpen)
+     *_retval |= STATE_DEFAULT;
+   else
+     *_retval |= STATE_INVISIBLE;
+
+   return NS_OK;
+}
+
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccExtState(PRUint32 *_retval)
+{
+	*_retval=0;
+   return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccName(PRUnichar **_retval)
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+ 
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccRole(PRUnichar **_retval)
+{
+  *_retval = ToNewUnicode(NS_LITERAL_STRING("window"));
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_IF_ADDREF(*_retval);
+    return NS_OK;
+}
+ 
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  *_retval = mPrev;
+  NS_IF_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccLastChild(nsIAccessible **_retval)
+{
+  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccFirstChild(nsIAccessible **_retval)
+{
+  *_retval = new nsSelectListAccessible(mPopupAtom, this, nsnull, mContent, mPresShell);
+  NS_ADDREF(*_retval);
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectWindowAccessible::GetAccChildCount(PRInt32 *_retval)
+{
+  *_retval = 1;
+  return NS_OK;
+}
+
+/*
+NS_IMETHODIMP nsSelectWindowAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+  *x = *y = *width = *height = 0;
+  return NS_OK;
+}
+*/
+
+nsIFrame* nsSelectWindowAccessible::GetBoundsFrame()
+{
+  // get our frame
+  nsIFrame* frame = GetFrame();
+
+  nsCOMPtr<nsIPresContext> context;
+  GetPresContext(context);
+
+  // get its first popup child that should be the window
+  frame->FirstChild(context, mPopupAtom, &frame);
+
+  return frame;
+}
+
+//----------
+
+
+nsSelectListAccessible::nsSelectListAccessible(nsIAtom* aPopupAtom, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+:nsAccessible(aAccessible, aContent, aShell)
+{
+    mPopupAtom = aPopupAtom;
+    mParent = aParent;
+}
+
+void nsSelectListAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
+{
+   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+   nsIFrame* frame = nsnull;
+   shell->GetPrimaryFrameFor(mContent, &frame);
+   if (aFrame == frame)
+     aList = mPopupAtom;
+   else
+     aList = nsnull;
+}
+
+NS_IMETHODIMP nsSelectListAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height)
+{
+  return mParent->AccGetBounds(x,y,width,height);
+}
+
+NS_IMETHODIMP nsSelectListAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_ADDREF(*_retval);
+    return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectListAccessible::GetAccName(PRUnichar **_retval)
+{
+  *_retval = nsnull;
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP nsSelectListAccessible::GetAccRole(PRUnichar **_retval)
+{
+  *_retval = ToNewUnicode(NS_LITERAL_STRING("list"));
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectListAccessible::GetAccPreviousSibling(nsIAccessible **_retval)
+{ 
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsSelectListAccessible::GetAccNextSibling(nsIAccessible **_retval)
+{
+  *_retval = nsnull;
+  return NS_OK;
+}
+
+nsIAccessible* nsSelectListAccessible::CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
+}
+
+nsIAccessible* nsSelectListAccessible::CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsListChildAccessible(mPopupAtom, mContent, this, aAccessible, aContent, aShell);
+}
+ 
+//--------
+
+nsListChildAccessible::nsListChildAccessible(nsIAtom* aPopupAtom, nsIContent* aSelectContent, nsIAccessible* aParent, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell):
+nsAccessible(aAccessible, aContent, aShell)
+{
+  mParent = aParent;
+  mPopupAtom = aPopupAtom;
+  mSelectContent = aSelectContent;
+}
+
+nsIAccessible* nsListChildAccessible::CreateNewAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell)
+{
+  NS_ASSERTION(aAccessible && aContent,"Error not accessible or content");
+  return new nsListChildAccessible(mPopupAtom, mSelectContent, mParent, aAccessible, aContent, aShell);
+}
+
+void nsListChildAccessible::GetListAtomForFrame(nsIFrame* aFrame, nsIAtom*& aList)
+{
+   nsCOMPtr<nsIPresShell> shell = do_QueryReferent(mPresShell);
+   nsIFrame* frame = nsnull;
+   shell->GetPrimaryFrameFor(mSelectContent, &frame);
+   if (aFrame == frame)
+     aList = mPopupAtom;
+   else
+     aList = nsnull;
+}
+
+NS_IMETHODIMP nsListChildAccessible::GetAccRole(PRUnichar **_retval)
+{
+  *_retval = ToNewUnicode(NS_LITERAL_STRING("list item"));
+  return NS_OK;
+}
+
+NS_IMETHODIMP nsListChildAccessible::GetAccParent(nsIAccessible **_retval)
+{   
+    *_retval = mParent;
+    NS_IF_ADDREF(*_retval);
+    return NS_OK;
+}
+

mozilla/accessible/src/nsSelectAccessible.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Original Author: David W. Hyatt (hyatt@netscape.com)
+ *
+ * Contributor(s): 
+ */
+#ifndef __nsSelectAccessible_h__
+#define __nsSelectAccessible_h__
+
+#include "nsAccessible.h"
+#include "nsCOMPtr.h"
+#include "nsIAtom.h"
+
+class nsSelectAccessible : public nsAccessible
+{
+public:
+  
+  nsSelectAccessible(nsIAtom* aPopupAtom, nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  NS_IMETHOD GetAccLastChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval);
+  NS_IMETHOD GetAccName(PRUnichar **_retval);
+  NS_IMETHOD GetAccValue(PRUnichar **_retval);
+  NS_IMETHOD GetAccRole(PRUnichar **_retval);
+  NS_IMETHOD GetAccChildCount(PRInt32 *_retval);
+
+  virtual ~nsSelectAccessible() {}
+  virtual nsIAccessible* CreateNewFirstAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+  virtual nsIAccessible* CreateNewLastAccessible(nsIAccessible* aAccessible, nsIContent* aContent, nsIWeakReference* aShell);
+
+  nsCOMPtr<nsIAtom> mPopupAtom;
+};
+
+
+#endif

mozilla/aclocal.m4

@@ -0,0 +1,14 @@
+dnl
+dnl Local autoconf macros used with mozilla
+dnl The contents of this file are under the Public Domain.
+dnl 
+
+builtin(include, build/autoconf/glib.m4)dnl
+builtin(include, build/autoconf/gtk.m4)dnl
+builtin(include, build/autoconf/gdk-pixbuf.m4)dnl
+builtin(include, build/autoconf/libIDL.m4)dnl
+builtin(include, build/autoconf/nspr.m4)dnl
+dnl
+define(MOZ_TOPSRCDIR,.)dnl MOZ_TOPSRCDIR is used in altoptions.m4
+builtin(include, build/autoconf/altoptions.m4)dnl
+

mozilla/build/Makefile.in

@@ -0,0 +1,42 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is Mozilla Communicator client code, 
+# released March 31, 1998. 
+#
+# The Initial Developer of the Original Code is Netscape Communications 
+# Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
+DIRS		= unix
+endif
+
+include $(topsrcdir)/config/rules.mk
+
+# Install bloaturls.txt file for tinderbox Bloaty test.
+install:: $(srcdir)/bloaturls.txt
+	$(INSTALL) $< $(DIST)/bin
+
+# Install startup.html, startup test page.
+install:: $(srcdir)/startup-test.html
+	$(INSTALL) $< $(DIST)/bin

mozilla/build/autoconf/acoutput-fast.pl

@@ -0,0 +1,179 @@
+#! /usr/bin/env perl
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+# acoutput-fast.pl - Quickly create makefiles that are in a common format.
+#
+# Most of the makefiles in mozilla only refer to two configure variables:
+#     @srcdir@
+#     @top_srcdir@
+# However, configure does not know any better and it runs sed on each file
+# with over 150 replacement rules (slow as molasses).
+#
+# This script takes a list of makefiles as input. For example,
+#   
+#     echo $MAKEFILES | acoutput-fast.pl
+#
+# The script creates each Makefile that only references @srcdir@ and
+# @top_srcdir@. For other files, it lists them in a shell command that is
+# printed to stdout:
+#
+#     CONFIG_FILES="unhandled_files..."; export CONFIG_FILES
+#
+# This command can be used to have config.status create the unhandled
+# files. For example,
+#
+#     eval "echo $MAKEFILES | acoutput-fast.pl"
+#     AC_OUTPUT($MAKEFILES)
+#
+# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
+
+#use File::Basename;
+sub dirname {
+  my $dir = $_[0];
+  return '.' if not $dir =~ m%/%;
+  $dir =~ s%/[^/][^/]*$%%;
+  return $dir;
+}
+
+# Create one directory. Assumes it doesn't already exist.
+# Will create parent(s) if needed.
+sub create_directory {
+  my $dir = $_[0];
+  my $parent = dirname($dir);
+  create_directory($parent) if not -d $parent;
+  mkdir "$dir",0777;
+}
+
+# Create all the directories at once.
+#   This can be much faster than calling mkdir() for each one.
+sub create_directories {
+  my @makefiles = @_;
+  my @dirs = ();
+  my $ac_file;
+  foreach $ac_file (@makefiles) {
+    push @dirs, dirname($ac_file);
+  }
+  # Call mkdir with the directories sorted by subdir count (how many /'s)
+  if (@dirs) {
+    my $mkdir_command = "mkdir -p ". join(' ', @dirs);
+    if (system($mkdir_command)  != 0) {
+      print STDERR "Creating dirs all at once failed; trying one at atime\n";
+      foreach $dir (@dirs) {
+        if (not -d $dir) {
+          print STDERR "Creating directory $dir\n";
+          create_directory($dir);
+        }
+      }
+    }
+  }
+}
+
+if ($ARGV[0] =~ /^--srcdir=/) {
+  $ac_given_srcdir = (split /=/, shift @ARGV)[1];
+} else {
+  $ac_given_srcdir = $0;
+  $ac_given_srcdir =~ s|/?build/autoconf/.*$||;
+  $ac_given_srcdir = '.' if $ac_given_srcdir eq '';
+}
+
+# Read list of makefiles from the stdin or,
+#   from files listed on the command-line.
+#
+@makefiles=();
+push @makefiles, split while (<>);
+
+# Create all the directories at once.
+#   This can be much faster than calling mkdir() for each one.
+create_directories(@makefiles);
+
+# Output the makefiles.
+#
+@unhandled=();
+foreach $ac_file (@makefiles) {
+  if (not $ac_file =~ /Makefile$/ or $ac_file =~ /:/) {
+    push @unhandled, $ac_file;
+    next;
+  }
+  $ac_file_in = "$ac_given_srcdir/$ac_file.in";
+  $ac_dir = dirname($ac_file);
+  if ($ac_dir eq '.') {
+    $ac_dir_suffix = '';
+    $ac_dots = '';
+  } else {
+    $ac_dir_suffix = "/$ac_dir";
+    $ac_dir_suffix =~ s%^/\./%/%;
+    $ac_dots = $ac_dir_suffix;
+    $ac_dots =~ s%/[^/]*%../%g;
+  }
+  if ($ac_given_srcdir eq '.') {
+    $srcdir = '.';
+    if ($ac_dots eq '') {
+      $top_srcdir = '.'
+    } else {
+      $top_srcdir = $ac_dots;
+      $top_srcdir =~ s%/$%%;
+    }
+  } elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) {
+    $srcdir     = "$ac_given_srcdir$ac_dir_suffix";
+    $top_srcdir = "$ac_given_srcdir";
+  } else {
+    $srcdir     = "$ac_dots$ac_given_srcdir$ac_dir_suffix";
+    $top_srcdir = "$ac_dots$ac_given_srcdir";
+  }
+
+  if (-e $ac_file) {
+    next if -M _ < -M $ac_file_in;
+    print STDERR "updating $ac_file\n";
+  } else {
+    print STDERR "creating $ac_file\n";
+  }
+
+  open (INFILE, "<$ac_file_in")
+    or ( warn "can't read $ac_file_in: No such file or directory\n" and next);
+  open (OUTFILE, ">$ac_file")
+    or ( warn "Unable to create $ac_file\n" and next);
+
+  while (<INFILE>) {
+    #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
+    #  warn "Two defines on a line:$ac_file:$.:$_";
+    #  push @unhandled, $ac_file;
+    #  last;
+    #}
+
+    s/\@srcdir\@/$srcdir/g;
+    s/\@top_srcdir\@/$top_srcdir/g;
+
+    if (/\@[_a-zA-Z]*\@/) {
+      warn "Unknown variable:$ac_file:$.:$_";
+      push @unhandled, $ac_file;
+      last;
+    }
+    print OUTFILE;
+  }
+  close INFILE;
+  close OUTFILE;
+}
+
+# Print the shell command to be evaluated by configure.
+#
+print "CONFIG_FILES=\"".join(' ', @unhandled)."\"; export CONFIG_FILES\n";
+

mozilla/build/autoconf/altoptions.m4

@@ -0,0 +1,140 @@
+dnl The contents of this file are subject to the Netscape Public
+dnl License Version 1.1 (the "License"); you may not use this file
+dnl except in compliance with the License. You may obtain a copy of
+dnl the License at http://www.mozilla.org/NPL/
+dnl
+dnl Software distributed under the License is distributed on an "AS
+dnl IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+dnl implied. See the License for the specific language governing
+dnl rights and limitations under the License.
+dnl
+dnl The Original Code is mozilla.org code.
+dnl
+dnl The Initial Developer of the Original Code is Netscape
+dnl Communications Corporation.  Portions created by Netscape are
+dnl Copyright (C) 1999 Netscape Communications Corporation. All
+dnl Rights Reserved.
+dnl
+dnl Contributor(s): 
+dnl
+
+dnl altoptions.m4 - An alternative way of specifying command-line options.
+dnl    These macros are needed to support a menu-based configurator.
+dnl    This file also includes the macro, AM_READ_MYCONFIG, for reading
+dnl    the 'myconfig.m4' file.
+
+dnl Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
+
+
+dnl MOZ_ARG_ENABLE_BOOL(           NAME, HELP, IF-YES [, IF-NO [, ELSE]])
+dnl MOZ_ARG_DISABLE_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE]])
+dnl MOZ_ARG_ENABLE_STRING(         NAME, HELP, IF-SET [, ELSE])
+dnl MOZ_ARG_ENABLE_BOOL_OR_STRING( NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
+dnl MOZ_ARG_WITH_BOOL(             NAME, HELP, IF-YES [, IF-NO [, ELSE])
+dnl MOZ_ARG_WITHOUT_BOOL(          NAME, HELP, IF-NO [, IF-YES [, ELSE])
+dnl MOZ_ARG_WITH_STRING(           NAME, HELP, IF-SET [, ELSE])
+dnl MOZ_ARG_HEADER(Comment)
+dnl MOZ_CHECK_PTHREADS(            NAME, IF-YES [, ELSE ])
+dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
+
+
+dnl MOZ_TWO_STRING_TEST(NAME, STR1, IF-STR1, STR2, IF-STR2 [, ELSE])
+AC_DEFUN(MOZ_TWO_STRING_TEST,
+[if test "$enableval" = "[$2]"; then
+    ifelse([$3], , :, [$3])
+  elif test "$enableval" = "[$4]"; then
+    ifelse([$5], , :, [$5])
+  else
+    ifelse([$6], ,
+      [AC_MSG_ERROR([Option, [$1], does not take an argument ($enableval).])],
+      [$6])
+  fi])
+
+dnl MOZ_ARG_ENABLE_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE]])
+AC_DEFUN(MOZ_ARG_ENABLE_BOOL,
+[AC_ARG_ENABLE([$1], [$2], 
+ [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_DISABLE_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE]])
+AC_DEFUN(MOZ_ARG_DISABLE_BOOL,
+[AC_ARG_ENABLE([$1], [$2],
+ [MOZ_TWO_STRING_TEST([$1], no, [$3], yes, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_ENABLE_STRING(NAME, HELP, IF-SET [, ELSE])
+AC_DEFUN(MOZ_ARG_ENABLE_STRING,
+[AC_ARG_ENABLE([$1], [$2], [$3], [$4])])
+
+dnl MOZ_ARG_ENABLE_BOOL_OR_STRING(NAME, HELP, IF-YES, IF-NO, IF-SET[, ELSE]]])
+AC_DEFUN(MOZ_ARG_ENABLE_BOOL_OR_STRING,
+[ifelse([$5], , 
+ [errprint([Option, $1, needs an "IF-SET" argument.
+])
+  m4exit(1)],
+ [AC_ARG_ENABLE([$1], [$2],
+  [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4], [$5])],
+  [$6])])])
+
+dnl MOZ_ARG_WITH_BOOL(NAME, HELP, IF-YES [, IF-NO [, ELSE])
+AC_DEFUN(MOZ_ARG_WITH_BOOL,
+[AC_ARG_WITH([$1], [$2],
+ [MOZ_TWO_STRING_TEST([$1], yes, [$3], no, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_WITHOUT_BOOL(NAME, HELP, IF-NO [, IF-YES [, ELSE])
+AC_DEFUN(MOZ_ARG_WITHOUT_BOOL,
+[AC_ARG_WITH([$1], [$2],
+ [MOZ_TWO_STRING_TEST([$1], no, [$3], yes, [$4])],
+ [$5])])
+
+dnl MOZ_ARG_WITH_STRING(NAME, HELP, IF-SET [, ELSE])
+AC_DEFUN(MOZ_ARG_WITH_STRING,
+[AC_ARG_WITH([$1], [$2], [$3], [$4])])
+
+dnl MOZ_ARG_HEADER(Comment)
+dnl This is used by webconfig to group options
+define(MOZ_ARG_HEADER, [# $1])
+
+dnl
+dnl Apparently, some systems cannot properly check for the pthread
+dnl library unless <pthread.h> is included so we need to test
+dnl using it
+dnl
+dnl MOZ_CHECK_PTHREADS(lib, success, failure)
+AC_DEFUN(MOZ_CHECK_PTHREADS,
+[
+AC_MSG_CHECKING([for pthread_create in -l$1])
+echo "
+    #include <pthread.h> 
+    void *foo(void *v) { int a = 1;  } 
+    int main() { 
+        pthread_t t;
+        if (!pthread_create(&t, 0, &foo, 0)) {
+            pthread_join(t, 0);
+        }
+        exit(0);
+    }" > dummy.c ;
+    echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -l[$1] $LDFLAGS $LIBS" 1>&5;
+    ${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -l[$1] $LDFLAGS $LIBS 2>&5;
+    _res=$? ;
+    rm -f dummy.c dummy${ac_exeext} ;
+    if test "$_res" = "0"; then
+        AC_MSG_RESULT([yes])
+        [$2]
+    else
+        AC_MSG_RESULT([no])
+        [$3]
+    fi
+])
+
+dnl MOZ_READ_MYCONFIG() - Read in 'myconfig.sh' file
+AC_DEFUN(MOZ_READ_MOZCONFIG,
+[AC_REQUIRE([AC_INIT_BINSH])dnl
+# Read in '.mozconfig' script to set the initial options.
+# See the mozconfig2configure script for more details.
+_AUTOCONF_TOOLS_DIR=`dirname [$]0`/[$1]/build/autoconf
+. $_AUTOCONF_TOOLS_DIR/mozconfig2configure])
+
+dnl This gets inserted at the top of the configure script
+MOZ_READ_MOZCONFIG(MOZ_TOPSRCDIR)

mozilla/build/autoconf/clean-config.sh

@@ -0,0 +1,54 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+# clean-config.sh - Removes all files generated by mozilla configure.
+#    Only removes files from the topsrcdir. To clean up an objdir,
+#    simply remove the directory and start over.
+#
+# Usage:
+#    1. cd <topsrcdir>
+#    2. build/autoconf/clean-config.sh
+#
+# Send comments, improvements, bugs to slamm@netscape.com
+
+topsrcdir=`cd \`dirname $0\`/../..; pwd`
+
+if [ ! -f configure.in ]; then
+  echo "clean-config.sh only cleans the source tree. To run," 2>&1
+  echo "  cd $topsrcdir; build/autoconf/clean-config.sh" 2>&1
+  echo "  (To clean a separate objdir, simple remove the directory.)" 2>&1
+  exit 1
+fi
+
+if [ -f mailnews/makefiles ]; then
+  MOZ_MAIL_NEWS=1
+  export MOZ_MAIL_NEWS
+fi
+
+. allmakefiles.sh
+
+rm -fr $MAKEFILES \
+    config-defs.h \
+    config.cache \
+    config.log \
+    config.status \
+    $NULL

mozilla/build/autoconf/gdk-pixbuf.m4

@@ -0,0 +1,166 @@
+# Configure paths for gdk-pixbuf
+# Elliot Lee 2000-01-10
+# stolen from Raph Levien 98-11-18
+# stolen from Manish Singh    98-9-30
+# stolen back from Frank Belew
+# stolen from Manish Singh
+# Shamelessly stolen from Owen Taylor
+
+dnl AM_PATH_GDK_PIXBUF([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GDK_PIXBUF, and define GDK_PIXBUF_CFLAGS and GDK_PIXBUF_LIBS
+dnl
+AC_DEFUN(AM_PATH_GDK_PIXBUF,
+[dnl 
+dnl Get the cflags and libraries from the gdk-pixbuf-config script
+dnl
+AC_ARG_WITH(gdk-pixbuf-prefix,[  --with-gdk-pixbuf-prefix=PFX   Prefix where GDK_PIXBUF is installed (optional)],
+            gdk_pixbuf_prefix="$withval", gdk_pixbuf_prefix="")
+AC_ARG_WITH(gdk-pixbuf-exec-prefix,[  --with-gdk-pixbuf-exec-prefix=PFX Exec prefix where GDK_PIXBUF is installed (optional)],
+            gdk_pixbuf_exec_prefix="$withval", gdk_pixbuf_exec_prefix="")
+AC_ARG_ENABLE(gdk_pixbuftest, [  --disable-gdk_pixbuftest       Do not try to compile and run a test GDK_PIXBUF program],
+		    , enable_gdk_pixbuftest=yes)
+
+  if test x$gdk_pixbuf_exec_prefix != x ; then
+     gdk_pixbuf_args="$gdk_pixbuf_args --exec-prefix=$gdk_pixbuf_exec_prefix"
+     if test x${GDK_PIXBUF_CONFIG+set} = xset ; then
+        GDK_PIXBUF_CONFIG=$gdk_pixbuf_exec_prefix/gdk-pixbuf-config
+     fi
+  fi
+  if test x$gdk_pixbuf_prefix != x ; then
+     gdk_pixbuf_args="$gdk_pixbuf_args --prefix=$gdk_pixbuf_prefix"
+     if test x${GDK_PIXBUF_CONFIG+set} = xset ; then
+        GDK_PIXBUF_CONFIG=$gdk_pixbuf_prefix/bin/gdk-pixbuf-config
+     fi
+  fi
+
+  AC_PATH_PROG(GDK_PIXBUF_CONFIG, gdk-pixbuf-config, no)
+  min_gdk_pixbuf_version=ifelse([$1], ,0.2.5,$1)
+  AC_MSG_CHECKING(for GDK_PIXBUF - version >= $min_gdk_pixbuf_version)
+  no_gdk_pixbuf=""
+  if test "$GDK_PIXBUF_CONFIG" = "no" ; then
+    no_gdk_pixbuf=yes
+  else
+    GDK_PIXBUF_CFLAGS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --cflags`
+    GDK_PIXBUF_LIBS=`$GDK_PIXBUF_CONFIG $gdk_pixbufconf_args --libs`
+
+    gdk_pixbuf_major_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gdk_pixbuf_minor_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gdk_pixbuf_micro_version=`$GDK_PIXBUF_CONFIG $gdk_pixbuf_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gdk_pixbuftest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
+      LIBS="$LIBS $GDK_PIXBUF_LIBS"
+dnl
+dnl Now check if the installed GDK_PIXBUF is sufficiently new. (Also sanity
+dnl checks the results of gdk-pixbuf-config to some extent
+dnl
+      rm -f conf.gdk_pixbuftest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+char*
+my_strdup (char *str)
+{
+  char *new_str;
+  
+  if (str)
+    {
+      new_str = malloc ((strlen (str) + 1) * sizeof(char));
+      strcpy (new_str, str);
+    }
+  else
+    new_str = NULL;
+  
+  return new_str;
+}
+
+int main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gdk_pixbuftest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = my_strdup("$min_gdk_pixbuf_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gdk_pixbuf_version");
+     exit(1);
+   }
+
+   if (($gdk_pixbuf_major_version > major) ||
+      (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version > minor)) ||
+      (($gdk_pixbuf_major_version == major) && ($gdk_pixbuf_minor_version == minor) && ($gdk_pixbuf_micro_version >= micro)))
+    {
+      return 0;
+    }
+  else
+    {
+      printf("\n*** 'gdk-pixbuf-config --version' returned %d.%d.%d, but the minimum version\n", $gdk_pixbuf_major_version, $gdk_pixbuf_minor_version, $gdk_pixbuf_micro_version);
+      printf("*** of GDK_PIXBUF required is %d.%d.%d. If gdk-pixbuf-config is correct, then it is\n", major, minor, micro);
+      printf("*** best to upgrade to the required version.\n");
+      printf("*** If gdk-pixbuf-config was wrong, set the environment variable GDK_PIXBUF_CONFIG\n");
+      printf("*** to point to the correct copy of gdk-pixbuf-config, and remove the file\n");
+      printf("*** config.cache before re-running configure\n");
+      return 1;
+    }
+}
+
+],, no_gdk_pixbuf=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gdk_pixbuf" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$GDK_PIXBUF_CONFIG" = "no" ; then
+       echo "*** The gdk-pixbuf-config script installed by GDK_PIXBUF could not be found"
+       echo "*** If GDK_PIXBUF was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GDK_PIXBUF_CONFIG environment variable to the"
+       echo "*** full path to gdk-pixbuf-config."
+     else
+       if test -f conf.gdk_pixbuftest ; then
+        :
+       else
+          echo "*** Could not run GDK_PIXBUF test program, checking why..."
+          CFLAGS="$CFLAGS $GDK_PIXBUF_CFLAGS"
+          LIBS="$LIBS $GDK_PIXBUF_LIBS"
+          AC_TRY_LINK([
+#include <stdio.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+],      [ return 0; ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GDK_PIXBUF or finding the wrong"
+          echo "*** version of GDK_PIXBUF. If it is not finding GDK_PIXBUF, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GDK_PIXBUF was incorrectly installed"
+          echo "*** or that you have moved GDK_PIXBUF since it was installed. In the latter case, you"
+          echo "*** may want to edit the gdk-pixbuf-config script: $GDK_PIXBUF_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GDK_PIXBUF_CFLAGS=""
+     GDK_PIXBUF_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GDK_PIXBUF_CFLAGS)
+  AC_SUBST(GDK_PIXBUF_LIBS)
+  rm -f conf.gdk_pixbuftest
+])

mozilla/build/autoconf/glib.m4

@@ -0,0 +1,200 @@
+# Configure paths for GLIB
+# Owen Taylor     97-11-3
+
+dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
+dnl gthread is specified in MODULES, pass to glib-config
+dnl
+AC_DEFUN(AM_PATH_GLIB,
+[dnl 
+dnl Get the cflags and libraries from the glib-config script
+dnl
+AC_ARG_WITH(glib-prefix,[  --with-glib-prefix=PFX  Prefix where GLIB is installed (optional)],
+            glib_config_prefix="$withval", glib_config_prefix="")
+AC_ARG_WITH(glib-exec-prefix,[  --with-glib-exec-prefix=PFX
+                          Exec prefix where GLIB is installed (optional)],
+            glib_config_exec_prefix="$withval", glib_config_exec_prefix="")
+AC_ARG_ENABLE(glibtest, [  --disable-glibtest      Do not try to compile and run a test GLIB program],
+		    , enable_glibtest=yes)
+
+  if test x$glib_config_exec_prefix != x ; then
+     glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix"
+     if test x${GLIB_CONFIG+set} != xset ; then
+        GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config
+     fi
+  fi
+  if test x$glib_config_prefix != x ; then
+     glib_config_args="$glib_config_args --prefix=$glib_config_prefix"
+     if test x${GLIB_CONFIG+set} != xset ; then
+        GLIB_CONFIG=$glib_config_prefix/bin/glib-config
+     fi
+  fi
+
+  for module in . $4
+  do
+      case "$module" in
+         gmodule) 
+             glib_config_args="$glib_config_args gmodule"
+         ;;
+         gthread) 
+             glib_config_args="$glib_config_args gthread"
+         ;;
+      esac
+  done
+
+  dnl Force a version check to keep upgraded versions from being overridden by the cached value.
+  unset ac_cv_path_GLIB_CONFIG
+
+  AC_PATH_PROG(GLIB_CONFIG, glib-config, no)
+  min_glib_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+  no_glib=""
+  if test "$GLIB_CONFIG" = "no" ; then
+    no_glib=yes
+  else
+    GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags`
+    GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs`
+    glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_glibtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GLIB_CFLAGS"
+      LIBS="$GLIB_LIBS $LIBS"
+dnl
+dnl Now check if the installed GLIB is sufficiently new. (Also sanity
+dnl checks the results of glib-config to some extent
+dnl
+      rm -f conf.glibtest
+      AC_TRY_RUN([
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.glibtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_glib_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_glib_version");
+     exit(1);
+   }
+
+  if ((glib_major_version != $glib_config_major_version) ||
+      (glib_minor_version != $glib_config_minor_version) ||
+      (glib_micro_version != $glib_config_micro_version))
+    {
+      printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 
+             $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
+             glib_major_version, glib_minor_version, glib_micro_version);
+      printf ("*** was found! If glib-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n");
+      printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+  else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
+	   (glib_minor_version != GLIB_MINOR_VERSION) ||
+           (glib_micro_version != GLIB_MICRO_VERSION))
+    {
+      printf("*** GLIB header files (version %d.%d.%d) do not match\n",
+	     GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     glib_major_version, glib_minor_version, glib_micro_version);
+    }
+  else
+    {
+      if ((glib_major_version > major) ||
+        ((glib_major_version == major) && (glib_minor_version > minor)) ||
+        ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n",
+               glib_major_version, glib_minor_version, glib_micro_version);
+        printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GLIB is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the glib-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n");
+        printf("*** correct copy of glib-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_glib" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$GLIB_CONFIG" = "no" ; then
+       echo "*** The glib-config script installed by GLIB could not be found"
+       echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GLIB_CONFIG environment variable to the"
+       echo "*** full path to glib-config."
+     else
+       if test -f conf.glibtest ; then
+        :
+       else
+          echo "*** Could not run GLIB test program, checking why..."
+          CFLAGS="$CFLAGS $GLIB_CFLAGS"
+          LIBS="$LIBS $GLIB_LIBS"
+          AC_TRY_LINK([
+#include <glib.h>
+#include <stdio.h>
+],      [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+          echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GLIB was incorrectly installed"
+          echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
+          echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GLIB_CFLAGS=""
+     GLIB_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GLIB_CFLAGS)
+  AC_SUBST(GLIB_LIBS)
+  rm -f conf.glibtest
+])

mozilla/build/autoconf/gtk.m4

@@ -0,0 +1,191 @@
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
+# (copy of gtk.m4 (public domain))
+
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+dnl
+AC_DEFUN(AM_PATH_GTK,
+[dnl 
+dnl Get the cflags and libraries from the gtk-config script
+dnl
+AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
+            gtk_config_prefix="$withval", gtk_config_prefix="")
+AC_ARG_WITH(gtk-exec-prefix,[  --with-gtk-exec-prefix=PFX 
+                          Exec prefix where GTK is installed (optional)],
+            gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+AC_ARG_ENABLE(gtktest, [  --disable-gtktest       Do not try to compile and run a test GTK program],
+		    , enable_gtktest=yes)
+
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  fi
+
+  dnl Force a version check to keep upgraded versions from being overridden by the cached value.
+  unset ac_cv_path_GTK_CONFIG
+
+  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+  min_gtk_version=ifelse([$1], ,0.99.7,$1)
+  AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+  no_gtk=""
+  if test "$GTK_CONFIG" = "no" ; then
+    no_gtk=yes
+  else
+    GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+    GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+    gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$LIBS $GTK_LIBS"
+dnl
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config to some extent
+dnl
+      rm -f conf.gtktest
+      AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtktest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_version) ||
+      (gtk_minor_version != $gtk_config_minor_version) ||
+      (gtk_micro_version != $gtk_config_micro_version))
+    {
+      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+      printf ("*** was found! If gtk-config was correct, then it is best\n");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+	   (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_micro_version != GTK_MICRO_VERSION))
+    {
+      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+               gtk_major_version, gtk_minor_version, gtk_micro_version);
+        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+	       major, minor, micro);
+        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_gtk" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$GTK_CONFIG" = "no" ; then
+       echo "*** The gtk-config script installed by GTK could not be found."
+       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GTK_CONFIG environment variable to the"
+       echo "*** full path to gtk-config."
+       echo "*** GTK+ is available from ftp://ftp.gtk.org/pub/gtk"
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK test program, checking why..."
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding GTK or finding the wrong"
+          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+          echo "***"
+          echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(GTK_CFLAGS)
+  AC_SUBST(GTK_LIBS)
+  rm -f conf.gtktest
+])

mozilla/build/autoconf/install-sh

@@ -0,0 +1,119 @@
+#!/bin/sh
+
+#
+# install - install a program, script, or datafile
+# This comes from X11R5; it is not part of GNU.
+#
+# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.
+#
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+
+instcmd="$mvprog"
+chmodcmd=""
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:  no input file specified"
+	exit 1
+fi
+
+if [ x"$dst" = x ]
+then
+	echo "install:  no destination specified"
+	exit 1
+fi
+
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+if [ -d $dst ]
+then
+	dst="$dst"/`basename $src`
+fi
+
+# Make a temp file name in the proper directory.
+
+dstdir=`dirname $dst`
+dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+$doit $instcmd $src $dsttmp
+
+# and set any options; do chmod last to preserve setuid bits
+
+if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
+if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
+if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
+if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
+
+# Now rename the file to the real destination.
+
+$doit $rmcmd $dst
+$doit $mvcmd $dsttmp $dst
+
+
+exit 0

mozilla/build/autoconf/libIDL.m4

@@ -0,0 +1,198 @@
+# Configure paths for LIBIDL
+
+dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
+dnl
+AC_DEFUN(AM_PATH_LIBIDL,
+[dnl 
+dnl Get the cflags and libraries from the libIDL-config script
+dnl
+AC_ARG_WITH(libIDL-prefix,[  --with-libIDL-prefix=PFX
+                          Prefix where libIDL is installed (optional)],
+            libIDL_config_prefix="$withval", libIDL_config_prefix="")
+AC_ARG_WITH(libIDL-exec-prefix,[  --with-libIDL-exec-prefix=PFX
+                          Exec prefix where libIDL is installed (optional)],
+            libIDL_config_exec_prefix="$withval", libIDL_config_exec_prefix="")
+AC_ARG_ENABLE(libIDLtest, [  --disable-libIDLtest    Do not try to compile and run a test libIDL program],
+		    , enable_libIDLtest=yes)
+
+  if test x$libIDL_config_exec_prefix != x ; then
+     libIDL_config_args="$libIDL_config_args --exec-prefix=$libIDL_config_exec_prefix"
+     if test x${LIBIDL_CONFIG+set} != xset ; then
+        LIBIDL_CONFIG=$libIDL_config_exec_prefix/bin/libIDL-config
+     fi
+  fi
+  if test x$libIDL_config_prefix != x ; then
+     libIDL_config_args="$libIDL_config_args --prefix=$libIDL_config_prefix"
+     if test x${LIBIDL_CONFIG+set} != xset ; then
+        LIBIDL_CONFIG=$libIDL_config_prefix/bin/libIDL-config
+     fi
+  fi
+
+  AM_PATH_GLIB(1.2.0)
+
+  dnl Force a version check to keep upgraded versions from being overridden by the cached value.
+  unset ac_cv_path_LIBIDL_CONFIG
+
+  AC_PATH_PROG(LIBIDL_CONFIG, libIDL-config, no)
+  min_libIDL_version=ifelse([$1], ,0.6.0,$1)
+  AC_MSG_CHECKING(for libIDL - version >= $min_libIDL_version)
+  no_libIDL=""
+  if test "$LIBIDL_CONFIG" = "no" ; then
+    no_libIDL=yes
+  else
+    LIBIDL_CFLAGS=`$LIBIDL_CONFIG $libIDL_config_args --cflags`
+    LIBIDL_LIBS=`$LIBIDL_CONFIG $libIDL_config_args --libs`
+    # hack to allow us to keep using libIDL 0.6.3-0.6.7. Anyone may remove
+    # this after we start requiring libIDL 0.6.8 or anything higher
+    LIBIDL_CFLAGS="$GLIB_CFLAGS $LIBIDL_CFLAGS"
+    LIBIDL_LIBS="$GLIB_LIBS $LIBIDL_LIBS"
+    libIDL_config_major_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+    libIDL_config_minor_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+    libIDL_config_micro_version=`$LIBIDL_CONFIG $libIDL_config_args --version | \
+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+    if test "x$enable_libIDLtest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
+      LIBS="$LIBIDL_LIBS $LIBS"
+dnl
+dnl Now check if the installed LIBIDL is sufficiently new.
+dnl
+      rm -f conf.libIDLtest
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <libIDL/IDL.h>
+
+int 
+main ()
+{
+  int major, minor, micro;
+  int libIDL_major_version;
+  int libIDL_minor_version;
+  int libIDL_micro_version;
+  char *tmp_version;
+
+  system ("touch conf.libIDLtest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup ("$min_libIDL_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_libIDL_version");
+     exit(1);
+  }
+  tmp_version = g_strdup (IDL_get_libver_string ());
+  if (sscanf(tmp_version, "%d.%d.%d",
+	     &libIDL_major_version,
+	     &libIDL_minor_version,
+	     &libIDL_micro_version) != 3) {
+     printf("%s, bad version string\n", tmp_version);
+     exit(1);
+  }
+
+  if ((libIDL_major_version != $libIDL_config_major_version) ||
+      (libIDL_minor_version != $libIDL_config_minor_version) ||
+      (libIDL_micro_version != $libIDL_config_micro_version))
+    {
+      printf("\n*** 'libIDL-config --version' returned %d.%d.%d, but libIDL (%d.%d.%d)\n", 
+             $libIDL_config_major_version, $libIDL_config_minor_version, $libIDL_config_micro_version,
+             libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
+      printf ("*** was found! If libIDL-config was correct, then it is best\n");
+      printf ("*** to remove the old version of LIBIDL. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\n");
+      printf("*** If libIDL-config was wrong, set the environment variable LIBIDL_CONFIG\n");
+      printf("*** to point to the correct copy of libIDL-config, and remove the file config.cache\n");
+      printf("*** before re-running configure\n");
+    } 
+  else if ((libIDL_major_version != LIBIDL_MAJOR_VERSION) ||
+	   (libIDL_minor_version != LIBIDL_MINOR_VERSION) ||
+           (libIDL_micro_version != LIBIDL_MICRO_VERSION))
+    {
+      printf("\n*** libIDL header files (version %d.%d.%d) do not match\n",
+	     LIBIDL_MAJOR_VERSION, LIBIDL_MINOR_VERSION, LIBIDL_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+	     libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
+    }
+  else
+    {
+      if ((libIDL_major_version > major) ||
+        ((libIDL_major_version == major) && (libIDL_minor_version > minor)) ||
+        ((libIDL_major_version == major) && (libIDL_minor_version == minor) && (libIDL_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        printf("\n*** An old version of libIDL (%d.%d.%d) was found.\n",
+               libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
+        printf("*** You need at least libIDL version %d.%d.%d.\n",
+               major, minor, micro);
+        printf("***\n");
+        printf("*** If you have already installed a sufficiently new version, this error\n");
+        printf("*** probably means that the wrong copy of the libIDL-config shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of libIDL, but you can also set the LIBIDL_CONFIG environment to point to the\n");
+        printf("*** correct copy of libIDL-config. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+],, no_libIDL=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     fi
+  fi
+  if test "x$no_libIDL" = x ; then
+     AC_MSG_RESULT(yes)
+     ifelse([$2], , :, [$2])     
+  else
+     AC_MSG_RESULT(no)
+     if test "$LIBIDL_CONFIG" = "no" ; then
+       echo "*** The libIDL-config script installed by libIDL could not be found"
+       echo "*** If libIDL was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the LIBIDL_CONFIG environment variable to the"
+       echo "*** full path to libIDL-config."
+     else
+       if test -f conf.libIDLtest ; then
+        :
+       else
+          echo "*** Could not run libIDL test program, checking why..."
+          CFLAGS="$CFLAGS $LIBIDL_CFLAGS"
+          LIBS="$LIBS $LIBIDL_LIBS"
+          AC_TRY_LINK([
+#include <stdio.h>
+#include <stdlib.h>
+#include <libIDL/IDL.h>
+],      [ return IDL_get_libver_string ? 1 : 0; ],
+        [ echo "*** The test program compiled, but did not run. This usually means"
+          echo "*** that the run-time linker is not finding libIDL or finding the wrong"
+          echo "*** version of LIBIDL. If it is not finding libIDL, you'll need to set your"
+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+          echo "*** is required on your system"
+	  echo "***"
+          echo "*** If you have an old version installed, it is best to remove it, although"
+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means libIDL was incorrectly installed"
+          echo "*** or that you have moved libIDL since it was installed. In the latter case, you"
+          echo "*** may want to edit the libIDL-config script: $LIBIDL_CONFIG" ])
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     fi
+     LIBIDL_CFLAGS=""
+     LIBIDL_LIBS=""
+     ifelse([$3], , :, [$3])
+  fi
+  AC_SUBST(LIBIDL_CFLAGS)
+  AC_SUBST(LIBIDL_LIBS)
+  rm -f conf.libIDLtest
+])

mozilla/build/autoconf/make-makefile

@@ -0,0 +1,280 @@
+#! /usr/bin/env perl
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+# make-makefiles - Quickly create Makefiles for subdirectories.
+#      Also, creates any needed subdirectories.
+#
+# usage: make-makefiles [ -t <topsrcdir> -d <depth> ] [ <subdir> | <subdir>/Makefile ] ...
+
+# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com).
+
+#$debug = 1;
+
+# Determine various tree path variables
+#
+($topsrcdir, $depth, @makefiles) = parse_arguments(@ARGV);
+
+$object_fullpath = `pwd`;
+chdir $depth;
+$object_root = `pwd`;
+chomp $object_fullpath;
+chomp $object_root;
+
+# $source_subdir is the path from the object root to where
+#    'make-makefile' was called. For example, if make-makefile was
+#    called from "mozilla/gfx/src", then $source_subdir would be
+#    "gfx/src/".
+$source_subdir = "$object_fullpath/";
+my $quoted_object_root = quotemeta($object_root);
+$source_subdir =~ s|^$quoted_object_root/||;
+
+# Prefix makefiles with $source_subdir so that paths
+# will be relative to the top of the object tree.
+#
+for $makefile (@makefiles) {
+  $makefile = "$source_subdir$makefile";
+}
+
+create_directories(@makefiles);
+
+# Find the path to the source directory based on how 'make-makefile'
+#  was invoked. The path is either relative to the object directory
+#  or an absolute path.
+$given_srcdir = find_srcdir($topsrcdir, $depth);
+
+if ($debug) {
+  warn "object_fullpath = $object_fullpath\n";
+  warn "object_root     = $object_root\n";
+  warn "source_subdir   = $source_subdir\n";
+  warn "makefiles       = @makefiles\n";
+  warn "given_srcdir    = $given_srcdir\n";
+}
+
+@unhandled = update_makefiles($given_srcdir, @makefiles);
+
+run_config_status(@unhandled);
+
+# end of Main
+############################################################
+
+sub dirname {
+ return $_[0] =~ /(.*)\/.*/ ? "$1" : '.';
+}
+
+# find_depth: Pull the value of DEPTH out of a Makefile (or Makefile.in)
+sub find_depth {
+  my $depth = '';
+  open(MAKEFILE, "<$_[0]") || die "Unable to open $_[0]: $!\n";
+  while (<MAKEFILE>) {
+    next unless /^DEPTH\s*=\s*(\..*)/;
+    $depth = $1;
+    last;
+  }
+  close MAKEFILE;
+  return $depth;
+}
+
+sub parse_arguments {
+  my @args = @_;
+  my $depth = '';
+  my $topsrcdir = '';
+  my @makefiles = ();
+
+  while (1) {
+    if ($args[0] eq '-d') {
+      $depth = $args[1];
+      shift @args; 
+      shift @args; 
+    } elsif ($args[0] eq '-t') {
+      $topsrcdir = $args[1];
+      shift @args; 
+      shift @args; 
+    } else {
+      last;
+    }
+  }
+
+  if ($topsrcdir eq '') {
+    $topsrcdir = $0; # Figure out topsrcdir based on program name.
+    $topsrcdir =~ s|/?build/autoconf/.*$||;
+  }
+  if ($depth eq '') {
+    # Use $(DEPTH) in the Makefile or Makefile.in to determine the depth
+    if (-e "Makefile.in") {
+      $depth = find_depth("Makefile.in");
+    } elsif (-e "Makefile") {
+      $depth = find_depth("Makefile");
+    } elsif (-e "../Makefile") {
+      $depth = "../".find_depth("../Makefile");
+      $depth =~ s/\/\.$//;
+    } else {
+      warn "Unable to determine depth (e.g. ../..) to root of objdir tree.\n";
+      die  "No Makefile(.in) present. Try running with '-d <depth>'\n";
+    }
+  } 
+
+  # Build the list of makefiles to generate
+  #
+  @makefiles = ();
+  my $makefile;
+  foreach $makefile (@args) {
+    $makefile =~ s/\.in$//;
+    $makefile =~ s/\/$//;
+    $makefile =~ /Makefile$/ or $makefile .= "/Makefile";
+    push @makefiles, "$makefile";
+  }
+  @makefiles = "Makefile" unless @args;
+
+  return ($topsrcdir, $depth, @makefiles);
+}
+
+
+# Create all the directories at once.
+#   This can be much faster than calling mkdir() for each one.
+sub create_directories {
+  my @makefiles = @_;
+  my @dirs = ();
+  my $ac_file;
+  foreach $ac_file (@makefiles) {
+    push @dirs, dirname($ac_file);
+  }
+  # Call mkdir with the directories sorted by subdir count (how many /'s)
+  system "mkdir -p ". join(' ', @dirs) if @dirs;
+}
+
+# Find the top of the source directory
+# (Assuming that the executable is in $top_srcdir/build/autoconf)
+sub find_srcdir {
+  my ($ac_given_srcdir, $depth) = @_;
+
+  if ($debug) {
+    print "ac_given_srcdir = $ac_given_srcdir\n";
+    print "depth           = $depth\n";
+  }
+  if ($ac_given_srcdir =~ /^\./ and $depth ne '.') {
+    my $quoted_depth = quotemeta($depth);
+    $ac_given_srcdir =~ s|^$quoted_depth/?||;
+  }
+  if ($debug) {
+    print "ac_given_srcdir = $ac_given_srcdir\n";
+  }
+  $ac_given_srcdir = '.' if $ac_given_srcdir eq '';
+  return $ac_given_srcdir;
+}
+
+# Output the makefiles.
+#
+sub update_makefiles {
+  my ($ac_given_srcdir, @makefiles) = @_;
+  my @unhandled=();
+
+  my $ac_file;
+  foreach $ac_file (@makefiles) {
+    my $ac_file_in    = "$ac_given_srcdir/${ac_file}.in";
+    my $ac_dir        = dirname($ac_file);
+    my $ac_dots       = '';
+    my $ac_dir_suffix = '';
+    my $srcdir        = '.';
+    my $top_srcdir    = '.';
+
+    # Determine $srcdir and $top_srcdir
+    #
+    if ($ac_dir ne '.') {
+      $ac_dir_suffix = "/$ac_dir";
+      $ac_dir_suffix =~ s%^/\./%/%;
+      $ac_dots = $ac_dir_suffix;
+      $ac_dots =~ s%/[^/]*%../%g;
+    }
+    if ($ac_given_srcdir eq '.') {
+      if ($ac_dots ne '') {
+        $top_srcdir = $ac_dots;
+        $top_srcdir =~ s%/$%%;
+      }
+    } elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) {
+      $srcdir     = "$ac_given_srcdir$ac_dir_suffix";
+      $top_srcdir = "$ac_given_srcdir";
+    } else {
+      $srcdir     = "$ac_dots$ac_given_srcdir$ac_dir_suffix";
+      $top_srcdir = "$ac_dots$ac_given_srcdir";
+    }
+
+    if ($debug) {
+      print "ac_dir     = $ac_dir\n";
+      print "ac_file    = $ac_file\n";
+      print "ac_file_in = $ac_file_in\n";
+      print "srcdir     = $srcdir\n";
+      print "top_srcdir = $top_srcdir\n";
+      print "cwd        = " . `pwd` . "\n";
+    }
+
+    # Copy the file and make substitutions.
+    #    @srcdir@     -> value of $srcdir
+    #    @top_srcdir@ -> value of $top_srcdir
+    #
+    if (-e $ac_file) {
+      next if -M _ < -M $ac_file_in;  # Next if Makefile is up-to-date.
+      warn "updating $ac_file\n";
+    } else {
+      warn "creating $ac_file\n";
+    }
+
+    open INFILE, "<$ac_file_in" or do {
+      warn "$0: Cannot read $ac_file_in: No such file or directory\n";
+      next;
+    };
+    open OUTFILE, ">$ac_file" or do {
+      warn "$0: Unable to create $ac_file\n";
+      next;
+    };
+
+    while (<INFILE>) {
+      #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) {
+      #  #warn "Two defines on a line:$ac_file:$.:$_";
+      #  push @unhandled, $ac_file;
+      #  last;
+      #}
+
+      s/\@srcdir\@/$srcdir/g;
+      s/\@top_srcdir\@/$top_srcdir/g;
+
+      if (/\@[_a-zA-Z]*\@/) {
+        #warn "Unknown variable:$ac_file:$.:$_";
+        push @unhandled, $ac_file;
+        last;
+      }
+      print OUTFILE;
+    }
+    close INFILE;
+    close OUTFILE;
+  }
+  return @unhandled;
+}
+
+sub run_config_status {
+  my @unhandled = @_;
+
+  # Run config.status with any unhandled files.
+  #
+  if (@unhandled) {
+    $ENV{CONFIG_FILES}= join ' ', @unhandled;
+    system "./config.status";
+  }
+}

mozilla/build/autoconf/match-dir.sh

@@ -0,0 +1,85 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+#
+# This script will match a dir with a set of dirs.
+#
+# Usage: match-dir.sh match [dir1 dir2 ... dirn]
+#
+# Send comments, improvements, bugs to ramiro@netscape.com
+# 
+
+if [ -f Makefile ]; then
+	MAKEFILE="Makefile"
+else
+	if [ -f Makefile.in ]; then
+		MAKEFILE="Makefile.in"
+	else
+		echo
+		echo "There ain't no 'Makefile' or 'Makefile.in' over here: $pwd, dude."
+		echo
+		exit 1
+	fi
+fi
+
+# Use DEPTH in the Makefile.in to determine the depth
+depth=`grep -w DEPTH ${MAKEFILE}  | grep "\.\." | awk -F"=" '{ print $2; }'`
+cwd=`pwd`
+
+# Determine the depth count
+n=`echo $depth | tr '/' ' ' | wc -w`
+
+cd $depth
+objdir=`pwd`
+
+path=`echo $cwd | sed "s|^${objdir}/||"`
+
+match=$path
+
+for i in $*
+do
+#	echo "Looking for $match in $i"
+
+	echo $i | grep -q -x $match
+
+	if [ $? -eq 0 ]
+	then
+		echo "1"
+
+		exit 0
+	fi
+
+#	echo "Looking for $i in $match"
+
+	echo $match | grep -q $i
+
+	if [ $? -eq 0 ]
+	then
+		echo "1"
+
+		exit 0
+	fi
+done
+
+echo "0"
+
+exit 0

mozilla/build/autoconf/mozconfig-find

@@ -0,0 +1,46 @@
+#! /bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): Stephen Lamm <slamm@netscape.com>
+#
+
+# mozconfigfind - Loads options from .mozconfig onto configure's
+#    command-line. The .mozconfig file is searched for in the 
+#    order:
+#       if $MOZCONFIG is set, use that.
+#       Otherwise, use $TOPSRCDIR/.mozconfig
+#       Otherwise, use $HOME/.mozconfig
+#
+topsrcdir=$1
+
+for _config in $MOZCONFIG \
+               $MOZ_MYCONFIG \
+               $topsrcdir/.mozconfig \
+               $topsrcdir/mozconfig \
+               $topsrcdir/mozconfig.sh \
+               $topsrcdir/myconfig.sh \
+               $HOME/.mozconfig \
+               $HOME/.mozconfig.sh \
+               $HOME/.mozmyconfig.sh
+do
+  if test -f $_config; then
+    echo $_config;
+    exit 0
+  fi
+done

mozilla/build/autoconf/mozconfig2client-mk

@@ -0,0 +1,94 @@
+#! /bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): Stephen Lamm <slamm@netscape.com>
+#
+
+# mozconfig2client-mk - Translates .mozconfig into options for client.mk.
+#    Prints defines to stdout.
+#
+# See mozconfig2configure for more details
+
+print_header() {
+  _mozconfig=${MOZCONFIG:-$HOME/.mozconfig}
+  cat >> $tmp_file <<EOF
+# gmake
+# This file is automatically generated for client.mk.
+# Do not edit. Edit $_mozconfig instead.
+# To create a new .mozconfig file, you can visit,
+#   http://webtools.mozilla.org/build/config.cgi
+
+EOF
+}
+
+ac_add_options() {
+  echo "# $* is used by configure (not client.mk)" >> $tmp_file
+}
+
+mk_add_options() {
+  for _opt
+  do
+    # Escape shell characters, space, tab, dollar, quote, backslash,
+    # and substitute '@<word>@' with '$(<word>)'.
+    _opt=`echo "$_opt" | sed -e 's/\([\"\\]\)/\\\1/g; s/@\([^@]*\)@/\$(\1)/g;'`
+    echo $_opt;
+    opts="${opts:+$opts^}$_opt";
+  done >> $tmp_file
+}
+
+mk_echo_options() {
+  echo "Adding client.mk options from $MOZCONFIG:"
+  IFS=^
+  for _opt in $opts; do
+    echo "    $_opt"
+  done
+}
+
+# Main
+#--------------------------------------------------
+
+scriptdir=`dirname $0`
+topsrcdir=$1
+out_file=$2
+tmp_file="$out_file-tmp$$"
+opts=""
+
+trap "rm -f $tmp_file; exit 1" 1 2 15
+
+MOZCONFIG=`$scriptdir/mozconfig-find $topsrcdir`
+
+print_header > $tmp_file
+
+# If the path changes, configure should be rerun
+echo "# PATH=$PATH" >> $tmp_file
+
+if [ "$MOZCONFIG" ]
+then
+  . $MOZCONFIG
+fi
+
+if [ "$opts" ]; then
+  mk_echo_options
+fi
+
+if test -f $out_file && cmp -s $tmp_file $out_file; then
+  rm $tmp_file
+else
+  mv -f $tmp_file $out_file
+fi

mozilla/build/autoconf/mozconfig2configurator

@@ -0,0 +1,70 @@
+#! /bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): Stephen Lamm (slamm@netscape.com)
+#
+
+# mozconfig2configurator - Translates .mozconfig into options for
+#    the online configurator,
+#
+#        http://webtools.mozilla.org/build/config.cgi
+#    
+#   This is called by the 'webconfig' target of mozilla/client.mk
+#
+
+ac_add_options() {
+  for _opt
+  do
+    # Escape special url characters
+    _opt=`echo $_opt | sed -e 's/%/%25/g;s/ /%20/g;s/&/%26/g;'`
+    case "$_opt" in
+      --*-*= ) url="$url$_opt&"     ;;
+      --*-* )  url="$url$_opt=yes&" ;;
+    esac
+  done
+}
+
+mk_add_options() {
+  for _opt
+  do
+    # Escape special url characters
+    # Escape special url characters
+    _opt=`echo $_opt | sed -e 's/%/%25/g;s/ /%20/g;s/&/%26/g;'`
+    url="$url$_opt&"
+  done
+}
+
+#
+# main
+#
+
+# find-mozconfig.sh 
+#   In params:   $MOZCONFIG $HOME ($MOZ_MYCONFIG)
+scriptdir=`dirname $0`
+MOZCONFIG=`$scriptdir/mozconfig-find $topsrcdir`
+
+if [ "$MOZCONFIG" ]
+then
+  url="http://webtools.mozilla.org/build/config.cgi?"
+  . $MOZCONFIG
+
+  # Drop the last character of $url
+  echo `expr "$url" : "\(.*\)."`
+fi
+

mozilla/build/autoconf/mozconfig2configure

@@ -0,0 +1,99 @@
+#! /bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): Stephen Lamm <slamm@netscape.com>
+#
+
+# mozconfig2configure - Loads options from .mozconfig onto configure's
+#    command-line. See find-mozconfig.sh for how the config file is
+#    found
+#
+#    The options from .mozconfig are inserted into the command-line
+#    before the real command-line options. This way the real options
+#    will override any .mozconfig options.
+#
+# .mozconfig is a shell script. To add an option to configure's
+#    command-line use the pre-defined function, ac_add_options,
+#
+#       ac_add_options  <configure-option> [<configure-option> ... ]
+#
+#    For example,
+#
+#       ac_add_options --with-pthreads --enable-debug
+#
+# ac_add_options can be called multiple times in .mozconfig.
+#    Each call adds more options to configure's command-line.
+
+# Note: $_AUTOCONF_TOOLS_DIR must be defined in the script that includes this.
+
+ac_add_options() {
+  for _opt
+  do
+    # Escape shell characters, space, tab, dollar, quote, backslash.
+    _opt=`echo $_opt | sed -e 's/\([\ \	\$\"\\]\)/\\\\\1/g;s/@\([^@]*\)@/\$\1/g;'`
+    _opt=`echo $_opt | sed -e 's/@\([^@]*\)@/\$(\1)/g'`
+
+    # Avoid adding duplicates
+    case "$ac_options" in
+      *"$_opt"* ) ;;
+      * ) mozconfig_ac_options="$mozconfig_ac_options $_opt" ;;
+    esac
+  done
+}
+
+mk_add_options() {
+  # These options are for client.mk
+  # configure can safely ignore them.
+  :
+}
+
+ac_echo_options() {
+  echo "Adding configure options from $MOZCONFIG:"
+  eval "set -- $mozconfig_ac_options"
+  for _opt
+  do
+    echo "  $_opt"
+  done
+}
+
+# Main
+#--------------------------------------------------
+_topsrcdir=`dirname $0`
+ac_options=
+mozconfig_ac_options=
+
+# Save the real command-line options
+for _opt
+do
+  # Escape shell characters, space, tab, dollar, quote, backslash.
+  _opt=`echo $_opt | sed -e 's/\([\ \	\$\"\\]\)/\\\\\1/g;'`
+  ac_options="$ac_options \"$_opt\""
+done
+
+MOZCONFIG=`$_AUTOCONF_TOOLS_DIR/mozconfig-find $_topsrcdir`
+if [ "$MOZCONFIG" ]; then
+  . $MOZCONFIG
+fi
+
+if [ "$mozconfig_ac_options" ]; then
+  ac_echo_options 1>&2
+fi
+
+eval "set -- $mozconfig_ac_options $ac_options"
+

mozilla/build/autoconf/nspr.m4

@@ -0,0 +1,67 @@
+# -*- tab-width: 4; -*-
+# Configure paths for NSPR
+# Public domain - Chris Seawood <cls@seawood.org> 2001-04-05
+# Based upon gtk.m4 (also PD) by Owen Taylor
+
+dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
+AC_DEFUN(AM_PATH_NSPR,
+[dnl
+
+AC_ARG_WITH(nspr-prefix,
+	[  --with-nspr-prefix=PFX  Prefix where NSPR is installed],
+	nspr_config_prefix="$withval",
+	nspr_config_prefix="")
+
+AC_ARG_WITH(nspr-exec-prefix,
+	[  --with-nspr-exec-prefix=PFX
+                          Exec prefix where NSPR is installed],
+	nspr_config_exec_prefix="$withval",
+	nspr_config_exec_prefix="")
+
+	if test -n "$nspr_config_exec_prefix"; then
+		nspr_config_args="$nspr_config_args --exec-prefix=$nspr_config_exec_prefix"
+		if test -z "$NSPR_CONFIG"; then
+			NSPR_CONFIG=$nspr_config_exec_prefix/bin/nspr-config
+		fi
+	fi
+	if test -n "$nspr_config_prefix"; then
+		nspr_config_args="$nspr_config_args --prefix=$nspr_config_prefix"
+		if test -z "$NSPR_CONFIG"; then
+			NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config
+		fi
+	fi
+
+	unset ac_cv_path_NSPR_CONFIG
+	AC_PATH_PROG(NSPR_CONFIG, nspr-config, no)
+	min_nspr_version=ifelse([$1], ,4.0.0,$1)
+	AC_MSG_CHECKING(for NSPR - version >= $min_nspr_version (skipping))
+
+	no_nspr=""
+	if test "$NSPR_CONFIG" = "no"; then
+		no_nspr="yes"
+	else
+		NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags`
+		NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs`
+
+		dnl Skip version check for now
+		nspr_config_major_version=`$NSPR_CONFIG $nspr_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+		nspr_config_minor_version=`$NSPR_CONFIG $nspr_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+		nspr_config_micro_version=`$NSPR_CONFIG $nspr_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+	fi
+
+	if test -z "$no_nspr"; then
+		AC_MSG_RESULT(yes)
+		ifelse([$2], , :, [$2])     
+	else
+		AC_MSG_RESULT(no)
+	fi
+
+
+	AC_SUBST(NSPR_CFLAGS)
+	AC_SUBST(NSPR_LIBS)
+
+])

mozilla/build/autoconf/update-makefile.sh

@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+#
+# This script will generate a single Makefile from a Makefile.in using
+# the config.status script.
+#
+# The config.status script is generated the first time you run 
+# ./configure.
+#
+#
+# Usage: update-makefile.sh
+#
+# Send comments, improvements, bugs to ramiro@netscape.com
+# 
+
+update_makefile_usage() {
+  _progname=`expr //$0 : '.*/\(.*\)'`
+  cat <<END_USAGE 2>&1
+
+Usage: $_progname [-h -u] [<keyword>]
+     -d <dir>     Subdir to update
+     -h           Print usage
+END_USAGE
+}
+
+# Parse the command-line options
+#
+subdir=
+while getopts d:h OPT; do
+    case $OPT in
+       d) # Make sure "subdir" has exactly one ending slash
+          subdir=`echo $OPTARG | sed 's/\/$//;'`"/" ;;
+    \?|h) update_makefile_usage
+          exit 1
+          ;;
+    esac
+done
+
+
+# find_depth: Pull the value of DEPTH out of Makefile (or Makefile.in)
+find_depth() {
+  egrep '^DEPTH[ 	]*=[ 	]*\.' $1 | awk -F= '{ print $2; }'
+}
+
+# The Makefile to create
+target_makefile=`pwd`"/${subdir}Makefile"
+
+# Use $(DEPTH) in the Makefile or Makefile.in to determine the depth
+if [ -f Makefile.in ]
+then
+    depth=`find_depth Makefile.in`
+elif [ -f Makefile ]
+then
+    depth=`find_depth Makefile`
+elif [ -f ../Makefile ]
+then
+    depth="../"`find_depth Makefile`
+else
+    echo
+    echo "There ain't no 'Makefile' or 'Makefile.in' over here: $pwd"
+    echo
+    exit
+fi
+
+# 'cd' to the root of the tree to run "config.status" there
+cd $depth
+
+# Strip the tree root off the Makefile's path
+#
+root_path=`pwd`
+target_makefile=`expr $target_makefile : $root_path'/\(.*\)'`
+
+# Make sure config.status exists
+#
+if [ -f config.status ]
+then
+    CONFIG_FILES=$target_makefile ./config.status
+else
+    echo
+    echo "There ain't no 'config.status' over here: $pwd"
+    echo
+fi

mozilla/build/bloaturls.txt

@@ -0,0 +1,7 @@
+http://www.mozilla.org
+ftp://ftp.netscape.com/Welcome
+http://www.mozilla.org
+resource:///res/samples/test2.html
+resource:///res/samples/test8.html
+resource:///res/samples/test6.html
+resource:///res/samples/test8.html

mozilla/build/file_migrate.pl

@@ -0,0 +1,292 @@
+#!perl -w
+
+# This script copies modified files from a source CVS tree to a destination
+# tree. Modified files are detected by comparing their modification dates
+# with the CVS Entries file.
+# 
+# Modified files are copied in their entirety to the destination tree
+# (no diffing is done). Files are only copied of the CVS version of the
+# file is the same in both trees. If the destination file is modified
+# already, it is backed up and replaced.
+# 
+# To use this on your tree/platform, do the following:
+# 
+# 1. Fix the !perl line, if necessary.
+# 2. Fix $dirsep to be the directory separator on your platform.
+# 3. Uncomment the appropriate $dst_linebreaks file specify what linebreaks
+#    you want for the copied files. This variable defines the *destination* linebreaks 
+#    that you want your changes to be converted to.
+#    For example, if you have a linux volume 
+#    mounted (via SAMBA perhaps) to your windows box where you've made changes to 
+#    source files, you'd want $dst_linebreaks to be set for unix. This ensures that 
+#    linebreaks are converted to the appropriate OS linebreak scheme for your *target* tree.
+# 4. Set $src_tree and $dest_tree to point to the directories you want
+#    to sync up. These don't have to point to the root of the tree,
+#    but should be equivalent directories in the two trees.
+#    
+# First version:
+#     Simon Fraser <sfraser@netscape.com>
+
+use File::stat;
+use Time::Local;
+
+# change for your platform ('\' == windows, ':' == mac, '/' == unix)
+$dirsep = "\\";
+
+# Set this to the native OS of the *destination* tree
+# $dst_linebreaks = pack("cc", 13);           # Mac
+#$dst_linebreaks = pack("cc", 13, 10);       # DOS
+$dst_linebreaks = pack("cc", 10);           # UNIX
+
+#change for your src and dest trees
+$src_tree =  "x:\\mozilla\\xpfe\\components";
+$dest_tree = "h:\\builds\\mozilla\\xpfe\\components";
+
+
+#//--------------------------------------------------------------------------------------------------
+#// _copyFile. Copy file from src to dest, converting linebreaks if necessary
+#//--------------------------------------------------------------------------------------------------
+sub _copyFile($;$;$;$)
+{
+    my($srcdir, $destdir, $file, $backup) = @_;
+
+    my($srcfile) = $srcdir.$dirsep.$file;
+    my($dstfile) = $destdir.$dirsep.$file;
+    
+    if ($backup)
+    {
+        my($counter) = 0;
+        
+        while (-f $dstfile."-".$counter)
+        {
+            $counter ++;
+        }
+        
+        rename($dstfile, $dstfile."-".$counter) or die "Failed to rename file\n";
+    }
+    
+    print "Copying $file over to dest\n";
+
+    my($newdest) = $dstfile."_temp";
+    
+    open(SRCFILE, "< $srcfile")     or die "Can't open source file $srcfile\n";
+    open(NEWDEST, "> $newdest")     or die "Can't open dest file $newdest\n";
+    
+    while (<SRCFILE>)
+    {
+        chomp($_);
+        print NEWDEST $_.$dst_linebreaks;
+    }
+    
+    close(SRCFILE);
+    close(NEWDEST);
+    
+    if (!$backup) {
+        unlink($dstfile)  or die "Failed to remove $dstfile\n";
+    }
+    rename($newdest, $dstfile)      or die "Failed to rename $newdest\n";
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// _readCVSInfo. Suck in the CVS info from the Entries file
+#//--------------------------------------------------------------------------------------------------
+
+sub _readCVSInfo($)
+{
+    my($cvsDir) = @_;
+
+    my($entries_file_name) = $cvsDir.$dirsep."CVS".$dirsep."Entries";
+    
+    # print "Reading $entries_file_name\n";
+    open(ENTRIES, $entries_file_name) || die "Could not open file $entries_file_name";
+
+    my(%cvs_entries);
+    
+    # Read in the path if available    
+    while (defined ($line = <ENTRIES>))
+    {
+        chomp($line);
+        
+        #parse out the line. Format is:
+        #   files:    /filename/version/date/options/tag
+        #   dirs:     D/dirname////
+        #   dir?      D
+        # because we might be reading an entries file from another platform, with
+        # different linebreaks, be anal about cleaning up $line.
+                
+        if ($line =~ /^?\/(.+)\/(.+)\/(.+)\/(.*)\/(.*)?$/)
+        {
+            my($filename) = $1;
+            my($version) = $2;
+            my($date) = $3;
+            my($options) = $4;
+            my($tag) = $5;
+            
+            my(%cvs_file) = (
+                "version"   => $version,
+                "date"      => $date,
+                "options"   => $options,
+                "tag"       => $tag
+            );
+                        
+            # print $filename." ".$version." ".$date." ".$options." ".$tag."\n";
+            $cvs_entries{$filename} = \%cvs_file;
+        }
+    }
+   
+    close ENTRIES;
+
+    return %cvs_entries;
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// _fileIsModified. compare mod date with CVS entries to see if a file is modified
+#//--------------------------------------------------------------------------------------------------
+sub _fileIsModified($;$;$)
+{
+    my($entries, $dir, $file) = @_;
+
+    my($abs_file) = $dir.$dirsep.$file;
+
+    if (exists($entries->{$file}))
+    {
+        my($date) = $entries->{$file}->{"date"};
+        
+        # stat the file to get its date
+        my($file_data) = stat($abs_file) || die "Could not stat $file\n";
+        my($mod_string) = scalar(gmtime($file_data->mtime));
+
+       return ($mod_string ne $date);
+    }
+    else
+    {
+        return 0;    
+    }
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// _processFile. args: entries hash, dir, filename
+#//--------------------------------------------------------------------------------------------------
+
+sub _processFile($;$;$;$;$)
+{
+    my($src_entries, $dest_entries, $srcdir, $destdir, $file) = @_;
+
+    my($abs_file) = $srcdir.$dirsep.$file;
+            
+    if (exists($src_entries->{$file}))
+    {
+        my($file_entry) = $src_entries->{$file};
+        my($version) = $file_entry->{"version"};
+        
+        if (_fileIsModified($src_entries, $srcdir, $file))
+        {
+            my($rel_file) = $abs_file;
+            $rel_file =~ s/^$src_tree//;
+            
+            # print "¥ÊFile $rel_file is modified\n";
+            
+            # check CVS version in dest
+            my($dest_entry) = $dest_entries->{$file};
+            if ($dest_entry)
+            {
+                my($dest_version) = $dest_entry->{"version"};
+                my($versions_match) = ($version == $dest_version);
+                my($dest_modified) = _fileIsModified($dest_entries, $destdir, $file);
+                                
+                if ($versions_match)
+                {
+                    # ok, we can copy the file over now, backing up dest if it is modified
+                    _copyFile($srcdir, $destdir, $file, $dest_modified);
+                }
+                else
+                {
+                    print "File $rel_file is version $version in the src tree, but $dest_version in dest. This file will not be copied.\n";
+                }
+            }
+            else
+            {
+                print "No CVS entry found in destination tree for $rel_file\n";
+            }
+        }
+    }
+    else
+    {
+        print "No entry for file $file\n";
+    }
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// _traverseDir. Traverse one dir, recurse for each found dir.
+#//--------------------------------------------------------------------------------------------------
+
+sub _traverseDir($;$)
+{
+    my($srcdir, $destdir) = @_;
+
+    opendir(DIR, $srcdir) or die "Cannot open dir $srcdir\n";
+    my @files = readdir(DIR);
+    closedir DIR;
+    
+    # suck in the CVS info for this dir, if there is a CVS dir
+    unless (-e $srcdir.$dirsep."CVS".$dirsep."Entries" && -e $destdir.$dirsep."CVS".$dirsep."Entries") {
+        print "$srcdir is not a CVS directory in both source and dest\n";
+        return;
+    }
+    
+    print " Doing $srcdir\n";
+    
+    my(%src_entries)  = _readCVSInfo($srcdir);
+    my(%dest_entries) = _readCVSInfo($destdir);
+
+    my $file;    
+    foreach $file (@files)
+    {        
+        my $filepath = $srcdir.$dirsep.$file;
+                
+        if (-d $filepath)
+        {
+            if ($file ne "CVS")     # ignore 'CVS' dirs
+            {
+                # print "Going into $filepath\n";            
+                _traverseDir($filepath, $destdir.$dirsep.$file);
+            }
+        }
+        else
+        {
+            # process this file
+            _processFile(\%src_entries, \%dest_entries, $srcdir, $destdir, $file);
+        }
+    }
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// MigrateChanges
+#//--------------------------------------------------------------------------------------------------
+sub MigrateChanges($;$)
+{
+    my($srcdir, $destdir) = @_;
+
+    # Check that src and dest exist
+    if (! -d $srcdir) {
+        die "Source directory $srcdir does not exist\n";
+    }
+
+    if (! -d $destdir) {
+        die "Dest directory $destdir does not exist\n";
+    }
+
+    print "---------------------------------------------------------\n";
+    print "Migrating changes from\n  $srcdir\nto\n  $destdir\n";
+    print "---------------------------------------------------------\n";
+    _traverseDir($srcdir, $destdir);
+    print "---------------------------------------------------------\n";
+}
+
+
+MigrateChanges($src_tree, $dest_tree);
+

mozilla/build/genrc.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DATATYPE="$1"
+INFILE="$2"
+
+echo "${DATATYPE} RCDATA"
+sed 's/"/""/g' ${INFILE} | awk 'BEGIN { printf("BEGIN\n") } { printf("\"%s\\r\\n\",\n", $0) } END { printf("\"\\0\"\nEND\n") }'
+
+exit 0

mozilla/build/hcc

@@ -0,0 +1,95 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+#
+# Fix brain-damaged compilers that don't understand -o and -c together
+#
+CC=`echo $1 | sed -e "s|'||g" -e 's|"||g'`
+shift
+DASH_C=0
+DASH_O=0
+DUMMY="XxxXxxX"
+GET_OBJECT=0
+OBJ="${DUMMY}"
+OBJECT="${DUMMY}"
+
+for i in $*
+do
+	[ "${CHECK_O}" = yes ]  && {
+	case $i in
+		./*/*.o)	OBJECT="$i"
+			OPTS="${OPTS} -o"
+   			DASH_O=1
+			;;
+		./*.o)	OBJECT="`basename $i`"
+			i=""
+   			DASH_O=1
+			;;
+		*.o)	if [ $i = `basename $i` ]
+			then
+				OBJECT="$i"
+				i=""
+			else
+				OPTS="${OPTS} -o"
+			fi
+   			DASH_O=1
+			;;
+		*)	OPTS="${OPTS} -o $i"
+   			DASH_O=1
+			i=""
+			;;
+	esac
+	CHECK_O=no
+	}
+   case $i in
+   -c)     DASH_C=1
+	OPTS="${OPTS} -c"
+		;;
+   -o)     CHECK_O=yes
+		;;
+   *.c)    C_SRC=$i
+	OPTS="${OPTS} $i"
+# cc always creates the .o from the .c name
+	OBJ=`basename $C_SRC .c`.o
+		;;
+   *.s)    S_SRC=$i
+	OPTS="${OPTS} $i"
+# or the .o from the .s name
+	OBJ=`basename $S_SRC .s`.o
+		;;
+   *.o)    OBJECT=$i
+	OPTS="${OPTS} $i"
+		;;
+   *) 	OPTS="${OPTS} $i"
+		;;
+   esac
+done
+
+${CC} ${OPTS} || exit $?
+
+# if there was no -c and -o we're done
+[ $DASH_C = 1 -a $DASH_O = 1 ] || exit 0
+
+# if $OBJ and $OBJECT are the same we're done
+[ $OBJ = $OBJECT ] && exit 0
+
+[ -f $OBJ ] && mv -f $OBJ $OBJECT

mozilla/build/hcpp

@@ -0,0 +1,139 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+#
+# Wrapper for brain-damaged compilers that don't understand -o and -c together.
+#
+CXX=`echo $1 | sed -e "s|'||g" -e 's|"||g'`
+shift
+DUMMY="XxxXxxX"
+DASH_C=0
+DASH_O=0
+GET_OBJECT=0
+C_SRC="${DUMMY}"
+CC_SRC="${DUMMY}"
+CPP_SRC="${DUMMY}"
+S_SRC="${DUMMY}"
+OBJECT="${DUMMY}"
+NEW_i="${DUMMY}"
+PLATFORM=`uname -s`
+
+for i in $*
+do
+	[ ${GET_OBJECT} -eq 1 ]  && {
+	case $i in
+		./*/*.o)	OBJECT="$i"
+			OPTS="${OPTS} -o"
+   			DASH_O=1
+			;;
+		./*.o)	OBJECT="`basename $i`"
+			i=""
+   			DASH_O=1
+			;;
+		*.o)	if [ $i = `basename $i` ]
+			then
+				i=""
+			else
+				OPTS="${OPTS} -o"
+   				DASH_O=1
+			fi
+			;;
+		*)	OPTS="${OPTS} -o $i"
+   			DASH_O=1
+			i=""
+			;;
+	esac
+	GET_OBJECT=0
+	}
+	case $i in
+		-c)
+			DASH_C=1
+			OPTS="${OPTS} -c"
+			;;
+		-o)
+			GET_OBJECT=1
+			;;
+		*.c)
+			C_SRC="$i"
+			OPTS="${OPTS} $i"
+# cc always creates the .o from the .c name
+			OBJ=`basename ${C_SRC} .c`.o
+			;;
+		+.*)
+			OPTS="${OPTS} $i"
+			;;
+		*.cpp)
+			CPP_SRC="$i"
+			if [ "${PLATFORM}" = "SCO_SV" ]; then
+				OPTS="${OPTS} +.cpp $i"
+			elif [ "${PLATFORM}" = "IRIX" ]; then
+				NEW_i=`basename ${CPP_SRC} .cpp`.C
+				rm -f ${NEW_i}
+				cp $i ${NEW_i}
+				OPTS="${OPTS} ${NEW_i}"
+			else
+				OPTS="${OPTS} $i"
+			fi
+# cc always creates the .o from the .cpp name
+			OBJ=`basename ${CPP_SRC} .cpp`.o
+			;;
+		*.cc)
+			CC_SRC="$i"
+			OPTS="${OPTS} $i"
+# cc always creates the .o from the .cc name
+			OBJ=`basename ${CC_SRC} .cc`.o
+			;;
+		*.s)
+			S_SRC="$i"
+			OPTS="${OPTS} $i"
+# cc always creates the .o from the .s name
+			OBJ=`basename ${S_SRC} .s`.o
+			;;
+   		*.o)    OBJECT=$i
+			OPTS="${OPTS} $i"
+			;;
+   		*) 	OPTS="${OPTS} $i"
+			;;
+	esac
+done
+
+${CXX} ${OPTS} || exit $?
+rm -f ${NEW_i}
+
+# Really only needed for NSPR now.
+if [ "${PLATFORM}" = "IRIX" -a "$OBJ" != "$OBJECT" ]; then
+	OBJ=$OBJECT
+fi
+
+# LAME!!!
+if [ -f -O ]; then
+	mv -f -- -O ${OBJECT}
+fi
+
+# if there was no -c and -o we're done
+[ ${DASH_C} -eq 1 -a ${DASH_O} -eq 1 ] || exit 0
+
+# if $OBJ and $OBJECT are the same we're done
+[ $OBJ = $OBJECT ] && exit 0
+
+[ -f $OBJ ] && mv -f $OBJ $OBJECT
+

mozilla/build/mac/IDE_Options.h

@@ -0,0 +1,110 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+/*
+
+	This file overrides all option settings in the IDE.  It is an attempt to allow all builds
+	to have the same options.
+
+	Note: We can't use ConditionalMacros.h in this file because it will conflict with 
+	the PowerPlant precompiled headers.
+
+*/
+
+	/* warning pragmas */
+#pragma warn_hidevirtual 		on
+#pragma warn_emptydecl 			on
+#pragma warn_unusedvar 			on
+#pragma warn_extracomma 		on
+#pragma warn_illpragma 			on
+#pragma warn_possunwant 		on
+#pragma warn_unusedarg 			off		/* turned off to reduce warnings */
+
+#pragma check_header_flags 		on
+
+	/* Language features that must be the same across libraries... */
+#pragma enumsalwaysint			on
+#pragma unsigned_char			off
+#pragma exceptions				on
+#pragma bool 					on
+#pragma wchar_type              on
+#pragma RTTI                    on
+
+
+	/* Save as much space as possible with strings... */
+#pragma pool_strings				on
+#pragma dont_reuse_strings			off
+
+#pragma options align=native
+#pragma sym 						on				/* Takes no memory.  OK in non-debug. */
+
+
+
+#ifdef powerc /* ...generating PowerPC */
+	#pragma toc_data 				on
+	#pragma fp_contract 			on
+	#pragma readonly_strings 		on
+
+	#ifdef DEBUG
+		#pragma profile 		off							/* Turn this on to profile the application. */
+																				/* Look for more details about profiling in nsMacMessagePump.cpp.  */
+		#pragma traceback 			on
+		#pragma global_optimizer 	off
+		#pragma scheduling 			off
+		#pragma peephole 			off
+		#pragma optimize_for_size 	off
+	#else
+		#pragma traceback 			on					/* leave on until the final release, so MacsBug logs are interpretable */
+		#pragma global_optimizer 	on
+		#pragma optimization_level 	4
+		#pragma scheduling 			603
+		#pragma peephole 			on
+		#pragma optimize_for_size	on
+
+    #pragma opt_strength_reduction on
+    #pragma opt_propagation on
+    #pragma opt_loop_invariants on
+    #pragma opt_lifetimes on
+    #pragma opt_dead_code on
+    #pragma opt_dead_assignments on
+    #pragma opt_common_subs on
+	#endif
+
+#else /* ...generating 68k */
+	#pragma code68020 			on
+	#pragma code68881 			off
+
+		/* Far everything... */
+	#pragma far_code
+	#pragma far_data 			on
+	#pragma far_strings 		on
+	#pragma far_vtables 		on
+
+	#pragma fourbyteints		on	/* 4-byte ints */
+	#pragma IEEEdoubles			on	/* 8-byte doubles (as required by Java and NSPR) */
+
+	#ifdef DEBUG
+		#pragma macsbug 		on
+		#pragma oldstyle_symbols off
+	#else
+		#pragma macsbug 		off
+	#endif
+#endif

mozilla/build/mac/MANIFEST

@@ -0,0 +1,5 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+IDE_Options.h

mozilla/build/mac/NSCrossProductDefines.h

@@ -0,0 +1,43 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#error "DonÕt use me!"
+
+#define OLDROUTINELOCATIONS 0
+#define XP_MAC 1
+#define NSPR20 1
+#define _NO_FAST_STRING_INLINES_ 1
+#define HAVE_BOOLEAN 1
+#define NETSCAPE 1
+#define OTUNIXERRORS 1		/* We want OpenTransport error codes */
+
+#define OJI 1
+
+/*
+	This compiles in heap dumping utilities and other good stuff
+ for developers -- maybe we only want it in for a special SDK
+ nspr/java runtime(?):
+*/
+#define DEVELOPER_DEBUG 1
+
+#define	MAX(_a,_b)	((_a) < (_b) ? (_b) : (_a))
+#define	MIN(_a,_b)	((_a) < (_b) ? (_a) : (_b))

mozilla/build/mac/build_scripts/BuildMozilla.pl

@@ -0,0 +1,78 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#   Simon Fraser <sfraser@netscape.com>
+#
+
+require 5.004;
+
+use strict;
+
+use Cwd;
+use Moz::BuildUtils;
+use Moz::BuildCore;
+
+#-------------------------------------------------------------
+# Where have the build options gone?
+# 
+# The various build flags have been centralized into one place. 
+# The master list of options is in MozBuildFlags.txt. However, 
+# you should never need to edit that file, or this one.
+# 
+# To customize what gets built, or where to start the build, 
+# edit the $prefs_file_name file in
+# System Folder:Preferences:Mozilla build prefs:
+# Documentation is provided in that file.
+#-------------------------------------------------------------
+
+my($prefs_file_name) = "Mozilla opt build prefs";
+
+#-------------------------------------------------------------
+# hashes to hold build options
+#-------------------------------------------------------------
+my(%build);
+my(%options);
+my(%filepaths);
+my(%optiondefines);
+
+# Hash of input files for this build. Eventually, there will be
+# input files for manifests, and projects too.
+my(%inputfiles) = (
+  "buildflags",     "MozillaBuildFlags.txt",
+  "checkoutdata",   "MozillaCheckoutList.txt",
+  "buildprogress",  "¥ Mozilla opt progress",
+  "buildmodule",    "MozillaBuildList.pm"
+);
+#-------------------------------------------------------------
+# end build hashes
+#-------------------------------------------------------------
+
+# set the build root directory, which is the the dir above mozilla
+SetupBuildRootDir(":mozilla:build:mac:build_scripts");
+
+# Set up all the flags on $main::, like DEBUG, CARBON etc.
+# Override the defaults using the preferences files.
+SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:");
+
+my($do_checkout)    = 0;
+my($do_build)       = 1;
+
+RunBuild($do_checkout, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/build_scripts/BuildMozillaDebug.pl

@@ -0,0 +1,78 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#   Simon Fraser <sfraser@netscape.com>
+#
+
+require 5.004;
+
+use strict;
+
+use Cwd;
+use Moz::BuildUtils;
+use Moz::BuildCore;
+
+#-------------------------------------------------------------
+# Where have the build options gone?
+# 
+# The various build flags have been centralized into one place. 
+# The master list of options is in MozBuildFlags.txt. However, 
+# you should never need to edit that file, or this one.
+# 
+# To customize what gets built, or where to start the build, 
+# edit the $prefs_file_name file in
+# System Folder:Preferences:Mozilla build prefs:
+# Documentation is provided in that file.
+#-------------------------------------------------------------
+
+my($prefs_file_name) = "Mozilla debug build prefs";
+
+#-------------------------------------------------------------
+# hashes to hold build options
+#-------------------------------------------------------------
+my(%build);
+my(%options);
+my(%filepaths);
+my(%optiondefines);
+
+# Hash of input files for this build. Eventually, there will be
+# input files for manifests, and projects too.
+my(%inputfiles) = (
+  "buildflags",     "MozillaBuildFlags.txt",
+  "checkoutdata",   "MozillaCheckoutList.txt",
+  "buildprogress",  "¥ Mozilla debug progress",
+  "buildmodule",    "MozillaBuildList.pm"
+);
+#-------------------------------------------------------------
+# end build hashes
+#-------------------------------------------------------------
+
+# set the build root directory, which is the the dir above mozilla
+SetupBuildRootDir(":mozilla:build:mac:build_scripts");
+
+# Set up all the flags on $main::, like DEBUG, CARBON etc.
+# Override the defaults using the preferences files.
+SetupDefaultBuildOptions(1, ":mozilla:dist:viewer_debug:");
+
+my($do_pull)        = 0;    # overridden by flags and prefs
+my($do_build)       = 1;
+
+RunBuild($do_pull, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/build_scripts/Moz/BuildCore.pm

@@ -0,0 +1,485 @@
+#!perl -w
+package Moz::BuildCore;
+
+require 5.004;
+require Exporter;
+
+use strict;
+use vars qw( @ISA @EXPORT );
+
+# perl includes
+use Cwd;
+use File::Basename;
+use LWP::Simple;
+
+# homegrown
+use Moz::Moz;
+use Moz::Jar;
+use Moz::BuildFlags;
+use Moz::BuildUtils;
+use Moz::CodeWarriorLib;
+
+# use MozillaBuildList;   # eventually, this should go away, and be replaced by data input
+
+
+@ISA        = qw(Exporter);
+@EXPORT     = qw(
+                    RunBuild
+                );
+
+
+#//--------------------------------------------------------------------------------------------------
+#// DoPrebuildCheck
+#//
+#// Check the build tools etc before running the build.
+#//--------------------------------------------------------------------------------------------------
+sub DoPrebuildCheck()
+{
+    SanityCheckJarOptions();
+
+    # launch codewarrior and persist its location. Have to call this before first
+    # call to getCodeWarriorPath().
+    my($ide_path_file) = $main::filepaths{"idepath"};
+    $ide_path_file = full_path_to($ide_path_file);
+    LaunchCodeWarrior($ide_path_file);
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// Configure Build System
+#//--------------------------------------------------------------------------------------------------
+
+sub GenBuildSystemInfo()
+{
+    # always rebuild the configuration program.
+    BuildProjectClean(":mozilla:build:mac:tools:BuildSystemInfo:BuildSystemInfo.mcp", "BuildSystemInfo");
+
+    # delete the configuration file.
+    unlink(":mozilla:build:mac:BuildSystemInfo.pm");
+    
+    # run the program.
+    system(":mozilla:build:mac:BuildSystemInfo");
+
+    # wait for the file to be created.
+    while (!(-e ":mozilla:build:mac:BuildSystemInfo.pm")) { WaitNextEvent(); }
+    
+    # wait for BuildSystemInfo to finish, so that we see correct results.
+    while (IsProcessRunning("BuildSystemInfo")) { WaitNextEvent(); }
+
+    # now, evaluate the contents of the file.
+    open(F, ":mozilla:build:mac:BuildSystemInfo.pm");
+    while (<F>) { eval; }
+    close(F);
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// Make library aliases
+#//--------------------------------------------------------------------------------------------------
+
+sub MakeLibAliases()
+{
+    my($dist_dir) = GetBinDirectory();
+
+    #// ProfilerLib
+    if ($main::PROFILE)
+    {
+        my($profilerlibpath) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:Profiler:Profiler Common:ProfilerLib");
+        MakeAlias("$profilerlibpath", "$dist_dir"."Essential Files:");
+    }
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// Regenerate DefinesOptions.h if necessary
+#//
+#//--------------------------------------------------------------------------------------------------
+
+sub UpdateConfigHeader($)
+{
+    my($config_path) = @_;
+    
+    my($config, $oldconfig) = ("", "");
+    my($define, $definevalue, $defines);
+    my($k, $l,);
+
+    foreach $k (keys(%main::options))
+    {
+        if ($main::options{$k})
+        {
+            foreach $l (keys(%{$main::optiondefines{$k}}))
+            {
+                $my::defines{$l} = $main::optiondefines{$k}{$l};
+                print "Setting up my::defines{$l}\n";
+            }
+        }
+    }
+
+    my $config_headerfile = current_directory().$config_path;
+    if (-e $config_headerfile)
+    {
+        open(CONFIG_HEADER, "< $config_headerfile") || die "$config_headerfile: $!\n";
+        my($line);
+        while ($line = <CONFIG_HEADER>)
+        {
+            $oldconfig .= $line;
+            if ($line =~ m/#define (.*) (.*)\n/)
+            {
+                $define = $1;
+                $definevalue = $2;
+                if (exists ($my::defines{$define}) and ($my::defines{$define} == $definevalue))
+                {
+                    delete $my::defines{$define};
+                    $config .= $line;
+                }
+            }
+        }
+        close(CONFIG_HEADER);
+    }
+
+    if (%my::defines)
+    {
+        foreach $k (keys(%my::defines))
+        {
+            $config .= "#define " . $k . " " . $my::defines{$k} . "\n";
+        }
+    }
+
+    if (($config ne $oldconfig) || (!-e $config_headerfile))
+    {
+        printf("Writing new DefinesOptions.h\n");
+        open(CONFIG_HEADER, "> $config_headerfile") || die "$config_headerfile: $!\n";
+        MacPerl::SetFileInfo("CWIE", "TEXT", $config_headerfile);
+        print CONFIG_HEADER ($config);
+        close(CONFIG_HEADER);
+    }
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// ConfigureBuildSystem
+#//
+#// defines some build-system configuration variables.
+#//--------------------------------------------------------------------------------------------------
+sub ConfigureBuildSystem()
+{
+    #// In the future, we may want to do configurations based on the actual build system itself.
+    #// GenBuildSystemInfo();
+        
+    #// For now, if we discover a newer header file than existed in Universal Interfaces 3.2,
+    #// we'll assume that 3.3 or later is in use.
+    my($universal_interfaces) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:Universal:Interfaces:CIncludes:");
+    if (-e ($universal_interfaces . "ControlDefinitions.h")) {
+        $main::UNIVERSAL_INTERFACES_VERSION = 0x0330;
+    }
+
+    #// Rename IC SDK folder in the Mac OS Support folder
+    my($ic_sdk_folder) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:ICProgKit2.0.2");
+    if( -e $ic_sdk_folder)
+    {
+        my($new_ic_folder_name) = Moz::CodeWarriorLib::getCodeWarriorPath("MacOS Support:(ICProgKit2.0.2)");
+        rename ($ic_sdk_folder, $new_ic_folder_name);
+        # note that CodeWarrior doesn't descnet into folders with () the name
+        print "Mozilla no longer needs the Internet Config SDK to build:\n  Renaming the 'ICProgKit2.0.2' folder to '(ICProgKit2.0.2)'\n";
+    }
+
+    printf("UNIVERSAL_INTERFACES_VERSION = 0x%04X\n", $main::UNIVERSAL_INTERFACES_VERSION);
+
+    UpdateConfigHeader(":mozilla:config:mac:DefinesOptions.h");
+
+    # alias required CodeWarrior libs into the Essential Files folder (only the Profiler lib now)
+    MakeLibAliases();
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// CheckOutModule. Takes variable number of args; first two are required
+#//--------------------------------------------------------------------------------------------------
+sub CheckOutModule($$$$)
+{
+    my($session, $module, $revision, $date) = @_;
+
+    my($result) = $session->checkout($module, $revision, $date);
+    
+    # result of 1 is success
+    if ($result) { return; }
+    
+    my($checkout_err) = $session->getLastError();
+    if ($checkout_err == 708) {
+        die "Error: Checkout was cancelled.\n";
+    } elsif ($checkout_err == 911) {
+        die "Error: CVS session settings are incorrect. Check your password, and the CVS root settings.\n";
+    } elsif ($checkout_err == 703) {
+        die "Error: CVS checkout failed. Unknown module, unknown tag, bad username, or other CVS error.\n";
+    } elsif ($checkout_err == 711) {
+        print "Checkout of '$module' failed.\n";
+    }
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// getScriptFolder
+#//--------------------------------------------------------------------------------------------------
+sub getScriptFolder()
+{
+    return dirname($0);
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// getScriptFolder
+#//--------------------------------------------------------------------------------------------------
+sub get_url_contents($)
+{
+    my($url) = @_;
+
+    my($url_contents) = LWP::Simple::get($url);
+    $url_contents =~ s/\r\n/\n/g;     # normalize linebreaks
+    $url_contents =~ s/\r/\n/g;       # normalize linebreaks
+    return $url_contents;
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// get_files_from_content
+#//--------------------------------------------------------------------------------------------------
+sub uniq
+{
+  my $lastval;
+  grep(($_ ne $lastval, $lastval = $_)[$[], @_);
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// get_files_from_content
+#//--------------------------------------------------------------------------------------------------
+sub get_files_from_content($)
+{
+  my($content) = @_;
+
+  my(@jscalls) = grep (/return js_file_menu[^{]*/, split(/\n/, $content));
+  my $i;
+
+  for ($i = 0; $i < @jscalls ; $i++)
+  {
+    $jscalls[$i] =~ s/.*\(|\).*//g;
+    my(@callparams) = split(/,/, $jscalls[$i]);
+    my ($repos, $dir, $file, $rev) = grep(s/['\s]//g, @callparams);
+    $jscalls[$i] = "$dir/$file";
+  }
+
+  &uniq(sort(@jscalls));
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// FastUpdate
+#// 
+#// Use Bonsai url data to update only those dirs which have new files
+#// 
+#//--------------------------------------------------------------------------------------------------
+sub FastUpdate($)
+{
+    my($num_hours) = @_;
+
+    my($the_module) = "SeaMonkeyAll";
+    my($the_branch) = "HEAD";
+    my($search_type) = "hours";
+    my($min_date) = "";
+    my($max_date) = "";
+    my($url) = "http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=${the_module}&branch=${the_branch}&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=${num_hours}&date=${search_type}&mindate=${min_date}&maxdate=${max_date}&cvsroot=%2Fcvsroot";
+
+    my(@files) = &get_files_from_content(&get_url_contents($url));
+
+	my(@cvs_co_list);
+
+	my($co_file);
+	foreach $co_file (@files)
+	{
+	  my(@cvs_co) = ["", "", ""];
+	  @cvs_co[0] = $co_file;
+	  push(@cvs_co_list, \@cvs_co);
+	}
+
+	CheckoutModules(\@cvs_co_list);
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// Checkout
+#//--------------------------------------------------------------------------------------------------
+sub CheckoutModules($)
+{
+    my($modules) = @_;          # list of modules to check out
+
+    my($start_time) = TimeStart();
+
+#    assertRightDirectory();
+    my($cvsfile) = AskAndPersistFile($main::filepaths{"sessionpath"});
+    my($session) = Moz::MacCVS->new( $cvsfile );
+    unless (defined($session)) { die "Error: Checkout aborted. Cannot create session file: $session" }
+
+    # activate MacCVS
+    ActivateApplication('Mcvs');
+
+    my($this_co);
+    foreach $this_co (@$modules)
+    {
+        my($module, $revision, $date) = ($this_co->[0], $this_co->[1], $this_co->[2]);        
+        CheckOutModule($session, $module, $revision, $date);
+        # print "Checking out $module with ref $revision, date $date\n";
+    }
+
+    TimeEnd($start_time, "Checkout");
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// Checkout
+#//--------------------------------------------------------------------------------------------------
+sub Checkout($)
+{
+    my($checkout_list) = @_;
+    
+    unless ( $main::build{pull} ) { return; }
+
+    StartBuildModule("pull");
+
+    my(@cvs_co_list);
+    
+    my($checkout_file) = getScriptFolder().":".$checkout_list;
+    local(*CHECKOUT_FILE);  
+    open(CHECKOUT_FILE, "< $checkout_file") || die "Error: failed to open checkout list $checkout_file\n";
+    while (<CHECKOUT_FILE>)
+    {
+        my($line) = $_;
+        chomp($line);
+    
+        # ignore comments and empty lines
+        if ($line =~ /^\#/ || $line =~ /^\s*$/) {
+            next;
+        }
+    
+        my(@cvs_co) = ["", "", ""];
+        
+        my($module, $revision, $date) = (0, 1, 2);
+        
+        if ($line =~ /\s*([^#,\s]+)\s*\,\s*([^#,\s]+)\s*\,\s*([^#]+)/)
+        {
+            @cvs_co[$module] = $1;
+            @cvs_co[$revision] = $2;
+            @cvs_co[$date] = $3;
+        }
+        elsif ($line =~ /\s*([^#,\s]+)\s*\,\s*([^#,\s]+)\s*(#.+)?/)
+        {
+            @cvs_co[$module] = $1;
+            @cvs_co[$revision] = $2;
+        }
+        elsif ($line =~ /\s*([^#,\s]+)\s*\,\s*,\s*([^#,]+)/)       
+        {
+            @cvs_co[$module] = $1;
+            @cvs_co[$date] = $2;
+        }
+        elsif ($line =~ /\s*([^#,\s]+)/)
+        {
+            @cvs_co[$module] = $1;
+        }
+        else
+        {
+            die "Error: unrecognized line '$line' in $checkout_list\n";
+        }
+        
+        # strip surrounding space from date
+        @cvs_co[$date] =~ s/^\s*|\s*$//g;
+        
+        # print "Going to check out '@cvs_co[$module]', '@cvs_co[$revision]', '@cvs_co[$date]'\n";
+        push(@cvs_co_list, \@cvs_co);
+    }
+
+    close(CHECKOUT_FILE);
+
+    CheckoutModules(\@cvs_co_list);
+
+    EndBuildModule("pull");
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// RunBuild
+#//--------------------------------------------------------------------------------------------------
+sub RunBuild($$$$)
+{
+    my($do_pull, $do_build, $input_files, $build_prefs) = @_;
+
+    InitBuildProgress($input_files->{"buildprogress"});
+    
+    # if we are pulling, we probably want to do a full build, so clear the build progress
+    if ($do_pull) {
+        ClearBuildProgress();    
+    }
+    
+    # read local prefs, and the build progress file, and set flags to say what to build
+    SetupBuildParams(\%main::build,
+                     \%main::options,
+                     \%main::optiondefines,
+                     \%main::filepaths,
+                     $input_files->{"buildflags"},
+                     $build_prefs);
+    
+    # If we were told to pull, make sure we do, overriding prefs etc.
+    if ($do_pull)
+    {
+        $main::build{"pull"} = 1;
+    }
+    
+    # transfer this flag
+    $CodeWarriorLib::CLOSE_PROJECTS_FIRST = $main::CLOSE_PROJECTS_FIRST;
+    
+    # setup the build log
+    SetupBuildLog($main::filepaths{"buildlogfilepath"}, $main::USE_TIMESTAMPED_LOGS);
+    StopForErrors();
+    
+    if ($main::LOG_TO_FILE) {
+        RedirectOutputToFile($main::filepaths{"scriptlogfilepath"});
+    }
+        
+    # run a pre-build check to see that the tools etc are in order
+    DoPrebuildCheck();
+    
+    if ($main::FAST_UPDATE)
+    {
+        my($hours) = 8;     # update files checked in during last 8 hours
+        FastUpdate($hours);
+    } else {
+        Checkout($input_files->{"checkoutdata"});
+    }
+    
+    unless ($do_build) { return; }
+
+    my($build_start) = TimeStart();
+
+    # create generated headers
+    ConfigureBuildSystem();
+
+    # here we load and call methods in the build module indirectly.
+    # we have to use indirection because the build module can be named
+    # differently for different builds.
+    chdir(dirname($0));     # change to the script dir
+    my($build_module) = $input_files->{"buildmodule"};
+    # load the build module
+    require $build_module;
+    {   # scope for no strict 'refs'
+        no strict 'refs';
+        
+        my($package_name) = $build_module;
+        $package_name =~ s/\.pm$//;
+        
+        chdir($main::MOZ_SRC);
+        &{$package_name."::BuildDist"}();
+        
+        chdir($main::MOZ_SRC);
+        &{$package_name."::BuildProjects"}();
+    }
+    
+    # the build finished, so clear the build progress state
+    ClearBuildProgress();
+    
+    TimeEnd($build_start, "Build");
+    print "Build complete\n";
+}
+
+1;

mozilla/build/mac/build_scripts/Moz/BuildFlags.pm

@@ -0,0 +1,423 @@
+
+package Moz::BuildFlags;
+
+require 5.004;
+require Exporter;
+
+# Package that attempts to read a file from the Preferences folder,
+# and get build settings out of it
+
+use strict;
+use Exporter;
+
+use Cwd;
+use File::Basename;
+
+use Moz::Moz;
+use Moz::Prefs;
+
+use vars qw(@ISA @EXPORT);
+
+@ISA      = qw(Exporter);
+@EXPORT   = qw(
+                SetupBuildParams
+                InitBuildProgress
+                WriteBuildProgress
+                ClearBuildProgress
+                ReadBuildProgress
+              );
+
+
+my(@build_flags);
+my(@options_flags);
+my(@filepath_flags);
+
+my(%arrays_list) = (
+  "build_flags",    \@build_flags,
+  "options_flags",  \@options_flags,
+  "filepath_flags", \@filepath_flags
+);
+
+my($progress_file) = "¥ÊBuild progress";
+
+#-------------------------------------------------------------------------------
+# appendArrayFlag
+# 
+# Set a flag in the array
+#-------------------------------------------------------------------------------
+sub appendArrayFlag($$$)
+{
+  my($array_name, $setting, $value) = @_;
+  
+  my(@this_flag) = [$setting, $value];
+  my($flags_array) = $arrays_list{$array_name};
+  if ($flags_array)
+  {
+    push(@{$flags_array}, @this_flag) || die "Failed to append\n";
+  }
+  else
+  {
+    die "Error: unknown build flags array $array_name\n";
+  }
+}
+
+#-------------------------------------------------------------------------------
+# readFlagsFile
+# 
+# Read the file of build flags from disk. File path is relative to the
+# script directory.
+#-------------------------------------------------------------------------------
+sub readFlagsFile($)
+{
+  my($flags_file) = @_;
+
+  my($file_path) = $0;
+  $file_path =~ s/[^:]+$/$flags_file/;
+  
+  print "Reading build flags from '$file_path'\n";
+
+  local(*FLAGS_FILE);
+  open(FLAGS_FILE, "< $file_path") || die "Error: failed to open flags file $file_path\n";
+
+  my($cur_array) = "";
+  
+  while(<FLAGS_FILE>)
+  {
+      my($line) = $_;
+      chomp($line);
+      
+      # ignore comments and empty lines  
+      if ($line =~ /^\#/ || $line =~ /^\s*$/) {
+        next;
+      }
+
+      # 1-word line, probably array name
+      if ($line =~ /^([^#\s]+)\s*$/)
+      {
+        $cur_array = $1;
+        next;  
+      }
+      elsif ($line =~ /^([^#\s]+)\s+\"(.+)\"(\s+#.+)?$/)    # quoted option, possible comment
+      {
+        my($flag) = $1;
+        my($setting) = $2;
+        
+        appendArrayFlag($cur_array, $flag, $setting);
+      }
+      elsif ($line =~ /^([^#\s]+)\s+([^#\s]+)(\s+#.+)?$/)   # two-word line, possible comment
+      {
+        my($flag) = $1;
+        my($setting) = $2;
+        
+        appendArrayFlag($cur_array, $flag, $setting);
+      }
+      else
+      {
+        die "Error: unknown build flag at '$line'\n";
+      }
+  
+  }
+  
+  close(FLAGS_FILE);
+}
+
+
+
+#-------------------------------------------------------------------------------
+# flagsArrayToHash
+# 
+# Utility routine to migrate flag from a 2D array to a hash, where
+# item[n][0] is the hash entry name, and item[n][1] is the hash entry value.
+#-------------------------------------------------------------------------------
+
+sub flagsArrayToHash($$)
+{
+  my($src_array, $dest_hash) = @_;
+  
+  my($item);
+  foreach $item (@$src_array)
+  {
+    $dest_hash->{$item->[0]} = $item->[1];
+  }
+}
+
+#-----------------------------------------------
+# printHash
+#
+# Utility routine to print a hash
+#-----------------------------------------------
+sub printHash($)
+{
+  my($hash_ref) = @_;
+ 
+  print "Printing hash:\n";
+  
+  my($key, $value);
+  
+  while (($key, $value) = each (%$hash_ref))
+  {
+    print "  $key $value\n";
+  }
+}
+
+
+#-----------------------------------------------
+# printBuildArray
+#
+# Utility routine to print a 2D array
+#-----------------------------------------------
+sub printBuildArray($)
+{
+  my($build_array) = @_;
+  
+  my($entry);
+  foreach $entry (@$build_array)
+  {  
+    print "$entry->[0] = $entry->[1]\n";
+  }
+
+}
+
+#-------------------------------------------------------------------------------
+# SetBuildFlags
+#-------------------------------------------------------------------------------
+sub SetBuildFlags($)
+{
+  my($build) = @_;
+
+  flagsArrayToHash(\@build_flags, $build);
+}
+
+#-------------------------------------------------------------------------------
+# SetBuildOptions
+#-------------------------------------------------------------------------------
+sub SetBuildOptions($)
+{
+  my($options) = @_;
+
+  flagsArrayToHash(\@options_flags, $options);
+}
+
+#-------------------------------------------------------------------------------
+# SetFilepathFlags
+#-------------------------------------------------------------------------------
+sub SetFilepathFlags($)
+{
+  my($filepath) = @_;
+
+  flagsArrayToHash(\@filepath_flags, $filepath);
+}
+
+#-------------------------------------------------------------------------------
+# SetOptionDefines
+#-------------------------------------------------------------------------------
+sub SetOptionDefines($)
+{
+  my($optiondefines) = @_;
+
+  # These should remain unchanged
+  $optiondefines->{"mathml"}{"MOZ_MATHML"}    = 1;
+  $optiondefines->{"svg"}{"MOZ_SVG"}          = 1;
+  $optiondefines->{"carbon"}{"TARGET_CARBON"} = 1;
+  $optiondefines->{"cache"}{"MOZ_NEW_CACHE"}  = 1;
+  $optiondefines->{"soap"}{"MOZ_SOAP"}        = 1;
+  $optiondefines->{"lowmem"}{"MOZ_MAC_LOWMEM"} = 1;
+  $optiondefines->{"ldap_experimental"}{"MOZ_LDAP_XPCOM_EXPERIMENTAL"} = 1;
+  $optiondefines->{"useimg2"}{"USE_IMG2"}     = 1;
+  $optiondefines->{"bidi"}{"IBMBIDI"}     = 1;
+}
+
+
+#-------------------------------------------------------------------------------
+# PropagateAllFlags
+#-------------------------------------------------------------------------------
+sub PropagateAllFlags($)
+{
+  my($build_array) = @_;
+  
+  # if "all" is set, set all the flags to 1
+  unless ($build_array->[0][0] eq "all") { die "Error: 'all' must come first in the flags array\n"; }
+  
+  if ($build_array->[0][1] == 1)
+  {
+    my($index);
+    foreach $index (@$build_array)
+    {
+      $index->[1] = 1;
+    }
+  }
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// _getBuildProgressFile
+#//--------------------------------------------------------------------------------------------------
+sub _getBuildProgressFile()
+{
+  return $progress_file;
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// setBuildProgressStart
+#// 
+#// This automagically sets $build{"all"} to 0
+#//--------------------------------------------------------------------------------------------------
+sub setBuildProgressStart($$)
+{
+  my($build_array, $name) = @_;
+
+  my($index);
+  foreach $index (@$build_array)
+  {
+    $index->[1] = 0;
+    if ($index->[0] eq $name) {
+      last;
+    }    
+  }
+
+  print "Building from module after $name, as specified by build progress\n";
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// InitBuildProgress
+#//--------------------------------------------------------------------------------------------------
+sub InitBuildProgress($)
+{
+  my($prog_file) = @_;
+  if ($prog_file ne "") {
+    $progress_file = full_path_to($prog_file);
+    print "Writing build progress to $progress_file\n";
+  }
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// WriteBuildProgress
+#//--------------------------------------------------------------------------------------------------
+sub WriteBuildProgress($)
+{
+  my($module_built) = @_;
+
+  my($progress_file) = _getBuildProgressFile();
+  
+  if ($progress_file ne "")
+  {
+    open(PROGRESS_FILE, ">>$progress_file") || die "Failed to open $progress_file\n";
+    print(PROGRESS_FILE "$module_built\n");
+    close(PROGRESS_FILE);
+  }
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// ClearBuildProgress
+#//--------------------------------------------------------------------------------------------------
+sub ClearBuildProgress()
+{
+  my($progress_file) = _getBuildProgressFile();
+  if ($progress_file ne "") {
+    unlink $progress_file;
+  }
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// WipeBuildProgress
+#//--------------------------------------------------------------------------------------------------
+sub WipeBuildProgress()
+{
+  print "Ignoring build progress\n";
+  ClearBuildProgress();
+  $progress_file = "";
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// ReadBuildProgress
+#//--------------------------------------------------------------------------------------------------
+sub ReadBuildProgress($)
+{
+  my($build_array) = @_;
+  my($progress_file) = _getBuildProgressFile();
+
+  my($last_module);
+  
+  if (open(PROGRESS_FILE, "< $progress_file"))
+  {
+    print "Getting build progress from $progress_file\n";
+    
+    while (<PROGRESS_FILE>)
+    {
+      my($line) = $_;
+      chomp($line);
+      $last_module = $line;
+    }
+    
+    close(PROGRESS_FILE);
+  }
+  
+  if ($last_module)
+  {
+    setBuildProgressStart($build_array, $last_module);
+  }
+}
+
+#-------------------------------------------------------------------------------
+# clearOldBuildSettings
+#-------------------------------------------------------------------------------
+sub clearOldBuildSettings($$$$)
+{
+  my($build, $options, $optiondefines, $filepaths) = @_;
+
+  # empty the arrays in case we're being called twice
+  @build_flags = ();
+  @options_flags = ();
+  @filepath_flags = ();
+  
+  # and empty the hashes
+  %$build = ();
+  %$options = ();
+  %$optiondefines = ();
+  %$filepaths = ();
+}
+
+#-------------------------------------------------------------------------------
+# SetupBuildParams
+#-------------------------------------------------------------------------------
+sub SetupBuildParams($$$$$$)
+{
+  my($build, $options, $optiondefines, $filepaths, $flags_file, $prefs_file) = @_;
+  
+  # Empty the hashes and arrays, to wipe out any stale data.
+  # Needed because these structures persist across two build scripts
+  # called using 'do' from a parent script.
+  clearOldBuildSettings($build, $options, $optiondefines, $filepaths);
+  
+  # Read from the flags file, which sets up the various arrays
+  readFlagsFile($flags_file);
+  
+  # If 'all' is set in the build array, propagate that to all entries
+  PropagateAllFlags(\@build_flags);
+  
+  # read the user pref file, that can change values in the array
+  ReadMozUserPrefs($prefs_file, \@build_flags, \@options_flags, \@filepath_flags);
+
+  # If build progress exists, this clears flags in the array up to a certain point
+  if ($main::USE_BUILD_PROGRESS) {
+    ReadBuildProgress(\@build_flags);
+  } else {
+    WipeBuildProgress();
+  }
+  
+#  printBuildArray(\@build_flags);
+#  printBuildArray(\@options_flags);
+  
+  SetBuildFlags($build);
+  SetBuildOptions($options);
+  SetOptionDefines($optiondefines);
+  SetFilepathFlags($filepaths);
+  
+#  printHash($build);
+#  printHash($options);
+}
+
+
+1;

mozilla/build/mac/build_scripts/Moz/BuildUtils.pm

@@ -0,0 +1,518 @@
+
+package Moz::BuildUtils;
+
+require 5.004;
+require Exporter;
+
+# Package that contains build util functions specific to the Mozilla build
+# process.
+
+use strict;
+use Exporter;
+
+use Cwd;
+use File::Path;
+use File::Basename;
+
+use Mac::Events;
+use Mac::StandardFile;
+
+use Moz::Moz;
+use Moz::BuildFlags;
+use Moz::MacCVS;
+
+use vars qw(@ISA @EXPORT);
+
+@ISA      = qw(Exporter);
+@EXPORT   = qw(
+                SetupDefaultBuildOptions
+                SetupBuildRootDir
+                StartBuildModule
+                EndBuildModule
+                GetBinDirectory
+                BuildOneProjectWithOutput
+                BuildOneProject
+                BuildIDLProject
+                BuildFolderResourceAliases
+                AskAndPersistFile
+                DelayFor
+                TimeStart
+                TimeEnd
+                EmptyTree
+                SetupBuildLog
+                SetBuildNumber
+                SetTimeBomb
+              );
+
+#//--------------------------------------------------------------------------------------------------
+#// SetupDefaultBuildOptions
+#//--------------------------------------------------------------------------------------------------
+sub SetupDefaultBuildOptions($$)
+{
+    my($debug, $bin_dir) = @_;
+
+    # Here we set up defaults for the various build flags.
+    # If you want to override any of these, it's best to do
+    # so via the relevant preferences file, which lives in
+    # System Folder:Preferences:Mozilla build prefs:{build prefs file}.
+    # For the name of the prefs file, see the .pl script that you
+    # run to start this build. The prefs files are created when
+    # you run the build, and contain some documentation.
+    
+    #-------------------------------------------------------------
+    # configuration variables that globally affect what is built
+    #-------------------------------------------------------------
+    $main::DEBUG                  = $debug;
+    $main::PROFILE                = 0;
+    $main::RUNTIME                = 0;    # turn on to just build runtime support and NSPR projects
+    $main::GC_LEAK_DETECTOR       = 0;    # turn on to use GC leak detection
+    $main::MOZILLA_OFFICIAL       = 0;    # generate build number
+    $main::LOG_TO_FILE            = 0;    # write perl output to a file
+    
+    #-------------------------------------------------------------
+    # configuration variables that affect the manner of building, 
+    # but possibly affecting the outcome.
+    #-------------------------------------------------------------    
+    $main::ALIAS_SYM_FILES        = $main::DEBUG;
+    $main::CLOBBER_LIBS           = 1;      # turn on to clobber existing libs and .xSYM files before
+                                            # building each project                         
+    # The following two options will delete all dist files (if you have $main::build{dist} turned on),
+    # but leave the directory structure intact.
+    $main::CLOBBER_DIST_ALL       = 1;    # turn on to clobber all aliases/files inside dist (headers/xsym/libs)
+    $main::CLOBBER_DIST_LIBS      = 0;    # turn on to clobber only aliases/files for libraries/sym files in dist
+    $main::CLOBBER_IDL_PROJECTS   = 0;    # turn on to clobber all IDL projects.
+    
+    $main::UNIVERSAL_INTERFACES_VERSION = 0x0320;
+    
+    #-------------------------------------------------------------
+    # configuration variables that are preferences for the build,
+    # style and do not affect what is built.
+    #-------------------------------------------------------------
+    $main::CLOSE_PROJECTS_FIRST   = 0;
+                                    # 1 = close then make (for development),
+                                    # 0 = make then close (for tinderbox).
+    $main::USE_TIMESTAMPED_LOGS   = 0;
+    $main::USE_BUILD_PROGRESS     = 1;    # track build progress for restartable builds
+    #-------------------------------------------------------------
+    # END OF CONFIG SWITCHES
+    #-------------------------------------------------------------
+    
+    $main::BIN_DIRECTORY = $bin_dir;
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// SetupBuildRootDir
+#//--------------------------------------------------------------------------------------------------
+sub SetupBuildRootDir($)
+{
+    my($rel_path_to_script) = @_;
+
+    my($cur_dir) = cwd();
+    $cur_dir =~ s/$rel_path_to_script$//;
+    chdir($cur_dir) || die "Error: failed to set build root directory to '$cur_dir'.\nYou probably need to put 'mozilla' one level down (in a folder).\n";
+    $main::MOZ_SRC = cwd();
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// StartBuildModule
+#//--------------------------------------------------------------------------------------------------
+sub StartBuildModule($)
+{
+    my($module) = @_;
+
+    print("---- Start of $module ----\n");
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// EndBuildModule
+#//--------------------------------------------------------------------------------------------------
+sub EndBuildModule($)
+{
+    my($module) = @_;
+    WriteBuildProgress($module);
+    print("---- End of $module ----\n");
+}
+
+#--------------------------------------------------------------------------------------------------
+# GetBinDirectory
+#--------------------------------------------------------------------------------------------------
+sub GetBinDirectory()
+{
+    if ($main::BIN_DIRECTORY eq "") { die "Dist directory not set\n"; }
+    return $main::BIN_DIRECTORY;
+}
+
+#--------------------------------------------------------------------------------------------------
+# AskAndPersistFile stores the information about the user pick inside
+# the file $session_storage
+#--------------------------------------------------------------------------------------------------
+sub AskAndPersistFile($)
+{
+    my ($sessionStorage) = @_;
+    my $cvsfile;
+
+    if (( -e $sessionStorage) &&
+        open( SESSIONFILE, $sessionStorage ))
+    {
+    # Read in the path if available
+        $cvsfile = <SESSIONFILE>;
+        chomp $cvsfile;
+        close SESSIONFILE;
+        if ( ! -e $cvsfile )
+        {
+            print STDERR "$cvsfile has disappeared\n";
+            undef $cvsfile;
+        }
+    }
+    unless (defined ($cvsfile))
+    {
+        # make sure that MacPerl is a front process
+        ActivateApplication('McPL');
+        MacPerl::Answer("Could not find your MacCVS session file. Please choose one", "OK");
+        
+        # prompt user for the file name, and store it
+        my $macFile = StandardGetFile( 0, "McvD");  
+        if ( $macFile->sfGood() )
+        {
+            $cvsfile = $macFile->sfFile();
+            # save the choice if we can
+            if ( open (SESSIONFILE, ">" . $sessionStorage))
+            {
+                printf SESSIONFILE $cvsfile, "\n";
+                close SESSIONFILE;
+            }
+            else
+            {
+                print STDERR "Could not open storage file $sessionStorage for saving $cvsfile\n";
+            }
+        }
+    }
+    return $cvsfile;
+}
+
+
+#--------------------------------------------------------------------------------------------------
+# BuildIDLProject
+#
+#--------------------------------------------------------------------------------------------------
+
+sub BuildIDLProject($$)
+{
+    my ($project_path, $module_name) = @_;
+
+    if ($main::CLOBBER_IDL_PROJECTS)
+    {
+        my($datafolder_path) = $project_path;
+        $datafolder_path =~ s/\.mcp$/ Data:/;       # generate name of the project's data folder.
+        print STDERR "Deleting IDL data folder: $datafolder_path\n";
+        EmptyTree($datafolder_path);
+    }
+
+    BuildOneProject($project_path,  "headers", 0, 0, 0);
+    BuildOneProject($project_path,  $module_name.".xpt", 1, 0, 1);
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// Build one project, and make the alias. Parameters are project path, target name, shared  library
+#// name, make shlb alias (boolean), make xSYM alias (boolean), and is component (boolean).
+#//--------------------------------------------------------------------------------------------------
+
+sub BuildOneProjectWithOutput($$$$$$)
+{
+    my ($project_path, $target_name, $output_name, $alias_shlb, $alias_xSYM, $component) = @_;
+
+    unless ($project_path =~ m/^$main::BUILD_ROOT.+/) { return; }
+    
+    # $D becomes a suffix to target names for selecting either the debug or non-debug target of a project
+    my($D) = $main::DEBUG ? "Debug" : "";
+    my($dist_dir) = GetBinDirectory();
+    
+    # Put libraries in "Essential Files" folder, Components in "Components" folder
+    my($component_dir) = $component ? "Components:" : "Essential Files:";
+
+    my($project_dir) = $project_path;
+    $project_dir =~ s/:[^:]+$/:/;           # chop off leaf name
+
+    if ($main::CLOBBER_LIBS)
+    {
+        unlink "$project_dir$output_name";              # it's OK if these fail
+        unlink "$project_dir$output_name.xSYM";
+    }
+    
+    BuildProject($project_path, $target_name);
+    
+    $alias_shlb ? MakeAlias("$project_dir$output_name", "$dist_dir$component_dir") : 0;
+    $alias_xSYM ? MakeAlias("$project_dir$output_name.xSYM", "$dist_dir$component_dir") : 0;
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// For compatiblity with existing scripts, BuildOneProject now just calls
+#// BuildOneProjectWithOutput, with the output name and target name identical.
+#// Note that this routine assumes that the target name and the shared libary name
+#// are the same.
+#//--------------------------------------------------------------------------------------------------
+
+sub BuildOneProject($$$$$)
+{
+    my ($project_path, $target_name, $alias_shlb, $alias_xSYM, $component) = @_;
+	BuildOneProjectWithOutput($project_path, $target_name, $target_name,
+							  $alias_shlb, $alias_xSYM, $component);
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// Make resource aliases for one directory
+#//--------------------------------------------------------------------------------------------------
+
+sub BuildFolderResourceAliases($$)
+{
+    my($src_dir, $dest_dir) = @_;
+        
+    # get a list of all the resource files
+    opendir(SRCDIR, $src_dir) || die("can't open $src_dir");
+    my(@resource_files) = readdir(SRCDIR);
+    closedir(SRCDIR);
+    
+    # make aliases for each one into the dest directory
+    print("Placing aliases to all files from $src_dir in $dest_dir\n");
+    for ( @resource_files )
+    {
+        next if $_ eq "CVS";
+        #print("    Doing $_\n");
+        if (-l $src_dir.$_)
+        {
+            print("     $_ is an alias\n");
+            next;
+        }
+        my($file_name) = $src_dir . $_; 
+        MakeAlias($file_name, $dest_dir);
+    }
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// DelayFor
+#//
+#// Delay for the given number of seconds, allowing the script to be cancelled
+#//--------------------------------------------------------------------------------------------------
+
+sub DelayFor($)
+{
+  my($delay_secs) = @_;
+  
+  STDOUT->autoflush(1);
+  
+  my($end_time) = time() + $delay_secs;
+    
+  my($last_time) = 0;
+  my($cur_time) = time();
+  
+  while ($cur_time < $end_time)
+  {
+    $cur_time = time();
+    if ($cur_time > $last_time)
+    {
+      print ".";
+      $last_time = $cur_time;
+    }
+    
+    WaitNextEvent();
+  }
+
+  print "\n";
+  STDOUT->autoflush(0);
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// TimeStart
+#//--------------------------------------------------------------------------------------------------
+sub TimeStart()
+{
+    return time();
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// TimeEnd
+#//--------------------------------------------------------------------------------------------------
+sub TimeEnd($$)
+{
+    use integer;
+    
+    my($start_time, $operation_name) = @_;
+    my($end_time) = time();
+    
+    my($tot_sec) = $end_time - $start_time;
+    
+    my($seconds) = $tot_sec;
+    
+    my($hours) = $seconds / (60 * 60);
+    $seconds -= $hours * (60 * 60);
+    
+    my($minutes) = $seconds / 60;
+    $seconds -= $minutes * 60;
+        
+    print "$operation_name took $hours hours $minutes minutes and $seconds seconds\n";
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// Remove all files from a tree, leaving directories intact (except "CVS").
+#//--------------------------------------------------------------------------------------------------
+
+sub EmptyTree($)
+{
+    my ($root) = @_; 
+    #print "EmptyTree($root)\n";
+    opendir(DIR, $root);
+    my $sub;
+    foreach $sub (readdir(DIR))
+    {
+        my $fullpathname = $root.$sub; # -f, -d only work on full paths
+
+        # Don't call empty tree for the alias of a directory.
+        # -d returns true for the alias of a directory, false for a broken alias)
+
+        if (-d $fullpathname)
+        {
+            if (-l $fullpathname)   # delete aliases
+            {
+                unlink $fullpathname;
+                next;
+            }
+            EmptyTree($fullpathname.":");
+            if ($sub eq "CVS")
+            {
+                #print "rmdir $fullpathname\n";
+                rmdir $fullpathname;
+            }
+        }
+        else
+        {
+            unless (unlink $fullpathname) { die "Failed to delete $fullpathname\n"; }
+        }
+    }
+    closedir(DIR);
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// Recurse through a directory hierarchy, looking for MANIFEST files.
+#// Currently unused.
+#//--------------------------------------------------------------------------------------------------
+
+sub ScanForManifestFiles($$$$)
+{
+    my($dir, $theme_root, $theme_name, $dist_dir) = @_;
+
+    opendir(DIR, $dir) or die "Cannot open dir $dir\n";
+    my @files = readdir(DIR);
+    closedir DIR;
+
+    my $file;
+
+    foreach $file (@files)
+    {    
+        my $filepath = $dir.":".$file;
+
+        if (-d $filepath)
+        {
+            # print "Looking for MANIFEST files in $filepath\n";        
+            ScanForManifestFiles($filepath, $theme_root, $theme_name, $dist_dir);
+        }
+        elsif ($file eq "MANIFEST")
+        {
+            # print "Doing manifest file $filepath\n";
+
+            # Get the dest path from the first line of the file
+
+            open(MANIFEST, $filepath) || die "Could not open file $file";
+            # Read in the path if available
+            my($dest_line) = <MANIFEST>;
+            chomp $dest_line;
+            close MANIFEST;
+
+            $dest_line =~ s|^#!dest[\t ]+|| || die "No destination line found in $filepath\n";
+
+            my($dest_path) = $dist_dir."chrome:skins:$theme_name:$dest_line";
+            # print " Destination is $dest_path\n";
+
+            InstallResources($filepath, "$dest_path", 0);
+        }
+    }
+}
+
+
+#-----------------------------------------------
+# SetupBuildLog
+#-----------------------------------------------
+sub SetupBuildLog($$)
+{
+    my($logfile_path, $timestamped_log) = @_;
+    
+    my($logdir) = "";
+    my($logfile) = $logfile_path;
+    
+    if ($logfile_path =~ /(.+?:)([^:]+)$/)       # ? for non-greedy match
+    {
+        $logdir = $1;
+        $logfile = $2;
+        
+        mkpath($logdir);
+    }
+    
+    if ($timestamped_log)
+    {
+        #Use time-stamped names so that you don't clobber your previous log file!
+        my $now = localtime();
+        while ($now =~ s@:@.@) {} # replace all colons by periods
+        OpenErrorLog("${logdir}${now}");
+    }
+    else
+    {
+        OpenErrorLog("${logdir}${logfile}");
+    }
+}
+
+#-----------------------------------------------
+# SetBuildNumber
+#-----------------------------------------------
+sub SetBuildNumber($$)
+{
+    my($build_num_file, $files_to_touch) = @_;
+
+    # Make sure we add the config dir to search, to pick up mozBDate.pm
+    # Need to do this dynamically, because this module can be used before
+    # mozilla/config has been checked out.
+    
+    my ($inc_path) = $0;        # $0 is the path to the parent script
+    $inc_path =~ s/:build:mac:build_scripts:.+$/:config/;
+    push(@INC, $inc_path);
+
+    require mozBDate;
+    
+    mozBDate::UpdateBuildNumber($build_num_file, $main::MOZILLA_OFFICIAL);
+   
+    my($file);
+    foreach $file (@$files_to_touch)
+    {
+        print "Writing build number to $file from ${file}.in\n";
+        mozBDate::SubstituteBuildNumber($file, $build_num_file, "${file}.in");
+    }
+}
+
+#-----------------------------------------------
+# SetBuildNumber
+#-----------------------------------------------
+sub SetTimeBomb($$)		
+{
+  my ($warn_days, $bomb_days) = @_;
+  
+  system("perl :mozilla:config:mac-set-timebomb.pl $warn_days $bomb_days");
+}
+
+
+1;
+

mozilla/build/mac/build_scripts/Moz/CodeWarriorLib.pm

@@ -0,0 +1,592 @@
+#!perl
+package Moz::CodeWarriorLib;
+
+=pod
+
+=head1 NAME
+
+CodeWarriorLib - supply interface to CodeWarrior
+
+=head1 SYNOPSIS
+
+	#!perl
+	use CodeWarriorLib;
+	CodeWarriorLib::activate();
+	$had_errors = CodeWarriorLib::build_project(
+		$project_path, $target_name, $recent_errors_file, $clean_build
+	);
+
+=head1 DESCRIPTION
+
+Replaces the AppleScript library I<CodeWarriorLib>.
+
+=over 4
+
+=cut
+
+use strict;
+use Cwd;
+use Mac::Types;
+use Mac::Events;
+use Mac::AppleEvents;
+use Mac::AppleEvents::Simple;
+use Mac::Processes;
+use Mac::MoreFiles;
+use Mac::StandardFile;
+use File::Basename;
+
+use vars qw($VERSION);
+$VERSION = '1.02';
+
+my($app)  = 'CWIE';
+my($scriptDir) = cwd();         # could use $0 for this
+my($ide_loc_file) = "";
+
+# 0 == don't switch CWIE to front app in do_event(), 1 == do switch
+# note: activate() still switches when called
+$Mac::AppleEvents::Simple::SWITCH = 0;
+# $Mac::AppleEvents::Simple::WARN = 1;
+
+# supply your own path to the source here
+#_test('PowerPudgeIV:mozilla:mozilla:');
+
+
+=pod
+
+=item _get_project($full_path)
+
+A private routine returning a reference to the open project with the given name,
+or else the empty string (when that project is not open)
+
+full_path is a string identifying the project to be built and is of the form, 
+e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
+
+=cut
+
+sub _get_project ($) {
+	my(
+		$full_path, $candidate_projects
+	) = @_;
+	$candidate_projects = _doc_named(basename($full_path, '*'));
+	if ($candidate_projects) {
+		my($cps) = _get_dobj($candidate_projects);
+		my($num) = AECountItems($cps);
+		if ($num) {  # is a list
+			foreach (1 .. AECountItems($cps)) {
+				my($cp) = AEGetNthDesc($cps, $_);
+				if (lc $full_path eq lc _full_path($cp)) {
+					return($cp);
+				}
+			}
+		} else {     # is only one, not a list
+			if (lc $full_path eq lc _full_path($cps)) {
+				return($cps);
+			}
+		}
+	}
+	return;
+}
+
+=pod
+
+=item build_project
+
+Build a selected target of a project, saving any errors to a file, if supplied.
+	
+full_path is a string identifying the project to be built and is of the form, 
+e.g., "HD:ProjectFolder:MyProject.mcp".  It must be supplied.
+
+If target_name is the empty string, the current target of the selected project 
+will be built, else, target_name should be a string matching a target name in 
+the selected project.
+	
+If error_path is the empty string, errors will not be saved to a file,
+else, error_path should be the full path of a file to save error messages into.
+
+=cut
+
+$CodeWarriorLib::CLOSE_PROJECTS_FIRST = 0; # If true we close then make. If false, make then close.
+my $last_project_built = "";
+my $last_project_was_closed = 0;
+
+sub build_project ($;$$$) {
+	my(
+		$full_path, $target_name, $error_path,
+		$remove_object, $p, $project_was_closed, $had_errors
+	) = @_;
+	_close_errors_window();
+
+	if ($CodeWarriorLib::CLOSE_PROJECTS_FIRST && ($last_project_built ne $full_path))
+	{
+		# If we're in "close first" mode, we don't close if the current project
+		# is the same as the previous one.
+		if ($last_project_was_closed) {
+			$p = _get_project($last_project_built);
+			_close($p);
+		}
+		$last_project_built = $full_path;
+		$last_project_was_closed = 0; # now refers to the new project
+	}
+	$project_was_closed = 0;
+	while (1) {
+		$p = _get_project($full_path);
+		if (!$p) {
+			if ($project_was_closed) {
+				print "### Error - request for project document failed after opening\n";
+				die "### possibly CW Pro 4 bug: be sure to close your Find window\n";
+			}
+			$project_was_closed = 1;
+			$last_project_was_closed = 1;
+			_open_file($full_path);
+		} else {
+			last;
+		}
+	}
+
+	$had_errors = 0;
+	if ($target_name eq '') {
+		if ($remove_object) {_remove_object($p)}
+		_build($p);
+	} else {
+		if ($remove_object) {_remove_object($p, $target_name)}
+		_build($p, $target_name);
+	}
+
+	if ($error_path ne '') {
+		_save_errors_window($error_path);
+	}
+	$had_errors = _close_errors_window();
+
+	if (!$CodeWarriorLib::CLOSE_PROJECTS_FIRST)
+	{
+		if ($project_was_closed) {
+			$p = _get_project($full_path);
+			_close($p);
+		}
+	}
+
+	return($had_errors);
+}
+
+=pod
+
+=item appIsRunning()
+
+=cut
+sub _appIsRunning($)
+{
+	my ($appSignature) = @_;
+	my ($psi);
+	my ($found) = 0;
+	my ($appPSN);
+
+	foreach $psi (values(%Process))
+	{
+		if ($psi->processSignature() eq $appSignature)
+		{
+			$appPSN = $psi->processNumber();
+			$found = 1;
+            last;
+		}
+	}
+	
+	return $found;
+}
+
+=pod
+
+=item appIsFrontmost()
+
+=cut
+sub _appIsFrontmost($)
+{
+	my ($appSignature) = @_;
+	my ($psi);
+	my ($found) = 0;
+	my ($appPSN);
+
+	foreach $psi (values(%Process))
+	{
+		if ($psi->processSignature() eq $appSignature)
+		{
+			$appPSN = $psi->processNumber();
+			$found = 1;
+            last;
+		}
+	}
+	
+	return (GetFrontProcess() == $appPSN);
+}
+
+
+=pod
+
+=item activate()
+
+Launches CodeWarrior and brings it to the front.
+
+Once found, path will be saved in $idepath_file for future reference.
+Edit or delete this file to change the location of the IDE.  If app is
+moved, C<activate()> will prompt for a new location.
+
+First looks for an open CodeWarrior app.  Second, tries to open previously
+saved location in ':idepath.txt'.  Third, tries to find it and allow user
+to choose it with Navigation Services (if present).  Fourth, uses good old
+GUSI routines built-in to MacPerl for a Choose Directory dialog box.
+
+=cut
+
+sub activate ($) {
+
+    $ide_loc_file = $_[0];     # save in global
+        
+	my($filepath, $appath, $psi) = ($ide_loc_file);
+
+	foreach $psi (values(%Process)) {
+		if ($psi->processSignature() eq $app) {
+			$appath = $psi->processAppSpec();
+			_save_appath($filepath, $appath);
+			last;
+		}
+	}
+
+	if (!$appath || !-x $appath) {
+		$appath = _read_appath($filepath);
+	}
+	
+	if (!$appath || ! -x $appath)
+	{
+		# make sure that MacPerl is a front process
+		#ActivateApplication('McPL');
+		MacPerl::Answer("Please locate the CodeWarrior application.", "OK");
+		
+		# prompt user for the file name, and store it
+		my $macFile = StandardGetFile( 0, "APPL");
+		if ( $macFile->sfGood() )
+		{
+			$appath = $macFile->sfFile();
+		}
+		else
+		{
+			die "Operation canceled\n";
+		}
+	
+#		if (eval {require Mac::Navigation}) {
+#			my($options, $nav);
+#			Mac::Navigation->import();
+#			$options = NavGetDefaultDialogOptions();
+#			$options->message('Where is CodeWarrior IDE?');
+#			$options->windowTitle('Find CodeWarrior IDE');
+#			$nav = NavChooseObject($Application{$app}, $options);
+#			die "CodeWarrior IDE not found.\n" if (!$nav || !$nav->file(1));
+#			$appath = $nav->file(1);
+#		} else {
+#			local(*D);
+#			my $cwd = `pwd`;
+#			$appath = _get_folder(
+#                               'Where is the CW IDE folder?',
+#				dirname($Application{$app})
+#			);
+#			die "CodeWarrior IDE not found.\n" if !$appath;
+#			opendir(D, $appath) or die $!;
+#			chdir($appath);
+#			foreach my $file (sort readdir (D)) {
+#				my(@app) = MacPerl::GetFileInfo($file);
+#				if ($app[0] && $app[1] &&
+#					$app[1] eq 'APPL' && $app[0] eq $app
+#				) {
+#					$appath .= $file;
+#					last;
+#				}
+#			}
+#			chomp($cwd);
+#			chdir($cwd);
+#		}
+		_save_appath($filepath, $appath);
+	}
+
+	my($lp) = LaunchParam->new(
+		launchAppSpec => $appath,
+		launchControlFlags => launchContinue() + launchNoFileFlags()
+	);
+	
+	unless (LaunchApplication($lp)) {
+		unlink($filepath);
+		die $^E;
+	}
+	
+	# wait for CodeWarrior to show up in the list of processes
+	while (!_appIsRunning('CWIE'))
+	{
+		WaitNextEvent();
+	}
+
+	# wait for CodeWarrior to come to the front
+	while (!_appIsFrontmost('CWIE'))
+	{
+		WaitNextEvent();
+	}
+}
+
+=pod
+
+=item getCodeWarriorPath()
+
+Returns a file path relative to the CodeWarrior folder
+
+=cut
+
+sub getCodeWarriorPath($)
+{
+    my($subfolder)=@_;
+    
+    my($app_path) = _read_appath($ide_loc_file);
+    if ($app_path eq "") { die "Error: Failed to get CodeWarrior IDE path\n"; }
+    
+    my($codewarrior_root) = $app_path;
+    $codewarrior_root =~ s/[^:]*$//;
+    return ($codewarrior_root . $subfolder);
+}
+
+
+=pod
+
+=item getCodeWarriorIDEName()
+
+Returns the name of the CodeWarrior application
+
+=cut
+
+sub getCodeWarriorIDEName()
+{
+    my($subfolder)=@_;
+
+    my($app_path) = _read_appath($ide_loc_file);
+    if ($app_path eq "") { die "Error: Failed to get CodeWarrior IDE path\n"; }
+
+    my(@codewarrior_path) = split(/:/, $app_path);
+    return pop(@codewarrior_path);
+}
+
+
+=pod
+
+=item quit()
+
+Quits CodeWarrior.
+
+=cut
+
+sub quit() {
+
+	$last_project_built = "";
+	$last_project_was_closed = 0;
+
+	my($evt) = do_event(qw/aevt quit/, $app);
+}
+
+
+sub _build ($;$) {
+	my($evt);
+	if ($_[1]) {
+		my($prm) =
+			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
+			AEPrint($_[0]) . '}';
+		$evt = do_event(qw/CWIE MAKE/, $app, $prm, $_[1]);
+	} else {
+		my($prm) = q"'----':" . AEPrint($_[0]);
+		$evt = do_event(qw/CWIE MAKE/, $app, $prm);
+	}
+}
+
+sub _remove_object ($;$) {
+	my($evt);
+	if ($_[1]) {
+		my($prm) =
+			q"'----':obj {form:name, want:type(TRGT), seld:TEXT(@), from:" .
+			AEPrint($_[0]) . '}';
+		$evt = do_event(qw/CWIE RMOB/, $app, $prm, $_[1]);
+	} else {
+		my($prm) = q"'----':" . AEPrint($_[0]);
+		$evt = do_event(qw/CWIE RMOB/, $app, $prm);
+	}
+}
+
+sub _open_file ($) {
+	my($prm) =
+		q"'----':obj {form:name, want:type(alis), " .
+		q"seld:TEXT(@), from:'null'()}";
+
+	do_event(qw/aevt odoc/, $app, $prm, $_[0]);
+}
+
+sub import_project ($$) {
+	my($xml_file, $project_path) = @_;
+	
+	my($prm) = "kocl:type(PRJD), rtyp:TEXT(@), data:TEXT(@), &subj:'null'()";
+	
+	my($evt) = do_event(qw/core crel/, $app, $prm, $project_path, $xml_file);    
+	return $evt->{ERROR};
+}
+
+sub _doc_named ($) {
+	my($prm) =
+		q"'----':obj {form:test, want:type(docu), from:'null'(), " .
+		q"seld:cmpd{relo:'=   ', 'obj1':obj {form:prop, want:type" .
+		q"(prop), seld:type(pnam), from:'exmn'()}, 'obj2':TEXT(@)}}";
+
+	my($evt) = do_event(qw/core getd/, $app, $prm, $_[0]);
+	return($evt->{REPLY} eq 'aevt\ansr{}' ? undef : $evt);
+}
+
+sub _full_path ($) {
+	my($obj) = $_[0];
+	my($prm) =
+		q"'----':obj {form:prop, want:type(prop), seld:type(FILE), " .
+		q"from:" . AEPrint($_[0]) . q"}, rtyp:type(TEXT)";
+	my($evt) = do_event(qw/core getd/, $app, $prm);
+
+	return MacPerl::MakePath(
+		MacUnpack('fss ', (
+			AEGetParamDesc($evt->{REP}, keyDirectObject()))->data()->get()
+		)
+	);
+}
+
+sub _save_errors_window ($) {
+	my($prm) = 
+		q"'----':obj {form:name, want:type(alis), seld:TEXT(@), from:'null'()}";
+	do_event(qw/MMPR SvMs/, $app, $prm, $_[0]);
+}
+
+
+sub _close_errors_window () {
+	my($prm) =
+		q"'----':obj {form:name, want:type(cwin), " .
+		q"seld:TEXT(@), from:'null'()}";
+
+	my($evt) = do_event(qw/core clos/, $app, $prm, 'Errors & Warnings');
+	return($evt->{REPLY} eq 'aevt\ansr{}' ? 1 : 0);
+}
+
+sub _close () {
+	my($prm) = q"'----':" . AEPrint($_[0]);
+	do_event(qw/core clos/, $app, $prm);
+}
+
+sub _get_dobj ($) {
+	return(AEGetParamDesc($_[0]->{REP}, keyDirectObject()));
+}
+
+sub _get_folder ($$) {
+    require 'GUSI.ph';
+    my($prompt, $default) = @_;
+    MacPerl::Choose(
+        GUSI::AF_FILE(), 0, $prompt, '',
+        GUSI::CHOOSE_DIR() + ($default ? &GUSI::CHOOSE_DEFAULT : 0),
+        $default
+    );
+}
+
+sub _save_appath ($$) {
+
+	my($cwd) = cwd();	# remember the current working dir
+	chdir($scriptDir);	# change dir to the script dir
+
+	local(*F);
+	open(F, '>' . $_[0]) or die $!;
+	print F $_[1];
+	close(F);
+		
+	chdir($cwd);		# restore the cwd
+}
+
+sub _read_appath ($) {
+
+	my($filepath) = @_;
+
+	my($cwd) = cwd();	# remember the current working dir
+	chdir($scriptDir);	# change dir to the script dir
+	
+	if (! -e $filepath) {
+		return "";
+	}
+
+	local(*F);
+	open(F, $filepath);
+	my($appath) = <F>;
+	close(F);
+		
+	chdir($cwd);		# restore the cwd
+	return($appath);
+}
+
+
+sub _test ($) {
+	activate($ide_loc_file);
+	my($path) = $_[0];
+	build_project(
+	  "${path}modules:xml:macbuild:XML.mcp", '',
+	  "${path}build:mac:Mozilla.BuildLog.part"
+	);
+}
+
+1;
+
+=pod
+
+=back
+
+=head1 HISTORY
+
+=over 4
+
+=item v1.02, September 23, 1998
+
+Made fixes in finding and saving location of CodeWarrior IDE.
+
+=item v1.01, June 1, 1998
+
+Made fixes to C<chdir()> in C<activate()>, made C<activate()> more robust 
+in finding CodeWarrior IDE, added global variable to NOT switch to IDE
+for each sent event, a few other fixes.
+
+=item v1.00, May 30, 1998
+
+First shot
+
+=back
+
+
+=head1 AUTHORS
+
+Chris Nandor F<E<lt>pudge@pobox.comE<gt>>, and the author of the
+original I<CodeWarriorLib>, Scott Collins F<E<lt>scc@netscape.comE<gt>>.
+
+=head1 SEE ALSO
+
+BuildProject L<Moz>.
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public
+License Version 1.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/NPL/
+
+Software distributed under the License is distributed on an "AS
+IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+implied. See the License for the specific language governing
+rights and limitations under the License.
+
+The Original Code is Mozilla Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+
+Contributor(s): 
+
+=cut

mozilla/build/mac/build_scripts/Moz/Jar.pm

@@ -0,0 +1,599 @@
+#!perl -w
+package Moz::Jar;
+
+#
+# Module for creating jar files, either using a jar manifest, or
+# simply jarring up folders on disk.
+#
+
+require 5.004;
+require Exporter;
+
+use strict;
+use Archive::Zip;
+use File::Path;
+
+use Mac::Files;
+
+use Moz::Moz;
+
+use vars qw( @ISA @EXPORT );
+
+@ISA        = qw(Exporter);
+@EXPORT     = qw(
+                    CreateJarFileFromDirectory
+                    CreateJarFromManifest
+                    WriteOutJarFiles
+                    SanityCheckJarOptions
+                );
+
+
+#-------------------------------------------------------------------------------
+# Add the contents of a directory to the zip file
+#
+#-------------------------------------------------------------------------------
+sub _addDirToJar($$$$)
+{
+    my($dir, $jar_root, $zip, $compress) = @_;
+
+    opendir(DIR, $dir) or die "Error: Cannot open dir $dir\n";
+    my @files = readdir(DIR);
+    closedir DIR;
+    
+    my $unix_jar_root = $jar_root;
+    $unix_jar_root =~ s|:|/|g;       # colon to slash conversion
+    
+    my $file;
+    
+    foreach $file (@files)
+    {        
+        my $filepath = $dir.":".$file;
+        
+        if (-d $filepath)
+        {
+            print "Adding files to jar from $filepath\n";            
+            _addDirToJar($filepath, $jar_root, $zip, $compress);
+        }
+        else
+        {
+            my $member = Archive::Zip::Member->newFromFile($filepath);
+            die "Error: Failed to create zip file member $filepath\n" unless $member;
+            
+            my $unixName = $filepath;
+            $unixName =~ s|:|/|g;               # colon to slash conversion
+            $unixName =~ s|^$unix_jar_root||;   # relativise
+            
+            $member->fileName($unixName);
+            
+            # print "Adding $file as $unixName\n";
+            
+            if ($compress) {
+                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
+            } else {
+                $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
+            }
+            
+            $zip->addMember($member);
+        }
+    }
+}
+
+#-------------------------------------------------------------------------------
+# Add the contents of a directory to the zip file
+#
+#-------------------------------------------------------------------------------
+
+sub CreateJarFileFromDirectory($$$)
+{
+    my($srcdir, $jarpath, $compress) = @_;
+
+    my $zip = Archive::Zip->new();
+
+    _addDirToJar($srcdir, $srcdir, $zip, $compress);
+
+    print "Saving zip file...\n";
+    my $status = $zip->writeToFileNamed($jarpath);
+    if ($status == 0) {
+        print "Zipping completed successfully\n";
+    } else {
+        print "Error saving zip file\n";
+    }
+    
+    # set the file type/creator to something reasonable
+    MacPerl::SetFileInfo("ZIP ", "ZIP ", $jarpath);
+}
+
+
+#-------------------------------------------------------------------------------
+# SanityCheckJarOptions
+# 
+#-------------------------------------------------------------------------------
+sub SanityCheckJarOptions()
+{
+    if (!$main::options{chrome_jars} && !$main::options{chrome_files})
+    {
+        print "Both \$options{chrome_jars} and \$options{chrome_files} are off. You won't get any chrome.\n";
+        return;
+    }
+
+    if (!$main::options{chrome_jars} && $main::options{use_jars})
+    {
+        print "\$options{chrome_jars} is off but \$options{use_jars} is on. Your build won't run (expects jars, got files).\n";
+        return;
+    }
+
+    if (!$main::options{chrome_files} && !$main::options{use_jars})
+    {
+        print "\$options{chrome_jars} is off but \$options{chrome_files} is on. Your build won't run (expects files, got jars).\n";
+        return;
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# printZipContents
+# 
+#-------------------------------------------------------------------------------
+sub printZipContents($)
+{
+    my($zip) = @_;
+
+    my(@members) = $zip->memberNames();
+    
+    print "Zip contains:\n";
+    
+    my($member);
+    foreach $member (@members)
+    {
+        print "  $member\n";
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# safeSaveJarFile
+# 
+# Archive::Zip has a problem where you cannot save a zip file on top of
+# an existing zip file that it has open, because it holds references
+# into that zip. So we have to save to a temp file, then do a swap.
+# 
+# Note that the zip will become invalid after this operation.
+# If you want to do further operations on it, you'll have to reread it.
+#-------------------------------------------------------------------------------
+sub safeSaveJarFile($$)
+{
+    my($zip, $full_dest_path) = @_;
+    
+    my($temp_file_name) = $full_dest_path."_temp";
+
+    ($zip->writeToFileNamed($temp_file_name) == Archive::Zip::AZ_OK) || die "Error: died writing jar to temp file $temp_file_name\n";
+    
+    unlink $full_dest_path;
+    
+    (rename $temp_file_name, $full_dest_path) || die "Error: Failed to rename $temp_file_name\n";
+    
+    MacPerl::SetFileInfo("ZIP ", "ZIP ", $full_dest_path);
+}
+
+
+#-------------------------------------------------------------------------------
+# addToJarFile
+# 
+# Add a file to a jar file
+#
+# Parameters:
+#   1. Jar ID. Unix path of jar file inside chrome.
+#   2. Abs path to jar.mn file (i.e. source)    (mac breaks)
+#   3. File source, relative to jar.mn path     (mac breaks)
+#   4. Abs path to the resulting .jar file      (mac breaks)
+#   5. Relative file path within the jar        (unix breaks)
+#   6. Reference to hash of jar files
+#
+#-------------------------------------------------------------------------------
+
+sub addToJarFile($$$$$$$)
+{
+    my($jar_id, $jar_man_dir, $file_src, $jar_path, $file_jar_path, $override, $jars) = @_;
+
+    # print "addToJarFile with:\n  $jar_man_dir\n  $file_src\n  $jar_path\n  $file_jar_path\n";
+
+    unless ($jar_path =~ m/(.+:)([^:]+)$/) { die "Error: Bad jar path $jar_path\n"; }
+    
+    my($target_dir) = $1;
+    my($jar_name) = $2;
+
+    $target_dir =~ s/[^:]+$//;
+    
+    # print "¥ $target_dir $jar_name\n";
+
+    # find the source file
+    my($src) = $jar_man_dir.":".$file_src;
+    if ((!-e $src) && ($file_src =~ m/.+:([^:]+)$/))    # src does not exist. Fall back to looking for src in jar.mn dir
+    {
+        $file_src = $1;
+        $src = $jar_man_dir.":".$file_src;
+        
+        if (!-e $src) {
+            die "Error: Can't find chrome file $src\n";
+        }
+    }
+    
+    if ($main::options{chrome_jars})
+    {
+        my($zip) = $jars->{$jar_id};
+        unless ($zip) { die "Error: Can't find Zip entry for $jar_id\n"; }
+        
+        # print "Adding $file_src to jar file $jar_path at $file_jar_path\n";
+        my($member) = Archive::Zip::Member->newFromFile($src);
+        unless ($member) { die "Error: Failed to create zip file member $src\n"; }
+
+        $member->fileName($file_jar_path);    
+    
+        my($compress) = 1;
+        if ($compress) {
+            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_DEFLATED);            
+            $member->desiredCompressionLevel(Archive::Zip::COMPRESSION_LEVEL_DEFAULT);   # defaults to 6
+        } else {
+            $member->desiredCompressionMethod(Archive::Zip::COMPRESSION_STORED);
+        }
+
+        my($old_member) = $zip->memberNamed($file_jar_path);
+        
+        if ($override)
+        {
+            if ($old_member)
+            {
+                # print "Overriding $file_jar_path in jar file $jar_id\n";
+                # need to compare mod dates or use the + here
+                $zip->removeMember($old_member);
+            }
+        
+            $zip->addMember($member);
+        }
+        else
+        {
+            if ($old_member)
+            {
+                #compare dates here
+                my($member_moddate) = $old_member->lastModTime();
+                my($file_moddate) = GetFileModDate($src);
+            
+                if ($file_moddate > $member_moddate)
+                {
+                    print "Updating older file $file_jar_path in $jar_id\n";
+                    $zip->removeMember($old_member);
+                    $zip->addMember($member);
+                }
+                else
+                {
+                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
+                }
+            }
+            else
+            {
+                $zip->addMember($member);
+            }
+        }
+    }
+    
+    if ($main::options{chrome_files})  # we install raw files too
+    {
+        my($rel_path) = $file_jar_path;
+        $rel_path =~ s|/|:|g;       # slash to colons
+        
+        my($dir_name) = $jar_name;
+        $dir_name =~ s/\.jar$//;
+        
+        my($dst) = $target_dir.$dir_name.":".$rel_path;
+                
+        # print "Aliassing $src\n to\n$dst\n";        
+        if ($override)
+        {
+            unlink $dst;
+        MakeAlias($src, $dst);      # don't check errors, otherwise we fail on replacement
+    }
+        else
+        {
+            if (-e $dst)
+            {
+                #compare dates here
+                my($dst_moddate) = GetFileModDate($dst);
+                my($file_moddate) = GetFileModDate($src);
+            
+                if ($file_moddate > $dst_moddate)
+                {
+                    print "Updating older file $rel_path in $dir_name\n";
+                    unlink $dst;
+                    MakeAlias($src, $dst);
+                }
+                else
+                {
+                    print "File $file_jar_path in $jar_id is more recent. Not updating.\n";
+                }
+            
+            }
+            else
+            {
+                MakeAlias($src, $dst);
+            }
+        }
+        
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# setupJarFile
+# 
+# setup a zip for writing
+#-------------------------------------------------------------------------------
+
+sub setupJarFile($$$)
+{
+    my($jar_id, $dest_path, $jar_hash) = @_;
+
+    # print "Creating jar file $jar_id at $jar_path\n";
+    
+    my($jar_file) = $jar_id;
+    $jar_file =~ s|/|:|g;           # slash to colons
+    my($full_jar_path) = full_path_to($dest_path.":".$jar_file);
+
+    if ($main::options{chrome_jars})
+    {
+        my($zip) = $jar_hash->{$jar_id};
+        if (!$zip)      # if we haven't made it already, do so
+        {
+	        my($zip) = Archive::Zip->new();
+	        $jar_hash->{$jar_id} = $zip;
+
+            # does the jar file exist already? If so, read it in
+            if (-e $full_jar_path)
+            {
+                print "Reading in jar file $jar_id\n";
+                if ($zip->read($full_jar_path) != Archive::Zip::AZ_OK) { die "Error: Failed to re-read $full_jar_path\n"; }
+                
+                # printZipContents($zip);
+            }
+
+        }
+    }
+    else
+    {
+        # installing files.
+        # nothing to do. MakeAlias creates dirs as needed.
+
+	    # add this jar to the list
+	    $jar_hash->{$jar_id} = 1;
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# closeJarFile
+# 
+# We're done with this jar file _for this jar.mn_. We may add more entries
+# to it later, so keep it open in the hash.
+#-------------------------------------------------------------------------------
+sub closeJarFile($$)
+{
+    my($jar_path, $jar_hash) = @_;
+
+    # print "Closing jar file $jar_path\n";
+
+    if ($main::options{chrome_jars})
+    {
+    
+    }
+    else
+    {
+        # installing files.
+        # nothing to do
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# WriteOutJarFiles
+# 
+# Now we dump out the jars
+#-------------------------------------------------------------------------------
+sub WriteOutJarFiles($$)
+{
+    my($chrome_dir, $jars) = @_;
+
+    unless ($main::options{chrome_jars}) { return; }
+    
+    my($full_chrome_path) = full_path_to($chrome_dir);
+
+    my($key);
+    foreach $key (keys %$jars)
+    {
+        my($zip) = $jars->{$key};
+        
+        my($rel_path) = $key;
+        $rel_path =~ s/\//:/g;
+        
+        my($output_path) = $full_chrome_path.":".$rel_path;
+        
+        print "Writing zip file $key to $output_path\n";
+
+        # ensure the target dirs exist
+        my($path) = $output_path;
+        $path =~ s/[^:]+$//;
+        mkpath($path);
+        
+        # unlink $output_path;        # remove any existing jar
+        safeSaveJarFile($zip, $output_path);
+        # $zip is invalid after this operation, so nuke it here
+        $jars->{$key} = 0;
+    }
+}
+
+
+#-------------------------------------------------------------------------------
+# registerChromePackage
+# 
+# Enter a chrome package into the installed-chrome.txt file
+#-------------------------------------------------------------------------------
+sub registerChromePackage($$$$$$)
+{
+    my($jar_file, $file_path, $chrome_dir, $jar_hash, $chrome_type, $pkg_name) = @_;
+
+    my($manifest_subdir) = $jar_file;
+    $manifest_subdir =~ s/:/\//g;
+    
+    my($chrome_entry);
+    
+    if ($main::options{use_jars}) {
+        $chrome_entry = "$chrome_type,install,url,jar:resource:/chrome/$manifest_subdir!/$chrome_type/$pkg_name";
+    } else {
+        $manifest_subdir =~ s/\.jar$//;
+        $chrome_entry = "$chrome_type,install,url,resource:/chrome/$manifest_subdir/$chrome_type/$pkg_name";
+    }
+
+    # print "Entering $chrome_entry in installed-chrome.txt\n";
+    
+    # ensure chrome_dir exists
+    mkpath($chrome_dir);
+    
+    my($inst_chrome) = ${chrome_dir}.":installed-chrome.txt";
+    
+    if (open(CHROMEFILE, "<$inst_chrome")) {
+        while (<CHROMEFILE>) {
+            chomp;
+            if ($_ eq $chrome_entry) {
+                # $chrome_entry already appears in installed-chrome.txt file
+                # just update the mod date
+                my $now = time;
+                utime($now, $now, $inst_chrome) || die "Error: Couldn't touch $inst_chrome";
+                print "+++ updating chrome $inst_chrome\n+++\t\t$chrome_entry\n";
+                close(CHROMEFILE) || die "Error: can't close $inst_chrome: $!";
+                return 0;
+            }
+        }
+        close(CHROMEFILE) || die "Error: can't close $inst_chrome: $!";
+    }
+    open(CHROMEFILE, ">>${inst_chrome}") || die "Error: Failed to open $inst_chrome\n";
+    print(CHROMEFILE "${chrome_entry}\n");
+    close(CHROMEFILE) || die "Error: Failed to close $inst_chrome\n";
+    print "+++ adding chrome $inst_chrome\n+++\t\t$chrome_entry\n";
+}
+
+#-------------------------------------------------------------------------------
+# Create or add to a jar file from a jar.mn file.
+# Both arguments are relative to the mozilla root dir.
+#
+#
+#-------------------------------------------------------------------------------
+sub CreateJarFromManifest($$$)
+{
+    my($jar_man_path, $dest_path, $jars) = @_;
+    
+    if ($main::options{chrome_jars}) {
+        print "Jarring from $jar_man_path\n";
+    }
+    if ($main::options{chrome_files}) {
+        print "Installing files from $jar_man_path\n";
+    }
+
+    $jar_man_path = full_path_to($jar_man_path);
+    $dest_path = full_path_to($dest_path);
+
+    # if the jars hash is empty, nuke installed-chrome.txt
+    if (! scalar(%$jars))
+    {
+        print "Nuking installed-chrome.txt\n";
+	    my($installed_chrome) = $dest_path.":installed-chrome.txt";
+	    # unlink $installed_chrome;
+    }
+    
+    my $jar_man_dir = "";
+    my $jar_man_file = "";
+    
+    if ($jar_man_path =~ /(.+):([^:]+)$/)
+    {
+        $jar_man_dir = $1;      # no trailing :
+        $jar_man_file = $2;
+    }
+
+    # Keep a hash of jar files, keyed on relative jar path (e.g. "packages/core.jar")
+    # Entries are open Archive::Zips (if zipping), and installed-chrome entries.
+    
+    my($jar_id) = "";       # Current foo/bar.jar from jar.mn file
+    my($jar_file) = "";     # relative path to jar file (from $dest_path), with mac separators
+    my($full_jar_path);
+    
+    open(FILE, "<$jar_man_path") || die "Error: could not open \"$jar_man_path\": $!";
+    while (<FILE>)
+    {
+        my($line) = $_;
+        chomp($line);
+        
+        # print "$line\n";
+        
+        if ($line =~ /^\s*\#.*$/) {     # skip comments
+            next;
+        }
+        
+        if ($line =~/^([\w\d.\-\_\\\/]+)\:\s*$/)                                  # line start jar file entries
+        {
+            $jar_id = $1;
+            $jar_file = $jar_id;
+            $jar_file =~ s|/|:|g;           # slash to colons
+            $full_jar_path = $dest_path.":".$jar_file;
+                        
+            setupJarFile($jar_id, $dest_path, $jars);
+
+        }
+        elsif ($line =~ /^(\+?)\s+([\w\d.\-\_\\\/]+)\s*(\([\w\d.\-\_\\\/]+\))?$\s*/)     # jar file entry
+        {
+            my($override) = ($1 eq "+");
+            my($file_dest) = $2;
+            my($file_src) = $3;
+ 
+            if ($file_src) {  
+                $file_src = substr($file_src, 1, -1);      #strip the ()
+            } else {
+                $file_src = $file_dest;
+            }
+            
+            $file_src =~ s|/|:|g;
+            
+            if ($jar_file ne "")    # if jar is open, add to jar
+            {
+                if ($file_dest =~ /([\w\d.\-\_]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
+                {
+                    my $chrome_type = $1;
+                    my $pkg_name = $2;
+                    registerChromePackage($jar_file, $file_dest, $dest_path, $jars, $chrome_type, $pkg_name);
+                }
+                
+                addToJarFile($jar_id, $jar_man_dir, $file_src, $full_jar_path, $file_dest, $override, $jars);
+            }
+            else
+            {
+                die "Error: bad jar.mn format at $line\n";
+            }
+        }
+        elsif ($line =~ /^\s*$/ )                                               # blank line
+        {
+            if ($jar_file ne "")    #if a jar file is open, close it
+            {
+                closeJarFile($full_jar_path, $jars);
+                
+                $jar_file = "";
+                $full_jar_path = "";
+            }
+        }
+    }
+    
+    close(FILE);
+
+    if ($jar_file ne "")    #if a jar file is open, close it
+    {
+        closeJarFile($full_jar_path, $jars);
+    }
+
+}
+
+1;

mozilla/build/mac/build_scripts/Moz/MacCVS.pm

@@ -0,0 +1,254 @@
+#!perl -w
+package Moz::MacCVS;
+
+# package Mac::Apps::MacCVS; this should really be the name of the package
+# but due to our directory hierarchy in mozilla, I am not doing it
+
+require 5.004;
+require Exporter;
+
+use strict;
+use Exporter;
+
+use vars qw($VERSION @ISA @EXPORT $MacCVSLib);
+
+use Cwd;
+
+use Mac::StandardFile;
+use File::Basename;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw( new print checkout);
+$VERSION = "1.00";
+
+my($last_error) = 0;
+
+# Architecture:
+# cvs session object:
+# name - session name
+# session_file - session file
+# 
+# globals
+# $MacCVSLib - location of MacCVS applescript library
+#
+# 
+
+#
+# utility routines
+#
+
+# just like Mac::DoAppleScript, 1 is success, 0 is failure
+sub _myDoAppleScript($) 
+{
+	my($script) = @_;
+	my $asresult = MacPerl::DoAppleScript($script);
+
+	if ($asresult eq "0")
+	{
+		return 1;
+	}
+	else
+	{
+		my($error_string) = "Unknown error";
+		my($error_code) = 0;
+
+		if ($asresult =~ /^\"(.*)\.([0-9]+)\"$/)
+		{
+			$error_string = $1;
+			$error_code = $2;
+		}
+
+		print STDERR "Error. Script returned '$error_string (error $error_code)\n";
+		# print STDERR "AppleScript was: \n $script \n";
+		$last_error = $error_code;
+		return 0;
+	}
+}
+
+# get the full path to this module
+sub _getPathToMe()
+{
+	# this can be a relative or absolute path. If relative, is relative
+	# to the running script ($0)
+	my($my_path) = $INC{"Moz/MacCVS.pm"};
+	
+	if (substr($my_path, 0, 1) eq ":")	# relative path
+	{
+		$my_path = dirname($0).$my_path;
+	}
+	
+	return $my_path;
+}
+
+# _useMacCVSLib
+# returns 1 on success
+# Search the include path for the file called MacCVSLib
+sub _useMacCVSLib() 
+{
+	unless (defined($MacCVSLib) && ($MacCVSLib ne ""))
+	{
+		my($libname) = "MacCVSLib";
+		
+		my($my_path) = _getPathToMe();
+		
+		# try in the same directory as this module
+		my($c) = dirname($my_path).":".$libname;
+		if ( -e $c)
+		{
+			$MacCVSLib = $c;
+			return 1;
+		}
+		
+		# try the directory we were run from
+		$c = dirname($0) . ":" . $libname;
+		if ( -e $c)
+		{
+			$MacCVSLib = $c;
+			return 1;
+		}
+
+		# now search the include directories
+		foreach (@INC)
+		{
+			unless ( m/^Dev:Pseudo/ ) # This is some bizarre MacPerl special-case directory
+			{
+				$c = $_ . $libname;
+				if (-e $c)
+				{
+					$MacCVSLib = $c;
+					return 1;
+				}
+			}
+		}
+
+		die "Error: MacCVSLib could not be found!";
+	}
+	return 1;
+}
+
+
+#
+# Session object methods
+#
+
+sub new
+{
+	my ( $proto, $session_file) = @_;
+	my $class = ref($proto) || $proto;
+	my $self = {};
+
+	if ( defined($session_file) && ( -e $session_file) )
+	{
+		$self->{"name"} = basename( $session_file );
+		$self->{"session_file"} = $session_file;
+		bless $self, $class;
+		return $self;
+	}
+	else
+	{
+		print STDERR "MacCVS->new cvs file < $session_file > does not exist\n";
+		return;
+	}
+}
+
+# makes sure that the session is open
+# assertSessionOpen()
+# returns 1 on success
+sub assertSessionOpen()
+{
+	my ($self) = shift;
+	
+	_useMacCVSLib() || die "Error: Could not load MacCVSLib\n";
+	$last_error = 0;
+
+	my $script = <<END_OF_APPLESCRIPT;
+	tell (load script file "$MacCVSLib") to OpenSession("$self->{session_file}")
+END_OF_APPLESCRIPT
+	return _myDoAppleScript($script);
+}
+
+# prints the cvs object, used mostly for debugging
+sub print
+{
+	my($self) = shift;
+		$last_error = 0;
+	print "MacCVS:: name: ", $self->{name}, " session file: ", $self->{session_file}, "\n";
+}
+
+# checkout( self, module, revision, date)
+# MacCVS checkout command
+# returns 1 on success.
+sub checkout()
+{
+	my($self, $module, $revision, $date ) = @_;
+	unless( defined ($module) ) { $module = ""; } # get rid of the pesky undefined warnings
+	unless( defined ($revision) ) { $revision = ""; }
+	unless( defined ($date) ) { $date = ""; }
+
+	$last_error = 0;
+		
+	$self->assertSessionOpen() || die "Error: failed to open MacCVS session file at $self->{session_file}\n";
+	
+	my($revstring) = ($revision ne "") ? $revision : "(none)";
+	my($datestring) = ($date ne "") ? $date : "(none)";
+	
+	print "Checking out $module with revision $revstring, date $datestring\n";
+	
+	my $script = <<END_OF_APPLESCRIPT;
+	tell (load script file "$MacCVSLib") to Checkout given sessionName:"$self->{name}", module:"$module", revision:"$revision", date:"$date"
+END_OF_APPLESCRIPT
+	return _myDoAppleScript($script);
+}
+
+sub getLastError()
+{
+	return $last_error;
+}
+
+1;
+=pod
+
+=head1 NAME
+
+MacCVS - Interface to MacCVS
+
+=head1 SYNOPSIS
+
+	use MacCVS;
+	$session = MacCVS->new( <session_file_path>) || die "cannot create session";
+	$session->checkout([module] [revision] [date]) || die "Could not check out";
+		
+=head1 DESCRIPTION
+
+This is a MacCVS interface for talking to MacCVS Pro client.
+MacCVSSession is the class used to manipulate the session
+
+=item new
+	MacCVS->new( <cvs session file path>);
+	
+	Creates a new session. Returns undef on failure.
+
+=item checkout( <module> [revision] [date] )
+
+	cvs checkout command. Revision and date are optional
+	returns 0 on failure
+	
+=cut
+
+=head1 SEE ALSO
+
+=over
+
+=item MacCVS Home Page
+
+http://www.maccvs.org/
+
+=back 
+
+=head1 AUTHORS
+
+Aleks Totic atotic@netscape.com
+
+=cut
+
+__END__

mozilla/build/mac/build_scripts/Moz/Moz.pm

@@ -0,0 +1,597 @@
+=head1 NAME
+
+B<Moz> - routines for automating CodeWarrior builds, and some extra-curricular
+activities related to building Mozilla
+
+=head1 SYNOPSIS
+
+    use Moz;
+
+    OpenErrorLog(":::BuildLog");
+    StopForErrors();
+
+		$Moz::QUIET = 1;
+		InstallFromManifest(":projects:MANIFEST", $dist_dir);
+
+    BuildProjectClean(":projects:SomeProject.mcp", "SomeTarget");
+    MakeAlias(":projects:SomeProject.shlb", $dist_dir);
+
+    DontStopForErrors();
+
+    BuildProject(":projects:SomeOtherProject.mcp", "SomeTarget");
+
+=head1 DESCRIPTION
+
+B<Moz> comprises the routines needed to slap CodeWarrior around, force it
+to build a sequence of projects, report the results, and a few other things.
+This module should only contain functions that are generic to any build,
+not just the Mozilla build.
+
+=cut
+
+
+package			Moz::Moz;
+require			Exporter;
+
+use Cwd;
+
+use File::Copy;
+use File::Path;
+
+use Mac::Types;
+use Mac::Events;
+use Mac::Processes;
+
+use ExtUtils::Manifest 'maniread';
+
+use Moz::CodeWarriorLib;
+
+@ISA				= qw(Exporter);
+
+@EXPORT			= qw( LaunchCodeWarrior
+                  GetCodeWarriorRelativePath
+                  current_directory
+                  full_path_to
+                  BuildProject
+                  BuildProjectClean
+                  ImportXMLProject
+                  OpenErrorLog
+                  MakeAlias
+                  GetFileModDate
+                  StopForErrors
+                  DontStopForErrors
+                  InstallFromManifest
+                  InstallResources
+                  RedirectOutputToFile
+                  Delay
+                  ActivateApplication
+                  IsProcessRunning);
+
+@EXPORT_OK	= qw(CloseErrorLog QUIET);
+
+
+sub current_directory()
+	{
+		my $current_directory = cwd();
+		chop($current_directory) if ( $current_directory =~ m/:$/ );
+		return $current_directory;
+	}
+
+sub full_path_to($)
+	{
+		my ($path) = @_;
+		if ( $path =~ m/^[^:]+$/ )
+			{
+				$path = ":" . $path;
+			}
+
+		if ( $path =~ m/^:/ )
+			{
+				$path = current_directory() . $path;
+			}
+
+		return $path;
+	}
+
+$logging								= 0;
+$recent_errors_file			= "";
+$stop_on_1st_error			= 1;
+$QUIET									= 0;
+
+
+
+=head2 Logging all the errors and warnings - C<OpenErrorLog($log_file)>, C<CloseErrorLog()>
+
+The warnings and errors generated in the course of building projects can be logged to a file.
+Tinderbox uses this facility to show why a remote build failed.
+
+Logging is off by default.
+  Start logging at any point in your build process with C<OpenErrorLog($log_file)>.
+  Stop with C<CloseErrorLog()>.
+  You never need to close the log explicitly, unless you want to just log a couple of projects in the middle of a big list.
+  C<CloseErrorLog()> is not exported by default. 
+
+=cut
+
+sub CloseErrorLog()
+	{
+		if ( $logging )
+			{
+				close(ERROR_LOG);
+				$logging = 0;
+				StopForErrors() if $stop_on_1st_error;
+			}
+	}
+
+
+
+sub OpenErrorLog($)
+	{
+		my ($log_file) = @_;
+
+		CloseErrorLog();
+		if ( $log_file )
+			{
+				$log_file = full_path_to($log_file);
+ 
+				open(ERROR_LOG, ">$log_file") || die "Error: Can't open $log_file\n";
+				MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
+
+				$log_file =~ m/.+:(.+)/;
+				$recent_errors_file = full_path_to("$1.part");
+				$logging = 1;
+			}
+	}
+
+
+=head2 Stopping before it's too late - C<StopForErrors()>, C<DontStopForErrors()>
+
+When building a long list of projects, you decide whether to continue building subsequent projects when one fails.
+  By default, your build script will C<die> after the first project that generates an error while building.
+  Change this behavior with C<DontStopForErrors()>.
+  Re-enable it with C<StopForErrors()>.
+
+=cut
+
+sub StopForErrors()
+	{
+		$stop_on_1st_error = 1;
+		
+			# Can't stop for errors unless we notice them.
+			# Can't notice them unless we are logging.
+			# If the user didn't explicitly request logging, log to a temporary file.
+
+		if ( ! $recent_errors_file )
+			{
+				OpenErrorLog("${TMPDIR}BuildResults");
+			}
+	}
+
+sub DontStopForErrors()
+	{
+		$stop_on_1st_error = 0;		
+	}
+
+sub log_message($)
+	{
+		if ( $logging )
+			{
+				my ($message) = @_;
+				print ERROR_LOG $message;
+			}
+	}
+
+sub log_message_with_time($)
+	{
+		if ( $logging )
+			{
+				my ($message) = @_;
+				my $time_stamp = localtime();
+				log_message("$message ($time_stamp)\n");
+			}
+	}
+
+sub log_recent_errors($)
+	{
+		my ($project_name) = @_;
+		my $found_errors = 0;
+	
+		if ( $logging )
+			{
+				open(RECENT_ERRORS, "<$recent_errors_file");
+
+				while( <RECENT_ERRORS> )
+					{
+						if ( /^Error/ || /^CouldnÕt find project file/ || /^Link Error/ )
+							{
+#								if (!$found_errors)
+#									print $_;
+								$found_errors = 1;
+							}
+						print ERROR_LOG $_;
+					}
+
+				close(RECENT_ERRORS);
+				unlink("$recent_errors_file");
+			}
+		
+		if ( $stop_on_1st_error && $found_errors )
+			{
+				print ERROR_LOG "### Build failed.\n";
+				die "### Errors encountered building \"$project_name\".\n";
+			}
+	}
+
+sub build_project($$$)
+	{
+		my ($project_path, $target_name, $clean_build) = @_;
+		$project_path = full_path_to($project_path);
+
+#		$project_path =~ m/.+:(.+)/;
+#		my $project_name = $1;
+
+		log_message_with_time("### Building \"$project_path\"");
+
+			# Check that the given project exists
+		if (! -e $project_path)
+			{
+				print ERROR_LOG "### Build failed.\n";
+				die "### Can't find project file \"$project_path\".\n";
+			}
+		
+		print "Building \"$project_path\[$target_name\]\"\n";
+		
+		$had_errors = Moz::CodeWarriorLib::build_project(
+			$project_path, $target_name, $recent_errors_file, $clean_build
+		);
+		WaitNextEvent();
+
+#		$had_errors =
+#MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
+#	tell (load script file "$CodeWarriorLib") to BuildProject("$project_path", "$project_name", "$target_name", "$recent_errors_file", $clean_build)
+#END_OF_APPLESCRIPT
+
+			# Append any errors to the globally accumulated log file
+#		if ( $had_errors ) # Removed this test, because we want warnings, too.  -- jrm
+			{
+				log_recent_errors($project_path);
+			}
+	}
+
+=head2 Getting CodeWarrior to build projects - C<BuildProject($project, $opt_target)>, C<BuildProjectClean($project, $opt_target)>
+
+C<BuildProject()> and C<BuildProjectClean()> are identical, except that the latter first removes object code.
+  In both, CodeWarrior opens the project if it wasn't already open; builds the given (or else current) target; and finally closes
+ the project, if it wasn't already open.
+
+=cut
+
+sub BuildProject($;$)
+	{
+		my ($project_path, $target_name) = @_;
+		build_project($project_path, $target_name, 0);
+	}
+
+sub BuildProjectClean($;$)
+	{
+		my ($project_path, $target_name) = @_;
+		build_project($project_path, $target_name, 1);
+	}
+
+
+sub ImportXMLProject($$)
+{
+    my ($xml_path, $project_path) = @_;
+    my ($codewarrior_ide_name) = Moz::CodeWarriorLib::getCodeWarriorIDEName();
+#    my $ascript = <<EOS;
+#      tell application "$codewarrior_ide_name"
+#        make new (project document) as ("$project_path") with data ("$xml_path")
+#      end tell
+#EOS
+#    print $ascript."\n";
+#    my($result) = MacPerl::DoAppleScript($ascript);
+#    unless ($result) { die "Error: ImportXMLProject AppleScript failed $^E $result\n";  }
+#    
+
+    my($import_error) = Moz::CodeWarriorLib::import_project($xml_path, $project_path);
+    if ($import_error ne "") {
+      die "Error: ImportXMLProject failed with error $import_error\n";
+    }
+}
+
+
+=head2 Miscellaneous
+
+C<MakeAlias($old_file, $new_file)> functions like C<symlink()>, except with better argument defaulting and more explicit error messages.
+
+=cut
+
+sub MakeAlias($$)
+	{
+		my ($old_file, $new_file) = @_;
+
+			# if the directory to hold $new_file doesn't exist, create it
+		if ( ($new_file =~ m/(.+:)/) && !-d $1 )
+			{
+				mkpath($1);
+			}
+
+			# if a leaf name wasn't specified for $new_file, use the leaf from $old_file
+		if ( ($new_file =~ m/:$/) && ($old_file =~ m/.+:(.+)/) )
+			{
+				$new_file .= $1;
+			}
+
+		my $message = "Can't create a Finder alias (at \"$new_file\")\n for \"$old_file\"; because ";
+
+		die "Error: $message \"$old_file\" doesn't exist.\n" unless -e $old_file;
+		die "Error: $message I won't replace an existing (non-alias) file with an alias.\n" if ( -e $new_file && ! -l $new_file );
+
+			# now: $old_file exists; $new_file doesn't (or else, is an alias already)
+
+		if ( -l $new_file )
+			{
+					# ...then see if it already points to $old_file
+				my $current_target	= full_path_to(readlink($new_file));
+				my $new_target			= full_path_to($old_file);
+
+				return if ( $current_target eq $new_target );
+					# if the desired alias already exists and points to the right thing, then we're done
+				
+				unlink $new_file;
+			}
+		
+		symlink($old_file, $new_file) || die "Error: $message symlink returned an unexpected error.\n";
+	}
+	
+	
+=pod
+
+C<InstallFromManifest()>
+
+=cut
+
+sub InstallFromManifest($;$$)
+	{
+		my ($manifest_file, $dest_dir, $flat) = @_;
+		
+		$flat = 0 unless defined($flat); # if $flat, all rel. paths in MANIFEST get aliased to the root of $dest_dir
+
+		$dest_dir ||= ":";
+
+		$manifest_file =~ m/(.+):/;
+		my $source_dir =  $1;
+
+		chop($dest_dir) if $dest_dir =~ m/:$/;
+
+		#Mac::Events->import();
+		WaitNextEvent();
+		if ($flat)
+		{
+			print "Doing manifest on \"$manifest_file\" FLAT\n" unless $QUIET;
+		}
+		else
+		{
+			print "Doing manifest on \"$manifest_file\"\n" unless $QUIET;
+		}
+		
+		my $read = maniread(full_path_to($manifest_file));
+		foreach $file (keys %$read)
+			{
+				next unless $file;
+
+				$subdir = ":";
+				if (!$flat && ($file =~ /:.+:/ ))
+					{
+						$subdir = $&;
+					}
+
+				$file = ":$file" unless $file =~ m/^:/;
+				MakeAlias("$source_dir$file", "$dest_dir$subdir");
+			}
+	}
+
+
+=pod
+
+C<InstallResources()>
+
+=cut
+
+# parameters are path to MANIFEST file, destination dir, true (to make copies) or false (to make aliases)
+sub InstallResources($;$;$)
+	{
+		my ($manifest_file, $dest_dir, $copy_files) = @_;
+
+		$dest_dir ||= ":";
+		mkpath($dest_dir) if !-d $dest_dir;
+
+		$manifest_file =~ m/(.+):/;
+		my $source_dir =  $1;
+
+		chop($dest_dir) if $dest_dir =~ m/:$/;
+
+		WaitNextEvent();
+		print "Installing resources from \"$manifest_file\"\n" unless $QUIET;
+		
+		my $read = maniread(full_path_to($manifest_file));
+		foreach $file (keys %$read)
+			{
+				next unless $file;
+				
+				if ($copy_files)
+					{
+						copy("$source_dir:$file", "$dest_dir:$file");
+					}
+				else
+					{
+						MakeAlias("$source_dir:$file", "$dest_dir:$file");
+					}
+			}
+	}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// Delay
+#//--------------------------------------------------------------------------------------------------
+sub Delay($)		
+{
+  my ($delay_seconds) = @_;
+
+  $now = time;
+  
+  $exit_time = $now + $delay_seconds;
+
+  while ($exit_time > $now) {
+     $now = time;
+  }
+	
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// GetFileModDate
+#//--------------------------------------------------------------------------------------------------
+sub GetFileModDate($)
+{
+    my($filePath)=@_;
+    my($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,
+        $atime,$mtime,$ctime,$blksize,$blocks) = stat($filePath);
+    return $mtime;
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// LaunchCodeWarrior
+#//--------------------------------------------------------------------------------------------------
+sub LaunchCodeWarrior($)
+{
+  my($idepath_file) = @_;   # full path to IDE location file
+  my($cur_dir) = cwd();
+  
+  # this both launches and writes the IDE path file
+  Moz::CodeWarriorLib::activate($idepath_file);
+  
+  chdir($cur_dir);
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// GetCodeWarriorRelativePath
+#//--------------------------------------------------------------------------------------------------
+sub GetCodeWarriorRelativePath($)
+{
+  my($rel_path) = @_;
+  return Moz::CodeWarriorLib::getCodeWarriorPath($rel_path);
+}
+
+
+#//--------------------------------------------------------------------------------------------------
+#// RedirectOutputToFile
+#//--------------------------------------------------------------------------------------------------
+sub RedirectOutputToFile($)
+{
+    my($log_file) = @_;
+    
+    # ensure that folders in the path exist
+    my($logdir) = "";
+    my($logfile) = $log_file;
+    
+    if ($log_file =~ /(.+?:)([^:]+)$/)       # ? for non-greedy match
+    {
+        $logdir = $1;
+        $logfile = $2;
+        
+        mkpath($logdir);
+    }
+
+    print "Output is now being redirected to the file '$log_file'\n";
+    
+    open(STDOUT, "> $log_file") || die "Can't redirect stdout";
+    open(STDERR, ">&STDOUT") || die "Can't dup stdout";
+    select(STDERR); $| = 1;     # make unbuffered
+    select(STDOUT); $| = 1;     # make unbuffered
+    
+    MacPerl::SetFileInfo("CWIE", "TEXT", $log_file);
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// ActivateApplication
+#//--------------------------------------------------------------------------------------------------
+
+sub ActivateApplication($)
+{
+	my ($appSignature) = @_;
+	my ($psi, $found);
+	my ($appPSN);
+	
+	$found = 0;
+		
+	foreach $psi (values(%Process))
+	{
+		if ($psi->processSignature() eq $appSignature)
+		{
+			$appPSN = $psi->processNumber();
+			$found = 1;
+            last;
+		}
+	}
+
+	if ($found == 0 || SameProcess($appPSN, GetFrontProcess()))
+	{
+		return;
+	}
+
+	SetFrontProcess($appPSN);
+
+	while (GetFrontProcess() != $appPSN)
+	{
+		WaitNextEvent();
+	}
+}
+
+#//--------------------------------------------------------------------------------------------------
+#// IsProcessRunning
+#//--------------------------------------------------------------------------------------------------
+
+sub IsProcessRunning($)
+{
+    my($processName, $psn, $psi) = @_;
+    while ( ($psn, $psi) = each(%Process) ) {
+     if ($psi->processName eq $processName) { return 1; }
+    }
+    return 0;
+}
+
+
+1;
+
+=head1 AUTHORS
+
+Scott Collins <scc@netscape.com>, Simon Fraser <sfraser@netscape.com>, Chris Yeh <cyeh@netscape.com>
+
+=head1 SEE ALSO
+
+BuildMozillaDebug.pl (et al), BuildList.pm, CodeWarriorLib (an AppleScript library)
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public
+License Version 1.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/NPL/
+
+Software distributed under the License is distributed on an "AS
+IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+implied. See the License for the specific language governing
+rights and limitations under the License.
+
+The Original Code is Mozilla Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+
+Contributor(s): 
+
+=cut

mozilla/build/mac/build_scripts/Moz/Prefs.pm

@@ -0,0 +1,273 @@
+
+package Moz::Prefs;
+
+require 5.004;
+require Exporter;
+
+# Package that attempts to read a file from the Preferences folder,
+# and get build settings out of it
+
+use strict;
+
+use Exporter;
+use File::Path;
+
+use Mac::Files;
+
+use vars qw(@ISA @EXPORT);
+
+@ISA		  = qw(Exporter);
+@EXPORT 	= qw(ReadMozUserPrefs);
+
+
+#-------------------------------------------------------------------------------
+#
+# GetPrefsFolder
+#
+#-------------------------------------------------------------------------------
+
+sub GetPrefsFolder()
+{
+  my($prefs_folder) = FindFolder(kOnSystemDisk, kPreferencesFolderType, 1);
+  return $prefs_folder.":Mozilla build prefs";
+}
+
+
+#-------------------------------------------------------------------------------
+#
+# SetArrayValue
+#
+#-------------------------------------------------------------------------------
+sub SetArrayValue($$$)
+{
+  my($array_ref, $index1, $index2) = @_;
+
+  my($index);
+  foreach $index (@$array_ref)
+  {
+    if ($index->[0] eq $index1)
+    {
+      $index->[1] = $index2;
+      return 1;
+    }
+  }
+  
+  return 0;
+}
+
+
+#-------------------------------------------------------------------------------
+#
+# WriteDefaultPrefsFile
+#
+#-------------------------------------------------------------------------------
+
+sub WriteDefaultPrefsFile($)
+{
+  my($file_path) = @_;
+
+  my($file_contents);
+  $file_contents = <<'EOS';
+% You can use this file to customize the Mozilla build system.
+% The following kinds of lines are allowable:
+%   Comment lines, which start with a '%' in the first column
+%   Lines which modify the default build settings. For the list of flags,
+%   see MozBuildFlags.pm. Examples are:
+%
+%    build       pull            0                    % don't pull
+%    options     mng             1                    % turn mng on
+%   
+%   Line containing the special 'buildfrom' flag, which specifies
+%   where to start the build. Example:
+%   
+%    buildfrom   nglayout                % where to start the build
+%
+%   Lines which specify the location of the files used to store paths
+%   to the CodeWarrior IDE, and the MacCVS Pro session file. Note quoting
+%   of paths containing whitespace. Examples:
+%
+%    filepath   idepath         ::codewarrior.txt
+%    filepath   sessionpath     ":Some folder:MacCVS session path.txt"
+%
+%   Lines which modify the build settings like %main::DEBUG.
+%   Any lines which do not match either of the above are assumed
+%   to set variables on $main::. Examples:
+%   
+%    CARBON              1
+%    MOZILLA_OFFICIAL    1
+%
+EOS
+
+  $file_contents =~ s/%/#/g;
+   
+  local(*PREFS_FILE);
+
+  open(PREFS_FILE, "> $file_path") || die "Could not write default prefs file\n";
+  print PREFS_FILE ($file_contents);
+  close(PREFS_FILE);
+
+  MacPerl::SetFileInfo("McPL", "TEXT", $file_path);
+}
+
+
+#-------------------------------------------------------------------------------
+#
+# HandlePrefSet
+#
+#-------------------------------------------------------------------------------
+sub HandlePrefSet($$$$)
+{
+  my($flags, $name, $value, $desc) = @_;
+
+  if (SetArrayValue($flags, $name, $value)) {
+    print "Prefs set $desc flag '$name' to '$value'\n";
+  } else {
+    die "$desc setting '$name' is not a valid option\n";
+  }
+
+}
+
+
+#-------------------------------------------------------------------------------
+#
+# HandleBuildFromPref
+#
+#-------------------------------------------------------------------------------
+sub HandleBuildFromPref($$)
+{
+  my($build_array, $name) = @_;
+
+  my($setting) = 0;
+  my($index);
+  foreach $index (@$build_array)
+  {
+    if ($index->[0] eq $name) {
+      $setting = 1;
+    }
+    
+    $index->[1] = $setting;    
+  }
+
+  if ($setting == 1) {
+    print "Building from $name onwards, as specified by prefs\n";
+  } else {
+    printf "Failed to find buildfrom setting '$name'\n";
+  }
+}
+
+
+#-------------------------------------------------------------------------------
+#
+# ReadPrefsFile
+#
+#-------------------------------------------------------------------------------
+
+sub ReadPrefsFile($$$$$)
+{
+  my($file_path, $build_flags, $options_flags, $filepath_flags, $create_if_missing) = @_;
+  
+  local(*PREFS_FILE);
+  
+  if (open(PREFS_FILE, "< $file_path"))
+  {
+    print "Reading build prefs from '$file_path'\n";
+  
+    while (<PREFS_FILE>)
+    {
+      my($line) = $_;
+      chomp($line);
+      
+      if ($line =~ /^\#/ || $line =~ /^\s*$/) {    # ignore comments and empty lines
+        next;
+      }
+            
+      if (($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+\"(.+)\"(\s+#.+)?/) ||
+          ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+\'(.+)\'(\s+#.+)?/) ||
+          ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)\s+([^#\s]+)(\s+#.+)?/))
+      {
+        my($array_name) = $1;      
+        my($option_name) = $2;
+        my($option_value) = $3;      
+      
+        # print "Read '$array_name' '$option_name' '$option_value'\n";
+        
+        if ($array_name eq "build")
+        {
+          HandlePrefSet($build_flags, $option_name, $option_value, "Build");
+        }
+        elsif ($array_name eq "options")
+        {
+          HandlePrefSet($options_flags, $option_name, $option_value, "Options");
+        }
+        elsif ($array_name eq "filepath" && $option_name && $option_value)
+        {
+          HandlePrefSet($filepath_flags, $option_name, $option_value, "Filepath");
+        }
+        else
+        {
+          print "Unknown pref option at $line\n";
+        }
+      }
+      elsif ($line =~ /^\s*buildfrom\s+([^#\s]+)(\s+#.+)?/)
+      {
+        my($build_start) = $1;
+        HandleBuildFromPref($build_flags, $build_start);
+      }
+      elsif ($line =~ /^\s*([^#\s]+)\s+([^#\s]+)(\s+#.+)?/)
+      {
+        my($build_var) = $1;
+        my($var_setting) = $2;
+        
+        print "Setting \$main::$build_var to $var_setting\n";
+        eval "\$main::$build_var = \"$var_setting\"";
+      }
+      else
+      {
+        print "Unrecognized input line at $line\n";
+      }
+      
+    }
+    
+    close(PREFS_FILE);  
+  }
+  elsif ($create_if_missing)
+  {
+    print "No prefs file found at $file_path; using defaults\n";
+    
+    my($folder_path) = $file_path;
+    $folder_path =~ s/[^:]+$//;
+    mkpath($folder_path);
+    WriteDefaultPrefsFile($file_path);
+  }
+}
+
+
+#-------------------------------------------------------------------------------
+#
+# ReadMozUserPrefs
+#
+#-------------------------------------------------------------------------------
+
+sub ReadMozUserPrefs($$$$)
+{
+  my($prefs_file_name, $build_flags, $options_flags, $filepath_flags) = @_;
+  
+  if ($prefs_file_name eq "") { return; }
+  
+  # if local prefs exist, just use those. Othewise, look in the prefs folder
+  if (-e $prefs_file_name)
+  {
+    # read local prefs
+    ReadPrefsFile($prefs_file_name, $build_flags, $options_flags, $filepath_flags, 0);
+  }
+  else
+  {
+    # first read prefs folder prefs
+    my($prefs_path) = GetPrefsFolder();
+    $prefs_path .= ":$prefs_file_name";
+
+    ReadPrefsFile($prefs_path, $build_flags, $options_flags, $filepath_flags, 1);
+  }
+}
+
+1;

mozilla/build/mac/build_scripts/MozillaBuildFlags.txt

@@ -0,0 +1,67 @@
+#-------------------------------------------------------------------------------
+# These 3 lists are the 'master lists' to control what gets built.
+# 
+# Ordering in these arrays is important; it has to reflect the order in
+# which the build occurs.
+#
+# Setting containing spaces must be quoted with double quotes.
+#-------------------------------------------------------------------------------
+
+build_flags
+all             1
+pull            0
+dist            0
+xpidl           0
+idl             0
+stubs           0
+runtime         0
+common          0
+imglib          0
+libimg2         0
+necko           0
+security        0
+browserutils    0
+intl            0
+nglayout        0
+accessiblity    0
+editor          0
+embedding       0
+viewer          0
+xpapp           0
+extensions      0
+plugins         0
+mailnews        0
+apprunner       0
+resources       0
+
+options_flags
+chrome_jars     1
+chrome_files    0
+use_jars        1
+transformiix    0
+mathml          0
+svg             0
+mng             1
+ldap            1
+ldap_experimental 0
+xmlextras       1
+soap            0
+vixen           0
+inspector       0
+mailextras      1
+xptlink         0
+psm             0
+psm2            0
+embedding_test  1
+carbon          0
+cache           1
+useimg2         1
+lowmem          0
+accessible      1
+bidi            0
+
+filepath_flags
+idepath             ":CodeWarrior IDE Path.txt"
+sessionpath         ":Mozilla session path.txt"
+buildlogfilepath    ":Build Logs:Mozilla build log.txt"   # this is a path
+scriptlogfilepath   ":Build Logs:Mozilla script log.txt"

mozilla/build/mac/build_scripts/MozillaCheckoutList.txt

@@ -0,0 +1,19 @@
+# List of modules to check out. Format is
+#   module, (tag), (date)
+# where tag and date are optional (non-trailing commas are required)
+#
+# Examples:
+#   mozilla/nsprpub, NSPRPUB_CLIENT_BRANCH
+#   mozilla/gc, , 10/25/2000 12:00:00
+#
+
+mozilla/nsprpub,        XPCDOM_20010329_BRANCH
+mozilla/security/nss,   XPCDOM_20010329_BRANCH
+mozilla/security/psm,   XPCDOM_20010329_BRANCH
+mozilla/security/manager, XPCDOM_20010329_BRANCH
+mozilla/accessible,     XPCDOM_20010329_BRANCH
+DirectorySDKSourceC,    XPCDOM_20010329_BRANCH
+mozilla/lib/mac/Instrumentation
+mozilla/gfx2,           XPCDOM_20010329_BRANCH
+mozilla/modules/libpr0n, XPCDOM_20010329_BRANCH
+SeaMonkeyAll,           XPCDOM_20010329_BRANCH

mozilla/build/mac/build_scripts/PullMozilla.pl

@@ -0,0 +1,78 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#   Simon Fraser <sfraser@netscape.com>
+#
+
+require 5.004;
+
+use strict;
+
+use Cwd;
+use Moz::BuildUtils;
+use Moz::BuildCore;
+
+#-------------------------------------------------------------
+# Where have the build options gone?
+# 
+# The various build flags have been centralized into one place. 
+# The master list of options is in MozBuildFlags.txt. However, 
+# you should never need to edit that file, or this one.
+# 
+# To customize what gets built, or where to start the build, 
+# edit the $prefs_file_name file in
+# System Folder:Preferences:Mozilla build prefs:
+# Documentation is provided in that file.
+#-------------------------------------------------------------
+
+my($prefs_file_name) = "Mozilla pull prefs";
+
+#-------------------------------------------------------------
+# hashes to hold build options
+#-------------------------------------------------------------
+my(%build);
+my(%options);
+my(%filepaths);
+my(%optiondefines);
+
+# Hash of input files for this build. Eventually, there will be
+# input files for manifests, and projects too.
+my(%inputfiles) = (
+  "buildflags",     "MozillaBuildFlags.txt",
+  "checkoutdata",   "MozillaCheckoutList.txt",
+  "buildprogress",  "",
+  "buildmodule",    "MozillaBuildList.pm"
+);
+#-------------------------------------------------------------
+# end build hashes
+#-------------------------------------------------------------
+
+# set the build root directory, which is the the dir above mozilla
+SetupBuildRootDir(":mozilla:build:mac:build_scripts");
+
+# Set up all the flags on $main::, like DEBUG, CARBON etc.
+# Override the defaults using the preferences files.
+SetupDefaultBuildOptions(0, ":mozilla:dist:viewer:");
+
+my($do_checkout)    = 1;
+my($do_build)       = 0;
+
+RunBuild($do_checkout, $do_build, \%inputfiles, $prefs_file_name);

mozilla/build/mac/test/README

@@ -0,0 +1,4 @@
+This directory is merely here to test the project editor server. It will go away after
+it is validated. For more information, see http://camelot.
+
+Testing watchers.