Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rearchitected the way the Mozilla event thread is run. I'm using

Browse Source 
a Java Thread now instead to control Mozilla/GTK events.


git-svn-id: svn://10.0.0.236/trunk@43315 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mark.lin%eng.sun.com
1999-08-13 23:01:49 +00:00
parent c108d9dde2
commit fc3246623a
3 changed files with 118 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
mozilla/java/webclient/src/motif/BrowserControlMozillaShimStub.cpp
View File

@@ -20,11 +20,20 @@
* BrowserControlMozillaShimStub.cpp
*/
#include <dlfcn.h>
#include <jni.h>
#include "../BrowserControlMozillaShim.h"
// PENDING(mark): I suppose this is where I need to go into my explaination of why
// this file is needed...
void * mozWebShellDll;
// For loading DLL
#include <dlfcn.h>
// JNI...yada, yada, yada
#include <jni.h>
// JNI Header
#include "../BrowserControlMozillaShim.h"
// JNI Header
#include "MozillaEventThread.h"
// Global reference to webclient dll
void * webClientDll;
extern void locateMotifBrowserControlStubFunctions(void *);
@@ -62,6 +71,8 @@ jboolean (* nativeWebShellGoTo) (JNIEnv *, jobject, jint, jint);
jint (* nativeWebShellGetHistoryLength) (JNIEnv *, jobject, jint);
jint (* nativeWebShellGetHistoryIndex) (JNIEnv *, jobject, jint);
jstring (* nativeWebShellGetURL) (JNIEnv *, jobject, jint, jint);
void (* processNativeEventQueue) (JNIEnv *, jobject, jint);
void locateBrowserControlStubFunctions(void * dll) {
nativeInitialize = (void (*) (JNIEnv *, jobject)) dlsym(dll, "Java_org_mozilla_webclient_BrowserControlMozillaShim_nativeInitialize");
@@ -200,6 +211,20 @@ void locateBrowserControlStubFunctions(void * dll) {
if (!nativeWebShellGetURL) {
printf("got dlsym error %s\n", dlerror());
}
processNativeEventQueue = (void (*) (JNIEnv *, jobject, jint)) dlsym(dll, "Java_org_mozilla_webclient_motif_MozillaEventThread_processNativeEventQueue");
if (!processNativeEventQueue) {
printf("got dlsym error %s\n", dlerror());
}
}
/*
* Class: org_mozilla_webclient_motif_MotifMozillaEventQueue
* Method: processNativeEventQueue
* Signature: ()V
*/
JNIEXPORT void JNICALL Java_org_mozilla_webclient_motif_MozillaEventThread_processNativeEventQueue
(JNIEnv * env, jobject obj, jint gtkWinPtr) {
(* processNativeEventQueue) (env, obj, gtkWinPtr);
}
@@ -213,11 +238,11 @@ Java_org_mozilla_webclient_BrowserControlMozillaShim_nativeInitialize (
JNIEnv * env,
jobject obj)
{
mozWebShellDll = dlopen("libwebclient.so", RTLD_LAZY | RTLD_GLOBAL);
webClientDll = dlopen("libwebclient.so", RTLD_LAZY | RTLD_GLOBAL);
if (mozWebShellDll) {
locateBrowserControlStubFunctions(mozWebShellDll);
locateMotifBrowserControlStubFunctions(mozWebShellDll);
if (webClientDll) {
locateBrowserControlStubFunctions(webClientDll);
locateMotifBrowserControlStubFunctions(webClientDll);
(* nativeInitialize) (env, obj);
} else {

3
mozilla/java/webclient/src/motif/MotifBrowserControlCanvasStub.cpp
View File

@@ -21,6 +21,9 @@
* MotifBrowserControlCanvasStub.cpp
*/
// PENDING(mark): I suppose this is where I need to go into my explaination of why
// this file is needed...
#include <jni.h>
#include "MotifBrowserControlCanvas.h"