Author: mmu_man Date: Mon Mar 21 16:15:58 2011 New Revision: 12119 URL: http://source.netsurf-browser.org?rev=12119&view=rev Log: Change rsrc: fetcher to check the mime type of resources from the extension. Add needed resource to get about: working. Added: trunk/netsurf/beos/res/en (with props) trunk/netsurf/beos/res/internal.css (with props) trunk/netsurf/beos/res/netsurf.png (with props) Modified: trunk/netsurf/beos/beos_fetch_rsrc.cpp trunk/netsurf/beos/beos_filetype.cpp trunk/netsurf/beos/beos_gui.cpp trunk/netsurf/beos/beos_res.rdef trunk/netsurf/beos/res/beosdefault.css Modified: trunk/netsurf/beos/beos_fetch_rsrc.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_fetch_rsrc.cpp?... ============================================================================== --- trunk/netsurf/beos/beos_fetch_rsrc.cpp (original) +++ trunk/netsurf/beos/beos_fetch_rsrc.cpp Mon Mar 21 16:15:58 2011 @@ -171,17 +171,10 @@ "Malformed rsrc: URL", 0, FETCH_ERROR_URL); return false; } - comma = strchr(slash, ','); + + // doesn't exist in the filesystem but we should hit the internal types. + c->mimetype = strdup(fetch_filetype(slash)); c->name = strdup(slash + 1); - - if (!comma) { - /* there is no mimetype here, assume text/plain */ - c->mimetype = strdup("text/plain;charset=US-ASCII"); - } else { - /* make a copy of everything after the comma */ - c->mimetype = strdup(comma + 1); - c->name[strlen(c->name) - strlen(comma)] = '\0'; - } if (c->mimetype == NULL) { fetch_rsrc_send_callback(FETCH_ERROR, c, Modified: trunk/netsurf/beos/beos_filetype.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_filetype.cpp?re... ============================================================================== --- trunk/netsurf/beos/beos_filetype.cpp (original) +++ trunk/netsurf/beos/beos_filetype.cpp Mon Mar 21 16:15:58 2011 @@ -96,6 +96,18 @@ // NOT THREADSAFE static char type[B_MIME_TYPE_LENGTH]; + // override reading the mime type for known types + // avoids getting CSS files as text/x-source-code + // even though it's the mime sniffer rules that should be fixed. + BString ext(unix_path); + ext.Remove(0, ext.FindLast('.') + 1); + for (i = 0; default_types[i].type; i++) { + if (ext == default_types[i].ext1) + return default_types[i].type; + if (ext == default_types[i].ext2) + return default_types[i].type; + } + BEntry entry(unix_path, true); BNode node(&entry); err = node.InitCheck(); @@ -109,18 +121,6 @@ err = info.InitCheck(); if (err < B_OK) return "test/plain"; - - // override reading the mime type for known types - // avoids getting CSS files as text/x-source-code - // even though it's the mime sniffer rules that should be fixed. - BString ext(unix_path); - ext.Remove(0, ext.FindLast('.') + 1); - for (i = 0; default_types[i].type; i++) { - if (ext == default_types[i].ext1) - return default_types[i].type; - if (ext == default_types[i].ext2) - return default_types[i].type; - } err = info.GetType(type); if (err < B_OK) { Modified: trunk/netsurf/beos/beos_gui.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_gui.cpp?rev=121... ============================================================================== --- trunk/netsurf/beos/beos_gui.cpp (original) +++ trunk/netsurf/beos/beos_gui.cpp Mon Mar 21 16:15:58 2011 @@ -616,7 +616,7 @@ /* set up stylesheet urls */ #ifdef USE_RESOURCES - default_stylesheet_url = strdup("rsrc:/beosdefault.css,text/css"); + default_stylesheet_url = strdup("rsrc:/beosdefault.css"); #else find_resource(buf, "beosdefault.css", "./beos/res/beosdefault.css"); default_stylesheet_url = path_to_url(buf); @@ -625,7 +625,7 @@ LOG(("Using '%s' as Default CSS URL", default_stylesheet_url)); #ifdef USE_RESOURCES - quirks_stylesheet_url = strdup("rsrc:/quirks.css,text/css"); + quirks_stylesheet_url = strdup("rsrc:/quirks.css"); #else find_resource(buf, "quirks.css", "./beos/res/quirks.css"); default_stylesheet_url = path_to_url(buf); @@ -633,7 +633,7 @@ #ifdef USE_RESOURCES - adblock_stylesheet_url = strdup("rsrc:/adblock.css,text/css"); + adblock_stylesheet_url = strdup("rsrc:/adblock.css"); #else find_resource(buf, "adblock.css", "./beos/res/adblock.css"); adblock_stylesheet_url = path_to_url(buf); Modified: trunk/netsurf/beos/beos_res.rdef URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_res.rdef?rev=12... ============================================================================== --- trunk/netsurf/beos/beos_res.rdef (original) +++ trunk/netsurf/beos/beos_res.rdef Mon Mar 21 16:15:58 2011 @@ -25,6 +25,8 @@ resource(204, "messages") #'data' import "res/messages"; /* resource(206, "about.en.html") #'data' import "res/about.en.html"; */ /* resource(210, "netsurf.xpm") #'data' import "res/netsurf.xpm"; */ +resource(205, "netsurf.png") #'data' import "res/netsurf.png"; +resource(206, "internal.css") #'data' import "res/internal.css"; /* throbber */ resource(400, "throbber0.png") #'data' import "res/throbber/throbber0.png"; @@ -36,6 +38,11 @@ resource(406, "throbber6.png") #'data' import "res/throbber/throbber6.png"; resource(407, "throbber7.png") #'data' import "res/throbber/throbber7.png"; resource(408, "throbber8.png") #'data' import "res/throbber/throbber8.png"; + +/* */ +resource(500, "credits.html") #'data' import "res/en/credits.html,faf"; +resource(501, "licence.html") #'data' import "res/en/licence.html,faf"; + resource(1, "BEOS:APP_FLAGS") (#'APPF') $"01000000"; Modified: trunk/netsurf/beos/res/beosdefault.css URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/beosdefault.css?... ============================================================================== --- trunk/netsurf/beos/res/beosdefault.css (original) +++ trunk/netsurf/beos/res/beosdefault.css Mon Mar 21 16:15:58 2011 @@ -5,7 +5,7 @@ /* Load base stylesheet. */ /*@import "default.css";*/ -@import "rsrc:/default.css,text/css"; +@import "rsrc:/default.css"; /* Apply GTK specific rules. */ Added: trunk/netsurf/beos/res/en URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/en?rev=12119&... ============================================================================== --- trunk/netsurf/beos/res/en (added) +++ trunk/netsurf/beos/res/en Mon Mar 21 16:15:58 2011 @@ -1,0 +1,1 @@ +link ../../!NetSurf/Resources/en Propchange: trunk/netsurf/beos/res/en ------------------------------------------------------------------------------ svn:special = * Added: trunk/netsurf/beos/res/internal.css URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/internal.css?rev... ============================================================================== --- trunk/netsurf/beos/res/internal.css (added) +++ trunk/netsurf/beos/res/internal.css Mon Mar 21 16:15:58 2011 @@ -1,0 +1,1 @@ +link ../../!NetSurf/Resources/internal.css,f79 Propchange: trunk/netsurf/beos/res/internal.css ------------------------------------------------------------------------------ svn:special = * Added: trunk/netsurf/beos/res/netsurf.png URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/netsurf.png?rev=... ============================================================================== --- trunk/netsurf/beos/res/netsurf.png (added) +++ trunk/netsurf/beos/res/netsurf.png Mon Mar 21 16:15:58 2011 @@ -1,0 +1,1 @@ +link ../../!NetSurf/Resources/netsurf.png,b60 Propchange: trunk/netsurf/beos/res/netsurf.png ------------------------------------------------------------------------------ svn:special = *