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

r3228 jmb - in /trunk/netsurf: content/content.c render/directory.c render/directory.h

by netsurf＠semichrome.net

Author: jmb Date: Wed Mar 28 23:56:54 2007 New Revision: 3228 URL: http://svn.semichrome.net?rev=3228&view=rev Log: Fix abort on attempted destruction of CONTENT_DIRECTORY (1690222) Modified: trunk/netsurf/content/content.c trunk/netsurf/render/directory.c trunk/netsurf/render/directory.h Modified: trunk/netsurf/content/content.c URL: http://svn.semichrome.net/trunk/netsurf/content/content.c?rev=3228&r1=322... ============================================================================== --- trunk/netsurf/content/content.c (original) +++ trunk/netsurf/content/content.c Wed Mar 28 23:56:54 2007 @@ -291,9 +291,7 @@ true}, #endif {directory_create, 0, directory_convert, - html_reformat, html_destroy, html_stop, html_redraw, 0, - html_open, html_close, - true}, + 0, directory_destroy, 0, 0, 0, 0, 0, true}, #ifdef WITH_THEME_INSTALL {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, false}, #endif Modified: trunk/netsurf/render/directory.c URL: http://svn.semichrome.net/trunk/netsurf/render/directory.c?rev=3228&r1=32... ============================================================================== --- trunk/netsurf/render/directory.c (original) +++ trunk/netsurf/render/directory.c Wed Mar 28 23:56:54 2007 @@ -34,8 +34,8 @@ /* html_create() must have broadcast MSG_ERROR already, so we * don't need to. */ return false; - htmlParseChunk(c->data.html.parser, header, sizeof(header) - 1, 0); - return true; + htmlParseChunk(c->data.html.parser, header, sizeof(header) - 1, 0); + return true; } bool directory_convert(struct content *c, int width, int height) { @@ -59,22 +59,22 @@ if (!nice_path) { msg_data.error = messages_get("MiscErr"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - return false; + return false; } for (cnv = nice_path, tmp = path; *tmp != '\0'; *tmp++) { - if (*tmp == '<') { - *cnv++ = '&'; - *cnv++ = 'l'; - *cnv++ = 't'; - *cnv++ = ';'; - } else if (*tmp == '>') { - *cnv++ = '&'; - *cnv++ = 'g'; - *cnv++ = 't'; - *cnv++ = ';'; - } else { - *cnv++ = *tmp; - } + if (*tmp == '<') { + *cnv++ = '&'; + *cnv++ = 'l'; + *cnv++ = 't'; + *cnv++ = ';'; + } else if (*tmp == '>') { + *cnv++ = '&'; + *cnv++ = 'g'; + *cnv++ = 't'; + *cnv++ = ';'; + } else { + *cnv++ = *tmp; + } } *cnv++ = '\0'; snprintf(buffer, sizeof(buffer), "Index of %s</title>\n</head>\n" @@ -85,20 +85,20 @@ res = url_parent(c->url, &up); if (res == URL_FUNC_OK) { - res = url_compare(c->url, up, &compare); - if (!compare) { + res = url_compare(c->url, up, &compare); + if (!compare) { snprintf(buffer, sizeof(buffer), "<a href=\"..\">[..]</a>\n"); htmlParseChunk(c->data.html.parser, buffer, strlen(buffer), 0); - } - free(up); - } + } + free(up); + } if ((parent = opendir(path)) == NULL) { msg_data.error = messages_get("EmptyErr"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); - return false; + return false; } while ((entry = readdir(parent)) != NULL) { if (!strcmp(entry->d_name, ".") || @@ -115,3 +115,16 @@ c->type = CONTENT_HTML; return html_convert(c, width, height); } + +void directory_destroy(struct content *c) +{ + /* This will only get called if the content is destroyed before + * content_convert() is called. Simply force the type to HTML and + * delegate the cleanup to html_destroy() */ + + c->type = CONTENT_HTML; + + html_destroy(c); + + return; +} Modified: trunk/netsurf/render/directory.h URL: http://svn.semichrome.net/trunk/netsurf/render/directory.h?rev=3228&r1=32... ============================================================================== --- trunk/netsurf/render/directory.h (original) +++ trunk/netsurf/render/directory.h Wed Mar 28 23:56:54 2007 @@ -20,5 +20,6 @@ bool directory_create(struct content *c, const char *params[]); bool directory_convert(struct content *c, int width, int height); +void directory_destroy(struct content *c); #endif

16 years, 5 months

1
0
0 / 0

r3227 jmb - in /trunk/netsurf/riscos: gui.h menus.c search.c window.c

by netsurf＠semichrome.net

Author: jmb Date: Mon Mar 26 22:09:25 2007 New Revision: 3227 URL: http://svn.semichrome.net?rev=3227&view=rev Log: Remove collusion between window, menus and search code in order to clear search selection state - this should happen automagically through wimp_event callbacks now. Also tidy search.c so I can read it better ;) Modified: trunk/netsurf/riscos/gui.h trunk/netsurf/riscos/menus.c trunk/netsurf/riscos/search.c trunk/netsurf/riscos/window.c Modified: trunk/netsurf/riscos/gui.h URL: http://svn.semichrome.net/trunk/netsurf/riscos/gui.h?rev=3227&r1=3226&r2=... ============================================================================== --- trunk/netsurf/riscos/gui.h (original) +++ trunk/netsurf/riscos/gui.h Mon Mar 26 22:09:25 2007 @@ -191,7 +191,6 @@ void ro_gui_search_init(void); void ro_gui_search_prepare(struct gui_window *g); bool ro_gui_search_prepare_menu(void); -void ro_gui_search_end(wimp_w w); /* in print.c */ void ro_gui_print_init(void); Modified: trunk/netsurf/riscos/menus.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/menus.c?rev=3227&r1=3226&r... ============================================================================== --- trunk/netsurf/riscos/menus.c (original) +++ trunk/netsurf/riscos/menus.c Mon Mar 26 22:09:25 2007 @@ -110,8 +110,6 @@ (wimp_COLOUR_BLACK << wimp_ICON_FG_COLOUR_SHIFT) | \ (wimp_COLOUR_WHITE << wimp_ICON_BG_COLOUR_SHIFT)) -/** Whether the search box was opened as a sub-menu */ -static bool ro_gui_menu_search_window_menu; /** The currently defined menus to perform actions for */ static struct menu_definition *ro_gui_menu_definitions; /** The current menu being worked with (may not be open) */ @@ -478,7 +476,6 @@ current_menu = menu; current_menu_window = w; current_menu_icon = -1; - ro_gui_menu_search_window_menu = false; /* prepare the menu state */ if (menu == url_suggest_menu) { @@ -581,7 +578,6 @@ } } - ro_gui_menu_search_window_menu = false; current_menu_window = NULL; current_menu_icon = NULL; current_menu_open = false; @@ -1585,7 +1581,6 @@ if (!c || (c->type != CONTENT_HTML && c->type != CONTENT_TEXTPLAIN)) return false; ro_gui_menu_prepare_action(owner, action, true); - ro_gui_menu_search_window_menu = false; ro_gui_dialog_open_persistent(g->window, dialog_search, windows_at_pointer); return true; @@ -2041,7 +2036,6 @@ ro_gui_menu_set_entry_shaded(current_menu, action, result); if ((!result) && (windows)) { - ro_gui_menu_search_window_menu = true; ro_gui_search_prepare(g); } if ((t) && (!t->editor) && Modified: trunk/netsurf/riscos/search.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/search.c?rev=3227&r1=3226&... ============================================================================== --- trunk/netsurf/riscos/search.c (original) +++ trunk/netsurf/riscos/search.c Mon Mar 26 22:09:25 2007 @@ -70,11 +70,12 @@ static void start_search(bool forwards); -static void do_search(char *string, int string_len, bool case_sens, bool forwards); +static void do_search(char *string, int string_len, bool case_sens, + bool forwards); static const char *find_pattern(const char *string, int s_len, const char *pattern, int p_len, bool case_sens, int *m_len); -static bool find_occurrences_html(const char *pattern, int p_len, struct box *cur, - bool case_sens); +static bool find_occurrences_html(const char *pattern, int p_len, + struct box *cur, bool case_sens); static bool find_occurrences_text(const char *pattern, int p_len, struct content *c, bool case_sens); static struct list_entry *add_entry(unsigned start_idx, unsigned end_idx); @@ -82,21 +83,26 @@ static void show_all(bool all); static void show_status(bool found); +static void ro_gui_search_end(wimp_w w); static bool ro_gui_search_next(wimp_w w); static bool ro_gui_search_click(wimp_pointer *pointer); static bool ro_gui_search_keypress(wimp_key *key); static void ro_gui_search_add_recent(char *search); -void ro_gui_search_init(void) { +void ro_gui_search_init(void) +{ dialog_search = ro_gui_dialog_create("search"); ro_gui_wimp_event_register_keypress(dialog_search, ro_gui_search_keypress); ro_gui_wimp_event_register_close_window(dialog_search, ro_gui_search_end); - ro_gui_wimp_event_register_menu_gright(dialog_search, ICON_SEARCH_TEXT, - ICON_SEARCH_MENU, recent_search_menu); - ro_gui_wimp_event_register_text_field(dialog_search, ICON_SEARCH_STATUS); - ro_gui_wimp_event_register_checkbox(dialog_search, ICON_SEARCH_CASE_SENSITIVE); + ro_gui_wimp_event_register_menu_gright(dialog_search, + ICON_SEARCH_TEXT, ICON_SEARCH_MENU, + recent_search_menu); + ro_gui_wimp_event_register_text_field(dialog_search, + ICON_SEARCH_STATUS); + ro_gui_wimp_event_register_checkbox(dialog_search, + ICON_SEARCH_CASE_SENSITIVE); ro_gui_wimp_event_register_mouse_click(dialog_search, ro_gui_search_click); ro_gui_wimp_event_register_ok(dialog_search, ICON_SEARCH_FIND_NEXT, @@ -114,15 +120,17 @@ * * \return false, to indicate the window should not be closed */ -bool ro_gui_search_next(wimp_w w) { +bool ro_gui_search_next(wimp_w w) +{ search_insert = true; start_search(true); return false; } -bool ro_gui_search_click(wimp_pointer *pointer) { +bool ro_gui_search_click(wimp_pointer *pointer) +{ switch (pointer->i) { - case ICON_SEARCH_FIND_PREV: + case ICON_SEARCH_FIND_PREV: search_insert = true; start_search(false); return true; @@ -130,13 +138,15 @@ start_search(true); return true; case ICON_SEARCH_SHOW_ALL: - show_all(ro_gui_get_icon_selected_state(pointer->w, pointer->i)); + show_all(ro_gui_get_icon_selected_state(pointer->w, + pointer->i)); return true; } return false; } -void ro_gui_search_add_recent(char *search) { +void ro_gui_search_add_recent(char *search) +{ char *tmp; int i; @@ -156,8 +166,8 @@ tmp = strdup(search); if (!tmp) { - warn_user("NoMemory", 0); - return; + warn_user("NoMemory", 0); + return; } free(recent_search[RECENT_SEARCHES - 1]); for (i = RECENT_SEARCHES - 1; i > 0; i--) @@ -169,7 +179,8 @@ ro_gui_search_prepare_menu(); } -bool ro_gui_search_prepare_menu(void) { +bool ro_gui_search_prepare_menu(void) +{ os_error *error; int i; int suggestions = 0; @@ -188,7 +199,8 @@ recent_search_menu->entries[i].data.indirected_text.size = strlen(recent_search[i]) + 1; } - recent_search_menu->entries[suggestions - 1].menu_flags |= wimp_MENU_LAST; + recent_search_menu->entries[suggestions - 1].menu_flags |= + wimp_MENU_LAST; if ((current_menu_open) && (current_menu == recent_search_menu)) { error = xwimp_create_menu(current_menu, 0, 0); @@ -215,7 +227,8 @@ c = g->bw->current_content; /* only handle html/textplain contents */ - if ((!c) || (c->type != CONTENT_HTML && c->type != CONTENT_TEXTPLAIN)) + if ((!c) || (c->type != CONTENT_HTML && + c->type != CONTENT_TEXTPLAIN)) return; /* if the search dialogue is reopened over a new window, we still @@ -231,8 +244,10 @@ ICON_SEARCH_SHOW_ALL, false); show_status(true); - ro_gui_set_icon_shaded_state(dialog_search, ICON_SEARCH_FIND_PREV, true); - ro_gui_set_icon_shaded_state(dialog_search, ICON_SEARCH_FIND_NEXT, true); + ro_gui_set_icon_shaded_state(dialog_search, + ICON_SEARCH_FIND_PREV, true); + ro_gui_set_icon_shaded_state(dialog_search, + ICON_SEARCH_FIND_NEXT, true); ro_gui_wimp_event_memorise(dialog_search); search_insert = true; @@ -250,14 +265,18 @@ switch (key->c) { case 1: { /* ctrl a */ - bool sel = !ro_gui_get_icon_selected_state(key->w, ICON_SEARCH_SHOW_ALL); - ro_gui_set_icon_selected_state(key->w, ICON_SEARCH_SHOW_ALL, sel); + bool sel = !ro_gui_get_icon_selected_state(key->w, + ICON_SEARCH_SHOW_ALL); + ro_gui_set_icon_selected_state(key->w, + ICON_SEARCH_SHOW_ALL, sel); show_all(sel); } break; case 9: /* ctrl i */ - state = ro_gui_get_icon_selected_state(dialog_search, ICON_SEARCH_CASE_SENSITIVE); - ro_gui_set_icon_selected_state(dialog_search, ICON_SEARCH_CASE_SENSITIVE, !state); + state = ro_gui_get_icon_selected_state(dialog_search, + ICON_SEARCH_CASE_SENSITIVE); + ro_gui_set_icon_selected_state(dialog_search, + ICON_SEARCH_CASE_SENSITIVE, !state); start_search(true); return true; case IS_WIMP_KEY | wimp_KEY_UP: @@ -270,8 +289,11 @@ return true; default: - if (key->c == 21) /* ctrl+u means the user's starting a new search */ + if (key->c == 21) { + /* ctrl+u means the user's starting + * a new search */ search_insert = true; + } if (key->c == 8 || /* backspace */ key->c == 21 || /* ctrl u */ (key->c >= 0x20 && key->c <= 0x7f)) { @@ -305,8 +327,10 @@ if (string_len <= 0) { free_matches(); show_status(true); - ro_gui_set_icon_shaded_state(dialog_search, ICON_SEARCH_FIND_PREV, true); - ro_gui_set_icon_shaded_state(dialog_search, ICON_SEARCH_FIND_NEXT, true); + ro_gui_set_icon_shaded_state(dialog_search, + ICON_SEARCH_FIND_PREV, true); + ro_gui_set_icon_shaded_state(dialog_search, + ICON_SEARCH_FIND_NEXT, true); gui_window_set_scroll(search_current_window, 0, 0); return; } @@ -392,7 +416,8 @@ c = search_current_window->bw->current_content; /* only handle html contents */ - if ((!c) || (c->type != CONTENT_HTML && c->type != CONTENT_TEXTPLAIN)) + if ((!c) || (c->type != CONTENT_HTML && + c->type != CONTENT_TEXTPLAIN)) return; box = c->data.html.layout; @@ -425,10 +450,12 @@ xhourglass_on(); if (c->type == CONTENT_HTML) - res = find_occurrences_html(string, string_len, box, case_sens); + res = find_occurrences_html(string, string_len, + box, case_sens); else { assert(c->type == CONTENT_TEXTPLAIN); - res = find_occurrences_text(string, string_len, c, case_sens); + res = find_occurrences_text(string, string_len, + c, case_sens); } if (!res) { @@ -462,7 +489,8 @@ } show_status(search_current != NULL); - show_all(ro_gui_get_icon_selected_state(dialog_search, ICON_SEARCH_SHOW_ALL)); + show_all(ro_gui_get_icon_selected_state(dialog_search, + ICON_SEARCH_SHOW_ALL)); ro_gui_set_icon_shaded_state(dialog_search, ICON_SEARCH_FIND_PREV, !search_current || !search_current->prev); @@ -475,9 +503,11 @@ switch (c->type) { case CONTENT_HTML: /* get box position and jump to it */ - box_coords(search_current->start_box, &bounds.x0, &bounds.y0); + box_coords(search_current->start_box, + &bounds.x0, &bounds.y0); /* \todo: move x0 in by correct idx */ - box_coords(search_current->end_box, &bounds.x1, &bounds.y1); + box_coords(search_current->end_box, + &bounds.x1, &bounds.y1); /* \todo: move x1 in by correct idx */ bounds.x1 += search_current->end_box->width; bounds.y1 += search_current->end_box->height; @@ -485,7 +515,8 @@ default: assert(c->type == CONTENT_TEXTPLAIN); - textplain_coords_from_range(c, search_current->start_idx, + textplain_coords_from_range(c, + search_current->start_idx, search_current->end_idx, &bounds); break; } @@ -631,14 +662,17 @@ unsigned match_offset; const char *new_text; const char *pos = find_pattern(text, length, - pattern, p_len, case_sens, &match_length); + pattern, p_len, case_sens, + &match_length); if (!pos) break; /* found string in box => add to list */ match_offset = pos - cur->text; entry = add_entry(cur->byte_offset + match_offset, - cur->byte_offset + match_offset + match_length); + cur->byte_offset + + match_offset + + match_length); if (!entry) return false; @@ -679,7 +713,8 @@ for(line = 0; line < nlines; line++) { size_t offset, length; - const char *text = textplain_get_line(c, line, &offset, &length); + const char *text = textplain_get_line(c, line, + &offset, &length); if (text) { while (length > 0) { struct list_entry *entry; @@ -687,12 +722,14 @@ size_t start_idx; const char *new_text; const char *pos = find_pattern(text, length, - pattern, p_len, case_sens, &match_length); + pattern, p_len, case_sens, + &match_length); if (!pos) break; /* found string in line => add to list */ start_idx = offset + (pos - text); - entry = add_entry(start_idx, start_idx + match_length); + entry = add_entry(start_idx, start_idx + + match_length); if (!entry) return false; @@ -763,7 +800,8 @@ struct list_entry *a; for(a = search_found->next; a; a = a->next) if (a->sel && selection_defined(a->sel) && - selection_highlighted(a->sel, start_offset, end_offset, + selection_highlighted(a->sel, + start_offset, end_offset, start_idx, end_idx)) return true; } @@ -797,10 +835,12 @@ struct content *c = search_current_window->bw->current_content; switch (c->type) { case CONTENT_HTML: - selection_init(a->sel, c->data.html.layout); + selection_init(a->sel, + c->data.html.layout); break; default: - assert(c->type == CONTENT_TEXTPLAIN); + assert(c->type == + CONTENT_TEXTPLAIN); selection_init(a->sel, NULL); break; } Modified: trunk/netsurf/riscos/window.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/window.c?rev=3227&r1=3226&... ============================================================================== --- trunk/netsurf/riscos/window.c (original) +++ trunk/netsurf/riscos/window.c Mon Mar 26 22:09:25 2007 @@ -518,18 +518,18 @@ */ void gui_window_redraw_window(struct gui_window *g) { - wimp_window_info info; - os_error *error; + wimp_window_info info; + os_error *error; assert(g); info.w = g->window; - error = xwimp_get_window_info_header_only(&info); - if (error) { - LOG(("xwimp_get_window_info_header_only: 0x%x: %s", - error->errnum, error->errmess)); - warn_user("WimpError", error->errmess); - return; - } + error = xwimp_get_window_info_header_only(&info); + if (error) { + LOG(("xwimp_get_window_info_header_only: 0x%x: %s", + error->errnum, error->errmess)); + warn_user("WimpError", error->errmess); + return; + } error = xwimp_force_redraw(g->window, info.extent.x0, info.extent.y0, info.extent.x1, info.extent.y1); if (error) { @@ -787,7 +787,7 @@ bw->x1 = x1 = parent->x0 + x1; bw->y1 = y1 = parent->y0 + y1; } - + /* only scale iframe locations */ if (bw->browser_window_type == BROWSER_WINDOW_IFRAME) scale = g->option.scale; @@ -1137,8 +1137,6 @@ void gui_window_new_content(struct gui_window *g) { - if (search_current_window == g) - ro_gui_search_end(dialog_search); ro_gui_menu_objects_moved(); ro_gui_prepare_navigate(g); ro_gui_dialog_close_persistent(g->window); @@ -1395,7 +1393,7 @@ ro_gui_dialog_update_zoom(g); if (!content_get_reformat(c)) { browser_window_update(g->bw, false); - } else { + } else { g->reformat_pending = true; gui_reformat_pending = true; } @@ -1735,7 +1733,7 @@ height -= toolbar_height; } } - + /* the top-level framed window is a total pain. to get it to maximise to the * top of the screen we need to fake it having a suitably large extent */ if (g->bw->children && (g->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) {

16 years, 6 months

1
0
0 / 0

r3226 rjw - in /trunk/netsurf/riscos: menus.c wimp_event.c wimp_event.h

by netsurf＠semichrome.net

Author: rjw Date: Mon Mar 26 21:33:50 2007 New Revision: 3226 URL: http://svn.semichrome.net?rev=3226&view=rev Log: Call close function for submenu windows. Modified: trunk/netsurf/riscos/menus.c trunk/netsurf/riscos/wimp_event.c trunk/netsurf/riscos/wimp_event.h Modified: trunk/netsurf/riscos/menus.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/menus.c?rev=3226&r1=3225&r... ============================================================================== --- trunk/netsurf/riscos/menus.c (original) +++ trunk/netsurf/riscos/menus.c Mon Mar 26 21:33:50 2007 @@ -574,10 +574,7 @@ current_menu = NULL; if (cleanup) { - /* end any search operation that was started so that - the text doesn't remain highlighted */ - if (ro_gui_menu_search_window_menu) - ro_gui_search_end(dialog_search); + ro_gui_wimp_event_menus_closed(); if (tree) ro_gui_tree_menu_closed(tree); @@ -726,6 +723,7 @@ entries[warning->selection.items[i]]; if (IS_MENU(menu_entry->sub_menu)) { + ro_gui_wimp_event_register_submenu((wimp_w)0); sub_menu = menu_entry->sub_menu; i = 0; do { @@ -736,6 +734,7 @@ action, false); } while (!(sub_menu->entries[i++].menu_flags & wimp_MENU_LAST)); } else { + ro_gui_wimp_event_register_submenu((wimp_w)menu_entry->sub_menu); action = ro_gui_menu_find_action(current_menu, menu_entry); if (action != NO_ACTION) ro_gui_menu_prepare_action(current_menu_window, Modified: trunk/netsurf/riscos/wimp_event.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/wimp_event.c?rev=3226&r1=3... ============================================================================== --- trunk/netsurf/riscos/wimp_event.c (original) +++ trunk/netsurf/riscos/wimp_event.c Mon Mar 26 21:33:50 2007 @@ -100,6 +100,7 @@ static struct event_window *ro_gui_wimp_event_windows[WIN_HASH_SIZE]; +static wimp_w ro_gui_wimp_event_submenu; /** * Memorises the current state of any registered components in a window. @@ -856,6 +857,8 @@ struct event_window *window; LOG(("Close event received for window 0x%x", (unsigned int)w)); + if (w == ro_gui_wimp_event_submenu) + ro_gui_wimp_event_submenu = 0; window = ro_gui_wimp_event_find_window(w); if ((window) && (window->close_window)) { window->close_window(w); @@ -1216,3 +1219,19 @@ return event; } + +/** + * Handle menus being closed + */ +void ro_gui_wimp_event_menus_closed(void) { + ro_gui_wimp_event_register_submenu(0); +} + +/** + * Register a submenu as being opened + */ +void ro_gui_wimp_event_register_submenu(wimp_w w) { + if (ro_gui_wimp_event_submenu) + ro_gui_wimp_event_close_window(ro_gui_wimp_event_submenu); + ro_gui_wimp_event_submenu = w; +} Modified: trunk/netsurf/riscos/wimp_event.h URL: http://svn.semichrome.net/trunk/netsurf/riscos/wimp_event.h?rev=3226&r1=3... ============================================================================== --- trunk/netsurf/riscos/wimp_event.h (original) +++ trunk/netsurf/riscos/wimp_event.h Mon Mar 26 21:33:50 2007 @@ -68,4 +68,7 @@ bool ro_gui_wimp_event_register_menu_selection(wimp_w w, void (*callback)(wimp_w w, wimp_i i)); +void ro_gui_wimp_event_menus_closed(void); +void ro_gui_wimp_event_register_submenu(wimp_w w); + #endif

16 years, 6 months

1
0
0 / 0

r3225 rjw - in /trunk/netsurf/riscos: dialog.c wimp_event.c

by netsurf＠semichrome.net

Author: rjw Date: Mon Mar 26 13:28:19 2007 New Revision: 3225 URL: http://svn.semichrome.net?rev=3225&view=rev Log: Call close functions when automatically closing child windows and when automatically handlign Cancel buttons. Modified: trunk/netsurf/riscos/dialog.c trunk/netsurf/riscos/wimp_event.c Modified: trunk/netsurf/riscos/dialog.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/dialog.c?rev=3225&r1=3224&... ============================================================================== --- trunk/netsurf/riscos/dialog.c (original) +++ trunk/netsurf/riscos/dialog.c Mon Mar 26 13:28:19 2007 @@ -365,9 +365,7 @@ } /* Close any child windows */ - for (i = 0; i < MAX_PERSISTENT; i++) - if (persistent_dialog[i].parent == close) - ro_gui_dialog_close(persistent_dialog[i].dialog); + ro_gui_dialog_close_persistent(close); /* Give the caret back to the parent window. This code relies on the fact that only tree windows and browser windows open @@ -642,6 +640,8 @@ if (persistent_dialog[i].parent == parent && persistent_dialog[i].dialog != NULL) { ro_gui_dialog_close(persistent_dialog[i].dialog); + ro_gui_wimp_event_close_window(persistent_dialog[i].dialog); + persistent_dialog[i].parent = NULL; persistent_dialog[i].dialog = NULL; } } Modified: trunk/netsurf/riscos/wimp_event.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/wimp_event.c?rev=3225&r1=3... ============================================================================== --- trunk/netsurf/riscos/wimp_event.c (original) +++ trunk/netsurf/riscos/wimp_event.c Mon Mar 26 13:28:19 2007 @@ -227,6 +227,7 @@ struct event_window *window; struct icon_event *event; + LOG(("Removing all events for window 0x%x", (unsigned int)w)); window = ro_gui_wimp_event_remove_window(w); if (!window) return; @@ -544,6 +545,7 @@ case EVENT_CANCEL: if (pointer->buttons & wimp_CLICK_SELECT) { ro_gui_dialog_close(pointer->w); + ro_gui_wimp_event_close_window(pointer->w); ro_gui_menu_closed(true); } else { ro_gui_wimp_event_restore(pointer->w); @@ -622,6 +624,7 @@ if (state & wimp_CLICK_SELECT) { ro_gui_dialog_close(window->w); + ro_gui_wimp_event_close_window(window->w); ro_gui_menu_closed(true); } else { ro_gui_wimp_event_memorise(window->w); @@ -812,6 +815,7 @@ wimp_WINDOW_CLOSE_ICON)) return false; ro_gui_dialog_close(key->w); + ro_gui_wimp_event_close_window(key->w); ro_gui_menu_closed(true); return true; /* Return performs the OK action */ @@ -851,6 +855,7 @@ bool ro_gui_wimp_event_close_window(wimp_w w) { struct event_window *window; + LOG(("Close event received for window 0x%x", (unsigned int)w)); window = ro_gui_wimp_event_find_window(w); if ((window) && (window->close_window)) { window->close_window(w); @@ -1122,10 +1127,12 @@ struct event_window *window; int h; + assert((int)w != 0); window = ro_gui_wimp_event_find_window(w); if (window) return window; + LOG(("Creating structure for window 0x%x", (unsigned int)w)); window = calloc(1, sizeof(struct event_window)); if (!window) return NULL;

16 years, 6 months

1
0
0 / 0

r3224 jmb - /trunk/netsurf/desktop/browser.c

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 25 20:32:41 2007 New Revision: 3224 URL: http://svn.semichrome.net?rev=3224&view=rev Log: Minor tidying Modified: trunk/netsurf/desktop/browser.c Modified: trunk/netsurf/desktop/browser.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/browser.c?rev=3224&r1=322... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Sun Mar 25 20:32:41 2007 @@ -962,13 +962,6 @@ return; content_reformat(c, width, height); - -// if (c->type == CONTENT_HTML && c->data.html.frameset) -// browser_window_recalculate_frameset(bw); - - /* CONTENT_MSG_REFORMAT handles the repositioning of iframes */ -// if (c->type == CONTENT_HTML && c->data.html.iframe) -// browser_window_recalculate_iframes(bw); } @@ -992,9 +985,9 @@ void browser_window_set_scale_internal(struct browser_window *bw, float scale) { - int i; - - gui_window_set_scale(bw->window, scale); + int i; + + gui_window_set_scale(bw->window, scale); for (i = 0; i < (bw->cols * bw->rows); i++) browser_window_set_scale_internal(&bw->children[i], scale);

16 years, 6 months

1
0
0 / 0

r3223 tlsa - in /trunk/netsurftest: crashes/absolute-container-assertion.html works/absolute-container-assertion.html

by netsurf＠semichrome.net

Author: tlsa Date: Sun Mar 25 17:32:13 2007 New Revision: 3223 URL: http://svn.semichrome.net?rev=3223&view=rev Log: Move testcase from crashes/ to works/. Added: trunk/netsurftest/works/absolute-container-assertion.html - copied unchanged from r3222, trunk/netsurftest/crashes/absolute-container-assertion.html Removed: trunk/netsurftest/crashes/absolute-container-assertion.html Removed: trunk/netsurftest/crashes/absolute-container-assertion.html URL: http://svn.semichrome.net/trunk/netsurftest/crashes/absolute-container-as... ============================================================================== --- trunk/netsurftest/crashes/absolute-container-assertion.html (original) +++ trunk/netsurftest/crashes/absolute-container-assertion.html (removed) @@ -1,21 +1,0 @@ -<html> -<head> -<title>Public Advisory: 10.17.06 // iDefense Labs</title> -<style type="text/css"> -#div_anchor { - position: absolute; - top: 0px; - left: 0px; -} - -html { /* Use this for forcing vertical scrollbars in FF */ - overflow: scroll; - margin-bottom: -20px; -} - -</style> -</head> -<body> -<div id="div_anchor"></div> -</body> -</html>

16 years, 6 months

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 25 17:20:10 2007 New Revision: 3222 URL: http://svn.semichrome.net?rev=3222&view=rev Log: Fix assertion when table has negative mbp (1579981) Modified: trunk/netsurf/render/layout.c Modified: trunk/netsurf/render/layout.c URL: http://svn.semichrome.net/trunk/netsurf/render/layout.c?rev=3222&r1=3221&... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Sun Mar 25 17:20:10 2007 @@ -2358,6 +2358,10 @@ /* add margins, border, padding to min, max widths */ calculate_mbp_width(table->style, LEFT, &extra_fixed, &extra_frac); calculate_mbp_width(table->style, RIGHT, &extra_fixed, &extra_frac); + if (extra_fixed < 0) + extra_fixed = 0; + if (extra_frac < 0) + extra_frac = 0; if (1.0 <= extra_frac) extra_frac = 0.9; table->min_width = (table_min + extra_fixed) / (1.0 - extra_frac);

16 years, 6 months

1
0
0 / 0

r3221 jmb - in /trunk/netsurftest: crashes/negative-margin-crash.html works/negative-margin-crash.html

by netsurf＠semichrome.net

Author: jmb Date: Sun Mar 25 17:19:07 2007 New Revision: 3221 URL: http://svn.semichrome.net?rev=3221&view=rev Log: Crash fixed - move to works/ Added: trunk/netsurftest/works/negative-margin-crash.html - copied unchanged from r3216, trunk/netsurftest/crashes/negative-margin-crash.html Removed: trunk/netsurftest/crashes/negative-margin-crash.html Removed: trunk/netsurftest/crashes/negative-margin-crash.html URL: http://svn.semichrome.net/trunk/netsurftest/crashes/negative-margin-crash... ============================================================================== --- trunk/netsurftest/crashes/negative-margin-crash.html (original) +++ trunk/netsurftest/crashes/negative-margin-crash.html (removed) @@ -1,11 +1,0 @@ -<html> -<body> - -<table style="margin: 0 -180px 0 0;"> - <tr> - <td>The -ve margin on TABLE makes NetSurf assert.</td> - </tr> -</table> - -</body> -</html>

16 years, 6 months

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: jmb Date: Sat Mar 24 23:47:44 2007 New Revision: 3220 URL: http://svn.semichrome.net?rev=3220&view=rev Log: Fix handling of scrollbar addition to blocks which have height/width == AUTO (fixes 1567430) Modified: trunk/netsurf/render/layout.c Modified: trunk/netsurf/render/layout.c URL: http://svn.semichrome.net/trunk/netsurf/render/layout.c?rev=3220&r1=3219&... ============================================================================== --- trunk/netsurf/render/layout.c (original) +++ trunk/netsurf/render/layout.c Sat Mar 24 23:47:44 2007 @@ -48,6 +48,7 @@ static void layout_minmax_block(struct box *block); static bool layout_block_object(struct box *block); static void layout_block_find_dimensions(int available_width, struct box *box); +static void layout_block_add_scrollbar(struct box *box, int which); static int layout_solve_width(int available_width, int width, int margin[4], int padding[4], int border[4]); static void layout_float_find_dimensions(int available_width, @@ -243,9 +244,11 @@ goto advance_to_next_box; } - if (box->type == BOX_BLOCK || box->object) + if (box->type == BOX_BLOCK || box->object) { layout_block_find_dimensions(box->parent->width, box); - else if (box->type == BOX_TABLE) { + layout_block_add_scrollbar(box, RIGHT); + layout_block_add_scrollbar(box, BOTTOM); + } else if (box->type == BOX_TABLE) { if (!layout_table(box, box->parent->width, content)) return false; layout_solve_width(box->parent->width, box->width, @@ -339,8 +342,12 @@ continue; } else if (box->type == BOX_BLOCK || box->object) cy += box->padding[TOP]; - if (box->type == BOX_BLOCK && box->height == AUTO) + + if (box->type == BOX_BLOCK && box->height == AUTO) { box->height = 0; + layout_block_add_scrollbar(box, BOTTOM); + } + cy += box->height + box->padding[BOTTOM] + box->border[BOTTOM]; max_pos_margin = max_neg_margin = 0; if (max_pos_margin < box->margin[BOTTOM]) @@ -358,9 +365,11 @@ box = box->parent; if (box == block) break; - if (box->height == AUTO) + if (box->height == AUTO) { box->height = y - box->padding[TOP]; - else + if (box->type == BOX_BLOCK) + layout_block_add_scrollbar(box, BOTTOM); + } else cy += box->height - (y - box->padding[TOP]); cy += box->padding[BOTTOM] + @@ -391,8 +400,11 @@ cy = y; } - if (block->height == AUTO) + if (block->height == AUTO) { block->height = cy - block->padding[TOP]; + if (block->type == BOX_BLOCK) + layout_block_add_scrollbar(block, BOTTOM); + } return true; } @@ -555,27 +567,37 @@ padding, border); box->height = height; - if (style->overflow == CSS_OVERFLOW_SCROLL || - style->overflow == CSS_OVERFLOW_AUTO) { - /* make space for scrollbars */ - if (style->overflow == CSS_OVERFLOW_SCROLL || - box_hscrollbar_present(box)) { - box->height -= SCROLLBAR_WIDTH; - box->padding[BOTTOM] += SCROLLBAR_WIDTH; - } - if (style->overflow == CSS_OVERFLOW_SCROLL || - box_vscrollbar_present(box)) { - box->width -= SCROLLBAR_WIDTH; - box->padding[RIGHT] += SCROLLBAR_WIDTH; - } - } - if (margin[TOP] == AUTO) margin[TOP] = 0; if (margin[BOTTOM] == AUTO) margin[BOTTOM] = 0; } +/** + * Manipulate a block's [RB]padding/height/width to accommodate scrollbars + */ + +void layout_block_add_scrollbar(struct box *box, int which) +{ + assert(box->type == BOX_BLOCK && (which == RIGHT || which == BOTTOM)); + + if (box->style && (box->style->overflow == CSS_OVERFLOW_SCROLL || + box->style->overflow == CSS_OVERFLOW_AUTO)) { + /* make space for scrollbars, unless height/width are AUTO */ + if (which == BOTTOM && box->height != AUTO && + (box->style->overflow == CSS_OVERFLOW_SCROLL || + box_hscrollbar_present(box))) { + box->height -= SCROLLBAR_WIDTH; + box->padding[BOTTOM] += SCROLLBAR_WIDTH; + } + if (which == RIGHT && box->width != AUTO && + (box->style->overflow == CSS_OVERFLOW_SCROLL || + box_vscrollbar_present(box))) { + box->width -= SCROLLBAR_WIDTH; + box->padding[RIGHT] += SCROLLBAR_WIDTH; + } + } +} /** * Solve the width constraint as given in CSS 2.1 section 10.3.3.

16 years, 6 months

1
0
0 / 0

r3219 jmb - /trunk/netsurftest/works/overflow-auto-height.html

by netsurf＠semichrome.net

Author: jmb Date: Sat Mar 24 23:45:58 2007 New Revision: 3219 URL: http://svn.semichrome.net?rev=3219&view=rev Log: Add testcase for interaction between overflow: auto; and undefined block height. Added: trunk/netsurftest/works/overflow-auto-height.html Added: trunk/netsurftest/works/overflow-auto-height.html URL: http://svn.semichrome.net/trunk/netsurftest/works/overflow-auto-height.ht... ============================================================================== --- trunk/netsurftest/works/overflow-auto-height.html (added) +++ trunk/netsurftest/works/overflow-auto-height.html Sat Mar 24 23:45:58 2007 @@ -1,0 +1,77 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <title>W3C QA - Recommended list of DTDs you can use in your Web document</title> + <style type="text/css" media="all"> +body +{ + margin: auto auto; + padding-left: 6%; + padding-right: 6%; +} + + +#main, address +{ + padding: 15px; +} + +address +{ + background-image: url(../images/netsurf.png); +} + +pre.html +{ + width: 70%; + margin: auto; + overflow: auto; +} + + </style> +</head> +<body> + +<div id="main"> + + +<dl> + <dt class="specification">HTML 4.01:</dt> + <dd class="dtd"><pre class="html"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" + "http://www.w3.org/TR/html4/frameset.dtd"> + </pre> +</dd> + + <dt class="specification">XHTML 1.0:</dt> + <dd class="dtd"><pre class="html"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> + </pre> +</dd> + +</dl> + +<dl> + <dt>HTML 4.0</dt> + <dd>http://www.w3.org/TR/1998/REC-html40-19980424/strict.dtd</dd> +</dl> + +</div> + +<address> + Last updated: $Date: 2006/07/25 02:48:06 $ by $Author: kdubost $ +</address> + +</body> +</html>

16 years, 6 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 March 2007