August 2006 - netsurf-commits - listmaster.pepperfish.net

r2863 rjek - /trunk/netsurf/gtk/font_pango.c

by netsurf＠semichrome.net

Author: rjek Date: Thu Aug 17 22:28:40 2006 New Revision: 2863 URL: http://svn.semichrome.net?rev=2863&view=rev Log: Make nsgtk's rendering pay attention to font name choices Modified: trunk/netsurf/gtk/font_pango.c Modified: trunk/netsurf/gtk/font_pango.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/font_pango.c?rev=2863&r1=2862... ============================================================================== --- trunk/netsurf/gtk/font_pango.c (original) +++ trunk/netsurf/gtk/font_pango.c Thu Aug 17 22:28:40 2006 @@ -254,7 +254,25 @@ assert(style->font_size.size == CSS_FONT_SIZE_LENGTH); - desc = pango_font_description_new(); + switch (style->font_family) { + case CSS_FONT_FAMILY_SERIF: + desc = pango_font_description_from_string(option_font_serif); + break; + case CSS_FONT_FAMILY_MONOSPACE: + desc = pango_font_description_from_string(option_font_mono); + break; + case CSS_FONT_FAMILY_CURSIVE: + desc = pango_font_description_from_string(option_font_cursive); + break; + case CSS_FONT_FAMILY_FANTASY: + desc = pango_font_description_from_string(option_font_fantasy); + break; + case CSS_FONT_FAMILY_SANS_SERIF: + default: + desc = pango_font_description_from_string(option_font_sans); + break; + } + if (style->font_size.value.length.unit == CSS_UNIT_PX) size = style->font_size.value.length.value; @@ -303,25 +321,6 @@ else pango_font_description_set_size(desc, size); - switch (style->font_family) { - case CSS_FONT_FAMILY_SERIF: - pango_font_description_set_family_static(desc, "Serif"); - break; - case CSS_FONT_FAMILY_MONOSPACE: - pango_font_description_set_family_static(desc, "Monospace"); - break; - case CSS_FONT_FAMILY_CURSIVE: - pango_font_description_set_family_static(desc, "Cursive"); - break; - case CSS_FONT_FAMILY_FANTASY: - pango_font_description_set_family_static(desc, "Fantasy"); - break; - case CSS_FONT_FAMILY_SANS_SERIF: - default: - pango_font_description_set_family_static(desc, "Sans"); - break; - } - switch (style->font_variant) { case CSS_FONT_VARIANT_SMALL_CAPS: pango_font_description_set_variant(desc, PANGO_VARIANT_SMALL_CAPS);

16 years, 9 months

1
0
0 / 0

r2862 rjek - in /trunk/netsurf/gtk: gtk_options.c netsurf.glade

by netsurf＠semichrome.net

Author: rjek Date: Thu Aug 17 21:31:24 2006 New Revision: 2862 URL: http://svn.semichrome.net?rev=2862&view=rev Log: Added font selection to nsgtk choices window. Still not used for plotting. Modified: trunk/netsurf/gtk/gtk_options.c trunk/netsurf/gtk/netsurf.glade Modified: trunk/netsurf/gtk/gtk_options.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_options.c?rev=2862&r1=286... ============================================================================== --- trunk/netsurf/gtk/gtk_options.c (original) +++ trunk/netsurf/gtk/gtk_options.c Thu Aug 17 21:31:24 2006 @@ -106,6 +106,7 @@ #define SET_SPIN(x, y) gtk_spin_button_set_value(GTK_SPIN_BUTTON((x)), (y)) #define SET_CHECK(x, y) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON((x)), (y)) #define SET_COMBO(x, y) gtk_combo_box_set_active(GTK_COMBO_BOX((x)), (y)) +#define SET_FONT(x, y) gtk_font_button_set_font_name(GTK_FONT_BUTTON((x)), (y)) void nsgtk_options_load(void) { char b[20]; @@ -131,6 +132,11 @@ SET_CHECK(checkDisableAnimations, !option_animate_images); /* TODO: set all font name widgets here */ + SET_FONT(fontSansSerif, option_font_sans); + SET_FONT(fontSerif, option_font_serif); + SET_FONT(fontMonospace, option_font_mono); + SET_FONT(fontCursive, option_font_cursive); + SET_FONT(fontFantasy, option_font_fantasy); SET_COMBO(comboDefault, option_font_default - 1); SET_SPIN(spinDefaultSize, option_font_size / 10); SET_SPIN(spinMinimumSize, option_font_min_size / 10); @@ -144,6 +150,8 @@ #define GET_CHECK(x, y) (y) = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON((x))) #define GET_SPIN(x, y) (y) = gtk_spin_button_get_value(GTK_SPIN_BUTTON((x))) #define GET_COMBO(x, y) (y) = gtk_combo_box_get_active(GTK_COMBO_BOX((x))) +#define GET_FONT(x, y) if ((y)) free((y)); \ + (y) = strdup(gtk_font_button_get_font_name(GTK_FONT_BUTTON((x)))) void nsgtk_options_save(void) { GET_ENTRY(entryHomePageURL, option_homepage_url); @@ -152,6 +160,11 @@ GET_CHECK(checkUseCairo, option_render_cairo); GET_CHECK(checkResampleImages, option_render_resample); + GET_FONT(fontSansSerif, option_font_sans); + GET_FONT(fontSerif, option_font_serif); + GET_FONT(fontMonospace, option_font_mono); + GET_FONT(fontCursive, option_font_cursive); + GET_FONT(fontFantasy, option_font_fantasy); GET_COMBO(comboDefault, option_font_default); option_font_default++; Modified: trunk/netsurf/gtk/netsurf.glade URL: http://svn.semichrome.net/trunk/netsurf/gtk/netsurf.glade?rev=2862&r1=286... ============================================================================== --- trunk/netsurf/gtk/netsurf.glade (original) +++ trunk/netsurf/gtk/netsurf.glade Thu Aug 17 21:31:24 2006 @@ -3466,7 +3466,6 @@ <child> <widget class="GtkFontButton" id="fontSerif"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="show_style">False</property> <property name="show_size">False</property> @@ -3487,7 +3486,6 @@ <child> <widget class="GtkFontButton" id="fontMonospace"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="show_style">False</property> <property name="show_size">False</property> @@ -3508,7 +3506,6 @@ <child> <widget class="GtkFontButton" id="fontCursive"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="show_style">False</property> <property name="show_size">False</property> @@ -3529,7 +3526,6 @@ <child> <widget class="GtkFontButton" id="fontFantasy"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="show_style">False</property> <property name="show_size">False</property> @@ -3571,7 +3567,6 @@ <child> <widget class="GtkFontButton" id="fontSansSerif"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="show_style">False</property> <property name="show_size">False</property>

16 years, 9 months

1
0
0 / 0

r2861 rjek - in /trunk/netsurf/gtk: gtk_options.c netsurf.glade

by netsurf＠semichrome.net

Author: rjek Date: Thu Aug 17 21:14:22 2006 New Revision: 2861 URL: http://svn.semichrome.net?rev=2861&view=rev Log: Implement default font style choice in nsgtk Choices dialogue Modified: trunk/netsurf/gtk/gtk_options.c trunk/netsurf/gtk/netsurf.glade Modified: trunk/netsurf/gtk/gtk_options.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_options.c?rev=2861&r1=286... ============================================================================== --- trunk/netsurf/gtk/gtk_options.c (original) +++ trunk/netsurf/gtk/gtk_options.c Thu Aug 17 21:14:22 2006 @@ -105,6 +105,7 @@ #define SET_ENTRY(x, y) gtk_entry_set_text(GTK_ENTRY((x)), (y)) #define SET_SPIN(x, y) gtk_spin_button_set_value(GTK_SPIN_BUTTON((x)), (y)) #define SET_CHECK(x, y) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON((x)), (y)) +#define SET_COMBO(x, y) gtk_combo_box_set_active(GTK_COMBO_BOX((x)), (y)) void nsgtk_options_load(void) { char b[20]; @@ -130,6 +131,7 @@ SET_CHECK(checkDisableAnimations, !option_animate_images); /* TODO: set all font name widgets here */ + SET_COMBO(comboDefault, option_font_default - 1); SET_SPIN(spinDefaultSize, option_font_size / 10); SET_SPIN(spinMinimumSize, option_font_min_size / 10); @@ -140,7 +142,8 @@ #define GET_ENTRY(x, y) if ((y)) free((y)); \ (y) = strdup(gtk_entry_get_text(GTK_ENTRY((x)))) #define GET_CHECK(x, y) (y) = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON((x))) -#define GET_SPIN(x, y) (y) = gtk_spin_button_get_value(GTK_SPIN_BUTTON((x))); +#define GET_SPIN(x, y) (y) = gtk_spin_button_get_value(GTK_SPIN_BUTTON((x))) +#define GET_COMBO(x, y) (y) = gtk_combo_box_get_active(GTK_COMBO_BOX((x))) void nsgtk_options_save(void) { GET_ENTRY(entryHomePageURL, option_homepage_url); @@ -148,6 +151,9 @@ GET_CHECK(checkUseCairo, option_render_cairo); GET_CHECK(checkResampleImages, option_render_resample); + + GET_COMBO(comboDefault, option_font_default); + option_font_default++; GET_SPIN(spinDefaultSize, option_font_size); option_font_size *= 10; Modified: trunk/netsurf/gtk/netsurf.glade URL: http://svn.semichrome.net/trunk/netsurf/gtk/netsurf.glade?rev=2861&r1=286... ============================================================================== --- trunk/netsurf/gtk/netsurf.glade (original) +++ trunk/netsurf/gtk/netsurf.glade Thu Aug 17 21:14:22 2006 @@ -3550,9 +3550,8 @@ <child> <widget class="GtkComboBox" id="comboDefault"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="items" translatable="yes">Sans-serif -Sans +Serif Monospace Cursive Fantasy</property>

16 years, 9 months

1
0
0 / 0

r2860 rjek - in /trunk/netsurf/gtk: gtk_options.c gtk_window.c gtk_window.h

by netsurf＠semichrome.net

Author: rjek Date: Thu Aug 17 21:03:28 2006 New Revision: 2860 URL: http://svn.semichrome.net?rev=2860&view=rev Log: Redraw nsgtk browser windows when Choices...Apply is clicked. Modified: trunk/netsurf/gtk/gtk_options.c trunk/netsurf/gtk/gtk_window.c trunk/netsurf/gtk/gtk_window.h Modified: trunk/netsurf/gtk/gtk_options.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_options.c?rev=2860&r1=285... ============================================================================== --- trunk/netsurf/gtk/gtk_options.c (original) +++ trunk/netsurf/gtk/gtk_options.c Thu Aug 17 21:03:28 2006 @@ -14,6 +14,7 @@ #include "netsurf/desktop/options.h" #include "netsurf/gtk/options.h" #include "netsurf/gtk/gtk_gui.h" +#include "netsurf/gtk/gtk_window.h" #include "netsurf/gtk/gtk_options.h" GtkWindow *wndChoices; @@ -156,5 +157,6 @@ /* TODO: save the other options */ options_write(options_file_location); + nsgtk_reflow_all_windows(); } Modified: trunk/netsurf/gtk/gtk_window.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_window.c?rev=2860&r1=2859... ============================================================================== --- trunk/netsurf/gtk/gtk_window.c (original) +++ trunk/netsurf/gtk/gtk_window.c Thu Aug 17 21:03:28 2006 @@ -65,6 +65,8 @@ struct gtk_history_window *history_window; int last_x, last_y; + + struct gui_window *next, *prev; }; struct gtk_history_window { @@ -87,6 +89,7 @@ }; static int open_windows = 0; /**< current number of open browsers */ +static struct gui_window *window_list = 0; /**< first entry in win list*/ static wchar_t gdkkey_to_nskey(GdkEventKey *); static void nsgtk_window_destroy_event(GtkWidget *, gpointer); @@ -183,6 +186,16 @@ /* sentinel */ { NULL, NULL } }; + +void nsgtk_reflow_all_windows(void) +{ + struct gui_window *g = window_list; + + while (g != NULL) { + nsgtk_perform_deferred_resize(g); + g = g->next; + } +} void nsgtk_attach_menu_handlers(GladeXML *xml, gpointer g) { @@ -240,10 +253,7 @@ { struct gui_window *g = data; - gtk_widget_destroy(GTK_WIDGET(g->history_window->window)); gui_window_destroy(g); - if (--open_windows == 0) - netsurf_quit = true; } gboolean nsgtk_window_expose_event(GtkWidget *widget, @@ -662,6 +672,16 @@ g->scale = 1.0; g->careth = 0; + + /* add the window to the list of open windows. */ + g->prev = 0; + g->next = window_list; + + if (window_list) + window_list->prev = g; + window_list = g; + + open_windows++; /* load the window template from the glade xml file, and extract * widget references from it for later use. @@ -807,9 +827,6 @@ /* set up the menu signal handlers */ nsgtk_attach_menu_handlers(g->xml, g); - - /* increase the number of open windows. */ - open_windows++; /* finally, show the window. */ gtk_widget_show(GTK_WIDGET(g->window)); @@ -819,7 +836,21 @@ void gui_window_destroy(struct gui_window *g) { - + if (g->prev) + g->prev->next = g->next; + else + window_list = g->next; + + if (g->next) + g->next->prev = g->prev; + + gtk_widget_destroy(GTK_WIDGET(g->history_window->window)); + gtk_widget_destroy(GTK_WIDGET(g->window)); + + free(g); + + if (--open_windows == 0) + netsurf_quit = true; } void gui_window_set_title(struct gui_window *g, const char *title) Modified: trunk/netsurf/gtk/gtk_window.h URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_window.h?rev=2860&r1=2859... ============================================================================== --- trunk/netsurf/gtk/gtk_window.h (original) +++ trunk/netsurf/gtk/gtk_window.h Thu Aug 17 21:03:28 2006 @@ -6,7 +6,7 @@ */ #include <gtk/gtk.h> - +#include "netsurf/desktop/plotters.h" extern GtkWidget *current_widget; extern GdkDrawable *current_drawable; @@ -18,3 +18,4 @@ void nsgtk_plot_set_scale(float s); float nsgtk_plot_get_scale(void); void nsgtk_set_colour(colour c); +void nsgtk_reflow_all_windows(void);

16 years, 9 months

1
0
0 / 0

r2859 rjek - in /trunk/netsurf/gtk: font_pango.c gtk_options.c

by netsurf＠semichrome.net

Author: rjek Date: Thu Aug 17 20:41:14 2006 New Revision: 2859 URL: http://svn.semichrome.net?rev=2859&view=rev Log: Make nsgtk respect minimum font size setting, and save font size choices Modified: trunk/netsurf/gtk/font_pango.c trunk/netsurf/gtk/gtk_options.c Modified: trunk/netsurf/gtk/font_pango.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/font_pango.c?rev=2859&r1=2858... ============================================================================== --- trunk/netsurf/gtk/font_pango.c (original) +++ trunk/netsurf/gtk/font_pango.c Thu Aug 17 20:41:14 2006 @@ -21,6 +21,7 @@ #include "netsurf/render/font.h" #include "netsurf/utils/utils.h" #include "netsurf/utils/log.h" +#include "netsurf/desktop/options.h" /* Until we can consider the descenders etc, we need to not render using cairo */ #undef CAIRO_VERSION @@ -256,9 +257,14 @@ desc = pango_font_description_new(); if (style->font_size.value.length.unit == CSS_UNIT_PX) - size = style->font_size.value.length.value * PANGO_SCALE; + size = style->font_size.value.length.value; else - size = css_len2pt(&style->font_size.value.length, style) * PANGO_SCALE; + size = css_len2pt(&style->font_size.value.length, style); + + if (size < abs(option_font_min_size / 10)) + size = option_font_min_size / 10; + + size *= PANGO_SCALE; switch (style->font_style) { case CSS_FONT_STYLE_ITALIC: Modified: trunk/netsurf/gtk/gtk_options.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_options.c?rev=2859&r1=285... ============================================================================== --- trunk/netsurf/gtk/gtk_options.c (original) +++ trunk/netsurf/gtk/gtk_options.c Thu Aug 17 20:41:14 2006 @@ -139,6 +139,7 @@ #define GET_ENTRY(x, y) if ((y)) free((y)); \ (y) = strdup(gtk_entry_get_text(GTK_ENTRY((x)))) #define GET_CHECK(x, y) (y) = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON((x))) +#define GET_SPIN(x, y) (y) = gtk_spin_button_get_value(GTK_SPIN_BUTTON((x))); void nsgtk_options_save(void) { GET_ENTRY(entryHomePageURL, option_homepage_url); @@ -146,6 +147,12 @@ GET_CHECK(checkUseCairo, option_render_cairo); GET_CHECK(checkResampleImages, option_render_resample); + + GET_SPIN(spinDefaultSize, option_font_size); + option_font_size *= 10; + GET_SPIN(spinMinimumSize, option_font_min_size); + option_font_min_size *= 10; + /* TODO: save the other options */ options_write(options_file_location);

16 years, 9 months

1
0
0 / 0

r2858 rjek - in /trunk/netsurf/gtk: gtk_gui.c gtk_options.c gtk_window.c netsurf.glade

by netsurf＠semichrome.net

Author: rjek Date: Thu Aug 17 20:20:13 2006 New Revision: 2858 URL: http://svn.semichrome.net?rev=2858&view=rev Log: Fix nsgtk choices window. I have no idea why it worked before. Modified: trunk/netsurf/gtk/gtk_gui.c trunk/netsurf/gtk/gtk_options.c trunk/netsurf/gtk/gtk_window.c trunk/netsurf/gtk/netsurf.glade [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/netsurf/gtk/gtk_gui.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_gui.c?rev=2858&r1=2857&r2... Modified: trunk/netsurf/gtk/gtk_options.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_options.c?rev=2858&r1=285... Modified: trunk/netsurf/gtk/gtk_window.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_window.c?rev=2858&r1=2857... Modified: trunk/netsurf/gtk/netsurf.glade URL: http://svn.semichrome.net/trunk/netsurf/gtk/netsurf.glade?rev=2858&r1=285...

16 years, 9 months

1
0
0 / 0

r2857 rjek - /trunk/netsurf/gtk/netsurf.glade

by netsurf＠semichrome.net

Author: rjek Date: Thu Aug 17 19:31:14 2006 New Revision: 2857 URL: http://svn.semichrome.net?rev=2857&view=rev Log: Remove signal handler references from glade file to remove runtime warning. Modified: trunk/netsurf/gtk/netsurf.glade Modified: trunk/netsurf/gtk/netsurf.glade URL: http://svn.semichrome.net/trunk/netsurf/gtk/netsurf.glade?rev=2857&r1=285... ============================================================================== --- trunk/netsurf/gtk/netsurf.glade (original) +++ trunk/netsurf/gtk/netsurf.glade Thu Aug 17 19:31:14 2006 @@ -3660,8 +3660,6 @@ <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> <property name="response_id">-5</property> - <signal name="clicked" handler="nsgtk_401login_apply" last_modification_time="Sun, 06 Aug 2006 20:48:22 GMT"/> - <signal name="clicked" handler="gtk_widget_hide" last_modification_time="Sun, 06 Aug 2006 20:48:32 GMT"/> <child> <widget class="GtkAlignment" id="alignment14">

16 years, 9 months

1
0
0 / 0

r2856 rjw - in /branches/rjw/frames: desktop/browser.c riscos/window.c

by netsurf＠semichrome.net

Author: rjw Date: Thu Aug 17 16:04:17 2006 New Revision: 2856 URL: http://svn.semichrome.net?rev=2856&view=rev Log: Fix NULL read, initially open iframe content at correct width. Modified: branches/rjw/frames/desktop/browser.c branches/rjw/frames/riscos/window.c Modified: branches/rjw/frames/desktop/browser.c URL: http://svn.semichrome.net/branches/rjw/frames/desktop/browser.c?rev=2856&... ============================================================================== --- branches/rjw/frames/desktop/browser.c (original) +++ branches/rjw/frames/desktop/browser.c Thu Aug 17 16:04:17 2006 @@ -194,7 +194,7 @@ struct browser_window *window; struct content_html_iframe *cur; int iframes = 0; - int index = 0; + int index; for (cur = iframe; cur; cur = cur->next) iframes++; @@ -203,7 +203,8 @@ return; bw->iframe_count = iframes; - for (; iframe; iframe = iframe->next) { + index = 0; + for (cur = iframe; cur; cur = cur->next) { window = &(bw->iframes[index++]); /* content */ @@ -214,28 +215,33 @@ /* window characteristics */ window->drag_type = DRAGGING_NONE; window->browser_window_type = BROWSER_WINDOW_IFRAME; - window->scrolling = iframe->scrolling; - window->border = iframe->border; - window->border_colour = iframe->border_colour; + window->scrolling = cur->scrolling; + window->border = cur->border; + window->border_colour = cur->border_colour; window->no_resize = true; - window->margin_width = iframe->margin_width; - window->margin_height = iframe->margin_height; - if (iframe->name) - window->name = strdup(iframe->name); + window->margin_width = cur->margin_width; + window->margin_height = cur->margin_height; + if (cur->name) + window->name = strdup(cur->name); /* linking */ - window->box = iframe->box; + window->box = cur->box; window->parent = bw; /* gui window */ window->window = gui_create_browser_window(window, bw); - if (iframe->url) - browser_window_go(window, iframe->url, NULL, true); } /* calculate dimensions */ gui_window_update_extent(bw->window); browser_window_recalculate_iframes(bw); + + index = 0; + for (cur = iframe; cur; cur = cur->next) { + window = &(bw->iframes[index++]); + if (iframe->url) + browser_window_go(window, iframe->url, NULL, true); + } } Modified: branches/rjw/frames/riscos/window.c URL: http://svn.semichrome.net/branches/rjw/frames/riscos/window.c?rev=2856&r1... ============================================================================== --- branches/rjw/frames/riscos/window.c (original) +++ branches/rjw/frames/riscos/window.c Thu Aug 17 16:04:17 2006 @@ -333,8 +333,6 @@ state.next = wimp_HIDDEN; if (bw->parent) { top = browser_window_owner(bw); - LOG(("CHILD is type %i", bw->browser_window_type)); - LOG(("Owner is type %i", top->browser_window_type)); error = xwimp_open_window_nested((wimp_open *)&state, top->window->window, wimp_CHILD_LINKS_PARENT_WORK_AREA << wimp_CHILD_XORIGIN_SHIFT | @@ -364,9 +362,9 @@ /* and register event handlers */ ro_gui_wimp_event_register_keypress(g->window, ro_gui_window_keypress); - ro_gui_wimp_event_register_keypress(g->toolbar->toolbar_handle, - ro_gui_window_keypress); - + if (g->toolbar) + ro_gui_wimp_event_register_keypress(g->toolbar->toolbar_handle, + ro_gui_window_keypress); ro_gui_wimp_event_register_mouse_click(g->window, ro_gui_window_click);

16 years, 9 months

1
0
0 / 0

r2855 rjw - /trunk/netsurf/utils/url.c

by netsurf＠semichrome.net

Author: rjw Date: Thu Aug 17 15:48:28 2006 New Revision: 2855 URL: http://svn.semichrome.net?rev=2855&view=rev Log: Remove URL caching and fix NULL reads. Modified: trunk/netsurf/utils/url.c Modified: trunk/netsurf/utils/url.c URL: http://svn.semichrome.net/trunk/netsurf/utils/url.c?rev=2855&r1=2854&r2=2... ============================================================================== --- trunk/netsurf/utils/url.c (original) +++ trunk/netsurf/utils/url.c Thu Aug 17 15:48:28 2006 @@ -24,10 +24,7 @@ #include "netsurf/utils/utils.h" struct url_components { - union { - char *storage; /* buffer used for all the following data */ - int *users; - } internal; + char *buffer; /* buffer used for all the following data */ char *scheme; char *authority; char *path; @@ -36,12 +33,9 @@ }; url_func_result url_get_components(const char *url, - struct url_components *result, bool cache); + struct url_components *result); char *url_reform_components(struct url_components *components); void url_destroy_components(struct url_components *components); - -char *cached_url = NULL; -struct url_components cached_components; regex_t url_re, url_up_re; @@ -234,22 +228,22 @@ url_func_result url_join(const char *rel, const char *base, char **result) { - url_func_result status = URL_FUNC_NOMEM; - struct url_components base_components = {{0},0,0,0,0,0}; - struct url_components rel_components = {{0},0,0,0,0,0}; - struct url_components merged_components = {{0},0,0,0,0,0}; + struct url_components base_components = {0,0,0,0,0,0}; + struct url_components rel_components = {0,0,0,0,0,0}; + struct url_components merged_components = {0,0,0,0,0,0}; char *merge_path = NULL, *split_point; - char *input, *output = NULL, *start; + char *input, *output, *start = NULL; int len, buf_len; (*result) = 0; assert(base); assert(rel); - + + /* break down the relative URL (not cached, corruptable) */ - status = url_get_components(rel, &rel_components, false); + status = url_get_components(rel, &rel_components); if (status != URL_FUNC_OK) { LOG(("relative url '%s' failed to get components", rel)); return URL_FUNC_FAILED; @@ -261,8 +255,9 @@ goto url_join_reform_url; /* break down the base URL (possibly cached, not corruptable) */ - status = url_get_components(base, &base_components, true); + status = url_get_components(base, &base_components); if (status != URL_FUNC_OK) { + url_destroy_components(&rel_components); LOG(("base url '%s' failed to get components", base)); return URL_FUNC_FAILED; } @@ -275,15 +270,7 @@ /* [3] handle empty paths */ merged_components.authority = base_components.authority; if (!rel_components.path) { - /* we cannot refer directly to base_components.path as it - * may be in the cache and could get altered during dot - * removal in url_join_reform_url */ - merge_path = strdup(base_components.path); - if (!merge_path) { - LOG(("malloc failed")); - goto url_join_no_mem; - } - merged_components.path = merge_path; + merged_components.path = base_components.path; if (!rel_components.query) merged_components.query = base_components.query; goto url_join_reform_url; @@ -303,7 +290,9 @@ sprintf(merge_path, "/%s", rel_components.path); merged_components.path = merge_path; } else { - split_point = strrchr(base_components.path, '/'); + split_point = base_components.path ? + strrchr(base_components.path, '/') : + NULL; if (!split_point) { merged_components.path = rel_components.path; } else { @@ -405,19 +394,18 @@ } /* [3] */ merged_components.path = start; - output = start; } /* 5.3 */ *result = url_reform_components(&merged_components); - if (!(*result)) + if (!(*result)) goto url_join_no_mem; /* return success */ status = URL_FUNC_OK; url_join_no_mem: - free(output); + free(start); free(merge_path); url_destroy_components(&base_components); url_destroy_components(&rel_components); @@ -441,7 +429,7 @@ assert(url); - status = url_get_components(url, &components, true); + status = url_get_components(url, &components); if (status == URL_FUNC_OK) { if (!components.authority) { url_destroy_components(&components); @@ -484,7 +472,7 @@ assert(url); - status = url_get_components(url, &components, true); + status = url_get_components(url, &components); if (status == URL_FUNC_OK) { if (!components.scheme) { status = URL_FUNC_FAILED; @@ -514,7 +502,7 @@ assert(url); - status = url_get_components(url, &components, true); + status = url_get_components(url, &components); if (status == URL_FUNC_OK) { if ((!components.scheme) || (!components.authority)) { status = URL_FUNC_FAILED; @@ -549,7 +537,7 @@ assert(url); - status = url_get_components(url, &components, true); + status = url_get_components(url, &components); if (status == URL_FUNC_OK) { if ((!components.scheme) || (!components.authority) || (!components.path)) { @@ -597,7 +585,7 @@ assert(url); - status = url_get_components(url, &components, true); + status = url_get_components(url, &components); if (status == URL_FUNC_OK) { if (!components.path) { status = URL_FUNC_FAILED; @@ -637,7 +625,7 @@ assert(url); - status = url_get_components(url, &components, true); + status = url_get_components(url, &components); if (status == URL_FUNC_OK) { if (!components.path) { status = URL_FUNC_FAILED; @@ -840,13 +828,13 @@ assert(url1 && url2 && result); /* Decompose URLs */ - status = url_get_components(url1, &c1, false); + status = url_get_components(url1, &c1); if (status != URL_FUNC_OK) { url_destroy_components(&c1); return status; } - status = url_get_components(url2, &c2, false); + status = url_get_components(url2, &c2); if (status != URL_FUNC_OK) { url_destroy_components(&c2); url_destroy_components(&c1); @@ -900,13 +888,13 @@ * * \param url a valid absolute or relative URL * \param result pointer to buffer to hold components - * \param cache cache this result for subsequent calls * \return URL_FUNC_OK on success */ url_func_result url_get_components(const char *url, - struct url_components *result, bool cache) -{ + struct url_components *result) +{ + int storage_length; char *storage_end; const char *scheme; const char *authority; @@ -916,29 +904,15 @@ assert(url); - /* used cached components as a preference */ - if (!cache) { - if (cached_url && !strcmp(url, cached_url)) { - *result = cached_components; - result->internal.users[0]++; - return URL_FUNC_OK; - } - - /* clear the cache */ - free(cached_url); - cached_url = NULL; - url_destroy_components(&cached_components); - } + /* clear our return value */ memset(result, 0x00, sizeof(struct url_components)); - /* get enough storage space for a URL with termination at each node */ - result->internal.storage = malloc(strlen(url) + sizeof(int *) + 8); - if (!result->internal.storage) + storage_length = strlen(url) + 8; + result->buffer = malloc(storage_length); + if (!result->buffer) return URL_FUNC_NOMEM; - result->internal.users[0] = 1; - storage_end = (char *)(result->internal.users + 1); - + storage_end = result->buffer; /* look for a valid scheme */ scheme = url; @@ -1009,19 +983,10 @@ memcpy(storage_end, query + 1, fragment - query - 1); storage_end[fragment - query - 1] = '\0'; result->fragment = storage_end; -// storage_end += fragment - query; - } - - - /* cache our values */ - if (cache) { - cached_url = strdup(url); - if (cached_url) { - result->internal.users[0]++; - cached_components = *result; - } - } - + storage_end += fragment - query; + } + + assert((result->buffer + storage_length) >= storage_end); return URL_FUNC_OK; } @@ -1093,13 +1058,9 @@ { assert(components); - if (components->internal.storage) { - components->internal.users[0]--; - if (components->internal.users[0] == 0) { - free(components->internal.storage); - components->internal.storage = NULL; - } - } + if (components->buffer) + free(components->buffer); + components->buffer = NULL; }

16 years, 9 months

1
0
0 / 0

r2854 dsilvers - /trunk/netsurf/desktop/options.c

by netsurf＠semichrome.net

Author: dsilvers Date: Thu Aug 17 10:18:50 2006 New Revision: 2854 URL: http://svn.semichrome.net?rev=2854&view=rev Log: Change max_fetchers_per_host to 2, as the RFC states we SHOULD not hold more than 2 simultaneous connections to a host. Closes #1469511 Modified: trunk/netsurf/desktop/options.c Modified: trunk/netsurf/desktop/options.c URL: http://svn.semichrome.net/trunk/netsurf/desktop/options.c?rev=2854&r1=285... ============================================================================== --- trunk/netsurf/desktop/options.c (original) +++ trunk/netsurf/desktop/options.c Thu Aug 17 10:18:50 2006 @@ -99,7 +99,7 @@ /** Maximum simultaneous active fetchers per host. * (<=option_max_fetchers else it makes no sense */ -int option_max_fetchers_per_host = 5; +int option_max_fetchers_per_host = 2; /** Maximum number of inactive fetchers cached. * The total number of handles netsurf will therefore have open * is this plus option_max_fetchers.

16 years, 9 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 August 2006