2000-03-04 01:37:20 +00:00
|
|
|
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
|
|
|
|
*
|
|
|
|
|
* The contents of this file are subject to the Mozilla Public
|
|
|
|
|
* License Version 1.1 (the "License"); you may not use this file
|
|
|
|
|
* except in compliance with the License. You may obtain a copy of
|
|
|
|
|
* the License at http://www.mozilla.org/MPL/
|
|
|
|
|
*
|
|
|
|
|
* Software distributed under the License is distributed on an "AS
|
|
|
|
|
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
|
|
|
* implied. See the License for the specific language governing
|
|
|
|
|
* rights and limitations under the License.
|
|
|
|
|
*
|
|
|
|
|
* The Original Code is RaptorCanvas.
|
|
|
|
|
*
|
|
|
|
|
* The Initial Developer of the Original Code is Kirk Baker and
|
|
|
|
|
* Ian Wilkinson. Portions created by Kirk Baker and Ian Wilkinson are
|
|
|
|
|
* Copyright (C) 1999 Kirk Baker and Ian Wilkinson. All
|
|
|
|
|
* Rights Reserved.
|
|
|
|
|
*
|
|
|
|
|
* Contributor(s): Kirk Baker <kbaker@eb.com>
|
|
|
|
|
* Ian Wilkinson <iw@ennoble.com>
|
|
|
|
|
* Mark Lin <mark.lin@eng.sun.com>
|
|
|
|
|
* Mark Goddard
|
|
|
|
|
* Ed Burns <edburns@acm.org>
|
2000-06-30 00:01:58 +00:00
|
|
|
* Ashutosh Kulkarni <ashuk@eng.sun.com>
|
2000-03-04 01:37:20 +00:00
|
|
|
* Ann Sunhachawee
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
|
|
* Util methods
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
2000-08-03 21:32:54 +00:00
|
|
|
#ifndef ns_util_h
|
|
|
|
|
#define ns_util_h
|
2000-03-04 01:37:20 +00:00
|
|
|
|
2000-08-03 21:32:54 +00:00
|
|
|
#include "jni_util.h" // located in ../src_share,
|
|
|
|
|
// pulls in ../src_share/jni_util_export.h
|
2000-03-04 01:37:20 +00:00
|
|
|
|
|
|
|
|
#include "nsCOMPtr.h" // so we can save the docShell
|
2000-06-30 00:01:58 +00:00
|
|
|
#include "nsIWebBrowser.h"
|
2000-03-04 01:37:20 +00:00
|
|
|
#include "nsIDocShell.h" // so we can save our nsIDocShell
|
2000-06-30 00:01:58 +00:00
|
|
|
#include "nsIBaseWindow.h" // to get methods like SetVisibility
|
|
|
|
|
#include "nsIPresShell.h"
|
2000-03-04 01:37:20 +00:00
|
|
|
#include "nsIThread.h" // for PRThread
|
|
|
|
|
#include "nsIWebShell.h" // for nsIWebShell
|
|
|
|
|
#include "nsIEventQueueService.h" // for PLEventQueue
|
2000-06-04 22:16:36 +00:00
|
|
|
#include "nsIDOMDocument.h"
|
2000-03-04 01:37:20 +00:00
|
|
|
|
2000-06-30 00:01:58 +00:00
|
|
|
#include "wcIBrowserContainer.h" // our BrowserContainer
|
|
|
|
|
|
The churn continues. After this checkin, BrowserControlFactoryTest
runs, but nothing else does.
As you all probably already know, all mozilla API calls have to happen
on the same thread. For webclient, this will be the NativeEventThread.
This change-bundle does many many things, here are the main ones.
These changes are in concert with the checkin I just did to the diagram
at
<http://www.mozilla.org/projects/blackwood/webclient/design/20040306-webclient-2_0.zargo>.
M classes_spec/org/mozilla/webclient/impl/WrapperFactory.java
M classes_spec/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImpl.java
* <p>This class is the hub of the startup and shutdown sequence for
* Webclient. It is a singleton and owns references to other app
* singletons:</p>
*
* <ul>
* <li><p>{@link NativeEventThread}</p></li>
*
* <li><p>{@link Bookmarks}</p></li>
*
* <li><p>{@link Preferences}</p></li>
*
* <li><p>{@link ProfileManager}</p></li>
* <li><p>the native object singleton corresponding to this java
* object (if necessary)</p></li>
*
* </ul>
*
* <p>It maintains a set of {@link BrowserControlImpl} instances so that
* we may return the native pointer for each one.</p>
*
* <p>This class is responsible for creating and initializing and
* deleting {@link BrowserControlImpl} instances, as well as ensuring
* that the native counterpart is proprely maintained in kind.</p>
*
* <p>This class has a tight contract with {@link
* NativeEventThread}.</p>
- make BrowserControl creation and deletion part of this classes
responsibilities.
- introduce NativeWrapperFactory concept.
- own the one and only NativeEventThread.
M classes_spec/org/mozilla/webclient/impl/wrapper_native/NativeEventThread.java
- make this a singleton.
- remove dependencies on BrowserControl and nativeBrowserControl
* <p>This is a singleton class. All native events pass thru this class
* by virtue of the {@link #pushRunnable} or {@link pushNotifyRunnable}
* methods.</p>
- remove listener logic. This'll go into EventRegistration, where it
belongs.
A src_moz/NativeWrapperFactory.cpp
A src_moz/NativeWrapperFactory.h
- takes the place of the old WebclientContext
- is now a class
M classes_spec/org/mozilla/webclient/impl/BrowserControlImpl.java
- this no longer destroys the nativeBrowserControl. That is now done by
WrapperFactoryImpl.
M classes_spec/org/mozilla/webclient/impl/WebclientFactoryImpl.java
- no longer maintain browserControlCount.
M classes_spec/org/mozilla/webclient/impl/wrapper_native/BookmarksImpl.java
M classes_spec/org/mozilla/webclient/impl/wrapper_native/NavigationImpl.java
M classes_spec/org/mozilla/webclient/impl/wrapper_native/PreferencesImpl.java
M classes_spec/org/mozilla/webclient/impl/wrapper_native/ProfileManagerImpl.java
- rename NativeContext to NativeWrapperFactory, to illustrate its
singletonness.
M classes_spec/org/mozilla/webclient/impl/wrapper_native/EventRegistrationImpl.java
- comment out a bunch of stuff in anticipation of the new threading
model, currently being fleshed out.
M classes_spec/org/mozilla/webclient/impl/wrapper_native/ImplObjectNative.java
- NativeEventThread is singleton
M src_moz/BookmarksImpl.cpp
M src_moz/PreferencesImpl.cpp
M src_moz/ProfileManagerImpl.cpp
M src_moz/RDFEnumeration.cpp
M src_moz/RDFTreeNode.cpp
- rename WebclientContext to NativeWrapperFactory.
M src_moz/EmbedWindow.cpp
- mBaseWindow->Destroy();
+ if (mBaseWindow) {
+ mBaseWindow->Destroy();
+ }
M src_moz/Makefile.in
- Bring back NavigationImpl
- add NativeWrapperFactory.
M src_moz/NativeBrowserControl.cpp
M src_moz/NativeBrowserControl.h
- move event queue and java related stuff to NativeWrapperFactory. This
class is now essentially a copy of EmbedPrivate in GtkEmbed.
M src_moz/NativeEventThread.cpp
- remove methods, most of it has moved to
WrapperFactoryImpl/NativeWrapperFactory.
M src_moz/NavigationImpl.cpp
- comment out all methods but LoadURI.
M src_moz/WrapperFactoryImpl.cpp
- take functionality over from NativeEventThread.
M src_moz/ns_util.cpp
M src_moz/ns_util.h
- the eventQueue is owned by NativeWrapperFactory now.
M src_moz/rdf_util.cpp
M src_share/jni_util.cpp
- make all exceptions RuntimeExceptions, so they can be thrown from a
Runnable.
M test/automated/src/classes/org/mozilla/webclient/impl/wrapper_native/WrapperFactoryImplTest.java
- comment out the meat of this test until I figure out how to test it.
M test/automated/src/test/BrowserControlFactoryTest_correct
- new content.
2004-04-15 22:58:08 +00:00
|
|
|
#include "NativeWrapperFactory.h"
|
|
|
|
|
|
bug: http://bugzilla.mozilla.org/show_bug.cgi?id=34665
This change replaces all printfs in src_moz with calls to PR_LOG. No
printfs should appear in src_moz anymore.
You won't see any console output from native code unless you define
NSPR_LOG_MODULES=webclient:3
in your environment. Furthermore, if you want PR_LOG statements in
webclient to go to a file instead, define
WEBCLIENT_LOG_FILE=C:\VALIDDIR\filename.txt
in your environment. This file will get created fresh each time, since
PR_LOG uses fopen(filename, "w").
New Files:
I've created ns_globals.h, included from jni_util.h. ns_globals.h holds
an extern * to a struct used in the PR_LOG calls.
Significant changes:
WrapperFactoryImpl.cpp
nativeAppInitialize(){
Added:
#if DEBUG_RAPTOR_CANVAS
prLogModuleInfo = PR_NewLogModule("webclient");
const char *webclientLogFile = PR_GetEnv("WEBCLIENT_LOG_FILE");
if (nsnull != webclientLogFile) {
PR_SetLogFile(webclientLogFile);
// If this fails, it just goes to stdout/stderr
}
#endif
}
All the other files in this checkin follow the this pattern:
Before checkin:
printf("InitMozillaStuff(%lx): Create the Event Queue for the UI thread...\n",
initContext);
After checkin:
if (prLogModuleInfo) {
PR_LOG(prLogModuleInfo, 3,
("InitMozillaStuff(%lx): Create the Event Queue for the UI thread...\n",
initContext));
}
See http://lxr.mozilla.org/mozilla/source/nsprpub/pr/include/prlog.h#190
for the definition of PR_LOG
2000-04-05 21:38:27 +00:00
|
|
|
#include "ns_globals.h"
|
|
|
|
|
|
2000-03-07 22:33:38 +00:00
|
|
|
// Ashu
|
|
|
|
|
#ifdef XP_UNIX
|
|
|
|
|
#include "nsIWidget.h" // for GTKWidget
|
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
|
#endif
|
|
|
|
|
//
|
|
|
|
|
|
2001-04-02 21:18:06 +00:00
|
|
|
#if defined(XP_UNIX) || defined(XP_MAC) || defined(XP_BEOS)
|
|
|
|
|
|
|
|
|
|
#define WC_ITOA(intVal, buf, radix) sprintf(buf, "%d", intVal)
|
|
|
|
|
#else
|
|
|
|
|
#define WC_ITOA(intVal, buf, radix) itoa(intVal, buf, radix)
|
|
|
|
|
#endif
|
|
|
|
|
|
2000-03-04 01:37:20 +00:00
|
|
|
//
|
|
|
|
|
// local classes
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
enum {
|
|
|
|
|
kEventQueueError = 1,
|
|
|
|
|
kCreateWebShellError,
|
2000-06-30 00:01:58 +00:00
|
|
|
kCreateDocShellError,
|
|
|
|
|
kGetBaseWindowError,
|
2000-03-04 01:37:20 +00:00
|
|
|
kInitWebShellError,
|
|
|
|
|
kShowWebShellError,
|
|
|
|
|
kHistoryWebShellError,
|
2000-04-06 17:45:27 +00:00
|
|
|
kClipboardWebShellError,
|
|
|
|
|
kFindComponentError,
|
2000-07-24 21:15:03 +00:00
|
|
|
kGetContentViewerError,
|
|
|
|
|
kGetDOMWindowError
|
2000-03-04 01:37:20 +00:00
|
|
|
};
|
|
|
|
|
|
2000-08-10 21:38:52 +00:00
|
|
|
extern const char *gSupportedListenerInterfaces[]; // defined in ns_util.cpp
|
|
|
|
|
|
2000-03-04 01:37:20 +00:00
|
|
|
/**
|
|
|
|
|
|
|
|
|
|
* This method calls PL_PostEvent(),
|
|
|
|
|
|
|
|
|
|
* http://lxr.mozilla.org/mozilla/source/xpcom/threads/plevent.c#248
|
|
|
|
|
|
|
|
|
|
* which simply uses nice monitors to insert the event into the provided
|
2004-04-28 16:40:15 +00:00
|
|
|
* event queue, which is from NativeWrapperFactory::sActionQueue. The
|
|
|
|
|
* events are processed in NativeEventThread.cpp:processEventLoop, which
|
|
|
|
|
* is called from the Java NativeEventThread.run(). See the code and
|
|
|
|
|
* comments for processEventLoop in NativeEventThread.cpp.
|
2000-03-04 01:37:20 +00:00
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
2004-04-28 16:40:15 +00:00
|
|
|
void util_PostEvent (PLEvent * event);
|
2000-03-04 01:37:20 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
|
|
* This method calls PL_PostSynchronousEvent(),
|
|
|
|
|
|
|
|
|
|
* http://lxr.mozilla.org/mozilla/source/xpcom/threads/plevent.c#278
|
|
|
|
|
|
|
|
|
|
* which, instead of putting the event in the queue, as in
|
|
|
|
|
* util_PostEvent(), either calls the event's handler directly, or puts
|
|
|
|
|
* it in the queue and waits for it to be processed so it can return the
|
|
|
|
|
* result.
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
2004-04-28 16:40:15 +00:00
|
|
|
void * util_PostSynchronousEvent (PLEvent * event);
|
2000-03-04 01:37:20 +00:00
|
|
|
|
2001-04-02 21:18:06 +00:00
|
|
|
typedef struct _wsStringStruct {
|
|
|
|
|
const PRUnichar *uniStr;
|
|
|
|
|
jstring jStr;
|
|
|
|
|
} wsStringStruct;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
|
|
* @param strings wsStringStruct []. A null terminated array of
|
|
|
|
|
* wsStringStruct instances. On return, the jStr of each element is the
|
|
|
|
|
* new jstring. Call util_DeleteJstringsFromUnichars to deallocate.
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
nsresult util_CreateJstringsFromUnichars(wsStringStruct *strings,
|
|
|
|
|
PRInt32 arrayLen);
|
|
|
|
|
|
|
|
|
|
nsresult util_DeleteJstringsFromUnichars(wsStringStruct *strings,
|
|
|
|
|
PRInt32 arrayLen);
|
|
|
|
|
|
2000-03-16 23:07:03 +00:00
|
|
|
// hack functions to get around mozilla oddities
|
|
|
|
|
#ifdef XP_UNIX
|
|
|
|
|
jint util_GetGTKWinPtrFromCanvas(JNIEnv *env, jobject browserControlCanvas);
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-09-12 23:45:37 +00:00
|
|
|
nsresult util_GetLocaleString(const char *aKey, PRUnichar **aResult);
|
|
|
|
|
|
2000-08-03 21:32:54 +00:00
|
|
|
#endif // ns_util_h
|