r7354 dsilvers - in /trunk/tools/svn: netsurf-review-diff netsurf-review-diff-list
by netsurf@semichrome.net
Author: dsilvers
Date: Tue Apr 28 10:16:37 2009
New Revision: 7354
URL: http://source.netsurf-browser.org?rev=7354&view=rev
Log:
Simple review generation and review->list sending scripts.
Added:
trunk/tools/svn/netsurf-review-diff (with props)
trunk/tools/svn/netsurf-review-diff-list (with props)
Added: trunk/tools/svn/netsurf-review-diff
URL: http://source.netsurf-browser.org/trunk/tools/svn/netsurf-review-diff?rev...
==============================================================================
--- trunk/tools/svn/netsurf-review-diff (added)
+++ trunk/tools/svn/netsurf-review-diff Tue Apr 28 10:16:37 2009
@@ -1,0 +1,73 @@
+#!/bin/bash
+
+# Generates a diff for review on stdout...
+
+PRECISFILE=$1
+test "x$PRECISFILE" = "x" && PRECISFILE=/tmp/precis
+
+(
+
+if test -s $PRECISFILE; then
+echo "Precis:"
+echo
+cat $PRECISFILE
+echo
+echo
+fi
+
+echo "Added files"
+echo
+echo
+for F in $(svn st | grep "^A" | cut -b8-); do
+ echo "Index: $F"
+ echo "==================================================================="
+ diff -u /dev/null $F
+done
+
+echo
+echo
+echo "Changed files"
+echo
+echo
+
+TMPFILE=$(mktemp -t)
+
+if [ ! -f ${TMPFILE} ]; then
+ echo temporary file creation failed >&2
+ exit 1
+fi
+
+for F in $(svn st | grep "^M" | cut -b8-); do
+ svn diff $F >>${TMPFILE}
+done
+
+diffstat ${TMPFILE}
+
+echo
+echo
+
+cat ${TMPFILE}
+
+rm ${TMPFILE}
+
+echo
+echo
+echo "Conflicted files"
+echo
+echo
+
+for F in $(svn st | grep "^C" | cut -b8-); do
+ svn diff $F
+done
+
+echo
+echo
+echo "Removed files"
+echo
+echo
+
+svn st | grep "^D" | cut -b8-
+
+)
+
+
Propchange: trunk/tools/svn/netsurf-review-diff
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/tools/svn/netsurf-review-diff-list
URL: http://source.netsurf-browser.org/trunk/tools/svn/netsurf-review-diff-lis...
==============================================================================
--- trunk/tools/svn/netsurf-review-diff-list (added)
+++ trunk/tools/svn/netsurf-review-diff-list Tue Apr 28 10:16:37 2009
@@ -1,0 +1,94 @@
+#!/bin/bash
+
+if test "x$NETSURF_USERNAME" = "x"; then
+ NETSURF_USERNAME=$(whoami)
+fi
+
+if test "x$NETSURF_REALNAME" = "x"; then
+ NETSURF_REALNAME=$(getent passwd $(whoami) | cut -d: -f 5 | cut -d, -f1)
+fi
+
+SENDCMD="/usr/lib/sendmail -t -r ${NETSURF_USERNAME}(a)netsurf-browser.org"
+if test "x$1" = "x--test"; then
+ SENDCMD="less -S"
+ shift
+fi
+
+test -x /usr/lib/sendmail || {
+ echo "Unable to find /usr/lib/sendmail"
+ exit 1
+}
+
+SUBJECT="$*"
+
+test "x$SUBJECT" = "x" && {
+ echo "No subject supplied."
+ exit 1
+}
+
+DIR=$(dirname $0)
+pushd $DIR
+DIR=$(pwd)
+popd
+
+yesno ()
+{
+ YNDEF=$1
+ shift
+ echo -n "$@ [$YNDEF]: "
+ read YNRES
+ YNRES=$(echo $YNRES | tr A-Z a-z)
+ test "x$YNRES" = "x" && YNRES=$YNDEF
+ test "x$YNRES" = "xyes" && return 0
+ test "x$YNRES" = "xno" && return 1
+ echo "Please enter 'yes' or 'no'"
+ yesno $YNDEF "$@"
+}
+
+do_precis ()
+{
+ PRECISFILE=$(tempfile)
+ /usr/bin/editor "$PRECISFILE"
+ test -s "$PRECISFILE" && return 0
+ yesno yes "You did not enter a precis. Do you wish to abort?" && exit 1
+ yesno yes "You did not enter a precis. Do you want to try again?" && do_precis
+ rm "$PRECISFILE"
+ PRECISFILE=""
+}
+
+TMPF=$(tempfile)
+
+PRECISFILE=""
+PRECISBKP=""
+if test -s /tmp/precis; then
+ PRECISFILE=/tmp/precis
+ yesno "yes" "The file /tmp/precis exists. Do you wish to use it?" || {
+ PRECISFILE=""
+ PRECISBKP=$(tempfile)
+ mv /tmp/precis $PRECISBKP
+ }
+fi
+
+if test "x$PRECISFILE" = "x"; then
+ yesno "yes" "Do you wish to write a precis?" && do_precis
+fi
+
+"${DIR}/netsurf-review-diff" $PRECISFILE | perl -pe's/^From />From /;' > "$TMPF"
+
+test "x$PRECISFILE" = "x/tmp/precis" && PRECISFILE=""
+
+test "x$PRECISFILE" = "x" || rm $PRECISFILE
+test "x$PRECISBKP" = "x" || mv $PRECISBKP /tmp/precis
+
+HEADER="From: ${NETSURF_REALNAME} <${NETSURF_USERNAME}(a)simtec.co.uk>
+To: NetSurf Development List <netsurf-dev(a)netsurf-browser.org>
+Subject: Review: $*
+
+"
+
+echo "Submitting to $SENDCMD"
+
+( echo "$HEADER"; cat $TMPF ) | $SENDCMD
+
+rm $TMPF
+
Propchange: trunk/tools/svn/netsurf-review-diff-list
------------------------------------------------------------------------------
svn:executable = *
14 years, 7 months
r7352 MarkieB - in /branches/MarkieB/search: desktop/ gtk/ gtk/dialogs/ gtk/res/ gtk/res/ico/
by netsurf@semichrome.net
Author: MarkieB
Date: Tue Apr 28 03:49:03 2009
New Revision: 7352
URL: http://source.netsurf-browser.org?rev=7352&view=rev
Log:
add search providers list
put search provider ico in toolbar
add gtk option to search from url bar
store ico files locally - I hope that is acceptable for copyright
as it's far more straightforward than retrieving them from the web
Added:
branches/MarkieB/search/gtk/res/ico/
branches/MarkieB/search/gtk/res/ico/aeromp3.ico (with props)
branches/MarkieB/search/gtk/res/ico/amazon.ico (with props)
branches/MarkieB/search/gtk/res/ico/answers.ico (with props)
branches/MarkieB/search/gtk/res/ico/aol.ico (with props)
branches/MarkieB/search/gtk/res/ico/ask.ico (with props)
branches/MarkieB/search/gtk/res/ico/baidu.ico (with props)
branches/MarkieB/search/gtk/res/ico/bbcnews.ico (with props)
branches/MarkieB/search/gtk/res/ico/business.ico (with props)
branches/MarkieB/search/gtk/res/ico/creativecommons.ico (with props)
branches/MarkieB/search/gtk/res/ico/dictionarycom.ico (with props)
branches/MarkieB/search/gtk/res/ico/ebay.ico (with props)
branches/MarkieB/search/gtk/res/ico/espn.ico (with props)
branches/MarkieB/search/gtk/res/ico/google.ico (with props)
branches/MarkieB/search/gtk/res/ico/imdb.ico (with props)
branches/MarkieB/search/gtk/res/ico/microsoft.ico (with props)
branches/MarkieB/search/gtk/res/ico/ubuntu.ico (with props)
branches/MarkieB/search/gtk/res/ico/wikipedia.ico (with props)
branches/MarkieB/search/gtk/res/ico/yahoo.ico (with props)
branches/MarkieB/search/gtk/res/ico/youtube.ico (with props)
Modified:
branches/MarkieB/search/desktop/search.c
branches/MarkieB/search/desktop/search.h
branches/MarkieB/search/gtk/dialogs/gtk_options.c
branches/MarkieB/search/gtk/gtk_scaffolding.c
branches/MarkieB/search/gtk/gtk_scaffolding.h
branches/MarkieB/search/gtk/res/options.glade
Modified: branches/MarkieB/search/desktop/search.c
URL: http://source.netsurf-browser.org/branches/MarkieB/search/desktop/search....
==============================================================================
--- branches/MarkieB/search/desktop/search.c (original)
+++ branches/MarkieB/search/desktop/search.c Tue Apr 28 03:49:03 2009
@@ -667,18 +667,207 @@
char *search_web_default_provider_host()
{
- switch (option_search_provider) {
+ return search_web_provider_host(option_search_provider);
+}
+
+char *search_web_provider_host(int ref)
+{
+ switch (ref) {
+ case OSP_YAHOO:
+ return strdup("search.yahoo.com");
+ break;
+ case OSP_MICROSOFT:
+ return strdup("search.live.com");
+ break;
+ case OSP_BUSINESS:
+ return strdup("www.business.com");
+ break;
+ case OSP_OMGILI:
+ return strdup("www.omgili.com");
+ break;
+ case OSP_BBC:
+ return strdup("search.bbc.co.uk");
+ break;
+ case OSP_UBUNTU:
+ return strdup("packages.ubuntu.com");
+ break;
+ case OSP_COMMONS:
+ return strdup("creativecommons.org");
+ break;
+ case OSP_ASK:
+ return strdup("www.ask.com");
+ break;
+ case OSP_ANSWERS:
+ return strdup("www.answers.com");
+ break;
+ case OSP_DICTIONARYCOM:
+ return strdup("dictionary.reference.com");
+ break;
+ case OSP_YOUTUBE:
+ return strdup("www.youtube.com");
+ break;
+ case OSP_AEROMP3:
+ return strdup("www.aeromp3.com");
+ break;
+ case OSP_AOL:
+ return strdup("search.aol.com");
+ break;
+ case OSP_BAIDU:
+ return strdup("www.baidu.com");
+ break;
+ case OSP_AMAZON:
+ return strdup("www.amazon.com");
+ break;
+ case OSP_EBAY:
+ return strdup("shop.ebay.com");
+ break;
+ case OSP_IMDB:
+ return strdup("www.imdb.com");
+ break;
+ case OSP_ESPN:
+ return strdup("search.espn.go.com");
+ break;
+ case OSP_WIKIPEDIA:
+ /* wikipedia automatically redirects from www to en
+ * at least for en locales; support for I18n may need
+ * adding */
+ return strdup("en.wikipedia.org");
+ break;
case OSP_GOOGLE:
default:
return strdup("www.google.com");
}
}
+char *search_web_default_ico_name()
+{
+ switch (option_search_provider) {
+ case OSP_YAHOO:
+ return strdup("yahoo.ico");
+ break;
+ case OSP_MICROSOFT:
+ return strdup("microsoft.ico");
+ break;
+ case OSP_BUSINESS:
+ return strdup("business.ico");
+ break;
+ case OSP_OMGILI:
+ return strdup("omgili.ico");
+ break;
+ case OSP_BBC:
+ return strdup("bbcnews.ico");
+ break;
+ case OSP_UBUNTU:
+ return strdup("ubuntu.ico");
+ break;
+ case OSP_COMMONS:
+ return strdup("creativecommons.ico");
+ break;
+ case OSP_ASK:
+ return strdup("ask.ico");
+ break;
+ case OSP_ANSWERS:
+ return strdup("answers.ico");
+ break;
+ case OSP_DICTIONARYCOM:
+ return strdup("dictionarycom.ico");
+ break;
+ case OSP_YOUTUBE:
+ return strdup("youtube.ico");
+ break;
+ case OSP_AEROMP3:
+ return strdup("aeromp3.ico");
+ break;
+ case OSP_AOL:
+ return strdup("aol.ico");
+ break;
+ case OSP_BAIDU:
+ return strdup("baidu.ico");
+ break;
+ case OSP_AMAZON:
+ return strdup("amazon.ico");
+ break;
+ case OSP_EBAY:
+ return strdup("ebay.ico");
+ break;
+ case OSP_IMDB:
+ return strdup("imdb.ico");
+ break;
+ case OSP_ESPN:
+ return strdup("espn.ico");
+ break;
+ case OSP_WIKIPEDIA:
+ return strdup("wikipedia.ico");
+ break;
+ case OSP_GOOGLE:
+ default:
+ return strdup("google.ico");
+ }
+}
+
char *search_web_get_url(const char *encsearchterm)
{
char *pref, *ret;
int len;
switch(option_search_provider) {
+ case OSP_YAHOO:
+ pref = strdup("http://search.yahoo.com/search?p=%s");
+ break;
+ case OSP_MICROSOFT:
+ pref = strdup("http://search.live.com/results.aspx?q=%s");
+ break;
+ case OSP_BUSINESS:
+ pref = strdup("http://www.business.com/search/rslt_default.asp?query=%s");
+ break;
+ case OSP_OMGILI:
+ pref = strdup("http://www.omgili.com/AAAAA/%s.html");
+ break;
+ case OSP_BBC:
+ pref = strdup("http://search.bbc.co.uk/search?q=%s&tab=ns");
+ break;
+ case OSP_UBUNTU:
+ pref = strdup("http://packages.ubuntu.com/search?keywords=%s");
+ break;
+ case OSP_COMMONS:
+ pref = strdup("http://creativecommons.org/?s=%s");
+ break;
+ case OSP_ASK:
+ pref = strdup("http://www.ask.com/web?q=%s");
+ break;
+ case OSP_ANSWERS:
+ pref = strdup("http://www.answers.com/main/ntquery?s=%s");
+ break;
+ case OSP_DICTIONARYCOM:
+ pref = strdup("http://dictionary.reference.com/browse/%s?jss=0");
+ break;
+ case OSP_YOUTUBE:
+ pref = strdup("http://www.youtube.com/results?search_query=%s");
+ break;
+ case OSP_AEROMP3:
+ pref = strdup("http://www.aeromp3.com/search?q=%s");
+ break;
+ case OSP_AOL:
+ pref = strdup("http://search.aol.com/aol/search?query=%s");
+ break;
+ case OSP_BAIDU:
+ pref = strdup("http://www.baidu.com/s?wd=%s");
+ break;
+ case OSP_AMAZON:
+ pref = strdup("http://www.amazon.com/s/ref=nb_ss_gw?field-keywords=%s");
+ break;
+ case OSP_EBAY:
+ pref = strdup("http://shop.ebay.com/items/%s");
+ break;
+ case OSP_IMDB:
+ pref = strdup("http://www.imdb.com/find?q=%s");
+ break;
+ case OSP_ESPN:
+ /* Espn changes spaces to '-', need to adapt */
+ pref = strdup("http://search.espn.go.com/%s/");
+ break;
+ case OSP_WIKIPEDIA:
+ pref = strdup("http://en.wikipedia.org/w/index.php?title=Special%%3ASearch&search=%s");
+ break;
case OSP_GOOGLE:
default:
pref = strdup("http://www.google.com/search?q=%s");
@@ -690,4 +879,3 @@
free(pref);
return ret;
}
-
Modified: branches/MarkieB/search/desktop/search.h
URL: http://source.netsurf-browser.org/branches/MarkieB/search/desktop/search....
==============================================================================
--- branches/MarkieB/search/desktop/search.h (original)
+++ branches/MarkieB/search/desktop/search.h Tue Apr 28 03:49:03 2009
@@ -21,6 +21,7 @@
#include <ctype.h>
#include <string.h>
+#include "desktop/browser.h"
#define RECENT_SEARCHES 8
@@ -31,7 +32,23 @@
OSP_GOOGLE,
OSP_YAHOO,
OSP_MICROSOFT,
+ OSP_BUSINESS,
+ OSP_OMGILI,
+ OSP_BBC,
+ OSP_UBUNTU,
+ OSP_COMMONS,
OSP_ASK,
+ OSP_ANSWERS,
+ OSP_DICTIONARYCOM,
+ OSP_YOUTUBE,
+ OSP_AEROMP3,
+ OSP_AOL,
+ OSP_BAIDU,
+ OSP_AMAZON,
+ OSP_EBAY,
+ OSP_IMDB,
+ OSP_ESPN,
+ OSP_WIKIPEDIA
} default_search_provider;
void start_search(bool forwards);
@@ -105,6 +122,16 @@
char *search_web_default_provider_host(void);
/**
+ * retrieve hostname of web search provider corresponding to ref
+ */
+char *search_web_provider_host(int ref);
+
+/**
+ * retrieve local name of stored .ico for search bar
+ */
+char *search_web_default_ico_name(void);
+
+/**
* check whether an URL is in fact a search term
* \param url the url being checked
* \return true for url, false for search
Modified: branches/MarkieB/search/gtk/dialogs/gtk_options.c
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/dialogs/gtk...
==============================================================================
--- branches/MarkieB/search/gtk/dialogs/gtk_options.c (original)
+++ branches/MarkieB/search/gtk/dialogs/gtk_options.c Tue Apr 28 03:49:03 2009
@@ -27,6 +27,7 @@
#include <glade/glade.h>
#include "utils/log.h"
#include "desktop/options.h"
+#include "desktop/search.h"
#include "gtk/options.h"
#include "gtk/gtk_gui.h"
#include "gtk/gtk_scaffolding.h"
@@ -97,6 +98,8 @@
DECLARE(fileChooserDownloads);
DECLARE(checkFocusNew);
DECLARE(checkNewBlank);
+DECLARE(checkUrlSearch);
+DECLARE(comboSearch);
DECLARE(spinMarginTop);
DECLARE(spinMarginBottom);
@@ -187,6 +190,8 @@
CONNECT(checkFocusNew, "toggled");
CONNECT(checkNewBlank, "toggled");
+ CONNECT(checkUrlSearch, "toggled");
+ CONNECT(comboSearch, "changed");
CONNECT(spinMarginTop, "value-changed");
CONNECT(spinMarginBottom, "value-changed");
@@ -388,6 +393,8 @@
SET_CHECK(checkFocusNew, option_focus_new);
SET_CHECK(checkNewBlank, option_new_blank);
+ SET_CHECK(checkUrlSearch, option_search_url_bar);
+ SET_COMBO(comboSearch, option_search_provider);
SET_SPIN(spinMarginTop, option_margin_top);
SET_SPIN(spinMarginBottom, option_margin_bottom);
@@ -696,6 +703,35 @@
CHECK_CHANGED(checkNewBlank, option_new_blank)
END_HANDLER
+CHECK_CHANGED(checkUrlSearch, option_search_url_bar)
+END_HANDLER
+
+COMBO_CHANGED(comboSearch, option_search_provider)
+
+ struct gui_window *current;
+ GtkImage *searchico;
+ current = window_list;
+ while (current) {
+ searchico = GTK_IMAGE(gtk_bin_get_child(GTK_BIN(
+ current->scaffold->webSearchIcoHolder)));
+ gtk_container_remove(GTK_CONTAINER(
+ current->scaffold->webSearchIcoHolder),
+ GTK_WIDGET(searchico));
+ LOG(("retrieving ico %s\n", g_strconcat(res_dir_location,
+ "ico/", search_web_default_ico_name(), NULL)));
+ searchico = GTK_IMAGE(gtk_image_new_from_file(g_strconcat(
+ res_dir_location, "ico/",
+ search_web_default_ico_name(), NULL)));
+
+ gtk_container_add(GTK_CONTAINER(
+ current->scaffold->webSearchIcoHolder),
+ GTK_WIDGET(searchico));
+
+ gtk_widget_show(GTK_WIDGET(searchico));
+ current = current->next;
+ }
+END_HANDLER
+
SPIN_CHANGED(spinMarginTop, option_margin_top)
END_HANDLER
Modified: branches/MarkieB/search/gtk/gtk_scaffolding.c
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/gtk_scaffol...
==============================================================================
--- branches/MarkieB/search/gtk/gtk_scaffolding.c (original)
+++ branches/MarkieB/search/gtk/gtk_scaffolding.c Tue Apr 28 03:49:03 2009
@@ -1230,6 +1230,7 @@
nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
{
struct gtk_scaffolding *g = malloc(sizeof(*g));
+ GtkImage *searchico;
LOG(("Constructing a scaffold of %p for gui_window %p", g, toplevel));
@@ -1269,6 +1270,7 @@
"searchForwardButton"));
g->checkAllSearch = GTK_CHECK_BUTTON(GET_WIDGET("checkAllSearch"));
g->caseSensButton = GTK_CHECK_BUTTON(GET_WIDGET("caseSensButton"));
+ g->webSearchIcoHolder = GTK_TOOL_ITEM(GET_WIDGET("webSearchItem"));
g->webSearchEntry = GTK_ENTRY(GET_WIDGET("webSearchEntry"));
g->preferences_dialog = NULL;
@@ -1405,6 +1407,22 @@
/* set up the throbber. */
gtk_image_set_from_pixbuf(g->throbber, nsgtk_throbber->framedata[0]);
g->throb_frame = 0;
+
+ /* set the web search ico */
+ searchico = GTK_IMAGE(gtk_bin_get_child(GTK_BIN(
+ g->webSearchIcoHolder)));
+ gtk_container_remove(GTK_CONTAINER(g->webSearchIcoHolder),
+ GTK_WIDGET(searchico));
+
+ LOG(("retrieving ico %s\n", g_strconcat(res_dir_location, "ico/",
+ search_web_default_ico_name(), NULL)));
+ searchico = GTK_IMAGE(gtk_image_new_from_file(g_strconcat(
+ res_dir_location, "ico/", search_web_default_ico_name(), NULL)));
+
+ gtk_container_add(GTK_CONTAINER(g->webSearchIcoHolder),
+ GTK_WIDGET(searchico));
+
+ gtk_widget_show(GTK_WIDGET(searchico));
#define CONNECT(obj, sig, callback, ptr) \
g_signal_connect(G_OBJECT(obj), (sig), G_CALLBACK(callback), (ptr))
Modified: branches/MarkieB/search/gtk/gtk_scaffolding.h
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/gtk_scaffol...
==============================================================================
--- branches/MarkieB/search/gtk/gtk_scaffolding.h (original)
+++ branches/MarkieB/search/gtk/gtk_scaffolding.h Tue Apr 28 03:49:03 2009
@@ -53,6 +53,7 @@
GtkToolButton *searchForwardButton;
GtkCheckButton *checkAllSearch;
GtkCheckButton *caseSensButton;
+ GtkToolItem *webSearchIcoHolder;
GtkEntry *webSearchEntry;
GtkPaned *status_pane;
Added: branches/MarkieB/search/gtk/res/ico/aeromp3.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/aer...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/aeromp3.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/amazon.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/ama...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/amazon.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/answers.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/ans...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/answers.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/aol.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/aol...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/aol.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/ask.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/ask...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/ask.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/baidu.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/bai...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/baidu.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/bbcnews.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/bbc...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/bbcnews.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/business.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/bus...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/business.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/creativecommons.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/cre...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/creativecommons.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/dictionarycom.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/dic...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/dictionarycom.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/ebay.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/eba...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/ebay.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/espn.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/esp...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/espn.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/google.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/goo...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/google.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/imdb.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/imd...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/imdb.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/microsoft.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/mic...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/microsoft.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/ubuntu.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/ubu...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/ubuntu.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/wikipedia.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/wik...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/wikipedia.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/yahoo.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/yah...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/yahoo.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: branches/MarkieB/search/gtk/res/ico/youtube.ico
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/ico/you...
==============================================================================
Binary file - no diff available.
Propchange: branches/MarkieB/search/gtk/res/ico/youtube.ico
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: branches/MarkieB/search/gtk/res/options.glade
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/res/options...
==============================================================================
--- branches/MarkieB/search/gtk/res/options.glade (original)
+++ branches/MarkieB/search/gtk/res/options.glade Tue Apr 28 03:49:03 2009
@@ -1739,6 +1739,90 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkFrame" id="frame9">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkHBox" id="hbox9">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkCheckButton" id="checkUrlSearch">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">search from url bar </property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label23">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> default provider</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ </widget>
+ <packing>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkComboBox" id="comboSearch">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">Google
+Yahoo!
+Microsoft live
+Business.com
+Omgili
+BBC News
+Ubuntu packages
+Creative commons
+Ask
+Answers
+Dictionary.com
+Youtube
+AeroMp3
+AOL
+Baidu
+Amazon
+Ebay
+IMDB
+Espn
+Wikipedia</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label22">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Search</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
14 years, 7 months
r7351 MarkieB - /branches/MarkieB/search/desktop/search.c
by netsurf@semichrome.net
Author: MarkieB
Date: Tue Apr 28 00:12:33 2009
New Revision: 7351
URL: http://source.netsurf-browser.org?rev=7351&view=rev
Log:
remove debugging printfs
Modified:
branches/MarkieB/search/desktop/search.c
Modified: branches/MarkieB/search/desktop/search.c
URL: http://source.netsurf-browser.org/branches/MarkieB/search/desktop/search....
==============================================================================
--- branches/MarkieB/search/desktop/search.c (original)
+++ branches/MarkieB/search/desktop/search.c Tue Apr 28 00:12:33 2009
@@ -646,17 +646,13 @@
bool search_is_url(const char *url)
{
char *url2, *host;
- printf("checking url %s\n", url);
if (url_normalize(url, &url2) != URL_FUNC_OK)
return false;
- printf("normal %s\n", url2);
-
if (url_host(url2, &host) != URL_FUNC_OK)
return false;
- printf("host %s\n", host);
return true;
}
14 years, 7 months
r7350 MarkieB - /branches/MarkieB/search/content/fetchcache.c
by netsurf@semichrome.net
Author: MarkieB
Date: Tue Apr 28 00:09:36 2009
New Revision: 7350
URL: http://source.netsurf-browser.org?rev=7350&view=rev
Log:
make sure the only time we potentially redirect to search
is when the curl error is inability to resolve hostname
Modified:
branches/MarkieB/search/content/fetchcache.c
Modified: branches/MarkieB/search/content/fetchcache.c
URL: http://source.netsurf-browser.org/branches/MarkieB/search/content/fetchca...
==============================================================================
--- branches/MarkieB/search/content/fetchcache.c (original)
+++ branches/MarkieB/search/content/fetchcache.c Tue Apr 28 00:09:36 2009
@@ -737,11 +737,17 @@
const char *params[] = { 0 };
int length;
char *host;
-
- if ((option_search_url_bar) || ((url_host(c->url, &host) ==
- URL_FUNC_OK) && (strcasecmp(host,
- search_web_default_provider_host()
- ) == 0))) {
+ char checkmessage[24];
+
+ if (option_search_url_bar)
+ /* get the start of the error message for comparison
+ * the potential error message we're identifying is derived
+ * directly from libcurl, so hopefully no need for I18n */
+ snprintf(checkmessage, 24, "%s", error);
+ if (((url_host(c->url, &host) != URL_FUNC_OK) || (strcasecmp(host,
+ search_web_default_provider_host())!= 0)) &&
+ (strcasecmp(checkmessage, "couldn't resolve host '")
+ == 0)) {
fetchcache_search_redirect(c, error);
return;
}
14 years, 7 months
r7349 dsilvers - /trunk/netsurfweb/about/team.en
by netsurf@semichrome.net
Author: dsilvers
Date: Mon Apr 27 18:10:22 2009
New Revision: 7349
URL: http://source.netsurf-browser.org?rev=7349&view=rev
Log:
Add some blurb about me, at last
Modified:
trunk/netsurfweb/about/team.en
Modified: trunk/netsurfweb/about/team.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/about/team.en?rev=7349...
==============================================================================
--- trunk/netsurfweb/about/team.en (original)
+++ trunk/netsurfweb/about/team.en Mon Apr 27 18:10:22 2009
@@ -118,6 +118,10 @@
<h2>Daniel Silverstone</h2>
+<p>Generally grumpy, occasionally clever, but consistently ginger; Daniel works mostly on the GTK port of NetSurf and in a more airy hand-wavy way on most of the newer libraries which make up the NetSurf project.</p>
+
+<p>Daniel does most of his development work on his Ubuntu systems and is also half-responsible for the Debian and Ubuntu packaging of the project's output. Daniel also helps to maintain the server that hosts the project's web site and mailing lists.</p>
+
<ul>
<li>First check in: 9 March 2006</li>
<li>IRC name: Kinnison, SVN name: dsilvers</li>
@@ -181,4 +185,4 @@
</form>
</body>
-</html>
+</html>
14 years, 7 months
r7348 vince - in /branches/vince/netsurf-ncurses/ncurses: font.c gui.c gui.h plot.c
by netsurf@semichrome.net
Author: vince
Date: Mon Apr 27 15:10:10 2009
New Revision: 7348
URL: http://source.netsurf-browser.org?rev=7348&view=rev
Log:
try and fix rounding issues.
Modified:
branches/vince/netsurf-ncurses/ncurses/font.c
branches/vince/netsurf-ncurses/ncurses/gui.c
branches/vince/netsurf-ncurses/ncurses/gui.h
branches/vince/netsurf-ncurses/ncurses/plot.c
Modified: branches/vince/netsurf-ncurses/ncurses/font.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-ncurses/ncurses/...
==============================================================================
--- branches/vince/netsurf-ncurses/ncurses/font.c (original)
+++ branches/vince/netsurf-ncurses/ncurses/font.c Mon Apr 27 15:10:10 2009
@@ -25,7 +25,8 @@
#include "desktop/options.h"
#include "utils/utf8.h"
-#include "font.h"
+#include "ncurses/font.h"
+#include "ncurses/gui.h"
utf8_convert_ret utf8_to_font_encoding(const struct font_desc* font,
const char *string,
@@ -46,8 +47,8 @@
struct font_desc asciif = {
.name = "ascii",
- .width = 8,
- .height = 8,
+ .width = NCURSES_SCALE,
+ .height = NCURSES_SCALE,
.encoding = "ascii//TRANSLIT",
};
Modified: branches/vince/netsurf-ncurses/ncurses/gui.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-ncurses/ncurses/...
==============================================================================
--- branches/vince/netsurf-ncurses/ncurses/gui.c (original)
+++ branches/vince/netsurf-ncurses/ncurses/gui.c Mon Apr 27 15:10:10 2009
@@ -173,13 +173,13 @@
if (gw->pany > 0) {
queue_redraw(gw, 0, gw->height - gw->pany, gw->width, gw->height);
- scrl(gw->pany / 8);
+ scrl(gw->pany / NCURSES_SCALE);
gw->scrolly += gw->pany;
}
if (gw->pany < 0) {
queue_redraw(gw, 0, 0, gw->width, - gw->pany);
- scrl(gw->pany/8);
+ scrl(gw->pany / NCURSES_SCALE);
gw->scrolly += gw->pany;
}
gw->pany = 0;
@@ -233,13 +233,13 @@
break;
case KEY_DOWN:
- gw->pany += 80;
+ gw->pany += (NCURSES_SCALE * 10);
gw->pan_required = true;
redraws_pending = true;
break;
case KEY_UP:
- gw->pany -= 80;
+ gw->pany -= (NCURSES_SCALE * 10);
gw->pan_required = true;
redraws_pending = true;
break;
@@ -288,8 +288,8 @@
getmaxyx(stdscr, h, w);
- gw->width = w * 8;
- gw->height = h * 8;
+ gw->width = w * NCURSES_SCALE;
+ gw->height = h * NCURSES_SCALE;
switch(bw->browser_window_type) {
case BROWSER_WINDOW_NORMAL:
Modified: branches/vince/netsurf-ncurses/ncurses/gui.h
URL: http://source.netsurf-browser.org/branches/vince/netsurf-ncurses/ncurses/...
==============================================================================
--- branches/vince/netsurf-ncurses/ncurses/gui.h (original)
+++ branches/vince/netsurf-ncurses/ncurses/gui.h Mon Apr 27 15:10:10 2009
@@ -18,6 +18,8 @@
#ifndef NCURSES_GUI_H
#define NCURSES_GUI_H
+
+#define NCURSES_SCALE 8
/* bounding box */
typedef struct bbox_s {
Modified: branches/vince/netsurf-ncurses/ncurses/plot.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-ncurses/ncurses/...
==============================================================================
--- branches/vince/netsurf-ncurses/ncurses/plot.c (original)
+++ branches/vince/netsurf-ncurses/ncurses/plot.c Mon Apr 27 15:10:10 2009
@@ -53,11 +53,17 @@
if (y0 == y1) {
/* horizontal line - possibly do something with this */
- mvhline(y0 / 8, x0 / 8, ACS_HLINE, (x1 - x0) / 8 );
+ mvhline(y0 / NCURSES_SCALE,
+ x0 / NCURSES_SCALE,
+ ACS_HLINE,
+ (x1 - x0) / NCURSES_SCALE );
}
if (x0 == x1) {
/* vertical line - possibly do something with this */
- mvvline(y0 / 8, x0 / 8, ACS_VLINE, (y1 - y0) / 8 );
+ mvvline(y0 / NCURSES_SCALE,
+ x0 / NCURSES_SCALE,
+ ACS_VLINE,
+ (y1 - y0) / NCURSES_SCALE );
}
if (c != 0) {
@@ -88,8 +94,8 @@
static bool fill(int x0, int y0, int x1, int y1, colour c)
{
int w,h,x,y;
- char buffer[] = " ";
int loop;
+
if (x0 < clipto.x0)
x0 = clipto.x0;
if (y0 < clipto.y0)
@@ -99,10 +105,10 @@
if (y1 > clipto.y1)
y1 = clipto.y1;
- w = (x1 - x0) / 8;
- h = (y1 - y0) / 8;
- x = x0 / 8;
- y = y0 / 8;
+ x = (x0 + (NCURSES_SCALE - 1)) / NCURSES_SCALE;
+ y = (y0 + (NCURSES_SCALE - 1)) / NCURSES_SCALE;
+ w = (x1 - (x * NCURSES_SCALE)) / NCURSES_SCALE;
+ h = (y1 - (y * NCURSES_SCALE)) / NCURSES_SCALE;
if ((w <= 0) || (h <= 0))
return true;
@@ -110,9 +116,9 @@
if (c != 0) {
attron(A_REVERSE);
}
- buffer[w] = 0;
+
for (loop = 0; loop < h;loop++) {
- mvprintw(loop + y, x, "%s", buffer);
+ mvprintw(loop + y, x, "%*s", w, "");
}
@@ -125,8 +131,12 @@
static bool clg(colour c)
{
- LOG(("clg unimplemented"));
- return true;
+ return fill(clipto.x0,
+ clipto.y0,
+ clipto.x1,
+ clipto.y1,
+ c);
+
}
@@ -147,7 +157,7 @@
}
- mvprintw(y / 8, x/ 8, "%s",buffer);
+ mvprintw(y / NCURSES_SCALE, x / NCURSES_SCALE, "%s",buffer);
if (c != 0) {
attroff(A_REVERSE);
14 years, 7 months
r7347 vince - in /branches/vince/netsurf-ncurses/ncurses: gui.c plot.c
by netsurf@semichrome.net
Author: vince
Date: Mon Apr 27 14:43:54 2009
New Revision: 7347
URL: http://source.netsurf-browser.org?rev=7347&view=rev
Log:
improve plotting
Modified:
branches/vince/netsurf-ncurses/ncurses/gui.c
branches/vince/netsurf-ncurses/ncurses/plot.c
Modified: branches/vince/netsurf-ncurses/ncurses/gui.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-ncurses/ncurses/...
==============================================================================
--- branches/vince/netsurf-ncurses/ncurses/gui.c (original)
+++ branches/vince/netsurf-ncurses/ncurses/gui.c Mon Apr 27 14:43:54 2009
@@ -308,8 +308,6 @@
window_list = gw;
input_window = gw;
- mvprintw(0, 0, "w %d h %d",w, h);
-
return gw;
}
@@ -371,9 +369,6 @@
void gui_window_position_frame(struct gui_window *g, int x0, int y0,
int x1, int y1)
{
- struct gui_window *parent;
- int px, py;
- int w, h;
LOG(("%s: %d, %d, %d, %d", g->bw->name, x0, y0, x1, y1));
}
Modified: branches/vince/netsurf-ncurses/ncurses/plot.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-ncurses/ncurses/...
==============================================================================
--- branches/vince/netsurf-ncurses/ncurses/plot.c (original)
+++ branches/vince/netsurf-ncurses/ncurses/plot.c Mon Apr 27 14:43:54 2009
@@ -45,6 +45,12 @@
static bool line(int x0, int y0, int x1, int y1, int width,
colour c, bool dotted, bool dashed)
{
+ if (c != 0) {
+ attron(A_REVERSE);
+ }
+
+
+
if (y0 == y1) {
/* horizontal line - possibly do something with this */
mvhline(y0 / 8, x0 / 8, ACS_HLINE, (x1 - x0) / 8 );
@@ -54,6 +60,9 @@
mvvline(y0 / 8, x0 / 8, ACS_VLINE, (y1 - y0) / 8 );
}
+ if (c != 0) {
+ attroff(A_REVERSE);
+ }
return true;
}
@@ -78,7 +87,39 @@
static bool fill(int x0, int y0, int x1, int y1, colour c)
{
- LOG(("fill unimplemented"));
+ int w,h,x,y;
+ char buffer[] = " ";
+ int loop;
+ if (x0 < clipto.x0)
+ x0 = clipto.x0;
+ if (y0 < clipto.y0)
+ y0 = clipto.y0;
+ if (x1 > clipto.x1)
+ x1 = clipto.x1;
+ if (y1 > clipto.y1)
+ y1 = clipto.y1;
+
+ w = (x1 - x0) / 8;
+ h = (y1 - y0) / 8;
+ x = x0 / 8;
+ y = y0 / 8;
+
+ if ((w <= 0) || (h <= 0))
+ return true;
+
+ if (c != 0) {
+ attron(A_REVERSE);
+ }
+ buffer[w] = 0;
+ for (loop = 0; loop < h;loop++) {
+ mvprintw(loop + y, x, "%s", buffer);
+ }
+
+
+ if (c != 0) {
+ attroff(A_REVERSE);
+ }
+
return true;
}
@@ -101,7 +142,16 @@
return true;
length = strlen((char *)buffer);
+ if (c != 0) {
+ attron(A_REVERSE);
+ }
+
+
mvprintw(y / 8, x/ 8, "%s",buffer);
+
+ if (c != 0) {
+ attroff(A_REVERSE);
+ }
return true;
}
14 years, 7 months
r7346 vince - in /branches/vince/netsurf-ncurses/ncurses: gui.c plot.c
by netsurf@semichrome.net
Author: vince
Date: Mon Apr 27 14:05:33 2009
New Revision: 7346
URL: http://source.netsurf-browser.org?rev=7346&view=rev
Log:
improve input handling delay
Modified:
branches/vince/netsurf-ncurses/ncurses/gui.c
branches/vince/netsurf-ncurses/ncurses/plot.c
Modified: branches/vince/netsurf-ncurses/ncurses/gui.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-ncurses/ncurses/...
==============================================================================
--- branches/vince/netsurf-ncurses/ncurses/gui.c (original)
+++ branches/vince/netsurf-ncurses/ncurses/gui.c Mon Apr 27 14:05:33 2009
@@ -216,6 +216,15 @@
struct gui_window *gw = input_window;
int c;
+ if (active) {
+ halfdelay(2);
+
+ } else {
+ nocbreak();
+ cbreak(); /* take input chars one at a time, no wait for \n */
+ }
+
+
/* input */
c = getch();
switch (c) {
Modified: branches/vince/netsurf-ncurses/ncurses/plot.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-ncurses/ncurses/...
==============================================================================
--- branches/vince/netsurf-ncurses/ncurses/plot.c (original)
+++ branches/vince/netsurf-ncurses/ncurses/plot.c Mon Apr 27 14:05:33 2009
@@ -48,6 +48,10 @@
if (y0 == y1) {
/* horizontal line - possibly do something with this */
mvhline(y0 / 8, x0 / 8, ACS_HLINE, (x1 - x0) / 8 );
+ }
+ if (x0 == x1) {
+ /* vertical line - possibly do something with this */
+ mvvline(y0 / 8, x0 / 8, ACS_VLINE, (y1 - y0) / 8 );
}
14 years, 7 months
r7345 MarkieB - in /branches/MarkieB/search: desktop/search.c desktop/search.h gtk/gtk_scaffolding.c
by netsurf@semichrome.net
Author: MarkieB
Date: Mon Apr 27 13:58:03 2009
New Revision: 7345
URL: http://source.netsurf-browser.org?rev=7345&view=rev
Log:
first try at checking host name for web search from url bar
Modified:
branches/MarkieB/search/desktop/search.c
branches/MarkieB/search/desktop/search.h
branches/MarkieB/search/gtk/gtk_scaffolding.c
Modified: branches/MarkieB/search/desktop/search.c
URL: http://source.netsurf-browser.org/branches/MarkieB/search/desktop/search....
==============================================================================
--- branches/MarkieB/search/desktop/search.c (original)
+++ branches/MarkieB/search/desktop/search.c Mon Apr 27 13:58:03 2009
@@ -643,6 +643,32 @@
return true;
}
+bool search_is_url(const char *url)
+{
+ char *url2, *host;
+ printf("checking url %s\n", url);
+
+ if (url_normalize(url, &url2) != URL_FUNC_OK)
+ return false;
+
+ printf("normal %s\n", url2);
+
+ if (url_host(url2, &host) != URL_FUNC_OK)
+ return false;
+
+ printf("host %s\n", host);
+ return true;
+}
+
+char *search_web_from_term(const char *searchterm)
+{
+ char *encsearchterm;
+ if (url_escape(searchterm, 0, true, NULL, &encsearchterm)
+ != URL_FUNC_OK)
+ return strdup(searchterm);
+ return search_web_get_url(encsearchterm);
+}
+
char *search_web_default_provider_host()
{
switch (option_search_provider) {
Modified: branches/MarkieB/search/desktop/search.h
URL: http://source.netsurf-browser.org/branches/MarkieB/search/desktop/search....
==============================================================================
--- branches/MarkieB/search/desktop/search.h (original)
+++ branches/MarkieB/search/desktop/search.h Mon Apr 27 13:58:03 2009
@@ -83,8 +83,32 @@
void search_reset(void);
void search_end(void);
+
+/**
+ * open new tab/window for web search term
+ */
bool search_web_new_window(struct browser_window *bw, const char *searchterm);
+
+/**
+ * retrieve full search url from unencoded search term
+ */
+char *search_web_from_term(const char *searchterm);
+
+/**
+ * retrieve full search url from encoded web search term
+ */
char *search_web_get_url(const char *encsearchterm);
+
+/**
+ * retrieve hostname of default web search provider
+ */
char *search_web_default_provider_host(void);
+/**
+ * check whether an URL is in fact a search term
+ * \param url the url being checked
+ * \return true for url, false for search
+ */
+bool search_is_url(const char *url);
+
#endif
Modified: branches/MarkieB/search/gtk/gtk_scaffolding.c
URL: http://source.netsurf-browser.org/branches/MarkieB/search/gtk/gtk_scaffol...
==============================================================================
--- branches/MarkieB/search/gtk/gtk_scaffolding.c (original)
+++ branches/MarkieB/search/gtk/gtk_scaffolding.c Mon Apr 27 13:58:03 2009
@@ -471,9 +471,10 @@
{
struct gtk_scaffolding *g = data;
struct browser_window *bw = gui_window_get_browser_window(g->top_level);
-
- browser_window_go(bw, gtk_entry_get_text(GTK_ENTRY(g->url_bar)),
- 0, true);
+ char *url = (char *)gtk_entry_get_text(GTK_ENTRY(g->url_bar));
+ if (!search_is_url(url))
+ url = search_web_from_term(url);
+ browser_window_go(bw, url, 0, true);
return TRUE;
}
14 years, 7 months