From 44225f1b34eb1d393a74cc44dcfc32d102205ef6 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 29 Sep 2020 22:48:16 +0100 Subject: split out about scheme handler for nscolours css --- content/fetchers/about/Makefile | 1 + content/fetchers/about/about.c | 63 ++++------------------------- content/fetchers/about/nscolours.c | 81 ++++++++++++++++++++++++++++++++++++++ content/fetchers/about/nscolours.h | 35 ++++++++++++++++ 4 files changed, 125 insertions(+), 55 deletions(-) create mode 100644 content/fetchers/about/nscolours.c create mode 100644 content/fetchers/about/nscolours.h (limited to 'content/fetchers') diff --git a/content/fetchers/about/Makefile b/content/fetchers/about/Makefile index da271097c..10c9a6a72 100644 --- a/content/fetchers/about/Makefile +++ b/content/fetchers/about/Makefile @@ -7,6 +7,7 @@ S_FETCHER_ABOUT := \ choices.c \ config.c \ imagecache.c \ + nscolours.c \ query.c \ query_auth.c \ query_fetcherror.c \ diff --git a/content/fetchers/about/about.c b/content/fetchers/about/about.c index bb9d68273..fe9eba7a4 100644 --- a/content/fetchers/about/about.c +++ b/content/fetchers/about/about.c @@ -26,27 +26,24 @@ * information from the browser from a known, fixed URL. */ -#include -#include -#include +#include +#include #include +#include +#include +#include #include "netsurf/inttypes.h" -#include "netsurf/plot_style.h" -#include "utils/log.h" +#include "utils/errors.h" +#include "utils/nsurl.h" #include "utils/corestrings.h" -#include "utils/nscolour.h" -#include "utils/nsoption.h" #include "utils/utils.h" -#include "utils/messages.h" #include "utils/ring.h" #include "content/fetch.h" #include "content/fetchers.h" -#include "desktop/system_colour.h" - #include "private.h" #include "about.h" #include "blank.h" @@ -54,6 +51,7 @@ #include "config.h" #include "choices.h" #include "imagecache.h" +#include "nscolours.h" #include "query.h" #include "query_auth.h" #include "query_fetcherror.h" @@ -298,51 +296,6 @@ static bool fetch_about_licence_handler(struct fetch_about_context *ctx) } -/** - * Handler to generate the nscolours stylesheet - * - * \param ctx The fetcher context. - * \return true if handled false if aborted. - */ -static bool fetch_about_nscolours_handler(struct fetch_about_context *ctx) -{ - nserror res; - const char *stylesheet; - - /* content is going to return ok */ - fetch_set_http_code(ctx->fetchh, 200); - - /* content type */ - if (fetch_about_send_header(ctx, "Content-Type: text/css; charset=utf-8")) { - goto aborted; - } - - res = nscolour_get_stylesheet(&stylesheet); - if (res != NSERROR_OK) { - goto aborted; - } - - res = fetch_about_ssenddataf(ctx, - "html {\n" - "\tbackground-color: #%06x;\n" - "}\n" - "%s", - colour_rb_swap(nscolours[NSCOLOUR_WIN_ODD_BG]), - stylesheet); - if (res != NSERROR_OK) { - goto aborted; - } - - fetch_about_send_finished(ctx); - - return true; - -aborted: - - return false; -} - - /** * Handler to generate about scheme logo page * diff --git a/content/fetchers/about/nscolours.c b/content/fetchers/about/nscolours.c new file mode 100644 index 000000000..bd7a5ed7a --- /dev/null +++ b/content/fetchers/about/nscolours.c @@ -0,0 +1,81 @@ +/* + * Copyright 2020 Vincent Sanders + * + * This file is part of NetSurf. + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file + * content generator for the about scheme query privacy page + */ + +#include +#include +#include +#include +#include +#include + +#include "netsurf/plot_style.h" + +#include "utils/errors.h" +#include "utils/nscolour.h" + +#include "private.h" +#include "nscolours.h" + +/** + * Handler to generate the nscolours stylesheet + * + * \param ctx The fetcher context. + * \return true if handled false if aborted. + */ +bool fetch_about_nscolours_handler(struct fetch_about_context *ctx) +{ + nserror res; + const char *stylesheet; + + /* content is going to return ok */ + fetch_about_set_http_code(ctx, 200); + + /* content type */ + if (fetch_about_send_header(ctx, "Content-Type: text/css; charset=utf-8")) { + goto aborted; + } + + res = nscolour_get_stylesheet(&stylesheet); + if (res != NSERROR_OK) { + goto aborted; + } + + res = fetch_about_ssenddataf(ctx, + "html {\n" + "\tbackground-color: #%06x;\n" + "}\n" + "%s", + colour_rb_swap(nscolours[NSCOLOUR_WIN_ODD_BG]), + stylesheet); + if (res != NSERROR_OK) { + goto aborted; + } + + fetch_about_send_finished(ctx); + + return true; + +aborted: + + return false; +} diff --git a/content/fetchers/about/nscolours.h b/content/fetchers/about/nscolours.h new file mode 100644 index 000000000..a602e4d99 --- /dev/null +++ b/content/fetchers/about/nscolours.h @@ -0,0 +1,35 @@ +/* + * Copyright 2020 Vincent Sanders + * + * This file is part of NetSurf. + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file + * about scheme nscolours handler interface + */ + +#ifndef NETSURF_CONTENT_FETCHERS_ABOUT_NSCOLOURS_H +#define NETSURF_CONTENT_FETCHERS_ABOUT_NSCOLOURS_H + +/** + * Handler to generate the nscolours stylesheet + * + * \param ctx The fetcher context. + * \return true if handled false if aborted. + */ +bool fetch_about_nscolours_handler(struct fetch_about_context *ctx); + +#endif -- cgit v1.2.3