summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2011-09-21 00:25:09 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2011-09-21 00:25:09 +0000
commitf27d5a3e15b5931f36b96bc5fb3d2572d339715d (patch)
treecb003adc645f8efccf31b1d0971f5e1ff842c814
parent0cf35ff7302525cffda2c9064b4077e80db9f663 (diff)
downloadnetsurf-f27d5a3e15b5931f36b96bc5fb3d2572d339715d.tar.gz
netsurf-f27d5a3e15b5931f36b96bc5fb3d2572d339715d.tar.bz2
Remove gui_multitask
svn path=/trunk/netsurf/; revision=12828
-rwxr-xr-xamiga/gui.c16
-rwxr-xr-xatari/download.c4
-rwxr-xr-xatari/gui.c8
-rw-r--r--beos/beos_gui.cpp12
-rw-r--r--beos/beos_gui.h1
-rw-r--r--cocoa/gui.m5
-rw-r--r--desktop/gui.h1
-rw-r--r--framebuffer/gui.c7
-rw-r--r--gtk/gui.c7
-rw-r--r--monkey/poll.c5
-rw-r--r--render/box_construct.c4
-rw-r--r--render/box_normalise.c3
-rw-r--r--render/html.c47
-rw-r--r--render/layout.c40
-rw-r--r--riscos/gui.c24
-rw-r--r--windows/gui.c5
16 files changed, 8 insertions, 181 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 87fc5fc93..1c0bd71f0 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1972,17 +1972,6 @@ void ami_get_msg(void)
}
}
-void gui_multitask(void)
-{
- /* This seems a bit topsy-turvy to me, but in this function, NetSurf is doing
- stuff and we need to poll for user events */
-
- ami_handle_msg();
- ami_handle_appmsg();
- ami_handle_applib();
- ami_arexx_handle();
-}
-
void gui_poll(bool active)
{
/* However, down here we are waiting for the user to do something or for a
@@ -1994,7 +1983,10 @@ void gui_poll(bool active)
if(active)
{
- gui_multitask();
+ ami_handle_msg();
+ ami_handle_appmsg();
+ ami_handle_applib();
+ ami_arexx_handle();
schedule_run(TRUE);
}
else
diff --git a/atari/download.c b/atari/download.c
index 7c785d3fc..a37c827c7 100755
--- a/atari/download.c
+++ b/atari/download.c
@@ -248,8 +248,6 @@ nserror gui_download_window_data(struct gui_download_window *dw,
fwrite( data , size, sizeof(unsigned char),dw->fd );
dw->size_downloaded += size;
- gui_multitask();
-
/* Update the progress bar... */
if( tnow - dw->lastrdw > 1 ) {
dw->lastrdw = tnow;
@@ -316,4 +314,4 @@ void gui_download_window_done(struct gui_download_window *dw)
if( (tree[DOWNLOAD_CB_CLOSE_RDY].ob_state & SELECTED) != 0 ) {
ApplWrite( _AESapid, WM_CLOSED, dw->form->handle, 0,0,0,0);
}
-} \ No newline at end of file
+}
diff --git a/atari/gui.c b/atari/gui.c
index 221801645..ce1750526 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -104,14 +104,6 @@ const char * cfg_homepage_url;
extern GEM_PLOTTER plotter;
-void gui_multitask(void)
-{
- short winloc[4];
- short mx, my, dummy, aestop;
- int flags = MU_MESAG | MU_KEYBD | MU_BUTTON | MU_TIMER;
- evnt.timer = 0;
- EvntWindom( flags );
-}
void gui_poll(bool active)
{
diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp
index 9e3136fdb..4740668d0 100644
--- a/beos/beos_gui.cpp
+++ b/beos/beos_gui.cpp
@@ -91,7 +91,6 @@ void gui_init(int argc, char** argv);
// enable using resources instead of files
#define USE_RESOURCES 1
-bool gui_in_multitask = false;
bool replicated = false; /**< if we are running as a replicant */
char *default_stylesheet_url;
@@ -759,17 +758,6 @@ void gui_poll(bool active)
}
-void gui_multitask(void)
-{
- gui_in_multitask = true;
-#if 0 /* GTK */
- while (beos_events_pending())
- beos_main_iteration();
-#endif
- gui_in_multitask = false;
-}
-
-
void gui_quit(void)
{
CALLED();
diff --git a/beos/beos_gui.h b/beos/beos_gui.h
index a5cb64322..6bbfa1dd1 100644
--- a/beos/beos_gui.h
+++ b/beos/beos_gui.h
@@ -29,7 +29,6 @@
#define CALLED() fprintf(stderr, "%s()\n", __FUNCTION__);
-extern bool gui_in_multitask;
extern bool replicated;
#if 0 /* GTK */
diff --git a/cocoa/gui.m b/cocoa/gui.m
index d39fae72d..1364077c8 100644
--- a/cocoa/gui.m
+++ b/cocoa/gui.m
@@ -57,11 +57,6 @@ char* gui_get_resource_url(const char *filename)
return strdup( [[[NSURL fileURLWithPath: path] absoluteString] UTF8String] );
}
-void gui_multitask(void)
-{
- // nothing to do
-}
-
void gui_poll(bool active)
{
cocoa_autorelease();
diff --git a/desktop/gui.h b/desktop/gui.h
index aac7f1001..9f49e7fe0 100644
--- a/desktop/gui.h
+++ b/desktop/gui.h
@@ -71,7 +71,6 @@ typedef enum { GUI_POINTER_DEFAULT, GUI_POINTER_POINT, GUI_POINTER_CARET,
#include <stdio.h>
bool nslog_ensure(FILE *fptr);
-void gui_multitask(void);
void gui_poll(bool active);
void gui_quit(void);
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 01ce53f51..e8f3f2983 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -529,13 +529,6 @@ main(int argc, char** argv)
void
-gui_multitask(void)
-{
- /* LOG(("gui_multitask")); */
-}
-
-
-void
gui_poll(bool active)
{
nsfb_event_t event;
diff --git a/gtk/gui.c b/gtk/gui.c
index 4afa646a7..abd02f1c2 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -563,13 +563,6 @@ void gui_poll(bool active)
}
-void gui_multitask(void)
-{
- while (gtk_events_pending())
- gtk_main_iteration();
-}
-
-
void gui_quit(void)
{
nsgtk_download_destroy();
diff --git a/monkey/poll.c b/monkey/poll.c
index 50744f5a4..024005b89 100644
--- a/monkey/poll.c
+++ b/monkey/poll.c
@@ -158,8 +158,3 @@ gui_poll(bool active)
monkey_window_process_reformats();
}
-
-void gui_multitask(void)
-{
- g_main_context_iteration(g_main_context_default(), false);
-}
diff --git a/render/box_construct.c b/render/box_construct.c
index 990fa380c..aafb0e5b5 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -38,12 +38,10 @@
#include "css/css.h"
#include "css/utils.h"
#include "css/select.h"
-#include "desktop/browser.h"
#include "desktop/options.h"
#include "render/box.h"
#include "render/form.h"
#include "render/html_internal.h"
-#include "desktop/gui.h"
#include "utils/locale.h"
#include "utils/log.h"
#include "utils/messages.h"
@@ -257,8 +255,6 @@ bool box_construct_element(xmlNode *n, html_content *content,
assert(parent);
assert(inline_container);
- gui_multitask();
-
/* In case the parent is a pre block, we clear the
* PRE_STRIP flag since it is not used if we
* follow the pre with a tag
diff --git a/render/box_normalise.c b/render/box_normalise.c
index f7154c5f3..8d88a2ef2 100644
--- a/render/box_normalise.c
+++ b/render/box_normalise.c
@@ -30,7 +30,6 @@
#include "render/box.h"
#include "render/html_internal.h"
#include "render/table.h"
-#include "desktop/gui.h"
#include "utils/log.h"
#include "utils/talloc.h"
@@ -114,8 +113,6 @@ bool box_normalise_block(struct box *block, html_content *c)
assert(block->type == BOX_BLOCK || block->type == BOX_INLINE_BLOCK ||
block->type == BOX_TABLE_CELL);
- gui_multitask();
-
for (child = block->children; child != NULL; child = next_child) {
#ifdef BOX_NORMALISE_DEBUG
LOG(("child %p, child->type = %d", child, child->type));
diff --git a/render/html.c b/render/html.c
index 286fc9644..392fec18e 100644
--- a/render/html.c
+++ b/render/html.c
@@ -32,7 +32,6 @@
#include "content/fetch.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
-#include "desktop/gui.h"
#include "desktop/options.h"
#include "desktop/selection.h"
#include "image/bitmap.h"
@@ -301,36 +300,16 @@ error:
/**
* Process data for CONTENT_HTML.
- *
- * The data is parsed in chunks of size CHUNK, multitasking in between.
*/
bool html_process_data(struct content *c, const char *data, unsigned int size)
{
html_content *html = (html_content *) c;
- unsigned long x;
binding_error err;
const char *encoding;
- for (x = 0; x + CHUNK <= size; x += CHUNK) {
- err = binding_parse_chunk(html->parser_binding,
- (const uint8_t *) data + x, CHUNK);
- if (err == BINDING_ENCODINGCHANGE) {
- goto encoding_change;
- } else if (err != BINDING_OK) {
- union content_msg_data msg_data;
-
- msg_data.error = messages_get("NoMemory");
- content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
-
- return false;
- }
-
- gui_multitask();
- }
-
err = binding_parse_chunk(html->parser_binding,
- (const uint8_t *) data + x, (size - x));
+ (const uint8_t *) data, size);
if (err == BINDING_ENCODINGCHANGE) {
goto encoding_change;
} else if (err != BINDING_OK) {
@@ -404,8 +383,8 @@ encoding_change:
source_data = content__get_source_data(c, &source_size);
- /* Recurse to reprocess all that data. This is safe because
- * the encoding is now specified at parser-start which means
+ /* Recurse to reprocess all the data. This is safe because
+ * the encoding is now specified at parser start which means
* it cannot be changed again. */
return html_process_data(c, source_data, source_size);
}
@@ -1731,26 +1710,6 @@ void html_stop(struct content *c)
switch (c->status) {
case CONTENT_STATUS_LOADING:
- /* Clean up objects if we were stopped after queuing up some
- * fetches within xml_to_box (i.e. gui_multitask is somewhere
- * in our call stack) */
- for (object = htmlc->object_list; object != NULL;
- object = object->next) {
- if (object->content == NULL)
- continue;
-
- /* If there's a content already associated with our
- * handle, something's gone very wrong */
- assert(content_get_status(object->content) ==
- CONTENT_STATUS_ERROR);
-
- hlcache_handle_abort(object->content);
- hlcache_handle_release(object->content);
- object->content = NULL;
-
- c->active--;
- }
-
/* Still loading; simply flag that we've been aborted
* html_convert/html_finish_conversion will do the rest */
htmlc->aborted = true;
diff --git a/render/layout.c b/render/layout.c
index 0506c60d5..a55793e89 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -43,7 +43,6 @@
#include "css/css.h"
#include "css/utils.h"
#include "content/content_protected.h"
-#include "desktop/gui.h"
#include "desktop/options.h"
#include "desktop/scrollbar.h"
#include "render/box.h"
@@ -220,45 +219,6 @@ bool layout_block_context(struct box *block, int viewport_height,
assert(block->width != UNKNOWN_WIDTH);
assert(block->width != AUTO);
-#ifdef riscos
- /* Why the ifdef? You don't really want to know. If you do, read on.
- *
- * So, the only way into this function is through the rest of the
- * layout code. The only external entry points into the layout code
- * are layout_document and layout_inline_container. The latter is only
- * ever called when editing text in form textareas, so we can ignore it
- * for the purposes of this discussion.
- *
- * layout_document is only ever called from html_reformat, which itself
- * is only ever called from content_reformat. content_reformat locks
- * the content structure while reformatting is taking place.
- *
- * If we call gui_multitask here, then any pending UI events will get
- * processed. This includes window expose/redraw events. Upon receipt
- * of these events, the UI code will call content_redraw for the
- * window's content. content_redraw will return immediately if the
- * content is currently locked (which it will be if we're still doing
- * layout).
- *
- * On RISC OS, this isn't a problem as the UI code's window redraw
- * handler explicitly checks for locked contents and does nothing
- * in that case. This effectively means that the window contents
- * aren't updated, so whatever's already in the window will remain
- * on-screen. On GTK, however, redraw is not direct-to-screen, but
- * to a pixmap which is then blitted to screen. If we perform no
- * redraw, then the pixmap will be flat white. When this is
- * subsequently blitted, the user gets greeted with an unsightly
- * flicker to white (and then back to the document when the content
- * is redrawn when unlocked).
- *
- * In the long term, this upcall into the GUI event dispatch code needs
- * to disappear. It needs to remain for the timebeing, however, as
- * document reflow can be fairly time consuming and we need to remain
- * responsive to user input.
- */
- gui_multitask();
-#endif
-
block->float_children = NULL;
block->clear_level = 0;
diff --git a/riscos/gui.c b/riscos/gui.c
index 387f1be11..ee67d576a 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -1081,30 +1081,6 @@ void ro_gui_handle_event(wimp_event_no event, wimp_block *block)
/**
- * Check for important events and yield CPU (RISC OS).
- *
- * Required on RISC OS for cooperative multitasking.
- */
-
-void gui_multitask(void)
-{
- wimp_event_no event;
- wimp_block block;
-
- if (clock() < gui_last_poll + 10)
- return;
-
- xhourglass_off();
- event = wimp_poll(wimp_MASK_LOSE | wimp_MASK_GAIN | wimp_SAVE_FP,
- &block, 0);
- xhourglass_on();
- gui_last_poll = clock();
-
- ro_gui_handle_event(event, &block);
-}
-
-
-/**
* Handle Null_Reason_Code events.
*/
diff --git a/windows/gui.c b/windows/gui.c
index 0290797d4..469230188 100644
--- a/windows/gui.c
+++ b/windows/gui.c
@@ -72,11 +72,6 @@ static const char windowclassname_main[] = "nswsmainwindow";
static struct nsws_pointers nsws_pointer;
-void gui_multitask(void)
-{
-/* LOG(("gui_multitask")); */
-}
-
void gui_poll(bool active)
{
MSG Msg; /* message from system */