mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-28 23:09:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix Replicant instanciation, though it doesn't get the url correctly yet, and leaves stuff behind when removed (like the main thread).

Browse Source 
svn path=/trunk/netsurf/; revision=11028
This commit is contained in:
François Revel 2010-12-12 00:26:36 +00:00
parent afc6a62b7a
commit 84ca0e364b
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
beos/beos_scaffolding.cpp
View File

@ -161,6 +161,9 @@ static void nsbeos_window_update_back_forward(struct beos_scaffolding *);
static void nsbeos_throb(void *);
static int32 nsbeos_replicant_main_thread(void *_arg);
// in beos_gui.cpp
extern int main(int argc, char** argv);
#warning XXX
#if 0 /* GTK */
static gboolean nsbeos_window_url_activate_event(beosWidget *, gpointer);
@ -339,6 +342,7 @@ NSBaseView::NSBaseView(BMessage *archive)
NSBaseView::~NSBaseView()
{
warn_user ("~NSBaseView()", NULL);
}
@ -500,7 +504,7 @@ NSBaseView::Instantiate(BMessage *archive)
//TODO:FIXME: fix replicants
// netsurf_init() needs different args now...
//netsurf_init(2, info->args);
return NULL;
//return NULL;
replicant_done_sem = create_sem(0, "NS Replicant created");
thread_id nsMainThread = spawn_thread(nsbeos_replicant_main_thread,
@ -512,7 +516,7 @@ NSBaseView::Instantiate(BMessage *archive)
return NULL;
}
resume_thread(nsMainThread);
//while (acquire_sem(replicant_done_sem) == EINTR);
while (acquire_sem(replicant_done_sem) == EINTR);
delete_sem(replicant_done_sem);
return view;
@ -603,10 +607,12 @@ NSBrowserWindow::QuitRequested(void)
int32 nsbeos_replicant_main_thread(void *_arg)
{
struct replicant_thread_info *info = (struct replicant_thread_info *)_arg;
netsurf_main_loop();
netsurf_exit();
int32 ret;
ret = main(2, info->args);
//netsurf_main_loop();
//netsurf_exit();
delete info;
return 0;
return ret;
}
@ -1612,6 +1618,7 @@ nsbeos_scaffolding *nsbeos_new_scaffolding(struct gui_window *toplevel)
g->menu_bar = NULL;
g->window = NULL;
printf ("repli: %p\n", replicant_view);
if (replicated && !replicant_view) {
warn_user("Error: No subwindow allowed when replicated.", NULL);