From b419853b1e1fba3d92b1616f46749d4f79f7f597 Mon Sep 17 00:00:00 2001 From: "Dmitry Pereverzev (SoUrcerer)" Date: Fri, 7 Jun 2013 23:03:35 +0000 Subject: [PATCH] Netsurf: switch to KolibriUI & fixes in curl git-svn-id: svn://kolibrios.org@3624 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../netsurf/netsurf/content/fetchers/curl.c | 7 +++++-- programs/network/netsurf/netsurf/framebuffer/gui.c | 14 ++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/programs/network/netsurf/netsurf/content/fetchers/curl.c b/programs/network/netsurf/netsurf/content/fetchers/curl.c index 6e3bf39d9d..792ea9e0b5 100644 --- a/programs/network/netsurf/netsurf/content/fetchers/curl.c +++ b/programs/network/netsurf/netsurf/content/fetchers/curl.c @@ -436,8 +436,11 @@ static void fetch_curl_process(struct fetch_curl_context *ctx) { * fetch_file_send_callback(). */ - /* content type */ - if (fetch_curl_send_header(ctx, "Content-Type: text/html")) + __menuet__debug_out(fetch_filetype(ctx->path)); + __menuet__debug_out("\n"); + + if (fetch_curl_send_header(ctx, "Content-Type: %s", + fetch_filetype(ctx->path))) goto fetch_file_process_aborted; diff --git a/programs/network/netsurf/netsurf/framebuffer/gui.c b/programs/network/netsurf/netsurf/framebuffer/gui.c index b6fb12fd29..15efa43238 100644 --- a/programs/network/netsurf/netsurf/framebuffer/gui.c +++ b/programs/network/netsurf/netsurf/framebuffer/gui.c @@ -427,8 +427,8 @@ process_cmdline(int argc, char** argv) LOG(("argc %d, argv %p", argc, argv)); - fename = "sdl"; - febpp = 16; + fename = "kolibri"; + febpp = 32; if ((nsoption_int(window_width) != 0) && (nsoption_int(window_height) != 0)) { @@ -543,15 +543,17 @@ main(int argc, char** argv) LOG(("Registering surfaces for SDL and RAM..")); - extern nsfb_surface_rtns_t sdl_rtns; + //extern nsfb_surface_rtns_t sdl_rtns; extern nsfb_surface_rtns_t ram_rtns; extern nsfb_surface_rtns_t able_rtns; + extern nsfb_surface_rtns_t kolibri_rtns; - _nsfb_register_surface(NSFB_SURFACE_SDL, &sdl_rtns, "sdl"); + //_nsfb_register_surface(NSFB_SURFACE_SDL, &sdl_rtns, "sdl"); _nsfb_register_surface(NSFB_SURFACE_RAM, &ram_rtns, "ram"); - _nsfb_register_surface(NSFB_SURFACE_RAM, &able_rtns, "able"); + _nsfb_register_surface(NSFB_SURFACE_ABLE, &able_rtns, "able"); + _nsfb_register_surface(NSFB_SURFACE_KOLIBRI, &kolibri_rtns, "kolibri"); - respaths = fb_init_resource("/tmp9/1/netsurf/res/:res/:fonts/"); + respaths = fb_init_resource("/hd0/1/res/:/bd0/1/res/:/tmp9/1/netsurf/res/:res/:fonts/"); options = filepath_find(respaths, "Choices"); messages = filepath_find(respaths, "messages");