Modifications to turn on EditorAppShell test bed for Linux.

xpfe/AppCores/public/Makefile.in

@@ -26,6 +26,7 @@ include $(topsrcdir)/config/config.mk
 EXPORTS =                         \
 		nsIDOMAppCoresManager.h          \
 		nsIDOMBaseAppCore.h          \
+		nsIDOMEditorAppCore.h          \
 		nsIDOMMailCore.h      \
 		nsIDOMToolbarCore.h	  \
 		nsIDOMToolkitCore.h		\

xpfe/AppCores/public/nsAppCoresCIDs.h

@@ -45,6 +45,12 @@
     {0x96, 0xc4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}  \
 }
 
+#define NS_BROWSERAPPCORE_FACTORY_CID             \
+{ /* BF4AE23F-BA9B-11d2-96C4-0060B0FB9956 */         \
+    0x108d759f, 0xbab5, 0x11d2,                     \
+    {0x96, 0xc4, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}  \
+}
+
 #define NS_TOOLKITCORE_CID                             \
 { /* 1cab9340-c122-11d2-81b2-0060083a0bcf */          \
     0x1cab9340, 0xc122, 0x11d2,                       \
@@ -69,4 +75,16 @@
     { 0x8a, 0x3f, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x8 } \
 }
 
+#define NS_EDITORAPPCORE_CID                         \
+{ /* {} */      \
+    0x9afff72b, 0xca9a, 0x11d2,                     \
+    { 0x96, 0xc9, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56 } \
+}
+
+#define NS_EDITORAPPCORE_FACTORY_CID                     \
+{ /* {739C5B4F-CA9D-11d2-96C9-0060B0FB9956} */          \
+    0x739c5b4f, 0xca9d, 0x11d2,                       \
+    {0x96, 0xc9, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x56}  \
+}
+
 #endif /* nsAppCoresCIDs_h___ */

xpfe/AppCores/src/Makefile.in

@@ -31,6 +31,9 @@ CPPSRCS= \
 	nsBaseAppCore.cpp       \
 	nsMailCore.cpp       \
 	nsAppCoresNameSet.cpp       \
+	nsEditorAppCore.cpp       \
+	nsEditorAppCoreFactory.cpp       \
+	nsEditorMode.cpp       \
 	nsToolbarCore.cpp       \
 	nsToolkitCore.cpp	\
 	nsBrowserAppCore.cpp       \
@@ -43,6 +46,7 @@ CPPSRCS= \
 	nsAppCoresManagerFactory.cpp       \
 	nsJSBaseAppCore.cpp       \
 	nsJSAppCoresManager.cpp       \
+	nsJSEditorAppCore.cpp       \
 	nsJSMailCore.cpp   \
 	nsJSToolbarCore.cpp   \
 	nsJSToolkitCore.cpp     \

xpfe/AppCores/src/nsAppCores.cpp

@@ -22,6 +22,7 @@
 #include "nsMailCoreFactory.h"
 #include "nsToolbarCoreFactory.h"
 #include "nsBrowserAppCoreFactory.h"
+#include "nsEditorAppCoreFactory.h"
 #include "nsToolkitCoreFactory.h"
 #include "nsIFactory.h"
 #include "nsRepository.h"
@@ -36,6 +37,7 @@ static NS_DEFINE_IID(kMailCoreCID,        NS_MAILCORE_CID);
 static NS_DEFINE_IID(kToolbarCoreCID,     NS_TOOLBARCORE_CID);
 static NS_DEFINE_IID(kToolkitCoreCID,     NS_TOOLKITCORE_CID);
 static NS_DEFINE_IID(kBrowserAppCoreCID,  NS_BROWSERAPPCORE_CID);
+static NS_DEFINE_IID(kEditorAppCoreCID,   NS_EDITORAPPCORE_CID);
 static NS_DEFINE_IID(kAppCoresManagerCID, NS_APPCORESMANAGER_CID);
 
 
@@ -58,6 +60,7 @@ NSRegisterSelf(const char *path)
     nsRepository::RegisterFactory(kToolbarCoreCID, path, PR_TRUE, PR_TRUE);
     nsRepository::RegisterFactory(kToolkitCoreCID, path, PR_TRUE, PR_TRUE);
     nsRepository::RegisterFactory(kBrowserAppCoreCID, path, PR_TRUE, PR_TRUE);
+    nsRepository::RegisterFactory(kEditorAppCoreCID, path, PR_TRUE, PR_TRUE);
     return NS_OK;
 }
 
@@ -71,6 +74,7 @@ NSUnregisterSelf(const char *path)
     nsRepository::UnregisterFactory(kToolbarCoreCID, path);
     nsRepository::UnregisterFactory(kToolkitCoreCID, path);
     nsRepository::UnregisterFactory(kBrowserAppCoreCID, path);
+    nsRepository::UnregisterFactory(kEditorAppCoreCID, path);
     
     return NS_OK;
 }
@@ -109,6 +113,10 @@ NSGetFactory(const nsCID &aClass, nsISupports* serviceMgr, nsIFactory **aFactory
     {
         inst = new nsBrowserAppCoreFactory();      
     }
+    else if ( aClass.Equals(kEditorAppCoreCID) )
+    {
+        inst = new nsEditorAppCoreFactory();      
+    }
     else
     {
         return NS_ERROR_ILLEGAL_VALUE;

xpfe/AppCores/src/nsAppCoresNameSet.cpp

@@ -29,6 +29,7 @@
 #include "nsIDOMMailCore.h"
 #include "nsIDOMToolbarCore.h"
 #include "nsIDOMBrowserAppCore.h"
+#include "nsIDOMEditorAppCore.h"
 #include "nsAppCoresCIDs.h" 
 
 
@@ -38,6 +39,7 @@ static NS_DEFINE_IID(kToolkitCoreCID,        NS_TOOLKITCORE_CID);
 static NS_DEFINE_IID(kMailCoreCID,           NS_MAILCORE_CID);
 static NS_DEFINE_IID(kToolbarCoreCID,        NS_TOOLBARCORE_CID);
 static NS_DEFINE_IID(kBrowserAppCoreCID,     NS_BROWSERAPPCORE_CID);
+static NS_DEFINE_IID(kEditorAppCoreCID,      NS_EDITORAPPCORE_CID);
 
 nsAppCoresNameSet::nsAppCoresNameSet()
 {
@@ -64,6 +66,7 @@ nsAppCoresNameSet::InitializeClasses(nsIScriptContext* aScriptContext)
     result = NS_InitMailCoreClass(aScriptContext, nsnull);
     result = NS_InitToolbarCoreClass(aScriptContext, nsnull);
     result = NS_InitBrowserAppCoreClass(aScriptContext, nsnull);
+    result = NS_InitEditorAppCoreClass(aScriptContext, nsnull);
     result = NS_InitToolkitCoreClass(aScriptContext, nsnull);
 
     return result;
@@ -105,6 +108,12 @@ nsAppCoresNameSet::AddNameSet(nsIScriptContext* aScriptContext)
 
         if (NS_OK != result) return result;
 
+        result = manager->RegisterGlobalName("EditorAppCore", 
+                                             kEditorAppCoreCID, 
+                                             PR_TRUE);
+
+        if (NS_OK != result) return result;
+
         result = manager->RegisterGlobalName("XPAppCoresManager", 
                                              kAppCoresCID, 
                                              PR_FALSE);

xpfe/AppCores/xul/Makefile.in

@@ -25,6 +25,8 @@ include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
 EXPORT_RESOURCE_SAMPLES = \
+	$(srcdir)/EditorAppShell.xul \
+	$(srcdir)/EditorInitPage.html \
 	$(srcdir)/MailAppShell.html \
 	$(srcdir)/MailAppShellNoTB.html \
 	$(srcdir)/MailFrame.html \
@@ -45,6 +47,28 @@ EXPORT_RESOURCE_TOOLBAR = \
 	$(srcdir)/resources/DialogMailIcon_mo.gif \
 	$(srcdir)/resources/DialogNavIcon.gif \
 	$(srcdir)/resources/DialogNavIcon_mo.gif \
+	$(srcdir)/resources/ED_Bold.gif \
+	$(srcdir)/resources/ED_Bullets.gif \
+	$(srcdir)/resources/ED_Center.gif \
+	$(srcdir)/resources/ED_ClearStyle.gif \
+	$(srcdir)/resources/ED_Copy.gif \
+	$(srcdir)/resources/ED_Cut.gif \
+	$(srcdir)/resources/ED_Dedent.gif \
+	$(srcdir)/resources/ED_Find.gif \
+	$(srcdir)/resources/ED_HLine.gif \
+	$(srcdir)/resources/ED_Image.gif \
+	$(srcdir)/resources/ED_Indent.gif \
+	$(srcdir)/resources/ED_Italic.gif \
+	$(srcdir)/resources/ED_Left.gif \
+	$(srcdir)/resources/ED_Link.gif \
+	$(srcdir)/resources/ED_Numbers.gif \
+	$(srcdir)/resources/ED_Paste.gif \
+	$(srcdir)/resources/ED_Right.gif \
+	$(srcdir)/resources/ED_Spell.gif \
+	$(srcdir)/resources/ED_Table.gif \
+	$(srcdir)/resources/ED_Target.gif \
+	$(srcdir)/resources/ED_Underline.gif \
+	$(srcdir)/resources/ED_Undo.gif \
 	$(srcdir)/resources/TB_Back.gif \
 	$(srcdir)/resources/TB_Back_dis.gif \
 	$(srcdir)/resources/TB_Back_mo.gif \

xpfe/bootstrap/nsSetupRegistry.cpp

@@ -22,10 +22,13 @@
 #include "nsICmdLineService.h"
 #include "nsAppShellCIDs.h"
 
+#include "nsIEditor.h"
+
 #include "nsAppCoresCIDs.h"
 #include "nsIDOMAppCoresManager.h"
 #include "nsIDOMMailCore.h"
 #include "nsIDOMBrowserAppCore.h"
+#include "nsIDOMEditorAppCore.h"
 
 static NS_DEFINE_IID(kIAppCoresManagerIID, NS_IDOMAPPCORESMANAGER_IID);
 static NS_DEFINE_IID(kAppCoresManagerCID,  NS_APPCORESMANAGER_CID);
@@ -33,12 +36,14 @@ static NS_DEFINE_IID(kToolkitCoreCID,      NS_TOOLKITCORE_CID);
 static NS_DEFINE_IID(kMailCoreCID,         NS_MAILCORE_CID);
 static NS_DEFINE_IID(kToolbarCoreCID,      NS_TOOLBARCORE_CID);
 static NS_DEFINE_IID(kBrowserAppCoreCID,   NS_BROWSERAPPCORE_CID);
+static NS_DEFINE_IID(kEditorAppCoreCID,    NS_EDITORAPPCORE_CID);
 
 #ifdef XP_PC
 
 #define APPSHELL_DLL "nsappshell.dll"
 #define BROWSER_DLL  "nsbrowser.dll"
 #define APPCORES_DLL  "appcores.dll"
+#define EDITOR_DLL "ender.dll"
 
 #else
 
@@ -46,12 +51,14 @@ static NS_DEFINE_IID(kBrowserAppCoreCID,   NS_BROWSERAPPCORE_CID);
 
 #define APPSHELL_DLL "APPSHELL_DLL"
 #define APPCORES_DLL  "APPCORES_DLL"
+#define EDITOR_DLL	"ENDER_DLL"
 
 #else
 
 // XP_UNIX
 #define APPSHELL_DLL  "libnsappshell.so"
 #define APPCORES_DLL  "libappcores.so"
+#define EDITOR_DLL "libender.so"
 
 #endif // XP_MAC
 
@@ -61,6 +68,7 @@ static NS_DEFINE_IID(kBrowserAppCoreCID,   NS_BROWSERAPPCORE_CID);
 static NS_DEFINE_IID(kCAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
 static NS_DEFINE_IID(kCCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
 ///static NS_DEFINE_IID(kCBrowserControllerCID, NS_BROWSERCONTROLLER_CID);
+//static NS_DEFINE_IID(kIEditFactoryIID, NS_IEDITORFACTORY_IID);
 
 
 /*
@@ -93,6 +101,8 @@ NS_SetupRegistry_1()
   nsRepository::RegisterFactory(kMailCoreCID,       APPCORES_DLL, PR_FALSE, PR_FALSE);
   nsRepository::RegisterFactory(kToolbarCoreCID,    APPCORES_DLL, PR_FALSE, PR_FALSE);
   nsRepository::RegisterFactory(kBrowserAppCoreCID, APPCORES_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterFactory(kEditorAppCoreCID,  APPCORES_DLL, PR_FALSE, PR_FALSE);
+  nsRepository::RegisterFactory(kIEditFactoryIID, EDITOR_DLL, PR_FALSE, PR_FALSE);
 //#endif
 ///  nsRepository::RegisterFactory(kCBrowserControllerCID, BROWSER_DLL, PR_FALSE, PR_FALSE);
 }