Wired up OverLink notifications to the status bar...

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

CVSROOT/modules

@@ -1,247 +0,0 @@
-# Three different line formats are valid:
-#	key	-a    aliases...
-#	key [options] directory
-#	key [options] directory files...
-#
-# Where "options" are composed of:
-#	-i prog		Run "prog" on "cvs commit" from top-level of module.
-#	-o prog		Run "prog" on "cvs checkout" of module.
-#	-e prog		Run "prog" on "cvs export" of module.
-#	-t prog		Run "prog" on "cvs rtag" of module.
-#	-u prog		Run "prog" on "cvs update" of module.
-#	-d dir		Place module in directory "dir" instead of module name.
-#	-l		Top-level directory only -- do not recurse.
-#
-# NOTE:  If you change any of the "Run" options above, you'll have to
-# release and re-checkout any working directories of these modules.
-#
-# And "directory" is a path to a directory relative to $CVSROOT.
-#
-# The "-a" option specifies an alias.  An alias is interpreted as if
-# everything on the right of the "-a" had been typed on the command line.
-#
-# You can encode a module within a module by using the special '&'
-# character to interpose another module into the current module.  This
-# can be useful for creating a module that consists of many directories
-# spread out over the entire source repository.
-
-ClientSourceProduct -a \
-	ClientSourceProductWin \
-	ClientSourceProductMac \
-	ClientSourceProductUnix \
-
-ClientSourceProductWin -a MozillaCommon MozillaWinOnly
-
-ClientSourceProductMac -a MozillaCommon MozillaMacOnly
-
-ClientSourceProductUnix -a MozillaCommon MozillaUnixOnly
-
-MozillaCommon -a \
-    ns/LEGAL  \
-    ns/LICENSE  \
-    ns/build  \
-    ns/include  \
-    ns/jpeg  \
-    ns/js  \
-    ns/lib/htmldlgs  \
-    ns/lib/layout  \
-    ns/lib/libcnv  \
-    ns/lib/libi18n  \
-    ns/lib/liblayer  \
-    ns/lib/libmisc  \
-    ns/lib/libmime  \
-    ns/lib/libmocha \
-    ns/lib/libnet  \
-    ns/lib/libparse  \
-    ns/lib/libpics  \
-    ns/lib/libpwcac  \
-    ns/lib/libstyle  \
-    ns/lib/plugin  \
-    ns/lib/xlate \
-    ns/lib/xp  \
-    ns/modules/edtplug/classes  \
-    ns/modules/edtplug/src  \
-    ns/modules/edtplug/include \
-    ns/modules/libfont/classes  \
-    ns/modules/libfont/public  \
-    ns/modules/libfont/src  \
-    ns/modules/libhook  \
-    ns/modules/libimg  \
-    ns/modules/libpref  \
-    ns/modules/libreg  \
-    ns/modules/libutil  \
-    ns/modules/progress/src  \
-    ns/modules/rdf  \
-    ns/modules/schedulr  \
-    ns/modules/security/freenav  \
-    ns/modules/zlib/src  \
-    ns/nav-java/stubs  \
-    ns/nsprpub  \
-    ns/xpcom \
-    ns/l10n \
-    ns/nsprpub \
-    ns/dbm  \
-    ns/modules/schedulr
-
-MozillaWinOnly -a \
-    ns/client.mak  \
-    ns/cmd/makefile.win  \
-    ns/cmd/wincom  \
-    ns/cmd/winfe  \
-    ns/config  \
-    ns/lib/makefile.win  \
-    ns/modules/coreincl  \
-    ns/modules/edtplug/makefile.win  \
-    ns/makefile.win  \
-    ns/modules/libfont/jmcgen  \
-    ns/modules/libfont/makefile.win  \
-    ns/modules/libfont/producers/makefile.win  \
-    ns/modules/libfont/producers/win  \
-    ns/modules/libfont/producers/win/classes  \
-    ns/modules/libfont/producers/win/classes/netscape  \
-    ns/modules/libfont/producers/win/classes/netscape/fonts  \
-    ns/modules/libfont/producers/win/src  \
-    ns/modules/makefile.win  \
-    ns/modules/progress/makefile.win  \
-    ns/modules/progress/public  \
-    ns/modules/security/makefile.win  \
-    ns/modules/zlib/makefile.win  \
-    ns/nav-java/makefile.win  \
-    JavaStubWin
-
-
-MozillaUnixOnly -a \
-    ns/cmd/Makefile  \
-    ns/cmd/stubfe  \
-    ns/cmd/xfe  \
-    ns/config/.cvsignore  \
-    ns/config/AIX.mk  \
-    ns/config/BSD_OS.mk  \
-    ns/config/bsdecho.c  \
-    ns/config/bsdecho.c  \
-    ns/config/clobber_miss.pl  \
-    ns/config/clobber_miss.pl  \
-    ns/config/common.mk  \
-    ns/config/common.mk  \
-    ns/config/config.guess  \
-    ns/config/config.mk  \
-    ns/config/coreconf.mk  \
-    ns/config/coreconf.mk  \
-    ns/config/cvsco.pl  \
-    ns/config/cvsco.pl  \
-    ns/config/fastcwd.pl  \
-    ns/config/fastcwd.pl  \
-    ns/config/FreeBSD.mk  \
-    ns/config/gtscc.c  \
-    ns/config/HP-UX.mk  \
-    ns/config/IRIX.mk  \
-    ns/config/Linux.mk  \
-    ns/config/makecopy.c  \
-    ns/config/makecopy.c  \
-    ns/config/Makefile  \
-    ns/config/Makefile  \
-    ns/config/mangle.c  \
-    ns/config/mangle.c  \
-    ns/config/mantomak.c  \
-    ns/config/mantomak.c  \
-    ns/config/mkdepend  \
-    ns/config/NCR.mk  \
-    ns/config/NEC.mk  \
-    ns/config/NEWS-OS.mk  \
-    ns/config/NEXTSTEP.mk  \
-    ns/config/nfspwd.pl  \
-    ns/config/nfspwd.pl  \
-    ns/config/nodl.pl  \
-    ns/config/nodl.pl  \
-    ns/config/nsinstall.c  \
-    ns/config/nsinstall.c  \
-    ns/config/OSF1.mk  \
-    ns/config/outofdate.pl  \
-    ns/config/outofdate.pl  \
-    ns/config/pathsub.c  \
-    ns/config/pathsub.c  \
-    ns/config/pathsub.h  \
-    ns/config/pathsub.h  \
-    ns/config/pkg2dpth.pl  \
-    ns/config/pkg2dpth.pl  \
-    ns/config/ports  \
-    ns/config/revdepth.pl  \
-    ns/config/revdepth.pl  \
-    ns/config/Rhapsody.mk  \
-    ns/config/rules.mk  \
-    ns/config/SCOOS.mk  \
-    ns/config/SINIX.mk  \
-    ns/config/sj.pl  \
-    ns/config/sj.pl  \
-    ns/config/SunOS.mk  \
-    ns/config/SunOS4.mk  \
-    ns/config/SunOS5.mk  \
-    ns/config/UNIXWARE.mk  \
-    ns/config/xmversion.sh  \
-    ns/lib/Makefile  \
-    ns/Makefile  \
-    ns/modules/edtplug/Makefile  \
-    ns/modules/libfont/jmcgen  \
-    ns/modules/libfont/Makefile  \
-    ns/modules/libfont/producers/Makefile  \
-    ns/modules/Makefile  \
-    ns/modules/progress/Makefile  \
-    ns/modules/progress/public  \
-    ns/modules/security/Makefile  \
-    ns/modules/zlib/Makefile  \
-    ns/nav-java/Makefile  \
-    ns/lib/mariner  \
-    JavaStubUnix
-
-
-MozillaMacOnly -a \
-    ns/cmd/macfe \
-    ns/lib/mac/AutoAdmin  \
-    ns/lib/mac/Includes  \
-    ns/lib/mac/MacMemoryAllocator  \
-    ns/lib/mac/Misc  \
-    ns/lib/mac/MoreFiles  \
-    ns/lib/mac/NSRuntime  \
-    ns/lib/mac/NSStdLib  \
-    ns/lib/mac/patches  \
-    ns/lib/mac/PowerPlant  \
-    ns/lib/mac/UserInterface  \
-    ns/modules/coreincl  \
-    ns/modules/edtplug/macbuild  \
-    ns/modules/libfont/jmcgen/include  \
-    ns/modules/libfont/jmcgen/src  \
-    ns/modules/libfont/macbuild  \
-    ns/modules/progress/macbuild  \
-    ns/modules/progress/public  \
-    ns/modules/zlib/macbuild  \
-    ns/lib/mariner  \
-    JavaStubMac
-
-JavaStubAll -a \
-	JavaStubWin \
-	JavaStubMac \
-	JavaStubUnix
-
-JavaStubCore -a \
-	ns/sun-java/stubs/include \
-	ns/sun-java/stubs/src
-
-JavaStubMac -a \
-	JavaStubCore \
-	ns/sun-java/stubs/macbuild \
-	ns/sun-java/stubs/macjri
-
-JavaStubUnix -a \
-	JavaStubCore \
-	ns/sun-java/Makefile \
-	ns/sun-java/stubs/jri \
-	ns/sun-java/stubs/Makefile
-
-JavaStubWin -a \
-	JavaStubCore \
-	ns/sun-java/makefile.win \
-	ns/sun-java/stubs/jri \
-	ns/sun-java/stubs/makefile.win
-
-
-

mozilla/LEGAL

@@ -1,15 +1,18 @@
 Please be apprised of the following Legal Notices:
 
-A) Wang contends that its U.S. Patent No. 4, 751,669 ("the '669
-Patent") disclosing a "video text" 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 based on mime types (performed in
-Windows OS) --See Claim 38.  Netscape believes the '669 Patent is
-invalid and non-infringed. Netscape is vigorously defending against
-Wang's claims.
+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

mozilla/Makefile

@@ -1,83 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-#
-
-DEPTH		= .
-
-NSPRDIR		= nsprpub
-NSPR20		= 1
-MOZILLA_CLIENT	= 1
-
-ifndef NO_MOCHA
-DIRS_JS		= js
-endif
-
-DIRS		= config coreconf $(NSPRDIR) jpeg dbm xpcom
-
-ifdef MOZ_NETCAST
-DIRS		+= netcast
-endif
-
-ifdef MOZ_JAVA
-DIRS		+= sun-java ldap ifc $(DIRS_JS) nav-java ifc/tools js/jsd
-else
-DIRS		+= sun-java nav-java $(DIRS_JS)
-endif
-
-ifndef NO_SECURITY
-DIRS		+= security
-endif
-
-DIRS		+= modules lib l10n cmd
-
-ifeq ($(STAND_ALONE_JAVA),1)
-DIRS		= config lib/xp $(NSPRDIR) jpeg modules/zlib sun-java ifc js ifc/tools sun-java/java
-endif
-
-include $(DEPTH)/config/rules.mk
-
-export:: $(OBJS)
-
-# Running this rule assembles all the SDK source pieces into dist/sdk.
-# You'll need to run this rule on every platform to get all the
-# binaries (e.g. javah) copied there. You'll also have to do special
-# magic on a Mac.
-sdk-src::
-	$(SDKINSTALL) include/npapi.h $(SDK)/include/
-	$(SDKINSTALL) include/jri_md.h $(SDK)/include/
-	$(SDKINSTALL) include/jritypes.h $(SDK)/include/
-	$(SDKINSTALL) include/jri.h $(SDK)/include/
-	$(SDKINSTALL) lib/plugin/npupp.h $(SDK)/include/
-	$(SDKINSTALL) sdk/common/*.c* $(SDK)/common/
-	$(SDKINSTALL) sun-java/classsrc/$(ZIP_NAME).x $(SDK)/classes/$(ZIP_NAME)
-	$(SDKINSTALL) sdk/examples/simple/Source/*.c $(SDK)/examples/simple/Source/
-	$(SDKINSTALL) sdk/examples/simple/Source/*.java $(SDK)/examples/simple/Source/
-	$(SDKINSTALL) sdk/examples/simple/Source/*.class $(SDK)/examples/simple/Source/
-	$(SDKINSTALL) sdk/examples/simple/Source/_gen/*.h $(SDK)/examples/simple/Source/_gen/
-	$(SDKINSTALL) sdk/examples/simple/Source/_stubs/*.c $(SDK)/examples/simple/Source/_stubs/
-	$(SDKINSTALL) sdk/examples/simple/Unix/makefile.* $(SDK)/examples/simple/Unix/
-	$(SDKINSTALL) sdk/examples/simple/Testing/SimpleExample.html $(SDK)/examples/simple/Testing/
-	$(SDKINSTALL) sdk/examples/simple/readme.html $(SDK)/examples/simple/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/*.c $(SDK)/examples/UnixTemplate/Source/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Testing/Test.html $(SDK)/examples/UnixTemplate/Testing/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Unix/makefile.* $(SDK)/examples/UnixTemplate/Unix/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/readme.html $(SDK)/examples/UnixTemplate/
-
-sdk-bin::
-	cd sdk; $(MAKE); cd ..
-	$(SDKINSTALL) $(DIST)/bin/javah$(BIN_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
-	$(SDKINSTALL) sdk/examples/simple/Source/$(OBJDIR)/npsimple.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/
-	$(SDKINSTALL) sdk/examples/UnixTemplate/Source/$(OBJDIR)/nptemplate.$(DLL_SUFFIX) $(SDK)/bin/$(OS_CONFIG)/

mozilla/base/Makefile

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

mozilla/base/makefile.win

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

mozilla/base/public/MANIFEST

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

mozilla/base/public/Makefile

@@ -0,0 +1,30 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+
+DEFINES = -D_IMPL_NS_BASE
+
+EXPORTS =		\
+    nsISizeOfHandler.h	\
+    $(NULL)
+
+MODULE = raptor
+
+include $(DEPTH)/config/config.mk
+
+include $(DEPTH)/config/rules.mk

mozilla/base/public/makefile.win

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

mozilla/base/public/nsISizeOfHandler.h

@@ -0,0 +1,66 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsISizeOfHandler_h___
+#define nsISizeOfHandler_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+/* c028d1f0-fc9e-11d1-89e4-006008911b81 */
+#define NS_ISIZEOF_HANDLER_IID \
+{ 0xc028d1f0, 0xfc9e, 0x11d1, {0x89, 0xe4, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81}}
+
+/**
+ * An API to managing a sizeof computation of an arbitrary graph.
+ * The handler is responsible for remembering which objects have been
+ * seen before. Note that the handler doesn't hold references to
+ * nsISupport's objects; the assumption is that the objects being
+ * sized are stationary and will not be modified during the sizing
+ * computation and therefore do not need an extra reference count.
+ */
+class nsISizeOfHandler : public nsISupports {
+public:
+  /**
+   * Add in a simple size value to the running total.
+   * Always returns NS_OK.
+   */
+  NS_IMETHOD Add(size_t aSize) = 0;
+
+  /**
+   * Update aResult with PR_TRUE if the object has been traversed
+   * by the sizeof computation before. Otherwise aResult is set to
+   * PR_FALSE and the object is added to the internal database
+   * of objects that have been traversed. It's ok to pass a null
+   * pointer in; aResult will be set to PR_TRUE so you won't accidently
+   * try to traverse through null pointer.
+   *
+   * Note: This violates the COM API standard on purpose; so there!
+   */
+  virtual PRBool HaveSeen(void* anObject) = 0;
+
+  /**
+   * Return the currently computed size.
+   * Always returns NS_OK.
+   */
+  NS_IMETHOD GetSize(PRUint32& aResult) = 0;
+};
+
+extern NS_BASE nsresult
+NS_NewSizeOfHandler(nsISizeOfHandler** aInstancePtrResult);
+
+#endif /* nsISizeofHandler_h___ */

mozilla/base/src/MANIFEST

@@ -0,0 +1,22 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+nscore.h
+nsIArena.h
+nsIAtom.h
+nsIByteBuffer.h
+nsBTree.h
+nsCRT.h
+nsDeque.h
+nsITimer.h
+nsITimerCallback.h
+nsIUnicharBuffer.h
+nsRBTree.h
+nsIUnicharInputStream.h
+nsString.h
+nsVoidArray.h
+nsUnitConversion.h
+nsIBaseStream.h
+nsIInputStream.h
+nsIOutputStream.h

mozilla/base/src/Makefile

@@ -0,0 +1,70 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+
+DEFINES =-D_IMPL_NS_BASE
+
+DIRS = unix
+
+LIBRARY_NAME = raptorbase
+
+CPPSRCS =                       \
+    nsArena.cpp                 \
+    nsAtomTable.cpp             \
+    nsBTree.cpp                 \
+    nsByteBuffer.cpp            \
+    nsCRT.cpp                   \
+    nsDeque.cpp                 \
+    nsRBTree.cpp                \
+    nsSizeOfHandler.cpp		\
+    nsString.cpp                \
+    nsUnicharBuffer.cpp         \
+    nsUnicharInputStream.cpp    \
+    nsVoidArray.cpp             \
+    $(NULL)
+
+EXPORTS =                       \
+    nscore.h                    \
+    nsBTree.h                   \
+    nsCRT.h                     \
+    nsDeque.h                   \
+    nsIArena.h                  \
+    nsIAtom.h                   \
+    nsIByteBuffer.h             \
+    nsIBaseStream.h             \
+    nsIInputStream.h            \
+    nsIOutputStream.h           \
+    nsITimer.h                  \
+    nsITimerCallback.h          \
+    nsIUnicharBuffer.h          \
+    nsIUnicharInputStream.h     \
+    nsRBTree.h                  \
+    nsString.h                  \
+    nsVoidArray.h               \
+    nsUnitConversion.h          \
+    $(NULL)
+
+MODULE = raptor
+
+REQUIRES = xpcom netlib raptor
+
+include $(DEPTH)/config/config.mk
+
+TARGET = $(LIBARY)
+
+include $(DEPTH)/config/rules.mk

mozilla/base/src/mac/nsTimerMac.cpp

@@ -0,0 +1,283 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+ 
+//
+// Mac implementation of the nsITimer interface
+//
+
+// nsMacTimerPeriodical idles, 
+
+
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include "prlog.h"
+#include <LPeriodical.h>
+#include <LArray.h>
+#include <LArrayIterator.h>
+#include <LComparator.h>
+
+#pragma mark class TimerImpl
+//
+// TimerImpl implements nsITimer API
+// 
+class TimerImpl : public nsITimer 
+{
+	private:
+		nsTimerCallbackFunc mCallbackFunc;
+		nsITimerCallback * mCallbackObject;
+  	void * mClosure;
+  	PRUint32 mDelay;
+  	UInt32 mFireTime;	// Timer should fire when TickCount >= this number
+	
+	public:
+
+	// constructors
+
+	  TimerImpl();
+
+	  virtual ~TimerImpl(){};
+
+	 	NS_DECL_ISUPPORTS
+
+		UInt32 GetFireTime() { return mFireTime; }
+
+		void Fire();
+
+	// nsITimer overrides
+
+	  virtual nsresult Init(nsTimerCallbackFunc aFunc,
+	                        void *aClosure,
+	                        PRUint32 aDelay);
+
+		virtual nsresult Init(nsITimerCallback *aCallback,
+	                        PRUint32 aDelay);
+
+	  virtual void Cancel();
+
+	  virtual PRUint32 GetDelay();
+
+	  virtual void SetDelay(PRUint32 aDelay);
+	
+	private:
+	// Calculates mFireTime too
+		void SetDelaySelf( PRUint32 aDelay );
+};
+
+#pragma mark class TimerPeriodical
+//
+// TimerPeriodical is a singleton LPeriodical subclass that fires
+// off TimerImpl. The firing is done on idle
+// 
+class TimerPeriodical	: public LPeriodical
+{
+		static TimerPeriodical * gPeriodical;
+		
+		LArray * mTimers;	// List of TimerImpl *
+	
+	public:
+		// Returns the singleton instance
+		static TimerPeriodical * GetPeriodical();
+
+		TimerPeriodical();
+
+		virtual ~TimerPeriodical();
+		
+		nsresult AddTimer( TimerImpl * aTimer);
+		
+		nsresult RemoveTimer( TimerImpl * aTimer);
+
+		virtual	void	SpendTime( const EventRecord &inMacEvent);
+};
+
+#pragma mark class TimerImplComparator
+// 
+// TimerImplComparator compares two TimerImpl
+//
+class TimerImplComparator	: public LComparator
+{
+	virtual Int32		Compare(
+								const void*			inItemOne,
+								const void* 		inItemTwo,
+								Uint32				inSizeOne,
+								Uint32				inSizeTwo) const;
+};
+
+
+// 
+// TimerImpl implementation
+//
+
+static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
+NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
+
+TimerImpl::TimerImpl()
+{
+	NS_INIT_REFCNT();
+	mCallbackFunc = NULL;
+	mCallbackObject = NULL;
+	mClosure = NULL;
+	mDelay = 0;
+	mFireTime = 0;
+}
+
+nsresult TimerImpl::Init(nsTimerCallbackFunc aFunc,
+	                        void *aClosure,
+	                        PRUint32 aDelay)
+{
+	mCallbackFunc = aFunc;
+	mClosure = aClosure;
+	SetDelaySelf(aDelay);
+	return TimerPeriodical::GetPeriodical()->AddTimer(this);
+}
+
+nsresult TimerImpl::Init(nsITimerCallback *aCallback,
+	                        PRUint32 aDelay)
+{
+	mCallbackObject = aCallback;
+	SetDelaySelf(aDelay);
+	return TimerPeriodical::GetPeriodical()->AddTimer(this);
+}
+
+void TimerImpl::Cancel()
+{
+	TimerPeriodical::GetPeriodical()->RemoveTimer(this);
+}
+
+PRUint32 TimerImpl::GetDelay()
+{
+	return mDelay;
+}
+
+void TimerImpl::SetDelay(PRUint32 aDelay)
+{
+	SetDelaySelf(aDelay);
+	// Make sure that timer was sorted
+	NS_ADDREF(this);
+	TimerPeriodical::GetPeriodical()->RemoveTimer(this);
+	TimerPeriodical::GetPeriodical()->AddTimer(this);
+	NS_RELEASE(this);
+}
+
+void TimerImpl::Fire()
+{
+	if (mCallbackFunc != NULL) {
+		(*mCallbackFunc)(this, mClosure);
+  }
+  else if (mCallbackObject != NULL) {
+    mCallbackObject->Notify(this); // Fire the timer
+  }
+}
+
+void TimerImpl::SetDelaySelf( PRUint32 aDelay )
+{
+	mDelay = aDelay;
+	mFireTime = TickCount() + mDelay / 100 * 6;	// We need mFireTime in ticks, 1/60th of a second
+}
+
+TimerPeriodical * TimerPeriodical::gPeriodical = NULL;
+
+TimerPeriodical * TimerPeriodical::GetPeriodical()
+{
+	if (gPeriodical == NULL)
+		gPeriodical = new TimerPeriodical();
+	return gPeriodical;
+}
+
+TimerPeriodical::TimerPeriodical()
+{
+	mTimers = new LArray( sizeof(TimerImpl*));
+	mTimers->SetComparator( new TimerImplComparator());
+	mTimers->SetKeepSorted( true );
+}
+
+TimerPeriodical::~TimerPeriodical()
+{
+	PR_ASSERT(mTimers->GetCount() == 0);
+	delete mTimers;
+}
+
+nsresult TimerPeriodical::AddTimer( TimerImpl * aTimer)
+{
+	try
+	{
+		NS_ADDREF(aTimer);
+		mTimers->AddItem( aTimer );
+		StartRepeating();
+	}
+	catch(...)
+	{
+		return NS_ERROR_UNEXPECTED;
+	}
+	return NS_OK;
+}
+
+nsresult TimerPeriodical::RemoveTimer( TimerImpl * aTimer)
+{
+	mTimers->Remove( aTimer );
+	NS_RELEASE( aTimer );
+	if ( mTimers->GetCount() == 0 )
+		StopRepeating();
+	return NS_OK;
+}
+
+// Called through every event loop
+// Loops through the list of available timers, and 
+// fires off the available ones
+void	TimerPeriodical::SpendTime( const EventRecord &inMacEvent)
+{
+	LArrayIterator iter( *mTimers, LArrayIterator::from_Start);
+	TimerImpl * timer;
+	while (iter.Next( &timer))
+	{
+		if ( timer->GetFireTime() <= inMacEvent.when )
+		{
+			NS_ADDREF(timer);
+			RemoveTimer(timer);
+			timer->Fire();
+			NS_RELEASE(timer);
+		}
+		else
+			break;	// Items are sorted, so we do not need to iterate until the end
+	}
+}
+
+//
+//  class TimerImplComparator implementation
+//
+Int32 TimerImplComparator::Compare(
+								const void*			inItemOne,
+								const void* 		inItemTwo,
+								Uint32				inSizeOne,
+								Uint32				inSizeTwo) const
+{
+	return (( TimerImpl *) inItemOne)->GetFireTime() - (( TimerImpl *) inItemTwo)->GetFireTime();
+}
+								
+NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+{
+    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
+    if (nsnull == aInstancePtrResult) {
+      return NS_ERROR_NULL_POINTER;
+    }  
+    TimerImpl *timer = new TimerImpl();
+    if (nsnull == timer) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
+}

mozilla/base/src/makefile.win

@@ -0,0 +1,99 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..
+IGNORE_MANIFEST=1
+
+DIRS = windows
+
+DEFINES=-D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN
+LIBRARY_NAME=raptorbase 
+
+CPPSRCS =				\
+	nsArena.cpp			\
+	nsAtomTable.cpp			\
+	nsBTree.cpp			\
+	nsByteBuffer.cpp		\
+	nsCRT.cpp			\
+	nsDeque.cpp			\
+	nsRBTree.cpp			\
+	nsSizeOfHandler.cpp		\
+	nsString.cpp			\
+	nsUnicharBuffer.cpp		\
+	nsUnicharInputStream.cpp	\
+	nsVoidArray.cpp			\
+	$(NULL)
+
+CPP_OBJS =					\
+	.\$(OBJDIR)\nsArena.obj			\
+	.\$(OBJDIR)\nsAtomTable.obj		\
+	.\$(OBJDIR)\nsBTree.obj			\
+	.\$(OBJDIR)\nsByteBuffer.obj		\
+	.\$(OBJDIR)\nsCRT.obj			\
+	.\$(OBJDIR)\nsDeque.obj			\
+	.\$(OBJDIR)\nsRBTree.obj		\
+	.\$(OBJDIR)\nsSizeOfHandler.obj		\
+	.\$(OBJDIR)\nsString.obj		\
+	.\$(OBJDIR)\nsUnicharBuffer.obj		\
+	.\$(OBJDIR)\nsUnicharInputStream.obj	\
+	.\$(OBJDIR)\nsVoidArray.obj		\
+	$(NULL)
+
+EXPORTS=nscore.h nsIArena.h nsIAtom.h nsIByteBuffer.h \
+    nsBTree.h nsCRT.h nsDeque.h nsITimer.h \
+    nsITimerCallback.h nsIUnicharBuffer.h nsRBTree.h \
+    nsIUnicharInputStream.h nsString.h nsVoidArray.h \
+    nsUnitConversion.h \
+    nsIBaseStream.h nsIInputStream.h nsIOutputStream.h
+
+MODULE=raptor 
+
+REQUIRES=xpcom netlib raptor 
+
+LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib \
+    -I$(PUBLIC)\raptor 
+
+MAKE_OBJ_TYPE = DLL
+DLLNAME = raptorbase
+DLL=.\$(OBJDIR)\$(DLLNAME).dll
+
+OBJS = $(OBJS) .\$(OBJDIR)\nsTimer.obj
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+# These are the libraries we need to link with to create the dll
+LLIBS=				\
+ $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\libplc21.lib       \
+ $(LIBNSPR)  
+!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
+LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
+!endif
+
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(DLL)
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
+	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib
+
+clobber::
+	rm -f $(DIST)\bin\$(DLLNAME).dll
+	rm -f $(DIST)\lib\$(DLLNAME).lib

mozilla/base/src/nsArena.cpp

@@ -0,0 +1,80 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIArena.h"
+#include "nsCRT.h"
+
+#define PL_ARENA_CONST_ALIGN_MASK 7
+#include "plarena.h"
+
+static NS_DEFINE_IID(kArenaIID, NS_IARENA_IID);
+
+// Simple arena implementation layered on plarena
+class ArenaImpl : public nsIArena {
+public:
+  ArenaImpl(PRInt32 aBlockSize);
+
+  NS_DECL_ISUPPORTS
+
+  virtual void* Alloc(PRInt32 aSize);
+
+protected:
+  ~ArenaImpl();
+
+  PLArenaPool mPool;
+  PRInt32 mBlockSize;
+};
+
+ArenaImpl::ArenaImpl(PRInt32 aBlockSize)
+{
+  NS_INIT_REFCNT();
+  if (aBlockSize < NS_MIN_ARENA_BLOCK_SIZE) {
+    aBlockSize = NS_DEFAULT_ARENA_BLOCK_SIZE;
+  }
+  PL_INIT_ARENA_POOL(&mPool, "nsIArena", aBlockSize);
+  mBlockSize = aBlockSize;
+}
+
+NS_IMPL_ISUPPORTS(ArenaImpl,kArenaIID)
+
+ArenaImpl::~ArenaImpl()
+{
+  PL_FinishArenaPool(&mPool);
+}
+
+void* ArenaImpl::Alloc(PRInt32 size)
+{
+  // Adjust size so that it's a multiple of sizeof(double)
+  PRInt32 align = size & (sizeof(double) - 1);
+  if (0 != align) {
+    size += sizeof(double) - align;
+  }
+
+  void* p;
+  PL_ARENA_ALLOCATE(p, &mPool, size);
+  return p;
+}
+
+NS_BASE nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
+                                 PRInt32 aArenaBlockSize)
+{
+  ArenaImpl* it = new ArenaImpl(aArenaBlockSize);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kArenaIID, (void **) aInstancePtrResult);
+}

mozilla/base/src/nsAtomTable.cpp

@@ -0,0 +1,154 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIAtom.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include "plhash.h"
+#include "nsISizeOfHandler.h"
+
+/**
+ * The shared hash table for atom lookups.
+ */
+static nsrefcnt gAtoms;
+static struct PLHashTable* gAtomHashTable;
+
+class AtomImpl : public nsIAtom {
+public:
+  AtomImpl();
+  ~AtomImpl();
+
+  NS_DECL_ISUPPORTS
+
+  void* operator new(size_t size, const PRUnichar* us, PRInt32 uslen);
+
+  virtual void ToString(nsString& aBuf) const;
+
+  virtual const PRUnichar* GetUnicode() const;
+
+  NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const;
+
+  // Actually more; 0 terminated. This slot is reserved for the
+  // terminating zero.
+  PRUnichar mString[1];
+};
+
+AtomImpl::AtomImpl()
+{
+  NS_INIT_REFCNT();
+  // Every live atom holds a reference on the atom hashtable
+  gAtoms++;
+}
+
+AtomImpl::~AtomImpl()
+{
+  NS_PRECONDITION(nsnull != gAtomHashTable, "null atom hashtable");
+  if (nsnull != gAtomHashTable) {
+    PL_HashTableRemove(gAtomHashTable, mString);
+    nsrefcnt cnt = --gAtoms;
+    if (0 == cnt) {
+      // When the last atom is destroyed, the atom arena is destroyed
+      NS_ASSERTION(0 == gAtomHashTable->nentries, "bad atom table");
+      PL_HashTableDestroy(gAtomHashTable);
+      gAtomHashTable = nsnull;
+    }
+  }
+}
+
+static NS_DEFINE_IID(kIAtomIID, NS_IATOM_IID);
+NS_IMPL_ISUPPORTS(AtomImpl, kIAtomIID);
+
+void* AtomImpl::operator new(size_t size, const PRUnichar* us, PRInt32 uslen)
+{
+  size = size + uslen * sizeof(PRUnichar);
+  AtomImpl* ii = (AtomImpl*) new char[size];
+  nsCRT::memcpy(ii->mString, us, uslen * sizeof(PRUnichar));
+  ii->mString[uslen] = 0;
+  return ii;
+}
+
+void AtomImpl::ToString(nsString& aBuf) const
+{
+  aBuf.SetLength(0);
+  aBuf.Append(mString, nsCRT::strlen(mString));
+}
+
+const PRUnichar* AtomImpl::GetUnicode() const
+{
+  return mString;
+}
+
+NS_IMETHODIMP
+AtomImpl::SizeOf(nsISizeOfHandler* aHandler) const
+{
+  aHandler->Add(sizeof(*this) + nsCRT::strlen(mString) * sizeof(PRUnichar));
+  return NS_OK;
+}
+
+//----------------------------------------------------------------------
+
+static PLHashNumber HashKey(const PRUnichar* k)
+{
+  return (PLHashNumber) nsCRT::HashCode(k);
+}
+
+static PRIntn CompareKeys(const PRUnichar* k1, const PRUnichar* k2)
+{
+  return nsCRT::strcmp(k1, k2) == 0;
+}
+
+NS_BASE nsIAtom* NS_NewAtom(const char* isolatin1)
+{
+  nsAutoString tmp(isolatin1);
+  return NS_NewAtom(tmp.GetUnicode());
+}
+
+NS_BASE nsIAtom* NS_NewAtom(const nsString& aString)
+{
+  return NS_NewAtom(aString.GetUnicode());
+}
+
+NS_BASE nsIAtom* NS_NewAtom(const PRUnichar* us)
+{
+  if (nsnull == gAtomHashTable) {
+    gAtomHashTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
+                                     (PLHashComparator) CompareKeys,
+                                     (PLHashComparator) nsnull,
+                                     nsnull, nsnull);
+  }
+  PRInt32 uslen;
+  PRInt32 hashCode = nsCRT::HashCode(us, &uslen);
+  PLHashEntry** hep = PL_HashTableRawLookup(gAtomHashTable, hashCode, us);
+  PLHashEntry* he = *hep;
+  if (nsnull != he) {
+    nsIAtom* id = (nsIAtom*) he->value;
+    NS_ADDREF(id);
+    return id;
+  }
+  AtomImpl* id = new(us, uslen) AtomImpl();
+  PL_HashTableRawAdd(gAtomHashTable, hep, hashCode, id->mString, id);
+  NS_ADDREF(id);
+  return id;
+}
+
+NS_BASE nsrefcnt NS_GetNumberOfAtoms(void)
+{
+  if (nsnull != gAtomHashTable) {
+    NS_PRECONDITION(nsrefcnt(gAtomHashTable->nentries) == gAtoms, "bad atom table");
+  }
+  return gAtoms;
+}

mozilla/base/src/nsBTree.cpp

@@ -0,0 +1,402 @@
+
+/**
+ * This file defines the binary tree class and it
+ * nsNode child class.
+ *
+ * This simple version stores nodes, and the
+ * nodes store void* ptrs.
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+
+#include "nsBTree.h"
+
+/**
+ * default constructor
+ * 
+ * @update gess 4/11/98
+ */
+nsNode::nsNode(){
+  mLeft=0;
+  mRight=0;
+  mParent=0;
+  mColor=eBlack;
+}
+
+
+/**
+ * Copy constructor
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+nsNode::nsNode(const nsNode& aNode){
+  mLeft=aNode.mLeft;
+  mRight=aNode.mRight;
+  mParent=aNode.mParent;
+  mColor=aNode.mColor;
+}
+
+/**
+ * destructor
+ * 
+ * @update gess 4/11/98
+ */
+nsNode::~nsNode(){
+}
+
+/**
+ * Retrive ptr to parent node
+ * 
+ * @update gess 4/11/98
+ * @return ptr to parent node
+ */
+nsNode* nsNode::GetParentNode(void) const{
+  return mParent;
+}
+
+/**
+ * Retrieve ptr to left (less) node
+ * 
+ * @update gess 4/11/98
+ * @return ptr to left (may be NULL)
+ */
+nsNode* nsNode::GetLeftNode(void) const{
+  return mLeft;
+}
+
+/**
+ * Retrieve ptr to right (more) node
+ * 
+ * @update gess 4/11/98
+ * @return ptr to right node (may be NULL)
+ */
+nsNode* nsNode::GetRightNode(void) const{
+  return mRight;
+}
+
+
+/**
+ * 
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+nsNode& nsNode::operator=(const nsNode& aNode){
+  if(this!=&aNode){
+    mLeft=aNode.mLeft;
+    mRight=aNode.mRight;
+    mParent=aNode.mParent;
+    mColor=aNode.mColor;
+  }
+  return *this;
+}
+
+/********************************************************
+ * Here comes the BTREE class...
+ ********************************************************/
+
+/**
+ * nsBTree constructor
+ * 
+ * @update gess 4/11/98
+ */
+nsBTree::nsBTree(){
+  mRoot=0;
+}
+
+
+/**
+ * destructor
+ * 
+ * @update gess 4/11/98
+ */
+nsBTree::~nsBTree(){
+  if(mRoot){
+    //walk the tree and destroy the children.
+  }
+}
+  
+/**
+ * Given a node, we're supposed to add it into 
+ * our tree.
+ * 
+ * @update gess 4/11/98
+ * @param  aNode to be added to tree
+ * @return ptr to added node or NULL
+ */
+nsNode* nsBTree::Add(nsNode& aNode){
+
+  nsNode* node1=mRoot; //x
+  nsNode* node2=0;     //y
+  while(node1) {
+    node2=node1;
+    if(aNode<*node1)
+      node1=node1->mLeft;
+    else node1=node1->mRight;
+  }
+  aNode.mParent=node2;
+  if(!node2){
+    mRoot=&aNode;
+  }
+  else{
+    if(aNode<*node2)
+      node2->mLeft=&aNode;
+    else node2->mRight=&aNode;
+  }
+
+  return &aNode;
+}
+
+
+/**
+ * Removes given node from tree if present.
+ * 
+ * @update gess 4/11/98
+ * @param  aNode to be found and removed
+ * @return ptr to remove node, or NULL
+ */
+nsNode* nsBTree::Remove(nsNode& aNode){
+  nsNode* result=0;  
+  nsNode* node3=Find(aNode);
+
+  if(node3) {
+    nsNode* node1;
+    nsNode* node2;
+
+    if((!node3->mLeft) || (!node3->mRight))
+      node2=node3;
+    else node2=After(*node3);
+
+    if(node2->mLeft)
+      node1=node2->mLeft;
+    else node1=node2->mRight;
+
+    if(node1)
+      node1->mParent=node2->mParent;
+
+    if(node2->mParent) {
+      if(node2==node2->mParent->mLeft)
+        node2->mParent->mLeft=node1;
+      else node2->mParent->mRight=node1;
+    }
+    else mRoot=node1;
+
+    if(node2!=node3)
+      (*node3)==(*node2);
+
+    if(node2->mColor == nsNode::eBlack)
+      ReBalance(*node1);
+
+    delete node2;
+    result=&aNode;
+  }
+  return result;
+}
+
+/**
+ * Clears the tree of any data. 
+ * Be careful here if your objects are heap based!
+ * This method doesn't free the objects, so if you
+ * don't have your own pointers, they will become
+ * orphaned.
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return this
+ */
+nsBTree& nsBTree::Empty(nsNode* aNode) {
+  mRoot=0;
+  return *this;
+}
+
+/**
+ * This method destroys all the objects in the tree.
+ * WARNING: Never call this method on stored objects
+ *          that are stack-based!
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return this
+ */
+nsBTree& nsBTree::Erase(nsNode* aNode){
+//  nsNode* node1 =(aNode) ? aNode : mRoot;
+
+  if(aNode) {
+    Erase(aNode->mLeft);  //begin by walking left side
+    Erase(aNode->mRight); //then search right side
+    delete aNode;         //until a leaf, then delete
+  }
+  return *this;
+}
+
+/**
+ * Retrieve ptr to first node in tree
+ * 
+ * @update gess 4/11/98
+ * @return 
+ */
+nsNode* nsBTree::First(void) const{
+  if(mRoot)
+    return First(*mRoot);
+  return 0;
+}
+
+/**
+ * Retrive ptr to first node rel to given node
+ * 
+ * @update gess 4/11/98
+ * @param  node to begin scan from
+ * @return ptr to first node from given node or NULL
+ */
+nsNode* nsBTree::First(const nsNode& aNode) const{
+  nsNode* result=0;
+
+  if(mRoot) {
+    result=mRoot;
+    while(result->GetLeftNode()) {
+      result=result->GetLeftNode();
+    }
+  }
+  return result;
+}
+
+/**
+ * Retrive ptr to last node 
+ * 
+ * @update gess 4/11/98
+ * @return ptr to last node rel to root or NULL
+ */
+nsNode* nsBTree::Last(void) const{
+  if(mRoot)
+    return Last(*mRoot);
+  return 0;
+}
+
+/**
+ * Retrive ptr to last node rel to given node
+ * 
+ * @update gess 4/11/98
+ * @param  node to begin scan from
+ * @return ptr to first node from given node or NULL
+ */
+nsNode* nsBTree::Last(const nsNode& aNode) const{
+  nsNode* result=0;
+
+  if(mRoot) {
+    result=mRoot;
+    while(result->GetRightNode()) {
+      result=result->GetRightNode();
+    }
+  }
+  return result;
+}
+
+
+/**
+ * Retrive ptr to prior node rel to given node
+ * 
+ * @update gess 4/11/98
+ * @param  node to begin scan from
+ * @return ptr to prior node from given node or NULL
+ */
+nsNode* nsBTree::Before(const nsNode& aNode) const{
+  
+  if(aNode.GetLeftNode())
+    return Last(*aNode.GetLeftNode());
+
+  //otherwise...
+
+  nsNode* node1=(nsNode*)&aNode;
+  nsNode* node2=aNode.GetParentNode();
+  
+  while((node2) && (node1==node2->GetLeftNode())) {
+    node1=node2;
+    node2=node2->GetParentNode();
+  }
+  return node2;
+}
+
+
+/**
+ * Retrive ptr to next node rel to given node
+ * 
+ * @update gess 4/11/98
+ * @param  node to begin scan from
+ * @return ptr to next node from given node or NULL
+ */
+nsNode* nsBTree::After(const nsNode& aNode) const{
+  
+  if(aNode.GetRightNode())
+    return First(*aNode.GetRightNode());
+
+  //otherwise...
+
+  nsNode* node1=(nsNode*)&aNode;
+  nsNode* node2=aNode.GetParentNode();
+  
+  while((node2) && (node1==node2->GetRightNode())) {
+    node1=node2;
+    node2=node2->GetParentNode();
+  }
+
+  return node2;
+}
+
+/**
+ * Scan for given node
+ * 
+ * @update gess 4/11/98
+ * @param  node to find
+ * @return ptr to given node, or NULL
+ */
+nsNode* nsBTree::Find(const nsNode& aNode) const{
+  nsNode* result=mRoot;
+
+  while((result) && (!(aNode==(*result)))) {
+    if(aNode<*result)
+      result=result->mLeft;
+    else result=result->mRight;
+  }
+  return (nsNode*)result;
+}
+
+/**
+ * Rebalances tree around the given node. This only
+ * needs to be called after a node is deleted.
+ * This method does nothing for btrees, but is
+ * needed for RBTrees.
+ * 
+ * @update gess 4/11/98
+ * @param  aNode -- node to balance around
+ * @return this
+ */
+nsBTree& nsBTree::ReBalance(nsNode& aNode){
+  return *this;
+}
+
+
+/**
+ * 
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+const nsBTree& nsBTree::ForEach(nsNodeFunctor& aFunctor,nsNode* aNode) const{
+  nsNode* node1 =(aNode) ? aNode : mRoot;
+
+  if(node1) {
+    if(node1->mLeft)
+      ForEach(aFunctor,node1->mLeft);  //begin by walking left side
+    aFunctor(*node1);
+    if(node1->mRight)
+      ForEach(aFunctor,node1->mRight); //then search right side
+  }
+  return *this;
+}
+

mozilla/base/src/nsBTree.h

@@ -0,0 +1,283 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/** 
+ * This file defines the binary tree class and it
+ * nsNode child class. Note that like all nsBTree
+ * containers, this one does not automatically balance.
+ * (Find for random data, bad for pre-ordered data).
+ *
+ * This simple version stores nodes, and the
+ * nodes store void* ptrs.
+ * 
+ * @update gess 4/11/98
+ */
+
+
+/**
+ * nsNode
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+
+#ifndef _BTREE_H
+#define _BTREE_H
+
+#include "nscore.h"
+
+struct NS_BASE nsNode {
+
+  /**
+   * 
+   * @update	gess4/20/98
+   * @param 
+   * @return
+   */
+  nsNode();
+
+  /**
+   * Copy constructor
+   * @update gess 4/11/98
+   */  
+  nsNode(const nsNode& aNode);
+
+  /**
+   * destructor
+   * @update gess 4/11/98
+   */  
+  virtual ~nsNode();
+
+  /**
+   * Retrieve parent node
+   *
+   * @update gess 4/11/98
+   * @return 
+   */  
+  nsNode*  GetParentNode(void) const;
+
+  /**
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */  
+  nsNode*  GetLeftNode() const;
+
+  /**
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */  
+  nsNode*  GetRightNode() const;
+
+  /**
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */  
+  virtual nsNode& operator=(const nsNode& aNode);
+
+
+  /**
+   * This method gets called to determine which of 
+   * two nodes is less. When you create your own
+   * subclass of nsNode, this is the most important
+   * method for you to overload.
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */ 
+  virtual PRBool operator<(const nsNode& aNode) const=0;
+
+  /** 
+   * This method gets called to determine which of 
+   * two nodes is less. When you create your own
+   * subclass of nsNode, this is the most important
+   * method for you to overload.
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */ 
+  virtual PRBool operator==(const nsNode& aNode) const=0;
+
+  enum eRBColor {eRed,eBlack};
+
+  nsNode*   mParent;
+  nsNode*   mLeft;
+  nsNode*   mRight;
+  eRBColor  mColor;
+};
+
+/**
+ * The Nodefunctor class is used when you want to create
+ * callbacks between the nsRBTree and your generic code.
+ *
+ * @update	gess4/20/98
+ */
+class NS_BASE nsNodeFunctor {
+public:
+  virtual nsNodeFunctor& operator()(nsNode& aNode)=0;
+};
+
+
+/****************************************************
+ * Here comes the nsBTree class...
+ ****************************************************/
+
+class NS_BASE nsBTree {
+public:
+friend class nsBTreeIterator;
+  
+  nsBTree();
+  virtual ~nsBTree();
+
+  /** 
+   * Add given node reference into our tree.
+   * 
+   * @update gess 4/11/98
+   * @param  aNode is a ref to a node to be added
+   * @return newly added node
+   */ 
+  nsNode*  Add(nsNode& aNode);
+
+  /** 
+   * Remove given node reference into our tree.
+   * 
+   * @update gess 4/11/98
+   * @param  aNode is a ref to a node to be removed
+   * @return Ptr to node if found (and removed) or NULL
+   */ 
+  nsNode*  Remove(nsNode& aNode);
+
+  /**
+   * Clears the tree of any data. 
+   * Be careful here if your objects are heap based!
+   * This method doesn't free the objects, so if you
+   * don't have your own pointers, they will become
+   * orphaned.
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return this
+   */
+   nsBTree& Empty(nsNode* aNode=0);
+
+  /**
+   * This method destroys all the objects in the tree.
+   * WARNING: Never call this method on stored objects
+   *          that are stack-based!
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return this
+   */
+   nsBTree& Erase(nsNode* aNode=0);
+
+  /** 
+   * Retrieve ptr to 1st node in tree (starting at root)
+   * 
+   * @update gess 4/11/98
+   * @return ptr to 1st node, possible to be NULL
+   */ 
+  nsNode*  First(void) const;
+
+  /** 
+   * Find first node in tree starting at given node
+   * 
+   * @update gess 4/11/98
+   * @param  aNode node to begin 1st search from
+   * @return ptr to 1st node below given node
+   */ 
+  nsNode*  First(const nsNode& aNode) const;
+
+  /** 
+   * Retrieve ptr to last node in tree relative to root.
+   * 
+   * @update gess 4/11/98
+   * @return ptr to last node or NULL
+   */ 
+  nsNode* Last(void) const;
+
+  /** 
+   * Retrieve ptr to last node in tree relative to given node.
+   * 
+   * @update gess 4/11/98
+   * @param  node to find last node from 
+   * @return ptr to last node or NULL
+   */ 
+  nsNode* Last(const nsNode& aNode) const;
+
+  /** 
+   * Retrieve a ptr to the node that preceeds given node
+   * 
+   * @update gess 4/11/98
+   * @param  aNode used as reference to find prev. 
+   * @return ptr to prev node or NULL
+   */ 
+  nsNode*  Before(const nsNode& aNode) const;
+
+  /** 
+   * Retrieve a ptr to the node after given node
+   * 
+   * @update gess 4/11/98
+   * @param  aNode used as reference to find next. 
+   * @return ptr to next node or NULL
+   */ 
+  nsNode*  After(const nsNode& aNode) const;
+
+  /** 
+   * Find given node in tree.
+   * (Why would you want to find a node you already have?)
+   * 
+   * @update gess 4/11/98
+   * @param  aNode is the node you're searching for
+   * @return ptr to node if found, or NULL
+   */ 
+  nsNode*  Find(const nsNode& aNode) const;
+
+  /** 
+   * Walks the tree, starting with root.
+   * 
+   * @update gess 4/11/98
+   */ 
+  virtual const nsBTree& ForEach(nsNodeFunctor& aFunctor,nsNode* aNode=0) const;
+            
+protected:
+
+  /**
+   * Rebalances tree around the given node. This only
+   * needs to be called after a node is deleted.
+   * 
+   * @update gess 4/11/98
+   * @param  aNode -- node to balance around
+   * @return this
+   */
+  virtual nsBTree& ReBalance(nsNode& aNode);
+
+
+  nsNode*  mRoot;
+};
+
+#endif
+

mozilla/base/src/nsByteBuffer.cpp

@@ -0,0 +1,138 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIByteBuffer.h"
+#include "nsIInputStream.h"
+#include "nsCRT.h"
+
+#define MIN_BUFFER_SIZE 32
+
+class ByteBufferImpl : public nsIByteBuffer {
+public:
+  ByteBufferImpl(PRInt32 aBufferSize);
+  ~ByteBufferImpl();
+
+  NS_DECL_ISUPPORTS
+  virtual PRInt32 GetLength() const;
+  virtual PRInt32 GetBufferSize() const;
+  virtual char* GetBuffer() const;
+  virtual PRBool Grow(PRInt32 aNewSize);
+  virtual PRInt32 Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                       PRInt32 aKeep);
+
+  char* mBuffer;
+  PRInt32 mSpace;
+  PRInt32 mLength;
+};
+
+ByteBufferImpl::ByteBufferImpl(PRInt32 aBufferSize)
+{
+  if (PRUint32(aBufferSize) < MIN_BUFFER_SIZE) {
+    aBufferSize = MIN_BUFFER_SIZE;
+  }
+  mSpace = aBufferSize;
+  mBuffer = new char[aBufferSize];
+  mLength = 0;
+  NS_INIT_REFCNT();
+}
+
+NS_DEFINE_IID(kByteBufferIID,NS_IBYTE_BUFFER_IID);
+NS_IMPL_ISUPPORTS(ByteBufferImpl,kByteBufferIID)
+
+ByteBufferImpl::~ByteBufferImpl()
+{
+  if (nsnull != mBuffer) {
+    delete mBuffer;
+    mBuffer = nsnull;
+  }
+  mLength = 0;
+}
+
+PRInt32 ByteBufferImpl::GetLength() const
+{
+  return mLength;
+}
+
+PRInt32 ByteBufferImpl::GetBufferSize() const
+{
+  return mSpace;
+}
+
+char* ByteBufferImpl::GetBuffer() const
+{
+  return mBuffer;
+}
+
+PRBool ByteBufferImpl::Grow(PRInt32 aNewSize)
+{
+  if (PRUint32(aNewSize) < MIN_BUFFER_SIZE) {
+    aNewSize = MIN_BUFFER_SIZE;
+  }
+  char* newbuf = new char[aNewSize];
+  if (nsnull != newbuf) {
+    if (0 != mLength) {
+      nsCRT::memcpy(newbuf, mBuffer, mLength);
+    }
+    delete mBuffer;
+    mBuffer = newbuf;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+PRInt32 ByteBufferImpl::Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                             PRInt32 aKeep)
+{
+  NS_PRECONDITION(nsnull != aStream, "null stream");
+  NS_PRECONDITION(PRUint32(aKeep) <= PRUint32(mLength), "illegal keep count");
+  if ((nsnull == aStream) || (PRUint32(aKeep) > PRUint32(mLength))) {
+    // whoops
+    *aErrorCode = NS_BASE_STREAM_ILLEGAL_ARGS;
+    return -1;
+  }
+
+  if (0 != aKeep) {
+    // Slide over kept data
+    nsCRT::memmove(mBuffer, mBuffer + (mLength - aKeep), aKeep);
+  }
+
+  // Read in some new data
+  mLength = aKeep;
+  PRInt32 amount = mSpace - aKeep;
+  PRInt32 nb;
+  *aErrorCode = aStream->Read(mBuffer, aKeep, amount, &nb);
+  if (NS_SUCCEEDED(*aErrorCode)) {
+    mLength += nb;
+  }
+  else
+    nb = 0;
+  return nb;
+}
+
+NS_BASE nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
+                                  nsISupports* aOuter,
+                                  PRInt32 aBufferSize)
+{
+  if (nsnull != aOuter) {
+    return NS_ERROR_NO_AGGREGATION;
+  }
+  ByteBufferImpl* it = new ByteBufferImpl(aBufferSize);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kByteBufferIID, (void **) aInstancePtrResult);
+}

mozilla/base/src/nsCRT.cpp

@@ -0,0 +1,400 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */ 
+
+ 
+/**
+ * MODULE NOTES:
+ * @update  gess7/30/98
+ *
+ * Much as I hate to do it, we were using string compares wrong.
+ * Often, programmers call functions like strcmp(s1,s2), and pass
+ * one or more null strings. Rather than blow up on these, I've 
+ * added quick checks to ensure that cases like this don't cause
+ * us to fail.
+ *
+ * In general, if you pass a null into any of these string compare
+ * routines, we simply return 0.
+ */
+
+
+#include "nsCRT.h"
+
+// XXX Bug: These tables don't lowercase the upper 128 characters properly
+
+// This table maps uppercase characters to lower case characters;
+// characters that are neither upper nor lower case are unaffected.
+static const unsigned char kUpper2Lower[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64,
+
+    // upper band mapped to lower [A-Z] => [a-z]
+       97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,
+
+                                               91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+static const unsigned char kLower2Upper[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+   96,
+
+    // lower band mapped to upper [a-z] => [A-Z]
+       65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+
+                                              123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+static const PRUnichar kIsoLatin1ToUCS2[256] = {
+    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
+   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+   64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+   80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
+  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
+  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
+  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
+  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
+  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
+  192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,
+  208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,
+  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
+  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
+};
+
+//----------------------------------------------------------------------
+
+#define TOLOWER(_ucs2) \
+  (((_ucs2) < 256) ? PRUnichar(kUpper2Lower[_ucs2]) : _ToLower(_ucs2))
+
+#define TOUPPER(_ucs2) \
+  (((_ucs2) < 256) ? PRUnichar(kLower2Upper[_ucs2]) : _ToUpper(_ucs2))
+
+static PRUnichar _ToLower(PRUnichar aChar)
+{
+  // XXX need i18n code here
+  return aChar;
+}
+
+static PRUnichar _ToUpper(PRUnichar aChar)
+{
+  // XXX need i18n code here
+  return aChar;
+}
+
+//----------------------------------------------------------------------
+
+PRUnichar nsCRT::ToUpper(PRUnichar aChar)
+{
+  return TOUPPER(aChar);
+}
+
+PRUnichar nsCRT::ToLower(PRUnichar aChar)
+{
+  return TOLOWER(aChar);
+}
+
+PRInt32 nsCRT::strlen(const PRUnichar* s)
+{
+  PRInt32 len = 0;
+  if(s) {
+    while (*s++ != 0) {
+      len++;
+    }
+  }
+  return len;
+}
+
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null 
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcmp(const PRUnichar* s1, const PRUnichar* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = *s2++;
+      if (c1 != c2) {
+        if (c1 < c2) return -1;
+        return 1;
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null or nth char.
+ * NOTE: If either is null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const PRUnichar* s2, PRInt32 n)
+{
+  if(s1 && s2) { 
+    if(0<n) {
+      while (--n >= 0) {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = *s2++;
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+        if ((0==c1) || (0==c2)) break;
+      }
+    }
+    else return 1;
+  }
+  return 0;
+}
+
+
+/**
+ * Compare unichar string ptrs without regard to case
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const PRUnichar* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = *s2++;
+      if (c1 != c2) {
+        c1 = TOLOWER(c1);
+        c2 = TOLOWER(c2);
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Compare unichar string ptrs, stopping at the 1st null or nth char;
+ * also ignoring the case of characters.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 and s2 both point to unichar strings
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const PRUnichar* s2, PRInt32 n)
+{
+  if(s1 && s2) {
+    if(0<n){
+      while (--n >= 0) {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = *s2++;
+        if (c1 != c2) {
+          c1 = TOLOWER(c1);
+          c2 = TOLOWER(c2);
+          if (c1 != c2) {
+            if (c1 < c2) return -1;
+            return 1;
+          }
+        }
+        if ((0==c1) || (0==c2)) break;
+      }
+    } else return 1;
+  }
+  return 0;
+}
+
+
+/**
+ * Compare a unichar string ptr to cstring.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcmp(const PRUnichar* s1, const char* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+      if (c1 != c2) {
+        if (c1 < c2) return -1;
+        return 1;
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+
+/**
+ * Compare a unichar string ptr to cstring, up to N chars.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncmp(const PRUnichar* s1, const char* s2, PRInt32 n)
+{
+  if(s1 && s2) {
+    if(0<n){
+      while (--n >= 0) {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+        if ((0==c1) || (0==c2)) break;
+      }
+    } else return 1;
+  }
+  return 0;
+}
+
+/**
+ * Compare a unichar string ptr to cstring without regard to case
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strcasecmp(const PRUnichar* s1, const char* s2)
+{
+  if(s1 && s2) {
+    for (;;) {
+      PRUnichar c1 = *s1++;
+      PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+      if (c1 != c2) {
+        c1 = TOLOWER(c1);
+        c2 = TOLOWER(c2);
+        if (c1 != c2) {
+          if (c1 < c2) return -1;
+          return 1;
+        }
+      }
+      if ((0==c1) || (0==c2)) break;
+    }
+  }
+  return 0;
+}
+
+/**
+ * Caseless compare up to N chars between unichar string ptr to cstring.
+ * NOTE: If both are null, we return 0.
+ * @update  gess7/30/98
+ * @param   s1 points to unichar string
+ * @param   s2 points to cstring
+ * @return  0 if they match, -1 if s1<s2; 1 if s1>s2
+ */
+PRInt32 nsCRT::strncasecmp(const PRUnichar* s1, const char* s2, PRInt32 n)
+{
+  if(s1 && s2){
+    if(0<n){
+      while (--n >= 0) {
+        PRUnichar c1 = *s1++;
+        PRUnichar c2 = kIsoLatin1ToUCS2[*(const unsigned char*)s2++];
+        if (c1 != c2) {
+          c1 = TOLOWER(c1);
+          c2 = TOLOWER(c2);
+          if (c1 != c2) {
+            if (c1 < c2) return -1;
+            return 1;
+          }
+        }
+        if (c1 == 0) break;
+      }
+    } else return 1;
+  }
+  return 0;
+}
+
+PRInt32 nsCRT::HashCode(const PRUnichar* us)
+{
+  PRInt32 rv = 0;
+  if(us) {
+    PRUnichar ch;
+    while ((ch = *us++) != 0) {
+      // FYI: rv = rv*37 + ch
+      rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    }
+  }
+  return rv;
+}
+
+PRInt32 nsCRT::HashCode(const PRUnichar* us, PRInt32* uslenp)
+{
+  PRInt32 rv = 0;
+  PRInt32 len = 0;
+  PRUnichar ch;
+  while ((ch = *us++) != 0) {
+    // FYI: rv = rv*37 + ch
+    rv = ((rv << 5) + (rv << 2) + rv) + ch;
+    len++;
+  }
+  *uslenp = len;
+  return rv;
+}
+
+PRInt32 nsCRT::atoi( const PRUnichar *string )
+{
+  return atoi(string);
+}
+

mozilla/base/src/nsCRT.h

@@ -0,0 +1,115 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsCRT_h___
+#define nsCRT_h___
+
+#include <stdlib.h>
+#include <string.h>
+#include "plstr.h"
+#include "nscore.h"
+
+/// This is a wrapper class around all the C runtime functions. 
+
+class NS_BASE nsCRT {
+public:
+  /** Copy bytes from aSrc to aDest.
+    @param aDest the destination address
+    @param aSrc the source address
+    @param aCount the number of bytes to copy
+    */
+  static void memcpy(void* aDest, const void* aSrc, PRInt32 aCount) {
+    ::memcpy(aDest, aSrc, (size_t)aCount);
+  }
+
+  static void memmove(void* aDest, const void* aSrc, PRInt32 aCount) {
+    ::memmove(aDest, aSrc, (size_t)aCount);
+  }
+
+  static void memset(void* aDest, PRUint8 aByte, PRInt32 aCount) {
+    ::memset(aDest, aByte, aCount);
+  }
+
+  static void zero(void* aDest, PRInt32 aCount) {
+    ::memset(aDest, 0, (size_t)aCount);
+  }
+
+  /** Compute the string length of s
+   @param s the string in question
+   @return the length of s
+   */
+  static PRInt32 strlen(const char* s) {
+    return PRInt32(::strlen(s));
+  }
+
+  /// Compare s1 and s2.
+  static PRInt32 strcmp(const char* s1, const char* s2) {
+    return PRInt32(PL_strcmp(s1, s2));
+  }
+
+  /// Case-insensitive string comparison.
+  static PRInt32 strcasecmp(const char* s1, const char* s2) {
+    return PRInt32(PL_strcasecmp(s1, s2));
+  }
+
+  /// Case-insensitive string comparison with length
+  static PRInt32 strncasecmp(const char* s1, const char* s2, PRInt32 aMaxLen) {
+    return PRInt32(PL_strncasecmp(s1, s2, aMaxLen));
+  }
+
+  /// Like strlen except for ucs2 strings
+  static PRInt32 strlen(const PRUnichar* s);
+
+  /// Like strcmp except for ucs2 strings
+  static PRInt32 strcmp(const PRUnichar* s1, const PRUnichar* s2);
+  /// Like strcmp except for ucs2 strings
+  static PRInt32 strncmp(const PRUnichar* s1, const PRUnichar* s2,
+                         PRInt32 aMaxLen);
+
+  /// Like strcasecmp except for ucs2 strings
+  static PRInt32 strcasecmp(const PRUnichar* s1, const PRUnichar* s2);
+  /// Like strncasecmp except for ucs2 strings
+  static PRInt32 strncasecmp(const PRUnichar* s1, const PRUnichar* s2,
+                             PRInt32 aMaxLen);
+
+  /// Like strcmp with a char* and a ucs2 string
+  static PRInt32 strcmp(const PRUnichar* s1, const char* s2);
+  /// Like strncmp with a char* and a ucs2 string
+  static PRInt32 strncmp(const PRUnichar* s1, const char* s2,
+                         PRInt32 aMaxLen);
+
+  /// Like strcasecmp with a char* and a ucs2 string
+  static PRInt32 strcasecmp(const PRUnichar* s1, const char* s2);
+  /// Like strncasecmp with a char* and a ucs2 string
+  static PRInt32 strncasecmp(const PRUnichar* s1, const char* s2,
+                             PRInt32 aMaxLen);
+
+  /// Compute a hashcode for a ucs2 string
+  static PRInt32 HashCode(const PRUnichar* s1);
+
+  /// Same as above except that we return the length in s1len
+  static PRInt32 HashCode(const PRUnichar* s1, PRInt32* s1len);
+
+  /// String to integer.
+  static PRInt32 atoi( const PRUnichar *string );
+  
+  static PRUnichar ToUpper(PRUnichar aChar);
+
+  static PRUnichar ToLower(PRUnichar aChar);
+};
+
+#endif /* nsCRT_h___ */

mozilla/base/src/nsDeque.cpp

@@ -0,0 +1,477 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+
+#include "nsDeque.h"
+#include "nsCRT.h"
+
+/**
+ * Standard constructor
+ * @update	gess4/18/98
+ * @return  new deque
+ */
+nsDeque::nsDeque(nsDequeFunctor& aMemDestroyer) : mMemDestroyer(aMemDestroyer) {
+  mMemDestroyer=aMemDestroyer;
+  mCapacity=eGrowthDelta;
+  mOrigin=mSize=0;
+  mData=new void*[mCapacity];
+}
+
+
+/**
+ * Destructor
+ * @update	gess4/18/98
+ */
+nsDeque::~nsDeque() {
+  Erase();
+  delete [] mData;
+  mData=0;
+}
+
+
+/**
+ * Returns the number of elements currently stored in
+ * this deque.
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return  int contains element count
+ */ 
+PRInt32 nsDeque::GetSize(void) const {
+  return mSize;
+}
+
+/**
+ * Remove all items from container without destroying them.
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return
+ */
+nsDeque& nsDeque::Empty() {
+  nsCRT::zero(mData,mCapacity*sizeof(mData));
+  mSize=0;
+  mOrigin=0;
+  return *this;
+}
+
+/**
+ * Remove and delete all items from container
+ * 
+ * @update	gess4/18/98
+ * @return  this
+ */
+nsDeque& nsDeque::Erase() {
+  ForEach(mMemDestroyer);
+  return Empty();
+}
+
+
+/**
+ * This method adds an item to the end of the queue. 
+ * This operation has the potential to cause the 
+ * underlying buffer to resize.
+ *
+ * @update	gess4/18/98
+ * @param   anItem: new item to be added to queue
+ * @return  nada
+ */
+nsDeque& nsDeque::Push(void* anItem) {
+  if(mSize==mCapacity) {
+    void** temp=new void*[mCapacity+eGrowthDelta];
+
+    //Here's the interesting part: You can't just move the elements
+    //directy (in situ) from the old buffer to the new one.
+    //Since capacity has changed, the old origin doesn't make
+    //sense anymore. It's better to resequence the elements now.
+    
+    int tempi=0;
+    int i=0;
+    int j=0;
+    for(i=mOrigin;i<mCapacity;i++) temp[tempi++]=mData[i]; //copy the leading elements...
+    for(j=0;j<mOrigin;j++) temp[tempi++]=mData[j];         //copy the trailing elements...
+    mCapacity+=eGrowthDelta;
+    mOrigin=0;       //now realign the origin...
+    delete[]mData;
+    mData=temp;
+  }
+  int offset=mOrigin+mSize;
+  if(offset<mCapacity)
+    mData[offset]=anItem;
+  else mData[offset-mCapacity]=anItem;
+  mSize++;
+  return *this;
+}
+
+
+/**
+ * This method gets called you want to remove and return
+ * the first member in the container.
+ *
+ * @update	gess4/18/98
+ * @param   nada
+ * @return  last item in container
+ */
+void* nsDeque::Pop() {
+  void* result=0;
+  if(mSize>0) {
+    result=mData[mOrigin];
+    mData[mOrigin++]=0;     //zero it out for debugging purposes.
+    mSize--;
+    if(0==mSize)
+      mOrigin=0;
+  }
+  return result;
+}
+
+/**
+ * This method gets called you want to peek at the topmost
+ * member without removing it.
+ *
+ * @update	gess4/18/98
+ * @param   nada
+ * @return  last item in container
+ */
+void* nsDeque::Peek() {
+  void* result=0;
+  if(mSize>0) {
+    result=mData[mOrigin];
+  }
+  return result;
+}
+
+/**
+ * Remove and return the last item in the container.
+ * 
+ * @update	gess4/18/98
+ * @param   none
+ * @return  ptr to last item in container
+ */
+void* nsDeque::PopBack(void) {
+  void* result=0;
+  if(mSize>0) {
+    int offset=mOrigin+mSize;
+    if(offset>=mCapacity) 
+      offset-=mCapacity;
+    result=mData[offset-1];
+    mData[offset-1]=0;
+    mSize--;
+    if(0==mSize)
+      mOrigin=0;
+  }
+  return result;
+}
+
+/**
+ * Call this to retrieve the ith element from this container.
+ * Keep in mind that accessing the underlying elements is 
+ * done in a relative fashion. Object 0 is not necessarily
+ * the first element (the first element is at mOrigin).
+ *
+ * @update	gess4/18/98
+ * @param   anIndex : 0 relative offset of item you want
+ * @return  void* or null
+ */
+void* nsDeque::ObjectAt(PRInt32 anIndex) const {
+  void* result=0;
+
+  if((anIndex>=0) && (anIndex<mSize))
+  {
+    if(anIndex<(mCapacity-mOrigin)) {
+      result=mData[mOrigin+anIndex];
+    }
+    else {
+      result=mData[anIndex-(mCapacity-mOrigin)];
+    }
+  }
+  return result;
+}
+
+/**
+ * Create and return an iterator pointing to
+ * the beginning of the queue. Note that this
+ * takes the circular buffer semantics into account.
+ * 
+ * @update	gess4/18/98
+ * @return  new deque iterator, init'ed to 1st item
+ */
+nsDequeIterator nsDeque::Begin(void) const{
+  return nsDequeIterator(*this,0);
+}
+
+/**
+ * Create and return an iterator pointing to
+ * the last of the queue. Note that this
+ * takes the circular buffer semantics into account.
+ * 
+ * @update	gess4/18/98
+ * @return  new deque iterator, init'ed to last item
+ */
+nsDequeIterator nsDeque::End(void) const{
+  return nsDequeIterator(*this,mSize);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+const void nsDeque::ForEach(nsDequeFunctor& aFunctor) const{
+  int i=0;
+  for(i=0;i<mSize;i++){
+    void* obj=ObjectAt(i);
+    obj=aFunctor(obj);
+  }
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code. Iteration continues until your
+ * functor returns a non-null.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+const void* nsDeque::FirstThat(nsDequeFunctor& aFunctor) const{
+  int i=0;
+  for(i=0;i<mSize;i++){
+    void* obj=ObjectAt(i);
+    obj=aFunctor(obj);
+    if(obj)
+      return obj;
+  }
+  return 0;
+}
+
+
+/******************************************************
+ * Here comes the nsDequeIterator class...
+ ******************************************************/
+
+/**
+ * DequeIterator is an object that knows how to iterate (forward and backward)
+ * a Deque. Normally, you don't need to do this, but there are some special
+ * cases where it is pretty handy, so here you go.
+ *
+ * This is a standard dequeiterator constructor
+ *
+ * @update	gess4/18/98
+ * @param   aQueue is the deque object to be iterated
+ * @param   anIndex is the starting position for your iteration
+ */
+nsDequeIterator::nsDequeIterator(const nsDeque& aQueue,int anIndex):  mIndex(anIndex), mDeque(aQueue) {
+}
+
+/**
+ * Copy construct a new iterator beginning with given 
+ *
+ * @update	gess4/20/98
+ * @param   aCopy is another iterator to copy from
+ * @return
+ */
+nsDequeIterator::nsDequeIterator(const nsDequeIterator& aCopy) : mIndex(aCopy.mIndex), mDeque(aCopy.mDeque) {
+}
+
+/**
+ * Standard assignment operator for dequeiterator
+ *
+ * @update	gess4/18/98
+ * @param   aCopy is an iterator to be copied from
+ * @return  *this
+ */
+nsDequeIterator& nsDequeIterator::operator=(const nsDequeIterator& aCopy) {
+  //queue's are already equal.
+  mIndex=aCopy.mIndex;
+  return *this;
+}
+
+/**
+ * preform ! operation against to iterators to test for equivalence
+ * (or lack thereof)!
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the object to be compared to
+ * @return  TRUE if NOT equal.
+ */
+PRBool nsDequeIterator::operator!=(nsDequeIterator& anIter) {
+  return PRBool(!this->operator==(anIter));
+}
+
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator<(nsDequeIterator& anIter) {
+  return PRBool(((mIndex<anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator==(nsDequeIterator& anIter) {
+  return PRBool(((mIndex==anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Compare 2 iterators for equivalence.
+ *
+ * @update	gess4/18/98
+ * @param   anIter is the other iterator to be compared to
+ * @return  TRUE if EQUAL
+ */
+PRBool nsDequeIterator::operator>=(nsDequeIterator& anIter) {
+  return PRBool(((mIndex>=anIter.mIndex) && (&mDeque==&anIter.mDeque)));
+}
+
+/**
+ * Pre-increment operator 
+ *
+ * @update	gess4/18/98
+ * @return  object at preincremented index
+ */
+void* nsDequeIterator::operator++() {
+  return mDeque.ObjectAt(++mIndex);
+}
+
+/**
+ * Post-increment operator 
+ *
+ * @update	gess4/18/98
+ * @param   param is ignored
+ * @return  object at post-incremented index
+ */
+void* nsDequeIterator::operator++(int) {
+  return mDeque.ObjectAt(mIndex++);
+}
+
+/**
+ * Pre-decrement operator
+ *
+ * @update	gess4/18/98
+ * @return  object at pre-decremented index
+ */
+void* nsDequeIterator::operator--() {
+  return mDeque.ObjectAt(--mIndex);
+}
+
+/**
+ * Post-decrement operator
+ *
+ * @update	gess4/18/98
+ * @param   param is ignored
+ * @return  object at post-decremented index
+ */
+void* nsDequeIterator::operator--(int) {
+  return mDeque.ObjectAt(mIndex--);
+}
+
+/**
+ * Dereference operator
+ *
+ * @update	gess4/18/98
+ * @return  object at ith index
+ */
+void* nsDequeIterator::GetCurrent(void) {
+  return mDeque.ObjectAt(mIndex);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+const void nsDequeIterator::ForEach(nsDequeFunctor& aFunctor) const{
+  mDeque.ForEach(aFunctor);
+}
+
+/**
+ * Call this method when you wanto to iterate all the
+ * members of the container, passing a functor along
+ * to call your code.
+ *
+ * @update	gess4/20/98
+ * @param   aFunctor object to call for each member
+ * @return  *this
+ */
+const void* nsDequeIterator::FirstThat(nsDequeFunctor& aFunctor) const{
+  return mDeque.FirstThat(aFunctor);
+}
+
+/**
+ * conduct automated self test for this class
+ *
+ * @update	gess4/18/98
+ * @param 
+ * @return
+ */
+void nsDeque::SelfTest(void) {
+#undef  _SELFTEST_DEQUE
+#ifdef  _SELFTEST_DEQUE
+#include <iostream.h>
+
+  {
+    nsDeque theDeque(PR_FALSE); //construct a simple one...
+    
+    int ints[10]={100,200,300,400,500,600,700,800,900,1000};
+    int count=sizeof(ints)/sizeof(int);
+
+    int i=0;
+    for(i=0;i<count;i++){
+      theDeque.Push(&ints[i]);
+    }
+
+    int* temp1=(int*)theDeque.Pop(); //should have popped 100
+    int* temp2=(int*)theDeque.Pop(); //should have popped 200
+
+    theDeque.Push(temp1); //these should now become
+    theDeque.Push(temp2); //the last 2 items in deque.
+
+    nsDequeIterator iter1=theDeque.Begin();
+    nsDequeIterator iter2=theDeque.End();
+    while(iter1!=iter2) {
+      temp1=(int*)(iter1++);
+      cout << *temp1 << endl;
+    }
+
+    //now, afll thru and watch the deque dtor run...
+    cout << "done" << endl;
+  }
+
+  int x;
+  x=10;
+#endif
+}
+

mozilla/base/src/nsDeque.h

@@ -0,0 +1,389 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/**
+ * MODULE NOTES:
+ * @update  gess 4/15/98 (tax day)
+ * 
+ * The Deque is a very small, very efficient container object
+ * than can hold elements of type void*, offering the following features:
+ *    It's interface supports pushing and poping of children.
+ *    It can iterate (via an interator class) it's children.
+ *    When full, it can efficently resize dynamically.
+ *
+ *
+ * NOTE: The only bit of trickery here is that this deque is
+ * built upon a ring-buffer. Like all ring buffers, the first 
+ * element may not be at index[0]. The mOrigin member determines 
+ * where the first child is. This point is quietly hidden from 
+ * customers of this class.
+ *    
+ */
+
+
+#ifndef _NSDEQUE
+#define _NSDEQUE
+
+#include "nscore.h"
+
+/**
+ * The nsDequefunctor class is used when you want to create
+ * callbacks between the deque and your generic code.
+ * Use these objects in a call to ForEach();
+ *
+ * @update	gess4/20/98
+ */
+class NS_BASE nsDequeFunctor{
+public:
+  virtual void* operator()(void* anObject)=0;
+};
+
+
+/******************************************************
+ * Here comes the nsDeque class itself...
+ ******************************************************/
+
+/**
+ * The deque (double-ended queue) class is a common container type, 
+ * whose behavior mimics a line in your favorite checkout stand.
+ * Classic CS describes the common behavior of a queue as FIFO. 
+ * A Deque allows items to be added and removed from either end of
+ * the queue.
+ *
+ * @update	gess4/20/98
+ */
+
+class NS_BASE nsDeque {
+friend class nsDequeIterator;
+  public:
+                       nsDeque(nsDequeFunctor& aMemDestroyer);
+                      ~nsDeque();
+            
+  /**
+   * Returns the number of elements currently stored in
+   * this deque.
+   *
+   * @update	gess4/18/98
+   * @param 
+   * @return  int contains element count
+   */
+  PRInt32 GetSize() const;
+  
+
+  /**
+   * Pushes new member onto the end of the deque
+   *
+   * @update	gess4/18/98
+   * @param   ptr to object to store
+   * @return  *this
+   */
+  nsDeque& Push(void* anItem);
+  
+  /**
+   * Remove and return the first item in the container.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* Pop(void);
+
+  /**
+   * Return topmost item without removing it.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* Peek(void);
+  
+  /**
+   * Remove and return the last item in the container.
+   * 
+   * @update	gess4/18/98
+   * @param   none
+   * @return  ptr to first item in container
+   */
+  void* PopBack(void);
+    
+  /**
+   * Remove all items from container without destroying them
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque& Empty();
+  
+  /**
+   * Remove and delete all items from container
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque& Erase();
+
+
+  /**
+   * Creates a new iterator, init'ed to start of container
+   *
+   * @update	gess4/18/98
+   * @return  new dequeIterator
+   */
+  nsDequeIterator Begin() const;
+  
+  /**
+   * Creates a new iterator, init'ed to end of container
+   *
+   * @update	gess4/18/98
+   * @return  new dequeIterator
+   */
+  nsDequeIterator End() const;
+
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  const void ForEach(nsDequeFunctor& aFunctor) const;
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code. This process will interupt if
+   * your function returns a null to this iterator.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  const void* FirstThat(nsDequeFunctor& aFunctor) const;
+
+  /**
+   * Perform automated selftest on the deque
+   *
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  static void SelfTest();
+
+protected:
+
+  PRInt32         mSize;
+  PRInt32         mCapacity;
+  PRInt32         mOrigin;
+  nsDequeFunctor& mMemDestroyer;
+  void**          mData;
+
+
+private: 
+  
+  enum {eGrowthDelta=64}; 
+
+  /**
+   * Simple default constructor (PRIVATE)
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque();
+
+  /**
+   * Copy constructor (PRIVATE)
+   * 
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDeque(const nsDeque& other);
+
+  /**
+   * Deque assignment operator (PRIVATE)
+   *
+   * @update	gess4/18/98
+   * @param   another deque
+   * @return  *this
+   */
+  nsDeque& operator=(const nsDeque& anOther);
+
+  /**
+   * PRIVATE method used to retrieve ptr to
+   * ith member in container. DOesn't remove
+   * that item.
+   *
+   * @update	gess4/18/98
+   * @param   index of desired item
+   * @return  ptr to ith element in list
+   */
+  void* ObjectAt(int anIndex) const;
+
+};
+
+/******************************************************
+ * Here comes the nsDequeIterator class...
+ ******************************************************/
+
+class NS_BASE nsDequeIterator {
+public:
+  
+  /**
+   * DequeIterator is an object that knows how to iterate (forward and backward)
+   * a Deque. Normally, you don't need to do this, but there are some special
+   * cases where it is pretty handy, so here you go.
+   *
+   * @update	gess4/18/98
+   * @param   aQueue is the deque object to be iterated
+   * @param   anIndex is the starting position for your iteration
+   */
+  nsDequeIterator(const nsDeque& aQueue,int anIndex=0);
+  
+  /**
+   * DequeIterator is an object that knows how to iterate (forward and backward)
+   * a Deque. Normally, you don't need to do this, but there are some special
+   * cases where it is pretty handy, so here you go.
+   *
+   * @update	gess4/18/98
+   * @param   aQueue is the deque object to be iterated
+   * @param   anIndex is the starting position for your iteration
+   */
+  nsDequeIterator(const nsDequeIterator& aCopy);
+
+  /**
+   * Standard assignment operator for deque
+   * @update	gess4/18/98
+   * @param 
+   * @return
+   */
+  nsDequeIterator& operator=(const nsDequeIterator& aCopy);
+
+  /**
+   * preform ! operation against to iterators to test for equivalence
+   * (or lack thereof)!
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the object to be compared to
+   * @return  TRUE if NOT equal.
+   */
+  PRBool operator!=(nsDequeIterator& anIter);
+
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator<(nsDequeIterator& anIter);
+
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator==(nsDequeIterator& anIter);
+  
+  /**
+   * Compare 2 iterators for equivalence.
+   *
+   * @update	gess4/18/98
+   * @param   anIter is the other iterator to be compared to
+   * @return  TRUE if EQUAL
+   */
+  PRBool operator>=(nsDequeIterator& anIter);
+
+  /**
+   * Pre-increment operator 
+   *
+   * @update	gess4/18/98
+   * @return  object at preincremented index
+   */
+  void* operator++();
+
+  /**
+   * Post-increment operator 
+   *
+   * @update	gess4/18/98
+   * @param   param is ignored
+   * @return  object at post-incremented index
+   */
+  void* operator++(int);
+
+  /**
+   * Pre-decrement operator
+   *
+   * @update	gess4/18/98
+   * @return  object at pre-decremented index
+   */
+  void* operator--();
+
+  /**
+   * Post-decrement operator
+   *
+   * @update	gess4/18/98
+   * @param   param is ignored
+   * @return  object at post-decremented index
+   */
+  void* operator--(int);
+  
+  /**
+   * Retrieve the ptr to the iterators notion of current node
+   *
+   * @update	gess4/18/98
+   * @return  object at ith index
+   */
+  void* GetCurrent(void);
+
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  const void ForEach(nsDequeFunctor& aFunctor) const;
+  
+  /**
+   * Call this method when you wanto to iterate all the
+   * members of the container, passing a functor along
+   * to call your code.
+   *
+   * @update	gess4/20/98
+   * @param   aFunctor object to call for each member
+   * @return  *this
+   */
+  const void* FirstThat(nsDequeFunctor& aFunctor) const;
+
+  protected:
+        PRInt32         mIndex;
+        const nsDeque&  mDeque;
+};
+
+
+#endif

mozilla/base/src/nsIArena.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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIArena_h___
+#define nsIArena_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+#define NS_MIN_ARENA_BLOCK_SIZE 64
+#define NS_DEFAULT_ARENA_BLOCK_SIZE 4096
+
+/// Interface IID for nsIArena
+#define NS_IARENA_IID         \
+{ 0xa24fdad0, 0x93b4, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+/** Interface to a memory arena abstraction. Arena's use large blocks
+ * of memory to allocate smaller objects. Arena's provide no free
+ * operator; instead, all of the objects in the arena are deallocated
+ * by deallocating the arena (e.g. when it's reference count goes to
+ * zero)
+ */
+class nsIArena : public nsISupports {
+public:
+  virtual void* Alloc(PRInt32 size) = 0;
+};
+
+/**
+ * Create a new arena using the desired block size for allocating the
+ * underlying memory blocks. The underlying memory blocks are allocated
+ * using the PR heap.
+ */
+extern NS_BASE nsresult NS_NewHeapArena(nsIArena** aInstancePtrResult,
+                                        PRInt32 aArenaBlockSize = 0);
+
+#endif /* nsIArena_h___ */

mozilla/base/src/nsIAtom.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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIAtom_h___
+#define nsIAtom_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+class nsString;
+class nsISizeOfHandler;
+
+#define NS_IATOM_IID          \
+{ 0x3d1b15b0, 0x93b4, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+/**
+ * A globally unique identfier.  nsIAtom's can be compared for
+ * equality by using operator '=='. These objects are reference
+ * counted like other nsISupports objects. When you are done with
+ * the atom, NS_RELEASE it.
+ */
+class nsIAtom : public nsISupports {
+public:
+  /**
+   * Translate the unicode string into the stringbuf.
+   */
+  virtual void ToString(nsString& aString) const = 0;
+
+  /**
+   * Return a pointer to a zero terminated unicode string.
+   */
+  virtual const PRUnichar* GetUnicode() const = 0;
+
+  /**
+   * Add the size, in bytes, of the atom to the handler.
+   */
+  NS_IMETHOD SizeOf(nsISizeOfHandler* aHandler) const = 0;
+};
+
+/**
+ * Find an atom that matches the given iso-latin1 C string. The
+ * C string is translated into it's unicode equivalent.
+ */
+extern NS_BASE nsIAtom* NS_NewAtom(const char* isolatin1);
+
+/**
+ * Find an atom that matches the given unicode string. The string is assumed
+ * to be zero terminated.
+ */
+extern NS_BASE nsIAtom* NS_NewAtom(const PRUnichar* unicode);
+
+/**
+ * Find an atom that matches the given string.
+ */
+extern NS_BASE nsIAtom* NS_NewAtom(const nsString& aString);
+
+/**
+ * Return a count of the total number of atoms currently
+ * alive in the system.
+ */
+extern NS_BASE nsrefcnt NS_GetNumberOfAtoms(void);
+
+#endif /* nsIAtom_h___ */

mozilla/base/src/nsIBaseStream.h

@@ -0,0 +1,57 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIBaseStream_h___
+#define nsIBaseStream_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+
+/* 6ccb17a0-e95e-11d1-beae-00805f8a66dc */
+#define NS_IBASESTREAM_IID   \
+{ 0x6ccb17a0, 0xe95e, 0x11d1, \
+  {0xbe, 0xae, 0x00, 0x80, 0x5f, 0x8a, 0x66, 0xdc} }
+
+/** Abstract stream */
+class nsIBaseStream : public nsISupports {
+public:
+
+    /** Close the stream. */
+    NS_IMETHOD
+    Close(void) = 0;
+};
+
+/** Error codes */
+//@{ 
+// XXX fix up the values so they are not total hacks... MMP
+/// End of file
+#define NS_BASE_STREAM_EOF            0x80001001
+/// Stream closed
+#define NS_BASE_STREAM_CLOSED         0x80001002
+/// Error from the operating system
+#define NS_BASE_STREAM_OSERROR        0x80001003
+/// Illegal arguments
+#define NS_BASE_STREAM_ILLEGAL_ARGS   0x80001004
+/// For unichar streams
+#define NS_BASE_STREAM_NO_CONVERTER   0x80001005
+/// For unichar streams
+#define NS_BASE_STREAM_BAD_CONVERSION 0x80001006
+//@}
+
+
+#endif /* nsInputStream_h___ */

mozilla/base/src/nsIByteBuffer.h

@@ -0,0 +1,56 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIByteBuffer_h___
+#define nsIByteBuffer_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+class nsIInputStream;
+
+#define NS_IBYTE_BUFFER_IID    \
+{ 0xe4a6e4b0, 0x93b4, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+/** Interface to a buffer that holds bytes */
+class nsIByteBuffer : public nsISupports {
+public:
+  /** @return length of buffer, i.e. how many bytes are currently in it. */
+  virtual PRInt32 GetLength() const = 0;
+
+  /** @return number of bytes allocated in the buffer */
+  virtual PRInt32 GetBufferSize() const = 0;
+
+  /** @return the buffer */
+  virtual char* GetBuffer() const = 0;
+
+  /** Grow buffer to aNewSize bytes. */
+  virtual PRBool Grow(PRInt32 aNewSize) = 0;
+
+  /** Fill the buffer with data from aStream.  Don't grow the buffer, only
+   *  read until length of buffer equals buffer size. */
+  virtual PRInt32 Fill(nsresult* aErrorCode, nsIInputStream* aStream,
+                       PRInt32 aKeep) = 0;
+};
+
+/** Create a new byte buffer using the given buffer size. */
+extern NS_BASE nsresult NS_NewByteBuffer(nsIByteBuffer** aInstancePtrResult,
+                                         nsISupports* aOuter,
+                                         PRInt32 aBufferSize = 0);
+
+#endif /* nsIByteBuffer_h___ */

mozilla/base/src/nsIInputStream.h

@@ -0,0 +1,54 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIInputStream_h___
+#define nsIInputStream_h___
+
+#include "nsIBaseStream.h"
+
+#define NS_IINPUTSTREAM_IID   \
+{ 0x022396f0, 0x93b5, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+/** Abstract byte input stream */
+class nsIInputStream : public nsIBaseStream {
+public:
+
+    /** Return the number of bytes in the stream
+     *  @param aLength out parameter to hold the length
+     *         of the stream. if an error occurs, the length
+     *         will be undefined
+     *  @return error status
+     */
+    NS_IMETHOD
+    GetLength(PRInt32 *aLength) = 0;
+
+    /** Read data from the stream.
+     *  @param aErrorCode the error code if an error occurs
+     *  @param aBuf the buffer into which the data is read
+     *  @param aOffset the start offset of the data
+     *  @param aCount the maximum number of bytes to read
+     *  @param aReadCount out parameter to hold the number of
+     *         bytes read, eof if 0. if an error occurs, the
+     *         read count will be undefined
+     *  @return error status
+     */   
+    NS_IMETHOD
+    Read(char* aBuf, PRInt32 aOffset, PRInt32 aCount, PRInt32 *aReadCount) = 0; 
+};
+
+#endif /* nsInputStream_h___ */

mozilla/base/src/nsIOutputStream.h

@@ -0,0 +1,46 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIOutputStream_h___
+#define nsIOutputStream_h___
+
+#include "nsIBaseStream.h"
+
+/* 7f13b870-e95f-11d1-beae-00805f8a66dc */
+#define NS_IOUTPUTSTREAM_IID   \
+{ 0x7f13b870, 0xe95f, 0x11d1, \
+  {0xbe, 0xae, 0x00, 0x80, 0x5f, 0x8a, 0x66, 0xdc} }
+
+/** Abstract byte output stream */
+class nsIOutputStream : public nsIBaseStream {
+public:
+
+    /** Write data into the stream.
+     *  @param aBuf the buffer into which the data is read
+     *  @param aOffset the start offset of the data
+     *  @param aCount the maximum number of bytes to read
+     *  @param aWriteCount out parameter to hold the number of
+     *         bytes written. if an error occurs, the writecount
+     *         is undefined
+     *  @return error status
+     */   
+    NS_IMETHOD
+    Write(const char* aBuf, PRInt32 aOffset, PRInt32 aCount, PRInt32 *aWriteCount) = 0; 
+};
+
+
+#endif /* nsOutputStream_h___ */

mozilla/base/src/nsITimer.h

@@ -0,0 +1,86 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsITimer_h___
+#define nsITimer_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+class nsITimer;
+class nsITimerCallback;
+
+/// Signature of timer callback function
+typedef void
+(*nsTimerCallbackFunc) (nsITimer *aTimer, void *aClosure);
+
+/// Interface IID for nsITimer
+#define NS_ITIMER_IID         \
+{ 0x497eed20, 0xb740, 0x11d1,  \
+{ 0x9b, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }
+
+/**
+ * Timer class, used to invoke a function or method after a fixed
+ * millisecond interval. <B>Note that this interface is subject to
+ * change!</B>
+ */
+class nsITimer : public nsISupports {
+public:  
+  /**
+   * Initialize a timer to fire after the given millisecond interval.
+   * This version takes a function to call and a closure to pass to
+   * that function.
+   *
+   * @param aFunc - The function to invoke
+   * @param aClosure - an opaque pointer to pass to that function
+   * @param aRepeat - (Not yet implemented) One-shot or repeating
+   * @param aDelay - The millisecond interval
+   * @result - NS_OK if this operation was successful
+   */
+  virtual nsresult Init(nsTimerCallbackFunc aFunc,
+                        void *aClosure,
+//                      PRBool aRepeat, 
+                        PRUint32 aDelay)=0;
+
+  /**
+   * Initialize a timer to fire after the given millisecond interval.
+   * This version takes an interface of type <code>nsITimerCallback</code>. 
+   * The <code>Notify</code> method of this method is invoked.
+   *
+   * @param aCallback - The interface to notify
+   * @param aRepeat - (Not yet implemented) One-shot or repeating
+   * @param aDelay - The millisecond interval
+   * @result - NS_OK if this operation was successful
+   */
+  virtual nsresult Init(nsITimerCallback *aCallback,
+//                      PRBool aRepeat, 
+                        PRUint32 aDelay)=0;
+
+  /// Cancels the timeout
+  virtual void Cancel()=0;
+
+  /// @return the millisecond delay of the timeout
+  virtual PRUint32 GetDelay()=0;
+
+  /// Change the millisecond interval for the timeout
+  virtual void SetDelay(PRUint32 aDelay)=0;
+};
+
+/** Factory method for creating an nsITimer */
+extern NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult);
+
+#endif

mozilla/base/src/nsITimerCallback.h

@@ -0,0 +1,41 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsITimerCallback_h___
+#define nsITimerCallback_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+class nsITimer;
+
+/// Interface IID for nsITimerCallback
+#define NS_ITIMERCALLBACK_IID         \
+{ 0x5079b3a0, 0xb743, 0x11d1,         \
+{ 0x9b, 0xc3, 0x00, 0x60, 0x08, 0x8c, 0xa6, 0xb3 } }
+
+/**
+ * Interface implemented by users of the nsITimer class. An instance
+ * of this interface is passed in when creating a timer. The Notify()
+ * method of that instance is invoked after the specified delay.
+ */
+class nsITimerCallback : public nsISupports {
+public:  
+  virtual void Notify(nsITimer *timer)=0;
+};
+
+#endif

mozilla/base/src/nsIUnicharBuffer.h

@@ -0,0 +1,46 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIUnicharBuffer_h___
+#define nsIUnicharBuffer_h___
+
+#include "nscore.h"
+#include "nsISupports.h"
+class nsIUnicharInputStream;
+
+#define NS_IUNICHAR_BUFFER_IID \
+{ 0x14cf6970, 0x93b5, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+/// Interface to a buffer that holds unicode characters
+class nsIUnicharBuffer : public nsISupports {
+public:
+  virtual PRInt32 GetLength() const = 0;
+  virtual PRInt32 GetBufferSize() const = 0;
+  virtual PRUnichar* GetBuffer() const = 0;
+  virtual PRBool Grow(PRInt32 aNewSize) = 0;
+  virtual PRInt32 Fill(nsresult* aErrorCode, nsIUnicharInputStream* aStream,
+                       PRInt32 aKeep) = 0;
+};
+
+/// Factory method for nsIUnicharBuffer.
+extern NS_BASE nsresult
+  NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
+                      nsISupports* aOuter,
+                      PRInt32 aBufferSize = 0);
+
+#endif /* nsIUnicharBuffer_h___ */

mozilla/base/src/nsIUnicharInputStream.h

@@ -0,0 +1,98 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsIUnicharInputStream_h___
+#define nsIUnicharInputStream_h___
+
+#include "nsIInputStream.h"
+class nsString;
+
+#define NS_IUNICHAR_INPUT_STREAM_IID \
+{ 0x2d97fbf0, 0x93b5, 0x11d1,        \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+#define NS_IB2UCONVERTER_IID  \
+{ 0x35e40290, 0x93b5, 0x11d1, \
+  {0x89, 0x5b, 0x00, 0x60, 0x08, 0x91, 0x1b, 0x81} }
+
+/// Enumeration of character set ids.
+enum nsCharSetID {
+  eCharSetID_IsoLatin1 = 0,
+  eCharSetID_UTF8,
+  eCharSetID_ShiftJis
+  // XXX more i'm sure...
+};
+
+/** Abstract unicode character input stream
+ *  @see nsIInputStream
+ */
+class nsIUnicharInputStream : public nsISupports {
+public:
+  NS_IMETHOD Read(PRUnichar* aBuf,
+                  PRInt32 aOffset,
+                  PRInt32 aCount,
+                  PRInt32 *aReadCount) = 0;
+  NS_IMETHOD Close() = 0;
+};
+
+/**
+ * Create a nsIUnicharInputStream that wraps up a string. Data is fed
+ * from the string out until the done. When this object is destroyed
+ * it destroyes the string (so make a copy if you don't want it doing
+ * that)
+ */
+extern NS_BASE nsresult
+  NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
+                                 nsString* aString);
+
+/// Abstract interface for converting from bytes to unicode characters
+class nsIB2UConverter : public nsISupports {
+public:
+  /** aDstLen is updated to indicate how much data was translated into
+   * aDst; aSrcLen is updated to indicate how much data was used in
+   * the source buffer.
+   */
+  virtual PRInt32 Convert(PRUnichar* aDst,
+                          PRInt32 aDstOffset,
+                          PRInt32& aDstLen,
+                          const char* aSrc,
+                          PRInt32 aSrcOffset,
+                          PRInt32& aSrcLen) = 0;
+};
+
+/** Create a new nsUnicharInputStream that provides a converter for the
+ * byte input stream aStreamToWrap. If no converter can be found then
+ * nsnull is returned and the error code is set to
+ * NS_INPUTSTREAM_NO_CONVERTER.
+ */
+extern NS_BASE nsresult
+  NS_NewConverterStream(nsIUnicharInputStream** aInstancePtrResult,
+                        nsISupports* aOuter,
+                        nsIInputStream* aStreamToWrap,
+                        PRInt32 aBufferSize = 0,
+                        nsCharSetID aCharSet = eCharSetID_IsoLatin1);
+
+/** Create a new nsB2UConverter for the given character set. When given
+ * nsnull, the converter for iso-latin1 to unicode is provided. If no
+ * converter can be found, nsnull is returned.
+ */
+extern NS_BASE nsresult
+  NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
+                     nsISupports* aOuter,
+                     nsCharSetID aCharSet = eCharSetID_IsoLatin1);
+
+#endif /* nsUnicharInputStream_h___ */

mozilla/base/src/nsRBTree.cpp

@@ -0,0 +1,423 @@
+
+/**
+ * This file defines the binary tree class and it
+ * nsNode child class.
+ *
+ * This simple version stores nodes, and the
+ * nodes store void* ptrs.
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+
+#include "nsRBTree.h"
+
+
+
+/**************************************************
+  Here comes the nsRBTree class...
+ *************************************************/
+
+/**
+ * nsRBTree constructor
+ * 
+ * @update gess 4/11/98
+ */
+nsRBTree::nsRBTree() : nsBTree() {
+  mRoot=0;
+}
+
+/**
+ * nsRBTree constructor
+ * 
+ * @update gess 4/11/98
+ */
+nsRBTree::nsRBTree(const nsRBTree& aCopy) : nsBTree(aCopy) {
+  mRoot=aCopy.mRoot;
+}
+
+/**
+ * nsRBTree destructor
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+nsRBTree::~nsRBTree(){
+  if(mRoot){
+    //walk the tree and destroy the children.
+  }
+}
+
+
+/**
+ * Given a node, we're supposed to add it into 
+ * our tree.
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+nsNode* nsRBTree::Add(nsNode& aNode){
+
+  nsBTree::Add(aNode);
+
+  nsNode* node1=&aNode;
+  nsNode* node2=0;
+
+  node1->mColor=nsNode::eRed;
+
+  while((node1!=mRoot) && (node1->mParent->mColor==nsNode::eRed)) {
+    if(node1->mParent==node1->mParent->mParent->mLeft) {
+      node2=node1->mParent->mParent->mLeft; 
+      if(node2->mColor==nsNode::eRed) {
+        node1->mParent->mColor=nsNode::eBlack;
+        node2->mColor=nsNode::eBlack;
+        node1->mParent->mParent->mColor=nsNode::eRed;
+        node1=node1->mParent->mParent;
+      }
+      else {
+        if(node1==node1->mParent->mRight) {
+          node1=node1->mParent;
+          ShiftLeft(*node1);
+        }
+        node1->mParent->mColor=nsNode::eBlack;
+        node1->mParent->mParent->mColor=nsNode::eRed;
+        ShiftRight(*node1->mParent->mParent);
+      }
+    }
+    else {
+      node2=node1->mParent->mParent->mRight; 
+      if (node2->mColor==nsNode::eRed){
+        node1->mParent->mColor=nsNode::eBlack;
+        node2->mColor=nsNode::eBlack;
+        node1->mParent->mParent->mColor=nsNode::eRed;
+        node1=node1->mParent->mParent;
+      }
+      else {
+        if (node1==node1->mParent->mLeft) {
+          node1=node1->mParent;
+          ShiftRight(*node1);
+        }
+        node1->mParent->mColor=nsNode::eBlack;
+        node1->mParent->mParent->mColor=nsNode::eRed;
+        ShiftLeft(*node1->mParent->mParent);
+      }
+    }
+  }
+
+  mRoot->mColor=nsNode::eBlack;
+  return &aNode;
+}
+
+
+/**
+ * Retrive the first node in the tree
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+nsNode* nsRBTree::First(){
+  nsNode* result=First(*mRoot);
+  return result;
+}
+
+/**
+ * Retrieve the first node given a starting node
+ * 
+ * @update gess 4/11/98
+ * @param  aNode --
+ * @return node ptr or null
+ */
+nsNode* nsRBTree::First(nsNode& aNode){
+  nsNode* result=0;
+
+  if(mRoot) {
+    result=mRoot;
+    while(result->GetLeftNode()) {
+      result=result->GetLeftNode();
+    }
+  }
+  return result;
+}
+
+/**
+ * Find the last node in the tree
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return node ptr or null
+ */
+nsNode* nsRBTree::Last(){
+  nsNode* result=Last(*mRoot);
+  return result;
+}
+
+/**
+ * Find the last node from a given node
+ * 
+ * @update gess 4/11/98
+ * @param  aNode -- node ptr to start from
+ * @return node ptr or null
+ */
+nsNode* nsRBTree::Last(nsNode& aNode){
+  nsNode* result=0;
+
+  if(mRoot) {
+    result=mRoot;
+    while(result->GetRightNode()) {
+      result=result->GetRightNode();
+    }
+  }
+  return result;
+}
+
+
+/**
+ * Retrieve the node that preceeds the given node
+ * 
+ * @update gess 4/11/98
+ * @param  aNode -- node to find precedent of
+ * @return preceeding node ptr, or null
+ */
+nsNode* nsRBTree::Before(nsNode& aNode){
+  
+  if(aNode.GetLeftNode())
+    return Last(*aNode.GetLeftNode());
+
+  //otherwise...
+
+  nsNode* node1=&aNode;
+  nsNode* node2=aNode.GetParentNode();
+  
+  while((node2) && (node1==node2->GetLeftNode())) {
+    node1=node2;
+    node2=node2->GetParentNode();
+  }
+  return node2;
+}
+
+
+/**
+ * Retrieve a ptr to the node following the given node
+ * 
+ * @update gess 4/11/98
+ * @param  aNode -- node to find successor node from
+ * @return node ptr or null
+ */
+nsNode* nsRBTree::After(nsNode& aNode){
+  
+  if(aNode.GetRightNode())
+    return First(*aNode.GetRightNode());
+
+  //otherwise...
+
+  nsNode* node1=&aNode;
+  nsNode* node2=aNode.GetParentNode();
+  
+  while((node2) && (node1==node2->GetRightNode())) {
+    node1=node2;
+    node2=node2->GetParentNode();
+  }
+
+  return node2;
+}
+
+/**
+ * Find a (given) node in the tree
+ * 
+ * @update gess 4/11/98
+ * @param  node to find in the tree
+ * @return node ptr (if found) or null
+ */
+nsNode* nsRBTree::Find(nsNode& aNode){
+  nsNode* result=mRoot;
+
+  while((result) && (!((*result)==aNode))) {
+    if(aNode<*result)
+      result=result->mLeft;
+    else result=result->mRight;
+  }
+  return result;
+}
+
+
+/**
+ * Causes a shift to the left, to keep the
+ * underlying RB data in balance
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return this
+ */
+nsRBTree& nsRBTree::ShiftLeft(nsNode& aNode){
+
+  nsNode* temp= aNode.mRight;
+
+  aNode.mRight=temp->mLeft;
+  if(temp->mLeft)
+    temp->mRight->mParent=&aNode;
+  temp->mParent= aNode.mParent;
+  if (aNode.mParent) {
+    if (&aNode==aNode.mParent->mLeft)
+      aNode.mParent->mLeft=temp;
+    else aNode.mParent->mRight=temp;
+  }
+  else mRoot=temp;
+  temp->mLeft=&aNode;;
+  aNode.mParent=temp;
+  return *this;
+}
+
+/**
+ * Causes a shift right to occur, to keep the
+ * underlying RB data in balance
+ * 
+ * @update gess 4/11/98
+ * @param  aNode -- node at which to perform shift
+ * @return this
+ */
+nsRBTree& nsRBTree::ShiftRight(nsNode& aNode){
+  
+  nsNode* temp=aNode.mLeft;
+
+  aNode.mLeft=temp->mRight;
+  if(temp->mRight)
+    temp->mRight->mParent=&aNode;
+  temp->mParent=aNode.mParent;
+  if(aNode.mParent){
+    if(&aNode==aNode.mParent->mRight)
+      aNode.mParent->mRight=temp;
+    else aNode.mParent->mLeft=temp;
+    }
+  else mRoot=temp;
+  temp->mRight=&aNode;
+  aNode.mParent=temp;
+  return *this;
+}
+
+/**
+ * Rebalances tree around the given node. This only
+ * needs to be called after a node is deleted.
+ * 
+ * @update gess 4/11/98
+ * @param  aNode -- node to balance around
+ * @return this
+ */
+nsBTree& nsRBTree::ReBalance(nsNode& aNode){
+
+  nsNode* node1=&aNode;
+  nsNode* node2=0;
+
+  while ((node1!=mRoot) && (node1->mColor==nsNode::eBlack)) {
+    if(node1==node1->mParent->mLeft) {
+      node2=node1->mParent->mRight;  
+      if(node2->mColor==nsNode::eRed) {
+        node2->mColor=nsNode::eBlack;
+        node1->mParent->mColor=nsNode::eRed;
+        ShiftLeft(*node1->mParent);
+        node2=node1->mParent->mRight;
+      }
+    
+      if((node2->mLeft->mColor == nsNode::eBlack) &&
+	 (node2->mRight->mColor == nsNode::eBlack)) {
+        node2->mColor=nsNode::eRed;
+        node1=node1->mParent;
+      } 
+      else {
+        if(node2->mRight->mColor == nsNode::eBlack) {
+          node2->mLeft->mColor=nsNode::eBlack;
+          node2->mColor=nsNode::eRed;
+          ShiftRight(*node2);
+          node2=node1->mParent->mRight;
+        }
+
+        node2->mColor=node1->mParent->mColor;
+        node1->mParent->mColor=nsNode::eBlack;
+        node2->mRight->mColor=nsNode::eBlack;
+        ShiftLeft(*node1->mParent);
+        node1=mRoot;
+      } //else
+    }
+    else {
+      node2=node1->mParent->mLeft;
+      if(node2->mColor==nsNode::eRed) {
+        node2->mColor=nsNode::eBlack;
+        node1->mParent->mColor=nsNode::eRed;
+        ShiftRight(*node1->mParent);
+        node2=node1->mParent->mLeft;
+      }
+
+      if((node2->mRight->mColor == nsNode::eBlack) &&
+	 (node2->mLeft->mColor == nsNode::eBlack)) {
+        node2->mColor=nsNode::eRed;
+        node1=node1->mParent;
+      }
+      else {
+        if(node2->mLeft->mColor == nsNode::eBlack){
+          node2->mRight->mColor=nsNode::eBlack;
+          node2->mColor=nsNode::eRed;
+          ShiftLeft(*node2);
+          node2=node1->mParent->mLeft;
+        }
+      
+        node2->mColor=node1->mParent->mColor;
+        node1->mParent->mColor=nsNode::eBlack;
+        node2->mLeft->mColor=nsNode::eBlack;
+        ShiftRight(*node1->mParent);
+        node1=mRoot;
+      } //else
+    } //if
+  } //while
+
+  node1->mColor=nsNode::eBlack;
+  return *this;
+}
+
+/**************************************************
+  Here comes the nsRBTreeIterator class...
+ *************************************************/
+
+/**
+ * 
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */
+nsRBTreeIterator::nsRBTreeIterator(const nsRBTree& aTree) : mTree(aTree) {
+}
+
+/**
+ * copy constructor
+ * 
+ * @update gess 4/11/98
+ * @param  aCopy is the object you want to copy from
+ * @return newly constructed object
+ */
+nsRBTreeIterator::nsRBTreeIterator(const nsRBTreeIterator& aCopy) : mTree(aCopy.mTree) {
+}
+
+/**
+ * Destructor method
+ * 
+ * @update gess 4/11/98
+ */
+nsRBTreeIterator::~nsRBTreeIterator(){
+}
+
+/**
+ * This method iterates over the tree, calling
+ * aFunctor for each node.
+ * 
+ * @update gess 4/11/98
+ * @param  aFunctor -- object to call for each node
+ * @param  aNode -- node at which to start iteration
+ * @return this
+ */
+const nsRBTreeIterator& nsRBTreeIterator::ForEach(nsNodeFunctor& aFunctor) const{
+  mTree.ForEach(aFunctor);
+  return *this;
+}

mozilla/base/src/nsRBTree.h

@@ -0,0 +1,223 @@
+
+/**
+ * This file defines the binary tree class and its
+ * nsNode child class.
+ *
+ * This simple version stores nodes, and the
+ * nodes store void* ptrs.
+ * 
+ * @update gess 4/11/98
+ * @param  
+ * @return 
+ */ 
+
+/** 
+ * MODULE NOTES 
+ * @update gess 4/11/98
+ *
+ * This file declares the nsRBTree (red/black tree).
+ * Red/black trees are auto-balancing binary trees.
+ *
+ * To use this class, define a subclass of nsNode
+ * which stores your data type. It's important that
+ * you overload the following methods:
+ *
+ *      virtual PRBool operator<()
+ *      virtual PRBool operator==()
+ *
+ */ 
+
+#ifndef _nsRBTree
+#define _nsRBTree
+
+
+#include "nsBTree.h"
+
+
+/**
+ * Here comes the main event: our nsRBTree (red/black tree).
+ * Red/Black trees are autobalancing binary trees.
+ *
+ * @update	gess4/20/98
+ */
+
+class NS_BASE nsRBTree : public nsBTree {
+public:
+friend class NS_BASE nsRBTreeIterator;
+  
+  /**
+   * nsRBTree constructor
+   * 
+   * @update gess 4/11/98
+   */
+  nsRBTree();
+
+  /**
+   * nsRBTree constructor
+   * 
+   * @update gess 4/11/98
+   */
+  nsRBTree(const nsRBTree& aCopy);
+
+  /**
+   * nsRBTree destructor
+   * 
+   * @update gess 4/11/98
+   */
+  virtual ~nsRBTree();
+
+  /**
+   * Given a node, we're supposed to add it into 
+   * our tree.
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */
+  nsNode*   Add(nsNode& aNode);
+
+  /**
+   * Retrive the first node in the tree
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */
+  nsNode*   First(void);
+  
+  /**
+   * Retrieve the first node given a starting node
+   * 
+   * @update gess 4/11/98
+   * @param  aNode --
+   * @return node ptr or null
+   */
+  nsNode*   First(nsNode& aNode);
+  
+  /**
+   * Find the last node in the tree
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return node ptr or null
+   */
+  nsNode*   Last(void);
+  
+  /**
+   * Find the last node from a given node
+   * 
+   * @update gess 4/11/98
+   * @param  aNode -- node ptr to start from
+   * @return node ptr or null
+   */
+  nsNode*   Last(nsNode& aNode);
+  
+  /**
+   * Retrieve the node that preceeds the given node
+   * 
+   * @update gess 4/11/98
+   * @param  aNode -- node to find precedent of
+   * @return preceeding node ptr, or null
+   */
+  nsNode*   Before(nsNode& aNode);
+  
+  /**
+   * Retrieve a ptr to the node following the given node
+   * 
+   * @update gess 4/11/98
+   * @param  aNode -- node to find successor node from
+   * @return node ptr or null
+   */
+  nsNode*   After(nsNode& aNode);
+
+  /**
+   * Find a (given) node in the tree
+   * 
+   * @update gess 4/11/98
+   * @param  node to find in the tree
+   * @return node ptr (if found) or null
+   */
+  nsNode*   Find(nsNode& aNode);
+
+private:
+
+  /**
+   * Causes a shift to the left, to keep the
+   * underlying RB data in balance
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return this
+   */
+  nsRBTree&   ShiftLeft(nsNode& aNode);
+
+  /**
+   * Causes a shift right to occur, to keep the
+   * underlying RB data in balance
+   * 
+   * @update gess 4/11/98
+   * @param  aNode -- node at which to perform shift
+   * @return this
+   */
+  nsRBTree&   ShiftRight(nsNode& aNode);
+
+  /**
+   * Rebalances tree around the given node. This only
+   * needs to be called after a node is deleted.
+   * 
+   * @update gess 4/11/98
+   * @param  aNode -- node to balance around
+   * @return this
+   */
+  virtual nsBTree& ReBalance(nsNode& aNode);
+
+};
+
+class NS_BASE nsRBTreeIterator {
+public:
+
+  /**
+   * TreeIterator constructor
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */
+  nsRBTreeIterator(const nsRBTree& aTree);
+
+  /**
+   * TreeIterator constructor
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */
+  nsRBTreeIterator(const nsRBTreeIterator& aCopy);
+
+  /**
+   * tree iterator destructor
+   * 
+   * @update gess 4/11/98
+   * @param  
+   * @return 
+   */
+  ~nsRBTreeIterator();
+
+  /**
+   * This method iterates over the tree, calling
+   * aFunctor for each node.
+   * 
+   * @update gess 4/11/98
+   * @param  aFunctor -- object to call for each node
+   * @param  aNode -- node at which to start iteration
+   * @return this
+   */
+  const nsRBTreeIterator& ForEach(nsNodeFunctor& aFunctor) const;
+
+protected:
+  const nsRBTree& mTree;
+
+};
+
+
+#endif

mozilla/base/src/nsSizeOfHandler.cpp

@@ -0,0 +1,121 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsISizeOfHandler.h"
+#include "plhash.h"
+
+static NS_DEFINE_IID(kISizeOfHandlerIID, NS_ISIZEOF_HANDLER_IID);
+
+class nsSizeOfHandler : public nsISizeOfHandler {
+public:
+  nsSizeOfHandler();
+  ~nsSizeOfHandler();
+
+  // nsISupports
+  NS_DECL_ISUPPORTS
+
+  // nsISizeOfHandler
+  NS_IMETHOD Add(size_t aSize);
+  virtual PRBool HaveSeen(void* anObject);
+  NS_IMETHOD GetSize(PRUint32& aResult);
+
+protected:
+  PRUint32 mTotalSize;
+  PLHashTable* mTable;
+};
+
+static PLHashNumber
+HashKey(void* key)
+{
+  return (PLHashNumber) key;
+}
+
+static PRIntn
+CompareKeys(void* key1, void* key2)
+{
+  return key1 == key2;
+}
+
+nsSizeOfHandler::nsSizeOfHandler()
+{
+  NS_INIT_REFCNT();
+  mTotalSize = 0;
+  mTable = PL_NewHashTable(8, (PLHashFunction) HashKey,
+                           (PLHashComparator) CompareKeys,
+                           (PLHashComparator) nsnull,
+                           nsnull, nsnull);
+}
+
+nsSizeOfHandler::~nsSizeOfHandler()
+{
+  if (nsnull != mTable) {
+    PL_HashTableDestroy(mTable);
+  }
+}
+
+NS_IMPL_ISUPPORTS(nsSizeOfHandler, kISizeOfHandlerIID)
+
+NS_IMETHODIMP
+nsSizeOfHandler::Add(size_t aSize)
+{
+  mTotalSize += aSize;
+  return NS_OK;
+}
+
+PRBool
+nsSizeOfHandler::HaveSeen(void* anObject)
+{
+  if (nsnull == mTable) {
+    // When we run out of memory, HaveSeen returns PR_TRUE to stop
+    // wasting time.
+    return PR_TRUE;
+  }
+    
+  if (nsnull != anObject) {
+    PRInt32 hashCode = (PRInt32) anObject;
+    PLHashEntry** hep = PL_HashTableRawLookup(mTable, hashCode, anObject);
+    PLHashEntry* he = *hep;
+    if (nsnull != he) {
+      return PR_TRUE;
+    }
+    he = PL_HashTableRawAdd(mTable, hep, hashCode, anObject, anObject);
+    if (nsnull == he) {
+      // When we run out of memory, HaveSeen returns PR_TRUE to stop
+      // wasting time.
+      return PR_TRUE;
+    }
+    return PR_FALSE;
+  }
+  return PR_TRUE;
+}
+
+NS_IMETHODIMP
+nsSizeOfHandler::GetSize(PRUint32& aResult)
+{
+  aResult = mTotalSize;
+  return NS_OK;
+}
+
+NS_BASE nsresult
+NS_NewSizeOfHandler(nsISizeOfHandler** aInstancePtrResult)
+{
+  nsISizeOfHandler *it = new nsSizeOfHandler();
+  if (it == nsnull) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kISizeOfHandlerIID, (void **) aInstancePtrResult);
+}

mozilla/base/src/nsString.h

@@ -0,0 +1,240 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/**
+ * MODULE NOTES:
+ * LAST MODS:	gess 28Feb98
+ * 
+ * This very simple string class that knows how to do 
+ * efficient (dynamic) resizing. It offers almost no
+ * i18n support, and will undoubtedly have to be replaced.
+ *
+ */
+
+#ifndef _NSSTRING
+#define _NSSTRING
+
+
+#include "prtypes.h"
+#include "nscore.h"
+#include "nsIAtom.h"
+#include <iostream.h>
+#include <stdio.h>
+class nsISizeOfHandler;
+
+class NS_BASE nsString {
+  public: 
+
+                          nsString();
+                          nsString(const char* anISOLatin1);
+                          nsString(const nsString&);
+                          nsString(const PRUnichar* aUnicode);    
+
+  public:
+  virtual                 ~nsString();
+
+            PRInt32       Length() const { return mLength; }
+
+            void          SetLength(PRInt32 aLength);
+            void          Truncate(PRInt32 anIndex=0);
+  virtual   void          EnsureCapacityFor(PRInt32 aNewLength);
+
+  virtual   void          SizeOf(nsISizeOfHandler* aHandler) const;
+
+  ///accessor methods
+  //@{
+         const PRUnichar* GetUnicode(void) const;
+                          operator PRUnichar*() const;
+
+            PRUnichar     operator()(PRInt32 i) const;
+            PRUnichar&    operator[](PRInt32 i) const;
+            PRUnichar&    CharAt(PRInt32 anIndex) const;
+            PRUnichar&    First() const; 
+            PRUnichar&    Last() const;
+
+                //string creation methods...
+            nsString      operator+(const nsString& aString);
+            nsString      operator+(const char* anISOLatin1);
+            nsString      operator+(char aChar);
+            nsString      operator+(const PRUnichar* aBuffer);
+            nsString      operator+(PRUnichar aChar);
+
+            void          ToLowerCase();
+            void          ToLowerCase(nsString& aString) const;
+            void          ToUpperCase();
+            void          ToUpperCase(nsString& aString) const;
+
+            nsString*     ToNewString() const;
+            char*         ToNewCString() const;
+
+            char*         ToCString(char* aBuf,PRInt32 aBufLength) const;
+            void          Copy(nsString& aString) const;
+
+            PRUnichar*    ToNewUnicode() const;
+            float         ToFloat(PRInt32* aErrorCode) const;
+            PRInt32       ToInteger(PRInt32* aErrorCode) const;
+  //@}
+
+  ///string manipulation methods...                
+  //@{
+
+            nsString&     SetString(const PRUnichar* aStr,PRInt32 aLength=-1);
+            nsString&     SetString(const char* anISOLatin1,PRInt32 aLength=-1);
+
+            nsString&     operator=(const nsString& aString);
+            nsString&     operator=(const char* anISOLatin1);
+            nsString&     operator=(char aChar);
+            nsString&     operator=(const PRUnichar* aBuffer);
+            nsString&     operator=(PRUnichar aChar);
+            nsString&     operator+=(const nsString& aString);
+            nsString&     operator+=(const char* anISOLatin1);
+            nsString&     operator+=(const PRUnichar* aBuffer);
+            nsString&     operator+=(PRUnichar aChar);
+
+            nsString&     Append(const nsString& aString,PRInt32 aLength=-1);
+            nsString&     Append(const char* anISOLatin1,PRInt32 aLength=-1);
+            nsString&     Append(char aChar);
+            nsString&     Append(const PRUnichar* aBuffer,PRInt32 aLength=-1);
+            nsString&     Append(PRUnichar aChar);
+            nsString&     Append(PRInt32 aInteger,PRInt32 aRadix); //radix=8,10 or 16
+            nsString&     Append(float aFloat);
+                          
+            PRInt32       Left(nsString& aCopy,PRInt32 aCount);
+            PRInt32       Mid(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount);
+            PRInt32       Right(nsString& aCopy,PRInt32 aCount);
+            PRInt32       Insert(nsString& aCopy,PRInt32 anOffset,PRInt32 aCount=-1);
+            PRInt32       Insert(PRUnichar aChar,PRInt32 anOffset);
+
+            nsString&     Cut(PRInt32 anOffset,PRInt32 aCount);
+            nsString&     StripChars(const char* aSet);
+            nsString&     StripWhitespace();
+            nsString&     Trim( const char* aSet,
+                                PRBool aEliminateLeading=PR_TRUE,
+                                PRBool aEliminateTrailing=PR_TRUE);
+            nsString&     CompressWhitespace( PRBool aEliminateLeading=PR_TRUE,
+                                              PRBool aEliminateTrailing=PR_TRUE);
+    static  PRBool        IsSpace(PRUnichar ch);
+    static  PRBool        IsAlpha(PRUnichar ch);
+    static  PRBool        IsDigit(PRUnichar ch);
+
+    //@}
+
+  ///searching methods...
+  //@{
+            PRInt32       Find(const char* anISOLatin1) const;
+            PRInt32       Find(const PRUnichar* aString) const;
+            PRInt32       Find(PRUnichar aChar,PRInt32 offset=0) const;
+            PRInt32       Find(const nsString& aString) const;
+            PRInt32       FindFirstCharInSet(const char* anISOLatin1Set,PRInt32 offset=0) const;
+            PRInt32       FindFirstCharInSet(nsString& aString,PRInt32 offset=0) const;
+            PRInt32       FindLastCharInSet(const char* anISOLatin1Set,PRInt32 offset=0) const;
+            PRInt32       FindLastCharInSet(nsString& aString,PRInt32 offset=0) const;
+            PRInt32       RFind(const char* anISOLatin1,PRBool aIgnoreCase=PR_FALSE) const;
+            PRInt32       RFind(const PRUnichar* aString,PRBool aIgnoreCase=PR_FALSE) const;
+            PRInt32       RFind(const nsString& aString,PRBool aIgnoreCase=PR_FALSE) const;
+            PRInt32       RFind(PRUnichar aChar,PRBool aIgnoreCase=PR_FALSE) const;
+  //@}
+
+  ///comparision methods...
+  //@{
+    virtual PRInt32       Compare(const nsString &S,PRBool aIgnoreCase=PR_FALSE) const;
+    virtual PRInt32       Compare(const char *anISOLatin1,PRBool aIgnoreCase=PR_FALSE,PRInt32 aLength=-1) const;
+    virtual PRInt32       Compare(const PRUnichar *aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aLength=-1) const;
+
+            PRBool        operator==(const nsString &S) const;
+            PRBool        operator==(const char *anISOLatin1) const;
+            PRBool        operator==(const PRUnichar* aString) const;
+            PRBool        operator!=(const nsString &S) const;
+            PRBool        operator!=(const char *anISOLatin1) const;
+            PRBool        operator!=(const PRUnichar* aString) const;
+            PRBool        operator<(const nsString &S) const;
+            PRBool        operator<(const char *anISOLatin1) const;
+            PRBool        operator<(const PRUnichar* aString) const;
+            PRBool        operator>(const nsString &S) const;
+            PRBool        operator>(const char *anISOLatin1) const;
+            PRBool        operator>(const PRUnichar* aString) const;
+            PRBool        operator<=(const nsString &S) const;
+            PRBool        operator<=(const char *anISOLatin1) const;
+            PRBool        operator<=(const PRUnichar* aString) const;
+            PRBool        operator>=(const nsString &S) const;
+            PRBool        operator>=(const char *anISOLatin1) const;
+            PRBool        operator>=(const PRUnichar* aString) const;
+
+            PRBool        Equals(const nsString& aString) const;
+            PRBool        Equals(const char* anISOLatin1,PRInt32 aLength=-1) const;   
+            PRBool        Equals(const nsIAtom *aAtom) const;
+            PRBool        Equals(const PRUnichar* s1, const PRUnichar* s2) const;
+
+            PRBool        EqualsIgnoreCase(const nsString& aString) const;
+            PRBool        EqualsIgnoreCase(const char* anISOLatin1,PRInt32 aLength=-1) const;
+            PRBool        EqualsIgnoreCase(const nsIAtom *aAtom) const;
+            PRBool        EqualsIgnoreCase(const PRUnichar* s1, const PRUnichar* s2) const;
+  //@}
+
+            static void   SelfTest();
+    virtual void          DebugDump(ostream& aStream) const;
+
+  protected:
+
+typedef PRUnichar chartype;
+
+            chartype*       mStr;
+            PRInt32         mLength;
+            PRInt32         mCapacity;
+		static	PRBool					mSelfTested;
+};
+
+extern NS_BASE int fputs(const nsString& aString, FILE* out);
+
+//----------------------------------------------------------------------
+
+/**
+ * A version of nsString which is designed to be used as an automatic
+ * variable.  It attempts to operate out of a fixed size internal
+ * buffer until too much data is added; then a dynamic buffer is
+ * allocated and grown as necessary.
+ */
+// XXX template this with a parameter for the size of the buffer?
+class NS_BASE nsAutoString : public nsString {
+public:
+                nsAutoString();
+                nsAutoString(const nsString& other);
+                nsAutoString(const nsAutoString& other);
+                nsAutoString(PRUnichar aChar);
+                nsAutoString(const char* isolatin1);
+                nsAutoString(const PRUnichar* us, PRInt32 uslen = -1);
+  virtual       ~nsAutoString();
+
+  nsAutoString& operator=(const nsString& aString) {nsString::operator=(aString); return *this;}
+  nsAutoString& operator=(const char* anISOLatin1) {nsString::operator=(anISOLatin1); return *this;}
+  nsAutoString& operator=(char aChar) {nsString::operator=(aChar); return *this;}
+  nsAutoString& operator=(const PRUnichar* aBuffer) {nsString::operator=(aBuffer); return *this;}
+  nsAutoString& operator=(PRUnichar aChar) {nsString::operator=(aChar); return *this;}
+
+  virtual void  SizeOf(nsISizeOfHandler* aHandler) const;
+
+  static  void  SelfTest();
+
+protected:
+  virtual void EnsureCapacityFor(PRInt32 aNewLength);
+
+  PRUnichar mBuf[32];
+};
+
+#endif
+

mozilla/base/src/nsUnicharBuffer.cpp

@@ -0,0 +1,140 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIUnicharBuffer.h"
+#include "nsIUnicharInputStream.h"
+#include "nsCRT.h"
+
+#define MIN_BUFFER_SIZE 32
+
+class UnicharBufferImpl : public nsIUnicharBuffer {
+public:
+  UnicharBufferImpl(PRInt32 aBufferSize);
+  ~UnicharBufferImpl();
+
+  NS_DECL_ISUPPORTS
+  virtual PRInt32 GetLength() const;
+  virtual PRInt32 GetBufferSize() const;
+  virtual PRUnichar* GetBuffer() const;
+  virtual PRBool Grow(PRInt32 aNewSize);
+  virtual PRInt32 Fill(nsresult* aErrorCode, nsIUnicharInputStream* aStream,
+                       PRInt32 aKeep);
+
+  PRUnichar* mBuffer;
+  PRInt32 mSpace;
+  PRInt32 mLength;
+};
+
+UnicharBufferImpl::UnicharBufferImpl(PRInt32 aBufferSize)
+{
+  if (PRUint32(aBufferSize) < MIN_BUFFER_SIZE) {
+    aBufferSize = MIN_BUFFER_SIZE;
+  }
+  mSpace = aBufferSize;
+  mBuffer = new PRUnichar[aBufferSize];
+  mLength = 0;
+  NS_INIT_REFCNT();
+}
+
+NS_DEFINE_IID(kUnicharBufferIID, NS_IUNICHAR_BUFFER_IID);
+NS_IMPL_ISUPPORTS(UnicharBufferImpl,kUnicharBufferIID)
+
+UnicharBufferImpl::~UnicharBufferImpl()
+{
+  if (nsnull != mBuffer) {
+    delete mBuffer;
+    mBuffer = nsnull;
+  }
+  mLength = 0;
+}
+
+PRInt32 UnicharBufferImpl::GetLength() const
+{
+  return mLength;
+}
+
+PRInt32 UnicharBufferImpl::GetBufferSize() const
+{
+  return mSpace;
+}
+
+PRUnichar* UnicharBufferImpl::GetBuffer() const
+{
+  return mBuffer;
+}
+
+PRBool UnicharBufferImpl::Grow(PRInt32 aNewSize)
+{
+  if (PRUint32(aNewSize) < MIN_BUFFER_SIZE) {
+    aNewSize = MIN_BUFFER_SIZE;
+  }
+  PRUnichar* newbuf = new PRUnichar[aNewSize];
+  if (nsnull != newbuf) {
+    if (0 != mLength) {
+      nsCRT::memcpy(newbuf, mBuffer, mLength * sizeof(PRUnichar));
+    }
+    delete mBuffer;
+    mBuffer = newbuf;
+    return PR_TRUE;
+  }
+  return PR_FALSE;
+}
+
+PRInt32 UnicharBufferImpl::Fill(nsresult* aErrorCode,
+                                nsIUnicharInputStream* aStream,
+                                PRInt32 aKeep)
+{
+  NS_PRECONDITION(nsnull != aStream, "null stream");
+  NS_PRECONDITION(PRUint32(aKeep) < PRUint32(mLength), "illegal keep count");
+  if ((nsnull == aStream) || (PRUint32(aKeep) >= PRUint32(mLength))) {
+    // whoops
+    *aErrorCode = NS_BASE_STREAM_ILLEGAL_ARGS;
+    return -1;
+  }
+
+  if (0 != aKeep) {
+    // Slide over kept data
+    nsCRT::memmove(mBuffer, mBuffer + (mLength - aKeep),
+                   aKeep * sizeof(PRUnichar));
+  }
+
+  // Read in some new data
+  mLength = aKeep;
+  PRInt32 amount = mSpace - aKeep;
+  PRInt32 nb;
+  *aErrorCode = aStream->Read(mBuffer, aKeep, amount, &nb);
+  if (NS_SUCCEEDED(*aErrorCode)) {
+    mLength += nb;
+  }
+  else
+    nb = 0;
+  return nb;
+}
+
+NS_BASE nsresult NS_NewUnicharBuffer(nsIUnicharBuffer** aInstancePtrResult,
+                                     nsISupports* aOuter,
+                                     PRInt32 aBufferSize)
+{
+  if (nsnull != aOuter) {
+    return NS_ERROR_NO_AGGREGATION;
+  }
+  UnicharBufferImpl* it = new UnicharBufferImpl(aBufferSize);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kUnicharBufferIID, (void **) aInstancePtrResult);
+}

mozilla/base/src/nsUnicharInputStream.cpp

@@ -0,0 +1,337 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIUnicharInputStream.h"
+#include "nsIByteBuffer.h"
+#include "nsIUnicharBuffer.h"
+#include "nsString.h"
+#include "nsCRT.h"
+#include <fcntl.h>
+#ifdef NS_WIN32
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+static NS_DEFINE_IID(kIUnicharInputStreamIID, NS_IUNICHAR_INPUT_STREAM_IID);
+
+class StringUnicharInputStream : public nsIUnicharInputStream {
+public:
+  StringUnicharInputStream(nsString* aString);
+  ~StringUnicharInputStream();
+
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD Read(PRUnichar* aBuf,
+                  PRInt32 aOffset,
+                  PRInt32 aCount,
+                  PRInt32 *aReadCount);
+  NS_IMETHOD Close();
+
+  nsString* mString;
+  PRInt32 mPos;
+  PRInt32 mLen;
+};
+
+StringUnicharInputStream::StringUnicharInputStream(nsString* aString)
+{
+  NS_INIT_REFCNT();
+  mString = aString;
+  mPos = 0;
+  mLen = aString->Length();
+}
+
+StringUnicharInputStream::~StringUnicharInputStream()
+{
+  if (nsnull != mString) {
+    delete mString;
+  }
+}
+
+nsresult StringUnicharInputStream::Read(PRUnichar* aBuf,
+                                        PRInt32 aOffset,
+                                        PRInt32 aCount,
+                                        PRInt32 *aReadCount)
+{
+  if (mPos >= mLen) {
+    *aReadCount = 0;
+    return (nsresult)-1;
+  }
+  const PRUnichar* us = mString->GetUnicode();
+  PRInt32 amount = mLen - mPos;
+  if (amount > aCount) {
+    amount = aCount;
+  }
+  nsCRT::memcpy(aBuf + aOffset, us + mPos, sizeof(PRUnichar) * amount);
+  mPos += amount;
+  *aReadCount = amount;
+  return NS_OK;
+}
+
+nsresult StringUnicharInputStream::Close()
+{
+  mPos = mLen;
+  if (nsnull != mString) {
+    delete mString;
+  }
+  return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(StringUnicharInputStream, kIUnicharInputStreamIID);
+
+NS_BASE nsresult
+NS_NewStringUnicharInputStream(nsIUnicharInputStream** aInstancePtrResult,
+                               nsString* aString)
+{
+  NS_PRECONDITION(nsnull != aString, "null ptr");
+  NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
+  if ((nsnull == aString) || (nsnull == aInstancePtrResult)) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  StringUnicharInputStream* it = new StringUnicharInputStream(aString);
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  return it->QueryInterface(kIUnicharInputStreamIID,
+                            (void**) aInstancePtrResult);
+}
+
+//----------------------------------------------------------------------
+
+class IsoLatin1Converter : public nsIB2UConverter {
+public:
+  IsoLatin1Converter();
+
+  NS_DECL_ISUPPORTS
+  virtual PRInt32 Convert(PRUnichar* aDst,
+                          PRInt32 aDstOffset,
+                          PRInt32& aDstLen,
+                          const char* aSrc,
+                          PRInt32 aSrcOffset,
+                          PRInt32& aSrcLen);
+};
+
+IsoLatin1Converter::IsoLatin1Converter()
+{
+  NS_INIT_REFCNT();
+}
+
+NS_DEFINE_IID(kIB2UConverterIID, NS_IB2UCONVERTER_IID);
+NS_IMPL_ISUPPORTS(IsoLatin1Converter,kIB2UConverterIID);
+
+PRInt32 IsoLatin1Converter::Convert(PRUnichar* aDst,
+                                    PRInt32 aDstOffset,
+                                    PRInt32& aDstLen,
+                                    const char* aSrc,
+                                    PRInt32 aSrcOffset,
+                                    PRInt32& aSrcLen)
+{
+  PRInt32 amount = aSrcLen;
+  if (aSrcLen > aDstLen) {
+    amount = aDstLen;
+  }
+  const char* end = aSrc + amount;
+  while (aSrc < end) {
+    PRUint8 isoLatin1 = PRUint8(*aSrc++);
+    /* XXX insert table based lookup converter here */
+    *aDst++ = isoLatin1;
+  }
+  aDstLen = amount;
+  aSrcLen = amount;
+  return NS_OK;
+}
+
+NS_BASE nsresult
+NS_NewB2UConverter(nsIB2UConverter** aInstancePtrResult,
+                   nsISupports* aOuter,
+                   nsCharSetID aCharSet)
+{
+  if (nsnull != aOuter) {
+    return NS_ERROR_NO_AGGREGATION;
+  }
+  if (eCharSetID_IsoLatin1 != aCharSet) {
+    return NS_BASE_STREAM_NO_CONVERTER;
+  }
+  IsoLatin1Converter* it = new IsoLatin1Converter();
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kIB2UConverterIID, (void**)aInstancePtrResult);
+}
+
+//----------------------------------------------------------------------
+
+class ConverterInputStream : public nsIUnicharInputStream {
+public:
+  ConverterInputStream(nsIInputStream* aStream,
+                       nsIB2UConverter* aConverter,
+                       PRInt32 aBufSize);
+  ~ConverterInputStream();
+
+  NS_DECL_ISUPPORTS
+  NS_IMETHOD Read(PRUnichar* aBuf,
+                  PRInt32 aOffset,
+                  PRInt32 aCount,
+                  PRInt32 *aReadCount);
+  NS_IMETHOD Close();
+
+protected:
+  PRInt32 Fill(nsresult * aErrorCode);
+
+  nsIInputStream* mInput;
+  nsIB2UConverter* mConverter;
+  nsIByteBuffer* mByteData;
+  PRInt32 mByteDataOffset;
+  nsIUnicharBuffer* mUnicharData;
+  PRInt32 mUnicharDataOffset;
+  PRInt32 mUnicharDataLength;
+};
+
+ConverterInputStream::ConverterInputStream(nsIInputStream* aStream,
+                                           nsIB2UConverter* aConverter,
+                                           PRInt32 aBufferSize)
+{
+  NS_INIT_REFCNT();
+  mInput = aStream; aStream->AddRef();
+  mConverter = aConverter; aConverter->AddRef();
+  if (aBufferSize == 0) {
+    aBufferSize = 8192;
+  }
+  nsresult rv1 = NS_NewByteBuffer(&mByteData, nsnull, aBufferSize);
+  nsresult rv2 = NS_NewUnicharBuffer(&mUnicharData, nsnull, aBufferSize);
+  mByteDataOffset = 0;
+  mUnicharDataOffset = 0;
+  mUnicharDataLength = 0;
+}
+
+NS_IMPL_ISUPPORTS(ConverterInputStream,kIUnicharInputStreamIID);
+
+ConverterInputStream::~ConverterInputStream()
+{
+  Close();
+}
+
+nsresult ConverterInputStream::Close()
+{
+  if (nsnull != mInput) {
+    mInput->Release();
+    mInput = nsnull;
+  }
+  if (nsnull != mConverter) {
+    mConverter->Release();
+    mConverter = nsnull;
+  }
+  if (nsnull != mByteData) {
+    mByteData->Release();
+    mByteData = nsnull;
+  }
+  if (nsnull != mUnicharData) {
+    mUnicharData->Release();
+    mUnicharData = nsnull;
+  }
+
+  return NS_OK;
+}
+
+nsresult ConverterInputStream::Read(PRUnichar* aBuf,
+                                    PRInt32 aOffset,
+                                    PRInt32 aCount,
+                                    PRInt32 *aReadCount)
+{
+  PRInt32 rv = mUnicharDataLength - mUnicharDataOffset;
+  nsresult errorCode;
+  if (0 == rv) {
+    // Fill the unichar buffer
+    rv = Fill(&errorCode);
+    if (rv <= 0) {
+      *aReadCount = 0;
+      return errorCode;
+    }
+  }
+  if (rv > aCount) {
+    rv = aCount;
+  }
+  nsCRT::memcpy(aBuf + aOffset, mUnicharData->GetBuffer() + mUnicharDataOffset,
+                rv * sizeof(PRUnichar));
+  mUnicharDataOffset += rv;
+  *aReadCount = rv;
+  return NS_OK;
+}
+
+PRInt32 ConverterInputStream::Fill(nsresult * aErrorCode)
+{
+  if (nsnull == mInput) {
+    // We already closed the stream!
+    *aErrorCode = NS_BASE_STREAM_CLOSED;
+    return -1;
+  }
+
+  PRInt32 remainder = mByteData->GetLength() - mByteDataOffset;
+  mByteDataOffset = remainder;
+  PRInt32 nb = mByteData->Fill(aErrorCode, mInput, remainder);
+  if (nb <= 0) {
+    // Because we assume a many to one conversion, the lingering data
+    // in the byte buffer must be a partial conversion
+    // fragment. Because we know that we have recieved no more new
+    // data to add to it, we can't convert it. Therefore, we discard
+    // it.
+    return nb;
+  }
+  NS_ASSERTION(remainder + nb == mByteData->GetLength(), "bad nb");
+
+  // Now convert as much of the byte buffer to unicode as possible
+  PRInt32 dstLen = mUnicharData->GetBufferSize();
+  PRInt32 srcLen = remainder + nb;
+  *aErrorCode = mConverter->Convert(mUnicharData->GetBuffer(), 0, dstLen,
+                                    mByteData->GetBuffer(), 0, srcLen);
+  mUnicharDataOffset = 0;
+  mUnicharDataLength = dstLen;
+  mByteDataOffset += srcLen;
+  return dstLen;
+}
+
+// XXX hook up auto-detect here (do we need more info, like the url?)
+NS_BASE nsresult
+NS_NewConverterStream(nsIUnicharInputStream** aInstancePtrResult,
+                      nsISupports* aOuter,
+                      nsIInputStream* aStreamToWrap,
+                      PRInt32 aBufferSize,
+                      nsCharSetID aCharSet)
+{
+  if (nsnull != aOuter) {
+    return NS_ERROR_NO_AGGREGATION;
+  }
+
+  // Create converter
+  nsIB2UConverter* converter;
+  nsresult rv = NS_NewB2UConverter(&converter, nsnull, aCharSet);
+  if (NS_OK != rv) {
+    return rv;
+  }
+
+  // Create converter input stream
+  ConverterInputStream* it =
+    new ConverterInputStream(aStreamToWrap, converter, aBufferSize);
+  converter->Release();
+  if (nsnull == it) {
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+  return it->QueryInterface(kIUnicharInputStreamIID, 
+                            (void **) aInstancePtrResult);
+}

mozilla/base/src/nsUnitConversion.h

@@ -0,0 +1,182 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsUnitConversion_h__
+#define nsUnitConversion_h__
+
+#include "nscore.h"
+#include <math.h>
+
+/// handy constants
+#define TWIPS_PER_POINT_INT           20
+#define TWIPS_PER_POINT_FLOAT         20.0f
+#define ROUND_EXCLUSIVE_CONST_FLOAT   0.4999999999999999f   // XXX this should be derived from platform FLOAT_MIN
+#define ROUND_CONST_FLOAT             0.5f
+#define CEIL_CONST_FLOAT              0.9999999999999999f   // XXX this should be derived from platform FLOAT_MIN
+
+
+/*
+ * Coord Rounding Functions
+ */
+inline nscoord NSToCoordFloor(float aValue)
+{
+  return ((0.0f <= aValue) ? nscoord(aValue) : nscoord(aValue - CEIL_CONST_FLOAT));
+}
+
+inline nscoord NSToCoordCeil(float aValue)
+{
+  return ((0.0f <= aValue) ? nscoord(aValue + CEIL_CONST_FLOAT) : nscoord(aValue));
+}
+
+inline nscoord NSToCoordRound(float aValue)
+{
+  return ((0.0f <= aValue) ? nscoord(aValue + ROUND_CONST_FLOAT) : nscoord(aValue - ROUND_CONST_FLOAT));
+}
+
+inline nscoord NSToCoordRoundExclusive(float aValue)
+{
+  return ((0.0f <= aValue) ? nscoord(aValue + ROUND_EXCLUSIVE_CONST_FLOAT) :
+                             nscoord(aValue - ROUND_EXCLUSIVE_CONST_FLOAT));
+}
+
+
+/*
+ * Int Rounding Functions
+ */
+inline PRInt32 NSToIntFloor(float aValue)
+{
+  return ((0.0f <= aValue) ? PRInt32(aValue) : PRInt32(aValue - CEIL_CONST_FLOAT));
+}
+
+inline PRInt32 NSToIntCeil(float aValue)
+{
+  return ((0.0f <= aValue) ? PRInt32(aValue + CEIL_CONST_FLOAT) : PRInt32(aValue));
+}
+
+inline PRInt32 NSToIntRound(float aValue)
+{
+  return ((0.0f <= aValue) ? PRInt32(aValue + ROUND_CONST_FLOAT) : PRInt32(aValue - ROUND_CONST_FLOAT));
+}
+
+inline PRInt32 NSToIntRoundExclusive(float aValue)
+{
+  return ((0.0f <= aValue) ? PRInt32(aValue + ROUND_EXCLUSIVE_CONST_FLOAT) :
+                             PRInt32(aValue - ROUND_EXCLUSIVE_CONST_FLOAT));
+}
+
+
+/* 
+ * Twips/Points conversions
+ */
+inline nscoord NSFloatPointsToTwips(float aPoints)
+{
+  return NSToCoordRound(aPoints * TWIPS_PER_POINT_FLOAT);
+}
+
+inline nscoord NSIntPointsToTwips(PRInt32 aPoints)
+{
+  return nscoord(aPoints * TWIPS_PER_POINT_INT);
+}
+
+inline PRInt32 NSTwipsToIntPoints(nscoord aTwips)
+{
+  return NSToIntRound(aTwips / TWIPS_PER_POINT_FLOAT);
+}
+
+inline PRInt32 NSTwipsToFloorIntPoints(nscoord aTwips)
+{
+  return NSToIntFloor(aTwips / TWIPS_PER_POINT_FLOAT);
+}
+
+inline PRInt32 NSTwipsToCeilIntPoints(nscoord aTwips)
+{
+  return NSToIntCeil(aTwips / TWIPS_PER_POINT_FLOAT);
+}
+
+inline float NSTwipsToFloatPoints(nscoord aTwips)
+{
+  return (float(aTwips) / TWIPS_PER_POINT_FLOAT);
+}
+
+/* 
+ * Twips/Pixel conversions
+ */
+inline nscoord NSFloatPixelsToTwips(float aPixels, float aTwipsPerPixel)
+{
+  return NSToCoordRound(aPixels * aTwipsPerPixel);
+}
+
+inline nscoord NSIntPixelsToTwips(PRInt32 aPixels, float aTwipsPerPixel)
+{
+  return NSToCoordRound(float(aPixels) * aTwipsPerPixel);
+}
+
+inline float NSTwipsToFloatPixels(nscoord aTwips, float aPixelsPerTwip)
+{
+  return (float(aTwips) * aPixelsPerTwip);
+}
+
+inline PRInt32 NSTwipsToIntPixels(nscoord aTwips, float aPixelsPerTwip)
+{
+  return NSToIntRound(float(aTwips) * aPixelsPerTwip);
+}
+
+/* 
+ * Twips/unit conversions
+ */
+inline nscoord NSUnitsToTwips(float aValue, float aPointsPerUnit)
+{
+  return NSToCoordRound(aValue * aPointsPerUnit * TWIPS_PER_POINT_FLOAT);
+}
+
+inline float NSTwipsToUnits(nscoord aTwips, float aUnitsPerPoint)
+{
+  return (aTwips * (aUnitsPerPoint / TWIPS_PER_POINT_FLOAT));
+}
+
+
+/// Unit conversion macros
+//@{
+#define NS_INCHES_TO_TWIPS(x)         NSUnitsToTwips((x), 72.0f)                      // 72 points per inch
+#define NS_FEET_TO_TWIPS(x)           NSUnitsToTwips((x), (72.0f * 12.0f))            // 12 inches per foot
+#define NS_MILES_TO_TWIPS(x)          NSUnitsToTwips((x), (72.0f * 12.0f * 5280.0f))  // 5280 feet per mile
+
+#define NS_MILLIMETERS_TO_TWIPS(x)    NSUnitsToTwips((x), (72.0f * 0.03937f))
+#define NS_CENTIMETERS_TO_TWIPS(x)    NSUnitsToTwips((x), (72.0f * 0.3937f))
+#define NS_METERS_TO_TWIPS(x)         NSUnitsToTwips((x), (72.0f * 39.37f))
+#define NS_KILOMETERS_TO_TWIPS(x)     NSUnitsToTwips((x), (72.0f * 39370.0f))
+
+#define NS_PICAS_TO_TWIPS(x)          NSUnitsToTwips((x), 12.0f)                      // 12 points per pica
+#define NS_DIDOTS_TO_TWIPS(x)         NSUnitsToTwips((x), (16.0f / 15.0f))            // 15 didots per 16 points
+#define NS_CICEROS_TO_TWIPS(x)        NSUnitsToTwips((x), (12.0f * (16.0f / 15.0f)))  // 12 didots per cicero
+
+
+#define NS_TWIPS_TO_INCHES(x)         NSTwipsToUnits((x), 1.0f / 72.0f)
+#define NS_TWIPS_TO_FEET(x)           NSTwipsToUnits((x), 1.0f / (72.0f * 12.0f))
+#define NS_TWIPS_TO_MILES(x)          NSTwipsToUnits((x), 1.0f / (72.0f * 12.0f * 5280.0f))
+
+#define NS_TWIPS_TO_MILLIMETERS(x)    NSTwipsToUnits((x), 1.0f / (72.0f * 0.03937f))
+#define NS_TWIPS_TO_CENTIMETERS(x)    NSTwipsToUnits((x), 1.0f / (72.0f * 0.3937f))
+#define NS_TWIPS_TO_METERS(x)         NSTwipsToUnits((x), 1.0f / (72.0f * 39.37f))
+#define NS_TWIPS_TO_KILOMETERS(x)     NSTwipsToUnits((x), 1.0f / (72.0f * 39370.0f))
+
+#define NS_TWIPS_TO_PICAS(x)          NSTwipsToUnits((x), 1.0f / 12.0f)
+#define NS_TWIPS_TO_DIDOTS(x)         NSTwipsToUnits((x), 1.0f / (16.0f / 15.0f))
+#define NS_TWIPS_TO_CICEROS(x)        NSTwipsToUnits((x), 1.0f / (12.0f * (16.0f / 15.0f)))
+//@}
+
+#endif

mozilla/base/src/nsVoidArray.cpp

@@ -0,0 +1,227 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsVoidArray.h"
+#include "nsCRT.h"
+#include "nsISizeOfHandler.h"
+
+static PRInt32 kGrowArrayBy = 8;
+
+nsVoidArray::nsVoidArray()
+{
+  mArray = nsnull;
+  mArraySize = 0;
+  mCount = 0;
+}
+
+nsVoidArray::nsVoidArray(PRInt32 aCount)
+{
+  NS_PRECONDITION(aCount > 0, "bad count");
+  mCount = mArraySize = aCount;
+  mArray = new void*[mCount];
+  nsCRT::memset(mArray, 0, mCount * sizeof(void*));
+}
+
+nsVoidArray& nsVoidArray::operator=(const nsVoidArray& other)
+{
+  if (nsnull != mArray) {
+    delete mArray;
+  }
+  PRInt32 otherCount = other.mCount;
+  mArraySize = otherCount;
+  mCount = otherCount;
+  if (otherCount != 0) {
+    mArray = new void*[otherCount];
+    nsCRT::memcpy(mArray, other.mArray, otherCount * sizeof(void*));
+  } else {
+    mArray = nsnull;
+  }
+  return *this;
+}
+
+nsVoidArray::~nsVoidArray()
+{
+  if (nsnull != mArray) {
+    delete [] mArray;
+  }
+}
+void
+nsVoidArray::SizeOf(nsISizeOfHandler* aHandler) const
+{
+  aHandler->Add(sizeof(*this));
+  aHandler->Add(sizeof(void*) * mArraySize);
+}
+
+void* nsVoidArray::ElementAt(PRInt32 aIndex) const
+{
+  if (PRUint32(aIndex) >= PRUint32(mCount)) {
+    return nsnull;
+  }
+  return mArray[aIndex];
+}
+
+PRInt32 nsVoidArray::IndexOf(void* aPossibleElement) const
+{
+  void** ap = mArray;
+  void** end = ap + mCount;
+  while (ap < end) {
+    if (*ap == aPossibleElement) {
+      return ap - mArray;
+    }
+    ap++;
+  }
+  return -1;
+}
+
+PRBool nsVoidArray::InsertElementAt(void* aElement, PRInt32 aIndex)
+{
+  PRInt32 oldCount = mCount;
+  if (PRUint32(aIndex) > PRUint32(oldCount)) {
+    // An invalid index causes the insertion to fail
+    return PR_FALSE;
+  }
+
+  if (oldCount + 1 > mArraySize) {
+    // We have to grow the array
+    PRInt32 newCount = oldCount + kGrowArrayBy;
+    void** newArray = new void*[newCount];
+    if (mArray != nsnull && aIndex != 0)
+      nsCRT::memcpy(newArray, mArray, aIndex * sizeof(void*));
+    PRInt32 slide = oldCount - aIndex;
+    if (0 != slide) {
+      // Slide data over to make room for the insertion
+      nsCRT::memcpy(newArray + aIndex + 1, mArray + aIndex,
+                    slide * sizeof(void*));
+    }
+    if (mArray != nsnull)
+      delete [] mArray;
+    mArray = newArray;
+    mArraySize = newCount;
+  } else {
+    // The array is already large enough
+    PRInt32 slide = oldCount - aIndex;
+    if (0 != slide) {
+      // Slide data over to make room for the insertion
+      nsCRT::memmove(mArray + aIndex + 1, mArray + aIndex,
+                     slide * sizeof(void*));
+    }
+  }
+  mArray[aIndex] = aElement;
+  mCount++;
+
+  return PR_TRUE;
+}
+
+PRBool nsVoidArray::ReplaceElementAt(void* aElement, PRInt32 aIndex)
+{
+  if (PRUint32(aIndex) >= PRUint32(mArraySize)) {
+
+    PRInt32 requestedCount = aIndex + 1;
+    PRInt32 growDelta = requestedCount - mCount;
+    PRInt32 newCount = mCount + (growDelta > kGrowArrayBy ? growDelta : kGrowArrayBy);
+    void** newArray = new void*[newCount];
+    nsCRT::memset(newArray, 0, newCount * sizeof(void*));
+    if (newArray==nsnull)
+       return PR_FALSE;
+    if (mArray != nsnull && aIndex != 0) {
+      nsCRT::memcpy(newArray, mArray, mCount * sizeof(void*));
+      if (mArray != nsnull)
+         delete [] mArray;
+    }
+    mArray = newArray;
+    mArraySize = newCount;
+  }
+  mArray[aIndex] = aElement;
+  if (aIndex >= mCount)
+     mCount = aIndex+1;
+  return PR_TRUE;
+}
+
+PRBool nsVoidArray::RemoveElementAt(PRInt32 aIndex)
+{
+  PRInt32 oldCount = mCount;
+  if (PRUint32(aIndex) >= PRUint32(oldCount)) {
+    // An invalid index causes the replace to fail
+    return PR_FALSE;
+  }
+
+  // We don't need to move any elements if we're removing the
+  // last element in the array
+  if (aIndex < (oldCount - 1)) {
+    nsCRT::memmove(mArray + aIndex, mArray + aIndex + 1,
+                   (oldCount - 1 - aIndex) * sizeof(void*));
+  }
+
+  mCount--;
+  return PR_TRUE;
+}
+
+PRBool nsVoidArray::RemoveElement(void* aElement)
+{
+  void** ep = mArray;
+  void** end = ep + mCount;
+  while (ep < end) {
+    void* e = *ep++;
+    if (e == aElement) {
+      ep--;
+      return RemoveElementAt(PRInt32(ep - mArray));
+    }
+  }
+  return PR_FALSE;
+}
+
+void nsVoidArray::Clear()
+{
+  mCount = 0;
+}
+
+void nsVoidArray::Compact()
+{
+  PRInt32 count = mCount;
+  if (mArraySize != count) {
+    void** newArray = new void*[count];
+    if (nsnull != newArray) {
+      nsCRT::memcpy(newArray, mArray, count * sizeof(void*));
+      delete [] mArray;
+      mArray = newArray;
+      mArraySize = count;
+    }
+  }
+}
+
+PRBool nsVoidArray::EnumerateForwards(nsVoidArrayEnumFunc aFunc, void* aData)
+{
+  PRInt32 index = -1;
+  PRBool  running = PR_TRUE;
+
+  while (running && (++index < mCount)) {
+    running = (*aFunc)(mArray[index], aData);
+  }
+  return running;
+}
+
+PRBool nsVoidArray::EnumerateBackwards(nsVoidArrayEnumFunc aFunc, void* aData)
+{
+  PRInt32 index = mCount;
+  PRBool  running = PR_TRUE;
+
+  while (running && (0 <= --index)) {
+    running = (*aFunc)(mArray[index], aData);
+  }
+  return running;
+}
+

mozilla/base/src/nsVoidArray.h

@@ -0,0 +1,74 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nsVoidArray_h___
+#define nsVoidArray_h___
+
+#include "nscore.h"
+class nsISizeOfHandler;
+
+// Enumerator callback function. Return PR_FALSE to stop
+typedef PRBool (*nsVoidArrayEnumFunc)(void* aElement, void *aData);
+
+/// A basic zero-based array of void*'s that manages its own memory
+class NS_BASE nsVoidArray {
+public:
+  nsVoidArray();
+  nsVoidArray(PRInt32 aCount);  // initial count of aCount elements set to nsnull
+  ~nsVoidArray();
+
+  nsVoidArray& operator=(const nsVoidArray& other);
+
+  void  SizeOf(nsISizeOfHandler* aHandler) const;
+
+  PRInt32 Count() const {
+    return mCount;
+  }
+
+  void* ElementAt(PRInt32 aIndex) const;
+  void* operator[](PRInt32 aIndex) const { return ElementAt(aIndex); }
+
+  PRInt32 IndexOf(void* aPossibleElement) const;
+
+  PRBool InsertElementAt(void* aElement, PRInt32 aIndex);
+
+  PRBool ReplaceElementAt(void* aElement, PRInt32 aIndex);
+
+  PRBool AppendElement(void* aElement) {
+    return InsertElementAt(aElement, mCount);
+  }
+
+  PRBool RemoveElement(void* aElement);
+  PRBool RemoveElementAt(PRInt32 aIndex);
+  void   Clear();
+
+  void Compact();
+
+  PRBool EnumerateForwards(nsVoidArrayEnumFunc aFunc, void* aData);
+  PRBool EnumerateBackwards(nsVoidArrayEnumFunc aFunc, void* aData);
+
+protected:
+  void** mArray;
+  PRInt32 mArraySize;
+  PRInt32 mCount;
+
+private:
+  /// Copy constructors are not allowed
+  nsVoidArray(const nsVoidArray& other);
+};
+
+#endif /* nsVoidArray_h___ */

mozilla/base/src/nscore.h

@@ -0,0 +1,127 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef nscore_h___
+#define nscore_h___
+
+#ifdef _WIN32
+#define NS_WIN32 1
+#endif
+
+#if defined(__unix)
+#define NS_UNIX 1
+#endif
+
+#include "prtypes.h"
+#include "nsDebug.h"
+
+/** ucs2 datatype for 2 byte unicode characters */
+typedef PRUint16 PRUcs2;
+
+/** ucs4 datatype for 4 byte unicode characters */
+typedef PRUint32 PRUcs4;
+
+#ifdef NS_UCS4
+typedef PRUcs4 PRUnichar;
+#else
+typedef PRUcs2 PRUnichar;
+#endif
+
+/// The preferred symbol for null.
+#define nsnull 0
+
+/* Define brackets for protecting C code from C++ */
+#ifdef __cplusplus
+#define NS_BEGIN_EXTERN_C extern "C" {
+#define NS_END_EXTERN_C }
+#else
+#define NS_BEGIN_EXTERN_C
+#define NS_END_EXTERN_C
+#endif
+
+/*----------------------------------------------------------------------*/
+/* Import/export defines */
+
+#ifdef NS_WIN32
+#define NS_IMPORT _declspec(dllimport)
+#define NS_IMPORT_(type) type _declspec(dllimport) __stdcall
+#define NS_EXPORT _declspec(dllexport)
+// XXX NS_EXPORT_ defined in nsCOm.h (xpcom) differs in where the __declspec
+// is placed. It needs to be done this way to make the 4.x compiler happy...
+#undef NS_EXPORT_
+#define NS_EXPORT_(type) type _declspec(dllexport) __stdcall
+#else
+/* XXX do something useful? */
+#define NS_IMPORT
+#define NS_IMPORT_(type) type
+#define NS_EXPORT
+#define NS_EXPORT_(type) type
+#endif
+
+#ifdef _IMPL_NS_BASE
+#define NS_BASE NS_EXPORT
+#else
+#define NS_BASE NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_NET
+#define NS_NET NS_EXPORT
+#else
+#define NS_NET NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_DOM
+#define NS_DOM NS_EXPORT
+#else
+#define NS_DOM NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_WIDGET
+#define NS_WIDGET NS_EXPORT
+#else
+#define NS_WIDGET NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_VIEW
+#define NS_VIEW NS_EXPORT
+#else
+#define NS_VIEW NS_IMPORT
+#endif
+
+#ifdef _IMPL_NS_GFXNONXP
+#define NS_GFXNONXP NS_EXPORT
+#define NS_GFXNONXP_(type) NS_EXPORT_(type)
+#else
+#define NS_GFXNONXP NS_IMPORT
+#define NS_GFXNONXP_(type) NS_IMPORT_(type)
+#endif
+
+#ifdef _IMPL_NS_GFX
+#define NS_GFX NS_EXPORT
+#define NS_GFX_(type) NS_EXPORT_(type)
+#else
+#define NS_GFX NS_IMPORT
+#define NS_GFX_(type) NS_IMPORT_(type)
+#endif
+
+#ifdef _IMPL_NS_PLUGIN
+#define NS_PLUGIN NS_EXPORT
+#else
+#define NS_PLUGIN NS_IMPORT
+#endif
+
+#endif /* nscore_h___ */

mozilla/base/src/unix/Makefile

@@ -0,0 +1,43 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+
+DEPTH = ../../..
+
+
+LIBRARY_NAME = gmbaseunix
+
+MODULE=raptor
+
+REQUIRES=xpcom raptor 
+
+DEFINES = -D_IMPL_NS_WIDGET 
+
+CPPSRCS= \
+	nsTimer.cpp 
+
+CPP_OBJS=				\
+ ./$(OBJDIR)/nsTimer.o		\
+ $(NULL)
+
+include $(DEPTH)/config/config.mk
+
+TARGETS = $(LIBRARY)
+
+include $(DEPTH)/config/rules.mk
+
+

mozilla/base/src/unix/nsTimer.cpp

@@ -0,0 +1,171 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include "nsCRT.h"
+#include "prlog.h"
+#include <stdio.h>
+#include <limits.h>
+#include "Xm/Xm.h"
+
+static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
+
+// Hack for now. This is Bad because it creates a dependency between the widget
+// library and this library. This needs to be replaced with having code 
+// to pass an interface which can be queried for the app context.
+extern XtAppContext gAppContext;
+
+extern void nsTimerExpired(XtPointer aCallData);
+
+
+/*
+ * Implementation of timers using Xt timer facility 
+ */
+class TimerImpl : public nsITimer {
+public:
+
+public:
+  TimerImpl();
+  virtual ~TimerImpl();
+
+  virtual nsresult Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  virtual nsresult Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  NS_DECL_ISUPPORTS
+
+  virtual void Cancel();
+  virtual PRUint32 GetDelay() { return mDelay; }
+  virtual void SetDelay(PRUint32 aDelay) { mDelay=aDelay; };
+
+  void FireTimeout();
+
+private:
+  nsresult Init(PRUint32 aDelay);
+
+  PRUint32 mDelay;
+  nsTimerCallbackFunc mFunc;
+  void *mClosure;
+  nsITimerCallback *mCallback;
+  // PRBool mRepeat;
+  TimerImpl *mNext;
+  XtIntervalId mTimerId; 
+};
+
+void TimerImpl::FireTimeout()
+{
+  if (mFunc != NULL) {
+    (*mFunc)(this, mClosure);
+  }
+  else if (mCallback != NULL) {
+    mCallback->Notify(this); // Fire the timer
+  }
+
+// Always repeating here
+
+// if (mRepeat)
+//  mTimerId = XtAppAddTimeOut(gAppContext, GetDelay(),(XtTimerCallbackProc)nsTimerExpired, this);
+}
+
+
+TimerImpl::TimerImpl()
+{
+  NS_INIT_REFCNT();
+  mFunc = NULL;
+  mCallback = NULL;
+  mNext = NULL;
+  mTimerId = 0;
+  mDelay = 0;
+}
+
+TimerImpl::~TimerImpl()
+{
+}
+
+nsresult 
+TimerImpl::Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+    mFunc = aFunc;
+    mClosure = aClosure;
+    // mRepeat = aRepeat;
+
+    mTimerId = XtAppAddTimeOut(gAppContext, aDelay,(XtTimerCallbackProc)nsTimerExpired, this);
+
+    return Init(aDelay);
+}
+
+nsresult 
+TimerImpl::Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+    mCallback = aCallback;
+    // mRepeat = aRepeat;
+
+    mTimerId = XtAppAddTimeOut(gAppContext, aDelay, (XtTimerCallbackProc)nsTimerExpired, this);
+
+    return Init(aDelay);
+}
+
+nsresult
+TimerImpl::Init(PRUint32 aDelay)
+{
+    mDelay = aDelay;
+    NS_ADDREF(this);
+
+    return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
+
+
+void
+TimerImpl::Cancel()
+{
+  XtRemoveTimeOut(mTimerId);
+}
+
+NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+{
+    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
+    if (nsnull == aInstancePtrResult) {
+      return NS_ERROR_NULL_POINTER;
+    }  
+
+    TimerImpl *timer = new TimerImpl();
+    if (nsnull == timer) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
+}
+
+
+void nsTimerExpired(XtPointer aCallData)
+{
+  TimerImpl* timer = (TimerImpl *)aCallData;
+  timer->FireTimeout();
+}

mozilla/base/src/windows/makefile.win

@@ -0,0 +1,40 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..\..
+IGNORE_MANIFEST=1
+
+DEFINES=-D_IMPL_NS_BASE 
+LIBRARY_NAME=gmbase 
+MODULE=raptor 
+REQUIRES=xpcom raptor 
+
+CPPSRCS=nsTimer.cpp 
+
+CPP_OBJS=.\$(OBJDIR)\nsTimer.obj 
+
+LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor 
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        -D_IMPL_NS_BASE \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+libs:: $(OBJS)
+	$(MAKE_INSTALL) $(OBJDIR)\nsTimer.obj ..\$(OBJDIR)

mozilla/base/src/windows/nsTimer.cpp

@@ -0,0 +1,373 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include "nsCRT.h"
+#include "prlog.h"
+#include <stdio.h>
+#include <windows.h>
+#include <limits.h>
+
+static NS_DEFINE_IID(kITimerIID, NS_ITIMER_IID);
+
+/*
+ * Implementation of timers lifted from Windows front-end file timer.cpp
+ */
+class TimerImpl : public nsITimer {
+public:
+  static TimerImpl *gTimerList;
+  static UINT gWindowsTimer;
+  static DWORD gNextFire;
+  static DWORD gSyncHack;
+
+  static void ProcessTimeouts(DWORD aNow);
+  static void SyncTimeoutPeriod(DWORD aTickCount);
+
+public:
+  TimerImpl();
+  virtual ~TimerImpl();
+
+  virtual nsresult Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  virtual nsresult Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay);
+
+  NS_DECL_ISUPPORTS
+
+  virtual void Cancel();
+  void Fire(DWORD aNow);
+
+  virtual PRUint32 GetDelay() { return mDelay; }
+  virtual void SetDelay(PRUint32 aDelay) {};
+
+private:
+  nsresult Init(PRUint32 aDelay);
+
+  PRUint32 mDelay;
+  nsTimerCallbackFunc mFunc;
+  void *mClosure;
+  nsITimerCallback *mCallback;
+  DWORD mFireTime;
+  // PRBool mRepeat;
+  TimerImpl *mNext;
+};
+
+TimerImpl *TimerImpl::gTimerList = NULL;
+UINT TimerImpl::gWindowsTimer = 0;
+DWORD TimerImpl::gNextFire = (DWORD)-1;
+DWORD TimerImpl::gSyncHack = 0;
+
+void CALLBACK FireTimeout(HWND aWindow, 
+                          UINT aMessage, 
+                          UINT aTimerID, 
+                          DWORD aTime)
+{
+  static BOOL bCanEnter = TRUE;
+
+  //  Don't allow old timer messages in here.
+  if(aMessage != WM_TIMER)    {
+    PR_ASSERT(0);
+    return;
+  }
+
+  if(aTimerID != TimerImpl::gWindowsTimer)   {
+    return;
+  }
+  
+  //  Block only one entry into this function, or else.
+  if(bCanEnter)   {
+    bCanEnter = FALSE;
+    // see if we need to fork off any timeout functions
+    if(TimerImpl::gTimerList)    {
+      TimerImpl::ProcessTimeouts(aTime);
+    }
+    bCanEnter = TRUE;
+  }
+}
+
+//  Function to correctly have the timer be set.
+void 
+TimerImpl::SyncTimeoutPeriod(DWORD aTickCount)
+{
+    //  May want us to set tick count ourselves.
+    if(aTickCount == 0)    {
+        if(gSyncHack == 0) {
+            aTickCount = ::GetTickCount();
+        }
+        else    {
+            aTickCount = gSyncHack;
+        }
+    }
+
+    //  If there's no list, we should clear the timer.
+    if(!gTimerList) {
+        if(gWindowsTimer) {
+            ::KillTimer(NULL, gWindowsTimer);
+            gWindowsTimer = 0;
+            gNextFire = (DWORD)-1;
+        }
+    }
+    else {
+        //  See if we need to clear the current timer.
+        //  Curcumstances are that if the timer will not
+        //      fire on time for the next timeout.
+        BOOL bSetTimer = FALSE;
+        TimerImpl *pTimeout = gTimerList;
+        if(gWindowsTimer)   {
+            if(pTimeout->mFireTime != gNextFire)   {
+                ::KillTimer(NULL, gWindowsTimer);
+                gWindowsTimer = 0;
+                gNextFire = (DWORD)-1;
+
+                //  Set the timer.
+                bSetTimer = TRUE;
+            }
+        }
+        else    {
+            //  No timer set, attempt.
+            bSetTimer = TRUE;
+        }
+
+        if(bSetTimer)   {
+            DWORD dwFireWhen = pTimeout->mFireTime > aTickCount ?
+                pTimeout->mFireTime - aTickCount : 0;
+            if(dwFireWhen > UINT_MAX)   {
+                dwFireWhen = UINT_MAX;
+            }
+            UINT uFireWhen = (UINT)dwFireWhen;
+
+            PR_ASSERT(gWindowsTimer == 0);
+            gWindowsTimer = ::SetTimer(NULL, 0, uFireWhen, (TIMERPROC)FireTimeout);
+
+            if(gWindowsTimer)   {
+                //  Set the fire time.
+                gNextFire = pTimeout->mFireTime;
+            }
+        }
+    }
+}
+
+// Walk down the timeout list and launch anyone appropriate
+void 
+TimerImpl::ProcessTimeouts(DWORD aNow)
+{
+    TimerImpl *p = gTimerList;
+    if(aNow == 0)   {
+        aNow = ::GetTickCount();
+    }
+
+    BOOL bCalledSync = FALSE;
+
+    //  Set the hack, such that when FE_ClearTimeout
+    //      calls SyncTimeoutPeriod, that GetTickCount()
+    //      overhead is not incurred.
+    gSyncHack = aNow;
+    
+    // loop over all entries
+    while(p) {
+        // send it
+        if(p->mFireTime < aNow) {
+            //  Make sure that the timer cannot be deleted during the
+            //  Fire(...) call which may release *all* other references
+            //  to p...
+            NS_ADDREF(p);
+            p->Fire(aNow);
+
+            //  Clear the timer.
+            //  Period synced.
+            p->Cancel();
+            bCalledSync = TRUE;
+            NS_RELEASE(p);
+
+            //  Reset the loop (can't look at p->pNext now, and called
+            //      code may have added/cleared timers).
+            //  (could do this by going recursive and returning).
+            p = gTimerList;
+        } else {
+            //  Make sure we fire an timer.
+            //  Also, we need to check to see if things are backing up (they
+            //      may be asking to be fired long before we ever get to them,
+            //      and we don't want to pass in negative values to the real
+            //      timer code, or it takes days to fire....
+            if(bCalledSync == FALSE)    {
+                SyncTimeoutPeriod(aNow);
+                bCalledSync = TRUE;
+            }
+            //  Get next timer.
+            p = p->mNext;
+        }
+    }
+    gSyncHack = 0;
+}
+
+
+TimerImpl::TimerImpl()
+{
+  NS_INIT_REFCNT();
+  mFunc = NULL;
+  mCallback = NULL;
+  mNext = NULL;
+  mClosure = nsnull;
+}
+
+TimerImpl::~TimerImpl()
+{
+    Cancel();
+    NS_IF_RELEASE(mCallback);
+}
+
+nsresult 
+TimerImpl::Init(nsTimerCallbackFunc aFunc,
+                void *aClosure,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+    mFunc = aFunc;
+    mClosure = aClosure;
+    // mRepeat = aRepeat;
+
+    return Init(aDelay);
+}
+
+nsresult 
+TimerImpl::Init(nsITimerCallback *aCallback,
+//              PRBool aRepeat, 
+                PRUint32 aDelay)
+{
+    mCallback = aCallback;
+    NS_ADDREF(mCallback);
+    // mRepeat = aRepeat;
+
+    return Init(aDelay);
+}
+
+nsresult
+TimerImpl::Init(PRUint32 aDelay)
+{
+    DWORD dwNow = ::GetTickCount();
+  
+    mDelay = aDelay;
+    mFireTime = (DWORD) aDelay + dwNow;
+    mNext = NULL;
+
+    // add it to the list
+    if(!gTimerList) {        
+        // no list add it
+        gTimerList = this;
+    } 
+    else {
+
+        // is it before everything else on the list?
+        if(mFireTime < gTimerList->mFireTime) {
+
+            mNext = gTimerList;
+            gTimerList = this;
+
+        } else {
+
+            TimerImpl * pPrev = gTimerList;
+            TimerImpl * pCurrent = gTimerList;
+
+            while(pCurrent && (pCurrent->mFireTime <= mFireTime)) {
+                pPrev = pCurrent;
+                pCurrent = pCurrent->mNext;
+            }
+
+            PR_ASSERT(pPrev);
+
+            // insert it after pPrev (this could be at the end of the list)
+            mNext = pPrev->mNext;
+            pPrev->mNext = this;
+
+        }
+
+    }
+
+    NS_ADDREF(this);
+
+    //  Sync the timer fire period.
+    SyncTimeoutPeriod(dwNow);
+    
+    return NS_OK;
+}
+
+NS_IMPL_ISUPPORTS(TimerImpl, kITimerIID)
+
+void
+TimerImpl::Fire(DWORD aNow)
+{
+    if (mFunc != NULL) {
+        (*mFunc)(this, mClosure);
+    }
+    else if (mCallback != NULL) {
+         mCallback->Notify(this);
+    }
+}
+
+void
+TimerImpl::Cancel()
+{
+    TimerImpl *me = this;
+
+    if(gTimerList == this) {
+
+        // first element in the list lossage
+        gTimerList = mNext;
+
+    } else {
+
+        // walk until no next pointer
+        for(TimerImpl * p = gTimerList; p && p->mNext && (p->mNext != this); p = p->mNext)
+            ;
+
+        // if we found something valid pull it out of the list
+        if(p && p->mNext && p->mNext == this) {
+            p->mNext = mNext;
+
+        } else {
+            // get out before we delete something that looks bogus
+            return;
+        }
+
+    }
+
+    // if we got here it must have been a valid element so trash it
+    NS_RELEASE(me);
+
+    //  If there's now no be sure to clear the timer.
+    SyncTimeoutPeriod(0);
+}
+
+NS_BASE nsresult NS_NewTimer(nsITimer** aInstancePtrResult)
+{
+    NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
+    if (nsnull == aInstancePtrResult) {
+      return NS_ERROR_NULL_POINTER;
+    }  
+
+    TimerImpl *timer = new TimerImpl();
+    if (nsnull == timer) {
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+    return timer->QueryInterface(kITimerIID, (void **) aInstancePtrResult);
+}

mozilla/base/tests/CvtURL.cpp

@@ -0,0 +1,105 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include <stdio.h>
+#include "nsIUnicharInputStream.h"
+#include "nsIURL.h"
+#include "nsCRT.h"
+#include "nsString.h"
+#include "prprf.h"
+#include "prtime.h"
+
+static nsCharSetID ConvertCharacterSetName(const char* aName)
+{
+  if (nsCRT::strcasecmp(aName, "iso-latin-1") == 0) {
+    return eCharSetID_IsoLatin1;
+  }
+  return (nsCharSetID) -1;
+}
+
+int main(int argc, char** argv)
+{
+  if (3 != argc) {
+    printf("usage: CvtURL url character-set-name\n");
+    return -1;
+  }
+
+  char* characterSetName = argv[2];
+  nsCharSetID cset = ConvertCharacterSetName(characterSetName);
+  if (PRInt32(cset) < 0) {
+    printf("illegal character set name: '%s'\n", characterSetName);
+    return -1;
+  }
+
+  // Create url object
+  char* urlName = argv[1];
+  nsIURL* url;
+  nsresult rv = NS_NewURL(&url, urlName);
+  if (NS_OK != rv) {
+    printf("invalid URL: '%s'\n", urlName);
+    return -1;
+  }
+
+  // Get an input stream from the url
+  PRInt32 ec;
+  nsIInputStream* in = url->Open(&ec);
+  if (nsnull == in) {
+    printf("open of url('%s') failed: error=%x\n", urlName, ec);
+    return -1;
+  }
+
+  // Translate the input using the argument character set id into unicode
+  nsIUnicharInputStream* uin;
+  rv = NS_NewConverterStream(&uin, nsnull, in, 0, cset);
+  if (NS_OK != rv) {
+    printf("can't create converter input stream: %d\n", rv);
+    return -1;
+  }
+
+  // Read the input and write some output
+  PRTime start = PR_Now();
+  PRInt32 count = 0;
+  for (;;) {
+    PRUnichar buf[1000];
+    PRInt32 nb;
+    ec = uin->Read(buf, 0, 1000, &nb);
+    if (ec < 0) {
+      if (ec != NS_BASE_STREAM_EOF) {
+        printf("i/o error: %d\n", ec);
+      }
+      break;
+    }
+    count += nb;
+  }
+  PRTime end = PR_Now();
+  PRTime conversion, ustoms;
+  LL_I2L(ustoms, 1000);
+  LL_SUB(conversion, end, start);
+  LL_DIV(conversion, conversion, ustoms);
+  char buf[500];
+  PR_snprintf(buf, sizeof(buf),
+              "converting and discarding %d bytes took %lldms",
+              count, conversion);
+  puts(buf);
+
+  // Release the objects
+  in->Release();
+  uin->Release();
+  url->Release();
+
+  return 0;
+}

mozilla/base/tests/Makefile

@@ -0,0 +1,62 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=../..
+
+REQUIRES=xpcom netlib
+
+include $(DEPTH)/config/config.mk
+
+CPPSRCS = \
+	TestAtoms.cpp	\
+	TestCRT.cpp	\
+	$(NULL)
+
+INCLUDES+=-I../src 
+
+OBJS	= $(CPPSRCS:.cpp=.o)
+
+EX_LIBS = \
+	$(DIST)/lib/libraptorbase.a \
+	$(DIST)/lib/libxpcom.a  \
+	$(DIST)/lib/libplc21.a	\
+	$(DIST)/lib/libplds21.a	\
+	$(DIST)/lib/libnspr21.a	\
+	$(NULL)
+
+PROGS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
+
+TARGETS = $(PROGS)
+
+include $(DEPTH)/config/rules.mk
+
+# needed for mac linux
+ifeq (linux,$(ARCH))
+OS_LIBS += /usr/lib/libdl.so
+endif
+
+$(OBJDIR)/%.o: %.cpp
+	@$(MAKE_OBJDIR)
+	$(CCC) -o $@ $(CFLAGS) -c $*.cpp
+
+$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
+	@$(MAKE_OBJDIR)
+	$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)
+
+install:: $(TARGETS)
+	$(INSTALL) $(PROGS) $(DIST)/bin
+

mozilla/base/tests/TestAtoms.cpp

@@ -0,0 +1,108 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "nsIAtom.h"
+#include "nsString.h"
+#include "prprf.h"
+#include "prtime.h"
+#include <stdio.h>
+
+extern "C" int _CrtSetDbgFlag(int);
+
+int main(int argc, char** argv)
+{
+  FILE* fp = fopen("words.txt", "r");
+  if (nsnull == fp) {
+    printf("can't open words.txt\n");
+    return -1;
+  }
+
+  PRInt32 count = 0;
+  PRUnichar** strings = new PRUnichar*[60000];
+  nsIAtom** ids = new nsIAtom*[60000];
+  nsAutoString s1, s2;
+  PRTime start = PR_Now();
+  for (PRInt32 i = 0; i < 60000; i++) {
+    char buf[1000];
+    char* s = fgets(buf, sizeof(buf), fp);
+    if (nsnull == s) {
+      break;
+    }
+    nsAutoString sb(buf);
+    strings[count++] = sb.ToNewUnicode();
+    sb.ToUpperCase();
+    strings[count++] = sb.ToNewUnicode();
+  }
+  PRTime end0 = PR_Now();
+
+  // Find and create idents
+  for (i = 0; i < count; i++) {
+    ids[i] = NS_NewAtom(strings[i]);
+  }
+  PRUnichar qqs[1]; qqs[0] = 0;
+  nsIAtom* qq = NS_NewAtom(qqs);
+  PRTime end1 = PR_Now();
+
+  // Now make sure we can find all the idents we just made
+  for (i = 0; i < count; i++) {
+    nsIAtom* id = NS_NewAtom(ids[i]->GetUnicode());
+    if (id != ids[i]) {
+      id->ToString(s1);
+      ids[i]->ToString(s2);
+      printf("find failed: id='%s' ids[%d]='%s'\n",
+             s1.ToNewCString(), i, s2.ToNewCString());
+      return -1;
+    }
+    NS_RELEASE(id);
+  }
+  PRTime end2 = PR_Now();
+
+  // Destroy all the atoms we just made
+  NS_RELEASE(qq);
+  for (i = 0; i < count; i++) {
+    NS_RELEASE(ids[i]);
+  }
+
+  // Print out timings
+  PRTime end3 = PR_Now();
+  PRTime creates, finds, lookups, dtor, ustoms;
+  LL_I2L(ustoms, 1000);
+  LL_SUB(creates, end0, start);
+  LL_DIV(creates, creates, ustoms);
+  LL_SUB(finds, end1, end0);
+  LL_DIV(finds, finds, ustoms);
+  LL_SUB(lookups, end2, end1);
+  LL_DIV(lookups, lookups, ustoms);
+  LL_SUB(dtor, end3, end2);
+  char buf[500];
+  PR_snprintf(buf, sizeof(buf), "making %d ident strings took %lldms",
+              count, creates);
+  puts(buf);
+  PR_snprintf(buf, sizeof(buf), "%d new idents took %lldms",
+              count, finds);
+  puts(buf);
+  PR_snprintf(buf, sizeof(buf), "%d ident lookups took %lldms",
+              count, lookups);
+  puts(buf);
+  PR_snprintf(buf, sizeof(buf), "dtor took %lldusec", dtor);
+  puts(buf);
+
+  printf("%d live atoms\n", NS_GetNumberOfAtoms());
+  NS_POSTCONDITION(0 == NS_GetNumberOfAtoms(), "dangling atoms");
+
+  return 0;
+}

mozilla/base/tests/TestCRT.cpp

@@ -0,0 +1,89 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "nsCRT.h"
+#include "nsString.h"
+#include "plstr.h"
+#include <stdlib.h>
+
+// Verify that nsCRT versions of string comparison routines get the
+// same answers as the native non-unicode versions. We only pass in
+// iso-latin-1 strings, so the comparision must be valid.
+static void Check(const char* s1, const char* s2, PRIntn n)
+{
+  PRIntn clib = PL_strcmp(s1, s2);
+  PRIntn clib_n = PL_strncmp(s1, s2, n);
+  PRIntn clib_case = PL_strcasecmp(s1, s2);
+  PRIntn clib_case_n = PL_strncasecmp(s1, s2, n);
+
+  nsAutoString t1(s1), t2(s2);
+  const PRUnichar* us1 = t1.GetUnicode();
+  const PRUnichar* us2 = t2.GetUnicode();
+
+  PRIntn u = nsCRT::strcmp(us1, s2);
+  PRIntn u_n = nsCRT::strncmp(us1, s2, n);
+  PRIntn u_case = nsCRT::strcasecmp(us1, s2);
+  PRIntn u_case_n = nsCRT::strncasecmp(us1, s2, n);
+
+  PRIntn u2 = nsCRT::strcmp(us1, us2);
+  PRIntn u2_n = nsCRT::strncmp(us1, us2, n);
+  PRIntn u2_case = nsCRT::strcasecmp(us1, us2);
+  PRIntn u2_case_n = nsCRT::strncasecmp(us1, us2, n);
+
+  NS_ASSERTION(clib == u, "strcmp");
+  NS_ASSERTION(clib_n == u_n, "strncmp");
+  NS_ASSERTION(clib_case == u_case, "strcasecmp");
+  NS_ASSERTION(clib_case_n == u_case_n, "strncasecmp");
+
+  NS_ASSERTION(clib == u2, "strcmp");
+  NS_ASSERTION(clib_n == u2_n, "strncmp");
+  NS_ASSERTION(clib_case == u2_case, "strcasecmp");
+  NS_ASSERTION(clib_case_n == u2_case_n, "strncasecmp");
+}
+
+struct Test {
+  const char* s1;
+  const char* s2;
+  PRIntn n;
+};
+
+static Test tests[] = {
+  { "foo", "foo", 3 },
+  { "foo", "fo", 3 },
+
+  { "foo", "bar", 3 },
+  { "foo", "ba", 3 },
+
+  { "foo", "zap", 3 },
+  { "foo", "za", 3 },
+
+  { "bar", "foo", 3 },
+  { "bar", "fo", 3 },
+
+  { "bar", "foo", 3 },
+  { "bar", "fo", 3 },
+};
+#define NUM_TESTS (sizeof(tests) / sizeof(tests[0]))
+
+void main()
+{
+  Test* tp = tests;
+  for (PRIntn i = 0; i < NUM_TESTS; i++, tp++) {
+    Check(tp->s1, tp->s2, tp->n);
+  }
+}

mozilla/base/tests/TimerTest.cpp

@@ -0,0 +1,202 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#include "prtypes.h"
+#include "nsVoidArray.h"
+#include "nsITimer.h"
+#include "nsITimerCallback.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include "resources.h"
+
+#include <windows.h>
+
+static char* class1Name = "TimerTest";
+
+static HINSTANCE gInstance, gPrevInstance;
+static nsVoidArray *gTimeouts = NULL;
+
+static void CreateRepeat(PRUint32 aDelay);
+
+void
+MyCallback (nsITimer *aTimer, void *aClosure)
+{
+    printf("Timer executed with delay %d\n", (int)aClosure);
+    
+    if (gTimeouts->RemoveElement(aTimer) == PR_TRUE) {
+      NS_RELEASE(aTimer);
+    }
+}
+
+void
+MyRepeatCallback (nsITimer *aTimer, void *aClosure)
+{
+    printf("Timer executed with delay %d\n", (int)aClosure);
+    
+    if (gTimeouts->RemoveElement(aTimer) == PR_TRUE) {
+      NS_RELEASE(aTimer);
+    }
+
+    CreateRepeat((PRUint32)aClosure);
+}
+
+static void
+CreateOneShot(PRUint32 aDelay)
+{
+    nsITimer *timer;
+
+    NS_NewTimer(&timer);
+    timer->Init(MyCallback, (void *)aDelay, aDelay);
+    
+    gTimeouts->AppendElement(timer);
+}
+
+static void
+CreateRepeat(PRUint32 aDelay)
+{
+    nsITimer *timer;
+
+    NS_NewTimer(&timer);
+    timer->Init(MyRepeatCallback, (void *)aDelay, aDelay);
+    
+    gTimeouts->AppendElement(timer);
+}
+
+static void
+CancelAll()
+{
+    int i, count = gTimeouts->Count();
+
+    for (i=0; i < count; i++) {
+        nsITimer *timer = (nsITimer *)gTimeouts->ElementAt(i);
+	
+	if (timer != NULL) {
+	    timer->Cancel();
+	    NS_RELEASE(timer);
+	}
+    }
+
+    gTimeouts->Clear();
+}
+
+long PASCAL
+WndProc(HWND hWnd, UINT msg, WPARAM param, LPARAM lparam)
+{
+  HMENU hMenu;
+
+  switch (msg) {
+    case WM_COMMAND:
+      hMenu = GetMenu(hWnd);
+
+      switch (LOWORD(param)) {
+        case TIMER_EXIT:
+	  ::DestroyWindow(hWnd);
+	  exit(0);
+
+        case TIMER_1SECOND:
+	  CreateOneShot(1000);
+	  break;
+        case TIMER_5SECOND:
+	  CreateOneShot(5000);
+	  break;
+        case TIMER_10SECOND:
+	  CreateOneShot(10000);
+	  break;
+
+        case TIMER_1REPEAT:
+	  CreateRepeat(1000);
+	  break;
+        case TIMER_5REPEAT:
+	  CreateRepeat(5000);
+	  break;
+        case TIMER_10REPEAT:
+	  CreateRepeat(10000);
+	  break;
+
+        case TIMER_CANCEL:
+	  CancelAll();
+	  break;
+
+        default:
+	  break;
+    }
+
+    default:
+      break;
+  }
+
+  return DefWindowProc(hWnd, msg, param, lparam);
+}
+
+static HWND CreateTopLevel(const char* clazz, const char* title,
+                                  int aWidth, int aHeight)
+{
+  // Create a simple top level window
+  HWND window = ::CreateWindowEx(WS_EX_CLIENTEDGE,
+                                 clazz, title,
+                                 WS_OVERLAPPEDWINDOW|WS_CLIPCHILDREN,
+                                 CW_USEDEFAULT, CW_USEDEFAULT,
+                                 aWidth, aHeight,
+                                 HWND_DESKTOP,
+                                 NULL,
+                                 gInstance,
+                                 NULL);
+
+  ::ShowWindow(window, SW_SHOW);
+  ::UpdateWindow(window);
+  return window;
+}
+
+int PASCAL
+WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParam, int nCmdShow)
+{
+  gInstance = instance;
+
+  if (!prevInstance) {
+    WNDCLASS wndClass;
+    wndClass.style = 0;
+    wndClass.lpfnWndProc = WndProc;
+    wndClass.cbClsExtra = 0;
+    wndClass.cbWndExtra = 0;
+    wndClass.hInstance = gInstance;
+    wndClass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    wndClass.hCursor = LoadCursor(NULL, IDC_ARROW);
+    wndClass.hbrBackground = (HBRUSH) GetStockObject(LTGRAY_BRUSH);
+    wndClass.lpszMenuName = class1Name;
+    wndClass.lpszClassName = class1Name;
+    RegisterClass(&wndClass);
+  }
+
+  // Create our first top level window
+  HWND window = CreateTopLevel(class1Name, "Raptor HTML Viewer", 620, 400);
+
+  gTimeouts = new nsVoidArray();
+
+  // Process messages
+  MSG msg;
+  while (GetMessage(&msg, NULL, 0, 0)) {
+      TranslateMessage(&msg);
+      DispatchMessage(&msg);
+  }
+  return msg.wParam;
+}
+
+void main(int argc, char **argv)
+{
+  WinMain(GetModuleHandle(NULL), NULL, 0, SW_SHOW);
+}

mozilla/base/tests/makefile.win

@@ -0,0 +1,90 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=..\..
+
+MAKE_OBJ_TYPE	= EXE
+PROG0 = .\$(OBJDIR)\TimerTest.exe
+PROG1 = .\$(OBJDIR)\TestAtoms.exe
+PROG2 = .\$(OBJDIR)\CvtURL.exe
+PROG3 = .\$(OBJDIR)\TestCRT.exe
+RESFILE = timer.res
+PROGRAMS = $(PROG0) $(PROG1) \
+!ifdef MODULAR_NETLIB
+        $(PROG2) \
+	$(PROG3) \
+!endif
+        $(NULL)
+
+LINCS=-I..\src -I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib
+
+LLIBS=				\
+ $(DIST)\lib\xpcom32.lib	\
+ $(DIST)\lib\raptorbase.lib	\
+!ifdef MODULAR_NETLIB
+ $(DIST)\lib\netlib.lib         \
+!endif
+ $(LIBNSPR)			\
+ $(DIST)\lib\libplc21.lib	\
+!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
+ $(GLOWDIR)\glowcode.lib	\
+!endif
+ $(RESFILE)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(PROGRAMS)
+	$(MAKE_INSTALL) $(PROG0) $(DIST)\bin
+	$(MAKE_INSTALL) $(PROG1) $(DIST)\bin
+!ifdef MODULAR_NETLIB
+	$(MAKE_INSTALL) $(PROG2) $(DIST)\bin
+	$(MAKE_INSTALL) $(PROG3) $(DIST)\bin
+!endif
+
+clobber::
+	rm -f $(DIST)\bin\TimerTest.exe
+	rm -f $(DIST)\bin\TestAtoms.exe
+!ifdef MODULAR_NETLIB
+	rm -f $(DIST)\bin\CvtURL.exe
+	rm -f $(DIST)\bin\TestCRT.exe
+!endif
+
+# Move this into config/obj.inc when it's allowed
+.cpp{.\$(OBJDIR)\}.exe:
+    $(CC) @<<$(CFGFILE)
+        $(CFLAGS)
+        $(LCFLAGS)
+        $(LINCS)
+        $(LINCS_1)
+        $(INCS)
+        $(LLIBS)
+        $(OS_LIBS)
+        -Fd$(PBDFILE)
+        -Fe.\$(OBJDIR)\
+        -Fo.\$(OBJDIR)\
+        $(CURDIR)$(*B).cpp
+<<KEEP
+
+$(PROG0): $(OBJDIR) TimerTest.cpp $(RESFILE)
+
+$(PROG1): $(OBJDIR) TestAtoms.cpp
+
+!ifdef MODULAR_NETLIB
+$(PROG2): $(OBJDIR) CvtURL.cpp
+
+$(PROG3): $(OBJDIR) TestCRT.cpp
+!endif

mozilla/base/tests/resources.h

@@ -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 Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#ifndef resources_h___
+#define resources_h___
+
+#define TIMER_1SECOND             40000
+#define TIMER_5SECOND             40001
+#define TIMER_10SECOND            40002
+
+#define TIMER_1REPEAT             40003
+#define TIMER_5REPEAT             40004
+#define TIMER_10REPEAT            40005
+
+#define TIMER_CANCEL              40006
+#define TIMER_EXIT                40010
+
+#endif /* resources_h___ */

mozilla/base/tests/timer.rc

@@ -0,0 +1,38 @@
+/*
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+#include "resources.h"
+
+TIMERTEST MENU DISCARDABLE
+{
+  POPUP "Debug"
+  {
+    POPUP "One Shot"
+    {
+      MENUITEM "1 second", TIMER_1SECOND
+      MENUITEM "5 second", TIMER_5SECOND
+      MENUITEM "10 second", TIMER_10SECOND
+    }
+    POPUP "Repeated"
+    {
+      MENUITEM "1 second", TIMER_1REPEAT
+      MENUITEM "5 second", TIMER_5REPEAT
+      MENUITEM "10 second", TIMER_10REPEAT
+    }
+    MENUITEM "Cancel All", TIMER_CANCEL
+    MENUITEM "Exit", TIMER_EXIT
+  }
+}

mozilla/build/build_number

@@ -1 +1 @@
-5009808600
+5009821211

mozilla/build/mac/BuildList.pm

@@ -0,0 +1,345 @@
+#!perl
+
+package			BuildList;
+require			Exporter;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(BuildMozilla DistMozilla);
+
+=head1 NAME
+
+BuildList - build the [ordered] set of projects needed to construct Mozilla
+
+=head1 SYNOPSIS
+
+...
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public License
+Version 1.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut
+
+		use Moz;
+		use File::Path;
+		
+sub BuildMozilla()
+	{
+		if ( $main::DEBUG )
+			{
+				$D = "Debug";
+				$dist_dir = ":mozilla:dist:client_debug:";
+			}
+		else
+			{
+				$D = "";
+				$dist_dir = ":mozilla:dist:client:";
+			}
+		
+			#
+			# Build the appropriate target of each project
+			#
+
+		BuildProjectClean(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",							"Stubs");
+		BuildProjectClean(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",						"Stubs");
+		BuildProjectClean(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",			"Stubs");
+		BuildProjectClean(":mozilla:cmd:macfe:projects:client:NavigatorStubs.mcp",			"Stubs");
+		
+		BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",							"NSRuntime$D.shlb");
+		MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:cmd:macfe:restext:StringLib.mcp",							"Strings$D.shlb");
+		MakeAlias(":mozilla:cmd:macfe:restext:Strings$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.mcp",					"MoreFiles$D.shlb");
+		MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp",								"NSPR20$D.shlb");
+		MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:dbm:macbuild:DBMPPC.mcp",									"DBM$D.shlb");
+		MakeAlias(":mozilla:dbm:macbuild:DBM$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",				"MemAllocator$D.shlb");
+		MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",								"NSStdLib$D.shlb");
+		MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp",								"xpcom$D.shlb");
+		MakeAlias(":mozilla:xpcom:macbuild:xpcom$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp",							"PowerPlant$D.shlb");		
+		MakeAlias(":mozilla:lib:mac:PowerPlant:PowerPlant$D.shlb", "$dist_dir");
+
+		BuildProject(":mozilla:modules:progress:macbuild:ProgressPPC.mcp",					"Progress$D.shlb");
+		MakeAlias(":mozilla:modules:progress:macbuild:Progress$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp",								"zlib$D.shlb");
+		MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp",										"JPEG$D.shlb");
+		MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:sun-java:stubs:macbuild:JavaStubs.mcp",						"JavaRuntime$D.shlb");
+		MakeAlias(":mozilla:sun-java:stubs:macbuild:JavaRuntime$D.shlb", "$dist_dir");	
+		
+		BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPC.mcp", 								"JSJ$D.o");
+		
+		BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp",								"JavaScript$D.shlb");
+		MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:js:macbuild:LiveConnect.mcp",								"LiveConnect$D.shlb");
+		MakeAlias(":mozilla:js:macbuild:LiveConnect$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:nav-java:stubs:macbuild:NavJavaStubs.mcp",					"NavJava$D.shlb");
+		MakeAlias(":mozilla:nav-java:stubs:macbuild:NavJava$D.shlb", "$dist_dir");
+
+		BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp", 								"RDF$D.shlb");
+		MakeAlias(":mozilla:modules:rdf:macbuild:RDF$D.shlb", "$dist_dir");
+	
+		BuildProject(":mozilla:modules:xml:macbuild:XML.mcp",								"XML$D.shlb");
+		MakeAlias(":mozilla:modules:xml:macbuild:XML$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:modules:schedulr:macbuild:Schedulr.mcp",						"Scheduler$D.shlb");
+		MakeAlias(":mozilla:modules:schedulr:macbuild:Scheduler$D.shlb", "$dist_dir");
+			
+		BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp",							"CustomLib$D.shlb");
+		MakeAlias(":mozilla:build:mac:CustomLib:CustomLib$D.shlb", "$dist_dir");
+		
+		BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",			"Security.o");
+		BuildProject(":mozilla:modules:libfont:macbuild:FontBroker.mcp",					"FontBroker$D.o");
+		BuildProject(":mozilla:modules:oji:macbuild:oji.mcp",								"oji$D.o");
+		BuildProject(":mozilla:lib:libmocha:macbuild:LibMocha.mcp",							"LibMocha$D.o");	
+
+		if ( $main::MOZ_DARK == 1 )
+		{
+			BuildProject(":mozilla:network:macbuild:network.mcp",							"Network$D.o (mailnews)");
+		}
+		else
+		{
+			BuildProject(":mozilla:network:macbuild:network.mcp",							"Network$D.o");
+		}
+		BuildProject(":mozilla:caps:macbuild:Caps.mcp",										"Caps$D.o");
+
+		BuildProject(":mozilla:modules:libimg:macbuild:png.mcp",						"png$D.o");
+		BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp",					"libimg$D.o");
+
+		BuildProject(":mozilla:build:mac:CustomLib:CustomLib.mcp",							"CustomStaticLib$D.o");
+		
+		if ( $main::MOZ_LITE == 1 )
+		{
+			BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"MailNews$D.o");
+			BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"Composer$D.o");
+			BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"Nav_Resources");
+		}
+		else
+		{
+			if ( $main::MOZ_MEDIUM == 1 )
+			{
+				BuildProject(":mozilla:cmd:macfe:projects:dummies:MakeDummies.mcp",				"MailNews$D.o");
+				BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",					"Composer$D.o");
+				BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"Moz_Resources");
+			}
+			else
+			{
+				if ( $main::MOZ_DARK == 1 )
+				{
+					BuildProject(":ns:lib:libneo:mac:macbuild:NeoLib.mcp",							"NeoLib$D.o");
+					MakeAlias(   ":ns:lib:libneo:mac:macbuild:NeoLib$D.o", "$dist_dir");				
+					BuildProject(":mozilla:lib:libmsg:macbuild:MsgLib.mcp",							"MsgLib$D.o (secure)");
+					MakeAlias(   ":mozilla:lib:libmsg:macbuild:MsgLib$D.o", "$dist_dir");				
+					BuildProject(":mozilla:directory:c-sdk:ldap:libraries:macintosh:LDAPClient.mcp","LDAPClient$D.o");
+					MakeAlias(   ":mozilla:directory:c-sdk:ldap:libraries:macintosh:LDAPClient$D.o", "$dist_dir");				
+
+					BuildProject(":mozilla:cmd:macfe:MailNews:build:MailNews.mcp",					"MailNews$D.o");
+					BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",					"Composer$D.o");
+					BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 					"MozDark_Resources");
+				}
+			}
+		}
+		
+		BuildProject(":mozilla:cmd:macfe:projects:client:Client.mcp", 						"Client$D");
+	}
+
+
+sub DistMozilla()
+	{
+		mkpath([ ":mozilla:dist:", ":mozilla:dist:client:", ":mozilla:dist:client_debug:", ":mozilla:dist:client_stubs:" ]);
+
+		#CONFIG
+		InstallFromManifest(":mozilla:config:mac:MANIFEST",								":mozilla:dist:config:");
+		InstallFromManifest(":mozilla:config:mac:MANIFEST_config",						":mozilla:dist:config:");
+
+		#INCLUDE
+		InstallFromManifest(":mozilla:include:MANIFEST",								":mozilla:dist:include:");
+		InstallFromManifest(":mozilla:cmd:macfe:pch:MANIFEST",							":mozilla:dist:include:");
+
+		#MAC_COMMON
+		InstallFromManifest(":mozilla:build:mac:MANIFEST",								":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:NSStdLib:include:MANIFEST",				":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST",		":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:Misc:MANIFEST",							":mozilla:dist:mac:common:");
+		InstallFromManifest(":mozilla:lib:mac:MoreFiles:MANIFEST",						":mozilla:dist:mac:common:morefiles:");
+		InstallFromManifest(":mozilla:cmd:macfe:MANIFEST",								":mozilla:dist:mac:macfe:");
+
+		#NSPR
+		InstallFromManifest(":mozilla:nsprpub:pr:include:MANIFEST",						":mozilla:dist:nspr:");
+		InstallFromManifest(":mozilla:nsprpub:pr:src:md:mac:MANIFEST",					":mozilla:dist:nspr:mac:");
+		InstallFromManifest(":mozilla:nsprpub:lib:ds:MANIFEST",							":mozilla:dist:nspr:");
+		InstallFromManifest(":mozilla:nsprpub:lib:libc:include:MANIFEST",				":mozilla:dist:nspr:");
+		InstallFromManifest(":mozilla:nsprpub:lib:msgc:include:MANIFEST",				":mozilla:dist:nspr:");
+		
+		#DBM
+		InstallFromManifest(":mozilla:dbm:include:MANIFEST",							":mozilla:dist:dbm:");
+		
+		#LIBIMAGE
+		InstallFromManifest(":mozilla:modules:libimg:png:MANIFEST",						":mozilla:dist:libimg:");
+		InstallFromManifest(":mozilla:modules:libimg:src:MANIFEST",						":mozilla:dist:libimg:");
+		InstallFromManifest(":mozilla:modules:libimg:public:MANIFEST",					":mozilla:dist:libimg:");
+		
+		#SECURITY_freenav
+		InstallFromManifest(":mozilla:modules:security:freenav:MANIFEST",				":mozilla:dist:security:");
+		
+		#XPCOM
+		InstallFromManifest(":mozilla:xpcom:src:MANIFEST",								":mozilla:dist:xpcom:");
+		
+		#ZLIB
+		InstallFromManifest(":mozilla:modules:zlib:src:MANIFEST",						":mozilla:dist:zlib:");
+				
+		#JPEG
+		InstallFromManifest(":mozilla:jpeg:MANIFEST",									":mozilla:dist:jpeg:");
+		
+		#JSJ
+		# beard: this conflicts with LiveConnect's jsjava.h.
+		#InstallFromManifest(":mozilla:js:jsj:MANIFEST",								":mozilla:dist:jsj:");
+		
+		#JSDEBUG
+		InstallFromManifest(":mozilla:js:jsd:MANIFEST",									":mozilla:dist:jsdebug:");
+		
+		#JS
+		InstallFromManifest(":mozilla:js:src:MANIFEST",									":mozilla:dist:js:");
+		
+		#LIVECONNECT
+		InstallFromManifest(":mozilla:js:src:liveconnect:MANIFEST",						":mozilla:dist:liveconnect:");
+		
+		#RDF
+		InstallFromManifest(":mozilla:modules:rdf:include:MANIFEST",					":mozilla:dist:rdf:");
+		
+		#XML
+		InstallFromManifest(":mozilla:modules:xml:glue:MANIFEST",						":mozilla:dist:xml:");
+		InstallFromManifest(":mozilla:modules:xml:expat:xmlparse:MANIFEST",				":mozilla:dist:xml:");
+		
+		#LIBFONT
+		InstallFromManifest(":mozilla:modules:libfont:MANIFEST",						":mozilla:dist:libfont:");
+		InstallFromManifest(":mozilla:modules:libfont:src:MANIFEST",					":mozilla:dist:libfont:");
+		
+		#LDAP
+		if ( $main::MOZ_LDAP ||  $main::MOZ_DARK )
+			{
+				InstallFromManifest(":mozilla:directory:c-sdk:ldap:include:MANIFEST",	":mozilla:dist:ldap:");
+			}
+
+		#PRIVACY
+		InstallFromManifest(":mozilla:privacy:public:MANIFEST", ":mozilla:dist:privacy:");
+			
+		#SCHEDULER
+		InstallFromManifest(":mozilla:modules:schedulr:public:MANIFEST",				":mozilla:dist:schedulr:");
+		
+		#NETWORK
+		InstallFromManifest(":mozilla:network:cache:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:client:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:cnvts:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:cstream:MANIFEST",						":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:main:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:mimetype:MANIFEST",						":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:util:MANIFEST",							":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:about:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:certld:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:dataurl:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:file:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:ftp:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:gopher:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:http:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:imap4:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:js:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:ldap:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:mailbox:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:marimba:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:nntp:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:pop3:MANIFEST",					":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:remote:MANIFEST",				":mozilla:dist:network:");
+		InstallFromManifest(":mozilla:network:protocol:smtp:MANIFEST",					":mozilla:dist:network:");
+		
+		#HTML_DIALOGS
+		InstallFromManifest(":mozilla:lib:htmldlgs:MANIFEST",							":mozilla:dist:htmldlgs:");
+		
+		#LAYOUT
+		InstallFromManifest(":mozilla:lib:layout:MANIFEST",								":mozilla:dist:layout:");
+		
+		#LAYERS
+		InstallFromManifest(":mozilla:lib:liblayer:include:MANIFEST",					":mozilla:dist:layers:");
+		
+		#PARSE
+		InstallFromManifest(":mozilla:lib:libparse:MANIFEST",							":mozilla:dist:libparse:");
+		
+		#STYLE
+		InstallFromManifest(":mozilla:lib:libstyle:MANIFEST",							":mozilla:dist:libstyle:");
+		
+		#PLUGIN
+		InstallFromManifest(":mozilla:modules:plugin:public:MANIFEST",					":mozilla:dist:plugin:");
+		InstallFromManifest(":mozilla:modules:plugin:src:MANIFEST",						":mozilla:dist:plugin:");
+		
+		#LIBHOOK
+		InstallFromManifest(":mozilla:modules:libhook:public:MANIFEST",					":mozilla:dist:libhook:");
+		
+		#LIBPREF
+		InstallFromManifest(":mozilla:modules:libpref:public:MANIFEST",					":mozilla:dist:libpref:");
+		
+		#LIBREG
+		InstallFromManifest(":mozilla:modules:libreg:include:MANIFEST",					":mozilla:dist:libreg:");
+		
+		#LIBUTIL
+		InstallFromManifest(":mozilla:modules:libutil:public:MANIFEST",					":mozilla:dist:libutil:");
+		
+		#PROGRESS
+		InstallFromManifest(":mozilla:modules:progress:public:MANIFEST",				":mozilla:dist:progress:");
+		
+		#EDTPLUG
+		InstallFromManifest(":mozilla:modules:edtplug:include:MANIFEST", 				":mozilla:dist:edtplug:");
+
+		#NAV_JAVA
+		InstallFromManifest(":mozilla:nav-java:stubs:include:MANIFEST",					":mozilla:dist:nav-java:");
+		InstallFromManifest(":mozilla:nav-java:stubs:macjri:MANIFEST",					":mozilla:dist:nav-java:");
+		
+		#SUN_JAVA
+		InstallFromManifest(":mozilla:sun-java:stubs:include:MANIFEST",					":mozilla:dist:sun-java:");
+		InstallFromManifest(":mozilla:sun-java:stubs:macjri:MANIFEST",					":mozilla:dist:sun-java:");
+
+		#OJI
+		InstallFromManifest(":mozilla:modules:oji:public:MANIFEST",						":mozilla:dist:oji:");
+		InstallFromManifest(":mozilla:modules:oji:src:MANIFEST",						":mozilla:dist:oji:");
+
+		#CAPS
+		InstallFromManifest(":mozilla:caps:include:MANIFEST",							":mozilla:dist:caps:");
+
+		#BASE
+		InstallFromManifest(":mozilla:base:public:MANIFEST",							":mozilla:dist:base:");
+		InstallFromManifest(":mozilla:base:src:MANIFEST",								":mozilla:dist:base:");
+	}
+
+1;
+

mozilla/build/mac/BuildListObsolete.pm

@@ -0,0 +1,143 @@
+#!perl
+
+package			BuildListObsolete;
+require			Exporter;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(BuildMozilla);
+
+=head1 NAME
+
+BuildList - build the [ordered] set of projects needed to construct Mozilla
+
+=head1 SYNOPSIS
+
+...
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public License
+Version 1.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut
+
+
+sub BuildMozilla()
+	{
+		use Moz;
+
+		chdir(":::"); # assuming this script is in "...:mozilla:build:mac:", change dir to just inside "mozilla"
+
+
+		if ( $main::DEBUG )
+			{
+				$D = " (Debug)";
+				$LibD = "Debug";
+				$dist_dir = ":dist:client_debug:";
+			}
+		else
+			{
+				$D = "";
+				$LibD = "";
+				$dist_dir = ":dist:client:";
+			}
+
+			#
+			# Build the appropriate target of each project
+			#
+
+		BuildProjectClean(":lib:mac:NSStdLib:NSStdLib.mcp",										"Stub Library");
+		BuildProjectClean(":lib:mac:MacMemoryAllocator:MemAllocator.mcp",			"Stub Library");
+		BuildProjectClean(":cmd:macfe:projects:client:Navigator.mcp",					"Stub Library");
+		
+		BuildProject(":lib:mac:NSRuntime:NSRuntime.mcp");
+		MakeAlias(":lib:mac:NSRuntime:NSRuntimePPCLib", "$dist_dir");
+		
+		BuildProject(":cmd:macfe:restext:NavStringLibPPC.mcp");
+		MakeAlias(":cmd:macfe:restext:StringsPPCLib", "$dist_dir");
+		
+		BuildProject(":lib:mac:MoreFiles:build:MoreFilesPPC.prj");
+		MakeAlias(":lib:mac:MoreFiles:build:MoreFilesPPC.lib", "$dist_dir");
+		
+		BuildProject(":nsprpub:macbuild:NSPR20PPC".$LibD.".mcp");
+		MakeAlias(":nsprpub:macbuild:NSPR20PPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":dbm:macbuild:DBMPPC".$LibD.".mcp");
+		MakeAlias(":dbm:macbuild:DBMPPC".$LibD."Lib", "${dist_dir}");
+
+		BuildProject(":lib:mac:MacMemoryAllocator:MemAllocator.mcp",					"PPC Shared Library$D");
+		MakeAlias(":lib:mac:MacMemoryAllocator:MemAllocatorPPC".$LibD."Lib", "$dist_dir");
+			
+		BuildProject(":lib:mac:NSStdLib:NSStdLib.mcp",												"PPC Shared Library");
+		MakeAlias(":lib:mac:NSStdLib:NSStdLibPPCLib", "$dist_dir");
+		
+		BuildProject(":modules:security:freenav:macbuild:NoSecurity.mcp",			"PPC Shared Library$D");
+		MakeAlias(":modules:security:freenav:macbuild:NoSecurity".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":xpcom:macbuild:xpcomPPC".$LibD.".mcp");
+		MakeAlias(":xpcom:macbuild:xpcomPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":lib:mac:PowerPlant:PowerPlant.mcp");		
+		MakeAlias(":lib:mac:PowerPlant:PowerPlantPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":modules:zlib:macbuild:zlib.mcp",												"PPC Shared Library$D");
+		MakeAlias(":modules:zlib:macbuild:zlibPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":jpeg:macbuild:JPEG.mcp",																"PPC Shared Library$D");
+		MakeAlias(":jpeg:macbuild:JPEGPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":sun-java:stubs:macbuild:JavaStubs.mcp",								"PPC Shared Library$D");
+		MakeAlias(":sun-java:stubs:macbuild:JavaRuntimePPC".$LibD."Lib", "$dist_dir");	
+		
+		BuildProject(":js:jsj:macbuild:JSJ_PPC".$LibD.".mcp");
+		
+		BuildProject(":js:macbuild:JavaScriptPPC".$LibD.".mcp");
+		MakeAlias(":js:macbuild:JavaScriptPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":nav-java:stubs:macbuild:NavJavaStubs.mcp",							"PPC Shared Library$D");
+		MakeAlias(":nav-java:stubs:macbuild:NavJavaPPC".$LibD."Lib", "$dist_dir");
+
+		if ( $main::DEBUG )
+			{
+				BuildProject(":modules:rdf:macbuild:RDF.mcp", 										"PPC Shared Library +D -LDAP");
+				MakeAlias(":modules:rdf:macbuild:RDFPPCDebugLib", "${dist_dir}");
+			}
+		else
+			{
+				Moz::BuildProject(":modules:rdf:macbuild:RDF.mcp", 								"PPC Shared Library -LDAP");
+				MakeAlias(":modules:rdf:macbuild:RDFPPCLib", "${dist_dir}");
+			}
+
+		BuildProject(":modules:xml:macbuild:XML.mcp",													"PPC Shared Library$D");
+		MakeAlias(":modules:xml:macbuild:XMLPPC".$LibD."Lib", "$dist_dir");
+		
+		BuildProject(":modules:libfont:macbuild:FontBroker.mcp",							"PPC Library$D");
+				
+		BuildProject(":modules:schedulr:macbuild:Schedulr.mcp",								"PPC Shared Library$D");
+		MakeAlias(":modules:schedulr:macbuild:Schedulr".$LibD."PPCLib", "$dist_dir");
+		
+		BuildProject(":network:macbuild:network.mcp",													"PPC Library (Debug Moz)");
+		
+		if ( $main::MOZ_LITE == 0 )
+			{
+				BuildProject(":cmd:macfe:Composer:build:Composer.mcp",						"PPC Library$D");
+			}
+		
+		BuildProject(":cmd:macfe:projects:client:Navigator.mcp", 							"Moz PPC App$D");
+	}
+
+1;
+
+

mozilla/build/mac/BuildMozilla.pl

@@ -0,0 +1,40 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+	use Moz;
+	use BuildList;
+
+$DEBUG = 0;
+
+	# One of them should be 1. This will come from a config file at some stage.
+	# In the meanwhile, it should match mozilla/config/mac/MacConfig.h
+$MOZ_LITE   = 0;
+$MOZ_MEDIUM = 1;
+$MOZ_DARK   = 0;
+
+Moz::OpenErrorLog(":::Mozilla.BuildLog");
+Moz::StopForErrors();
+
+chdir("::::");
+
+# Make and popuplate the dist directory
+DistMozilla();
+
+# Now build the projects
+BuildMozilla();

mozilla/build/mac/BuildMozilla.pm

@@ -0,0 +1,124 @@
+#!perl
+
+package			BuildMozilla;
+require			Exporter;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(BuildMozilla);
+
+=head1 NAME
+
+BuildMozilla - build the [ordered] set of projects needed to construct Mozilla
+
+=head1 COPYRIGHT
+
+The contents of this file are subject to the Netscape Public License
+Version 1.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut
+
+
+sub BuildMozilla()
+	{
+		use Moz;
+
+		chdir("::::"); # assuming this script is in "...:mozilla:build:mac:", change dir to just above "mozilla"
+
+
+		# Ideally, we would set the target name like so:
+		# $target = $main::DEBUG ? "debug" : "optimized";
+		# ...and all projects would have corresponding targets
+
+
+		$D = $main::DEBUG ? " (Debug)" : "";	# $D becomes a suffix to target names for selecting either the debug or non-debug target of a project
+
+
+			#
+			# Build the appropriate target of each project
+			#
+
+		Moz::BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",              				"Stub Library");
+		Moz::BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",				"Stub Library");
+		Moz::BuildProject(":mozilla:cmd:macfe:projects:client:Navigator.mcp",    				"Stub Library");
+
+		Moz::BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp");
+		Moz::BuildProject(":mozilla:cmd:macfe:restext:NavStringLibPPC.mcp");
+		Moz::BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.prj");
+
+		if ( $main::DEBUG )
+			{
+				Moz::BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPCDebug.mcp");
+				Moz::BuildProject(":mozilla:dbm:macbuild:DBMPPCDebug.mcp");
+			}
+		else
+			{
+				Moz::BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp");
+				Moz::BuildProject(":mozilla:dbm:macbuild:DBMPPC.mcp");
+			}
+
+		Moz::BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",				"PPC Shared Library$D");
+		Moz::BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",              				"PPC Shared Library");
+		Moz::BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",	"PPC Shared Library$D");
+
+		if ( $main::DEBUG )
+			{
+				Moz::BuildProject(":mozilla:xpcom:macbuild:xpcomPPCDebug.mcp");
+			}
+		else
+			{
+				Moz::BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp");
+			}
+
+		Moz::BuildProject(":mozilla:lib:mac:PowerPlant:PowerPlant.mcp");
+		Moz::BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp",            			  "PPC Shared Library$D");
+		Moz::BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp",                    			  "PPC Shared Library$D");
+		Moz::BuildProject(":mozilla:sun-java:stubs:macbuild:JavaStubs.mcp",      				"PPC Shared Library$D");
+
+		if ( $main::DEBUG )
+			{
+				Moz::BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPCDebug.mcp");
+				Moz::BuildProject(":mozilla:js:macbuild:JavaScriptPPCDebug.mcp");
+			}
+		else
+			{
+				Moz::BuildProject(":mozilla:js:jsj:macbuild:JSJ_PPC.mcp");
+				Moz::BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp");
+			}
+
+		Moz::BuildProject(":mozilla:nav-java:stubs:macbuild:NavJavaStubs.mcp",   				"PPC Shared Library$D");
+
+
+		# the following `if' can be fixed when we either rename the debug target of the RDF project, or of all the other projects
+
+		if ( $main::DEBUG )
+			{
+				Moz::BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp",               		"PPC Shared Library +D -LDAP");
+			}
+		else
+			{
+				Moz::BuildProject(":mozilla:modules:rdf:macbuild:RDF.mcp",               		"PPC Shared Library -LDAP");
+			}
+
+		Moz::BuildProject(":mozilla:modules:xml:macbuild:XML.mcp",               				"PPC Shared Library$D");
+		Moz::BuildProject(":mozilla:modules:libfont:macbuild:FontBroker.mcp",    				"PPC Library$D");
+		Moz::BuildProject(":mozilla:modules:schedulr:macbuild:Schedulr.mcp",     				"PPC Shared Library$D");
+		Moz::BuildProject(":mozilla:network:macbuild:network.mcp",											"PPC Library (Debug Moz)");
+		Moz::BuildProject(":mozilla:cmd:macfe:Composer:build:Composer.mcp",   					"PPC Library$D");
+		Moz::BuildProject(":mozilla:cmd:macfe:projects:client:Navigator.mcp",   				"Moz PPC App$D");
+	}
+
+1;
+
+

mozilla/build/mac/BuildMozillaDebug.pl

@@ -0,0 +1,40 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+	use Moz;
+	use BuildList;
+
+$DEBUG = 1;
+
+	# One of them should be 1. This will come from a config file at some stage.
+	# In the meanwhile, it should match mozilla/config/mac/MacConfig.h
+$MOZ_LITE   = 0;
+$MOZ_MEDIUM = 1;
+$MOZ_DARK   = 0;
+
+Moz::OpenErrorLog(":::Mozilla.BuildLog");
+Moz::StopForErrors();
+
+chdir("::::");
+
+# Make and popuplate the dist directory
+DistMozilla();
+
+# Now build the projects
+BuildMozilla();

mozilla/build/mac/BuildNGLayoutDebug.pl

@@ -0,0 +1,134 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+#
+# nglayout build script (debug)
+#
+use NGLayoutBuildList;
+use Cwd;
+use Moz;
+
+# configuration variables
+$DEBUG = 1;
+$pull{all} = 0;
+$pull{lizard} = 0;
+$pull{xpcom} = 0;
+$pull{imglib} = 0;
+$pull{netlib} = 0;
+$pull{nglayout} = 0;
+$pull{mac} = 0;
+
+$build{all} = 0;
+$build{dist} = 0;
+$build{common}= 0;
+$build{nglayout}= 0;
+
+
+#
+# UI
+#
+
+@choices = ("pull_and_build_all", 
+						"pull_all", 
+						"build_all",  
+						"pull_nglayout", 
+						"build_dist", 
+						"build_projects");
+#damn, this does not work on 
+if (0)
+{
+  while (GetFrontProcess	() !=  GetCurrentProcess())
+  {
+	   SetFrontProcess( GetCurrentProcess() );
+  }
+	@pick = MacPerl::Pick("What would you like to do?", @choices);
+	$pull{all} = 0;
+	$build{all} = 1;
+	foreach $i (@pick)
+	{
+		if ($i eq "pull_and_build_all")
+		{
+			$pull{all} = 1;
+			$build{all} = 1;
+		}
+		elsif ($i eq "pull_all")
+		{
+			$pull{all} = 1;
+		}
+		elsif ($i eq "build_all")
+		{
+			$build{all} = 1;
+		}
+		elsif ($i eq "build_dist")
+		{
+			$build{dist} = 1;
+		}
+		elsif ($i eq "build_projects")
+		{
+			$build{projects} = 1;
+		}
+	}
+}
+else
+{
+	$pull{all} = 1;
+	$build{all} = 1;
+#	$pull{netlib} = 1;
+#	$pull{nglayout} = 1;
+#	$build{common} = 1;
+#	$build{nglayout} = 1;
+# $build{dist} = 1;
+#	$pull{nglayout} = 1;
+}
+
+if ($pull{all})
+{
+	foreach $k (keys(%pull))
+	{
+		$pull{$k} = 1;
+	}
+}
+if ($build{all})
+{
+	foreach $k (keys(%build))
+	{
+		$build{$k} = 1;
+	}
+}
+
+# do the work
+# you should not have to edit anything bellow
+
+chdir("::::");
+$MOZ_SRC = cwd();
+
+Moz::StopForErrors();
+#Moz::DontStopForErrors();
+
+#OpenErrorLog("::NGLayoutBuildLog");
+OpenErrorLog(":::Mozilla.BuildLog");		# Tinderbox requires that name
+Checkout();
+
+chdir($MOZ_SRC);
+BuildDist();
+
+chdir($MOZ_SRC);
+BuildProjects();
+
+print "Build layout complete\n";

mozilla/build/mac/CodeWarriorLib.pm

@@ -0,0 +1,374 @@
+#!perl
+package 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 Mac::AppleEvents::Simple;
+use Mac::AppleEvents;
+use Mac::Processes;
+use Mac::MoreFiles;
+use Mac::Types;
+use File::Basename;
+
+use vars qw($VERSION);
+$VERSION = '1.01';
+
+my($app)  = 'CWIE';
+
+# 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;
+
+# 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 ($full_path eq _full_path($cp)) {
+					return($cp);
+				}
+			}
+		} else {     # is only one, not a list
+			if ($full_path eq _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
+
+sub build_project ($;$$$) {
+	my(
+		$full_path, $target_name, $error_path,
+		$remove_object, $p, $project_was_closed, $had_errors
+	) = @_;
+	_close_errors_window();
+
+	while (1) {
+		$p = _get_project($full_path);
+		if (!$p) {
+			return if ($project_was_closed);
+			$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 ($project_was_closed) {
+		$p = _get_project($full_path);
+		_close($p);
+	}
+
+	return($had_errors);
+}
+
+=pod
+
+=item activate()
+
+Launches CodeWarrior and brings it to the front.
+
+Once found, path will be saved in ':idepath.txt' 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 () {
+	local(*F);
+	my($filepath, $appath, $psi) = (':idepath.txt');
+
+	foreach $psi (values(%Process)) {
+		if ($psi->processSignature() eq $app) {
+			$appath = $psi->processAppSpec(), "\n";
+		}
+		_save_appath($filepath, $appath);
+	}
+
+	if ((!$appath || ! -x $appath) && open(F, $filepath)) {
+		$appath = <F>;
+		close(F);
+	}
+
+	if (!$appath || ! -x $appath) {
+		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 folder containing CodeWarrior IDE?',
+				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()
+	);
+	LaunchApplication($lp) or die $^E;
+}
+
+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 _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 ($$) {
+	open(F, '>' . $_[0]) or die $!;
+	print F $_[1];
+	close(F);
+}
+
+sub _test ($) {
+	activate();
+	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.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.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut

mozilla/build/mac/CopyExports.script

@@ -0,0 +1,78 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+if {#} != 1
+	echo "CopyExports requires 1 parameters:"
+	echo "Parameter 1: path relative to {SourceRootDir} of the file which contains"
+	echo "             the list of files to be copied, one per line.  This path"
+	echo "             may not begin with a colon"
+	echo
+	Exit 1
+end if
+
+
+Set SourceList "{SourceRootDir}{1}"
+
+Set ScriptsDir "{SourceRootDir}mozilla:build:mac:"
+
+#set sourceList "{SourceRootDir}mozilla:{1}"
+
+if {verbose}
+	echo "Source list is in file ¶"{SourceList}¶""
+	echo "Scripts directory is ¶"{ScriptsDir}¶""
+end if
+
+# for each line in the source file, remove it if it starts with #, otherwise quote it
+
+for curLine in `streamedit "{sourceList}" -e '/¥#Å/ Delete; /¥/ Replace /(Å)¨1/ "¶""¨1"¶""'`
+	
+	echo "{curLine}"
+	
+	# ignore empty lines
+	if `evaluate "{{curLine}}" != ""`
+		
+		echo "{curLine}"
+		
+		# strip out trailing comments
+		if `evaluate "{curLine}" =~ /(Å)¨1[ ¶t]+(#Å)¨2/`
+			set sourceLine "{¨1}"
+			# echo "Discarding comment {¨2}"
+		else
+			set sourceLine "{curLine}"
+		end if
+		
+		if `evaluate "{sourceLine}" =~ /([Â ¶t]+)¨1[ ¶t]+[:]*(Å)¨2/`
+		
+			if {verbose}
+				echo "Cur line is {sourceLine}"
+			end if
+		
+			set exportFile "{¨1}"
+			set theTarget "{¨2}"
+			
+			if {verbose}
+				echo "Export file name is {exportFile}"
+				echo "Target directory is {theTarget}"
+			end if
+			
+			"{ScriptsDir}CopyList.script" "{exportFile}" "{theTarget}"
+		
+		end if
+	
+	end if
+
+end for

mozilla/build/mac/CopyHeaders.script

@@ -0,0 +1,81 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+
+# This is the controlling script for a set of scripts that copy public
+# header files in one or more source trees into a single, "dist" directory.
+#
+# It relies on the two accompanying scripts, ÒCopyList.scriptÓ and
+# ÒCopyExports.scriptÓ, which must be in the same directory.
+# 
+# To execute this script, select everything from "# Get the..." to 
+# " the end" and hit the Enter key.
+# 
+# Known bugs:
+# 	Header files are always copied if the export.mac file contains
+#	non-local paths.
+#	Spurious output is produced even when verbose is off.
+#
+
+# Uncomment this to get some progress information
+# set -e verbose 1
+
+# Get the root of everything
+
+set magicfilepath "{systempfolder}filepath" # Temporary items folder, "filepath"
+if !`Exists "{{magicFilePath}}"`
+	Echo "No file path file seems to have been created in the temporary items folder."
+	Echo "Was this script executed from the perl script?  That's the way it was designed."
+	Exit 1
+end if
+
+set myDirectory "`catenate "{{magicFilePath}}"`"
+delete -i "{{magicFilePath}}"
+
+Set SourceList "{myDirectory}{1}"
+(Evaluate "{myDirectory}" =~ /(Å:)¨1[Â:]+:[Â:]+:[Â:]+/) #·· dev:null
+Set -e mozillaDir "{¨1}"
+
+if !`Exists "{{mozillaDir}}"`
+	Echo "A file path was passed, but it doesn't seem to be the mozilla directory."
+	Exit 1
+end if
+echo "Mozilla directory found at {mozillaDir}"
+
+#Calculate the root directory by stripping off the leaf name.
+(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
+Set -e SourceRootDir "{¨1}"
+Set -e DestRootDir "{mozillaDir}dist:"
+
+# Ensure the build and stubs folders exist
+
+if !`exists -d "{mozillaDir}dist"`
+	newfolder "{mozillaDir}dist"
+end if
+if !`exists -d "{mozillaDir}dist:client"`
+	newfolder "{mozillaDir}dist:client"
+end if
+if !`exists -d "{mozillaDir}dist:client_debug"`
+	newfolder "{mozillaDir}dist:client_debug"
+end if
+if !`exists -d "{mozillaDir}dist:client_stubs"`
+	newfolder "{mozillaDir}dist:client_stubs"
+end if
+
+"{SourceRootDir}mozilla:build:mac:CopyExports.script" "mozilla:build:mac:MacExportListPublic"
+
+# the end

mozilla/build/mac/CopyList.script

@@ -0,0 +1,97 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+if {#} != 2
+	echo "CopyList requires 2 parameters:"
+	echo "Parameter 1: path relative to {SourceRootDir} of the file which contains"
+	echo "             the list of files to be copied, one per line.  This path"
+	echo "             may not begin with a colon"
+	echo
+	echo "Parameter 2: path relative to {DestRootDir} of the directory where all the"
+	echo "             files are to be copied.  No initial colons!"
+	echo
+	Exit 1
+end if
+
+set debugEcho "" # This setting will actually duplicate the files
+#set debugEcho "echo" # This setting will merely print the "duplicate" commands.
+
+set sourceList "{SourceRootDir}{1}"
+set targetDir "{DestRootDir}{2}"
+
+# targetDir may not end in a colon for this script to work.
+if `Evaluate "{targetDir}" =~ /(Å)¨1:/`
+	#echo "Removed a colon"
+	set targetDir "{¨1}"
+end if
+
+#Ensure the target hierarchy exists
+# Volume name
+(Evaluate "{TargetDir}" =~ /([Â:]+)¨1:Å/) ·· dev:null
+Set PartialPath "{¨1}"
+Loop
+	(Evaluate "{TargetDir}" =~ /("{PartialPath}":[Â:]+)¨1([:]*)¨2Å/) ·· dev:null
+	Set PartialPath "{¨1}"
+	Set Exit 0
+	(NewFolder "{PartialPath}") ·· dev:null
+	Set Exit 1
+	break if "{¨2}" == ""
+End Loop
+
+#Calculate the source directory by stripping off the leaf name.
+(Evaluate "{SourceList}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
+Set SourceDir "{¨1}"
+
+if {verbose}
+	echo "Source list is in file ¶"{sourceList}¶""
+	echo "Source directory is  ¶"{SourceDir}¶""
+	echo "Target directory is ¶"{targetDir}¶""
+end if
+
+# Strip all comment lines, pipe the stripped lines into the "for" loop.
+# We quote each whole line here so that we deal with a line at a time in the
+# for loop. Don't ya just love MPW quoting rulesÉ
+
+for f in `streamedit "{sourceList}" -e '/¥#Å/ Delete; /¥/ Replace /(Å)¨1/ "¶""¨1"¶""'`
+	
+	if `evaluate "{{f}}" != ""`
+	
+		# strip out trailing comments (in fact, anything following whitespace)
+		if `evaluate "{f}" =~ /([Â ¶t]+)¨1[ ¶t]+([#]*Å)¨2/`
+			set sourceFile "{¨1}"
+			# echo "Discarding comment {¨2}"
+		else
+			set sourceFile "{f}"
+		end if
+		
+		# sourceFile can be a relative path, so need to get the file name for date comparisons
+		if `evaluate "{sourceFile}" =~ /Å:([Â:]+)¨1/`
+			set filename "{¨1}"
+		else
+			set filename "{sourceFile}"
+		end if
+		
+		# now copy the file if newer
+		if "`Newer "{sourceDir}{sourceFile}" "{targetDir}:{filename}"`" 		#|| !`Exists "{targetDir}:{filename}"`
+			if {verbose} ; echo "{sourceDir}{sourceFile} is newer than {targetDir}:{filename}" ; end if
+			#{debugEcho} duplicate -y "{sourceDir}{sourceFile}" "{targetDir}"
+			{debugEcho} newalias "{sourceDir}{sourceFile}" "{targetDir}:{filename}"
+		end if
+		
+	end if
+	
+end for

mozilla/build/mac/CustomLib/CustomLib.c

@@ -0,0 +1,4 @@
+
+/* This library only exists to provide a dummy library for the final project */
+
+/* There is nothing to do here. */

mozilla/build/mac/DoCopyHeaders

@@ -0,0 +1,69 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+
+# This is the controlling script for a set of scripts that copy public
+# header files in one or more source trees into a single, "dist" directory.
+#
+# It relies on the two accompanying scripts, ÒCopyList.scriptÓ and
+# ÒCopyExports.scriptÓ, which must be in the same directory.
+# 
+# To execute this script, select everything from "# Get the..." to 
+# " the end" and hit the Enter key.
+# 
+# Known bugs:
+#	Spurious output is produced even when verbose is off.
+#
+
+# Uncomment this to get some progress information
+# set -e verbose 1
+
+# Get the root of everything
+
+set moz ""
+loop
+	set mozillaDir `GetFileName -d -m "Please select the ÒmozillaÓ directory"`
+	#set SourceRootDir
+	(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2:/) #·· dev:null
+	set moz "{¨2}"
+	break if "{moz}" == "mozilla"
+	Alert "Sorry, this only works if you select the folder called ÒmozillaÓ."
+end loop
+
+#Calculate the root directory by stripping off the leaf name.
+(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2/) #·· dev:null
+Set -e SourceRootDir "{¨1}"
+Set -e DestRootDir "{mozillaDir}dist:"
+
+# Ensure the build and stubs folders exist
+
+if !`exists -d "{mozillaDir}dist"`
+	newfolder "{mozillaDir}dist"
+end if
+if !`exists -d "{mozillaDir}dist:client"`
+	newfolder "{mozillaDir}dist:client"
+end if
+if !`exists -d "{mozillaDir}dist:client_debug"`
+	newfolder "{mozillaDir}dist:client_debug"
+end if
+if !`exists -d "{mozillaDir}dist:client_stubs"`
+	newfolder "{mozillaDir}dist:client_stubs"
+end if
+
+"{SourceRootDir}mozilla:build:mac:CopyExports.script" "mozilla:build:mac:MacExportListPublic"
+
+# the end

mozilla/build/mac/IDE_Options.h

@@ -26,63 +26,69 @@
 */
 
 	/* warning pragmas */
-#pragma warn_hidevirtual on
+#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
+#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 enumsalwaysint			on
+#pragma unsigned_char			off
+#pragma exceptions				on
+#pragma bool 					on
 
 
 	/* Save as much space as possible with strings... */
 #pragma pool_strings				on
-#pragma dont_reuse_strings	off
+#pragma dont_reuse_strings			off
 
 #pragma options align=native
-#pragma sym on									/* Takes no memory.  OK in non-debug. */
+#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
+	#pragma toc_data 				on
+	#pragma fp_contract 			on
+	#pragma readonly_strings 		on
 
 	#ifdef DEBUG
-		#pragma traceback on
-		#pragma global_optimizer off
-		#pragma scheduling off
-		#pragma peephole off
-		#pragma optimize_for_size off
+		#pragma traceback 			on
+		#pragma global_optimizer 	off
+		#pragma scheduling 			off
+		#pragma peephole 			off
+		#pragma optimize_for_size 	off
 	#else
-		#pragma traceback off
-		#pragma global_optimizer on
-		#pragma optimization_level 4
-		#pragma scheduling 604
-		#pragma peephole on
-		#pragma optimize_for_size on
+		#pragma traceback 			off
+		#pragma global_optimizer 	on
+		#pragma optimization_level 	4
+		#pragma scheduling 			604
+		#pragma peephole 			on
+		#pragma optimize_for_size	on
 	#endif
 
 #else /* ...generating 68k */
-	#pragma code68020 on
-	#pragma code68881 off
+	#pragma code68020 			on
+	#pragma code68881 			off
 
 		/* Far everything... */
 	#pragma far_code
-	#pragma far_data on
-	#pragma far_strings on
-	#pragma far_vtables on
+	#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) */
+	#pragma fourbyteints		on	/* 4-byte ints */
+	#pragma IEEEdoubles			on	/* 8-byte doubles (as required by Java and NSPR) */
 
 	#ifdef DEBUG
-		#pragma macsbug on
+		#pragma macsbug 		on
 		#pragma oldstyle_symbols off
 	#else
-		#pragma macsbug off
+		#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/MacCVS.pm

@@ -0,0 +1,198 @@
+#!perl -w
+package	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 vars qw($VERSION @ISA @EXPORT $MacCVSLib);
+use Mac::StandardFile;
+use Moz;
+use Cwd;
+use Exporter;
+use File::Basename;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw( new print checkout);
+$VERSION = "1.00";
+
+# 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
+	{
+		print STDERR "AppleScript error: $asresult\n";
+		print STDERR "AppleScript was: \n $script \n";
+		return 0;
+	}
+}
+
+# _useMacCVSLib
+# returns 1 on success
+# Search the include path for the file called MacCVSLib
+sub _useMacCVSLib() 
+{
+	unless ( defined($MacCVSLib) )
+	{
+		my($libname) = "MacCVSLib";
+# try the directory we were run from
+		my($c) = dirname($0) . ":" . $libname;
+		if ( -e $c)
+		{
+			$MacCVSLib = $c;
+		}
+		else
+		{
+	# 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;
+						last;
+					}
+				}
+			}
+		}
+		if (! (-e $MacCVSLib))
+		{
+			print STDERR "MacCVS lib could not be found! $MacCVSLib";
+			return 0;
+		}
+	}
+	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 failure
+sub assertSessionOpen()	{
+	my ($self) = shift;
+	_useMacCVSLib() || die "Could not load MacCVSLib\n";
+	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;
+	print "MacCVS:: name: ", $self->{name}, " session file: ", $self->{session_file}, "\n";
+}
+
+# checkout( self, module, revision, date)
+# MacCVS checkout command
+# returns 1 on failure
+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 = ""; }
+
+	$self->assertSessionOpen() || return 1;
+	
+	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);
+}
+
+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/MacExportListPublic

@@ -0,0 +1,159 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# This is a list of paths to export.mac files, and destination
+# directories for the copied headers. Destinations are relative
+# to "mozilla:dist".
+
+###################
+# PUBLIC TREE
+###################
+
+# LDAP
+mozilla:directory:c-sdk:ldap:include:MANIFEST		:ldap
+
+#INCLUDE
+mozilla:config:mac:export.mac						:config
+mozilla:include:export.mac							:include
+mozilla:cmd:macfe:pch:export.mac					:include
+
+#MAC_COMMON
+mozilla:build:mac:export.mac						:mac:common
+mozilla:lib:mac:NSStdLib:include:export.mac			:mac:common
+mozilla:lib:mac:MacMemoryAllocator:include:export.mac	:mac:common
+mozilla:lib:mac:Misc:export.mac						:mac:common
+mozilla:lib:mac:MoreFiles:export.mac				:mac:common:morefiles
+mozilla:cmd:macfe:export.mac						:mac:macfe
+
+#NSPR
+mozilla:nsprpub:pr:include:export.mac				:nspr
+mozilla:nsprpub:pr:src:md:mac:export.mac			:nspr:mac
+mozilla:nsprpub:lib:ds:export.mac					:nspr
+mozilla:nsprpub:lib:libc:include:export.mac			:nspr
+mozilla:nsprpub:lib:msgc:include:export.mac			:nspr
+
+#DBM
+mozilla:dbm:include:export.mac						:dbm
+
+#LIBIMAGE
+mozilla:modules:libimg:png:export.mac				:libimg
+mozilla:modules:libimg:src:export.mac				:libimg
+mozilla:modules:libimg:public:export.mac			:libimg
+
+#SECURITY_freenav
+mozilla:modules:security:freenav:export.mac			:security
+
+#XPCOM
+mozilla:xpcom:src:export.mac						:xpcom
+
+#ZLIB
+mozilla:modules:zlib:src:export.mac					:zlib
+
+#JPEG
+mozilla:jpeg:export.mac								:jpeg
+
+#JSJ
+mozilla:js:jsj:export.mac							:jsj
+
+#JSDEBUG
+mozilla:js:jsd:export.mac							:jsdebug
+
+#JS
+mozilla:js:src:export.mac							:js
+
+#RDF
+mozilla:modules:rdf:include:export.mac				:rdf
+
+#XML
+mozilla:modules:xml:glue:export.mac					:xml
+mozilla:modules:xml:expat:xmlparse:export.mac		:xml
+
+#LIBFONT
+mozilla:modules:libfont:public:export.mac			:libfont
+mozilla:modules:libfont:src:export.mac				:libfont
+
+#SCHEDULER
+mozilla:modules:schedulr:public:export.mac			:schedulr
+
+#NETWORK
+#This stuff is all in libnet on the branch.
+#mozilla:network:cache:export.mac					:network
+#mozilla:network:client:export.mac					:network
+#mozilla:network:cnvts:export.mac					:network
+#mozilla:network:cstream:export.mac					:network
+#mozilla:network:main:export.mac						:network
+#ozilla:network:protocol:about:export.mac			:network
+#mozilla:network:protocol:certld:export.mac			:network
+#mozilla:network:protocol:dataurl:export.mac			:network
+#mozilla:network:protocol:file:export.mac			:network
+#mozilla:network:protocol:ftp:export.mac				:network
+#mozilla:network:protocol:gopher:export.mac			:network
+#mozilla:network:protocol:http:export.mac			:network
+#mozilla:network:protocol:js:export.mac				:network
+#mozilla:network:protocol:mailbox:export.mac			:network
+#mozilla:network:protocol:marimba:export.mac			:network
+#mozilla:network:protocol:nntp:export.mac			:network
+#mozilla:network:protocol:pop3:export.mac			:network
+#mozilla:network:protocol:remote:export.mac			:network
+#mozilla:network:protocol:smtp:export.mac			:network
+
+#NORMANDY_BRANCH only
+mozilla:lib:libnet:export.mac						:libnet
+
+#HTML_DIALOGS
+mozilla:lib:htmldlgs:export.mac						:htmldlgs
+
+#LAYOUT
+mozilla:lib:layout:export.mac						:layout
+
+#LAYERS
+mozilla:lib:liblayer:include:export.mac				:layers
+
+#PARSE
+mozilla:lib:libparse:export.mac						:libparse
+
+#STYLE
+mozilla:lib:libstyle:export.mac						:libstyle
+
+#LIBHOOK
+mozilla:modules:libhook:public:export.mac			:libhook
+
+#LIBPREF
+mozilla:modules:libpref:public:export.mac			:libpref
+
+#LIBREG
+mozilla:modules:libreg:include:export.mac			:libreg
+
+#LIBUTIL
+mozilla:modules:libutil:public:export.mac			:libutil
+
+#OJI
+mozilla:modules:oji:src:export.mac					:oji
+
+#PROGRESS
+mozilla:modules:progress:public:export.mac			:progress
+
+#SOFTUPDATE
+mozilla:modules:softupdt:include:export.mac			:softupdate
+
+#NAV_JAVA
+mozilla:nav-java:stubs:macjri:export.mac			:nav-java:macjri
+mozilla:nav-java:stubs:include:export.mac			:nav-java
+
+#SUN_JAVA
+mozilla:sun-java:stubs:include:export.mac			:sun-java:include
+mozilla:sun-java:stubs:macjri:export.mac			:sun-java:macjri

mozilla/build/mac/Moz.pm

@@ -0,0 +1,389 @@
+=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.
+
+=cut
+
+
+
+
+package			Moz;
+require			Exporter;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw(BuildProject BuildProjectClean OpenErrorLog MakeAlias StopForErrors DontStopForErrors InstallFromManifest);
+@EXPORT_OK	= qw(CloseErrorLog UseCodeWarriorLib QUIET);
+
+	use Cwd;
+	use File::Path;
+	use ExtUtils::Manifest 'maniread';
+
+	use CodeWarriorLib;
+
+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;
+	}
+
+=head2 Setup
+
+Pretty much, everything is taken care of for you.
+  However, B<Moz> does use a little compiled AppleScript library (the file CodeWarriorLib) for some of its communcication with CodeWarrior.
+  If this library isn't in the same directory as "Moz.pm", then you need to tell B<Moz> where to find it.
+  Call C<UseCodeWarriorLib($path_to_CodeWarriorLib)>.
+  This routine is not exported by default, nor are you likely to need it.
+
+=cut
+
+sub UseCodeWarriorLib($)
+	{
+#		($CodeWarriorLib) = @_;
+#		$CodeWarriorLib = full_path_to($CodeWarriorLib);
+	}
+
+sub activate_CodeWarrior()
+	{
+#MacPerl::DoAppleScript(<<END_OF_APPLESCRIPT);
+#	tell (load script file "$CodeWarriorLib") to ActivateCodeWarrior()
+#END_OF_APPLESCRIPT
+	}
+
+BEGIN
+	{
+#		UseCodeWarriorLib(":CodeWarriorLib");
+#		activate_CodeWarrior();
+		CodeWarriorLib::activate();
+	}
+
+$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");
+
+				$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/ )
+							{
+								$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\"\n";
+		
+		$had_errors = CodeWarriorLib::build_project(
+			$project_path, $target_name, $recent_errors_file, $clean_build
+		);
+
+
+#		$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 )
+			{
+				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);
+	}
+
+
+=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 "$message \"$old_file\" doesn't exist.\n" unless -e $old_file;
+		die "$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 "$message symlink returned an unexpected error.\n";
+	}
+	
+	
+=pod
+
+C<InstallFromManifest()>
+
+=cut
+
+sub InstallFromManifest($;$)
+	{
+		my ($manifest_file, $dest_dir) = @_;
+
+		$dest_dir ||= ":";
+
+		$manifest_file =~ m/(.+):/;
+		my $source_dir =  $1;
+
+		chop($dest_dir) if $dest_dir =~ m/:$/;
+
+		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 ( $file =~ /:.+:/ )
+					{
+						$subdir = $&;
+					}
+
+				$file = ":$file" unless $file =~ m/^:/;
+				MakeAlias("$source_dir$file", "$dest_dir$subdir");
+			}
+	}
+
+
+
+1;
+
+=head1 AUTHORS
+
+Scott Collins <scc@netscape.com>, Simon Fraser <sfraser@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.0 (the "NPL"); you may not use this file except in
+compliance with the NPL.  You may obtain a copy of the NPL at
+http://www.mozilla.org/NPL/
+
+Software distributed under the NPL is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+for the specific language governing rights and limitations under the
+NPL.
+
+The Initial Developer of this code under the NPL is Netscape
+Communications Corporation.  Portions created by Netscape are
+Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+Reserved.
+
+=cut

mozilla/build/mac/NGLayoutBuildList.pm

@@ -0,0 +1,403 @@
+#!perl -w
+package			NGLayoutBuildList;
+
+require 5.004;
+require Exporter;
+
+use strict;
+use vars qw( @ISA @EXPORT );
+
+# perl includes
+use Mac::StandardFile;
+use Mac::Processes;
+use Cwd;
+use File::Path;
+
+# homegrown
+use Moz;
+use MacCVS;
+
+@ISA				= qw(Exporter);
+@EXPORT			= qw( Checkout BuildDist BuildProjects BuildCommonProjects BuildLayoutProjects);
+
+# NGLayoutBuildList builds the nglayout project
+# it is configured by setting the following variables in the caller:
+# Usage:
+# caller variables that affect behaviour:
+# DEBUG		: 1 if we are building a debug version
+# 3-part build process: checkout, dist, and build_projects
+# Hack alert:
+# NGLayout defines are located in :mozilla:config:mac:NGLayoutConfigInclude.h
+# An alias "MacConfigInclude.h" to this file is created inside dist:config
+# Note that the name of alias is different than the name of the file. This
+# is to trick CW into including NGLayout defines 
+
+#
+# Utility routines
+#
+
+# pickWithMemoryFile stores the information about the user pick inside
+# the file $session_storage
+sub _pickWithMemoryFile($)
+{
+	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))
+	{
+		print "Choose a CVS session file in file dialog box:\n";	# no way to display a prompt?
+# make sure that MacPerl is a front process
+  while (GetFrontProcess	() !=  GetCurrentProcess())
+  {
+	   SetFrontProcess( GetCurrentProcess() );
+  }
+	# 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\n";
+			}
+		}
+	}
+	return $cvsfile;
+}
+
+# assert that we are in the correct directory for the build
+sub _assertRightDirectory()
+{
+	unless (-e ":mozilla")
+	{
+		my($dir) = cwd();
+		print STDERR "NGLayoutBuildList called from incorrect directory: $dir";
+	} 
+}
+
+sub _getDistDirectory()
+{
+	return $main::DEBUG ? ":mozilla:dist:viewer_debug:" : ":mozilla:dist:viewer:";
+}
+
+#
+# MAIN ROUTINES
+#
+sub Checkout()
+{
+	_assertRightDirectory();
+	my($cvsfile) = _pickWithMemoryFile("::nglayout.cvsloc");
+	my($session) = MacCVS->new( $cvsfile );
+	unless (defined($session)) { die "Checkout aborted. Cannot create session file: $session" }
+
+	my($LIBPREF_BRANCH) = "XPCOM_BRANCH";
+	my($IMGLIB_BRANCH) = "MODULAR_IMGLIB_BRANCH"; #// compile the "(standalone)" targets when pulling the tips
+	my($PLUGIN_BRANCH) = "OJI_19980618_BRANCH";
+
+	if ($main::pull{lizard})
+	{
+		$session->checkout("mozilla/LICENSE") || die "checkout failure";
+		$session->checkout("mozilla/LEGAL") || die "checkout failure";
+		$session->checkout("mozilla/config") || die "checkout failure";
+		$session->checkout("mozilla/dbm") || die "checkout failure";
+		$session->checkout("mozilla/lib/liblayer") || die "checkout failure";
+		$session->checkout("mozilla/modules/zlib") || die "checkout failure";
+		$session->checkout("mozilla/modules/libutil") || die "checkout failure";
+		$session->checkout("mozilla/nsprpub") || die "checkout failure";
+		$session->checkout("mozilla/sun-java") || die "checkout failure";
+		$session->checkout("mozilla/nav-java") || die "checkout failure";
+		$session->checkout("mozilla/js") || die "checkout failure";
+		$session->checkout("mozilla/modules/security/freenav") || die "checkout failure";
+		#//$session->checkout("mozilla/lib/libparse") || die "checkout failure";
+		#//$session->checkout("mozilla/lib/layout") || die "checkout failure";
+		#//$session->checkout("mozilla/lib/libstyle") || die "checkout failure";
+		#//$session->checkout("mozilla/lib/libpwcac") || die "checkout failure";
+		$session->checkout("mozilla/modules/libpref",$LIBPREF_BRANCH) || die "checkout failure";
+		#//$session->checkout("mozilla/modules/plugin",$PLUGIN_BRANCH) || die "checkout failure";
+		$session->checkout("mozilla/modules/plugin") || die "checkout failure";
+	}
+	if ($main::pull{xpcom})
+	{
+		$session->checkout("mozilla/modules/libreg") || die "checkout failure";
+		$session->checkout("mozilla/xpcom") || die "checkout failure";
+	}
+	if ($main::pull{imglib})
+	{
+		$session->checkout("mozilla/jpeg", $IMGLIB_BRANCH) || die "checkout failure";
+		$session->checkout("mozilla/modules/libutil", $IMGLIB_BRANCH) || die "checkout failure";
+		$session->checkout("mozilla/modules/libimg", $IMGLIB_BRANCH) || die "checkout failure";
+	}
+	if ($main::pull{netlib})
+	{
+		$session->checkout("mozilla/lib/xp") || die "checkout failure";
+		$session->checkout("mozilla/lib/libpwcac") || die "checkout failure";
+		$session->checkout("mozilla/network") || die "checkout failure";
+		$session->checkout("mozilla/include") || die "checkout failure";
+	}
+	if ($main::pull{nglayout})
+	{
+		$session->checkout("mozilla/base") || die "checkout failure";
+		$session->checkout("mozilla/dom") || die "checkout failure";
+		$session->checkout("mozilla/gfx") || die "checkout failure";
+		$session->checkout("mozilla/htmlparser") || die "checkout failure";
+		$session->checkout("mozilla/layout") || die "checkout failure";
+		$session->checkout("mozilla/view") || die "checkout failure";
+		$session->checkout("mozilla/webshell") || die "checkout failure";
+		$session->checkout("mozilla/widget") || die "checkout failure";
+	}
+	if ($main::pull{mac})
+	{
+		$session->checkout("mozilla/build/mac") || die "checkout failure";
+		$session->checkout("mozilla/cmd/macfe") || die "checkout failure";
+		$session->checkout("mozilla/lib/mac/MacMemoryAllocator") || die "checkout failure";
+		$session->checkout("mozilla/lib/mac/NSStdLib") || die "checkout failure";
+		$session->checkout("mozilla/lib/mac/MoreFiles") || die "checkout failure";
+		$session->checkout("mozilla/lib/mac/NSRuntime") || die "checkout failure";
+		$session->checkout("mozilla/lib/mac/Misc") || die "checkout failure";
+	}
+}
+
+# builds the dist directory
+sub BuildDist()
+{
+	unless ( $main::build{dist} ) { return;}
+	_assertRightDirectory();
+	
+	# we really do not need all these paths, but many client projects include them
+	mkpath([ ":mozilla:dist:", ":mozilla:dist:client:", ":mozilla:dist:client_debug:", ":mozilla:dist:client_stubs:" ]);
+	mkpath([ ":mozilla:dist:viewer:", ":mozilla:dist:viewer_debug:" ]);
+
+	my($distdirectory) = ":mozilla:dist";
+
+	my($distlist) = [
+#MAC_COMMON
+	[":mozilla:build:mac:MANIFEST", "$distdirectory:mac:common:"],
+	[":mozilla:lib:mac:NSStdLib:include:MANIFEST", "$distdirectory:mac:common:"],
+	[":mozilla:lib:mac:MacMemoryAllocator:include:MANIFEST", "$distdirectory:mac:common:"],
+	[":mozilla:lib:mac:Misc:MANIFEST", "$distdirectory:mac:common:"],
+	[":mozilla:lib:mac:MoreFiles:MANIFEST", "$distdirectory:mac:common:morefiles:"],
+#INCLUDE
+	[":mozilla:config:mac:MANIFEST", "$distdirectory:config:"],
+	[":mozilla:config:mac:MANIFEST_config", "$distdirectory:config:"],
+	[":mozilla:include:MANIFEST", "$distdirectory:include:"],		
+	[":mozilla:cmd:macfe:pch:MANIFEST", "$distdirectory:include:"],
+#NSPR	
+    [":mozilla:nsprpub:pr:include:MANIFEST", "$distdirectory:nspr:"],		
+    [":mozilla:nsprpub:pr:src:md:mac:MANIFEST", "$distdirectory:nspr:mac:"],		
+    [":mozilla:nsprpub:lib:ds:MANIFEST", "$distdirectory:nspr:"],		
+    [":mozilla:nsprpub:lib:libc:include:MANIFEST", "$distdirectory:nspr:"],		
+    [":mozilla:nsprpub:lib:msgc:include:MANIFEST", "$distdirectory:nspr:"],
+#JPEG
+    [":mozilla:jpeg:MANIFEST", "$distdirectory:jpeg:"],
+#LIBREG
+    [":mozilla:modules:libreg:include:MANIFEST", "$distdirectory:libreg:"],
+#XPCOM
+    [":mozilla:xpcom:src:MANIFEST", "$distdirectory:xpcom:"],
+#ZLIB
+    [":mozilla:modules:zlib:src:MANIFEST", "$distdirectory:zlib:"],
+#LIBUTIL
+    [":mozilla:modules:libutil:public:MANIFEST", "$distdirectory:libutil:"],
+#SUN_JAVA
+    [":mozilla:sun-java:stubs:include:MANIFEST", "$distdirectory:sun-java:"],
+    [":mozilla:sun-java:stubs:macjri:MANIFEST", "$distdirectory:sun-java:"],
+#NAV_JAVA
+    [":mozilla:nav-java:stubs:include:MANIFEST", "$distdirectory:nav-java:"],
+    [":mozilla:nav-java:stubs:macjri:MANIFEST", "$distdirectory:nav-java:"],
+#JS
+    [":mozilla:js:src:MANIFEST", "$distdirectory:js:"],
+#SECURITY_freenav
+    [":mozilla:modules:security:freenav:MANIFEST", "$distdirectory:security:"],
+#LIBPREF
+    [":mozilla:modules:libpref:public:MANIFEST", "$distdirectory:libpref:"],
+#LIBIMAGE
+    [":mozilla:modules:libimg:png:MANIFEST", "$distdirectory:libimg:"],
+    [":mozilla:modules:libimg:src:MANIFEST", "$distdirectory:libimg:"],
+    [":mozilla:modules:libimg:public:MANIFEST", "$distdirectory:libimg:"],
+#PLUGIN
+    [":mozilla:modules:plugin:nglsrc:MANIFEST", "$distdirectory:plugin:"],
+    [":mozilla:modules:plugin:public:MANIFEST", "$distdirectory:plugin:"],
+    [":mozilla:modules:plugin:src:MANIFEST", "$distdirectory:plugin:"],
+#//PARSE
+#//	[":mozilla:lib:libparse:MANIFEST",			"$distdirectory:libparse:"],
+#//OLD LAYOUT
+#//	[":mozilla:lib:layout:MANIFEST",	"$distdirectory:layout:"],
+#//STYLE
+#//	[":mozilla:lib:libstyle:MANIFEST",	 "$distdirectory:libstyle:"],
+#LAYERS
+	[":mozilla:lib:liblayer:include:MANIFEST",	"$distdirectory:layers:"],
+#NETWORK
+    [":mozilla:network:cache:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:client:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:cnvts:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:cstream:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:main:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:mimetype:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:util:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:about:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:certld:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:dataurl:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:file:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:ftp:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:gopher:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:http:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:js:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:mailbox:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:marimba:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:nntp:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:pop3:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:remote:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:protocol:smtp:MANIFEST", "$distdirectory:network:"],
+    [":mozilla:network:module:MANIFEST","$distdirectory:network:module"],
+#BASE
+    [":mozilla:base:src:MANIFEST", "$distdirectory:base:"],
+    [":mozilla:base:public:MANIFEST", "$distdirectory:base:"],
+#WEBSHELL
+    [":mozilla:webshell:public:MANIFEST", "$distdirectory:webshell:"],
+#LAYOUT
+    [":mozilla:layout:base:public:MANIFEST", "$distdirectory:layout:"],
+    [":mozilla:layout:html:style:public:MANIFEST", "$distdirectory:layout:"],
+    [":mozilla:layout:html:base:src:MANIFEST", "$distdirectory:layout:"],
+    [":mozilla:layout:html:document:public:MANIFEST", "$distdirectory:layout:"],
+    [":mozilla:layout:base:src:MANIFEST", "$distdirectory:layout:"],
+	[":mozilla:layout:events:public:MANIFEST", "$distdirectory:layout:"],
+	[":mozilla:layout:events:src:MANIFEST", "$distdirectory:layout:"],
+#WIDGET
+    [":mozilla:widget:public:MANIFEST", "$distdirectory:widget:"],
+#GFX
+    [":mozilla:gfx:src:MANIFEST", "$distdirectory:gfx:"],
+#VIEW
+    [":mozilla:view:public:MANIFEST", "$distdirectory:view:"],
+#DOM
+   [":mozilla:dom:public:MANIFEST", "$distdirectory:dom:"],
+   [":mozilla:dom:public:coreDom:MANIFEST", "$distdirectory:dom:"],
+   [":mozilla:dom:public:coreEvents:MANIFEST", "$distdirectory:dom:"],
+   [":mozilla:dom:public:events:MANIFEST", "$distdirectory:dom:"],
+   [":mozilla:dom:public:html:MANIFEST", "$distdirectory:dom:"],
+#HTMLPARSER
+   [":mozilla:htmlparser:src:MANIFEST", "$distdirectory:htmlparser:"],
+
+	];
+	foreach $a (@$distlist)
+	{
+		InstallFromManifest( $a->[0], $a->[1]);
+	}
+	
+# To get out defines in all the project, dummy alias NGLayoutConfigInclude.h into MacConfigInclude.h
+	MakeAlias(":mozilla:config:mac:NGLayoutConfigInclude.h", ":mozilla:dist:config:MacConfigInclude.h");
+}
+
+# builds all projects
+# different targets controlled by $main::build
+sub BuildCommonProjects()
+{
+	unless( $main::build{common} ) { return; }
+	_assertRightDirectory();
+
+	# $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) = _getDistDirectory();
+
+# clean projects
+
+	Moz::BuildProjectClean(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",	"Stubs");
+	Moz::BuildProjectClean(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",              	"Stubs");
+	Moz::BuildProjectClean(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp",							"Stubs");
+	Moz::BuildProjectClean(":mozilla:cmd:macfe:projects:client:Navigator.mcp",    				"Stub Library");
+
+# shared
+
+	Moz::BuildProject(":mozilla:lib:mac:NSRuntime:NSRuntime.mcp");
+	MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb", "$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:NSRuntime:NSRuntime$D.shlb.xSYM", "$dist_dir") : 0;
+	
+	Moz::BuildProject(":mozilla:lib:mac:MoreFiles:build:MoreFilesPPC.mcp", "MoreFiles$D.shlb");
+	MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb", "$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:MoreFiles:build:MoreFiles$D.shlb.xSYM", "$dist_dir") : 0;
+
+	BuildProject(":mozilla:nsprpub:macbuild:NSPR20PPC.mcp",	"NSPR20$D.shlb");
+	MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb", "$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:nsprpub:macbuild:NSPR20$D.shlb.xSYM", "$dist_dir") : 0;
+
+	BuildProject(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator.mcp",	"MemAllocator$D.shlb");
+	MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb", "$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:MacMemoryAllocator:MemAllocator$D.shlb.xSYM", "$dist_dir") : 0;
+	
+	BuildProject(":mozilla:lib:mac:NSStdLib:NSStdLib.mcp",								"NSStdLib$D.shlb");
+	MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb", "$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:lib:mac:NSStdLib:NSStdLib$D.shlb.xSYM", "$dist_dir") : 0;
+
+	BuildProject(":mozilla:jpeg:macbuild:JPEG.mcp",											"JPEG$D.shlb");
+	MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb", "$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:jpeg:macbuild:JPEG$D.shlb.xSYM", "$dist_dir") : 0;
+
+	BuildProject(":mozilla:js:macbuild:JavaScriptPPC.mcp",		"JavaScriptNoJSJ$D.shlb");
+	MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb", "$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:js:macbuild:JavaScript$D.shlb.xSYM", "$dist_dir") : 0;
+
+	BuildProject(":mozilla:modules:zlib:macbuild:zlib.mcp",		"zlib$D.shlb");
+	MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb", "$dist_dir");
+	$main::DEBUG ? MakeAlias(":mozilla:modules:zlib:macbuild:zlib$D.shlb.xSYM", "$dist_dir") : 0;
+	
+# static
+
+	BuildProject(":mozilla:xpcom:macbuild:xpcomPPC.mcp",								"xpcom$D.o");
+
+	BuildProject(":mozilla:modules:security:freenav:macbuild:NoSecurity.mcp",	 "Security.o");
+
+	BuildProject(":mozilla:modules:libimg:macbuild:png.mcp",						"png$D.o");
+
+	BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp",					"libimg$D.o");
+	#//BuildProject(":mozilla:modules:libimg:macbuild:libimg.mcp",					"libimg$D.o (standalone)");
+
+	BuildProject(":mozilla:network:macbuild:network.mcp",		"NetworkModular$D.o");
+
+}
+
+sub BuildLayoutProjects()
+{
+	unless( $main::build{nglayout} ) { return; }
+	_assertRightDirectory();
+
+	# $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) = _getDistDirectory();
+
+	BuildProject(":mozilla:base:macbuild:base.mcp",				"base$D.o");
+
+	BuildProject(":mozilla:htmlparser:macbuild:htmlparser.mcp",				"htmlparser$D.o");
+	
+	BuildProject(":mozilla:dom:macbuild:dom.mcp",				"dom$D.o");
+
+	BuildProject(":mozilla:gfx:macbuild:gfx.mcp",				"gfx$D.o");
+
+	BuildProject(":mozilla:layout:macbuild:layout.mcp",	"layout$D.o");
+
+	BuildProject(":mozilla:webshell:macbuild:webshell.mcp",	"webshell$D.o");
+
+	BuildProject(":mozilla:webshell:tests:viewer:mac:viewer.mcp",	"viewer$D");
+}
+
+sub BuildProjects()
+{
+	BuildCommonProjects();
+	BuildLayoutProjects();
+}

mozilla/build/mac/NSCrossProductDefines.h

@@ -16,6 +16,8 @@
  * Reserved.
  */
 
+#error "DonÕt use me!"
+
 #define OLDROUTINELOCATIONS 0
 #define XP_MAC 1
 #ifndef NSPR20
@@ -27,6 +29,9 @@
 #define NETSCAPE 1
 #define OTUNIXERRORS 1		/* We want OpenTransport error codes */
 
+#define OJI 1
+#define MOCHA 1
+
 /*
 	This compiles in heap dumping utilities and other good stuff
  for developers -- maybe we only want it in for a special SDK

mozilla/build/mac/TinderboxMozilla.pl

@@ -0,0 +1,40 @@
+#!perl
+
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+	use Moz;
+	use BuildList;
+
+$DEBUG = 1;
+
+	# One of them should be 1. This will come from a config file at some stage.
+	# In the meanwhile, it should match mozilla/config/mac/MacConfig.h
+$MOZ_LITE   = 0;
+$MOZ_MEDIUM = 1;
+$MOZ_DARK   = 0;
+
+Moz::OpenErrorLog("::::Mozilla.BuildLog");
+#Moz::StopForErrors();
+
+chdir("::::");
+
+# Make and popuplate the dist directory
+DistMozilla();
+
+# Now build the projects
+BuildMozilla();

mozilla/build/mac/export.mac

@@ -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/makedist.xps

@@ -0,0 +1,26 @@
+/* -*- 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.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+/*
+	The only job of this file is for make dependencies:
+	include files here that you want to cause MakeDist
+	to happen again when they change.
+*/
+
+
+#include "MacExportListPublic"

mozilla/build/mac/makedist.xps_Make

@@ -0,0 +1,76 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+
+# This is the controlling script for a set of scripts that copy public
+# header files in one or more source trees into a single, "dist" directory.
+#
+# It relies on the two accompanying scripts, ÒCopyList.scriptÓ and
+# ÒCopyExports.scriptÓ, which must be in the same directory.
+# 
+# 
+# Known bugs:
+# 	Header files are always copied if the export.mac file contains
+#	non-local paths.
+#	Spurious output is produced even when verbose is off.
+#
+
+set echo 0
+
+Evaluate % = ("{{SourceFile}}" =~ /(Å:)¨0Å/)
+Directory "{{¨0}}"
+
+set mozillaDir "{¨0}"
+if `evaluate "{mozillaDir}" =~ /(Å:)¨1[Â:]+:[Â:]+:/`
+	set -e mozillaDir "{¨1}"
+else
+	echo "Failed to find mozilla directory. Exitting"
+	exit 1;
+end if
+
+# Sanity check for mozilla
+
+if !`exists -d "{mozillaDir}"`
+	echo "Failed to find mozilla directory. Exitting"
+	exit 1;
+end if
+
+# Calculate the root directory by stripping off the leaf name.
+
+(Evaluate "{mozillaDir}" =~ /(Å:)¨1([Â:]+)¨2:/)
+Set -e SourceRootDir "{¨1}"
+Set -e DestRootDir "{mozillaDir}dist:"
+
+# Ensure the build and stubs folders exist
+
+if !`exists -d "{mozillaDir}dist"`
+	newfolder "{mozillaDir}dist"
+end if
+if !`exists -d "{mozillaDir}dist:client"`
+	newfolder "{mozillaDir}dist:client"
+end if
+if !`exists -d "{mozillaDir}dist:client_debug"`
+	newfolder "{mozillaDir}dist:client_debug"
+end if
+if !`exists -d "{mozillaDir}dist:client_stubs"`
+	newfolder "{mozillaDir}dist:client_stubs"
+end if
+
+# Now do the grunt work of copying headers. This can take some time
+
+"{SourceRootDir}mozilla:build:mac:CopyExports.script" "mozilla:build:mac:MacExportListPublic"
+
+

mozilla/client.mak

@@ -1,246 +0,0 @@
-# The contents of this file are subject to the Netscape Public License
-# Version 1.0 (the "NPL"); you may not use this file except in
-# compliance with the NPL.  You may obtain a copy of the NPL at
-# http://www.mozilla.org/NPL/
-#
-# Software distributed under the NPL is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-# for the specific language governing rights and limitations under the
-# NPL.
-#
-# The Initial Developer of this code under the NPL is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-# Reserved.
-
-#//------------------------------------------------------------------------
-#// Figure out how to do the pull.
-#//------------------------------------------------------------------------
-!if "$(MOZ_BRANCH)" != ""
-CVS_BRANCH=-r $(MOZ_BRANCH)
-HAVE_BRANCH=1
-!else
-HAVE_BRANCH=0
-!endif
-
-#//
-#// Temporary hardcode (while we figure out how to do this)
-#//	to support the Core modularity efforts...
-#//
-
-!ifndef MOZ_JAVAVER
-!ifdef MOZ_MEDIUM
-MOZ_JAVAVER    =-r JAVA_STUB_RELEASE_19980319
-!else
-MOZ_JAVAVER    =-r JAVA_RELEASE_19980304
-!endif
-!endif
-
-
-NSPR20_BRANCH  =-r NSPR20_RELEASE_19980304_BRANCH
-SECURITY_BRANCH=-r SECURITY_RELEASE_19980210
-CORECONF_BRANCH=-r CFG_1_6
-DBM_BRANCH     =-r DBM_RELEASE_19980319
-
-!if "$(MOZ_DATE)" != ""
-CVS_BRANCH=-D "$(MOZ_DATE)"
-HAVE_DATE=1
-!else
-HAVE_DATE=0
-!endif
-
-!if $(HAVE_DATE) && $(HAVE_BRANCH)
-ERR_MESSAGE=$(ERR_MESSAGE)^
-Cannot specify both MOZ_BRANCH and MOZ_DATE
-!endif
-
-NMAKE=@nmake -nologo -$(MAKEFLAGS)
-
-#//------------------------------------------------------------------------
-#//
-#// Stuff a do complete pull and build
-#//
-#//------------------------------------------------------------------------
-
-default:: 		build_all
-
-pull_and_build_all::     pull_all    \
-			    build_all
-
-#// Do this when you pull a new tree, or else you will often get bugs
-#// when replaceing an old dist with a new dist.
-
-pull_clobber_build_all:: pull_all \
-			clobber_all \
-			build_all
-
-clobber_build_all:: 	clobber_all \
-			build_all
-
-# In theory, we should use some symbol in ns/config/liteness.mak, 
-# but we haven't pulled the file yet.  So, refer to MOZ_LITE and
-# MOZ_MEDIUM explicitly .
-!if defined(MOZ_LITE) || defined(MOZ_MEDIUM)
-pull_all:: pull_client_source_product
-!else
-pull_all:: pull_client 
-!endif
-
-!ifndef NO_SECURITY
-pull_security:
-    -cvs -q co $(CORECONF_BRANCH) ns/coreconf
-    -cvs -q co $(SECURITY_BRANCH) CoreSecurity
-!else
-pull_security:
-!endif
-
-pull_client: pull_security
-    @echo +++ client.mak: checking out the client with "$(CVS_BRANCH)"
-    cd $(MOZ_SRC)\.
-    -cvs -q co $(DBM_BRANCH)      ns/dbm
-    -cvs -q co $(CVS_BRANCH)      Client50Win
-    -cvs -q co $(MOZ_JAVAVER)     JavaWin
-    -cvs -q co $(NSPR20_BRANCH)   CoreNSPR20
-
-pull_client_source_product:
-    @echo +++ client.mak: checking out the client with "$(CVS_BRANCH)"
-    cd $(MOZ_SRC)\.
-    -cvs -q co $(DBM_BRANCH)      ns/dbm
-    -cvs -q co $(CVS_BRANCH)      ClientSourceProductWin
-    -cvs -q co $(MOZ_JAVAVER)     JavaStubWin
-
-
-build_all:              build_ldap  \
-			build_dist  \
-			build_client
-build_dist:
-    @echo +++ client.mak: building dist
-    cd $(MOZ_SRC)\ns
-    $(NMAKE) -f makefile.win
-
-
-!if defined(MOZ_LITE) || defined(MOZ_MEDIUM)
-build_ldap:
-!else
-build_ldap:
-    @echo +++ client.mak: building ldap
-    cd $(MOZ_SRC)\ns\netsite\ldap\libraries\msdos\winsock
-    $(NMAKE) -f nsldap.mak DEPEND=1
-    $(NMAKE) -f nsldap.mak 
-    $(NMAKE) -f nsldap.mak EXPORT=1
-!endif
-
-
-build_client:
-    @echo +++ client.mak: building client
-    cd $(MOZ_SRC)\ns\cmd\winfe\mkfiles32
-!if "$(MOZ_BITS)" == "16"
-    $(NMAKE) -f mozilla.mak exports
-!endif
-    $(NMAKE) -f mozilla.mak DEPEND=1
-    $(NMAKE) -f mozilla.mak
-
-
-#
-# remove all source files from the tree and print a report of what was missed
-#
-clobber_all:
-    cd $(MOZ_SRC)\ns
-    $(NMAKE) -f makefile.win clobber_all
-    cd $(MOZ_SRC)\ns\cmd\winfe\mkfiles32
-    $(NMAKE) -f mozilla.mak clobber_all
-!if !defined(MOZ_MEDIUM)
-    cd $(MOZ_SRC)\ns\netsite\ldap\libraries\msdos\winsock
-    $(NMAKE) -f nsldap.mak clobber_all
-!endif
-
-depend:
-    -del /s /q make.dep
-    $(NMAKE) -f makefile.win depend 
-
-quick:
-    @cd $(MOZ_SRC)\.
-    @cvs -q co ns/quickup
-    @cd $(MOZ_SRC)\ns\quickup
-    @$(MOZ_TOOLS)\perl5\perl doupdate.pl
-
-#//------------------------------------------------------------------------
-#// Utility stuff...
-#//------------------------------------------------------------------------
-
-#//------------------------------------------------------------------------
-# Verify that MOZ_SRC is set correctly
-#//------------------------------------------------------------------------
-
-# Check to see if it is set at all
-!if "$(MOZ_SRC)"!=""
-
-#
-# create a temp file at the root and make sure it is visible from MOZ_SRC
-#
-!if [copy $(MAKEDIR)\client.mak $(MAKEDIR)\xyzzy.tmp > NUL] == 0
-!endif
-
-!if !EXIST( $(MOZ_SRC)\ns\xyzzy.tmp )
-ERR_MESSAGE=$(ERR_MESSAGE)^
-MOZ_SRC isn't set correctly: [$(MOZ_SRC)\ns]!=[$(MAKEDIR)]
-!endif
-
-!if [del $(MAKEDIR)\xyzzy.tmp]
-!endif
-
-!else
-# MOZ_SRC isn't set at all
-ERR_MESSAGE=$(ERR_MESSAGE)^
-Environment variable MOZ_SRC isn't set.
-!endif
-
-#//------------------------------------------------------------------------
-# Verify that MOZ_BITS is set
-#//------------------------------------------------------------------------
-!if !defined(MOZ_BITS)
-ERR_MESSAGE=$(ERR_MESSAGE)^
-Environment variable MOZ_BITS isn't set.
-!endif
-
-!if !defined(MOZ_TOOLS)
-ERR_MESSAGE=$(ERR_MESSAGE)^
-Environment variable MOZ_TOOLS isn't set.
-!endif
-
-
-#//------------------------------------------------------------------------
-#// Display error 
-#//------------------------------------------------------------------------
-
-
-!if "$(ERR_MESSAGE)" != ""
-ERR_MESSAGE = ^
-client.mak:  ^
-$(ERR_MESSAGE) ^
-^
-client.mak: usage^
-^
-nmake -f client.mak [MOZ_BRANCH=<cvs_branch_name>] ^
-		    [MOZ_DATE=<cvs_date>]^
-		    [pull_and_build_all]^
-		    [pull_all]^
-		    [pull_dist]^
-		    [pull_client]^
-		    [build_all]^
-		    [build_dist]^
-		    [build_ldap]^
-		    [build_client]^
-^
-Environment variables:^
-^
-MOZ_BITS    set to either 32 or 16 ^
-MOZ_SRC     set to the directory above ns or "$(MAKEDIR)\.."^
-MOZ_TOOLS   set to the directory containing the java compiler see ^
-		http://warp/tools/nt^
-JAVA_HOME   set to the same thing as MOZ_TOOLS^
-
-!ERROR $(ERR_MESSAGE)
-
-!endif
-

mozilla/cmd/Makefile

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

mozilla/cmd/macfe/Composer/CColorPopup.cp

@@ -1,788 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-// ===========================================================================
-//	CColorPopup.cp
-// ===========================================================================
-
-#include "CColorPopup.h"
-#include "UGraphicGizmos.h"
-#include "UGraphicsUtilities.h"
-#include "CTargetedUpdateMenuRegistry.h"
-#include "CEditView.h"			// constant for menu string resource
-#include "edt.h"				// EDT calls
-#include "prefapi.h"
-#include "StSetBroadcasting.h"
-#include "CBrowserContext.h"	// MWContext
-
-
-// prototypes
-pascal void
-colorPopupMDEFProc( short message, MenuHandle theMenu, 
-					Rect *menuRect, Point hitPt, short *whichItem );
-
-// functionality
-
-static
-void
-colorPopupGetBox( Rect *menuRect, Rect *itemBox, short numItems, short theItem )
-{
-	Rect	box;
-
-	SetRect( itemBox, 0, 0, 0, 0 );
-	if ( theItem <= numItems )
-	{
-		if ( theItem == CColorPopup::CURRENT_COLOR_ITEM )
-		{
-			box.bottom = menuRect->bottom - CColorPopup::COLOR_FRAME_BORDER;
-			box.top = box.bottom - CColorPopup::COLOR_BOX_HEIGHT;
-			box.left = menuRect->left + CColorPopup::COLOR_FRAME_BORDER;
-			box.right = box.left + CColorPopup::COLOR_BOX_HEIGHT;
-		}
-		else if ( theItem == CColorPopup::DEFAULT_COLOR_ITEM )
-		{
-			box.bottom = menuRect->bottom - CColorPopup::COLOR_FRAME_BORDER 
-										- CColorPopup::COLOR_BOX_HEIGHT;
-			box.top = box.bottom - CColorPopup::COLOR_BOX_HEIGHT;
-			box.left = menuRect->left + CColorPopup::COLOR_FRAME_BORDER;
-			box.right = box.left + CColorPopup::COLOR_BOX_HEIGHT;
-		}
-		else if ( theItem == CColorPopup::LAST_COLOR_PICKED_ITEM )
-		{
-			box.top = menuRect->top + CColorPopup::COLOR_FRAME_BORDER;
-			box.bottom = box.top + CColorPopup::COLOR_BOX_HEIGHT;
-			box.left = menuRect->left + CColorPopup::COLOR_FRAME_BORDER;
-			box.right = box.left + CColorPopup::COLOR_BOX_HEIGHT;
-		}
-		else
-		{
-			box.top = menuRect->top /* + CColorPopup::COLOR_FRAME_BORDER */ + CColorPopup::COLOR_HEX_DISPLAY_SIZE;
-			box.left = menuRect->left + CColorPopup::COLOR_FRAME_BORDER;
-			box.bottom = box.top + CColorPopup::COLOR_BOX_HEIGHT;
-			box.right = box.left + CColorPopup::COLOR_BOX_WIDTH;
-
-			while ( --theItem > 1 )	// 1 is # menuItems preceding color chip matrix
-			{
-				OffsetRect( &box, CColorPopup::COLOR_BOX_WIDTH, 0 );
-				if ( box.left >= menuRect->right - CColorPopup::COLOR_FRAME_BORDER )
-				{
-					box.left = menuRect->left + CColorPopup::COLOR_FRAME_BORDER;
-					box.right = box.left + CColorPopup::COLOR_BOX_WIDTH;
-					OffsetRect( &box, 0, CColorPopup::COLOR_BOX_HEIGHT );
-				}
-			}
-		}
-		*itemBox = box;
-	}
-}
-
-
-static
-Boolean
-colorPopupParseColor( Str255 menuStr, RGBColor *theColor )
-{
-	Boolean			foundColorFlag = false;
-	unsigned short	part;
-	short			loop;
-
-	theColor->red = theColor->green = theColor->blue = 0;
-	for ( loop = 1; loop <= (unsigned)menuStr[ 0 ] - 6; ++loop )
-	{
-		if ( menuStr[0] > 1 
-		&& ( menuStr[ loop ] == CColorPopup::COLOR_CHIP_CHAR 
-		|| menuStr[ loop ] == CColorPopup::LAST_COLOR_PICKED_CHAR 
-		|| menuStr[ loop ] == CColorPopup::DEFAULT_COLOR_CHAR
-		|| menuStr[ loop ] == CColorPopup::CURRENT_COLOR_CHAR ) )
-		{
-		// Converting from ASCII to Hex
-		// This is BAD code...
-
-			part = menuStr[ loop + 1 ] - '0';
-			if ( part > 9 )
-				part = menuStr[ loop + 1 ] - 'A' + 10;
-			theColor->red = part << 4;
-			part = menuStr[ loop + 2 ] - '0';
-			if ( part > 9 )
-				part = menuStr[ loop + 2 ] - 'A' + 10;
-			theColor->red |= part;
-			theColor->red = theColor->red << 8;
-
-			part = menuStr[ loop + 3 ] - '0';
-			if ( part > 9 )
-				part = menuStr[ loop + 3 ] - 'A' + 10;
-			theColor->green = part << 4;
-			part = menuStr[ loop + 4 ] - '0';
-			if ( part > 9 )
-				part = menuStr[ loop + 4 ] - 'A' + 10;
-			theColor->green |= part;
-			theColor->green = theColor->green << 8;
-
-			part = menuStr[ loop + 5 ] - '0';
-			if ( part > 9 )
-				part = menuStr[ loop + 5 ] - 'A' + 10;
-			theColor->blue = part << 4;
-			part = menuStr[ loop + 6 ] - '0';
-			if ( part > 9 )
-				part = menuStr[ loop + 6 ] - 'A' + 10;
-			theColor->blue |= part;
-			theColor->blue = theColor->blue << 8;
-
-			foundColorFlag = true;
-			break;
-		}
-	}
-	
-	return foundColorFlag;
-}
-
-
-static
-void
-colorPopupDrawBox( MenuHandle theMenu, Rect *menuRect, short numItems )
-{
-	Boolean			wildcardFlag;
-	CIconHandle		cicnHandle;
-	RGBColor		theColor;
-	const RGBColor	black = {0,0,0}, white = {0xFFFF,0xFFFF,0xFFFF};
-	Rect			box;
-	Str255			menuStr;
-	short			theItem;
-
-	for ( theItem = 1; theItem <= numItems; ++theItem )
-	{
-		menuStr[ 0 ] = 0;
-		GetMenuItemText( theMenu, theItem, menuStr );
-		wildcardFlag = ((menuStr[0] == 0x01 && menuStr[1] == CColorPopup::COLOR_PICKER_CHAR)) ? true : false;
-		
-		colorPopupGetBox( menuRect, &box, numItems, theItem );
-
-		// text (if any)
-		int stringNum;
-		switch ( menuStr[1] )
-		{
-			default:									stringNum = 0;	break;
-			case CColorPopup::LAST_COLOR_PICKED_CHAR:	stringNum = 20;	break;
-			case CColorPopup::DEFAULT_COLOR_CHAR:		stringNum = 21;	break;
-			case CColorPopup::CURRENT_COLOR_CHAR:		stringNum = 22;	break;
-		}
-
-		if ( stringNum )
-		{
-			Point baseLinePoint;
-			baseLinePoint.v = box.top + CColorPopup::COLOR_BOX_HEIGHT - 4;
-			baseLinePoint.h = box.right + CColorPopup::COLOR_FRAME_BORDER;
-
-			Str255 menuItemStr;
-			menuItemStr[ 0 ] = 0;
-			::GetIndString( menuItemStr, CEditView::STRPOUND_EDITOR_MENUS, stringNum );
-			::RGBBackColor( &white );
-			::RGBForeColor( &black );
-			::MoveTo( baseLinePoint.h, baseLinePoint.v );
-			::DrawString( menuItemStr );
-		}
-
-		// draw color chip
-		if ( (true == wildcardFlag ) || (colorPopupParseColor( menuStr, &theColor ) == true))
-		{
-			::InsetRect( &box, 1, 1 );
-			::RGBForeColor( &black );
-			::MoveTo( box.left, box.bottom - 1 );
-			::LineTo( box.left, box.top );
-			::LineTo( box.right - 1, box.top );
-#ifdef THREE_D_EFFECT_ON_COLOR_POPUP
-			::RGBForeColor( &white );
-#endif
-			::LineTo( box.right - 1, box.bottom - 1 );
-			::LineTo( box.left, box.bottom - 1 );
-
-			if ( true == wildcardFlag )
-			{
-				RGBForeColor( &black );
-				if ( (cicnHandle = GetCIcon(11685)) != NULL )
-				{
-					// don't scale, plot into same size rect
-					Rect	r = (**cicnHandle).iconPMap.bounds;
-					box.bottom = box.top + r.bottom - r.top;
-					box.right = box.left + r.right - r.left;
-
-					::PlotCIcon( &box, cicnHandle );
-					::DisposeCIcon( cicnHandle );
-				}
-			}
-			else
-			{
-				InsetRect( &box, 1, 1 );
-				RGBForeColor( &theColor );
-				PaintRect( &box );
-
-				::RGBForeColor( &black );
-				box.left += ( box.right-box.left ) / 2;
-				box.right = box.left;
-				box.top += ( box.bottom - box.top ) / 2;
-				box.bottom = box.top;
-				InsetRect( &box, -4, -4 );
-				}
-			}
-		}
-}
-
-
-static
-void
-colorPopupChooseColor( Rect *menuRect, Point hitPt,
-						short *whichItem, short numItems, RGBColor *backColor )
-{
-	RGBColor	aColor;
-	Rect		box, oldBox;
-	short		newItem = 0, loop;
-
-	colorPopupGetBox( menuRect, &oldBox, numItems, *whichItem );
-
-	if ( PtInRect( hitPt, menuRect ) )
-	{
-		for ( loop = 1; loop <= numItems; loop++ )
-		{
-			colorPopupGetBox( menuRect, &box, numItems, loop );
-			if ( PtInRect( hitPt, &box ) )
-			{
-				newItem = loop;
-				break;
-			}
-		}
-	
-		if ( *whichItem != newItem )
-		{
-			// deselect old menu item, select new menu item
-			
-			if ( *whichItem > 0 )
-			{
-				RGBForeColor( backColor );
-				FrameRect( &oldBox );
-			}
-			if ( newItem > 0 )
-			{
-				aColor.red = aColor.blue = aColor.green = 0;
-				RGBForeColor( &aColor );
-				FrameRect( &box );
-			}
-
-#if COLOR_DISPLAY_TEXT
-			box = *menuRect;
-			box.top = box.bottom - COLOR_HEX_DISPLAY_SIZE;
-			EraseRect( &box );
-			if ( newItem > 0 )
-			{
-				menuStr[ 0 ] = 0;
-				GetMenuItemText( theMenu, newItem, menuStr );
-				if ( colorPopupParseColor( menuStr, &aColor ) == true )
-				{
-					if ( menuStr[ 0 ] )
-					{
-						// XXX should save/restore current font info, and set a particular (system?) font
-					
-						MoveTo( box.left + ((box.right-box.left) / 2) - ( ::StringWidth(menuStr) / 2), 
-								box.bottom - 4);
-						DrawString( menuStr );
-					}
-				}
-			}
-#endif
-			*whichItem = newItem;
-		}
-	}
-	else if ( *whichItem > 0 )
-	{
-		// deselect old menu item
-
-		RGBForeColor( backColor );
-		FrameRect( &oldBox );
-#if COLOR_DISPLAY_TEXT
-		box = *menuRect;
-		box.top = box.bottom - COLOR_HEX_DISPLAY_SIZE;
-		EraseRect( &box );
-#endif
-		*whichItem = 0;	// clear old item
-	}
-}
-
-
-pascal void
-colorPopupMDEFProc(short message, MenuHandle theMenu, 
-		Rect *menuRect, Point hitPt, short *whichItem)
-{
-	if ( theMenu == NULL )
-		return;
-	
-	PenState	pnState;
-	RGBColor	foreColor, backColor;
-#if 0
-	Boolean		growRowsFlag = false;
-#endif
-	short		numItems, numCols, numRows;
-
-	numItems = ::CountMItems( theMenu );
-	::GetPenState( &pnState );
-	::GetForeColor( &foreColor );
-	::PenNormal();
-	
-	switch( message )
-	{
-		case mDrawMsg:
-			colorPopupDrawBox( theMenu, menuRect, numItems );
-			break;
-
-		case mChooseMsg:
-			::GetBackColor( &backColor );
-			colorPopupChooseColor( menuRect, hitPt, whichItem, numItems, &backColor );
-			::RGBBackColor( &backColor );
-			break;
-
-		case mSizeMsg:
-
-		// determine # of rows/cols needed
-
-#if 0
-			if ( numItems > 0 )
-			{
-				numRows = numCols = 1;
-				while( numItems > (numRows * numCols) )
-				{
-					if ( growRowsFlag )
-						++numRows;
-					else
-						++numCols;
-					
-					growRowsFlag = (!growRowsFlag);
-				}
-			}
-#endif			
-#if 1
-			// hard code these for now
-			numRows = 10;
-			numCols = 10;
-#endif
-			// why are the width and height backwards?  If they are switched, the menu is wrong shape
-			(**theMenu).menuHeight = (numRows * CColorPopup::COLOR_BOX_HEIGHT) + (2 * CColorPopup::COLOR_FRAME_BORDER);
-			(**theMenu).menuWidth = (numCols * CColorPopup::COLOR_BOX_WIDTH) + CColorPopup::COLOR_FRAME_BORDER;
-	#if COLOR_DISPLAY_TEXT
-			(**theMenu).menuWidth += CColorPopup::COLOR_HEX_DISPLAY_SIZE;
-	#endif
-			break;
-
-		case mPopUpMsg:
-			::SetRect( menuRect, hitPt.v, hitPt.h, 
-						hitPt.v + (**theMenu).menuWidth, hitPt.h + (**theMenu).menuHeight );
-			break;
-/*
-		case	mDrawItemMsg:
-		break;
-
-		case	mCalcItemMsg:
-		break;
-*/
-		}
-
-	::RGBForeColor( &foreColor );
-	SetPenState( &pnState );
-}
-
-
-// This class overrides CPatternButtonPopup to provide a popup menu which
-// changes the descriptor based on the menu selection
-// assumes left-justified text in DrawButtonTitle()
-
-
-// ---------------------------------------------------------------------------
-//		¥ CColorPopup
-// ---------------------------------------------------------------------------
-// Stream-based ctor
-
-CColorPopup::CColorPopup(LStream* inStream)
-							:	CPatternButtonPopupText(inStream)
-{
-}
-
-
-void CColorPopup::FinishCreateSelf()
-{
-	LView *superview = NULL, *view = GetSuperView();
-	while ( view )
-	{
-		view = view->GetSuperView();
-		if ( view )
-			superview = view;
-	}
-
-	mEditView = (CEditView *)superview->FindPaneByID( CEditView::pane_ID );
-	mDoSetLastPickedPreference = false;
-
-	// need to Finish FinishCreateSelf to get menus set for retrieval
-	super::FinishCreateSelf();
-	
-	// set the control by adjusting the menu and then getting the current color
-	// unfortunately, when this is called, the editView doesn't have an mwcontext
-	// so we can't query to find out what the current color is to set it properly
-}
-
-
-void
-CColorPopup::InitializeCurrentColor()
-{
-	MenuHandle menuh;
-	menuh = GetMenu()->GetMacMenuH();
-	
-	MWContext *mwcontext;
-	if ( mEditView )
-		mwcontext = mEditView->GetNSContext() 
-						? mEditView->GetNSContext()->operator MWContext*()
-						: NULL;
-	else
-		mwcontext = NULL;
-	
-	char colorstr[9];
-	LO_Color color;
-	Boolean isColorFound = false;
-	
-	// first try to get the color out of the character data
-	EDT_CharacterData* chardata;
-	chardata = EDT_GetCharacterData( mwcontext );
-	if ( chardata && chardata->pColor )
-	{
-		isColorFound = true;
-		color = *chardata->pColor;
-		XP_SPRINTF( &colorstr[2], "%02X%02X%02X", color.red, color.green, color.blue);
-	}
-	if ( chardata )
-		EDT_FreeCharacterData( chardata );
-	
-	// if we still haven't found it, let's try the page data
-	if ( !isColorFound )
-	{
-		EDT_PageData *pagedata = EDT_GetPageData( mwcontext );
-		if ( pagedata && pagedata->pColorText )
-		{
-			isColorFound = true;
-			color = *pagedata->pColorText;
-			XP_SPRINTF( &colorstr[2], "%02X%02X%02X", color.red, color.green, color.blue);
-		}
-		if ( pagedata )
-			EDT_FreePageData( pagedata );
-	}
-	
-	// if we still haven't found the color, get the browser preference
-	if ( !isColorFound )
-	{
-		// editor.text_color
-		int iSize = 9;
-		int result = PREF_GetCharPref( "browser.foreground_color", &colorstr[1], &iSize );
-		if ( result != PREF_NOERROR )
-			colorstr[1] = 0;	// zero string if error is encountered
-	}
-	
-	colorstr[1] = CURRENT_COLOR_CHAR;	// put in leading character
-	colorstr[0] = strlen( &colorstr[1] );
-	::SetMenuItemText( menuh, CURRENT_COLOR_ITEM, (unsigned char *)&colorstr );
-	
-	// set descriptor of control
-	if ( GetValue() == CURRENT_COLOR_ITEM )
-	{
-		SetDescriptor( (const unsigned char *)colorstr );
-		Refresh();	// inval the control's visible pane area
-	}
-}
-
-
-// ---------------------------------------------------------------------------
-//		¥ AdjustMenuContents
-// ---------------------------------------------------------------------------
-//	Set last color picked (first item).
-
-void
-CColorPopup::AdjustMenuContents()
-{
-	MenuHandle menuh;
-	menuh = GetMenu()->GetMacMenuH();
-	
-	// initialize last color picked
-	char colorstr[9];
-	int iSize = 9;
-	int result;
-	
-	// note hack to avoid converting c-string to p-string
-	result = PREF_GetCharPref( "editor.last_color_used", &colorstr[1], &iSize );
-	if ( result == PREF_NOERROR )
-	{
-		colorstr[1] = LAST_COLOR_PICKED_CHAR;	// replace '#' with '<'
-		colorstr[0] = strlen( &colorstr[1] );
-		::SetMenuItemText( menuh, LAST_COLOR_PICKED_ITEM, (unsigned char *)&colorstr );
-	}
-	
-	// initialize the default color
-	result = PREF_GetCharPref( "browser.foreground_color", &colorstr[1], &iSize );
-	if ( result == PREF_NOERROR )
-	{
-		colorstr[1] = DEFAULT_COLOR_CHAR;	// replace '#' with '<'
-		colorstr[0] = strlen( &colorstr[1] );
-		::SetMenuItemText( menuh, DEFAULT_COLOR_ITEM, (unsigned char *)&colorstr );
-	}
-	
-	// initialize the current color
-	InitializeCurrentColor();
-}
-
-
-void CColorPopup::HandlePopupMenuSelect( Point inPopupLoc, Int16 inCurrentItem, 
-										Int16& outMenuID, Int16& outMenuItem )
-{
-	super::HandlePopupMenuSelect( inPopupLoc, inCurrentItem, outMenuID, outMenuItem );
-	
-	// check if we need to set the preference here...
-	mDoSetLastPickedPreference = ( outMenuID && outMenuItem != DEFAULT_COLOR_ITEM );
-}
-
-
-void CColorPopup::SetValue(Int32 inValue)
-{
-	if ( inValue == 0 )
-		inValue = CURRENT_COLOR_ITEM;
-	
-	Boolean shouldBroadcast;
-	// Handle color picker item special
-	if ( inValue == COLOR_PICKER_ITEM )
-	{
-		mValue = inValue;			//  Store new value to broadcast it
-		BroadcastValueMessage();	//  Inform Listeners of value change
-
-		inValue = CURRENT_COLOR_ITEM;	//	Reset value to current color
-		shouldBroadcast = false;	//	Already broadcast above; don't do again
-	}
-	else
-		shouldBroadcast = IsBroadcasting();
-	
-	// broadcast only if it's not a color picker item (handled above)
-	StSetBroadcasting setBroadcasting( this, shouldBroadcast );
-	super::SetValue( inValue );
-}
-
-
-// ---------------------------------------------------------------------------
-//		¥ HandleNewValue
-// ---------------------------------------------------------------------------
-//	Hook for handling value changes. Called by SetValue.
-//	Note that the setting of the new value is done by CPatternButtonPopup::SetValue.
-//  Therefore, GetValue() will still return the old value here, so the old value is
-//	still available in this method.
-
-Boolean
-CColorPopup::HandleNewValue(Int32 inNewValue)
-{
-	Str255	str;
-	MenuHandle menuh;
-	menuh = GetMenu()->GetMacMenuH();
-	::GetMenuItemText ( menuh, inNewValue, str );
-
-	if ( str[1] != COLOR_PICKER_CHAR )
-		SetDescriptor( str );
-
-	if ( mDoSetLastPickedPreference 
-	&& str[1] != LAST_COLOR_PICKED_CHAR && str[1] != COLOR_PICKER_CHAR )
-	{
-		mDoSetLastPickedPreference = false;
-
-		// skip over any text which might preceed color
-		int index;
-		for ( index = 1; index <= str[0]
-			&& str[index] != LAST_COLOR_PICKED_CHAR
-			&& str[index] != COLOR_CHIP_CHAR
-			&& str[index] != COLOR_PICKER_CHAR
-			&& str[index] != DEFAULT_COLOR_CHAR
-			&& str[index] != CURRENT_COLOR_CHAR; ++index )
-			;
-		
-		if ( index + 7 < str[0] )
-			str[index + 7] = 0;	// null terminate after symbol + 6chars of color
-		
-		str[ index ] = COLOR_CHIP_CHAR;	// prefs assume #-format color
-		p2cstr( str );
-		int result;
-		result = PREF_SetCharPref( "editor.last_color_used", (char *)&str[index-1] );
-														// skip past initial symbol; index-1 since now c-string
-	}
-	
-	return false;
-}
-
-
-const Int16 cPopupArrowHeight	= 	5;		// height of the arrow
-const Int16 cPopupArrowWidth	= 	9;		// widest width of the arrow
-
-
-void
-CColorPopup::DrawButtonContent(void)
-{
-	CPatternButtonPopupText::DrawButtonContent();
-	DrawPopupArrow();
-}
-
-
-void
-CColorPopup::DrawButtonTitle(void)
-{
-}
-
-
-void
-CColorPopup::DrawButtonGraphic(void)
-{
-	ResIDT		theSaveID = GetGraphicID();
-	ResIDT		theNewID = theSaveID;
-	RGBColor	foreColor, theColor;
-	const RGBColor	black={0,0,0};
-
-	Int32 theValue = GetValue();
-	if (theValue > 0)
-	{
-		if ( theValue == COLOR_PICKER_ITEM )
-			theValue = CURRENT_COLOR_ITEM;
-		
-		if (GetMenuItemRGBColor((short)theValue, &theColor) == true)
-		{
-			CButton::CalcGraphicFrame();
-			InsetRect(&mCachedGraphicFrame, (mCachedGraphicFrame.right-mCachedGraphicFrame.left-12)/2,
-				(mCachedGraphicFrame.bottom-mCachedGraphicFrame.top-12)/2);
-			
-			::GetForeColor(&foreColor);
-
-			::RGBForeColor(&black);
-			::FrameRect(&mCachedGraphicFrame);
-			::RGBForeColor(&foreColor);
-
-			::InsetRect(&mCachedGraphicFrame,1,1);
-			::RGBForeColor(&theColor);
-			::PaintRect(&mCachedGraphicFrame);
-		}
-		else
-			theValue = CURRENT_COLOR_ITEM;	// not sure this is the right thing; 
-											// it'd be nice if GetMenuItemRGBColor always returned true
-	}
-}
-
-
-void
-CColorPopup::DrawPopupArrow(void)
-{
-	Rect theFrame;
-	
-	CalcLocalFrameRect(theFrame);
-	
-	Int16 width = theFrame.right - theFrame.left;
-	Int16 height = theFrame.bottom - theFrame.top;
-	theFrame.top += ((height - cPopupArrowHeight) / 2);
-	theFrame.left = theFrame.right - cPopupArrowWidth - 7;
-	theFrame.right = theFrame.left + cPopupArrowWidth - 1;
-	theFrame.bottom = theFrame.top + cPopupArrowHeight - 1;
-
-	// check if we have moved past the right edge of the button
-	// if so, adjust it back to the right edge of the button
-	if ( theFrame.right > mCachedButtonFrame.right - 4 )
-	{
-		theFrame.right = mCachedButtonFrame.right - 4;
-		theFrame.left = theFrame.right - cPopupArrowWidth - 1;
-	}
-
-	UGraphicGizmos::DrawPopupArrow(
-									theFrame,
-									IsEnabled(),
-									IsActive(),
-									IsTrackInside());
-}
-
-
-#pragma mark -
-
-// always call ProcessCommandStatus for popup menus which can change values
-void
-CColorPopup::HandleEnablingPolicy()
-{
-	LCommander* theTarget		= LCommander::GetTarget();
-	MessageT	buttonCommand	= GetValueMessage();
-	Boolean 	enabled			= false;
-	Boolean		usesMark		= false;
-	Str255		outName;
-	Char16		outMark;
-	
-	if (!CTargetedUpdateMenuRegistry::UseRegistryToUpdateMenus() ||
-			CTargetedUpdateMenuRegistry::CommandInRegistry(buttonCommand))
-	{
-		if (!IsActive() || !IsVisible())
-			return;
-			
-		if (!theTarget)
-			return;
-		
-		CPatternButtonPopup::HandleEnablingPolicy();
-		
-		if (buttonCommand)
-			theTarget->ProcessCommandStatus(buttonCommand, enabled, usesMark, outMark, outName);
-	}
-	CPatternButtonPopup::Enable();
-}
-
-
-
-Boolean
-CColorPopup::GetMenuItemRGBColor(short menuItem, RGBColor *theColor)
-{
-	Str255		str;
-	MenuHandle	menuh;
-	Boolean		colorFoundFlag;
-
-	menuh = GetMenu()->GetMacMenuH();
-	::GetMenuItemText( menuh, menuItem, str );
-	colorFoundFlag = colorPopupParseColor( str, theColor );
-	return colorFoundFlag;
-}
-
-
-
-short
-CColorPopup::GetMenuItemFromRGBColor(RGBColor *theColor)
-{
-	MenuHandle	menuh;
-	RGBColor	tempColor;
-	Str255		str;
-	short		loop,numItems,retVal=CURRENT_COLOR_ITEM; // return current color if not found
-
-	if ((menuh = GetMenu()->GetMacMenuH()) != NULL)
-	{
-		numItems = ::CountMItems(menuh);
-		for (loop=1; loop<= numItems; loop++)
-		{
-			::GetMenuItemText( menuh, loop, str);
-			if (colorPopupParseColor(str, &tempColor) == true)
-			{
-				if ((tempColor.red == theColor->red) && (tempColor.blue == theColor->blue) && (tempColor.green == theColor->green))
-				{
-					retVal = loop;
-					break;
-				}
-			}
-		}
-	}
-	return retVal;
-}

mozilla/cmd/macfe/Composer/CColorPopup.h

@@ -1,74 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "CPatternButtonPopupText.h"
-
-class CEditView;
-
-
-class CColorPopup : 	public CPatternButtonPopupText
-{
-	public:
-		enum { class_ID = 'Cpop' };
-		enum { COLOR_DISPLAY_TEXT = 0,	// need to fix "*" bug before turning on (among other things)
-		 		COLOR_FRAME_BORDER = 2,
-				COLOR_BOX_WIDTH = 14,
-				COLOR_BOX_HEIGHT = 14,
-				COLOR_HEX_DISPLAY_SIZE = 16
-		 	};
-		 enum {
-		 		LAST_COLOR_PICKED_CHAR = '<',
-		 		LAST_COLOR_PICKED_ITEM = 1,
-		 		COLOR_CHIP_CHAR = '#',
-		 		COLOR_PICKER_CHAR = '*',
-		 		COLOR_PICKER_ITEM = 62,
-		 		DEFAULT_COLOR_CHAR = '@',
-		 		DEFAULT_COLOR_ITEM = 72,
-		 		CURRENT_COLOR_CHAR = '.',
-		 		CURRENT_COLOR_ITEM = 73
-		 	};
-
-	typedef CPatternButtonPopupText super;
-	
-		
-	static	void*	CreateCColorPopupStream( LStream *inStream ) {return( new CColorPopup (inStream ));};
-					CColorPopup( LStream *inStream );		//	¥ Constructor
-	virtual void	FinishCreateSelf();
-	
-						// ¥ drawing
-	void			DrawButtonContent(void);
-	void 			DrawButtonTitle(void);
-	void			DrawPopupArrow(void);
-	void			DrawButtonGraphic(void);
-
-						// ¥ hooks
-	virtual void 		SetValue( Int32 inValue );
-	virtual void		AdjustMenuContents();
-	virtual	void		HandlePopupMenuSelect( Point inPopupLoc, Int16 inCurrentItem,
-												Int16& outMenuID, Int16& outMenuItem );
-	virtual Boolean		HandleNewValue(Int32 inNewValue);
-	virtual Boolean		GetMenuItemRGBColor(short menuItem, RGBColor *theColor);
-	virtual short		GetMenuItemFromRGBColor(RGBColor *theColor);
-	
-	void			InitializeCurrentColor();
-
-protected:
-	virtual void		HandleEnablingPolicy();
-	CEditView			*mEditView;
-	Boolean				mDoSetLastPickedPreference;
-};

mozilla/cmd/macfe/Composer/CComposerDragTask.cp

@@ -1,71 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-// ===========================================================================
-//	CComposerDragTask.cp
-// ===========================================================================
-
-
-#include "CComposerDragTask.h"
-
-
-// ---------------------------------------------------------------------------
-//		¥ CComposerDragTask
-// ---------------------------------------------------------------------------
-
-CComposerDragTask::CComposerDragTask(
-	const EventRecord&	inEventRecord,
-	const Rect& 		inGlobalFrame,
-	CHTMLView& 			inHTMLView)
-	:	mGlobalFrame(inGlobalFrame),
-		mHTMLView(inHTMLView),
-		super(inEventRecord)
-{
-}	
-
-
-// ---------------------------------------------------------------------------
-//		¥ ~CComposerDragTask
-// ---------------------------------------------------------------------------
-											
-CComposerDragTask::~CComposerDragTask()
-{
-}	
-
-
-// ---------------------------------------------------------------------------
-//		¥ AddFlavors
-// ---------------------------------------------------------------------------
-
-void
-CComposerDragTask::AddFlavors( DragReference /* inDragRef */ )
-{
-	OSErr theErr;
-	
-	theErr = ::AddDragItemFlavor( mDragRef, (ItemReference)this, emComposerNativeDrag,
-									nil, 0, flavorNotSaved | flavorSenderTranslated );
-	ThrowIfOSErr_(theErr);
-}
-
-
-void
-CComposerDragTask::MakeDragRegion( DragReference /* inDragRef */, RgnHandle /* inDragRegion */ )
-{
-	AddRectDragItem((ItemReference)&mHTMLView, mGlobalFrame);
-}
-				

mozilla/cmd/macfe/Composer/CComposerDragTask.h

@@ -1,56 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-// ===========================================================================
-//	CComposerDragTask.h
-// ===========================================================================
-
-#ifndef CComposerDragTask_H
-#define CComposerDragTask_H
-#pragma once
-
-// Includes
-
-#include <LDragTask.h>
-
-class CHTMLView;
-
-#define emComposerNativeDrag 'CNDr'	// others defined in "resgui.h"
-
-// Class declaration
-
-class CComposerDragTask : public LDragTask
-{
-public:
-	typedef LDragTask super;
-	
-							CComposerDragTask( const EventRecord& inEventRecord,
-											const Rect& inGlobalFrame, CHTMLView& inHTMLView );
-	virtual	 				~CComposerDragTask();
-						
-protected:
-	virtual void			AddFlavors( DragReference inDragRef );
-	virtual void		 	MakeDragRegion( DragReference inDragRef, RgnHandle inDragRegion );
-
-
-	Rect			mGlobalFrame;
-	CHTMLView&		mHTMLView;
-};
-
-
-#endif

mozilla/cmd/macfe/Composer/CEditDictionary.cp

@@ -1,320 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "CEditDictionary.h"
-#include "CLargeEditField.h"	// msg_EditField2
-#include "LGAPushButton.h"
-#include "resgui.h"				// msg_Help
-#include "macutil.h"			// ShowHelp
-#include "CSpellChecker.h"		// ISpellChecker
-
-// need to include "ntypes.h" before "xp_help.h" because 
-// "xp_help.h" doesn't include definition of MWContext though it should
-#include "ntypes.h"
-#include "xp_help.h"			// HELP_SPELL_CHECK
-
-// If user has changed the word field, figure out the length and enable/disable appropriately
-void		CEditDictionary::ListenToMessage	(	MessageT inMessage, 
-														void*		ioParam )	{
-														
-	Assert_(mWordNameField);
-	Assert_(mAddButton);
-	
-	// This happens when user types
-	if (inMessage == msg_EditField2) {
-		if ((**(mWordNameField->GetMacTEH())).teLength) {
-			mAddButton->Enable();
-		} else {
-			mAddButton->Disable();
-		}
-	
-	// User clicked in words table	
-	} else if (inMessage == WordsTableID) {
-	
-		Boolean atleastoneselected = false;
-		// Must have at least one cell selected for remove to be valid
-		STableCell selchecker(0,0);
-		if (mWordsView->GetNextSelectedCell(selchecker)) {
-			atleastoneselected = true;
-			mRemoveButton->Enable();
-		} else {
-			mRemoveButton->Disable();
-		}
-		// Replace is enabled if there is a valid word in New Word Edit Field
-		// And exactly one word is selected
-		if ((**(mWordNameField->GetMacTEH())).teLength && atleastoneselected &&
-		 !mWordsView->GetNextSelectedCell(selchecker) ) {
-			mReplaceButton->Enable();
-		} else {
-			mReplaceButton->Disable();
-		}
-	
-	// User left words table
-	} else if (inMessage == msg_LeaveDictionaryTable) {
-		mRemoveButton->Disable();
-		mReplaceButton->Disable();
-	
-	// If user clicks on Remove Button
-	} else if (inMessage == RemoveButtonID) {
-		RemoveSelectedWords();
-	
-	// If user clicks on Replace Button
-	} else if (inMessage == ReplaceButtonID) {
-		ReplaceSelectedWord();
-		
-	// If user clicks on OK Button
-	}	else if (inMessage == msg_OK) {
-		MakeDictionaryChangesPermanent();
-		AttemptClose();
-		
-	// If user clicks on Cancel Button
-	} else if (inMessage == msg_Cancel) {
-		AttemptClose();
-	
-	// User clicks on Help Button	
-	} else if (inMessage == msg_Help) {
-		ShowHelp(HELP_SPELL_CHECK);
-		
-	// This is the case when something important happens (selection, deselection, etc.)
-	// to the New Word edit field.  Check status of word
-	} else if (inMessage == WordID) {
-		if ((**(mWordNameField->GetMacTEH())).teLength) {
-			mAddButton->Enable();
-		} else {
-			mAddButton->Disable();
-		}
-		
-	// Add word to dictionary	
-	} else if (inMessage == AddButtonID) {
-		AddNewWord();
-	} else {
-		LGADialogBox::ListenToMessage(inMessage, ioParam);
-	}			
-	
-}
-
-//-------------------------------------------------------------------------------------
-// CEditDictionary::MakeDictionaryChangesPermanent
-// Take words in view and set in dictionary
-//-------------------------------------------------------------------------------------
-void CEditDictionary::MakeDictionaryChangesPermanent() {
-
-	STableCell 	currCellLoc(1,1);
-	Str255			currCellData;
-	int					maxsize = 255;
-	
-	mISpellChecker->ResetPersonalDictionary();
-	for (currCellLoc.row = 1; currCellLoc.row <= mNumWords; currCellLoc.row++) {
-		maxsize = 255;
-		mWordsView->GetCellData(currCellLoc, currCellData, maxsize);
-		mISpellChecker->AddWordToPersonalDictionary(p2cstr(currCellData));
-	}
-}
-
-
-//-------------------------------------------------------------------------------------
-// CEditDictionary::RemoveSelectedWord
-// Remove words that are currently selected
-//-------------------------------------------------------------------------------------
-void  CEditDictionary::RemoveSelectedWords() {
-
-	STableCell currCellLoc(0,0);
-	int rowstodelete = 0;
-		
-	while (mWordsView->GetNextSelectedCell(currCellLoc)) {
-		rowstodelete++;
-	}
-	currCellLoc = mWordsView->GetFirstSelectedCell();
-	mWordsView->RemoveRows(rowstodelete, currCellLoc.row, true);
-	mNumWords-=rowstodelete;
-}
-
-//-------------------------------------------------------------------------------------
-// CEditDictionary::ReplaceSelectedWord
-// Remove currently selected word with word in New Word box
-//-------------------------------------------------------------------------------------
-void  CEditDictionary::ReplaceSelectedWord() {
-
-	STableCell currCellLoc;
-	Str255 theWord;
-	
-	mWordNameField->GetDescriptor(theWord);
-	currCellLoc = mWordsView->GetFirstSelectedCell();
-	if (mWordsView->IsValidCell(currCellLoc)) {
-		mWordsView->SetCellData(currCellLoc, theWord, theWord[0] + 1);
-		mWordsView->RefreshCell(currCellLoc);
-	}
-}
-
-
-//-------------------------------------------------------------------------------------
-// CEditDictionary::AddNewWord
-// Add the word in "New Word" edit field to personal dictionary
-//-------------------------------------------------------------------------------------
-void  CEditDictionary::AddNewWord()	{
-
-	Str255 theWord;
-	Str255 currWord;
-	Assert_(mWordNameField);
-	Assert_(mISpellChecker);
-	
-	STableCell cell(1,1);
-	Uint32 maxbytes;
-
-	mWordNameField->GetDescriptor(theWord);
-	
-	/*
-	Check to make sure word is not already in the list.  If it is, then highlight that word
-	and return so we don't insert.
-	*/
-	for (cell.row = 1; cell.row <= mNumWords; cell.row++) {
-		maxbytes = 255;
-		mWordsView->GetCellData(cell, currWord, maxbytes);
-		if (currWord[0] == theWord[0] && 
-		 !strncmp(reinterpret_cast<const char *>(&(currWord[1])), reinterpret_cast<const char *>(&(theWord[1])), theWord[0]) ) {		// If word already exists exit
-				mWordsView->UnselectAllCells();
-				mWordsView->SelectCell(cell);
-				return;
-		}
-	}
-	
-	mWordsView->InsertRows(1, mNumWords, theWord, theWord[0] + 1, Refresh_Yes);
-	mNumWords++;
-	cell.row = mNumWords;
-	mWordsView->UnselectAllCells();
-	mWordsView->SelectCell(cell);
-}
-
-
-//-------------------------------------------------------------------------------------
-// CEditDictionary::FinishCreateSelf
-// Setup object references
-//-------------------------------------------------------------------------------------
-void	CEditDictionary::FinishCreateSelf ()	{
-
-	mAddButton = dynamic_cast<LGAPushButton *>(FindPaneByID(AddButtonID));
-	mReplaceButton = dynamic_cast<LGAPushButton *>(FindPaneByID(ReplaceButtonID));
-	mRemoveButton = dynamic_cast<LGAPushButton *>(FindPaneByID(RemoveButtonID));
-	mHelpButton = dynamic_cast<LGAPushButton *>(FindPaneByID(HelpButtonID));
-	mWordNameField = dynamic_cast<CLargeEditFieldBroadcast *>(FindPaneByID(WordID));
-	mWordsView = dynamic_cast<CTextTable *>(FindPaneByID( WordsTableID ));
-	
-	ThrowIfNil_(mAddButton);
-	ThrowIfNil_(mReplaceButton);
-	ThrowIfNil_(mRemoveButton);
-	ThrowIfNil_(mHelpButton);
-	ThrowIfNil_(mWordNameField);
-	ThrowIfNil_(mWordsView);
-		
-	LGADialogBox::FinishCreateSelf();
-
-	PenState penState;
-	::GetPenState( &penState );
-	mWordsView->AddAttachment( new LColorEraseAttachment( &penState, NULL, NULL, true ) );
-	mAddButton->Disable();		// Add button should be originally disabled
-	mReplaceButton->Disable();
-	mRemoveButton->Disable();
-	
-	mAddButton->AddListener( this );
-	mReplaceButton->AddListener( this );
-	mRemoveButton->AddListener( this );
-	mWordNameField->AddListener( this );
-	mWordsView->AddListener( this );
-	mHelpButton->AddListener( this );
-}
-
-// Constructor
-
-CEditDictionary::CEditDictionary(LStream *inStream)	: mNumWords(0), 
-		mWordNameField(NULL), mISpellChecker(NULL), mAddButton(NULL), mWordsView(NULL), 
-		mHelpButton(NULL), LGADialogBox (inStream) {
-
-}
-
-//-------------------------------------------------------------------------------------
-// CEditDictionary::SetISPellChecker
-// Sets personal dictionary and inserts into GUI
-//-------------------------------------------------------------------------------------
-
-void CEditDictionary::SetISpellChecker(ISpellChecker *i)	{
-
-	STableCell	cell(0, 1);
-	int unusedNumber;
-	char word_buffer[max_word_length];
-	int curr_word_length;
-	
-	mISpellChecker = i;
-	cell.row = 0;
-	
-	if ((mISpellChecker->GetFirstPersonalDictionaryWord(word_buffer, max_word_length) >= 0) && mWordsView) {
-		mWordsView->FocusDraw();
-		do	{
-			mNumWords++;
-			cell.row++;
-			curr_word_length = strlen(word_buffer);
-			CStr255 pascalstring( word_buffer );
-			mWordsView->InsertRows(1, cell.row-1, NULL ,0, Refresh_Yes);
-			mWordsView->SetCellData(cell, pascalstring, curr_word_length + 1);
-			// Insert the words into dialog box here!
-		}	while	(mISpellChecker->GetNextPersonalDictionaryWord(word_buffer, max_word_length) >= 0);
-	}
-	
-	mWordsView->GetTableSize(mNumWords, unusedNumber);
-}
-
-//-------------------------------------------------------------------------------------
-// CEditDictionary::GetISPellChecker
-// Get the Personal Dictionary
-//-------------------------------------------------------------------------------------
-ISpellChecker *CEditDictionary::GetISpellChecker()	{
-
-	return mISpellChecker;
-}
-
-//-------------------------------------------------------------------------------------
-// CEditDictionaryTable::BeTarget()
-// Broadcast messages when we become target so we can setup buttons
-//-------------------------------------------------------------------------------------
-void CEditDictionaryTable::BeTarget() {
-
-	CTextTable::BeTarget();
-	BroadcastMessage(CEditDictionary::WordsTableID, NULL);
-}
-
-//-------------------------------------------------------------------------------------
-// CEditDictionaryTable::DontBeTarget()
-// Broadcast messages when we lose target so we can setup buttons
-//-------------------------------------------------------------------------------------
-void CEditDictionaryTable::DontBeTarget() {
-
-	CTextTable::DontBeTarget();
-	BroadcastMessage(CEditDictionary::msg_LeaveDictionaryTable, NULL);
-}
-
-//-------------------------------------------------------------------------------------
-// HiliteSelection
-// Setup back/front colors.  Otherwise we sometimes get the de-highlighting
-// wrong when switching selection
-//-------------------------------------------------------------------------------------
-void CEditDictionaryTable::HiliteSelection(	Boolean	inActively, 	Boolean	 inHilite )
-{
-	if (inActively) {
-		StColorPenState::Normalize();
-	}
-	LTableView::HiliteSelection( 	inActively, inHilite );
-}

mozilla/cmd/macfe/Composer/CEditDictionary.h

@@ -1,76 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#pragma once
-
-#include "CTextTable.h"
-#include <LGADialogBox.h>
-
-
-class LGAPushButton;
-class CLargeEditFieldBroadcast;
-class ISpellChecker;
-
-
-class CEditDictionary : public LGADialogBox {
-
-	public:
-
-		virtual 	void							ListenToMessage	(	MessageT inMessage, 
-																	void*		ioParam );		
-														
-		virtual		void							FinishCreateSelf();
-													CEditDictionary(LStream *inStream);
-																
-					void							SetISpellChecker(ISpellChecker *i);
-					ISpellChecker					*GetISpellChecker();						
-																
-		enum	{ class_ID = 'CEdD', res_ID = 5298 };
-		enum	{ AddButtonID	= 201 ,	WordID = 200, WordsTableID = 202, ReplaceButtonID = 203,
-				RemoveButtonID = 204, HelpButtonID = 205, msg_LeaveDictionaryTable = 208 };
-		enum	{ max_word_length = 50 };	// Max length of a word
-		
-	protected:
-	
-							void 							MakeDictionaryChangesPermanent();
-		virtual		void 							AddNewWord();
-		virtual		void  						RemoveSelectedWords();
-		virtual		void							ReplaceSelectedWord();
-		CLargeEditFieldBroadcast 		*mWordNameField;			// The field where user edits word
-		LGAPushButton 							*mAddButton;					// Add new word button
-		LGAPushButton								*mReplaceButton;
-		LGAPushButton								*mRemoveButton;
-		LGAPushButton								*mHelpButton;
-		CTextTable									*mWordsView;					// The Personal Dictionary view
-		
-		int													mNumWords;
-		
-		ISpellChecker								*mISpellChecker;
-};
-
-class CEditDictionaryTable : public CTextTable {
-
-	public:
-	
-			enum	{class_ID = 'CEDT' };
-			virtual void		BeTarget();
-			virtual void		DontBeTarget();
-											CEditDictionaryTable(LStream *inStream) : CTextTable(inStream) { }
-	
-							void 		HiliteSelection(	Boolean	inActively, 	Boolean	 inHilite );
-};

mozilla/cmd/macfe/Composer/CEditView.h

@@ -1,272 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#pragma once
-
-#include <TextServices.h>
-#include "CHTMLView.h"
-
-// dangling prototype
-Boolean GetCaretPosition(MWContext *context, LO_Element * element, int32 caretPos, 
-									int32* caretX, int32* caretYLow, int32* caretYHigh );
-
-
-class LGAPopup;
-class CPatternButtonPopup;
-class CColorPopup;
-class CComposeSession;
-class CFontMenuPopup;
-
-class HTMLInlineTSMProxy;
-class HoldUpdatesProxy;
-
-class CEditView: public CHTMLView
-{
-#if !defined(__MWERKS__) || (__MWERKS__ >= 0x2000)
-	typedef CHTMLView inherited;
-#endif
-
-public:
-	enum { pane_ID = 'html', class_ID = 'Edtp', dashMark = '-' };
-	enum {
-			STRPOUND_EDITOR_MENUS			= 5101,
-			EDITOR_MENU_SHOW_PARA_SYMBOLS		= 1,
-			EDITOR_MENU_HIDE_PARA_SYMBOLS		= 2,
-			EDITOR_MENU_UNDO					= 3,
-			EDITOR_MENU_REDO					= 4,
-			EDITOR_MENU_SHOW_COMP_TOOLBAR		= 5,
-			EDITOR_MENU_HIDE_COMP_TOOLBAR		= 6,
-			EDITOR_MENU_SHOW_FORMAT_TOOLBAR		= 7,
-			EDITOR_MENU_HIDE_FORMAT_TOOLBAR		= 8,
-			EDITOR_MENU_SHOW_TABLE_BORDERS		= 9,
-			EDITOR_MENU_HIDE_TABLE_BORDERS		= 10,
-			EDITOR_MENU_CHARACTER_ATTRIBS		= 11,
-			EDITOR_MENU_IMAGE_ATTRIBUTES		= 12,
-			EDITOR_MENU_LINK_ATTRIBUTES			= 13,
-			EDITOR_MENU_LINE_ATTRIBUTES			= 14,
-			EDITOR_MENU_TABLE_ATTRIBUTES		= 15,
-			EDITOR_MENU_UNKNOWN_ATTRIBUTES		= 16,
-			EDITOR_MENU_TARGET_ATTRIBUTES		= 17
-	};
-	enum {
-			eMouseHysteresis = 6,
-			eSelectionBorder = 3
-	};
-	
-	// ¥¥ Constructors
-					CEditView(LStream * inStream);
-					~CEditView();
-	virtual void	FinishCreateSelf(void);
-
-	// ¥¥ Command handling
-	virtual	Boolean ObeyCommand( CommandT inCommand, void *ioParam );
-	virtual void	ListenToMessage( MessageT inMessage, void* ioParam );
-	virtual void  	FindCommandStatus( CommandT inCommand,
-							Boolean& outEnabled, Boolean& outUsesMark, 
-							Char16& outMark,Str255 outName );
-			Boolean	FindCommandStatusForContextMenu( CommandT inCommand,
-							Boolean &outEnabled, Boolean &outUsesMark,
-							Char16 &outMark, Str255 outName );
-	
-			Boolean IsPastable(Char16 theChar);
-			int 	FindQueuedKeys( char *keys_in_q );
-	virtual Boolean HandleKeyPress( const EventRecord& inKeyEvent );
-	
-	virtual void 	AdaptToSuperFrameSize( Int32 inSurrWidthDelta, 
-											Int32 inSurrHeightDelta, Boolean inRefresh );
-								
-	virtual void	BeTarget();
-	virtual void	DontBeTarget();
-
-			void	HandleCut();
-			void	HandleCopy();
-			void	HandlePaste();
-	
-	TSMDocumentID	midocID;
-	
-	virtual void	CreateFindWindow();
-	virtual void	SetContext( CBrowserContext* inNewContext );
-	virtual URL_Struct *GetURLForPrinting( Boolean& outSuppressURLCaption, MWContext *printingContext );
-
-	void			TakeOffDuty();
-	virtual void	PutOnDuty(LCommander*);
-	
-	Bool 			PtInSelectedRegion(SPoint32 cpPoint );
-	virtual void	DrawSelf( void );
-	virtual Boolean	EstablishPort();
-	virtual void 	ActivateSelf();
-	virtual void 	DeactivateSelf();
-	
-	Bool			SaveDocument();
-	Bool			SaveDocumentAs();
-	Bool			VerifySaveUpToDate();
-	
-
-	// ¥¥ cursor calls and caret functionality
-	virtual void	AdjustCursorSelf( Point inPortPt, const EventRecord& inMacEvent );
-
-	virtual void	SpendTime( const EventRecord& inMacEvent );
-	void	 		DrawCaret( Boolean doErase );
-	void	 		EraseCaret();
-	void			HideCaret( Boolean mhide ) { EraseCaret(); mHideCaret = mhide; }
-	void			PlaceCaret(int32 caretX, int32 caretYLow, int32 caretYHigh);
-	void			RemoveCaret();
-	void 			DisplayGenericCaret( MWContext *context, LO_Element * pLoAny, 
-										ED_CaretObjectPosition caretPos );
-	
-	// ¥¥ Drag and Drop 
-	virtual Boolean	ItemIsAcceptable (DragReference	dragRef, ItemReference itemRef);
-	virtual void	ReceiveDragItem( DragReference inDragRef, DragAttributes inDragAttr, 
-									ItemReference inItemRef, Rect& inItemBounds );
-	virtual void	DoDragSendData( FlavorType inFlavor, ItemReference inItemRef,
-									DragReference inDragRef );
-	
-	virtual void	ClickSelf (const SMouseDownEvent& where );
-	virtual	Boolean	ClickTrackSelection( const SMouseDownEvent&	inMouseDown, 
-										CHTMLClickRecord& inClickRecord );
-	
-	virtual Boolean	SetDefaultCSID( Int16 inPreferredCSID );
-	CBrowserContext	*GetNSContext() { return mContext; };
-
-	void			SetHoldUpdates(HoldUpdatesProxy* inHoldUpdates) {mHoldUpdates = inHoldUpdates;};
-
-	Boolean			mEditorDoneLoading;
-	Boolean			IsDoneLoading() const { return mEditorDoneLoading; }
-
-	// ¥¥ FE_* calls
-	void			DocumentChanged( int32 iStartY, int32 iHeight );
-	void			GetDocAndWindowPosition( SPoint32 &frameLocation, SPoint32 &imageLocation, SDimension16 &frameSize );
-	
-	// ¥¥ formatting query calls
-	void			UseCharFormattingCache() { CanUseCharFormatting(); mUseCharFormattingCache = true; }
-	void			DontUseCharFormattingCache() { mUseCharFormattingCache = false; }
-
-	class StUseCharFormattingCache
-	{
-		public:
-			StUseCharFormattingCache( CEditView& p ) : view(p) { view.UseCharFormattingCache(); }
-			~StUseCharFormattingCache() { view.DontUseCharFormattingCache(); }
-		
-		private:
-			CEditView &view;	
-	};
-
-	LGAPopup		* mParagraphToolbarPopup;
-	LGAPopup		* mSizeToolbarPopup;
-	CFontMenuPopup	* mFontToolbarPopup;
-	CPatternButtonPopup	* mAlignToolbarPopup;
-	CColorPopup		* mColorPopup;
-
-protected:
-	virtual Boolean		IsGrowCachingEnabled() const { return !mEditorDoneLoading; }
-
-	virtual void 		LayoutNewDocument( URL_Struct *inURL, Int32 *inWidth,
-										Int32 *inHeight, Int32 *inMarginWidth, Int32 *inMarginHeight );
-
-	// ¥¥ FE_* calls
-	virtual void 		SetDocPosition( int inLocation, Int32 inX, Int32 inY,
-									Boolean inScrollEvenIfVisible = false);
-	virtual void 		DisplayLineFeed( int inLocation, LO_LinefeedStruct *inLinefeedStruct, XP_Bool inNeedBG );
-	virtual void 		DisplayHR( int inLocation, LO_HorizRuleStruct *inRuleStruct );
-	virtual void 		DisplaySubtext( int inLocation, LO_TextStruct *inText, 
-										Int32 inStartPos, Int32 inEndPos, XP_Bool inNeedBG );
-	virtual void 		EraseBackground( int inLocation, Int32 inX, Int32 inY,
-										Uint32 inWidth, Uint32 inHeight, LO_Color *inColor );
-	virtual void		GetDefaultBackgroundColor(LO_Color* outColor) const;
-	virtual void 		DisplayTable( int inLocation, LO_TableStruct *inTableStruct );
-	virtual void		DisplayCell( int inLocation, LO_CellStruct *inCellStruct );
-	virtual	void 		InvalidateEntireTableOrCell( LO_Element* inElement );
-	virtual	void 		DisplayAddRowOrColBorder( XP_Rect* inRect, XP_Bool inDoErase );
-	virtual void		UpdateEnableStates();
-	virtual void		DisplayFeedback( int inLocation, LO_Element *inElement );
-	virtual void		DisplaySelectionFeedback( uint16 ele_attrmask, const Rect &inRect );
-	
-	
-	virtual void		InsideDropArea( DragReference inDragRef );
-	virtual void 		EnterDropArea( DragReference inDragRef, Boolean inDragHasLeftSender );
-	DragReference 		mDragRef;
-
-	enum {
-		ED_SELECTION_BORDER = 3
-		};
-	
-    enum { MAX_Q_SIZE = 12 };		// Used for checking out key strokes waiting in FindQueuedKeys
-
-	void 			InsertDefaultLine();
-	void			DoReload( void );
-	void			ToFromList( intn listType, ED_ListType elementType );
-	void			NoteEditorRepagination( void );
-	Boolean			CanUseCharFormatting();
-
-	Boolean			IsMouseInSelection( SPoint32 pt, CL_Layer *curLayer, Rect& selectRect );
-	Boolean			mDoContinueSelection;
-
-	HTMLInlineTSMProxy*		mProxy;
-	HoldUpdatesProxy* 		mHoldUpdates;
-
-	// more caret blinking and related stuff
-	Boolean			mCaretDrawn, mCaretActive;
-	Boolean			mHideCaret;
-	Boolean			mDisplayParagraphMarks;
-
-	Point			mOldPoint;	// Last place cursor was adjusted. No initializing
-	long			mOldLastElementOver;	// id of the last element the cursor was over
-
-	unsigned long	mLastBlink;
-	int32			mCaretX;
-	int32			mCaretYLow;
-	int32			mCaretYHigh;
-	
-	Boolean			mUseCharFormattingCache;
-	Boolean			mIsCharFormatting;
-	
-	// these are only to be used during drag of data in composer
-	char			*mDragData;	// warning this really isn't a "char" but void* data!!!
-	int32			mDragDataLength;
-};	// class CEditView
-
-
-//======================================
-class CMailEditView : public CEditView
-//======================================
-{
-public:
-	enum { pane_ID = 'html', class_ID = 'MEdp' };
-	
-	// ¥¥ Constructors
-
-					CMailEditView(LStream * inStream);
-	virtual void	InstallBackgroundColor();
-	virtual void	GetDefaultBackgroundColor(LO_Color* outColor) const;
-	virtual void	InitMailCompose();
-			void	SetComposeSession( CComposeSession *c ) { mComposeSession = c; };
-			void	SetInitialText( const char *textp );
-			void    InsertMessageCompositionText( const char* text,
-					 XP_Bool leaveCursorBeginning, XP_Bool isHTML );
-			void	DisplayDefaultTextBody();
-
-private:
-	Int32			mStartQuoteOffset;
-	Int32			mEndQuoteOffset;
-	Boolean			mHasAutoQuoted;
-	Boolean			mHasInsertSignature;
-	Boolean			mCursorSet;
-	char			*mInitialText; // Draft text
-	CComposeSession *mComposeSession;
-}; // class CMailEditView
-

mozilla/cmd/macfe/Composer/CEditorWindow.cp

@@ -1,610 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "CEditorWindow.h"
-#include "CBrowserContext.h"
-#include "resgui.h"
-#include "CFormattingToolBar.h"
-#include "CFontMenuAttachment.h"
-#include "CToolbarPopup.h"
-#include "CPatternButtonPopupText.h"
-#include "COpenRecentlyEditedPopup.h"
-#include "CColorPopup.h"
-
-#include "CEditDictionary.h"
-
-#include "CTextTable.h"
-#include "CTableKeySingleSelector.h"
-
-	// macfe
-#include "mversion.h"	// ID_STRINGS
-#include "URobustCreateWindow.h"
-#include "uprefd.h"
-#include "uerrmgr.h"
-#include "uapp.h"
-#include "meditdlg.h"	// CTabbedDialog
-#include "meditor.h"	// HandleModalDialog
-#include "CEditView.h"
-
-	// Netscape
-#include "net.h"	// NET_cinfo_find_type
-#include "proto.h"	// XP_IsContextBusy
-#include "edt.h"
-#include "shist.h"
-#include "prefapi.h"	// PREF_GetBoolPref
-
-#ifdef PROFILE
-#pragma profile on
-#endif
-
-// pane id constants - for ShowOneDragBar
-const PaneIDT Paragraph_Bar_PaneID = 'DBar';
-const PaneIDT Character_Bar_PaneID = 'NBar';
-
-const char* Pref_ShowParagraphBar = "editor.show_paragraph_toolbar";
-const char* Pref_ShowCharacterBar = "editor.show_character_toolbar";
-
-enum {  eParagraphBar,
-		eCharacterBar	};
-
-CEditorWindow::CEditorWindow( LStream* inStream )
-	:CBrowserWindow(inStream)
-{
-	SetWindowType( WindowType_Editor );
-}
-
- 
-static	// PRIVATE
-CMediatedWindow* GetFrontWindowByType( OSType windowType )
-{
-	CMediatedWindow* theWindow = NULL;
-	CWindowIterator iter(windowType);
-	iter.Next(theWindow);
-	return theWindow;
-}
-
-// given an mwcontext (non-busy, with a history), select the matching editor window
-// or open an editor window based on that mwcontext
-// if all else fails (and memory is not low), create an empty editor window
-void CEditorWindow::MakeEditWindowFromBrowser( MWContext* mwcontext )
-{
-	if ( Memory_MemoryIsLow() )
-		return;
-	
-	History_entry*	entry = NULL;
-	if ( mwcontext && !XP_IsContextBusy( mwcontext ) )
-		entry = SHIST_GetCurrent(&mwcontext->hist);
-	
-	if ( entry && entry->address)
-	{
-		// If there is already an editor window open for this url 
-		// just switch to it and keep this browser window open.
-		CMediatedWindow * win;
-		CWindowIterator iter(WindowType_Editor);
-		while (iter.Next(win))
-		{
-			CNSContext* curContext = ((CBrowserWindow *)win)->GetWindowContext();
-			MWContext*	context;
-			
-			context = curContext ? curContext->operator MWContext*() : NULL;
-			if (context && EDT_IS_EDITOR(context))
-			{
-				History_entry*	newEntry = SHIST_GetCurrent(&context->hist);
-				if (newEntry && newEntry->address && !strcmp(newEntry->address, entry->address))
-				{
-					win->Show();
-					win->Select();
-					return;
-				}
-			}
-		}
-		
-		if (CEditorWindow::MakeEditWindow(mwcontext, NULL) == NULL) 	// new window based on history of this window
-			return;		// don't close this one on error.
-	}
-	else
-	{
-		CEditorWindow::MakeEditWindow(NULL, NULL);	// make a completely new window
-	}
-}
-
-
-// EDT_PreOpenCallbackFn 
-static void createEditorWindowCallback( XP_Bool userCanceled, char* pURL, void* hook )
-{
-	if ( !userCanceled )
-	{
-		EditorCreationStruct *edtCreatePtr = (EditorCreationStruct *)hook;
-		
-		if ( hook )
-		{
-			if ( edtCreatePtr->existingURLstruct && edtCreatePtr->existingURLstruct->address )
-			{
-				XP_FREE( edtCreatePtr->existingURLstruct->address );
-				edtCreatePtr->existingURLstruct->address = XP_STRDUP( pURL );
-			}
-		}
-		
-		// substitute new URL
-		CEditorWindow::CreateEditorWindowStage2( edtCreatePtr );
-	}
-}
-
-
-CEditorWindow* CEditorWindow::MakeEditWindow( MWContext* old_context, URL_Struct* url )
-{
-	Boolean urlCameInNULL = (url == NULL);
-	
-	// if we don't have an URL, try to get it from the old_context's window history
-	if (url == NULL && old_context != NULL)
-	{
-		CBrowserContext *browserContext = (CBrowserContext *)old_context->fe.newContext;
-		History_entry*	entry = browserContext->GetCurrentHistoryEntry();	// Take the last instead of the first history entry.
-		if ( entry )
-		{
-			url = SHIST_CreateURLStructFromHistoryEntry( old_context, entry );
-			if ( url )
-				url->force_reload = NET_NORMAL_RELOAD;
-		}
-		// if we don't have a history entry, we're kind of screwed-->just load a blank page
-	}
-
-	// we want to open a new blank edit window
-	// or we are still having troubles... fall back to our old tried and true blank page
-	if (url == NULL)
-		url = NET_CreateURLStruct ("about:editfilenew", NET_NORMAL_RELOAD );
-				// FIX THIS!!! the above line should use "XP_GetString(XP_EDIT_NEW_DOC_NAME)"
-
-	// time of reckoning. We really, really need an URL and address at this point...
-	// I don't know what an url without an address is anyway...
-	if (url == NULL || url->address == NULL)
-		return NULL;
-	
-	// now make sure that the url is a valid type to edit.
-	NET_cinfo *cinfo = NET_cinfo_find_type (url->address);
-	
-	if (cinfo == NULL || cinfo->type == NULL ||
-		  (strcasecomp (cinfo->type, TEXT_HTML)
-		&& strcasecomp (cinfo->type, UNKNOWN_CONTENT_TYPE)
-		&& strcasecomp (cinfo->type, TEXT_PLAIN)))
-	{
-		ErrorManager::PlainAlert( NOT_HTML );
-		return NULL;
-	}
-
-	EditorCreationStruct *edtCreatePtr = (EditorCreationStruct *)XP_ALLOC( sizeof( EditorCreationStruct ) );
-	if ( edtCreatePtr )
-	{
-		edtCreatePtr->context = old_context;
-		edtCreatePtr->existingURLstruct = url;
-		edtCreatePtr->isEmptyPage = old_context == NULL && urlCameInNULL;
-	}
-		
-	if ( urlCameInNULL && old_context == NULL )
-	{
-		return CreateEditorWindowStage2( edtCreatePtr );
-	}
-	else
-	{
-		EDT_PreOpen( old_context, url->address, createEditorWindowCallback, edtCreatePtr );
-		return NULL;
-	}
-}
-
-
-CEditorWindow *CEditorWindow::CreateEditorWindowStage2( EditorCreationStruct *edtCreatePtr )
-{
-	// now we can create an editor window since we don't already have one for this url.
-	
-	/* instead of just calling LWindow::CreateWindow(), we do it ourselves by hand here 
-	 * so that we can set the window bounds before we call FinishCreate().
-	 */
-	
-	if ( edtCreatePtr == NULL )
-		return NULL;
-	
-	CEditorWindow* newWindow = NULL;
-	SetDefaultCommander(CFrontApp::GetApplication());
-	try {
-		OSErr	error;
-		URobustCreateWindow::ReadObjects( 'PPob', CEditorWindow::res_ID, &newWindow, &error );
-		Assert_(newWindow);
-		FailOSErr_(error);
-		if (newWindow == NULL)
-		{
-			XP_FREE( edtCreatePtr );
-			return NULL;
-		}
-
-		newWindow->FinishCreate();
-		if (newWindow->HasAttribute(windAttr_ShowNew))
-			newWindow->Show();
-
-		UReanimator::LinkListenerToControls( newWindow, newWindow, CEditorWindow::res_ID );
-	}
-	catch(...)
-	{
-		if ( newWindow )
-			delete newWindow;
-		
-		XP_FREE( edtCreatePtr );
-		
-		return NULL;
-	}
-	
-	Boolean hasURLstruct = edtCreatePtr->existingURLstruct && edtCreatePtr->existingURLstruct->address;
-	CBrowserContext *nscontext = new CBrowserContext();
-	newWindow->SetWindowContext( nscontext );
-	
-	CURLDispatcher::DispatchURL( edtCreatePtr->existingURLstruct, nscontext, false, false, CEditorWindow::res_ID );
-	
-	if ( edtCreatePtr->context )
-	{
-		nscontext->InitHistoryFromContext( (CBrowserContext *)edtCreatePtr->context->fe.newContext );
-	}
-	else
-	{
-		// the url will eventually be freed when the load is complete.
-	}
-
-	// set window title here (esp. for "open")
-	if ( !edtCreatePtr->isEmptyPage
-	&& edtCreatePtr->existingURLstruct && edtCreatePtr->existingURLstruct->address )
-	{
-		char *pSlash = strrchr( edtCreatePtr->existingURLstruct->address, '/' );
-		if ( pSlash )
-			pSlash += 1;	// move past '/'
-		newWindow->NoteDocTitleChanged( pSlash );
-	}
-	
-	XP_FREE( edtCreatePtr );
-	
-	return newWindow;
-}
-
-		
-void CEditorWindow::SetWindowContext(CBrowserContext* inContext)
-{
-	if ( inContext )
-	{
-		MWContext *context;
-		context = inContext->operator MWContext*();
-		if ( context )
-		{
-			context->is_editor = true;
-			NET_CheckForTimeBomb( context );
-		}
-	}
-
-	CBrowserWindow::SetWindowContext( inContext );
-}
-
-
-void CEditorWindow::NoteDocTitleChanged( const char* inNewTitle )
-{
-	// there is one bogus set-title from layout that we want to skip...
-	// We are hard coding "editfilenew" here because it is already hardcoded 
-	// a million other places...
-	if ( inNewTitle && XP_STRCMP( inNewTitle, "editfilenew" ) == 0 )
-		return;
-
-	CNSContext *theContext = GetWindowContext();
-	
-	CStr255 	title( inNewTitle );
-	char *baseName = LO_GetBaseURL( theContext->operator MWContext*() );	// don't free this...
-	// strip out username and password so user doesn't see them in window title
-	char *location = NULL;
-	if ( baseName )
-		NET_ParseUploadURL( baseName, &location, NULL, NULL );
-	CStr255	csBaseURL(location);
-	// if this page has a local "file:" url, then just show the file name (skip the url and directory crap.)
-	
-	if ( location && NET_IsLocalFileURL(location) )
-	{
-		char *localName = NULL;
-		XP_ConvertUrlToLocalFile( location, &localName );
-		
-		if (localName)
-		{
-#if 0
-			char *pSlash = strrchr(localName, '/');
-			if (pSlash)
-			{		// is there is a slash, move everything AFTER the last slash to the front
-				pSlash++;
-				XP_STRCPY(localName, pSlash);
-			}
-#endif
-
-			csBaseURL = localName;
-			XP_FREE(localName);
-		}
-	}
-	
-	CStr255 	netscapeTitle;
-	CStr255		subTitle;
-	
-	::GetIndString( netscapeTitle, ID_STRINGS, APPNAME_STRING_INDEX );
-	::GetIndString( subTitle, WINDOW_TITLES_RESID, 3 );
-	
-	netscapeTitle += " ";
-	netscapeTitle += subTitle;
-	netscapeTitle += " - [";
-	if ( inNewTitle && *inNewTitle )
-	{
-		netscapeTitle += title;
-		if (csBaseURL.Length())
-			netscapeTitle += " : ";
-	}
-	netscapeTitle += csBaseURL;
-	netscapeTitle += "]";
-
-	SetDescriptor( netscapeTitle );
-
-	if ( location )
-		XP_FREE( location );
-}
-
-
-void CEditorWindow::RegisterViewTypes()
-{
-	// Registers all its view types
-	RegisterClass_( CEditorWindow);
-	RegisterClass_( CEditView);
-	RegisterClass_( MultipleSelectionSingleColumn);	// newer, better class?
-	RegisterClass_( CTarget);
-	RegisterClass_( CLineProp);
-	RegisterClass_( CFormattingToolBar);
-	
-	RegisterClass_( CToolbarPopup);					// newer, better class?
-	RegisterClass_( CIconToolbarPopup);				// newer, better class?
-	RegisterClass_( CColorPopup);
-	RegisterClass_( CFontMenuPopup );
-	
-	RegisterClass_( CChameleonCaption);				// newer, better class?
-	RegisterClass_( CChameleonView);				// newer, better class?
-	CTabbedDialog::RegisterViewTypes();
-	
-	RegisterClass_( CTextTable);					// newer, better class?
-	RegisterClass_( CTableKeySingleSelector);		// newer, better class?
-
-	RegisterClass_( CPatternButtonPopupText);		// newer, better class?
-	RegisterClass_( LOffscreenView);
-	RegisterClass_( COpenRecentlyEditedPopup );
-	
-	RegisterClass_( CEditDictionary);
-	RegisterClass_( CEditDictionaryTable);	
-}
-
-
-void CEditorWindow::FinishCreateSelf()
-{
-	CBrowserWindow::FinishCreateSelf();
-
-	// Show/hide toolbars based on preference settings
-	XP_Bool	value;
-	PREF_GetBoolPref(Pref_ShowParagraphBar, &value);
-	mToolbarShown[eParagraphBar] = value;
-	ShowOneDragBar(Paragraph_Bar_PaneID, value);
-	PREF_GetBoolPref(Pref_ShowCharacterBar, &value);
-	mToolbarShown[eCharacterBar] = value;
-	ShowOneDragBar(Character_Bar_PaneID, value);
-}
-
-
-void CEditorWindow::ListenToMessage( MessageT inMessage, void* ioParam )
-{
-	switch (inMessage)
-	{
-		case msg_NSCDocTitleChanged:
-			NoteDocTitleChanged((const char*)ioParam);
-			break;
-	
-		default:
-		{
-			if ( inMessage == 'Para' )
-			{
-				switch  (*(long*)ioParam)
-				{
-					case 1:		inMessage = cmd_Format_Paragraph_Normal;		break;
-					case 2:		inMessage = cmd_Format_Paragraph_Head1;			break;
-					case 3:		inMessage = cmd_Format_Paragraph_Head2;			break;
-					case 4:		inMessage = cmd_Format_Paragraph_Head3;			break;
-					case 5:		inMessage = cmd_Format_Paragraph_Head4;			break;
-					case 6:		inMessage = cmd_Format_Paragraph_Head5;			break;
-					case 7:		inMessage = cmd_Format_Paragraph_Head6;			break;
-					case 8:		inMessage = cmd_Format_Paragraph_Address;		break;
-					case 9:		inMessage = cmd_Format_Paragraph_Formatted;		break;
-					case 10:	inMessage = cmd_Format_Paragraph_List_Item;		break;
-					case 11:	inMessage = cmd_Format_Paragraph_Desc_Title;	break;
-					case 12:	inMessage = cmd_Format_Paragraph_Desc_Text;		break;
-				}
-			}
-			else if ( inMessage == 'Size' )
-			{
-				switch  (*(long*)ioParam)
-				{
-					case 1:		inMessage = cmd_Format_Font_Size_N2;	break;
-					case 2:		inMessage = cmd_Format_Font_Size_N1;	break;
-					case 3:		inMessage = cmd_Format_Font_Size_0;		break;
-					case 4:		inMessage = cmd_Format_Font_Size_P1;	break;
-					case 5:		inMessage = cmd_Format_Font_Size_P2;	break;
-					case 6:		inMessage = cmd_Format_Font_Size_P3;	break;
-					case 7:		inMessage = cmd_Format_Font_Size_P4;	break;
-				}
-			}
-			else if ( inMessage == 'Algn' )
-			{
-				switch  (*(long*)ioParam)
-				{
-					case 1:		inMessage = cmd_JustifyLeft;	break;
-					case 2:		inMessage = cmd_JustifyCenter;	break;
-					case 3:		inMessage = cmd_JustifyRight;	break;
-				}
-			}
-
-			// GetHTMLView() guaranteed not to fail
-			GetHTMLView()->ObeyCommand( inMessage, ioParam );
-			break;
-		}
-	}
-}
-
-
-// EDT_PreCloseCallbackFn 
-static void closeEditorWindowCallback( void* hook )
-{
-	CEditorWindow *editorWindow = (CEditorWindow *)hook;
-	if ( editorWindow )
-		editorWindow->SetPluginDoneClosing();
-}
-
-
-Boolean CEditorWindow::ObeyCommand( CommandT inCommand, void *ioParam )
-{
-	switch ( inCommand )
-	{
-		case cmd_NewWindowEditor:
-			CEditorWindow::MakeEditWindow( NULL, NULL );
-			break;
-		
-		case cmd_ViewSource:
-			// Delegate this to the view.
-			if ( ((CEditView *)GetHTMLView())->IsDoneLoading() )
-				GetHTMLView()->ObeyCommand(inCommand, ioParam);
-			break;
-				
-		case cmd_Toggle_Paragraph_Toolbar:
-			ToggleDragBar(Paragraph_Bar_PaneID, eParagraphBar, Pref_ShowParagraphBar);
-			break;
-		
-		case cmd_Toggle_Character_Toolbar:
-			ToggleDragBar(Character_Bar_PaneID, eCharacterBar, Pref_ShowCharacterBar);
-			break;
-
-		case cmd_Close:
-		case cmd_Quit:				// we'll just intercept these and then send them on to the default case
-			MWContext *mwcontext = GetWindowContext()->operator MWContext*();
-			History_entry*	newEntry = SHIST_GetCurrent(&mwcontext->hist);
-			CStr255 fileName;
-			if ( newEntry && newEntry->address )
-				fileName = newEntry->address;
-				
-			if ( ((CEditView *)GetHTMLView())->IsDoneLoading() && EDT_DirtyFlag( *GetWindowContext() ) )
-			{
-				Select(); // This helps during a quit or "close all"
-				
-				MessageT itemHit = HandleModalDialog( EDITDLG_SAVE_BEFORE_QUIT, fileName, NULL );
-				if (itemHit == cancel)
-					return true;
-				
-				if (itemHit == ok)
-				{				// save
-					if ( !((CEditView *)GetHTMLView())->SaveDocument() )
-						return true;			
-				}
-				EDT_SetDirtyFlag( mwcontext, false );		// we have to do this or else when we quit, we will be asked twice to save
-			}
-			
-			// need to let this work asynchronously; make our own internal loop
-			if ( ((CEditView *)GetHTMLView())->IsDoneLoading() && newEntry && newEntry->address )
-			{
-				mPluginDoneClosing = false;
-				EDT_PreClose( mwcontext, newEntry->address, closeEditorWindowCallback, this );
-				
-				do
-				{
-					CFrontApp::GetApplication()->ProcessNextEvent();
-				} while ( !mPluginDoneClosing );
-			}
-
-		// fall through
-
-		default:
-		{
-			return CBrowserWindow::ObeyCommand (inCommand, ioParam);
-		}
-	}
-	return TRUE;
-}
-
-
-void CEditorWindow::FindCommandStatus( CommandT inCommand,
-	Boolean& outEnabled, Boolean& outUsesMark, Char16& outMark,
-	Str255 outName )
-{
-	short index;
-	outUsesMark = FALSE;
-	outEnabled = false;
-
-	switch ( inCommand )
-	{
-		case cmd_ViewSource:
-			// Delegate this to the view.
-			if ( ((CEditView *)GetHTMLView())->IsDoneLoading() )
-				GetHTMLView()->FindCommandStatus(inCommand, outEnabled, outUsesMark, outMark, outName);
-			break;
-
-		case cmd_Toggle_Character_Toolbar:
-			outEnabled = ((CEditView *)GetHTMLView())->IsDoneLoading();
-			index = mToolbarShown[eCharacterBar] ? CEditView::EDITOR_MENU_HIDE_COMP_TOOLBAR 
-											: CEditView::EDITOR_MENU_SHOW_COMP_TOOLBAR;
-			::GetIndString( outName, CEditView::STRPOUND_EDITOR_MENUS, index );
-			break;
-
-		case cmd_Toggle_Paragraph_Toolbar:
-			outEnabled = ((CEditView *)GetHTMLView())->IsDoneLoading();
-			index = mToolbarShown[eParagraphBar] ? CEditView::EDITOR_MENU_HIDE_FORMAT_TOOLBAR 
-											: CEditView::EDITOR_MENU_SHOW_FORMAT_TOOLBAR;
-			::GetIndString( outName, CEditView::STRPOUND_EDITOR_MENUS, index );
-			break;
-
-		default:
-			CBrowserWindow::FindCommandStatus(inCommand, outEnabled, outUsesMark, outMark, outName );
-	}
-}
-
-
-// Called when we are trying to quit the application
-Boolean	CEditorWindow::AttemptQuitSelf( long inSaveOption )
-{
-	MWContext *mwcontext = GetWindowContext()->operator MWContext*();
-	if ( EDT_DirtyFlag( mwcontext ) )
-	{
-		History_entry*	newEntry = SHIST_GetCurrent(&mwcontext->hist);
-		CStr255 fileName;
-		if ( newEntry && newEntry->address )
-			fileName = newEntry->address;
-
-		if ( kAEAsk == inSaveOption )
-		{
-			MessageT itemHit = HandleModalDialog( EDITDLG_SAVE_BEFORE_QUIT, fileName, NULL );
-			if ( cancel == itemHit )
-				return false;
-		}
-		
-		// save
-		if ( !((CEditView *)GetHTMLView())->SaveDocument() ) 
-			return false;			
-	}
-	
-	return true;
-}
-
-#ifdef PROFILE
-#pragma profile off
-#endif

mozilla/cmd/macfe/Composer/CEditorWindow.h

@@ -1,67 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#pragma once
-
-#include "CBrowserWindow.h"
-
-
-struct EditorCreationStruct {
-	MWContext	*context;	// may be NULL
-	URL_Struct	*existingURLstruct;
-	Boolean		isEmptyPage;
-};
-
-
-
-/******************************************************************************
- * CEditorWindow is really just a CBrowserWindow with some changes for an editor window.
- ******************************************************************************/
-class CEditorWindow: public CBrowserWindow
-{	
-public:
-	enum {class_ID = 'edtw', res_ID = 10000};
-	
-	// ¥¥ Constructors
-
-	static void 		RegisterViewTypes();	// Registers all its view types
-	static CEditorWindow *MakeEditWindow( MWContext* old_context, URL_Struct* url );
-	static CEditorWindow *CreateEditorWindowStage2( EditorCreationStruct *edtCreatePtr);
-	static void 		MakeEditWindowFromBrowser( MWContext* mwcontext );
-
-						CEditorWindow(LStream * inStream);
-	virtual void 		FinishCreateSelf();
-	virtual void		SetWindowContext(CBrowserContext* inContext);
-
-	// ¥¥ Command handling
-	virtual void		ListenToMessage( MessageT inMessage, void* ioParam );
-	virtual	Boolean 	ObeyCommand( CommandT inCommand, void *ioParam );
-	virtual void  		FindCommandStatus( CommandT inCommand,
-							Boolean& outEnabled, Boolean& outUsesMark, 
-							Char16& outMark,Str255 outName );
-	virtual void		NoteDocTitleChanged( const char* title );
-	virtual Boolean		AttemptQuitSelf( long inSaveOption );
-	static CEditorWindow*	FindAndShow(Boolean inMakeNew = false);
-	virtual void		SetPluginDoneClosing() { mPluginDoneClosing = true; }
-
-protected:
-
-	virtual ResIDT		GetStatusResID(void) const { return CEditorWindow::res_ID; }
-
-	Boolean  			mPluginDoneClosing;
-};

mozilla/cmd/macfe/Composer/CFontMenuAttachment.cp

@@ -1,299 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "CFontMenuAttachment.h"
-#include "CEditView.h"
-#include "CBrowserContext.h"		// operator MWContext*()
-#include "resgui.h"					// cmd_FormatViewerFont, cmd_FormatFixedFont, FONT_MENU_BASE
-#include "macutil.h"				// CMediatedWindow
-#include "edt.h"
-
-
-
-LMenu *CFontMenuAttachment::sMenu = NULL;
-
-//===========================================================
-// CFontMenuAttachment
-//===========================================================
-CFontMenuAttachment::CFontMenuAttachment()
-{
-	UpdateMenu();
-}
-
-MWContext *CFontMenuAttachment::GetTopWindowContext()
-{
-							
-	// Ok, ok. I know this is skanky,
-	// but there is no common way to get the context from a window: it depends on the window type.
-	// So, we look around for a CEditView somewhere in the top window.
-	// A CEditView we understand (and get an MWContext from).
-	
-	CMediatedWindow* topWin = NULL;		// find the top window to use the plugin in
-	CWindowIterator iter(WindowType_Any);
-	iter.Next(topWin);
-	
-	if (topWin == NULL
-	|| ! (topWin->GetWindowType() == WindowType_Editor || topWin->GetWindowType() == WindowType_Compose) )
-		return NULL;
-	
-	CEditView *editView = (CEditView *)(topWin->FindPaneByID(CEditView::pane_ID));
-		
-	if (editView == NULL || editView->GetNSContext() == NULL)
-		return NULL;
-		
-	return editView->GetNSContext()->operator MWContext*();
-}
-
-
-// Processes:
-// 
-void CFontMenuAttachment::ExecuteSelf( MessageT inMessage, void* ioParam )
-{
-	mExecuteHost = FALSE;
-	switch ( inMessage )	
-	{
-		case msg_CommandStatus:
-		{
-			SCommandStatus*	status = (SCommandStatus*)ioParam;
-
-			EDT_CharacterData* better;
-			
-			if ( status->command == cmd_FormatViewerFont || status->command == cmd_FormatFixedFont 
-				|| ( status->command >= FONT_MENU_BASE && status->command <= FONT_MENU_BASE_LAST ) )
-			{
-				*(status->enabled) = true;
-				*(status->usesMark) = false;
-
-				better = NULL;
-				MWContext *cntxt = GetTopWindowContext();
-				if ( cntxt )
-					better = EDT_GetCharacterData( cntxt );
-				if ( better == NULL )
-				{
-					*(status->enabled) = false;
-					return;
-				}
-			}
-			
-			switch ( status->command )
-			{
-				case cmd_FormatViewerFont:
-					*(status->usesMark) = ( ! ( better->values & TF_FIXED ) && !( better->values & TF_FONT_FACE ) );
-					*(status->mark) = *(status->usesMark) ? checkMark : 0;
-					*(status->usesMark) = true;
-					
-					EDT_FreeCharacterData(better);
-					mExecuteHost = false;
-				 	return;
-					break;
-				
-				case cmd_FormatFixedFont:
-					*(status->usesMark) = ( better->values & TF_FIXED ) != 0;
-					*(status->mark) = *(status->usesMark) ? checkMark : 0;
-					*(status->usesMark) = true;
-					
-					EDT_FreeCharacterData(better);
-					mExecuteHost = false;
-					return;
-					break;
-				
-				default:
-					if ( status->command >= FONT_MENU_BASE && status->command <= FONT_MENU_BASE_LAST )
-					{
-						// get font menu item
-						Str255	fontItemString;
-						fontItemString[0] = 0;
-						MenuHandle menuh = GetMenu()->GetMacMenuH();
-						::GetMenuItemText ( menuh, status->command - FONT_MENU_BASE + PERM_FONT_ITEMS + 1, fontItemString );
-						p2cstr( fontItemString );
-
-// in mixed situation the mask bit will be cleared
-						*(status->usesMark) = ( better->values & TF_FONT_FACE && better->pFontFace && XP_STRLEN((char *)fontItemString) > 0 
-												&& XP_STRSTR( better->pFontFace, (char *)fontItemString ) != NULL );
-						*(status->mark) = *(status->usesMark) ? checkMark : 0;
-						*(status->usesMark) = true;
-
-						EDT_FreeCharacterData(better);
-						mExecuteHost = false;
-						return;
-					}
-			}
-		}
-		break;
-		
-		case cmd_FormatViewerFont:
-			MWContext *cntxt2 = GetTopWindowContext();
-			if ( cntxt2 )
-				EDT_SetFontFace( cntxt2, NULL, 0, NULL );
-			break;
-		
-		case cmd_FormatFixedFont:
-			MWContext *cntxt3 = GetTopWindowContext();
-			if ( cntxt3 )
-				EDT_SetFontFace( cntxt3, NULL, 1, NULL );
-			break;
-		
-		default:
-		{
-			if ( inMessage >= FONT_MENU_BASE && inMessage <= FONT_MENU_BASE_LAST )
-			{
-				MWContext *cntxt2 = GetTopWindowContext();
-				if ( cntxt2 )
-				{
-					// get font menu item
-					Str255	newFontItemString;
-					newFontItemString[0] = 0;
-					MenuHandle menuh = GetMenu()->GetMacMenuH();
-					::GetMenuItemText ( menuh, inMessage - FONT_MENU_BASE + PERM_FONT_ITEMS + 1, newFontItemString );
-					p2cstr( newFontItemString );
-					
-					EDT_SetFontFace( cntxt2, NULL, -1, (char *)newFontItemString );
-					
-					mExecuteHost = false;
-					return;
- 				}
-			}
-		}
-		break;			
-	}
-	
-	mExecuteHost = TRUE;	// Let application handle it
-}
-
-LMenu *CFontMenuAttachment::GetMenu()
-{
-	if (!sMenu)
-		sMenu = new LMenu(cFontMenuID);
-	
-	return sMenu;
-}
-
-// build the font menu from the system
-void CFontMenuAttachment::UpdateMenu()
-{
-	if (!GetMenu() || !LMenuBar::GetCurrentMenuBar())
-		return;
-	
-	int i;
-	
-	// ¥ delete all the menu items after the separator line
-	MenuHandle menu = sMenu->GetMacMenuH();
-	if ( menu )
-	{
-		for ( i = ::CountMItems( menu ); i > PERM_FONT_ITEMS; i-- )
-			sMenu->RemoveItem( i );
-	}
-	
-	Try_
-	{
-		ThrowIfNil_( menu );
-	
-		// Add fonts to menu
-		::InsertResMenu( menu, 'FONT', PERM_FONT_ITEMS );
-		
-		int	commandNum = FONT_MENU_BASE;
-		int newHowMany = ::CountMItems( menu );
-		for (i = PERM_FONT_ITEMS + 1; i <= newHowMany; i++ )
-			sMenu->SetCommand( i, commandNum++ );
-	}
-	Catch_( inErr )
-	{
-	}
-	EndCatch_
-}
-
-
-void CFontMenuAttachment::RemoveMenus()
-{
-	if (sMenu)
-	{
-		LMenuBar *currentMenuBar = LMenuBar::GetCurrentMenuBar();
-		if (currentMenuBar)
-			currentMenuBar->RemoveMenu(sMenu);
-	}
-}
-
-
-void CFontMenuAttachment::InstallMenus()
-{
-	if (sMenu)
-	{
-		LMenuBar *currentMenuBar = LMenuBar::GetCurrentMenuBar();
-		if (currentMenuBar)
-		{
-			StValueChanger<EDebugAction> okayToFail(gDebugThrow, debugAction_Nothing);
-			currentMenuBar->InstallMenu(sMenu, hierMenu);
-			
-			ResIDT resID;
-			MenuHandle menuh;
-			Int16 whichItem;
-			currentMenuBar->FindMenuItem( cmd_ID_toSearchFor, resID, menuh, whichItem );
-			if ( menuh )
-			{
-				// make it hierarchical
-				::SetItemCmd( menuh, whichItem, hMenuCmd );
-				::SetItemMark( menuh, whichItem, menu_ID );
-			}
-		}
-	}
-}
-
-#pragma mark -
-
-CFontMenuPopup::CFontMenuPopup( LStream *inStream ) : CPatternButtonPopupText( inStream )
-{
-}
-
-CFontMenuPopup::~CFontMenuPopup()
-{
-}
-
-void CFontMenuPopup::FinishCreateSelf( void )
-{
-	CPatternButtonPopupText::FinishCreateSelf();
-
-	int i;
-	
-	// ¥ delete all the menu items after the separator line
-	LMenu *ppmenu = GetMenu();
-	MenuHandle menuh = ppmenu ? ppmenu->GetMacMenuH() : NULL;
-	if ( menuh )
-	{
-		for ( i = ::CountMItems( menuh ); i > CFontMenuAttachment::PERM_FONT_ITEMS; i-- )
-			ppmenu->RemoveItem( i );
-	}
-	
-	Try_
-	{
-		ThrowIfNil_( menuh );
-	
-		// Add fonts to menu
-		::InsertResMenu( menuh, 'FONT', CFontMenuAttachment::PERM_FONT_ITEMS );
-		
-		int	commandNum = FONT_MENU_BASE;
-		int newHowMany = ::CountMItems( menuh );
-		for (i = CFontMenuAttachment::PERM_FONT_ITEMS + 1; i <= newHowMany; i++ )
-			ppmenu->SetCommand( i, commandNum++ );
-		
-		SetMaxValue( newHowMany );
-	}
-	Catch_( inErr )
-	{
-	}
-	EndCatch_
-}

mozilla/cmd/macfe/Composer/CFontMenuAttachment.h

@@ -1,73 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#pragma once
-
-#ifndef CFONTMENUATTACHMENT_H_
-#define CFONTMENUATTACHMENT_H_
-
-#include <LAttachment.h>
-#include "CPatternButtonPopupText.h"
-#include "ntypes.h"	// MWContext
-
-
-class LMenu;
-
-/***********************************************************************************
- * CFontMenuAttachment
- * Processes Font menu commands -- should be attached to application
- * Currently, this menu is only used in the Editor and mail compose window
- ***********************************************************************************/
-class CFontMenuAttachment: public LAttachment
-{
-public:
-	enum { menu_ID = 13, PERM_FONT_ITEMS = 3, cmd_ID_toSearchFor = 'FONT' };
-
-	// ¥¥ constructors
-						CFontMenuAttachment();
-	// ¥¥Êevents
-	virtual void		ExecuteSelf( MessageT inMessage, void* ioParam );
-
-	static LMenu*		GetMenu();
-	static void			UpdateMenu();
-
-	static void			RemoveMenus();
-	static void			InstallMenus();
-	
-protected:
-	static MWContext*	GetTopWindowContext();
-
-	static LMenu*		sMenu;
-};
-
-
-
-class CFontMenuPopup : 	public CPatternButtonPopupText
-{
-	public:
-		enum { class_ID = 'Fpop' };
-		
-		static	void*	CreateCFontMenuPopupStream( LStream *inStream ) {return( new CFontMenuPopup (inStream ));};
-						CFontMenuPopup( LStream *inStream );		//	¥ Constructor
-						~CFontMenuPopup();							//	¥ Destructor
-
-						// ¥ drawing
-		void			FinishCreateSelf(void);
-};
-
-#endif

mozilla/cmd/macfe/Composer/CFormattingToolBar.cp

@@ -1,124 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "CFormattingToolBar.h"
-#include "CEditView.h"
-#include "resgui.h"
-#include "edt.h"
-
-CFormattingToolBar::CFormattingToolBar(LStream * inStream) 
-							: CPatternBevelView(inStream)
-{
-}
-
-CFormattingToolBar::~CFormattingToolBar()
-{
-	mEditView = NULL;
-}
-
-void CFormattingToolBar::FinishCreateSelf()
-{
-	if ( GetSuperView() )
-	{
-		// get SuperView (we start with "this" so we're guaranteed non-0)
-		LView *superView = (LView *)this;
-		while (superView->GetSuperView() != NULL)
-			superView = superView->GetSuperView();
-		
-		mEditView = dynamic_cast<CEditView*>(superView->FindPaneByID( CEditView::pane_ID ));
-	}
-	else
-		mEditView = dynamic_cast<CEditView*>(FindPaneByID( CEditView::pane_ID ));
-
-	// if we have a mailcompose window show insert object popup menu
-	// check for presence of insert menu within CFormattingToolBar
-	LPane *pane = FindPaneByID('InsO');
-	if ( pane )
-	{
-		CMailEditView *mailview = dynamic_cast<CMailEditView*>( mEditView );
-		if ( mailview )
-			pane->Show();
-		else
-			pane->Hide();
-	}
-	
-	UReanimator::LinkListenerToControls(this, this, 11616);
-}
-
-void CFormattingToolBar::ListenToMessage( MessageT inMessage, void* ioParam )
-{
-	PaneIDT paneID = CEditView::pane_ID;
-	
-	if ( mEditView == NULL )
-		return;
-	
-	if ( inMessage == 'Para' )
-	{
-		switch  (*(long*)ioParam)
-		{
-			case 1:		inMessage = cmd_Format_Paragraph_Normal;		break;
-			case 2:		inMessage = cmd_Format_Paragraph_Head1;			break;
-			case 3:		inMessage = cmd_Format_Paragraph_Head2;			break;
-			case 4:		inMessage = cmd_Format_Paragraph_Head3;			break;
-			case 5:		inMessage = cmd_Format_Paragraph_Head4;			break;
-			case 6:		inMessage = cmd_Format_Paragraph_Head5;			break;
-			case 7:		inMessage = cmd_Format_Paragraph_Head6;			break;
-			case 8:		inMessage = cmd_Format_Paragraph_Address;		break;
-			case 9:		inMessage = cmd_Format_Paragraph_Formatted;		break;
-			case 10:	inMessage = cmd_Format_Paragraph_List_Item;		break;
-			case 11:	inMessage = cmd_Format_Paragraph_Desc_Title;	break;
-			case 12:	inMessage = cmd_Format_Paragraph_Desc_Text;		break;
-		}
-	}
-	else if ( inMessage == 'Size' )
-	{
-		switch  (*(long*)ioParam)
-		{
-			case 1:		inMessage = cmd_Format_Font_Size_N2;	break;
-			case 2:		inMessage = cmd_Format_Font_Size_N1;	break;
-			case 3:		inMessage = cmd_Format_Font_Size_0;		break;
-			case 4:		inMessage = cmd_Format_Font_Size_P1;	break;
-			case 5:		inMessage = cmd_Format_Font_Size_P2;	break;
-			case 6:		inMessage = cmd_Format_Font_Size_P3;	break;
-			case 7:		inMessage = cmd_Format_Font_Size_P4;	break;
-		}
-	}
-	else if ( inMessage == 'Algn' )
-	{
-		switch  (*(long*)ioParam)
-		{
-			case 1:		inMessage = cmd_JustifyLeft;	break;
-			case 2:		inMessage = cmd_JustifyCenter;	break;
-			case 3:		inMessage = cmd_JustifyRight;	break;
-		}
-	}
-	else if ( inMessage == 'InsO' )
-	{
-		switch  (*(long*)ioParam)
-		{
-			case 1:		inMessage = cmd_Insert_Link;	break;
-			case 2:		inMessage = cmd_Insert_Target;	break;
-			case 3:		inMessage = cmd_Insert_Image;	break;
-			case 4:		inMessage = cmd_Insert_Line;	break;
-			case 5:		inMessage = cmd_Insert_Table;	break;
-		}
-	}
-
-	mEditView->ObeyCommand( inMessage, ioParam );
-}
-

mozilla/cmd/macfe/Composer/CFormattingToolBar.h

@@ -1,42 +0,0 @@
-/* -*- 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.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#pragma once
-
-#include "CPatternBevelView.h"
-#include <LListener.h>
-
-class CEditView;
-
-
-// used in Editor window and Mail Compose windows
-
-class CFormattingToolBar : public CPatternBevelView, public LListener
-{
-public:
-	enum {class_ID = 'FoTB'};
-					CFormattingToolBar(LStream * inStream);
-					~CFormattingToolBar();
-
-	virtual void	ListenToMessage( MessageT inMessage, void* ioParam );
-	virtual void	FinishCreateSelf();
-
-protected:
-	CEditView* 		mEditView;
-};
-