r12480 tlsa - /trunk/netsurf/desktop/browser.h
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Jun 15 08:46:41 2011
New Revision: 12480
URL: http://source.netsurf-browser.org?rev=12480&view=rev
Log:
Delete redundant function declaration.
Modified:
trunk/netsurf/desktop/browser.h
Modified: trunk/netsurf/desktop/browser.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.h?rev=124...
==============================================================================
--- trunk/netsurf/desktop/browser.h (original)
+++ trunk/netsurf/desktop/browser.h Wed Jun 15 08:46:41 2011
@@ -243,8 +243,6 @@
unsigned utf8_len, bool last);
void browser_redraw_box(struct hlcache_handle *c, struct box *box);
-void browser_scroll_callback(void *client_data,
- struct scroll_msg_data *scroll_data);
void browser_select_menu_callback(void *client_data,
int x, int y, int width, int height);
12 years, 3 months
r12479 tlsa - /trunk/netsurf/desktop/textinput.c
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Jun 15 07:30:13 2011
New Revision: 12479
URL: http://source.netsurf-browser.org?rev=12479&view=rev
Log:
Fix paste in form inputs in iframes.
Modified:
trunk/netsurf/desktop/textinput.c
Modified: trunk/netsurf/desktop/textinput.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/textinput.c?rev=1...
==============================================================================
--- trunk/netsurf/desktop/textinput.c (original)
+++ trunk/netsurf/desktop/textinput.c Wed Jun 15 07:30:13 2011
@@ -1329,10 +1329,11 @@
bool browser_window_paste_text(struct browser_window *bw, const char *utf8,
unsigned utf8_len, bool last)
{
- if (!bw->paste_callback)
+ if (!bw->focus || !bw->focus->paste_callback)
return false;
- return bw->paste_callback(bw, utf8, utf8_len, last, bw->caret_p);
+ return bw->focus->paste_callback(bw->focus, utf8, utf8_len, last,
+ bw->focus->caret_p);
}
12 years, 3 months
r12477 tlsa - /trunk/netsurf/desktop/browser.c
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Jun 15 06:46:07 2011
New Revision: 12477
URL: http://source.netsurf-browser.org?rev=12477&view=rev
Log:
Improve scale with iframes.
Modified:
trunk/netsurf/desktop/browser.c
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=124...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Wed Jun 15 06:46:07 2011
@@ -192,8 +192,8 @@
/* offset comes from its box position in parent bw */
box_coords(bw->box, &x, &y);
- *pos_x += x;
- *pos_y += y;
+ *pos_x += x * bw->scale;
+ *pos_y += y * bw->scale;
break;
}
@@ -760,7 +760,7 @@
case BROWSER_WINDOW_IFRAME:
/* browser window is size of associated box */
box_bounds(bw->box, &rect);
- /* TODO: Handle scale */
+LOG(("SCALED: %s", scaled ? "yes" : "no"));
*width = rect.x1 - rect.x0;
*height = rect.y1 - rect.y0;
break;
@@ -1334,7 +1334,13 @@
if (c == NULL)
return;
- content_reformat(c, width / bw->scale, height / bw->scale);
+ if (bw->browser_window_type != BROWSER_WINDOW_IFRAME) {
+ /* Iframe dimensions are already scaled in parent's layout */
+ width /= bw->scale;
+ height /= bw->scale;
+ }
+
+ content_reformat(c, width, height);
}
12 years, 3 months
r12476 tlsa - /trunk/netsurf/render/layout.c
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Jun 14 16:09:38 2011
New Revision: 12476
URL: http://source.netsurf-browser.org?rev=12476&view=rev
Log:
Reformat floated iframe browser windows only after the iframe box has been linked into the box tree from the block formatting context block.
Modified:
trunk/netsurf/render/layout.c
Modified: trunk/netsurf/render/layout.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=12476...
==============================================================================
--- trunk/netsurf/render/layout.c (original)
+++ trunk/netsurf/render/layout.c Tue Jun 14 16:09:38 2011
@@ -2497,12 +2497,8 @@
if (b->height == AUTO)
b->height = 300;
- /* If the iframe's bw is in place, reformat it to the
- * new box size */
- if (b->iframe) {
- browser_window_reformat(b->iframe,
- b->width, b->height);
- }
+ /* We reformat the iframe browser window to new
+ * dimensions in pass 2 */
} else {
/* form control with no object */
if (b->width == AUTO)
@@ -2734,6 +2730,14 @@
}
b->next_float = cont->float_children;
cont->float_children = b;
+
+ /* If the iframe's bw is in place, reformat it to the
+ * new box size */
+ if (b->iframe) {
+ browser_window_reformat(b->iframe,
+ b->width, b->height);
+ }
+
split_box = 0;
}
}
12 years, 3 months
r12474 tlsa - in /trunk/netsurf: desktop/ render/
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Jun 14 15:00:18 2011
New Revision: 12474
URL: http://source.netsurf-browser.org?rev=12474&view=rev
Log:
First pass at core iframes. Currently lacking scrollbars.
Modified:
trunk/netsurf/desktop/browser.c
trunk/netsurf/desktop/browser.h
trunk/netsurf/desktop/frames.c
trunk/netsurf/desktop/search.c
trunk/netsurf/desktop/selection.c
trunk/netsurf/desktop/selection.h
trunk/netsurf/desktop/textinput.c
trunk/netsurf/render/box.c
trunk/netsurf/render/box.h
trunk/netsurf/render/box_construct.c
trunk/netsurf/render/html_interaction.c
trunk/netsurf/render/html_redraw.c
trunk/netsurf/render/layout.c
trunk/netsurf/render/textplain.c
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=124...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Tue Jun 14 15:00:18 2011
@@ -112,7 +112,8 @@
}
/* Browser window has content */
- if (plot.option_knockout)
+ if (bw->browser_window_type != BROWSER_WINDOW_IFRAME &&
+ plot.option_knockout)
knockout_plot_start(&plot);
plot.clip(clip);
@@ -133,7 +134,8 @@
plot_ok &= content_redraw(bw->current_content, x, y, width, height,
clip, bw->scale, 0xFFFFFF, false, false);
- if (plot.option_knockout)
+ if (bw->browser_window_type != BROWSER_WINDOW_IFRAME &&
+ plot.option_knockout)
knockout_plot_end();
return plot_ok;
@@ -153,8 +155,60 @@
return true;
}
-/**
- * Create and open a new browser window with the given page.
+/* exported interface, documented in browser.h */
+void browser_window_update_extent(struct browser_window *bw)
+{
+ switch (bw->browser_window_type) {
+ default:
+ /* Fall through until core frame(set)s are implemented */
+ case BROWSER_WINDOW_NORMAL:
+ gui_window_update_extent(bw->window);
+ break;
+ case BROWSER_WINDOW_IFRAME:
+ /* TODO */
+ break;
+ }
+}
+
+/* exported interface, documented in browser.h */
+void browser_window_get_position(struct browser_window *bw, bool root,
+ int *pos_x, int *pos_y)
+{
+ int x, y;
+ *pos_x = 0;
+ *pos_y = 0;
+
+ assert(bw != NULL);
+
+ while (bw) {
+ switch (bw->browser_window_type) {
+ default:
+ /* fall through to NORMAL until frame(set)s are handled
+ * in the core */
+ case BROWSER_WINDOW_NORMAL:
+ /* There is no offset to the root browser window */
+ break;
+ case BROWSER_WINDOW_IFRAME:
+ /* offset comes from its box position in parent bw */
+ box_coords(bw->box, &x, &y);
+
+ *pos_x += x;
+ *pos_y += y;
+ break;
+ }
+
+ bw = bw->parent;
+
+ if (!root) {
+ /* return if we just wanted the position in the parent
+ * browser window. */
+ return;
+ }
+ }
+}
+
+/**
+ * Create and open a new root browser window with the given page.
*
* \param url URL to start fetching in the new window (copied)
* \param clone The browser window to clone
@@ -166,6 +220,7 @@
const char *referer, bool history_add, bool new_tab)
{
struct browser_window *bw;
+ struct browser_window *top;
assert(clone || history_add);
@@ -183,10 +238,18 @@
bw->border = true;
bw->no_resize = true;
bw->last_action = wallclock();
-
- bw->window = gui_create_browser_window(bw, clone, new_tab);
+ bw->sel = selection_create();
/* gui window */
+ /* from the front end's pov, it clones the top level browser window,
+ * so find that. */
+ top = clone;
+ while (top && !top->window && top->parent) {
+ top = top->parent;
+ }
+
+ bw->window = gui_create_browser_window(bw, top, new_tab);
+
if (bw->window == NULL) {
browser_window_destroy(bw);
return NULL;
@@ -217,12 +280,14 @@
bw->history = history_clone(clone->history);
/* window characteristics */
- bw->sel = selection_create(bw);
+ bw->sel = NULL;
bw->refresh_interval = -1;
bw->reformat_pending = false;
bw->drag_type = DRAGGING_NONE;
bw->scale = (float) option_scale / 100.0;
+
+ bw->focus = NULL;
/* initialise status text cache */
bw->status_text = NULL;
@@ -534,7 +599,7 @@
bw->loading_content = NULL;
/* Format the new content to the correct dimensions */
- gui_window_get_dimensions(bw->window, &width, &height, true);
+ browser_window_get_dimensions(bw, &width, &height, true);
content_reformat(c, width, height);
browser_window_remove_caret(bw);
@@ -568,9 +633,11 @@
}
/* favicon preload */
- if (content_get_type(c) == CONTENT_HTML)
+ if (bw->browser_window_type == BROWSER_WINDOW_NORMAL &&
+ content_get_type(c) == CONTENT_HTML) {
gui_window_set_icon(bw->window,
- html_get_favicon(bw->current_content));
+ html_get_favicon(bw->current_content));
+ }
/* text selection */
if (content_get_type(c) == CONTENT_HTML)
@@ -651,7 +718,7 @@
break;
case CONTENT_MSG_REDRAW:
- gui_window_update_box(bw->window, &event->data);
+ browser_window_update_box(bw, &event->data);
break;
case CONTENT_MSG_REFRESH:
@@ -660,7 +727,10 @@
case CONTENT_MSG_FAVICON_REFRESH:
/* Cause the GUI to update */
- gui_window_set_icon(bw->window, html_get_favicon(bw->current_content));
+ if (bw->browser_window_type == BROWSER_WINDOW_NORMAL) {
+ gui_window_set_icon(bw->window,
+ html_get_favicon(bw->current_content));
+ }
break;
default:
@@ -668,6 +738,41 @@
}
return NSERROR_OK;
+}
+
+
+/*
+ * Get the dimensions of the area a browser window occupies
+ *
+ * \param bw The browser window to get dimensions of
+ * \param width Updated to the browser window viewport width
+ * \param height Updated to the browser window viewport height
+ * \param scaled Whether we want the height with scale applied
+ */
+
+void browser_window_get_dimensions(struct browser_window *bw,
+ int *width, int *height, bool scaled)
+{
+ struct rect rect;
+
+ switch (bw->browser_window_type) {
+ case BROWSER_WINDOW_IFRAME:
+ /* browser window is size of associated box */
+ box_bounds(bw->box, &rect);
+ /* TODO: Handle scale */
+ *width = rect.x1 - rect.x0;
+ *height = rect.y1 - rect.y0;
+ break;
+
+ case BROWSER_WINDOW_FRAME:
+ case BROWSER_WINDOW_FRAMESET:
+ case BROWSER_WINDOW_NORMAL:
+ /* root window (or frame(set), currently); browser window is
+ * size of gui window viewport */
+ assert(bw->window);
+ gui_window_get_dimensions(bw->window, width, height, scaled);
+ break;
+ }
}
@@ -833,22 +938,75 @@
if (bw->current_content == NULL)
return;
- gui_window_set_title(bw->window,
- content_get_title(bw->current_content));
-
- gui_window_update_extent(bw->window);
-
- if (scroll_to_top)
- gui_window_set_scroll(bw->window, 0, 0);
-
- /** \todo don't do this if the user has scrolled */
- /* if frag_id exists, then try to scroll to it */
- if (bw->frag_id && html_get_id_offset(bw->current_content, bw->frag_id,
- &x, &y)) {
- gui_window_set_scroll(bw->window, x, y);
- }
-
- gui_window_redraw_window(bw->window);
+ switch (bw->browser_window_type) {
+ default:
+ /* Fall through to normal
+ * (frame(set)s aren't handled by the core yet) */
+ case BROWSER_WINDOW_NORMAL:
+ /* Root browser window, constituting a front end window/tab */
+ gui_window_set_title(bw->window,
+ content_get_title(bw->current_content));
+
+ browser_window_update_extent(bw);
+
+ if (scroll_to_top)
+ gui_window_set_scroll(bw->window, 0, 0);
+
+ /* if frag_id exists, then try to scroll to it */
+ /** \TODO don't do this if the user has scrolled */
+ if (bw->frag_id && html_get_id_offset(bw->current_content,
+ bw->frag_id, &x, &y)) {
+ gui_window_set_scroll(bw->window, x, y);
+ }
+
+ gui_window_redraw_window(bw->window);
+
+ break;
+ case BROWSER_WINDOW_IFRAME:
+ /* Internal iframe browser window */
+
+ /** \TODO handle scrollbar extents, scroll offset */
+
+ html_redraw_a_box(bw->parent->current_content, bw->box);
+ break;
+ }
+}
+
+
+void browser_window_update_box(struct browser_window *bw,
+ const union content_msg_data *data)
+{
+ int pos_x;
+ int pos_y;
+ union content_msg_data data_copy = *data;
+ struct browser_window *top;
+
+ switch (bw->browser_window_type) {
+ default:
+ /* fall through for frame(set)s,
+ * until they are handled by core */
+ case BROWSER_WINDOW_NORMAL:
+ gui_window_update_box(bw->window, data);
+ break;
+
+ case BROWSER_WINDOW_IFRAME:
+ browser_window_get_position(bw, true, &pos_x, &pos_y);
+
+ top = bw;
+ while (top && !top->window && top->parent) {
+ top = top->parent;
+ }
+
+ /* TODO: update gui_window_update_box so it takes a struct rect
+ * instead of msg data. */
+ data_copy.redraw.x += pos_x;
+ data_copy.redraw.y += pos_y;
+ data_copy.redraw.object_x += pos_x;
+ data_copy.redraw.object_y += pos_y;
+
+ gui_window_update_box(top->window, &data_copy);
+ break;
+ }
}
@@ -993,9 +1151,19 @@
* \param shape shape to use
*/
-void browser_window_set_pointer(struct gui_window *g, gui_pointer_shape shape)
-{
- gui_window_set_pointer(g, shape);
+void browser_window_set_pointer(struct browser_window *bw,
+ gui_pointer_shape shape)
+{
+ struct browser_window *root = bw;
+
+ while (root && !root->window && root->parent) {
+ root = root->parent;
+ }
+
+ assert(root);
+ assert(root->window);
+
+ gui_window_set_pointer(root->window, shape);
}
@@ -1061,12 +1229,27 @@
schedule_remove(browser_window_refresh, bw);
+ /* If this brower window is not the root window, and has focus, unset
+ * the root browser window's focus pointer. */
+ if (!bw->window) {
+ struct browser_window *top = bw;
+
+ while (top && !top->window && top->parent)
+ top = top->parent;
+
+ if (top->focus == bw)
+ top->focus = NULL;
+ }
+
/* Destruction order is important: we must ensure that the frontend
* destroys any window(s) associated with this browser window before
* we attempt any destructive cleanup.
*/
- gui_window_destroy(bw->window);
+ if (bw->window) {
+ /* Only the root window has a GUI window */
+ gui_window_destroy(bw->window);
+ }
if (bw->loading_content != NULL) {
hlcache_handle_release(bw->loading_content);
@@ -1083,8 +1266,18 @@
bw->current_content = NULL;
}
+ if (bw->box != NULL) {
+ bw->box->iframe = NULL;
+ bw->box = NULL;
+ }
+
+ /* TODO: After core FRAMES are done, should be
+ * if (bw->browser_window_type == BROWSER_WINDOW_NORMAL) */
+ if (bw->browser_window_type != BROWSER_WINDOW_IFRAME) {
+ selection_destroy(bw->sel);
+ }
+
/* These simply free memory, so are safe here */
- selection_destroy(bw->sel);
history_destroy(bw->history);
free(bw->name);
@@ -1211,6 +1404,11 @@
assert(url);
bw->visible_select_menu = NULL;
+
+ if (bw->parent != NULL) {
+ /* Not root window; don't set a URL in GUI URL bar */
+ return;
+ }
if (frag == NULL) {
/* With no fragment, we may as well pass url straight through
@@ -1425,6 +1623,10 @@
browser_window_mouse_drag_end(bw, mouse, x, y);
}
+ if (bw->drag_type != DRAGGING_NONE) {
+ selection_set_browser_window(bw->sel, bw);
+ }
+
if (bw->drag_type == DRAGGING_FRAME) {
browser_window_resize_frame(bw, bw->x0 + x, bw->y0 + y);
} else if (bw->drag_type == DRAGGING_PAGE_SCROLL) {
@@ -1439,7 +1641,17 @@
bw->drag_start_scroll_x = scrollx;
bw->drag_start_scroll_y = scrolly;
- gui_window_set_scroll(bw->window, scrollx, scrolly);
+ switch (bw->browser_window_type) {
+ default:
+ /* Fall through to normal, until frame(set)s are
+ * handled in the core */
+ case BROWSER_WINDOW_NORMAL:
+ gui_window_set_scroll(bw->window, scrollx, scrolly);
+ break;
+ case BROWSER_WINDOW_IFRAME:
+ /* TODO */
+ break;
+ }
} else {
assert(c != NULL);
content_mouse_track(c, bw, mouse, x, y);
@@ -1460,9 +1672,18 @@
browser_mouse_state mouse, int x, int y)
{
hlcache_handle *c = bw->current_content;
+ struct browser_window *top;
if (!c)
return;
+
+ /* Set focus browser window */
+ top = bw;
+ while (top && !top->window && top->parent)
+ top = top->parent;
+ top->focus = bw;
+
+ selection_set_browser_window(bw->sel, bw);
switch (content_get_type(c)) {
case CONTENT_HTML:
@@ -1481,7 +1702,7 @@
else if (mouse & (BROWSER_MOUSE_DRAG_1 |
BROWSER_MOUSE_DRAG_2)) {
browser_window_page_drag_start(bw, x, y);
- browser_window_set_pointer(bw->window, GUI_POINTER_MOVE);
+ browser_window_set_pointer(bw, GUI_POINTER_MOVE);
}
break;
}
@@ -1495,9 +1716,9 @@
* \param mouse state of mouse buttons and modifier keys
* \param x coordinate of mouse
* \param y coordinate of mouse
- */
-
-// TODO: MOVE content specific stuff out
+ *
+ * TODO: MOVE content specific stuff out
+ */
void browser_window_mouse_drag_end(struct browser_window *bw,
browser_mouse_state mouse, int x, int y)
@@ -1581,10 +1802,19 @@
bw->drag_start_x = x;
bw->drag_start_y = y;
- gui_window_get_scroll(bw->window, &bw->drag_start_scroll_x,
- &bw->drag_start_scroll_y);
-
- gui_window_scroll_start(bw->window);
+ switch (bw->browser_window_type) {
+ default:
+ /* fall through until frame(set)s are handled in core */
+ case BROWSER_WINDOW_NORMAL:
+ gui_window_get_scroll(bw->window, &bw->drag_start_scroll_x,
+ &bw->drag_start_scroll_y);
+
+ gui_window_scroll_start(bw->window);
+ break;
+ case BROWSER_WINDOW_IFRAME:
+ /* TODO */
+ break;
+ }
}
Modified: trunk/netsurf/desktop/browser.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.h?rev=124...
==============================================================================
--- trunk/netsurf/desktop/browser.h (original)
+++ trunk/netsurf/desktop/browser.h Tue Jun 14 15:00:18 2011
@@ -28,6 +28,7 @@
#include <stdbool.h>
#include <time.h>
+#include "content/content.h"
#include "desktop/gui.h"
#include "desktop/mouse.h"
#include "desktop/shape.h"
@@ -168,6 +169,9 @@
/** [iframe_count] iframes */
int iframe_count;
struct browser_window *iframes;
+
+ /** browser window child of root browser window which has input focus */
+ struct browser_window *focus;
/** Last time a link was followed in this window */
unsigned int last_action;
@@ -207,9 +211,13 @@
void browser_window_go_unverifiable(struct browser_window *bw,
const char *url, const char *referrer, bool history_add,
struct hlcache_handle *parent);
+void browser_window_get_dimensions(struct browser_window *bw,
+ int *width, int *height, bool scaled);
void browser_window_download(struct browser_window *bw,
const char *url, const char *referrer);
void browser_window_update(struct browser_window *bw, bool scroll_to_top);
+void browser_window_update_box(struct browser_window *bw,
+ const union content_msg_data *data);
void browser_window_stop(struct browser_window *bw);
void browser_window_reload(struct browser_window *bw, bool all);
void browser_window_destroy(struct browser_window *bw);
@@ -244,7 +252,8 @@
int width, int height);
void browser_window_set_status(struct browser_window *bw, const char *text);
-void browser_window_set_pointer(struct gui_window *g, gui_pointer_shape shape);
+void browser_window_set_pointer(struct browser_window *bw,
+ gui_pointer_shape shape);
void browser_window_page_drag_start(struct browser_window *bw, int x, int y);
bool browser_window_back_available(struct browser_window *bw);
@@ -283,6 +292,27 @@
*/
bool browser_window_redraw_ready(struct browser_window *bw);
+/*
+ * Update the extent of the inside of a browser window to that of the current
+ * content
+ *
+ * \param bw browser_window to update the extent of
+ */
+void browser_window_update_extent(struct browser_window *bw);
+
+/*
+ * Get the position of the current browser window with respect to the root or
+ * parent browser window
+ *
+ * \param bw browser window to get the position of
+ * \param root true if we want position wrt root bw, false if wrt parent bw
+ * \param pos_x updated to x position of bw
+ * \param pos_y updated to y position of bw
+ */
+void browser_window_get_position(struct browser_window *bw, bool root,
+ int *pos_x, int *pos_y);
+
+
/* In platform specific hotlist.c. */
void hotlist_visited(struct hlcache_handle *c);
Modified: trunk/netsurf/desktop/frames.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/frames.c?rev=1247...
==============================================================================
--- trunk/netsurf/desktop/frames.c (original)
+++ trunk/netsurf/desktop/frames.c Tue Jun 14 15:00:18 2011
@@ -83,6 +83,7 @@
window->no_resize = true;
window->margin_width = cur->margin_width;
window->margin_height = cur->margin_height;
+ window->sel = bw->sel;
if (cur->name) {
window->name = strdup(cur->name);
if (!window->name)
@@ -92,22 +93,22 @@
/* linking */
window->box = cur->box;
window->parent = bw;
-
- /* gui window */
- window->window = gui_create_browser_window(window, bw, false);
+ window->box->iframe = window;
}
/* calculate dimensions */
- gui_window_update_extent(bw->window);
+ browser_window_update_extent(bw);
browser_window_recalculate_iframes(bw);
index = 0;
for (cur = iframe; cur; cur = cur->next) {
window = &(bw->iframes[index++]);
- if (cur->url)
+ if (cur->url) {
+ /* fetch iframe's content */
browser_window_go_unverifiable(window, cur->url,
content_get_url(bw->current_content),
false, bw->current_content);
+ }
}
}
@@ -118,36 +119,10 @@
* \param bw The browser window to reposition iframes for
*/
-void browser_window_recalculate_iframes(struct browser_window *bw) {
- struct browser_window *window;
- struct rect rect;
- int index;
-
-#ifdef nsamiga
- /* In the Amiga frontend we can switch off IFrames because they
- * turn into pop-up hell due to broken frames implementation.
- * This stops NetSurf asserting in this specific instance.
- */
- if(bw && bw->window == NULL) return;
-#endif
-
- assert(bw != NULL);
- assert(bw->window != NULL);
-
- /* update window dimensions */
- for (index = 0; index < bw->iframe_count; index++) {
- window = &(bw->iframes[index]);
-
- if ((window != NULL) && (window->box != NULL)) {
- box_bounds(window->box, &rect);
- gui_window_position_frame(window->window,
- rect.x0, rect.y0,
- rect.x1, rect.y1);
- } else {
- LOG(("Bad IFrame window=%p, box=%p", window,
- window != NULL ? window->box : NULL));
- }
- }
+void browser_window_recalculate_iframes(struct browser_window *bw)
+{
+ /* TODO: decide if this is still needed after scrollbars are
+ * implemented */
}
@@ -206,6 +181,10 @@
warn_user("NoMemory", 0);
}
+ /* TODO: when framesets are handled in the core, remove
+ * the following line. */
+ window->sel = selection_create();
+
/* linking */
window->parent = bw;
@@ -220,7 +199,7 @@
}
/* 2. Calculate dimensions */
- gui_window_update_extent(bw->window);
+ browser_window_update_extent(bw);
browser_window_recalculate_frameset(bw);
/* 3. Recurse for grandchildren */
Modified: trunk/netsurf/desktop/search.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/search.c?rev=1247...
==============================================================================
--- trunk/netsurf/desktop/search.c (original)
+++ trunk/netsurf/desktop/search.c Tue Jun 14 15:00:18 2011
@@ -644,7 +644,8 @@
}
}
if (add && !a->sel) {
- a->sel = selection_create(context->bw);
+ a->sel = selection_create();
+ selection_set_browser_window(a->sel, context->bw);
if (a->sel) {
hlcache_handle *c = context->bw->
current_content;
Modified: trunk/netsurf/desktop/selection.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/selection.c?rev=1...
==============================================================================
--- trunk/netsurf/desktop/selection.c (original)
+++ trunk/netsurf/desktop/selection.c Tue Jun 14 15:00:18 2011
@@ -90,14 +90,30 @@
/**
* Creates a new selection object associated with a browser window.
*
+ * \param s selection object
* \param bw browser window
*/
-struct selection *selection_create(struct browser_window *bw)
+void selection_set_browser_window(struct selection *s,
+ struct browser_window *bw)
+{
+ assert(s);
+
+ s->bw = bw;
+}
+
+/**
+ * Set the browser window that contains the selection within a selection
+ * object.
+ *
+ * \param bw browser window
+ */
+
+struct selection *selection_create(void)
{
struct selection *s = calloc(1, sizeof(struct selection));
if (s) {
- s->bw = bw;
+ s->bw = NULL;
s->root = NULL;
s->drag_state = DRAG_NONE;
selection_clear(s, false);
@@ -116,7 +132,8 @@
void selection_destroy(struct selection *s)
{
- free(s);
+ if (s != NULL)
+ free(s);
}
@@ -260,6 +277,7 @@
browser_mouse_state modkeys =
(mouse & (BROWSER_MOUSE_MOD_1 | BROWSER_MOUSE_MOD_2));
int pos = -1; /* 0 = inside selection, 1 = after it */
+ struct browser_window *bw;
if (!SAME_SPACE(s, idx))
return false; /* not our problem */
@@ -278,7 +296,12 @@
(modkeys && (mouse & BROWSER_MOUSE_DRAG_2)))) {
/* drag-saving selection */
assert(s->bw);
- gui_drag_save_selection(s, s->bw->window);
+
+ bw = s->bw;
+ while (bw && !bw->window && bw->parent)
+ bw = bw->parent;
+
+ gui_drag_save_selection(s, bw->window);
}
else if (!modkeys) {
if (pos && (mouse & BROWSER_MOUSE_PRESS_1))
@@ -294,7 +317,11 @@
s->drag_state = DRAG_END;
- gui_start_selection(s->bw->window);
+ bw = s->bw;
+ while (bw && !bw->window && bw->parent)
+ bw = bw->parent;
+
+ gui_start_selection(bw->window);
}
else if (mouse & BROWSER_MOUSE_DRAG_2) {
@@ -312,7 +339,12 @@
s->drag_state = DRAG_START;
}
- gui_start_selection(s->bw->window);
+
+ bw = s->bw;
+ while (bw && !bw->window && bw->parent)
+ bw = bw->parent;
+
+ gui_start_selection(bw->window);
}
/* Selection should be cleared when button is released but in
* the RO interface click is the same as press */
@@ -675,10 +707,11 @@
rdw.inited = true;
}
}
+ LOG(("browser window type: %s", s->bw->browser_window_type == BROWSER_WINDOW_NORMAL ? "NORMAL" : "IFRAME"));
if (rdw.inited)
browser_window_redraw_rect(s->bw, rdw.r.x0, rdw.r.y0,
- rdw.r.x1 - rdw.r.x0, rdw.r.y1 - rdw.r.y0);
+ rdw.r.x1 - rdw.r.x0, rdw.r.y1 - rdw.r.y0);
}
@@ -694,6 +727,7 @@
{
int old_start, old_end;
bool was_defined;
+ struct browser_window *bw;
assert(s);
was_defined = selection_defined(s);
@@ -704,7 +738,14 @@
s->start_idx = 0;
s->end_idx = 0;
- gui_clear_selection(s->bw->window);
+ if (!s->bw)
+ return;
+
+ bw = s->bw;
+ while (bw && !bw->window && bw->parent)
+ bw = bw->parent;
+
+ gui_clear_selection(bw->window);
if (redraw && was_defined)
selection_redraw(s, old_start, old_end);
Modified: trunk/netsurf/desktop/selection.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/selection.h?rev=1...
==============================================================================
--- trunk/netsurf/desktop/selection.h (original)
+++ trunk/netsurf/desktop/selection.h Tue Jun 14 15:00:18 2011
@@ -59,11 +59,14 @@
size_t whitespace_length);
-struct selection *selection_create(struct browser_window *bw);
+struct selection *selection_create(void);
void selection_destroy(struct selection *s);
void selection_init(struct selection *s, struct box *root);
void selection_reinit(struct selection *s, struct box *root);
+
+void selection_set_browser_window(struct selection *s,
+ struct browser_window *bw);
/* struct box *selection_root(struct selection *s); */
#define selection_root(s) ((s)->root)
Modified: trunk/netsurf/desktop/textinput.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/textinput.c?rev=1...
==============================================================================
--- trunk/netsurf/desktop/textinput.c (original)
+++ trunk/netsurf/desktop/textinput.c Tue Jun 14 15:00:18 2011
@@ -1173,7 +1173,29 @@
browser_move_callback move_cb,
void *p)
{
- gui_window_place_caret(bw->window, x, y, height);
+ struct browser_window *root_bw;
+ int pos_x = 0;
+ int pos_y = 0;
+
+ /* Find top level browser window */
+ root_bw = bw;
+ while (root_bw && !root_bw->window && root_bw->parent) {
+ switch (root_bw->browser_window_type) {
+ default:
+ /* TODO: Frame(set)s */
+ case BROWSER_WINDOW_NORMAL:
+ break;
+ case BROWSER_WINDOW_IFRAME:
+ box_coords(root_bw->box, &pos_x, &pos_y);
+ x += pos_x;
+ y += pos_y;
+ break;
+ }
+
+ root_bw = root_bw->parent;
+ }
+
+ gui_window_place_caret(root_bw->window, x, y, height);
bw->caret_callback = caret_cb;
bw->paste_callback = paste_cb;
bw->move_callback = move_cb;
@@ -1188,7 +1210,16 @@
*/
void browser_window_remove_caret(struct browser_window *bw)
{
- gui_window_remove_caret(bw->window);
+ struct browser_window *root_bw;
+
+ /* Find top level browser window */
+ root_bw = bw;
+ while (root_bw && !root_bw->window && root_bw->parent) {
+ root_bw = root_bw->parent;
+ }
+
+ gui_window_remove_caret(root_bw->window);
+
bw->caret_callback = NULL;
bw->paste_callback = NULL;
bw->move_callback = NULL;
@@ -1245,29 +1276,31 @@
/**
* Handle key presses in a browser window.
*
- * \param bw The browser window with input focus
+ * \param bw The root browser window
* \param key The UCS4 character codepoint
* \return true if key handled, false otherwise
*/
bool browser_window_key_press(struct browser_window *bw, uint32_t key)
{
+ struct browser_window *focus = bw->focus;
+
/* keys that take effect wherever the caret is positioned */
switch (key) {
case KEY_SELECT_ALL:
- selection_select_all(bw->sel);
+ selection_select_all(focus->sel);
return true;
case KEY_COPY_SELECTION:
- gui_copy_to_clipboard(bw->sel);
+ gui_copy_to_clipboard(focus->sel);
return true;
case KEY_CLEAR_SELECTION:
- selection_clear(bw->sel, true);
+ selection_clear(focus->sel, true);
return true;
case KEY_ESCAPE:
- if (selection_defined(bw->sel)) {
- selection_clear(bw->sel, true);
+ if (selection_defined(focus->sel)) {
+ selection_clear(focus->sel, true);
return true;
}
/* if there's no selection,
@@ -1276,10 +1309,10 @@
}
/* pass on to the appropriate field */
- if (!bw->caret_callback)
+ if (!focus->caret_callback)
return false;
- return bw->caret_callback(bw, key, bw->caret_p);
+ return focus->caret_callback(focus, key, focus->caret_p);
}
Modified: trunk/netsurf/render/box.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/box.c?rev=12474&r1...
==============================================================================
--- trunk/netsurf/render/box.c (original)
+++ trunk/netsurf/render/box.c Tue Jun 14 15:00:18 2011
@@ -165,6 +165,7 @@
box->background = NULL;
box->object = NULL;
box->object_params = NULL;
+ box->iframe = NULL;
return box;
}
@@ -931,6 +932,9 @@
if (box->object) {
fprintf(stream, "(object '%s') ",
content_get_url(box->object));
+ }
+ if (box->iframe) {
+ fprintf(stream, "(iframe) ");
}
if (box->gadget)
fprintf(stream, "(gadget) ");
Modified: trunk/netsurf/render/box.h
URL: http://source.netsurf-browser.org/trunk/netsurf/render/box.h?rev=12474&r1...
==============================================================================
--- trunk/netsurf/render/box.h (original)
+++ trunk/netsurf/render/box.h Tue Jun 14 15:00:18 2011
@@ -127,7 +127,8 @@
HAS_HEIGHT = 1 << 6, /* box has height (perhaps due to children) */
MAKE_HEIGHT = 1 << 7, /* box causes its own height */
NEED_MIN = 1 << 8, /* minimum width is required for layout */
- REPLACE_DIM = 1 << 9 /* replaced element has given dimensions */
+ REPLACE_DIM = 1 << 9, /* replaced element has given dimensions */
+ IFRAME = 1 << 10 /* box contains an iframe */
} box_flags;
/* Sides of a box */
@@ -257,6 +258,9 @@
struct hlcache_handle* object;
/** Parameters for the object, or 0. */
struct object_params *object_params;
+
+ /** Iframe's browser_window, or NULL if none */
+ struct browser_window *iframe;
};
/** Table column data. */
Modified: trunk/netsurf/render/box_construct.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/box_construct.c?re...
==============================================================================
--- trunk/netsurf/render/box_construct.c (original)
+++ trunk/netsurf/render/box_construct.c Tue Jun 14 15:00:18 2011
@@ -1631,8 +1631,8 @@
free(url);
/* box */
- box->type = BOX_INLINE_BLOCK;
assert(box->style);
+ box->flags |= IFRAME;
/* Showing iframe, so don't show alternate content */
if (convert_children)
Modified: trunk/netsurf/render/html_interaction.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html_interaction.c...
==============================================================================
--- trunk/netsurf/render/html_interaction.c (original)
+++ trunk/netsurf/render/html_interaction.c Tue Jun 14 15:00:18 2011
@@ -135,6 +135,7 @@
hlcache_handle *gadget_content = h;
struct form_control *gadget = 0;
hlcache_handle *object = NULL;
+ struct browser_window *iframe = NULL;
struct box *next_box;
struct box *drag_candidate = NULL;
struct scrollbar *scrollbar = NULL;
@@ -213,6 +214,9 @@
if (box->object)
object = box->object;
+
+ if (box->iframe)
+ iframe = box->iframe;
if (box->href) {
url = box->href;
@@ -464,6 +468,18 @@
/* \todo should have a drag-saving object msg */
status = content_get_status_message(h);
+ } else if (iframe) {
+ int pos_x, pos_y;
+ browser_window_get_position(iframe, false, &pos_x, &pos_y);
+
+ if (mouse & BROWSER_MOUSE_CLICK_1 ||
+ mouse & BROWSER_MOUSE_CLICK_2) {
+ browser_window_mouse_click(iframe, mouse,
+ x - pos_x, y - pos_y);
+ } else {
+ browser_window_mouse_track(iframe, mouse,
+ x - pos_x, y - pos_y);
+ }
} else if (url) {
if (title) {
snprintf(status_buffer, sizeof status_buffer, "%s: %s",
@@ -601,7 +617,8 @@
if (status != NULL)
browser_window_set_status(bw, status);
- browser_window_set_pointer(bw->window, pointer);
+ if (!iframe)
+ browser_window_set_pointer(bw, pointer);
/* deferred actions that can cause this browser_window to be destroyed
* and must therefore be done after set_status/pointer
@@ -778,8 +795,7 @@
case SCROLLBAR_MSG_SCROLL_FINISHED:
bw->scrollbar = NULL;
- browser_window_set_pointer(bw->window,
- GUI_POINTER_DEFAULT);
+ browser_window_set_pointer(bw, GUI_POINTER_DEFAULT);
break;
}
}
Modified: trunk/netsurf/render/html_redraw.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html_redraw.c?rev=...
==============================================================================
--- trunk/netsurf/render/html_redraw.c (original)
+++ trunk/netsurf/render/html_redraw.c Tue Jun 14 15:00:18 2011
@@ -430,7 +430,7 @@
bg_box->type != BOX_TEXT &&
bg_box->type != BOX_INLINE_END &&
(bg_box->type != BOX_INLINE || bg_box->object ||
- box->flags & REPLACE_DIM)) {
+ bg_box->flags & IFRAME || box->flags & REPLACE_DIM)) {
/* find intersection of clip box and border edge */
struct rect p;
p.x0 = x - border_left < r.x0 ? r.x0 : x - border_left;
@@ -475,7 +475,7 @@
if (box->style && box->type != BOX_TEXT &&
box->type != BOX_INLINE_END &&
(box->type != BOX_INLINE || box->object ||
- box->flags & REPLACE_DIM) &&
+ box->flags & IFRAME || box->flags & REPLACE_DIM) &&
(border_top || border_right ||
border_bottom || border_left)) {
if (!html_redraw_borders(box, x_parent, y_parent,
@@ -622,8 +622,9 @@
/* clip to the padding edge for objects, or boxes with overflow hidden
* or scroll */
- if (box->object || (box->style && css_computed_overflow(box->style) !=
- CSS_OVERFLOW_VISIBLE)) {
+ if ((box->style && css_computed_overflow(box->style) !=
+ CSS_OVERFLOW_VISIBLE) || box->object ||
+ box->flags & IFRAME) {
r.x0 = x;
r.y0 = y;
r.x1 = x + padding_width;
@@ -659,6 +660,10 @@
current_background_color,
false, false))
return false;
+
+ } else if (box->flags & IFRAME) {
+ browser_window_redraw(box->iframe,
+ x + padding_left, y + padding_top, &r);
} else if (box->gadget && box->gadget->type == GADGET_CHECKBOX) {
if (!html_redraw_checkbox(x + padding_left, y + padding_top,
Modified: trunk/netsurf/render/layout.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=12474...
==============================================================================
--- trunk/netsurf/render/layout.c (original)
+++ trunk/netsurf/render/layout.c Tue Jun 14 15:00:18 2011
@@ -273,6 +273,12 @@
return true;
}
+ /* special case if the block contains an iframe */
+ if (block->iframe) {
+ browser_window_reformat(block->iframe, block->width,
+ block->height == AUTO ? 0 : block->height);
+ }
+
/* special case if the block contains an radio button or checkbox */
if (block->gadget && (block->gadget->type == GADGET_RADIO ||
block->gadget->type == GADGET_CHECKBOX)) {
@@ -360,8 +366,10 @@
* left and right margins to avoid any floats. */
lm = rm = 0;
- if (box->type == BOX_BLOCK || box->object) {
- if (!box->object && !(box->flags & REPLACE_DIM) &&
+ if (box->type == BOX_BLOCK || box->object ||
+ box->flags & IFRAME) {
+ if (!box->object && !(box->flags & IFRAME) &&
+ !(box->flags & REPLACE_DIM) &&
box->style &&
css_computed_overflow(box->style) !=
CSS_OVERFLOW_VISIBLE) {
@@ -388,7 +396,7 @@
}
layout_block_find_dimensions(box->parent->width,
viewport_height, lm, rm, box);
- if (box->type == BOX_BLOCK) {
+ if (box->type == BOX_BLOCK && !(box->flags & IFRAME)) {
layout_block_add_scrollbar(box, RIGHT);
layout_block_add_scrollbar(box, BOTTOM);
}
@@ -503,11 +511,18 @@
if (box->object) {
if (!layout_block_object(box))
return false;
+
+ } else if (box->iframe) {
+ browser_window_reformat(box->iframe, box->width,
+ box->height == AUTO ?
+ 0 : box->height);
+
} else if (box->type == BOX_INLINE_CONTAINER) {
box->width = box->parent->width;
if (!layout_inline_container(box, box->width, block,
cx, cy, content))
return false;
+
} else if (box->type == BOX_TABLE) {
/* Move down to avoid floats if necessary. */
int x0, x1;
@@ -549,7 +564,8 @@
}
/* Advance to next box. */
- if (box->type == BOX_BLOCK && !box->object && box->children) {
+ if (box->type == BOX_BLOCK && !box->object && !(box->iframe) &&
+ box->children) {
/* Down into children. */
if (box == margin_collapse) {
@@ -563,7 +579,8 @@
box->y = y;
cy += y;
continue;
- } else if (box->type == BOX_BLOCK || box->object)
+ } else if (box->type == BOX_BLOCK || box->object ||
+ box->flags & IFRAME)
cy += box->padding[TOP];
if (box->type == BOX_BLOCK && box->height == AUTO) {
@@ -776,6 +793,10 @@
min = max = content_get_width(block->object);
}
+ block->flags |= HAS_HEIGHT;
+ } else if (block->flags & IFRAME) {
+ /** TODO: do we need to know the min/max width of the iframe's
+ * content? */
block->flags |= HAS_HEIGHT;
} else {
/* recurse through children */
@@ -2016,8 +2037,9 @@
whitespace == CSS_WHITE_SPACE_PRE_WRAP);
}
- if ((!c->object && !(c->flags & REPLACE_DIM) && c->text &&
- (c->length || is_pre)) ||
+ if ((!c->object && !(c->flags & REPLACE_DIM) &&
+ !(c->flags & IFRAME) &&
+ c->text && (c->length || is_pre)) ||
c->type == BOX_BR)
has_text_children = true;
}
@@ -2369,7 +2391,7 @@
continue;
}
- if (!b->object && !b->gadget &&
+ if (!b->object && !(b->flags & IFRAME) && !b->gadget &&
!(b->flags & REPLACE_DIM)) {
/* inline non-replaced, 10.3.1 and 10.6.1 */
b->height = line_height(b->style ? b->style :
@@ -2468,6 +2490,19 @@
if (b->object && !(b->flags & REPLACE_DIM)) {
layout_get_object_dimensions(b, &b->width, &b->height,
true, true);
+ } else if (b->flags & IFRAME) {
+ /* TODO: should we look at the content dimensions? */
+ if (b->width == AUTO)
+ b->width = 400;
+ if (b->height == AUTO)
+ b->height = 300;
+
+ /* If the iframe's bw is in place, reformat it to the
+ * new box size */
+ if (b->iframe) {
+ browser_window_reformat(b->iframe,
+ b->width, b->height);
+ }
} else {
/* form control with no object */
if (b->width == AUTO)
@@ -2478,6 +2513,7 @@
CSS_UNIT_EM, b->style));
}
+ /* Reformat object to new box size */
if (b->object && content_get_type(b->object) == CONTENT_HTML &&
b->width !=
content_get_available_width(b->object)) {
@@ -2558,7 +2594,8 @@
}
space_before = space_after;
- if (b->object || b->flags & REPLACE_DIM)
+ if (b->object || b->flags & REPLACE_DIM ||
+ b->flags & IFRAME)
space_after = 0;
else if (b->text || b->type == BOX_INLINE_END) {
if (b->space == UNKNOWN_WIDTH) {
@@ -2713,6 +2750,7 @@
split_box->type == BOX_TEXT) &&
!split_box->object &&
!(split_box->flags & REPLACE_DIM) &&
+ !(split_box->flags & IFRAME) &&
!split_box->gadget && split_box->text) {
/* skip leading spaces, otherwise code gets fooled into
* thinking it's all one long word */
@@ -2867,6 +2905,7 @@
continue;
} else if ((d->type == BOX_INLINE &&
((d->object || d->gadget) == false) &&
+ !(d->flags & IFRAME) &&
!(d->flags & REPLACE_DIM)) ||
d->type == BOX_BR ||
d->type == BOX_TEXT ||
@@ -3022,7 +3061,8 @@
font_plot_style_from_css(b->style, &fstyle);
if (b->type == BOX_INLINE && !b->object &&
- !(b->flags & REPLACE_DIM)) {
+ !(b->flags & REPLACE_DIM) &&
+ !(b->flags & IFRAME)) {
fixed = frac = 0;
calculate_mbp_width(b->style, LEFT, true, true, true,
&fixed, &frac);
@@ -3050,7 +3090,7 @@
continue;
}
- if (!b->object && !b->gadget &&
+ if (!b->object && !(b->flags & IFRAME) && !b->gadget &&
!(b->flags & REPLACE_DIM)) {
/* inline non-replaced, 10.3.1 and 10.6.1 */
if (!b->text)
@@ -3157,6 +3197,15 @@
true, false);
}
+ fixed = frac = 0;
+ calculate_mbp_width(b->style, LEFT, true, true, true,
+ &fixed, &frac);
+ calculate_mbp_width(b->style, RIGHT, true, true, true,
+ &fixed, &frac);
+
+ if (0 < width + fixed)
+ width += fixed;
+ } else if (b->flags & IFRAME) {
fixed = frac = 0;
calculate_mbp_width(b->style, LEFT, true, true, true,
&fixed, &frac);
@@ -4668,7 +4717,7 @@
box->height = height;
if (box->type == BOX_BLOCK || box->type == BOX_INLINE_BLOCK ||
- box->object) {
+ box->object || box->flags & IFRAME) {
if (!layout_block_context(box, -1, content))
return false;
} else if (box->type == BOX_TABLE) {
Modified: trunk/netsurf/render/textplain.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/textplain.c?rev=12...
==============================================================================
--- trunk/netsurf/render/textplain.c (original)
+++ trunk/netsurf/render/textplain.c Tue Jun 14 15:00:18 2011
@@ -661,7 +661,7 @@
if (status != NULL)
browser_window_set_status(bw, status);
- browser_window_set_pointer(bw->window, pointer);
+ browser_window_set_pointer(bw, pointer);
}
12 years, 3 months
r12473 tlsa - in /branches/jmb/dom-alloc-purge/src/core: text.c text.h
by netsurf＠semichrome.net
Author: tlsa
Date: Mon Jun 13 06:05:38 2011
New Revision: 12473
URL: http://source.netsurf-browser.org?rev=12473&view=rev
Log:
Move text.c closer towards compiling. Still needs copy constructor sorting out.
Modified:
branches/jmb/dom-alloc-purge/src/core/text.c
branches/jmb/dom-alloc-purge/src/core/text.h
Modified: branches/jmb/dom-alloc-purge/src/core/text.c
URL: http://source.netsurf-browser.org/branches/jmb/dom-alloc-purge/src/core/t...
==============================================================================
--- branches/jmb/dom-alloc-purge/src/core/text.c (original)
+++ branches/jmb/dom-alloc-purge/src/core/text.c Mon Jun 13 06:05:38 2011
@@ -7,6 +7,7 @@
*/
#include <assert.h>
+#include <stdlib.h>
#include <dom/core/string.h>
#include <dom/core/text.h>
@@ -69,21 +70,21 @@
* The returned node will already be referenced.
*/
dom_exception _dom_text_create(struct dom_document *doc,
- struct lwc_string_s *name, dom_string *value,
+ dom_string *name, dom_string *value,
struct dom_text **result)
{
struct dom_text *t;
dom_exception err;
/* Allocate the text node */
- t = _dom_document_alloc(doc, NULL, sizeof(struct dom_text));
+ t = malloc(sizeof(struct dom_text));
if (t == NULL)
return DOM_NO_MEM_ERR;
/* And initialise the node */
err = _dom_text_initialise(t, doc, DOM_TEXT_NODE, name, value);
if (err != DOM_NO_ERR) {
- _dom_document_alloc(doc, t, 0);
+ free(t);
return err;
}
@@ -104,13 +105,13 @@
*
* The contents of ::text will be destroyed and ::text will be freed.
*/
-void _dom_text_destroy(struct dom_document *doc, struct dom_text *text)
+void _dom_text_destroy(struct dom_text *text)
{
/* Finalise node */
- _dom_text_finalise(doc, text);
+ _dom_text_finalise(text);
/* Free node */
- _dom_document_alloc(doc, text, 0);
+ free(text);
}
/**
@@ -127,7 +128,7 @@
*/
dom_exception _dom_text_initialise(struct dom_text *text,
struct dom_document *doc, dom_node_type type,
- struct lwc_string_s *name, dom_string *value)
+ dom_string *name, dom_string *value)
{
dom_exception err;
@@ -151,9 +152,9 @@
*
* The contents of ::text will be cleaned up. ::text will not be freed.
*/
-void _dom_text_finalise(struct dom_document *doc, struct dom_text *text)
-{
- _dom_characterdata_finalise(doc, &text->base);
+void _dom_text_finalise(struct dom_text *text)
+{
+ _dom_characterdata_finalise(&text->base);
}
/*----------------------------------------------------------------------*/
@@ -292,27 +293,7 @@
/* The destroy function of this class */
void __dom_text_destroy(struct dom_node_internal *node)
{
- struct dom_document *doc;
- doc = dom_node_get_owner(node);
-
- _dom_text_destroy(doc, (struct dom_text *) node);
-}
-
-/* The memory allocator for this class */
-dom_exception _dom_text_alloc(struct dom_document *doc,
- struct dom_node_internal *n, struct dom_node_internal **ret)
-{
- UNUSED(n);
- dom_text *a;
-
- a = _dom_document_alloc(doc, NULL, sizeof(struct dom_text));
- if (a == NULL)
- return DOM_NO_MEM_ERR;
-
- *ret = (dom_node_internal *) a;
- dom_node_set_owner(*ret, doc);
-
- return DOM_NO_ERR;
+ _dom_text_destroy((struct dom_text *) node);
}
/* The copy constructor of this class */
Modified: branches/jmb/dom-alloc-purge/src/core/text.h
URL: http://source.netsurf-browser.org/branches/jmb/dom-alloc-purge/src/core/t...
==============================================================================
--- branches/jmb/dom-alloc-purge/src/core/text.h (original)
+++ branches/jmb/dom-alloc-purge/src/core/text.h Mon Jun 13 06:05:38 2011
@@ -29,16 +29,16 @@
/* Constructor and Destructor */
dom_exception _dom_text_create(struct dom_document *doc,
- struct lwc_string_s *name, dom_string *value,
+ dom_string *name, dom_string *value,
struct dom_text **result);
-void _dom_text_destroy(struct dom_document *doc, struct dom_text *text);
+void _dom_text_destroy(struct dom_text *text);
dom_exception _dom_text_initialise(struct dom_text *text,
struct dom_document *doc, dom_node_type type,
- struct lwc_string_s *name, dom_string *value);
+ dom_string *name, dom_string *value);
-void _dom_text_finalise(struct dom_document *doc, struct dom_text *text);
+void _dom_text_finalise(struct dom_text *text);
/* Virtual functions for dom_text */
@@ -67,7 +67,6 @@
#define DOM_TEXT_PROTECT_VTABLE \
__dom_text_destroy, \
- _dom_text_alloc, \
_dom_text_copy
12 years, 3 months
r12472 tlsa - /trunk/netsurf/image/png.c
by netsurf＠semichrome.net
Author: tlsa
Date: Mon Jun 13 06:02:27 2011
New Revision: 12472
URL: http://source.netsurf-browser.org?rev=12472&view=rev
Log:
Fix warnings.
Modified:
trunk/netsurf/image/png.c
Modified: trunk/netsurf/image/png.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/png.c?rev=12472&r1=...
==============================================================================
--- trunk/netsurf/image/png.c (original)
+++ trunk/netsurf/image/png.c Mon Jun 13 06:02:27 2011
@@ -77,7 +77,7 @@
/**
* nspng_warning -- callback for libpng warnings
*/
-void nspng_warning(png_structp png_ptr, png_const_charp warning_message)
+static void nspng_warning(png_structp png_ptr, png_const_charp warning_message)
{
LOG(("%s", warning_message));
}
@@ -85,7 +85,7 @@
/**
* nspng_error -- callback for libpng errors
*/
-void nspng_error(png_structp png_ptr, png_const_charp error_message)
+static void nspng_error(png_structp png_ptr, png_const_charp error_message)
{
LOG(("%s", error_message));
longjmp(png_ptr->jmpbuf, 1);
12 years, 3 months
r12471 chris_y - /trunk/netsurf/image/png.c
by netsurf＠semichrome.net
Author: chris_y
Date: Sun Jun 12 13:04:09 2011
New Revision: 12471
URL: http://source.netsurf-browser.org?rev=12471&view=rev
Log:
Redirect libpng errors to the standard NetSurf logfile
Modified:
trunk/netsurf/image/png.c
Modified: trunk/netsurf/image/png.c
URL: http://source.netsurf-browser.org/trunk/netsurf/image/png.c?rev=12471&r1=...
==============================================================================
--- trunk/netsurf/image/png.c (original)
+++ trunk/netsurf/image/png.c Sun Jun 12 13:04:09 2011
@@ -73,6 +73,23 @@
static unsigned int interlace_step[8] = {28, 28, 12, 12, 4, 4, 0};
static unsigned int interlace_row_start[8] = {0, 0, 4, 0, 2, 0, 1};
static unsigned int interlace_row_step[8] = {8, 8, 8, 4, 4, 2, 2};
+
+/**
+ * nspng_warning -- callback for libpng warnings
+ */
+void nspng_warning(png_structp png_ptr, png_const_charp warning_message)
+{
+ LOG(("%s", warning_message));
+}
+
+/**
+ * nspng_error -- callback for libpng errors
+ */
+void nspng_error(png_structp png_ptr, png_const_charp error_message)
+{
+ LOG(("%s", error_message));
+ longjmp(png_ptr->jmpbuf, 1);
+}
/**
* info_callback -- PNG header has been completely received, prepare to process
@@ -209,6 +226,8 @@
return NSERROR_NOMEM;
}
+ png_set_error_fn(png_c->png, NULL, nspng_error, nspng_warning);
+
png_c->info = png_create_info_struct(png_c->png);
if (png_c->info == NULL) {
png_destroy_read_struct(&png_c->png, &png_c->info, 0);
12 years, 3 months