summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Wilson <rjw@netsurf-browser.org>2006-07-02 17:23:49 +0000
committerRichard Wilson <rjw@netsurf-browser.org>2006-07-02 17:23:49 +0000
commitdbe40cffb39f2590e98fe01a43ff118887aa7b2c (patch)
treeba936301c404dc8201def6bbb0b08b11df2d5cae
parent0f36a3e6a50513078e8bfd69fb679af5b3cfce76 (diff)
downloadnetsurf-dbe40cffb39f2590e98fe01a43ff118887aa7b2c.tar.gz
netsurf-dbe40cffb39f2590e98fe01a43ff118887aa7b2c.tar.bz2
Re-instate the knockout renderers after a nested flush(). Make so knockout rendering is always used.
svn path=/trunk/netsurf/; revision=2693
-rw-r--r--desktop/knockout.c8
-rw-r--r--desktop/options.c2
-rw-r--r--desktop/options.h1
-rw-r--r--riscos/window.c5
4 files changed, 6 insertions, 10 deletions
diff --git a/desktop/knockout.c b/desktop/knockout.c
index 56bd6cf92..6767838cc 100644
--- a/desktop/knockout.c
+++ b/desktop/knockout.c
@@ -16,7 +16,7 @@
#include "netsurf/image/bitmap.h"
#include "netsurf/utils/log.h"
-#define NDEBUG
+//#define NDEBUG
#define KNOCKOUT_ENTRIES 3072 /* 40 bytes each */
#define KNOCKOUT_BOXES 768 /* 28 bytes each */
@@ -405,6 +405,10 @@ bool knockout_plot_flush(void)
knockout_box_cur = 0;
knockout_polygon_cur = 0;
knockout_list = NULL;
+
+ /* re-instate knockout plotters if we are still active */
+ if (nested_depth > 0)
+ plot = knockout_plotters;
return success;
}
@@ -440,7 +444,7 @@ void knockout_calculate(int x0, int y0, int x1, int y1, struct knockout_box *own
if (owner) {
/* first valid element: update child reference */
owner->child = parent->next;
- /* have we deleted all children node? */
+ /* have we deleted all child nodes? */
if (!owner->child)
owner->deleted = true;
} else {
diff --git a/desktop/options.c b/desktop/options.c
index d01caad61..5eaebda9a 100644
--- a/desktop/options.c
+++ b/desktop/options.c
@@ -102,7 +102,6 @@ int option_max_fetchers_per_host = 5;
*/
int option_max_cached_fetch_handles = 6;
/** Whether to use knockout rendering */
-bool option_knockout_rendering = false;
EXTRA_OPTION_DEFINE
@@ -144,7 +143,6 @@ struct {
OPTION_INTEGER, &option_max_fetchers_per_host },
{ "max_cached_fetch_handles",
OPTION_INTEGER, &option_max_cached_fetch_handles },
- { "knockout_rendering", OPTION_BOOL, &option_knockout_rendering },
EXTRA_OPTION_TABLE
};
diff --git a/desktop/options.h b/desktop/options.h
index 08e808b99..35e1d62a9 100644
--- a/desktop/options.h
+++ b/desktop/options.h
@@ -55,7 +55,6 @@ extern char *option_ca_bundle;
extern char *option_cookie_file;
extern char *option_cookie_jar;
extern char *option_homepage_url;
-extern bool option_knockout_rendering;
/* Fetcher configuration. */
extern int option_max_fetchers;
diff --git a/riscos/window.c b/riscos/window.c
index 9b8e3ac10..0864ecf8a 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -2031,11 +2031,6 @@ bool ro_gui_window_keypress(struct gui_window *g, int key, bool toolbar)
return ro_gui_menu_handle_action(g->window,
BROWSER_SCALE_VIEW, false);
- case wimp_KEY_CONTROL + wimp_KEY_F11: /* Toggle knockout rendering */
- option_knockout_rendering = !option_knockout_rendering;
- gui_window_redraw_window(g);
- return true;
-
case wimp_KEY_SHIFT + wimp_KEY_F11: /* Toggle display of box outlines. */
html_redraw_debug = !html_redraw_debug;
gui_window_redraw_window(g);