diff --git a/netsurf/desktop/searchweb.c b/netsurf/desktop/searchweb.c index 2c0873de..fabbb3e2 100644 --- a/netsurf/desktop/searchweb.c +++ b/netsurf/desktop/searchweb.c @@ -34,9 +34,9 @@ #include "desktop/gui_internal.h" struct search_provider { - char *name; /**< readable name such as 'google', 'yahoo', etc */ - char *hostname; /**< host address such as www.google.com */ - char *searchstring; /** < such as "www.google.com?search=%s" */ + char *name; /**< readable name such as 'searx', 'invidious', etc */ + char *hostname; /**< host address such as searx.prvcy.eu */ + char *searchstring; /** < such as "searx.prvcy.eu?search=%s" */ char *ico; /** < location of domain's favicon */ hlcache_handle *ico_handle; }; @@ -52,7 +52,7 @@ static struct search_web_ctx_s { } search_web_ctx; -static const char *default_providers = "Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico|\n"; +static const char *default_providers = "Searx|searx.prvcy.eu|https://searx.prvcy.eu/search?q=%s|https://searx.prvcy.eu/favicon.ico|\n"; static const char *default_search_icon_url = "resource:icons/search.png"; diff --git a/netsurf/frontends/riscos/appdir/Resources/SearchEngines b/netsurf/frontends/riscos/appdir/Resources/SearchEngines index e7fd7cb6..7e0a3782 100644 --- a/netsurf/frontends/riscos/appdir/Resources/SearchEngines +++ b/netsurf/frontends/riscos/appdir/Resources/SearchEngines @@ -1,22 +1,2 @@ -Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico| -Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico| -Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico| -Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico| -Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://www.omgili.com/favicon.ico| -BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://news.bbc.co.uk/favicon.ico| -Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico| -Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico| -Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://www.ask.com/favicon.ico| -Answers.com|www.answers.com|http://www.answers.com/%s|http://www.answers.com/favicon.ico| -Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico| -Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico| -AeroMp3|www.aeromp3.com|http://www.aeromp3.com/search?q=%s|http://www.aeromp3.com/favicon.ico| -AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico| -Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico| -Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico| -Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico| -IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico| -ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico| -Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico| -DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/?q=%s|http://www.duckduckgo.com/favicon.ico| -Seeks|www.seeks-project.info|https://www.seeks-project.info/search.php/search?q=%s|http://www.seeks-project.info/search.php/public/images/seek_icon_32x32_transparent.png| +Searx|searx.prvcy.eu|https://searx.prvcy.eu/search?q=%s|%s|https://searx.prvcy.eu/favicon.ico| +Invidious|invidious.namazso.eu|https://invidious.namazso.eu/results?search_query=%s|http://invidious.namazso.eu/favicon.ico| diff --git a/netsurf/resources/SearchEngines b/netsurf/resources/SearchEngines index 38e77957..7e0a3782 100644 --- a/netsurf/resources/SearchEngines +++ b/netsurf/resources/SearchEngines @@ -1,20 +1,2 @@ -Google|www.google.com|http://www.google.com/search?q=%s|http://www.google.com/favicon.ico| -Yahoo|search.yahoo.com|http://search.yahoo.com/search?p=%s|http://www.yahoo.com/favicon.ico| -Bing|www.bing.com|http://www.bing.com/search?q=%s|http://www.bing.com/favicon.ico| -Business.com|www.business.com|http://www.business.com/search/rslt_default.asp?query=%s|http://www.business.com/favicon.ico| -Omgili|www.omgili.com|http://www.omgili.com/AAAAA/%s.html|http://omgili.com/public/images/favicon.ico| -BBC News|search.bbc.co.uk|http://search.bbc.co.uk/search?q=%s&tab=ns|http://www.bbc.co.uk/favicon.ico| -Ubuntu Packages|packages.ubuntu.com|http://packages.ubuntu.com/search?keywords=%s|http://packages.ubuntu.com/favicon.ico| -Creative Commons|creativecommons.org|http://creativecommons.org/?s=%s|http://creativecommons.org/favicon.ico|fixme:favicon does not work as it is served as x-icon and is a png -Ask.com|www.ask.com|http://www.ask.com/web?q=%s|http://sp.uk.ask.com/sh/i/a14/favicon/favicon.ico|fixme:favicon is served as text/plain -Dictionary.com|dictionary.reference.com|http://dictionary.reference.com/browse/%s?jss=0|http://dictionary.reference.com/favicon.ico| -Youtube|www.youtube.com|http://www.youtube.com/results?search_query=%s|http://www.youtube.com/favicon.ico| -AOL|search.aol.com|http://search.aol.com/aol/search?query=%s|http://www.aol.com/favicon.ico| -Baidu|www.baidu.com|http://www.baidu.com/s?wd=%s|http://www.baidu.com/favicon.ico| -Amazon|www.amazon.com|http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s|http://www.amazon.com/favicon.ico| -Ebay|shop.ebay.com|http://shop.ebay.com/items/%s|http://www.ebay.com/favicon.ico| -IMDB|www.imdb.com|http://www.imdb.com/find?q=%s|http://www.imdb.com/favicon.ico| -ESPN|search.espn.go.com|http://search.espn.go.com/%s/|http://www.espn.go.com/favicon.ico| -Wikipedia|en.wikipedia.org|http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s|http://en.wikipedia.org/favicon.ico| -DuckDuckGo|www.duckduckgo.com|http://www.duckduckgo.com/html/?q=%s|http://www.duckduckgo.com/favicon.ico|fixme:Their ico upsets the current implementation -Seeks|www.seeks-project.info|https://www.seeks-project.info/search.php/search?q=%s|http://www.seeks-project.info/search.php/public/images/seek_icon_32x32_transparent.png|fixme:they have no icon +Searx|searx.prvcy.eu|https://searx.prvcy.eu/search?q=%s|%s|https://searx.prvcy.eu/favicon.ico| +Invidious|invidious.namazso.eu|https://invidious.namazso.eu/results?search_query=%s|http://invidious.namazso.eu/favicon.ico| diff --git a/netsurf/resources/en/welcome.html b/netsurf/resources/en/welcome.html index d1073588..04e3c299 100644 --- a/netsurf/resources/en/welcome.html +++ b/netsurf/resources/en/welcome.html @@ -20,38 +20,35 @@

NetSurf is a small, fast open source web browser. We are always keen to improve our browser, so get in touch if you run into any problems. Thanks for choosing NetSurf!

-
+
- +
@@ -61,4 +58,4 @@ - \ No newline at end of file +