r=ashuk
bug=47357
M classes_spec/org/mozilla/webclient/wrapper_native/NativeEventThread.java
M src_moz/CBrowserContainer.cpp
M src_moz/NativeEventThread.cpp
M src_moz/ns_util.cpp
M src_moz/ns_util.h
M src_share/jni_util.cpp
M src_share/jni_util.h
tar -cvf 47357.2.tar classes_spec/org/mozilla/webclient/wrapper_native/NativeEventThread.java src_moz/CBrowserContainer.cpp src_moz/NativeEventThread.cpp src_moz/ns_util.cpp src_moz/ns_util.h src_share/jni_util.cpp src_share/jni_util.h
cvs diff -u classes_spec/org/mozilla/webclient/wrapper_native/NativeEventThread.java src_moz/CBrowserContainer.cpp src_moz/NativeEventThread.cpp src_moz/ns_util.cpp src_moz/ns_util.h src_share/jni_util.cpp src_share/jni_util.h
This change modifes what one has to do on the native side to add a
listener.
* How to create a new listener type on the native side: <P>
* 1. add an entry in the gSupportedListenerInterfaces array defined in
* ns_util.cpp <P>
* 2. add a corresponding entry in the LISTENER_CLASSES enum in
* ns_util.h <P>
* 3. add a jstring to the string constant list in
* CBrowserContainer.cpp, below.
* 4. Initialize this jstring constant in CBrowserContainer.cpp
* initStringConstants() <P>
* 5. add an entry to the switch statement in NativeEventThread.cpp
* native{add,remove}Listener <P>
You have to clobber_all in webclient after this change.
git-svn-id: svn://10.0.0.236/trunk@76019 18797224-902f-48f8-a5cc-f745e15eee43
171 lines
4.8 KiB
C
171 lines
4.8 KiB
C
/* -*- 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>
|
|
* Ashutosh Kulkarni <ashuk@eng.sun.com>
|
|
* Ann Sunhachawee
|
|
*/
|
|
|
|
|
|
/**
|
|
|
|
* Util methods
|
|
|
|
*/
|
|
|
|
#ifndef ns_util_h
|
|
#define ns_util_h
|
|
|
|
#include "jni_util.h" // located in ../src_share,
|
|
// pulls in ../src_share/jni_util_export.h
|
|
|
|
#include "nsCOMPtr.h" // so we can save the docShell
|
|
#include "nsIWebBrowser.h"
|
|
#include "nsIDocShell.h" // so we can save our nsIDocShell
|
|
#include "nsIBaseWindow.h" // to get methods like SetVisibility
|
|
#include "nsIWebNavigation.h" // for all Navigation commands
|
|
#include "nsISHistory.h" // for session history
|
|
#include "nsIPresShell.h"
|
|
#include "nsIThread.h" // for PRThread
|
|
#include "nsIWebShell.h" // for nsIWebShell
|
|
#include "nsIEventQueueService.h" // for PLEventQueue
|
|
#include "nsISearchContext.h" // for Find
|
|
#include "nsIDOMDocument.h"
|
|
|
|
#include "wcIBrowserContainer.h" // our BrowserContainer
|
|
|
|
#include "ns_globals.h"
|
|
|
|
// Ashu
|
|
#ifdef XP_UNIX
|
|
#include "nsIWidget.h" // for GTKWidget
|
|
#include <gtk/gtk.h>
|
|
#endif
|
|
//
|
|
|
|
//
|
|
// local classes
|
|
//
|
|
|
|
// PENDING(edburns): this should be a class, and we should define a
|
|
// constructor and destructor for it.
|
|
|
|
struct WebShellInitContext {
|
|
#ifdef XP_UNIX
|
|
GtkWidget * parentHWnd;
|
|
#else
|
|
// PENDING(mark): Don't we need something for Mac?
|
|
HWND parentHWnd;
|
|
#endif
|
|
nsCOMPtr<nsIWebShell> webShell;
|
|
nsCOMPtr<nsIDocShell> docShell;
|
|
nsCOMPtr<nsIBaseWindow> baseWindow;
|
|
nsCOMPtr<nsISHistory> sHistory;
|
|
nsCOMPtr<nsIWebNavigation> webNavigation;
|
|
nsCOMPtr<nsIPresShell> presShell;
|
|
nsCOMPtr<nsIWebBrowser> webBrowser;
|
|
PLEventQueue * actionQueue;
|
|
PRThread * embeddedThread;
|
|
JNIEnv * env;
|
|
jobject nativeEventThread;
|
|
int stopThread;
|
|
int initComplete;
|
|
int initFailCode;
|
|
int x;
|
|
int y;
|
|
int w;
|
|
int h;
|
|
int gtkWinPtr;
|
|
nsCOMPtr<nsISearchContext> searchContext;
|
|
nsCOMPtr<nsIDOMDocument> currentDocument;
|
|
nsCOMPtr<wcIBrowserContainer> browserContainer;
|
|
// This struct contains all per-window information not specific to mozilla
|
|
ShareInitContext shareContext;
|
|
};
|
|
|
|
enum {
|
|
kEventQueueError = 1,
|
|
kCreateWebShellError,
|
|
kCreateDocShellError,
|
|
kGetBaseWindowError,
|
|
kInitWebShellError,
|
|
kShowWebShellError,
|
|
kHistoryWebShellError,
|
|
kClipboardWebShellError,
|
|
kFindComponentError,
|
|
kSearchContextError,
|
|
kGetContentViewerError,
|
|
kGetDOMWindowError
|
|
};
|
|
|
|
extern const char *gSupportedListenerInterfaces[]; // defined in ns_util.cpp
|
|
|
|
// these index into the gSupportedListenerInterfaces array
|
|
|
|
typedef enum {
|
|
DOCUMENT_LOAD_LISTENER = 0,
|
|
MOUSE_LISTENER,
|
|
LISTENER_NOT_FOUND
|
|
} LISTENER_CLASSES;
|
|
|
|
|
|
/**
|
|
|
|
* 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
|
|
* event queue, which is from WebShellInitContext->actionQueue, which is
|
|
* created in NativeEventThread.cpp:InitMozillaStuff(). 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.
|
|
|
|
*/
|
|
|
|
void util_PostEvent (WebShellInitContext * initContext, PLEvent * event);
|
|
|
|
|
|
/**
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
void * util_PostSynchronousEvent (WebShellInitContext * initContext, PLEvent * event);
|
|
|
|
// hack functions to get around mozilla oddities
|
|
#ifdef XP_UNIX
|
|
jint util_GetGTKWinPtrFromCanvas(JNIEnv *env, jobject browserControlCanvas);
|
|
#endif
|
|
|
|
#endif // ns_util_h
|