April 2007 - netsurf-commits - listmaster.pepperfish.net

r3249 jmb - /trunk/netsurf/desktop/frames.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Apr 8 00:27:28 2007 New Revision: 3249 URL: http://svn.semichrome.net?rev=3249&view=rev Log: Fix return value check Modified: trunk/netsurf/desktop/frames.c Modified: trunk/netsurf/desktop/frames.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/frames.c?rev=3249&r1=3248... ============================================================================== --- trunk/netsurf/desktop/frames.c (original) +++ trunk/netsurf/desktop/frames.c Sun Apr 8 00:27:28 2007 @@ -82,10 +82,10 @@ window->margin_height = cur->margin_height; if (cur->name) { window->name = strdup(cur->name); - if (!cur->name) + if (!window->name) warn_user("NoMemory", 0); - } - + } + /* linking */ window->box = cur->box; window->parent = bw; @@ -203,7 +203,7 @@ /* gui window */ window->window = gui_create_browser_window(window, bw); - + if (window->name) LOG(("Created frame '%s'", window->name)); else

16 years, 8 months

1
0
0 / 0

r3248 rjw - in /trunk/netsurf/desktop: browser.c browser.h frames.c textinput.c

by netsurf＠semichrome.net

Author: rjw Date: Sun Apr 8 00:08:31 2007 New Revision: 3248 URL: http://svn.semichrome.net?rev=3248&view=rev Log: Open window targets with a new name in a new window. Fix handling of Adjust-click on a form submit when new window opening is disabled. Modified: trunk/netsurf/desktop/browser.c trunk/netsurf/desktop/browser.h trunk/netsurf/desktop/frames.c trunk/netsurf/desktop/textinput.c Modified: trunk/netsurf/desktop/browser.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/browser.c?rev=3248&r1=324... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Sun Apr 8 00:08:31 2007 @@ -83,7 +83,7 @@ static void browser_window_set_scale_internal(struct browser_window *bw, float scale); static struct browser_window *browser_window_find_target( - struct browser_window *bw, const char *target); + struct browser_window *bw, const char *target, bool new_window); static void browser_window_find_target_internal(struct browser_window *bw, const char *target, int depth, struct browser_window *page, int *rdepth, struct browser_window **bw_target); @@ -1001,9 +1001,11 @@ * * \param bw the browser_window to search all relatives of * \param target the target to locate - */ - -struct browser_window *browser_window_find_target(struct browser_window *bw, const char *target) + * \param new_window always return a new window (ie 'Open Link in New Window') + */ + +struct browser_window *browser_window_find_target(struct browser_window *bw, const char *target, + bool new_window) { struct browser_window *bw_target; struct browser_window *top; @@ -1014,19 +1016,21 @@ c = bw->current_content; if (!target && c && c->data.html.base_target) target = c->data.html.base_target; - - /* allow target="_blank" to be ignored so zamez, tlsa and jmb don't lynch me */ - if (!option_target_blank) { - if ((target == TARGET_BLANK) || (!strcasecmp(target, "_blank"))) - target = TARGET_SELF; - } - - /* todo: correctly follow B.8 - * http://www.w3.org/TR/REC-html40/appendix/notes.html#notes-frames - */ - if ((!target) || (target == TARGET_SELF) || (!strcasecmp(target, "_self"))) + if (!target) + target = TARGET_SELF; + + /* allow the simple case of target="_blank" to be ignored if requested */ + if ((!option_target_blank) && ((target == TARGET_BLANK) || (!strcasecmp(target, "_blank")))) return bw; + + /* handle reserved keywords */ + if ((new_window) || ((target == TARGET_BLANK) || (!strcasecmp(target, "_blank")))) { + bw_target = browser_window_create(NULL, bw, NULL, false); + if (!bw_target) + return bw; + return bw_target; + } else if ((target == TARGET_SELF) || (!strcasecmp(target, "_self"))) { return bw; - else if ((target == TARGET_PARENT) || (!strcasecmp(target, "_parent"))) { + } else if ((target == TARGET_PARENT) || (!strcasecmp(target, "_parent"))) { if (bw->parent) return bw->parent; return bw; @@ -1034,11 +1038,6 @@ while (bw->parent) bw = bw->parent; return bw; - } else if ((target == TARGET_BLANK) || (!strcasecmp(target, "_blank"))) { - bw_target = browser_window_create(NULL, bw, NULL, false); - if (!bw_target) - return bw; - return bw_target; } /* find frame according to B.8, ie using the following priorities: @@ -1046,11 +1045,31 @@ * 1) current frame * 2) closest to front */ - rdepth = -1; - bw_target = bw; + bw_target = NULL; for (top = bw; top->parent; top = top->parent); browser_window_find_target_internal(top, target, 0, bw, &rdepth, &bw_target); + if (bw_target) + return bw_target; + + /* we require a new window using the target name */ + if (!option_target_blank) + return bw; + bw_target = browser_window_create(NULL, bw, NULL, false); + if (!bw_target) + return bw; + + /* frame names should begin with an alphabetic character (a-z,A-Z), however in + * practice you get things such as '_new' and '2left'. The only real effect this + * has is when giving out names as it can be assumed that an author intended '_new' + * to create a new nameless window (ie '_blank') whereas in the case of '2left' the + * intention was for a new named window. As such we merely special case windows that + * begin with an underscore. */ + if (target[0] != '_') { + bw_target->name = strdup(target); + if (!bw_target->name) + warn_user("NoMemory", 0); + } return bw_target; } @@ -1328,12 +1347,12 @@ gadget->form->action); status = status_buffer; pointer = GUI_POINTER_POINT; - if (mouse & BROWSER_MOUSE_CLICK_1) - browser_form_submit(bw, target, gadget->form, - gadget); - else if (mouse & BROWSER_MOUSE_CLICK_2) - browser_form_submit(bw, "_blank", gadget->form, - gadget); + if (mouse & (BROWSER_MOUSE_CLICK_1 | BROWSER_MOUSE_CLICK_2)) { + browser_form_submit(bw, + browser_window_find_target(bw, target, + (mouse & BROWSER_MOUSE_CLICK_2)), + gadget->form, gadget); + } } else { status = messages_get("FormBadSubmit"); } @@ -1343,7 +1362,6 @@ pointer = GUI_POINTER_CARET; if (mouse & (BROWSER_MOUSE_CLICK_1 | BROWSER_MOUSE_CLICK_2)) { - if (text_box && selection_root(bw->sel) != gadget_box) selection_init(bw->sel, gadget_box); @@ -1449,10 +1467,10 @@ browser_window_go_post(bw, url, 0, 0, false, c->url, true, true, 0); - } else if (mouse & BROWSER_MOUSE_CLICK_1) { - bw = browser_window_find_target(bw, target); - assert(bw); - browser_window_go(bw, url, c->url, true); + } else if (mouse & (BROWSER_MOUSE_CLICK_1 | BROWSER_MOUSE_CLICK_2)) { + browser_window_go(browser_window_find_target(bw, target, + (mouse & BROWSER_MOUSE_CLICK_2)), + url, c->url, true); } else if (mouse & BROWSER_MOUSE_CLICK_2 && mouse & BROWSER_MOUSE_MOD_1) { free(browser_window_href_content.url); @@ -1462,9 +1480,6 @@ else gui_window_save_as_link(bw->window, &browser_window_href_content); - } else if (mouse & BROWSER_MOUSE_CLICK_2) { - /* open link in new window */ - browser_window_create(url, bw, c->url, true); } } else { @@ -2255,12 +2270,11 @@ * Collect controls and submit a form. */ -void browser_form_submit(struct browser_window *bw, const char *target, +void browser_form_submit(struct browser_window *bw, struct browser_window *target, struct form *form, struct form_control *submit_button) { char *data = 0, *url = 0; struct form_successful_control *success; - struct browser_window *bw_form; assert(form); assert(bw->current_content->type == CONTENT_HTML); @@ -2269,9 +2283,6 @@ warn_user("NoMemory", 0); return; } - - bw_form = browser_window_find_target(bw, target); - assert(bw); switch (form->method) { case method_GET: @@ -2295,7 +2306,7 @@ else { sprintf(url, "%s?%s", form->action, data); } - browser_window_go(bw_form, url, + browser_window_go(target, url, bw->current_content->url, true); break; @@ -2306,13 +2317,13 @@ warn_user("NoMemory", 0); return; } - browser_window_go_post(bw_form, form->action, data, 0, + browser_window_go_post(target, form->action, data, 0, true, bw->current_content->url, false, true, 0); break; case method_POST_MULTIPART: - browser_window_go_post(bw_form, form->action, 0, + browser_window_go_post(target, form->action, 0, success, true, bw->current_content->url, false, true, 0); Modified: trunk/netsurf/desktop/browser.h URL: http://svn.semichrome.net/trunk/netsurf/desktop/browser.h?rev=3248&r1=324... ============================================================================== --- trunk/netsurf/desktop/browser.h (original) +++ trunk/netsurf/desktop/browser.h Sun Apr 8 00:08:31 2007 @@ -206,7 +206,7 @@ void browser_window_form_select(struct browser_window *bw, struct form_control *control, int item); void browser_redraw_box(struct content *c, struct box *box); -void browser_form_submit(struct browser_window *bw, const char *target, +void browser_form_submit(struct browser_window *bw, struct browser_window *target, struct form *form, struct form_control *submit_button); void browser_window_redraw_rect(struct browser_window *bw, int x, int y, Modified: trunk/netsurf/desktop/frames.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/frames.c?rev=3248&r1=3247... ============================================================================== --- trunk/netsurf/desktop/frames.c (original) +++ trunk/netsurf/desktop/frames.c Sun Apr 8 00:08:31 2007 @@ -80,9 +80,12 @@ window->no_resize = true; window->margin_width = cur->margin_width; window->margin_height = cur->margin_height; - if (cur->name) + if (cur->name) { window->name = strdup(cur->name); - + if (!cur->name) + warn_user("NoMemory", 0); + } + /* linking */ window->box = cur->box; window->parent = bw; @@ -189,14 +192,22 @@ window->frame_height = frame->height; window->margin_width = frame->margin_width; window->margin_height = frame->margin_height; - if (frame->name) + if (frame->name) { window->name = strdup(frame->name); + if (!window->name) + warn_user("NoMemory", 0); + } /* linking */ window->parent = bw; /* gui window */ window->window = gui_create_browser_window(window, bw); + + if (window->name) + LOG(("Created frame '%s'", window->name)); + else + LOG(("Created frame (unnamed)")); } } Modified: trunk/netsurf/desktop/textinput.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/textinput.c?rev=3248&r1=3... ============================================================================== --- trunk/netsurf/desktop/textinput.c (original) +++ trunk/netsurf/desktop/textinput.c Sun Apr 8 00:08:31 2007 @@ -934,7 +934,7 @@ case 10: case 13: /* Return/Enter hit */ if (form) - browser_form_submit(bw, 0, form, 0); + browser_form_submit(bw, bw, form, 0); return true; case 11: { /* Shift + Tab */

16 years, 8 months

1
0
0 / 0

r3247 rjw - in /trunk/netsurf/riscos: 401login.c configure.c download.c

by netsurf＠semichrome.net

Author: rjw Date: Sat Apr 7 23:53:59 2007 New Revision: 3247 URL: http://svn.semichrome.net?rev=3247&view=rev Log: Remove redundant close window calls. Modified: trunk/netsurf/riscos/401login.c trunk/netsurf/riscos/configure.c trunk/netsurf/riscos/download.c Modified: trunk/netsurf/riscos/401login.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/401login.c?rev=3247&r1=324... ============================================================================== --- trunk/netsurf/riscos/401login.c (original) +++ trunk/netsurf/riscos/401login.c Sat Apr 7 23:53:59 2007 @@ -164,7 +164,6 @@ free(session->url); free(session); - ro_gui_dialog_close(w); error = xwimp_delete_window(w); if (error) { LOG(("xwimp_delete_window: 0x%x:%s", Modified: trunk/netsurf/riscos/configure.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/configure.c?rev=3247&r1=32... ============================================================================== --- trunk/netsurf/riscos/configure.c (original) +++ trunk/netsurf/riscos/configure.c Sat Apr 7 23:53:59 2007 @@ -156,7 +156,6 @@ tool->open = false; if (tool->finalise) tool->finalise(w); - ro_gui_dialog_close(w); break; } } Modified: trunk/netsurf/riscos/download.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/download.c?rev=3247&r1=324... ============================================================================== --- trunk/netsurf/riscos/download.c (original) +++ trunk/netsurf/riscos/download.c Sat Apr 7 23:53:59 2007 @@ -1335,7 +1335,6 @@ dw->next->prev = dw->prev; /* delete window */ - ro_gui_dialog_close(dw->window); error = xwimp_delete_window(dw->window); if (error) { LOG(("xwimp_delete_window: 0x%x: %s",

16 years, 8 months

1
0
0 / 0

r3246 rjw - /trunk/netsurf/render/html.c

by netsurf＠semichrome.net

Author: rjw Date: Sat Apr 7 23:51:06 2007 New Revision: 3246 URL: http://svn.semichrome.net?rev=3246&view=rev Log: Set minimum META refresh delay to 1s Modified: trunk/netsurf/render/html.c Modified: trunk/netsurf/render/html.c URL: http://svn.semichrome.net/trunk/netsurf/render/html.c?rev=3246&r1=3245&r2... ============================================================================== --- trunk/netsurf/render/html.c (original) +++ trunk/netsurf/render/html.c Sat Apr 7 23:51:06 2007 @@ -557,6 +557,11 @@ end = (char *)content + strlen(content); msg_data.delay = (int)strtol((char *) content, &url, 10); + /* a very small delay and self-referencing URL can cause a loop + * that grinds machines to a halt. To prevent this we set a + * minimum refresh delay of 1s. */ + if (msg_data.delay < 1) + msg_data.delay = 1; if (url == end) { /* Just delay specified, so refresh current page */

16 years, 8 months

1
0
0 / 0

r3245 jmb - /trunk/netsurf/riscos/cookies.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Apr 7 23:44:46 2007 New Revision: 3245 URL: http://svn.semichrome.net?rev=3245&view=rev Log: Construct cookies treeview correctly (fixes 1675328) Modified: trunk/netsurf/riscos/cookies.c Modified: trunk/netsurf/riscos/cookies.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/cookies.c?rev=3245&r1=3244... ============================================================================== --- trunk/netsurf/riscos/cookies.c (original) +++ trunk/netsurf/riscos/cookies.c Sat Apr 7 23:44:46 2007 @@ -145,9 +145,9 @@ node->expanded = expanded; } if (!data) { - if (!node) - return true; - tree_delete_node(cookies_tree, node, false); + if (!node) + return true; + tree_delete_node(cookies_tree, node, false); tree_handle_node_changed(cookies_tree, cookies_tree->root, true, false); return true; @@ -157,16 +157,14 @@ if (!node) { for (parent = cookies_tree->root->child; parent; parent = parent->next) { - if (strcmp(domain, parent->data.text) < 0) + if (strcmp(domain, parent->data.text) == 0) break; } if (!parent) { node = tree_create_folder_node(cookies_tree->root, domain); } else { - node = tree_create_folder_node(NULL, domain); - if (node) - tree_link_node(parent, node, true); + node = parent; } } if (!node)

16 years, 8 months

1
0
0 / 0

r3244 jmb - /trunk/netsurf/desktop/history_core.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Apr 7 22:33:54 2007 New Revision: 3244 URL: http://svn.semichrome.net?rev=3244&view=rev Log: Silence noisy logging Modified: trunk/netsurf/desktop/history_core.c Modified: trunk/netsurf/desktop/history_core.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/history_core.c?rev=3244&r... ============================================================================== --- trunk/netsurf/desktop/history_core.c (original) +++ trunk/netsurf/desktop/history_core.c Sat Apr 7 22:33:54 2007 @@ -225,12 +225,12 @@ return; } - LOG(("%s => %s : %s", content->url, url, content->title)); - LOG(("%s", frag_id)); +// LOG(("%s => %s : %s", content->url, url, content->title)); +// LOG(("%s", frag_id)); title = strdup(content->title ? content->title : url); - LOG(("after strdup")); +// LOG(("after strdup")); if (!entry || !url || !title) { warn_user("NoMemory", 0); @@ -407,20 +407,13 @@ char *url; struct history_entry *current; - LOG(("%p %p %p", bw, history, entry)); - LOG(("%s %s %s", - entry->page.url, entry->page.title, entry->page.frag_id)); +// LOG(("%p %p %p", bw, history, entry)); +// LOG(("%s %s %s", +// entry->page.url, entry->page.title, entry->page.frag_id)); if (entry->page.frag_id) { - size_t a, b; - - a = strlen(entry->page.url); - LOG(("after a")); - b = strlen(entry->page.frag_id); - LOG(("after b")); - url = malloc(a + b + 5); - LOG(("after malloc")); - + url = malloc(strlen(entry->page.url) + + strlen(entry->page.frag_id) + 5); if (!url) { warn_user("NoMemory", 0); return;

16 years, 8 months

1
0
0 / 0

r3243 jmb - in /trunk/netsurf: content/urldb.c desktop/history_core.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Apr 7 21:30:39 2007 New Revision: 3243 URL: http://svn.semichrome.net?rev=3243&view=rev Log: 1) Fix corruption of history data structure on cloning 2) Only destroy urldb's thumbnail bitmap if it's not the same as the new one. This needs revisiting at a later date such that the mess surrounding who owns bitmap objects is sorted (and so that urldb doesn't need to know about bitmaps) Modified: trunk/netsurf/content/urldb.c trunk/netsurf/desktop/history_core.c Modified: trunk/netsurf/content/urldb.c URL: http://svn.semichrome.net/trunk/netsurf/content/urldb.c?rev=3243&r1=3242&... ============================================================================== --- trunk/netsurf/content/urldb.c (original) +++ trunk/netsurf/content/urldb.c Sat Apr 7 21:30:39 2007 @@ -1067,7 +1067,7 @@ if (!p) return; - if (p->thumb) + if (p->thumb && p->thumb != bitmap) bitmap_destroy(p->thumb); p->thumb = bitmap; Modified: trunk/netsurf/desktop/history_core.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/history_core.c?rev=3243&r... ============================================================================== --- trunk/netsurf/desktop/history_core.c (original) +++ trunk/netsurf/desktop/history_core.c Sat Apr 7 21:30:39 2007 @@ -124,7 +124,7 @@ new_history->start = history_clone_entry(new_history, new_history->start); if (!history->start) { - LOG(("Insufficient memory to clone history")); + LOG(("Insufficient memory to clone history")); warn_user("NoMemory", 0); history_destroy(new_history); return 0; @@ -178,7 +178,7 @@ for (child = new_entry->forward; child; child = child->next) { new_child = history_clone_entry(history, child); if (new_child) - new_child->back = entry; + new_child->back = new_entry; if (prev) prev->next = new_child; if (new_entry->forward == child)

16 years, 8 months

1
0
0 / 0

r3242 jmb - /trunk/netsurf/desktop/history_core.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Apr 7 18:58:42 2007 New Revision: 3242 URL: http://svn.semichrome.net?rev=3242&view=rev Log: Add logging Modified: trunk/netsurf/desktop/history_core.c Modified: trunk/netsurf/desktop/history_core.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/history_core.c?rev=3242&r... ============================================================================== --- trunk/netsurf/desktop/history_core.c (original) +++ trunk/netsurf/desktop/history_core.c Sat Apr 7 18:58:42 2007 @@ -224,7 +224,14 @@ warn_user("NoMemory", 0); return; } + + LOG(("%s => %s : %s", content->url, url, content->title)); + LOG(("%s", frag_id)); + title = strdup(content->title ? content->title : url); + + LOG(("after strdup")); + if (!entry || !url || !title) { warn_user("NoMemory", 0); free(entry); @@ -400,9 +407,20 @@ char *url; struct history_entry *current; + LOG(("%p %p %p", bw, history, entry)); + LOG(("%s %s %s", + entry->page.url, entry->page.title, entry->page.frag_id)); + if (entry->page.frag_id) { - url = malloc(strlen(entry->page.url) + - strlen(entry->page.frag_id) + 5); + size_t a, b; + + a = strlen(entry->page.url); + LOG(("after a")); + b = strlen(entry->page.frag_id); + LOG(("after b")); + url = malloc(a + b + 5); + LOG(("after malloc")); + if (!url) { warn_user("NoMemory", 0); return;

16 years, 8 months

1
0
0 / 0

r3241 jmb - /trunk/netsurftest/works/image-sizing.html

by netsurf＠semichrome.net

Author: jmb Date: Sat Apr 7 03:30:20 2007 New Revision: 3241 URL: http://svn.semichrome.net?rev=3241&view=rev Log: Add testcase for scaled objects & hit detection Added: trunk/netsurftest/works/image-sizing.html Added: trunk/netsurftest/works/image-sizing.html URL: http://svn.semichrome.net/trunk/netsurftest/works/image-sizing.html?rev=3... ============================================================================== --- trunk/netsurftest/works/image-sizing.html (added) +++ trunk/netsurftest/works/image-sizing.html Sat Apr 7 03:30:20 2007 @@ -1,0 +1,18 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head><title>Image sizing test</title></head> +<body> +<a href="foo.htm"><img src="../images/netsurf.png" style="width: 90px; height: 90px"></a> +<hr> +<a href="bar.htm"><img src="../images/netsurf.png" width="90" height="90"></a> +<hr> +<object data="../images/netsurf.png" type="image/png" style="width:90px; height: 90px;"> +Fallback content +</object> +<hr> +<div style="width: 90px; height: 90px; overflow: scroll;"> +<a href="baz.htm"><img src="../images/netsurf.png"></a> +</div> +</body> +</html>

16 years, 8 months

1
0
0 / 0

r3240 jmb - /trunk/netsurf/render/layout.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Apr 7 03:29:32 2007 New Revision: 3240 URL: http://svn.semichrome.net?rev=3240&view=rev Log: Object sizes do not apply when calculating the extent of descendent bounding boxes. (fixes 1601881) Modified: trunk/netsurf/render/layout.c Modified: trunk/netsurf/render/layout.c URL: http://svn.semichrome.net/trunk/netsurf/render/layout.c?rev=3240&r1=3239&... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Sat Apr 7 03:29:32 2007 @@ -3015,17 +3015,6 @@ box->descendant_y1 = box->padding[TOP] + box->height + box->padding[BOTTOM] + box->border[BOTTOM]; - if (box->object) { - LOG(("%i %i %i %i", - box->descendant_x1, box->object->width, - box->descendant_y1, box->object->height)); - if (box->descendant_x1 < box->object->width) - box->descendant_x1 = box->object->width; - if (box->descendant_y1 < box->object->height) - box->descendant_y1 = box->object->height; - return; - } - if (box->type == BOX_INLINE || box->type == BOX_TEXT) return;

16 years, 8 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits April 2007