a=edburns
r=ashuk
This change creates a new directory, java/webclient/src_share, that
contains the code that will be used in both src_moz and src_ie, and any
other native browser wrapping implementations.
Here are the steps I followed to implement this change.
1. Create a new directory java/webclient/src_share
2. Move all jni_util*.* files from src_moz into src_share
3. Make it so src_share compiles into a new .lib
src_share has no netscape dependencies. Any functionality that
depended on ns dependencies was kept in src_moz. In this case, we
have a function prototype only in src_share, with the implementation
in src_moz. We did this for nsHashtable. The other trick was for
things in WebShellInitContext that had nothing to do with Netscape.
This case was accomodated by creating a new struct, ShareInitContext,
that contains all WebShellInitContext members that have nothing to do
with Netscape. Currently this is just jobject propertiesClass. I
modified the WebShellInitContext struct to contain a ShareContext
struct as its last member. There are two new methods in jni_util.h
that allow for the initialization and deallocation of the members of
the ShareContext struct.
4. Make it so src_moz uses the new .lib to provide the jni_util behavior
a. Create ns_util* files that include ../src_share/jni_util* files
appropriately.
The only tricky part was for things in jni_util.h that
Here's the list of files in this change.
cvs -z3 -n update (in directory D:\Projects\mozilla\java\webclient)
cvs server: Updating .
M Makefile.win // added src_share to DIRS
M src_moz/BookmarksImpl.cpp // include ns_util instead of jni_util
M src_moz/CBrowserContainer.cpp // include ns_util instead of jni_util
M src_moz/CBrowserContainer.h // include ns_util instead of jni_util
M src_moz/CurrentPageImpl.cpp // include ns_util instead of jni_util
M src_moz/HistoryImpl.cpp // include ns_util instead of jni_util
M src_moz/Makefile.win // include ns_util instead of jni_util
M src_moz/NativeEventThread.cpp // include ns_util instead of jni_util
M src_moz/NavigationImpl.cpp // include ns_util instead of jni_util
M src_moz/RDFEnumeration.cpp // include ns_util instead of jni_util
M src_moz/RDFTreeNode.cpp // include ns_util instead of jni_util
M src_moz/WindowControlImpl.cpp // include ns_util instead of jni_util
// also use new util_InitShareContext
// function
M src_moz/WrapperFactoryImpl.cpp // include ns_util instead of jni_util
R src_moz/jni_util.cpp // moved to ../src_share
R src_moz/jni_util.h // moved to ../src_share
R src_moz/jni_util_export.cpp // moved to ../src_share
R src_moz/jni_util_export.h // moved to ../src_share
M src_moz/nsActions.cpp // include ns_util instead of jni_util
// also use new
util_DeallocateShareContext
M src_moz/nsActions.h // include ns_util instead of jni_util
A src_moz/ns_util.cpp // include jni_util.h
A src_moz/ns_util.h // include jni_util.h, changes to
// WebshellInitContext struct
A src_moz/ns_util_export.cpp // provide impls for methods in
// jni_util_export.h
A src_share/Makefile.win
A src_share/bal_util.cpp
A src_share/bal_util.h
A src_share/jni_util.cpp
A src_share/jni_util.h
A src_share/jni_util_export.cpp
A src_share/jni_util_export.h
*****CVS exited normally with code 0*****
git-svn-id: svn://10.0.0.236/trunk@75504 18797224-902f-48f8-a5cc-f745e15eee43
229 lines
7.6 KiB
C++
229 lines
7.6 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
|
|
*/
|
|
|
|
#include "WindowControlImpl.h"
|
|
#include "ns_util.h"
|
|
#include "nsActions.h"
|
|
|
|
#include "nsIThread.h" // for PRThread
|
|
|
|
#include "nsCOMPtr.h" // to get nsIBaseWindow from webshell
|
|
#include "nsIBaseWindow.h" // to get methods like SetVisibility
|
|
|
|
|
|
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_WindowControlImpl_nativeSetBounds
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jint x, jint y, jint w, jint h)
|
|
{
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to nativeSetBounds");
|
|
return;
|
|
}
|
|
if (initContext->initComplete) {
|
|
wsResizeEvent * actionEvent =
|
|
new wsResizeEvent(initContext->baseWindow, x, y, w, h);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
|
|
}
|
|
|
|
JNIEXPORT jint JNICALL Java_org_mozilla_webclient_wrapper_1native_WindowControlImpl_nativeCreateInitContext
|
|
(JNIEnv *env, jobject obj, jint windowPtr, jint x, jint y,
|
|
jint width, jint height, jobject aBrowserControlImpl)
|
|
{
|
|
#ifdef XP_MAC
|
|
WindowPtr pWindow = (WindowPtr) windowPtr;
|
|
Rect webRect = pWindow->portRect;
|
|
// nsIWidget * pWidget = (nsIWidget *) widgetPtr;
|
|
#elif defined(XP_PC)
|
|
// elif defined(XP_WIN)
|
|
HWND parentHWnd = (HWND)windowPtr;
|
|
#elif defined(XP_UNIX)
|
|
GtkWidget * parentHWnd = (GtkWidget *) windowPtr;
|
|
#endif
|
|
|
|
if (parentHWnd == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null window handle passed to raptorWebShellCreate");
|
|
return (jint) 0;
|
|
}
|
|
WebShellInitContext* initContext = new WebShellInitContext;
|
|
|
|
initContext->initComplete = FALSE;
|
|
initContext->initFailCode = 0;
|
|
initContext->parentHWnd = parentHWnd;
|
|
initContext->webShell = nsnull;
|
|
initContext->docShell = nsnull;
|
|
initContext->baseWindow = nsnull;
|
|
initContext->sHistory = nsnull;
|
|
initContext->webNavigation = nsnull;
|
|
initContext->presShell = nsnull;
|
|
initContext->embeddedThread = nsnull;
|
|
initContext->actionQueue = nsnull;
|
|
initContext->env = env;
|
|
initContext->nativeEventThread = nsnull;
|
|
initContext->stopThread = FALSE;
|
|
initContext->x = x;
|
|
initContext->y = y;
|
|
initContext->w = width;
|
|
initContext->h = height;
|
|
initContext->searchContext = nsnull;
|
|
initContext->currentDocument = nsnull;
|
|
initContext->browserContainer = nsnull;
|
|
util_InitializeShareInitContext(&(initContext->shareContext));
|
|
|
|
#ifdef XP_UNIX
|
|
initContext->gtkWinPtr =
|
|
(int)::util_GetGTKWinPtrFromCanvas(env, aBrowserControlImpl);
|
|
#else
|
|
initContext->gtkWinPtr = nsnull;
|
|
#endif
|
|
|
|
return (jint) initContext;
|
|
}
|
|
|
|
JNIEXPORT void JNICALL
|
|
Java_org_mozilla_webclient_wrapper_1native_WindowControlImpl_nativeDestroyInitContext
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to nativeDestroyInitContext");
|
|
return;
|
|
}
|
|
wsDeallocateInitContextEvent * actionEvent =
|
|
new wsDeallocateInitContextEvent(initContext);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
nsresult rv;
|
|
|
|
rv = (nsresult) ::util_PostSynchronousEvent(initContext, event);
|
|
if (NS_FAILED(rv)) {
|
|
::util_ThrowExceptionToJava(env, "Exception: Can't destroy initContext");
|
|
return;
|
|
}
|
|
initContext->actionQueue = nsnull;
|
|
delete initContext;
|
|
}
|
|
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_WindowControlImpl_nativeMoveWindowTo
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jint x, jint y)
|
|
{
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellMoveTo");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsMoveToEvent * actionEvent = new wsMoveToEvent(initContext->baseWindow, x, y);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_WindowControlImpl_nativeRemoveFocus
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellRemoveFocus");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsRemoveFocusEvent * actionEvent = new wsRemoveFocusEvent(initContext->baseWindow);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_WindowControlImpl_nativeRepaint
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jboolean forceRepaint)
|
|
{
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellRepaint");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsRepaintEvent * actionEvent = new wsRepaintEvent(initContext->baseWindow, (PRBool) forceRepaint);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_WindowControlImpl_nativeSetVisible
|
|
(JNIEnv *env, jobject obj, jint webShellPtr, jboolean newState)
|
|
{
|
|
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellRepaint");
|
|
return;
|
|
}
|
|
if (initContext->initComplete) {
|
|
wsShowEvent * actionEvent = new wsShowEvent(initContext->baseWindow, JNI_TRUE == newState ? PR_TRUE : PR_FALSE);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
|
|
}
|
|
|
|
JNIEXPORT void JNICALL Java_org_mozilla_webclient_wrapper_1native_WindowControlImpl_nativeSetFocus
|
|
(JNIEnv *env, jobject obj, jint webShellPtr)
|
|
{
|
|
WebShellInitContext* initContext = (WebShellInitContext *) webShellPtr;
|
|
|
|
if (initContext == nsnull) {
|
|
::util_ThrowExceptionToJava(env, "Exception: null webShellPtr passed to raptorWebShellSetFocus");
|
|
return;
|
|
}
|
|
|
|
if (initContext->initComplete) {
|
|
wsSetFocusEvent * actionEvent = new wsSetFocusEvent(initContext->baseWindow);
|
|
PLEvent * event = (PLEvent*) *actionEvent;
|
|
|
|
::util_PostEvent(initContext, event);
|
|
}
|
|
}
|