r2833 rjek - in /branches/rjek/glade/gtk: gtk_window.c netsurf.glade
by netsurf＠semichrome.net
Author: rjek
Date: Sat Aug 12 16:42:17 2006
New Revision: 2833
URL: http://svn.semichrome.net?rev=2833&view=rev
Log:
New nsgtk window improvements - toolbar now functions.
Modified:
branches/rjek/glade/gtk/gtk_window.c
branches/rjek/glade/gtk/netsurf.glade
Modified: branches/rjek/glade/gtk/gtk_window.c
URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_window.c?rev=2833&r...
==============================================================================
--- branches/rjek/glade/gtk/gtk_window.c (original)
+++ branches/rjek/glade/gtk/gtk_window.c Sat Aug 12 16:42:17 2006
@@ -86,7 +86,16 @@
gpointer);
static gboolean nsgtk_window_size_allocate_event(GtkWidget *, GtkAllocation *,
gpointer);
+
static void nsgtk_perform_deferred_resize(void *p);
+static void nsgtk_window_update_back_forward(struct gui_window *);
+
+static void nsgtk_window_back_button_clicked(GtkWidget *, gpointer);
+static void nsgtk_window_forward_button_clicked(GtkWidget *, gpointer);
+static void nsgtk_window_stop_button_clicked(GtkWidget *, gpointer);
+static void nsgtk_window_reload_button_clicked(GtkWidget *, gpointer);
+static void nsgtk_window_home_button_clicked(GtkWidget *, gpointer);
+static gboolean nsgtk_window_url_activate_event(GtkWidget *, gpointer);
wchar_t gdkkey_to_nskey(GdkEventKey *key)
{
@@ -273,6 +282,82 @@
schedule(100, nsgtk_perform_deferred_resize, g);
}
+void nsgtk_window_update_back_forward(struct gui_window *g)
+{
+ int width, height;
+ gtk_widget_set_sensitive(GTK_WIDGET(g->back_button),
+ history_back_available(g->bw->history));
+ gtk_widget_set_sensitive(GTK_WIDGET(g->forward_button),
+ history_forward_available(g->bw->history));
+ history_size(g->bw->history, &width, &height);
+ gtk_widget_set_size_request(GTK_WIDGET(g->history_window->drawing_area),
+ width, height);
+ gtk_widget_queue_draw(GTK_WIDGET(g->history_window));
+}
+
+
+/* signal handling functions for the toolbar and URL bar */
+void nsgtk_window_back_button_clicked(GtkWidget *widget, gpointer data)
+{
+ struct gui_window *g = data;
+
+ if (!history_back_available(g->bw->history))
+ return;
+
+ history_back(g->bw, g->bw->history);
+ nsgtk_window_update_back_forward(g);
+}
+
+void nsgtk_window_forward_button_clicked(GtkWidget *widget, gpointer data)
+{
+ struct gui_window *g = data;
+
+ if (!history_forward_available(g->bw->history))
+ return;
+
+ history_forward(g->bw, g->bw->history);
+ nsgtk_window_update_back_forward(g);
+}
+
+void nsgtk_window_stop_button_clicked(GtkWidget *widget, gpointer data)
+{
+ struct gui_window *g = data;
+
+ browser_window_stop(g->bw);
+}
+
+void nsgtk_window_reload_button_clicked(GtkWidget *widget, gpointer data)
+{
+ struct gui_window *g = data;
+
+ browser_window_reload(g->bw, true);
+}
+
+void nsgtk_window_home_button_clicked(GtkWidget *widget, gpointer data)
+{
+ struct gui_window *g = data;
+ const char *addr = "http://netsurf.sourceforge.net/";
+
+ if (option_homepage_url != NULL)
+ addr = option_homepage_url;
+
+ browser_window_go(g->bw, addr, 0, true);
+}
+
+gboolean nsgtk_window_url_activate_event(GtkWidget *widget, gpointer data)
+{
+ struct gui_window *g = data;
+ char *referer = 0;
+
+ if (g->bw->current_content && g->bw->current_content->url)
+ referer = g->bw->current_content->url;
+
+ browser_window_go(g->bw, gtk_entry_get_text(GTK_ENTRY(g->url_bar)),
+ referer, true);
+
+ return TRUE;
+}
+
/* functions called by the core to manipulate the GUI */
#define GET_WIDGET(x) glade_xml_get_widget(g->xml, (x))
@@ -333,6 +418,11 @@
/* set the default background colour of the drawing area to white. */
gtk_widget_modify_bg(GTK_WIDGET(g->drawing_area), GTK_STATE_NORMAL,
&((GdkColor) { 0, 0xffff, 0xffff, 0xffff } ));
+
+ /* disable toolbar buttons that make no sense initially. */
+ gtk_widget_set_sensitive(GTK_WIDGET(g->back_button), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(g->forward_button), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(g->stop_button), FALSE);
/* create the local history window to be assoicated with this browser */
g->history_window = malloc(sizeof(struct gtk_history_window));
@@ -375,6 +465,17 @@
nsgtk_window_keypress_event, g);
CONNECT(GET_WIDGET("viewport1"), "size_allocate",
nsgtk_window_size_allocate_event, g);
+
+ /* toolbar and URL bar signal handlers */
+ CONNECT(g->back_button, "clicked", nsgtk_window_back_button_clicked, g);
+ CONNECT(g->forward_button, "clicked",
+ nsgtk_window_forward_button_clicked, g);
+ CONNECT(g->stop_button, "clicked", nsgtk_window_stop_button_clicked, g);
+ CONNECT(g->reload_button, "clicked",
+ nsgtk_window_reload_button_clicked, g);
+ CONNECT(GET_WIDGET("toolHome"), "clicked",
+ nsgtk_window_home_button_clicked, g);
+ CONNECT(g->url_bar, "activate", nsgtk_window_url_activate_event, g);
/* increase the number of open windows. */
open_windows++;
@@ -392,7 +493,20 @@
void gui_window_set_title(struct gui_window *g, const char *title)
{
- gtk_window_set_title(g->window, title);
+ char suffix[] = " - NetSurf";
+ char nt[strlen(title) + strlen(suffix) + 1];
+
+ if (title == NULL || title[0] == NULL)
+ {
+ gtk_window_set_title(g->window, "NetSurf");
+
+ }
+ else
+ {
+ strcpy(nt, title);
+ strcat(nt, suffix);
+ gtk_window_set_title(g->window, nt);
+ }
}
void gui_window_redraw(struct gui_window *g, int x0, int y0, int x1, int y1)
@@ -548,12 +662,14 @@
{
gtk_widget_set_sensitive(GTK_WIDGET(g->stop_button), TRUE);
gtk_widget_set_sensitive(GTK_WIDGET(g->reload_button), FALSE);
+ nsgtk_window_update_back_forward(g);
}
void gui_window_stop_throbber(struct gui_window* g)
{
gtk_widget_set_sensitive(GTK_WIDGET(g->stop_button), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(g->reload_button), TRUE);
+ nsgtk_window_update_back_forward(g);
}
void gui_window_place_caret(struct gui_window *g, int x, int y, int height)
Modified: branches/rjek/glade/gtk/netsurf.glade
URL: http://svn.semichrome.net/branches/rjek/glade/gtk/netsurf.glade?rev=2833&...
==============================================================================
--- branches/rjek/glade/gtk/netsurf.glade (original)
+++ branches/rjek/glade/gtk/netsurf.glade Sat Aug 12 16:42:17 2006
@@ -3283,7 +3283,7 @@
<accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image105">
+ <widget class="GtkImage" id="image214">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -3299,6 +3299,7 @@
<child>
<widget class="GtkMenuItem" id="open_location">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Open an address into this browser window.</property>
<property name="label" translatable="yes">Open _location</property>
<property name="use_underline">True</property>
@@ -3310,6 +3311,7 @@
<child>
<widget class="GtkImageMenuItem" id="open_file">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Open a file on your computer into this browser window.</property>
<property name="label" translatable="yes">Open _file</property>
<property name="use_underline">True</property>
@@ -3317,7 +3319,7 @@
<accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image106">
+ <widget class="GtkImage" id="image215">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -3340,7 +3342,7 @@
<accelerator key="W" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image107">
+ <widget class="GtkImage" id="image216">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -3362,6 +3364,7 @@
<child>
<widget class="GtkImageMenuItem" id="save_page">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Save this page to disc, optionally including images, etc.</property>
<property name="label" translatable="yes">Save page...</property>
<property name="use_underline">True</property>
@@ -3369,7 +3372,7 @@
<accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image108">
+ <widget class="GtkImage" id="image217">
<property name="visible">True</property>
<property name="stock">gtk-save-as</property>
<property name="icon_size">1</property>
@@ -3385,6 +3388,7 @@
<child>
<widget class="GtkMenuItem" id="export">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Export the page to a different format.</property>
<property name="label" translatable="yes">Export</property>
<property name="use_underline">True</property>
@@ -3436,13 +3440,14 @@
<child>
<widget class="GtkImageMenuItem" id="print_preview">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Show how a print out might look like.</property>
<property name="label" translatable="yes">Print preview</property>
<property name="use_underline">True</property>
<signal name="activate" handler="nsgtk_on_print_preview_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image109">
+ <widget class="GtkImage" id="image218">
<property name="visible">True</property>
<property name="stock">gtk-print-preview</property>
<property name="icon_size">1</property>
@@ -3458,6 +3463,7 @@
<child>
<widget class="GtkImageMenuItem" id="print">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Produce a hardcopy on your printer.</property>
<property name="label" translatable="yes">Print</property>
<property name="use_underline">True</property>
@@ -3465,7 +3471,7 @@
<accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image110">
+ <widget class="GtkImage" id="image219">
<property name="visible">True</property>
<property name="stock">gtk-print</property>
<property name="icon_size">1</property>
@@ -3509,6 +3515,7 @@
<child>
<widget class="GtkImageMenuItem" id="cut">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="label">gtk-cut</property>
<property name="use_stock">True</property>
<signal name="activate" handler="nsgtk_on_cut_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
@@ -3518,6 +3525,7 @@
<child>
<widget class="GtkImageMenuItem" id="copy">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="label">gtk-copy</property>
<property name="use_stock">True</property>
<signal name="activate" handler="nsgtk_on_copy_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
@@ -3527,6 +3535,7 @@
<child>
<widget class="GtkImageMenuItem" id="paste">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="label">gtk-paste</property>
<property name="use_stock">True</property>
<signal name="activate" handler="nsgtk_on_paste_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
@@ -3536,6 +3545,7 @@
<child>
<widget class="GtkImageMenuItem" id="delete">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="label">gtk-delete</property>
<property name="use_stock">True</property>
<signal name="activate" handler="nsgtk_on_delete_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
@@ -3551,6 +3561,7 @@
<child>
<widget class="GtkMenuItem" id="select_all">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Selects all text in the current browser window.</property>
<property name="label" translatable="yes">Select _all</property>
<property name="use_underline">True</property>
@@ -3568,6 +3579,7 @@
<child>
<widget class="GtkMenuItem" id="find">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Find specific text in the current browser window.</property>
<property name="label" translatable="yes">_Find...</property>
<property name="use_underline">True</property>
@@ -3591,7 +3603,7 @@
<signal name="activate" handler="nsgtk_on_choices_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image111">
+ <widget class="GtkImage" id="image220">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -3627,7 +3639,7 @@
<accelerator key="F11" modifiers="0" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image112">
+ <widget class="GtkImage" id="image221">
<property name="visible">True</property>
<property name="stock">gtk-zoom-in</property>
<property name="icon_size">1</property>
@@ -3637,6 +3649,77 @@
<property name="ypad">0</property>
</widget>
</child>
+
+ <child>
+ <widget class="GtkMenu" id="scale_view_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="nsgtk_zoom_in">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Zoom _in</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_nsgtk_zoom_in_activate" last_modification_time="Sat, 12 Aug 2006 15:24:15 GMT"/>
+ <accelerator key="plus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image222">
+ <property name="visible">True</property>
+ <property name="stock">gtk-zoom-in</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="normal_size">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Normal size</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_normal_size_activate" last_modification_time="Sat, 12 Aug 2006 15:24:15 GMT"/>
+ <accelerator key="0" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image223">
+ <property name="visible">True</property>
+ <property name="stock">gtk-zoom-100</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="zoom_out">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Zoom _out</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_zoom_out_activate" last_modification_time="Sat, 12 Aug 2006 15:24:15 GMT"/>
+ <accelerator key="minus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image224">
+ <property name="visible">True</property>
+ <property name="stock">gtk-zoom-out</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
@@ -3763,7 +3846,7 @@
<accelerator key="Left" modifiers="GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image113">
+ <widget class="GtkImage" id="image225">
<property name="visible">True</property>
<property name="stock">gtk-go-back</property>
<property name="icon_size">1</property>
@@ -3785,7 +3868,7 @@
<accelerator key="Right" modifiers="GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image114">
+ <widget class="GtkImage" id="image226">
<property name="visible">True</property>
<property name="stock">gtk-go-forward</property>
<property name="icon_size">1</property>
@@ -3807,7 +3890,7 @@
<accelerator key="Home" modifiers="GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image115">
+ <widget class="GtkImage" id="image227">
<property name="visible">True</property>
<property name="stock">gtk-home</property>
<property name="icon_size">1</property>
@@ -3840,6 +3923,7 @@
<child>
<widget class="GtkMenuItem" id="global_history1">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Show the history tree for all windows.</property>
<property name="label" translatable="yes">_Global history</property>
<property name="use_underline">True</property>
@@ -3857,6 +3941,7 @@
<child>
<widget class="GtkMenuItem" id="nsgtk_add_to_bookmarks">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Add the current page to your bookmarks.</property>
<property name="label" translatable="yes">_Add to bookmarks</property>
<property name="use_underline">True</property>
@@ -3867,6 +3952,7 @@
<child>
<widget class="GtkMenuItem" id="show_bookmarks">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Open a window showing all your bookmarks.</property>
<property name="label" translatable="yes">Show book_marks</property>
<property name="use_underline">True</property>
@@ -3892,6 +3978,7 @@
<child>
<widget class="GtkImageMenuItem" id="contents">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Shows the contents of the NetSurf manual.</property>
<property name="label" translatable="yes">_Contents...</property>
<property name="use_underline">True</property>
@@ -3899,7 +3986,7 @@
<accelerator key="F1" modifiers="0" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image116">
+ <widget class="GtkImage" id="image228">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
<property name="icon_size">1</property>
@@ -3915,6 +4002,7 @@
<child>
<widget class="GtkMenuItem" id="guide">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Shows a guide and tutorial.</property>
<property name="label" translatable="yes">User _guide</property>
<property name="use_underline">True</property>
@@ -3925,6 +4013,7 @@
<child>
<widget class="GtkMenuItem" id="user_information">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="label" translatable="yes">User _information</property>
<property name="use_underline">True</property>
<signal name="activate" handler="nsgtk_on_user_information_activate" last_modification_time="Sat, 12 Aug 2006 14:04:35 GMT"/>
@@ -4025,78 +4114,6 @@
<widget class="GtkToolButton" id="toolHome">
<property name="visible">True</property>
<property name="stock_id">gtk-home</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolButton" id="toolZoomIn">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
- <property name="stock_id">gtk-zoom-in</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolButton" id="toolZoom100">
- <property name="visible">True</property>
- <property name="stock_id">gtk-zoom-100</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolButton" id="toolZoomOut">
- <property name="visible">True</property>
- <property name="stock_id">gtk-zoom-out</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolButton" id="toolHistory">
- <property name="visible">True</property>
- <property name="stock_id">gtk-open</property>
- <property name="visible_horizontal">True</property>
- <property name="visible_vertical">True</property>
- <property name="is_important">False</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkToolButton" id="toolChoices">
- <property name="visible">True</property>
- <property name="stock_id">gtk-preferences</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
<property name="is_important">False</property>
@@ -4135,14 +4152,14 @@
</child>
<child>
- <widget class="GtkToolItem" id="toolitem3">
+ <widget class="GtkToolItem" id="toolthrobber">
<property name="visible">True</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
<property name="is_important">False</property>
<child>
- <widget class="GtkImage" id="throbber">
+ <widget class="GtkImage" id="throbble">
<property name="visible">True</property>
<property name="icon_size">4</property>
<property name="icon_name">gtk-yes</property>
16 years, 7 months
- 1
- 0
r2832 rjek - /branches/rjek/glade/gtk/netsurf.glade
by netsurf＠semichrome.net
Author: rjek
Date: Sat Aug 12 15:08:44 2006
New Revision: 2832
URL: http://svn.semichrome.net?rev=2832&view=rev
Log:
Design menu bar for nsgtk. Although none of the entries do anything yet.
Modified:
branches/rjek/glade/gtk/netsurf.glade
Modified: branches/rjek/glade/gtk/netsurf.glade
URL: http://svn.semichrome.net/branches/rjek/glade/gtk/netsurf.glade?rev=2832&...
==============================================================================
--- branches/rjek/glade/gtk/netsurf.glade (original)
+++ branches/rjek/glade/gtk/netsurf.glade Sat Aug 12 15:08:44 2006
@@ -3271,46 +3271,215 @@
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="menu4">
-
- <child>
- <widget class="GtkImageMenuItem" id="new1">
- <property name="visible">True</property>
- <property name="label">gtk-new</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_new1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="open1">
- <property name="visible">True</property>
- <property name="label">gtk-open</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_open1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="save1">
- <property name="visible">True</property>
- <property name="label">gtk-save</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_save1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="save_as1">
- <property name="visible">True</property>
- <property name="label">gtk-save-as</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_save_as1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ <widget class="GtkMenu" id="menuitem4_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="new_window">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Opens a new browser window.</property>
+ <property name="label" translatable="yes">New window</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_new_window_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+ <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image105">
+ <property name="visible">True</property>
+ <property name="stock">gtk-new</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="open_location">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Open an address into this browser window.</property>
+ <property name="label" translatable="yes">Open _location</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_open_location_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+ <accelerator key="L" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="open_file">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Open a file on your computer into this browser window.</property>
+ <property name="label" translatable="yes">Open _file</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_open_file_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+ <accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image106">
+ <property name="visible">True</property>
+ <property name="stock">gtk-open</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="close_window">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Close this browser window.</property>
+ <property name="label" translatable="yes">_Close window</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="ns_gtk_on_close_window_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+ <accelerator key="W" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image107">
+ <property name="visible">True</property>
+ <property name="stock">gtk-close</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
</child>
<child>
<widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="save_page">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Save this page to disc, optionally including images, etc.</property>
+ <property name="label" translatable="yes">Save page...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_save_page_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+ <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image108">
+ <property name="visible">True</property>
+ <property name="stock">gtk-save-as</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="export">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Export the page to a different format.</property>
+ <property name="label" translatable="yes">Export</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_export_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+
+ <child>
+ <widget class="GtkMenu" id="export_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="export_plain_text">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Plain ASCII text, readable in text editors and views.</property>
+ <property name="label" translatable="yes">Plain text</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_export_plain_text_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="export_drawfile">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">RISC OS Drawfile vector graphic.</property>
+ <property name="label" translatable="yes">Drawfile</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_export_drawfile_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="export_postscript">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">PostScript for printing and converting to PDFs.</property>
+ <property name="label" translatable="yes">PostScript</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_export_postscript_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator2">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="print_preview">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show how a print out might look like.</property>
+ <property name="label" translatable="yes">Print preview</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_print_preview_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image109">
+ <property name="visible">True</property>
+ <property name="stock">gtk-print-preview</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="print">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Produce a hardcopy on your printer.</property>
+ <property name="label" translatable="yes">Print</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_print_activate" last_modification_time="Sat, 12 Aug 2006 13:19:42 GMT"/>
+ <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image110">
+ <property name="visible">True</property>
+ <property name="stock">gtk-print</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator3">
<property name="visible">True</property>
</widget>
</child>
@@ -3335,41 +3504,103 @@
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="menu5">
-
- <child>
- <widget class="GtkImageMenuItem" id="cut1">
+ <widget class="GtkMenu" id="menuitem5_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="cut">
<property name="visible">True</property>
<property name="label">gtk-cut</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_cut1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="copy1">
+ <signal name="activate" handler="nsgtk_on_cut_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="copy">
<property name="visible">True</property>
<property name="label">gtk-copy</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_copy1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="paste1">
+ <signal name="activate" handler="nsgtk_on_copy_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="paste">
<property name="visible">True</property>
<property name="label">gtk-paste</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_paste1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="delete1">
+ <signal name="activate" handler="nsgtk_on_paste_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="delete">
<property name="visible">True</property>
<property name="label">gtk-delete</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_delete1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ <signal name="activate" handler="nsgtk_on_delete_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator4">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="select_all">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Selects all text in the current browser window.</property>
+ <property name="label" translatable="yes">Select _all</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_select_all_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
+ <accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator5">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="find">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Find specific text in the current browser window.</property>
+ <property name="label" translatable="yes">_Find...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_find_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
+ <accelerator key="F" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator6">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="choices">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Change how NetSurf functions.</property>
+ <property name="label" translatable="yes">_Choices</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_choices_activate" last_modification_time="Sat, 12 Aug 2006 13:32:56 GMT"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image111">
+ <property name="visible">True</property>
+ <property name="stock">gtk-preferences</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
</child>
</widget>
@@ -3384,27 +3615,334 @@
<property name="use_underline">True</property>
<child>
- <widget class="GtkMenu" id="menu6">
+ <widget class="GtkMenu" id="menuitem6_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="scale_view">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Scale the page in the current browser window to be smaller or larger.</property>
+ <property name="label" translatable="yes">Scale View...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_scale_view_activate" last_modification_time="Sat, 12 Aug 2006 13:40:14 GMT"/>
+ <accelerator key="F11" modifiers="0" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image112">
+ <property name="visible">True</property>
+ <property name="stock">gtk-zoom-in</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="images">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Images</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_images_activate" last_modification_time="Sat, 12 Aug 2006 13:40:14 GMT"/>
+
+ <child>
+ <widget class="GtkMenu" id="images_menu">
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="foreground_images">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Toggle the display of images in the foreground.</property>
+ <property name="label" translatable="yes">Foreground images</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="activate" handler="nsgtk_on_foreground_images_activate" last_modification_time="Sat, 12 Aug 2006 13:40:14 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="background_images">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Toggle the display of images in the background.</property>
+ <property name="label" translatable="yes">Background images</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="activate" handler="nsgtk_on_background_images_activate" last_modification_time="Sat, 12 Aug 2006 13:40:14 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="toolbars">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Toolbars</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_toolbars_activate" last_modification_time="Sat, 12 Aug 2006 13:40:14 GMT"/>
+
+ <child>
+ <widget class="GtkMenu" id="toolbars_menu">
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="menu_bar">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Menu bar</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="activate" handler="nsgtk_on_menu_bar_activate" last_modification_time="Sat, 12 Aug 2006 13:40:14 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="buttons">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Buttons</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="activate" handler="nsgtk_on_buttons_activate" last_modification_time="Sat, 12 Aug 2006 13:40:14 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="address_bar">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Address bar</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="activate" handler="nsgtk_on_address_bar_activate" last_modification_time="Sat, 12 Aug 2006 13:40:14 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="throbber">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Throbber</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="activate" handler="nsgtk_on_throbber_activate" last_modification_time="Sat, 12 Aug 2006 13:40:14 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkCheckMenuItem" id="status_bar">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Status bar</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <signal name="activate" handler="nsgtk_on_status_bar_activate" last_modification_time="Sat, 12 Aug 2006 13:40:14 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menuitem7">
+ <widget class="GtkMenuItem" id="navigate">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Navigate</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_navigate_activate" last_modification_time="Sat, 12 Aug 2006 13:55:35 GMT"/>
+
+ <child>
+ <widget class="GtkMenu" id="navigate_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="back">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Back</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_back_activate" last_modification_time="Sat, 12 Aug 2006 13:56:18 GMT"/>
+ <accelerator key="Left" modifiers="GDK_MOD1_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image113">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-back</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="forward">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Forward</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_forward_activate" last_modification_time="Sat, 12 Aug 2006 13:56:44 GMT"/>
+ <accelerator key="Right" modifiers="GDK_MOD1_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image114">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-forward</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="home">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Home</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_home_activate" last_modification_time="Sat, 12 Aug 2006 13:57:05 GMT"/>
+ <accelerator key="Home" modifiers="GDK_MOD1_MASK" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image115">
+ <property name="visible">True</property>
+ <property name="stock">gtk-home</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator7">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="local_history">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show the history tree for this browser window.</property>
+ <property name="label" translatable="yes">_Local history</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_local_history_activate" last_modification_time="Sat, 12 Aug 2006 13:58:43 GMT"/>
+ <accelerator key="F7" modifiers="0" signal="activate"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="global_history1">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Show the history tree for all windows.</property>
+ <property name="label" translatable="yes">_Global history</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_global_history1_activate" last_modification_time="Sat, 12 Aug 2006 13:58:43 GMT"/>
+ <accelerator key="F7" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator8">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="nsgtk_add_to_bookmarks">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Add the current page to your bookmarks.</property>
+ <property name="label" translatable="yes">_Add to bookmarks</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_nsgtk_add_to_bookmarks_activate" last_modification_time="Sat, 12 Aug 2006 13:59:56 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="show_bookmarks">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Open a window showing all your bookmarks.</property>
+ <property name="label" translatable="yes">Show book_marks</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_show_bookmarks_activate" last_modification_time="Sat, 12 Aug 2006 14:01:11 GMT"/>
+ <accelerator key="F6" modifiers="0" signal="activate"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="help">
<property name="visible">True</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_help_activate" last_modification_time="Sat, 12 Aug 2006 14:04:35 GMT"/>
<child>
- <widget class="GtkMenu" id="menu7">
-
- <child>
- <widget class="GtkMenuItem" id="about1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_About</property>
+ <widget class="GtkMenu" id="help_menu">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="contents">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Shows the contents of the NetSurf manual.</property>
+ <property name="label" translatable="yes">_Contents...</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_about1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ <signal name="activate" handler="nsgtk_on_contents_activate" last_modification_time="Sat, 12 Aug 2006 14:04:35 GMT"/>
+ <accelerator key="F1" modifiers="0" signal="activate"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image116">
+ <property name="visible">True</property>
+ <property name="stock">gtk-help</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="guide">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Shows a guide and tutorial.</property>
+ <property name="label" translatable="yes">User _guide</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_guide_activate" last_modification_time="Sat, 12 Aug 2006 14:04:35 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="user_information">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">User _information</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="nsgtk_on_user_information_activate" last_modification_time="Sat, 12 Aug 2006 14:04:35 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator9">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="about">
+ <property name="visible">True</property>
+ <property name="label">gtk-about</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="nsgtk_on_about_activate" last_modification_time="Sat, 12 Aug 2006 14:04:35 GMT"/>
</widget>
</child>
</widget>
16 years, 7 months
- 1
- 0
r2831 rjek - /branches/rjek/glade/gtk/gtk_window.c
by netsurf＠semichrome.net
Author: rjek
Date: Fri Aug 11 19:52:47 2006
New Revision: 2831
URL: http://svn.semichrome.net?rev=2831&view=rev
Log:
Fix some warnings
Modified:
branches/rjek/glade/gtk/gtk_window.c
Modified: branches/rjek/glade/gtk/gtk_window.c
URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_window.c?rev=2831&r...
==============================================================================
--- branches/rjek/glade/gtk/gtk_window.c (original)
+++ branches/rjek/glade/gtk/gtk_window.c Fri Aug 11 19:52:47 2006
@@ -126,6 +126,8 @@
}
}
+/* event handlers and support functions for them */
+
void nsgtk_window_destroy_event(GtkWidget *widget, gpointer data)
{
struct gui_window *g = data;
@@ -270,6 +272,8 @@
if (GTK_WIDGET_SENSITIVE((GTK_WIDGET(g->stop_button))))
schedule(100, nsgtk_perform_deferred_resize, g);
}
+
+/* functions called by the core to manipulate the GUI */
#define GET_WIDGET(x) glade_xml_get_widget(g->xml, (x))
struct gui_window *gui_create_browser_window(struct browser_window *bw,
@@ -333,16 +337,19 @@
/* create the local history window to be assoicated with this browser */
g->history_window = malloc(sizeof(struct gtk_history_window));
g->history_window->g = g;
- g->history_window->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ g->history_window->window = GTK_WINDOW(
+ gtk_window_new(GTK_WINDOW_TOPLEVEL));
gtk_window_set_transient_for(g->history_window->window, g->window);
gtk_window_set_default_size(g->history_window->window, 400, 400);
gtk_window_set_title(g->history_window->window, "NetSurf History");
- g->history_window->scrolled = gtk_scrolled_window_new(0, 0);
+ g->history_window->scrolled = GTK_SCROLLED_WINDOW(
+ gtk_scrolled_window_new(0, 0));
gtk_container_add(GTK_CONTAINER(g->history_window->window),
GTK_WIDGET(g->history_window->scrolled));
gtk_widget_show(GTK_WIDGET(g->history_window->scrolled));
- g->history_window->drawing_area = gtk_drawing_area_new();
+ g->history_window->drawing_area = GTK_DRAWING_AREA(
+ gtk_drawing_area_new());
gtk_widget_set_events(GTK_WIDGET(g->history_window->drawing_area),
GDK_EXPOSURE_MASK |
GDK_POINTER_MOTION_MASK |
@@ -426,12 +433,12 @@
int gui_window_get_width(struct gui_window* g)
{
- //return g->drawing_area->allocation.width;
+ return GTK_WIDGET(g->drawing_area)->allocation.width;
}
int gui_window_get_height(struct gui_window* g)
{
- //return g->drawing_area->allocation.height;
+ return GTK_WIDGET(g->drawing_area)->allocation.height;
}
void gui_window_set_extent(struct gui_window *g, int width, int height)
16 years, 7 months
- 1
- 0
r2830 rjek - /branches/rjek/glade/gtk/gtk_window.c
by netsurf＠semichrome.net
Author: rjek
Date: Fri Aug 11 18:34:12 2006
New Revision: 2830
URL: http://svn.semichrome.net?rev=2830&view=rev
Log:
Start massive rewrite of main window code for nsgtk
Modified:
branches/rjek/glade/gtk/gtk_window.c
Modified: branches/rjek/glade/gtk/gtk_window.c
URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_window.c?rev=2830&r...
==============================================================================
--- branches/rjek/glade/gtk/gtk_window.c (original)
+++ branches/rjek/glade/gtk/gtk_window.c Fri Aug 11 18:34:12 2006
@@ -1,8 +1,8 @@
/*
* This file is part of NetSurf, http://netsurf.sourceforge.net/
* Licensed under the GNU General Public License,
- * http://www.opensource.org/licenses/gpl-license
- * Copyright 2005 James Bursa <bursa(a)users.sourceforge.net>
+ * http://www.opensource.org/licenses/gpl-license
+ * Copyright 2006 Rob Kendrick <rjek(a)rjek.com>
*/
#include <stdbool.h>
@@ -34,30 +34,33 @@
struct gtk_history_window;
struct gui_window {
- GtkWidget *window;
- GtkWidget *url_bar;
- GtkWidget *drawing_area;
- GtkWidget *status_bar;
- GtkWidget *progress_bar;
- GtkWidget *stop_button;
- GtkWidget *back_button;
- GtkWidget *forward_button;
- GtkWidget *reload_button;
- GtkWidget *home_button;
- struct browser_window *bw;
- int target_width;
- int target_height;
- gui_pointer_shape current_pointer;
- float scale;
+ GtkWindow *window;
+ GtkEntry *url_bar;
+ GtkDrawingArea *drawing_area;
+ GtkLabel *status_bar;
+ GtkToolButton *back_button;
+ GtkToolButton *forward_button;
+ GtkToolButton *stop_button;
+ GtkToolButton *reload_button;
+
+ GladeXML *xml;
+
+ struct browser_window *bw;
+ float scale;
+ int target_width, target_height;
+ int caretx, carety, careth;
+ gui_pointer_shape current_pointer;
+
struct gtk_history_window *history_window;
- GtkWidget *history_window_widget;
- int caretx, carety, careth;
- int last_x, last_y;
+
+ int last_x, last_y;
};
struct gtk_history_window {
- struct gui_window *g;
- GtkWidget *drawing_area;
+ struct gui_window *g;
+ GtkWindow *window;
+ GtkScrolledWindow *scrolled;
+ GtkDrawingArea *drawing_area;
};
GtkWidget *current_widget;
@@ -66,346 +69,79 @@
#ifdef CAIRO_VERSION
cairo_t *current_cr;
#endif
-static int open_windows = 0;
-
-/* functions used by below event handlers */
-static void nsgtk_window_change_scale(struct gui_window *g, float scale);
-static void nsgtk_window_update_back_forward(struct gui_window *g);
-
-/* main browser window toolbar event handlers */
-void nsgtk_window_back_button_clicked(GtkWidget *widget, gpointer data);
-void nsgtk_window_forward_button_clicked(GtkWidget *widget, gpointer data);
-void nsgtk_window_stop_button_clicked(GtkWidget *widget, gpointer data);
-void nsgtk_window_reload_button_clicked(GtkWidget *widget, gpointer data);
-void nsgtk_window_home_button_clicked(GtkWidget *widget, gpointer data);
-void nsgtk_window_zoomin_button_clicked(GtkWidget *widget, gpointer data);
-void nsgtk_window_zoom100_button_clicked(GtkWidget *widget, gpointer data);
-void nsgtk_window_zoomout_button_clicked(GtkWidget *widget, gpointer data);
-void nsgtk_window_history_button_clicked(GtkWidget *widget, gpointer data);
-void nsgtk_window_choices_button_clicked(GtkWidget *widget, gpointer data);
-
-/* main browser window event handlers */
-void nsgtk_window_destroy_event(GtkWidget *widget, gpointer data);
-gboolean nsgtk_window_expose_event(GtkWidget *widget,
- GdkEventExpose *event, gpointer data);
-gboolean nsgtk_window_url_keypress_event(GtkWidget *widget,
- GdkEventKey *event, gpointer data);
-gboolean nsgtk_window_configure_event(GtkWidget *widget,
- GdkEventConfigure *event, gpointer data);
-gboolean nsgtk_window_motion_notify_event(GtkWidget *widget,
- GdkEventMotion *event, gpointer data);
-gboolean nsgtk_window_button_press_event(GtkWidget *widget,
- GdkEventButton *event, gpointer data);
-void nsgtk_window_size_allocate_event(GtkWidget *widget,
- GtkAllocation *allocation, gpointer data);
-gboolean nsgtk_window_keypress_event(GtkWidget *widget,
- GdkEventKey *event, gpointer data);
-
-
-/* local history window event handlers */
-gboolean nsgtk_history_expose_event(GtkWidget *widget,
- GdkEventExpose *event, gpointer data);
-gboolean nsgtk_history_motion_notify_event(GtkWidget *widget,
- GdkEventMotion *event, gpointer data);
-gboolean nsgtk_history_button_press_event(GtkWidget *widget,
- GdkEventButton *event, gpointer data);
-
-
-/* misc support functions */
+
+static int open_windows = 0; /**< current number of open browsers */
+
+static wchar_t gdkkey_to_nskey(GdkEventKey *);
+static void nsgtk_window_destroy_event(GtkWidget *, gpointer);
+static gboolean nsgtk_window_expose_event(GtkWidget *, GdkEventExpose *,
+ gpointer);
+static gboolean nsgtk_window_configure_event(GtkWidget *, GdkEventConfigure *,
+ gpointer);
+static gboolean nsgtk_window_motion_notify_event(GtkWidget *, GdkEventMotion *,
+ gpointer);
+static gboolean nsgtk_window_button_press_event(GtkWidget *, GdkEventButton *,
+ gpointer);
+static gboolean nsgtk_window_keypress_event(GtkWidget *, GdkEventKey *,
+ gpointer);
+static gboolean nsgtk_window_size_allocate_event(GtkWidget *, GtkAllocation *,
+ gpointer);
static void nsgtk_perform_deferred_resize(void *p);
-static wchar_t gdkkey_to_nskey(GdkEventKey *key);
-static void nsgtk_pass_mouse_position(void *p);
-
-struct gui_window *gui_create_browser_window(struct browser_window *bw,
- struct browser_window *clone)
-{
- struct gui_window *g;
- GladeXML *xml = glade_xml_new("./gtk/netsurf.glade", "wndBrowser", NULL);
- GtkWidget *window, *history_window;
- GtkWidget *vbox;
- GtkWidget *toolbar;
- GtkToolItem *back_button, *forward_button, *stop_button, *reload_button;
- GtkToolItem *zoomin_button, *zoomout_button, *zoom100_button;
- GtkToolItem *home_button, *history_button, *choices_button;
- GtkToolItem *url_item;
- GtkWidget *url_bar;
- GtkWidget *scrolled, *history_scrolled;
- GtkWidget *drawing_area, *history_area;
- GtkWidget *status_box;
-
- g = malloc(sizeof *g);
- if (!g) {
- warn_user("NoMemory", 0);
- return 0;
- }
-
- /* a height of zero means no caret */
- g->careth = 0;
-
- // window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- window = glade_xml_get_widget(xml, "wndBrowser");
- g->status_bar = glade_xml_get_widget(xml, "statusBar");
- back_button = g->back_button = glade_xml_get_widget(xml, "toolBack");
- forward_button = g->forward_button = glade_xml_get_widget(xml, "toolForward");
- stop_button = g->stop_button = glade_xml_get_widget(xml, "toolStop");
- reload_button = g->reload_button = glade_xml_get_widget(xml, "toolReload");
- home_button = g->home_button = glade_xml_get_widget(xml, "toolHome");
- zoomin_button = glade_xml_get_widget(xml, "toolZoomIn");
- zoom100_button = glade_xml_get_widget(xml, "toolZoom100");
- zoomout_button = glade_xml_get_widget(xml, "toolZoomOut");
- history_button = glade_xml_get_widget(xml, "toolHistory");
- choices_button = glade_xml_get_widget(xml, "toolChoices");
- url_bar = glade_xml_get_widget(xml, "URLBar");
-
- gtk_viewport_set_hadjustment(GTK_VIEWPORT(glade_xml_get_widget(xml, "viewport1")),
- gtk_range_get_adjustment(GTK_RANGE(glade_xml_get_widget(xml, "hscrollbar1"))));
- gtk_viewport_set_vadjustment(GTK_VIEWPORT(glade_xml_get_widget(xml, "viewport1")),
- gtk_range_get_adjustment(GTK_RANGE(glade_xml_get_widget(xml, "vscrollbar1"))));
- gtk_widget_set_size_request(GTK_WIDGET(glade_xml_get_widget(xml, "viewport1")), 0, 0);
-
- gtk_tool_item_set_expand(glade_xml_get_widget(xml, "toolURLBar"), TRUE);
-
- gtk_window_set_default_size(GTK_WINDOW(window), 600, 600);
- gtk_window_set_title(GTK_WINDOW(window), "NetSurf");
-
- g->history_window = malloc(sizeof(struct gtk_history_window));
- if (!g->history_window) {
- warn_user("NoMemory", 0);
- return 0;
- }
- g->history_window->g = g;
-
- history_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_transient_for(GTK_WINDOW(history_window),
- GTK_WINDOW(window));
- gtk_window_set_default_size(GTK_WINDOW(history_window), 400, 400);
- gtk_window_set_title(GTK_WINDOW(history_window), "NetSurf History");
-
- g->history_window_widget = GTK_WIDGET(history_window);
-
- history_scrolled = gtk_scrolled_window_new(0, 0);
- gtk_container_add(GTK_CONTAINER(history_window), history_scrolled);
- gtk_widget_show(history_scrolled);
-
- drawing_area = glade_xml_get_widget(xml, "drawingArea");
- gtk_widget_set_events(drawing_area,
- GDK_EXPOSURE_MASK |
- GDK_LEAVE_NOTIFY_MASK |
- GDK_BUTTON_PRESS_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_KEY_PRESS_MASK |
- GDK_KEY_RELEASE_MASK);
- GTK_WIDGET_SET_FLAGS(GTK_WIDGET(drawing_area),
- GTK_CAN_FOCUS);
- gtk_widget_modify_bg(drawing_area, GTK_STATE_NORMAL,
- &((GdkColor) { 0, 0xffff, 0xffff, 0xffff }));
-
- history_area = gtk_drawing_area_new();
- gtk_widget_set_events(history_area,
- GDK_EXPOSURE_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_BUTTON_PRESS_MASK);
- gtk_widget_modify_bg(history_area, GTK_STATE_NORMAL,
- &((GdkColor) { 0, 0xffff, 0xffff, 0xffff }));
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(history_scrolled),
- history_area);
- gtk_widget_show(history_area);
- g->history_window->drawing_area = history_area;
-
- gtk_widget_show(window);
-
- g->window = window;
- g->url_bar = url_bar;
- g->drawing_area = drawing_area;
- g->bw = bw;
- g->current_pointer = GUI_POINTER_DEFAULT;
-
- if (clone)
- g->scale = clone->window->scale;
- else
- g->scale = 1.0;
-
-#define NS_SIGNAL_CONNECT(obj, sig, callback, ptr) \
- g_signal_connect(G_OBJECT(obj), (sig), G_CALLBACK(callback), (ptr))
-
- NS_SIGNAL_CONNECT(window, "destroy", nsgtk_window_destroy_event, g);
-
- g_signal_connect(G_OBJECT(drawing_area), "expose_event",
- G_CALLBACK(nsgtk_window_expose_event), g);
- g_signal_connect(G_OBJECT(drawing_area), "configure_event",
- G_CALLBACK(nsgtk_window_configure_event), g);
- g_signal_connect(G_OBJECT(drawing_area), "motion_notify_event",
- G_CALLBACK(nsgtk_window_motion_notify_event), g);
- g_signal_connect(G_OBJECT(drawing_area), "button_press_event",
- G_CALLBACK(nsgtk_window_button_press_event), g);
- g_signal_connect(G_OBJECT(glade_xml_get_widget(xml, "viewport1")), "size_allocate",
- G_CALLBACK(nsgtk_window_size_allocate_event), g);
- g_signal_connect(G_OBJECT(drawing_area), "key_press_event",
- G_CALLBACK(nsgtk_window_keypress_event), g);
-
- g_signal_connect(G_OBJECT(zoomin_button), "clicked",
- G_CALLBACK(nsgtk_window_zoomin_button_clicked), g);
- g_signal_connect(G_OBJECT(zoom100_button), "clicked",
- G_CALLBACK(nsgtk_window_zoom100_button_clicked), g);
- g_signal_connect(G_OBJECT(zoomout_button), "clicked",
- G_CALLBACK(nsgtk_window_zoomout_button_clicked), g);
- g_signal_connect(G_OBJECT(g->stop_button), "clicked",
- G_CALLBACK(nsgtk_window_stop_button_clicked), g);
-
- NS_SIGNAL_CONNECT(g->back_button, "clicked", nsgtk_window_back_button_clicked, g);
- NS_SIGNAL_CONNECT(g->forward_button, "clicked", nsgtk_window_forward_button_clicked, g);
- NS_SIGNAL_CONNECT(g->reload_button, "clicked", nsgtk_window_reload_button_clicked, g);
-
- NS_SIGNAL_CONNECT(history_button, "clicked", nsgtk_window_history_button_clicked, g);
- NS_SIGNAL_CONNECT(choices_button, "clicked", nsgtk_window_choices_button_clicked, g);
- NS_SIGNAL_CONNECT(home_button, "clicked", nsgtk_window_home_button_clicked, g);
-
- /* History window events */
- NS_SIGNAL_CONNECT(history_area, "expose_event",
- nsgtk_history_expose_event, g->history_window);
- NS_SIGNAL_CONNECT(history_area, "motion_notify_event",
- nsgtk_history_motion_notify_event, g->history_window);
- NS_SIGNAL_CONNECT(history_area, "button_press_event",
- nsgtk_history_button_press_event, g->history_window);
- NS_SIGNAL_CONNECT(g->history_window_widget, "delete_event",
- gtk_widget_hide_on_delete, NULL);
-
-#undef NS_SIGNAL_CONNECT
-
- if( !bw->gesturer ) {
- /* Prepare a gesturer */
- GestureRecogniser gr = gesture_recogniser_create();
- bw->gesturer = gesturer_create(gr);
- gesture_recogniser_add(gr, "732187", 100);
- gesture_recogniser_set_distance_threshold(gr, 50);
- gesture_recogniser_set_count_threshold(gr, 20);
- schedule(5, nsgtk_pass_mouse_position, g);
+
+wchar_t gdkkey_to_nskey(GdkEventKey *key)
+{
+ /* this function will need to become much more complex to support
+ * everything that the RISC OS version does. But this will do for
+ * now. I hope.
+ */
+
+ switch (key->keyval)
+ {
+ case GDK_BackSpace: return KEY_DELETE_LEFT;
+ case GDK_Delete: return KEY_DELETE_RIGHT;
+ case GDK_Linefeed: return 13;
+ case GDK_Return: return 10;
+ case GDK_Left: return KEY_LEFT;
+ case GDK_Right: return KEY_RIGHT;
+ case GDK_Up: return KEY_UP;
+ case GDK_Down: return KEY_DOWN;
+
+ /* Modifiers - do nothing for now */
+ case GDK_Shift_L:
+ case GDK_Shift_R:
+ case GDK_Control_L:
+ case GDK_Control_R:
+ case GDK_Caps_Lock:
+ case GDK_Shift_Lock:
+ case GDK_Meta_L:
+ case GDK_Meta_R:
+ case GDK_Alt_L:
+ case GDK_Alt_R:
+ case GDK_Super_L:
+ case GDK_Super_R:
+ case GDK_Hyper_L:
+ case GDK_Hyper_R: return 0;
+
+ default: return key->keyval;
}
-
- open_windows++;
- return g;
-}
-
-void nsgtk_pass_mouse_position(void *p)
-{
- struct gui_window *g = (struct gui_window*)p;
- if( g->bw->gesturer )
- if( gesturer_add_point(g->bw->gesturer, g->last_x, g->last_y) == 100 )
- exit(0);
- schedule(5, nsgtk_pass_mouse_position, p);
-}
-
-void nsgtk_window_change_scale(struct gui_window *g, float scale)
-{
- g->scale = scale;
- if (g->bw->current_content != NULL)
- gui_window_set_extent(g, g->bw->current_content->width,
- g->bw->current_content->height);
- gtk_widget_queue_draw(g->drawing_area);
-}
-
-void nsgtk_window_zoomin_button_clicked(GtkWidget *widget, gpointer data)
+}
+
+void nsgtk_window_destroy_event(GtkWidget *widget, gpointer data)
{
struct gui_window *g = data;
- nsgtk_window_change_scale(g, g->scale + 0.05);
-}
-
-void nsgtk_window_zoom100_button_clicked(GtkWidget *widget, gpointer data)
-{
- struct gui_window *g = data;
- nsgtk_window_change_scale(g, 1.00);
-}
-
-void nsgtk_window_zoomout_button_clicked(GtkWidget *widget, gpointer data)
-{
- struct gui_window *g = data;
- nsgtk_window_change_scale(g, g->scale - 0.05);
-}
-
-void nsgtk_window_stop_button_clicked(GtkWidget *widget, gpointer data)
-{
- struct gui_window *g = data;
- browser_window_stop(g->bw);
-}
-
-void nsgtk_window_destroy_event(GtkWidget *widget, gpointer data)
-{
- struct gui_window *g = data;
+
gui_window_destroy(g);
if (--open_windows == 0)
netsurf_quit = true;
}
-void nsgtk_window_back_button_clicked(GtkWidget *widget, gpointer data)
-{
- struct gui_window *g = data;
- if (!history_back_available(g->bw->history)) return;
- history_back(g->bw, g->bw->history);
- nsgtk_window_update_back_forward(g);
-}
-
-void nsgtk_window_forward_button_clicked(GtkWidget *widget, gpointer data)
-{
- struct gui_window *g = data;
- if (!history_forward_available(g->bw->history)) return;
- history_forward(g->bw, g->bw->history);
- nsgtk_window_update_back_forward(g);
-}
-
-void nsgtk_window_update_back_forward(struct gui_window *g)
-{
- int width, height;
- gtk_widget_set_sensitive(g->back_button,
- history_back_available(g->bw->history));
- gtk_widget_set_sensitive(g->forward_button,
- history_forward_available(g->bw->history));
- history_size(g->bw->history, &width, &height);
- gtk_widget_set_size_request(GTK_WIDGET(g->history_window->drawing_area),
- width, height);
- gtk_widget_queue_draw(GTK_WIDGET(g->history_window_widget));
-}
-
-void nsgtk_window_history_button_clicked(GtkWidget *widget, gpointer data)
-{
- struct gui_window *g = data;
- gtk_widget_show(GTK_WIDGET(g->history_window_widget));
- gdk_window_raise(g->history_window_widget->window);
-}
-
-void nsgtk_window_choices_button_clicked(GtkWidget *widget, gpointer data)
-{
- gtk_widget_show(GTK_WIDGET(wndChoices));
- gdk_window_raise(wndChoices);
-}
-
-void nsgtk_window_reload_button_clicked(GtkWidget *widget, gpointer data)
-{
- struct gui_window *g = data;
- browser_window_reload(g->bw, true);
-}
-
-void nsgtk_window_home_button_clicked(GtkWidget *widget, gpointer data)
-{
- struct gui_window *g = data;
- char *referer = 0;
- const char *addr = "http://netsurf.sourceforge.net/";
-
- if (option_homepage_url != NULL)
- addr = option_homepage_url;
-
- if (g->bw->current_content && g->bw->current_content->url)
- referer = g->bw->current_content->url;
-
- browser_window_go(g->bw, addr, referer, true);
-}
-
gboolean nsgtk_window_expose_event(GtkWidget *widget,
- GdkEventExpose *event, gpointer data)
+ GdkEventExpose *event, gpointer data)
{
struct gui_window *g = data;
struct content *c = g->bw->current_content;
- if (!c)
+ if (c == NULL)
return FALSE;
current_widget = widget;
@@ -417,7 +153,6 @@
plot = nsgtk_plotters;
nsgtk_plot_set_scale(g->scale);
-
content_redraw(c, 0, 0,
widget->allocation.width,
widget->allocation.height,
@@ -439,80 +174,8 @@
return FALSE;
}
-gboolean nsgtk_history_expose_event(GtkWidget *widget,
- GdkEventExpose *event,
- gpointer data)
-{
- struct gtk_history_window *hw = data;
- current_widget = widget;
- current_drawable = widget->window;
- current_gc = gdk_gc_new(current_drawable);
-#ifdef CAIRO_VERSION
- current_cr = gdk_cairo_create(current_drawable);
-#endif
- plot = nsgtk_plotters;
- nsgtk_plot_set_scale(1.0);
-
- history_redraw(hw->g->bw->history);
-
- g_object_unref(current_gc);
-#ifdef CAIRO_VERSION
- cairo_destroy(current_cr);
-#endif
- return FALSE;
-}
-
-gboolean nsgtk_history_motion_notify_event(GtkWidget *widget,
- GdkEventMotion *event, gpointer data)
-{
- /* Not sure what to do here */
-
- return TRUE;
-}
-
-gboolean nsgtk_history_button_press_event(GtkWidget *widget,
- GdkEventButton *event,
- gpointer data)
-{
- struct gtk_history_window *hw = data;
-
- history_click(hw->g->bw, hw->g->bw->history,
- event->x, event->y, false);
-
- return TRUE;
-}
-
-gboolean nsgtk_window_url_keypress_event(GtkWidget *widget,
- GdkEventKey *event, gpointer data)
-{
- struct gui_window *g = data;
- char *referer = 0;
-
- if (event->keyval != GDK_Return)
- return FALSE;
-
- if (g->bw->current_content && g->bw->current_content->url)
- referer = g->bw->current_content->url;
-
- browser_window_go(g->bw, gtk_entry_get_text(GTK_ENTRY(g->url_bar)),
- referer, true);
-
- return TRUE;
-}
-
-gboolean nsgtk_window_keypress_event(GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
-{
- struct gui_window *g = data;
- wchar_t nskey = gdkkey_to_nskey(event);
- browser_window_key_press(g->bw, nskey);
-
- return TRUE;
-}
-
gboolean nsgtk_window_configure_event(GtkWidget *widget,
- GdkEventConfigure *event, gpointer data)
+ GdkEventConfigure *event, gpointer data)
{
struct gui_window *g = data;
@@ -521,109 +184,233 @@
if (!g->bw->current_content)
return FALSE;
+
if (g->bw->current_content->status != CONTENT_STATUS_READY &&
g->bw->current_content->status != CONTENT_STATUS_DONE)
return FALSE;
-/* content_reformat(g->bw->current_content, event->width, event->height); */
+ content_reformat(g->bw->current_content, event->width, event->height);
return FALSE;
}
-void nsgtk_perform_deferred_resize(void *p)
-{
- struct gui_window *g = p;
- if (gui_in_multitask) return;
- if (!g->bw->current_content) return;
- if (g->bw->current_content->status != CONTENT_STATUS_READY &&
- g->bw->current_content->status != CONTENT_STATUS_DONE)
- return;
- LOG(("Moo!!! %d x %d", g->target_width, g->target_height));
- content_reformat(g->bw->current_content, g->target_width, g->target_height);
- if (GTK_WIDGET_SENSITIVE (g->stop_button)) {
- schedule(100, nsgtk_perform_deferred_resize, g);
- }
-}
-
-void nsgtk_window_size_allocate_event(GtkWidget *widget,
- GtkAllocation *allocation, gpointer data)
+gboolean nsgtk_window_motion_notify_event(GtkWidget *widget,
+ GdkEventMotion *event, gpointer data)
{
struct gui_window *g = data;
- GtkWidget *viewport = widget;//gtk_bin_get_child(GTK_BIN(widget));
- /* The widget is the scrolled window, which is a GtkBin. We want
- * The width and height of the allocation of its child
- */
- g->target_width = viewport->allocation.width - 2;
- g->target_height = viewport->allocation.height;
- /* Schedule a callback to perform the resize for 1/10s from now */
- schedule(5, nsgtk_perform_deferred_resize, g);
-}
-
-gboolean nsgtk_window_motion_notify_event(GtkWidget *widget,
- GdkEventMotion *event, gpointer data)
-{
- struct gui_window *g = data;
browser_window_mouse_track(g->bw, 0, event->x / g->scale,
- event->y / g->scale);
+ event->y / g->scale);
+
g->last_x = event->x;
- g->last_y = event->y;
+ g->last_y = event->y;
+
return TRUE;
}
-
gboolean nsgtk_window_button_press_event(GtkWidget *widget,
- GdkEventButton *event, gpointer data)
+ GdkEventButton *event, gpointer data)
{
struct gui_window *g = data;
int button = BROWSER_MOUSE_CLICK_1;
if (event->button == 2) /* 2 == middle button on X */
button = BROWSER_MOUSE_CLICK_2;
+
if (event->button == 3) /* 3 == right button on X */
- return TRUE; /* Do nothing for right click for now */
+ return TRUE; /* Do nothing for right click for now */
+
+ browser_window_mouse_click(g->bw, button,
+ event->x / g->scale, event->y / g->scale);
+
+ return TRUE;
+}
+
+gboolean nsgtk_window_keypress_event(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
+{
+ struct gui_window *g = data;
+ wchar_t nskey = gdkkey_to_nskey(event);
+
+ browser_window_key_press(g->bw, nskey);
+
+ return TRUE;
+}
+
+gboolean nsgtk_window_size_allocate_event(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+{
+ struct gui_window *g = data;
+
+ g->target_width = widget->allocation.width - 2;
+ g->target_height = widget->allocation.height;
+
+ /* schedule a callback to perform the resize for 1/10s from now */
+ schedule(5, nsgtk_perform_deferred_resize, g);
+
+ return TRUE;
+}
+
+void nsgtk_perform_deferred_resize(void *p)
+{
+ struct gui_window *g = p;
+
+ if (gui_in_multitask)
+ return;
+
+ if (g->bw->current_content == NULL)
+ return;
+
+ if (g->bw->current_content->status != CONTENT_STATUS_READY &&
+ g->bw->current_content->status != CONTENT_STATUS_DONE)
+ return;
+
+ content_reformat(g->bw->current_content,
+ g->target_width, g->target_height);
+
+ if (GTK_WIDGET_SENSITIVE((GTK_WIDGET(g->stop_button))))
+ schedule(100, nsgtk_perform_deferred_resize, g);
+}
+
+#define GET_WIDGET(x) glade_xml_get_widget(g->xml, (x))
+struct gui_window *gui_create_browser_window(struct browser_window *bw,
+ struct browser_window *clone)
+{
+ struct gui_window *g; /**< what we're creating to return */
- browser_window_mouse_click(g->bw, button,
- event->x / g->scale, event->y / g->scale);
-
- return TRUE;
+ g = malloc(sizeof(*g));
+
+ g->bw = bw;
+ g->current_pointer = GUI_POINTER_DEFAULT;
+ if (clone != NULL)
+ g->scale = clone->window->scale;
+ else
+ g->scale = 1.0;
+
+ /* load the window template from the glade xml file, and extract
+ * widget references from it for later use.
+ */
+ g->xml = glade_xml_new("./gtk/netsurf.glade", "wndBrowser", NULL);
+ g->window = GTK_WINDOW(GET_WIDGET("wndBrowser"));
+ g->url_bar = GTK_ENTRY(GET_WIDGET("URLBar"));
+ g->drawing_area = GTK_DRAWING_AREA(GET_WIDGET("drawingArea"));
+ g->status_bar = GTK_LABEL(GET_WIDGET("statusBar"));
+ g->back_button = GTK_TOOL_BUTTON(GET_WIDGET("toolBack"));
+ g->forward_button = GTK_TOOL_BUTTON(GET_WIDGET("toolForward"));
+ g->stop_button = GTK_TOOL_BUTTON(GET_WIDGET("toolStop"));
+ g->reload_button = GTK_TOOL_BUTTON(GET_WIDGET("toolReload"));
+
+ /* connect our scrollbars to the viewport */
+ gtk_viewport_set_hadjustment(GTK_VIEWPORT(GET_WIDGET("viewport1")),
+ gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("hscrollbar1"))));
+ gtk_viewport_set_vadjustment(GTK_VIEWPORT(GET_WIDGET("viewport1")),
+ gtk_range_get_adjustment(GTK_RANGE(GET_WIDGET("vscrollbar1"))));
+ gtk_widget_set_size_request(GTK_WIDGET(GET_WIDGET("viewport1")), 0, 0);
+
+ /* set the URL entry box to expand, as we can't do this from within
+ * glade because of the way it emulates toolbars.
+ */
+ gtk_tool_item_set_expand(GTK_TOOL_ITEM(GET_WIDGET("toolURLBar")), TRUE);
+
+ /* set the initial size of the browser window */
+ gtk_window_set_default_size(g->window, 600, 600);
+
+ /* set the events we're interested in receiving from the browser's
+ * drawing area.
+ */
+ gtk_widget_set_events(GTK_WIDGET(g->drawing_area),
+ GDK_EXPOSURE_MASK |
+ GDK_LEAVE_NOTIFY_MASK |
+ GDK_BUTTON_PRESS_MASK |
+ GDK_POINTER_MOTION_MASK |
+ GDK_KEY_PRESS_MASK |
+ GDK_KEY_RELEASE_MASK);
+ GTK_WIDGET_SET_FLAGS(GTK_WIDGET(g->drawing_area), GTK_CAN_FOCUS);
+
+ /* set the default background colour of the drawing area to white. */
+ gtk_widget_modify_bg(GTK_WIDGET(g->drawing_area), GTK_STATE_NORMAL,
+ &((GdkColor) { 0, 0xffff, 0xffff, 0xffff } ));
+
+ /* create the local history window to be assoicated with this browser */
+ g->history_window = malloc(sizeof(struct gtk_history_window));
+ g->history_window->g = g;
+ g->history_window->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_transient_for(g->history_window->window, g->window);
+ gtk_window_set_default_size(g->history_window->window, 400, 400);
+ gtk_window_set_title(g->history_window->window, "NetSurf History");
+ g->history_window->scrolled = gtk_scrolled_window_new(0, 0);
+ gtk_container_add(GTK_CONTAINER(g->history_window->window),
+ GTK_WIDGET(g->history_window->scrolled));
+
+ gtk_widget_show(GTK_WIDGET(g->history_window->scrolled));
+ g->history_window->drawing_area = gtk_drawing_area_new();
+ gtk_widget_set_events(GTK_WIDGET(g->history_window->drawing_area),
+ GDK_EXPOSURE_MASK |
+ GDK_POINTER_MOTION_MASK |
+ GDK_BUTTON_PRESS_MASK);
+ gtk_widget_modify_bg(GTK_WIDGET(g->history_window->drawing_area),
+ GTK_STATE_NORMAL,
+ &((GdkColor) { 0, 0xffff, 0xffff, 0xffff } ));
+ gtk_widget_show(GTK_WIDGET(g->history_window->drawing_area));
+
+
+ /* connect signals to handlers. */
+#define CONNECT(obj, sig, callback, ptr) \
+ g_signal_connect(G_OBJECT(obj), (sig), G_CALLBACK(callback), (ptr))
+ CONNECT(g->window, "destroy", nsgtk_window_destroy_event, g);
+ CONNECT(g->drawing_area, "expose_event", nsgtk_window_expose_event, g);
+ CONNECT(g->drawing_area, "configure_event",
+ nsgtk_window_configure_event, g);
+ CONNECT(g->drawing_area, "motion_notify_event",
+ nsgtk_window_motion_notify_event, g);
+ CONNECT(g->drawing_area, "button_press_event",
+ nsgtk_window_button_press_event, g);
+ CONNECT(g->drawing_area, "key_press_event",
+ nsgtk_window_keypress_event, g);
+ CONNECT(GET_WIDGET("viewport1"), "size_allocate",
+ nsgtk_window_size_allocate_event, g);
+
+ /* increase the number of open windows. */
+ open_windows++;
+
+ /* finally, show the window. */
+ gtk_widget_show(GTK_WIDGET(g->window));
+
+ return g;
}
void gui_window_destroy(struct gui_window *g)
{
- /* XXX: Destroy history window etc here */
-}
-
+
+}
void gui_window_set_title(struct gui_window *g, const char *title)
{
- gtk_window_set_title(GTK_WINDOW(g->window), title);
-}
-
+ gtk_window_set_title(g->window, title);
+}
void gui_window_redraw(struct gui_window *g, int x0, int y0, int x1, int y1)
{
- gtk_widget_queue_draw_area(g->drawing_area, x0, y0, x1-x0+1, y1-y0+1);
-}
-
-
-void gui_window_redraw_window(struct gui_window* g)
-{
- gtk_widget_queue_draw(g->drawing_area);
-}
-
+ gtk_widget_queue_draw_area(GTK_WIDGET(g->drawing_area),
+ x0, y0, x1-x0+1, y1-y0+1);
+}
+
+void gui_window_redraw_window(struct gui_window *g)
+{
+ gtk_widget_queue_draw(GTK_WIDGET(g->drawing_area));
+}
void gui_window_update_box(struct gui_window *g,
- const union content_msg_data *data)
+ const union content_msg_data *data)
{
struct content *c = g->bw->current_content;
- if (!c) return;
-
- gtk_widget_queue_draw_area(g->drawing_area, data->redraw.x, data->redraw.y,
- data->redraw.width, data->redraw.height);
-}
-
+ if (c == NULL)
+ return;
+
+ gtk_widget_queue_draw_area(GTK_WIDGET(g->drawing_area),
+ data->redraw.x, data->redraw.y,
+ data->redraw.width, data->redraw.height);
+}
bool gui_window_get_scroll(struct gui_window *g, int *sx, int *sy)
{
@@ -632,185 +419,150 @@
return true;
}
-
void gui_window_set_scroll(struct gui_window *g, int sx, int sy)
{
-}
-
+
+}
int gui_window_get_width(struct gui_window* g)
{
- return g->drawing_area->allocation.width;
-}
-
+ //return g->drawing_area->allocation.width;
+}
int gui_window_get_height(struct gui_window* g)
{
- return g->drawing_area->allocation.height;
-}
-
+ //return g->drawing_area->allocation.height;
+}
void gui_window_set_extent(struct gui_window *g, int width, int height)
{
- gtk_widget_set_size_request(g->drawing_area, width * g->scale,
- height * g->scale);
-}
-
+ gtk_widget_set_size_request(GTK_WIDGET(g->drawing_area),
+ width * g->scale, height * g->scale);
+}
void gui_window_set_status(struct gui_window *g, const char *text)
{
- gtk_label_set_text(GTK_LABEL(g->status_bar), text);
-}
-
+ gtk_label_set_text(g->status_bar, text);
+}
void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape)
{
- GdkCursor *cursor = NULL;
- GdkCursorType cursortype;
- bool nullcursor = false;
- if (g->current_pointer == shape) return;
+ GdkCursor *cursor = NULL;
+ GdkCursorType cursortype;
+ bool nullcursor = false;
+
+ if (g->current_pointer == shape)
+ return;
+
g->current_pointer = shape;
+
switch (shape) {
- case GUI_POINTER_POINT:
- cursortype = GDK_HAND1;
- break;
- case GUI_POINTER_CARET:
- cursortype = GDK_XTERM;
- break;
- case GUI_POINTER_UP:
- cursortype = GDK_TOP_SIDE;
- break;
- case GUI_POINTER_DOWN:
- cursortype = GDK_BOTTOM_SIDE;
- break;
- case GUI_POINTER_LEFT:
- cursortype = GDK_LEFT_SIDE;
- break;
- case GUI_POINTER_RIGHT:
- cursortype = GDK_RIGHT_SIDE;
- break;
- case GUI_POINTER_LD:
- cursortype = GDK_BOTTOM_LEFT_CORNER;
- break;
- case GUI_POINTER_RD:
- cursortype = GDK_BOTTOM_RIGHT_CORNER;
- break;
- case GUI_POINTER_LU:
- cursortype = GDK_TOP_LEFT_CORNER;
- break;
- case GUI_POINTER_RU:
- cursortype = GDK_TOP_RIGHT_CORNER;
- break;
- case GUI_POINTER_CROSS:
- cursortype = GDK_CROSS;
- break;
- case GUI_POINTER_MOVE:
- cursortype = GDK_FLEUR;
- break;
- case GUI_POINTER_WAIT:
- cursortype = GDK_WATCH;
- break;
- case GUI_POINTER_HELP:
- cursortype = GDK_QUESTION_ARROW;
- break;
- case GUI_POINTER_MENU:
- cursortype = GDK_RIGHTBUTTON;
- break;
- case GUI_POINTER_PROGRESS:
- /* In reality, this needs to be the funky left_ptr_watch which we can't do easily yet */
- cursortype = GDK_WATCH;
- break;
- /* The following we're not sure about */
- case GUI_POINTER_NO_DROP:
- case GUI_POINTER_NOT_ALLOWED:
- case GUI_POINTER_DEFAULT:
- default:
- nullcursor = true;
- }
+ case GUI_POINTER_POINT:
+ cursortype = GDK_HAND1;
+ break;
+ case GUI_POINTER_CARET:
+ cursortype = GDK_XTERM;
+ break;
+ case GUI_POINTER_UP:
+ cursortype = GDK_TOP_SIDE;
+ break;
+ case GUI_POINTER_DOWN:
+ cursortype = GDK_BOTTOM_SIDE;
+ break;
+ case GUI_POINTER_LEFT:
+ cursortype = GDK_LEFT_SIDE;
+ break;
+ case GUI_POINTER_RIGHT:
+ cursortype = GDK_RIGHT_SIDE;
+ break;
+ case GUI_POINTER_LD:
+ cursortype = GDK_BOTTOM_LEFT_CORNER;
+ break;
+ case GUI_POINTER_RD:
+ cursortype = GDK_BOTTOM_RIGHT_CORNER;
+ break;
+ case GUI_POINTER_LU:
+ cursortype = GDK_TOP_LEFT_CORNER;
+ break;
+ case GUI_POINTER_RU:
+ cursortype = GDK_TOP_RIGHT_CORNER;
+ break;
+ case GUI_POINTER_CROSS:
+ cursortype = GDK_CROSS;
+ break;
+ case GUI_POINTER_MOVE:
+ cursortype = GDK_FLEUR;
+ break;
+ case GUI_POINTER_WAIT:
+ cursortype = GDK_WATCH;
+ break;
+ case GUI_POINTER_HELP:
+ cursortype = GDK_QUESTION_ARROW;
+ break;
+ case GUI_POINTER_MENU:
+ cursortype = GDK_RIGHTBUTTON;
+ break;
+ case GUI_POINTER_PROGRESS:
+ /* In reality, this needs to be the funky left_ptr_watch
+ * which we can't do easily yet.
+ */
+ cursortype = GDK_WATCH;
+ break;
+ /* The following we're not sure about */
+ case GUI_POINTER_NO_DROP:
+ case GUI_POINTER_NOT_ALLOWED:
+ case GUI_POINTER_DEFAULT:
+ default:
+ nullcursor = true;
+ }
+
+ if (!nullcursor)
+ cursor = gdk_cursor_new_for_display(
+ gtk_widget_get_display(
+ GTK_WIDGET(g->drawing_area)),
+ cursortype);
+ gdk_window_set_cursor(GTK_WIDGET(g->drawing_area)->window, cursor);
+
if (!nullcursor)
- cursor = gdk_cursor_new_for_display(gtk_widget_get_display(GTK_WIDGET(g->drawing_area)), cursortype);
- gdk_window_set_cursor(g->drawing_area->window, cursor);
- if (!nullcursor)
- gdk_cursor_unref(cursor);
-}
-
+ gdk_cursor_unref(cursor);
+}
void gui_window_hide_pointer(struct gui_window *g)
{
-}
-
+
+}
void gui_window_set_url(struct gui_window *g, const char *url)
{
- gtk_entry_set_text(GTK_ENTRY(g->url_bar), url);
- LOG(("URLBar: %x", g->url_bar));
-}
-
-static void nsgtk_throb(void *p)
-{
- struct gui_window *g = p;
- gtk_progress_bar_pulse(GTK_PROGRESS_BAR(
- (struct gui_window *)(g)->progress_bar));
- schedule(10, nsgtk_throb, g);
+ gtk_entry_set_text(g->url_bar, url);
}
void gui_window_start_throbber(struct gui_window* g)
{
-
- gtk_widget_set_sensitive(g->stop_button, TRUE);
- gtk_widget_set_sensitive(g->reload_button, FALSE);
- //gtk_widget_show(g->progress_bar);
- schedule(100, nsgtk_perform_deferred_resize, g);
- nsgtk_window_update_back_forward(g);
- //schedule(10, nsgtk_throb, g);
-}
-
+ gtk_widget_set_sensitive(GTK_WIDGET(g->stop_button), TRUE);
+ gtk_widget_set_sensitive(GTK_WIDGET(g->reload_button), FALSE);
+}
void gui_window_stop_throbber(struct gui_window* g)
{
-
- gtk_widget_set_sensitive(g->stop_button, FALSE);
- gtk_widget_set_sensitive(g->reload_button, TRUE);
- nsgtk_window_update_back_forward(g);
- //gtk_widget_hide(g->progress_bar);
- //schedule_remove(nsgtk_throb, g);
-}
-
-static void gui_window_redraw_caret(struct gui_window *g)
-{
- if (g->careth == 0)
- return;
-
- gui_window_redraw(g, g->caretx, g->carety,
- g->caretx, g->carety + g->careth);
+ gtk_widget_set_sensitive(GTK_WIDGET(g->stop_button), FALSE);
+ gtk_widget_set_sensitive(GTK_WIDGET(g->reload_button), TRUE);
}
void gui_window_place_caret(struct gui_window *g, int x, int y, int height)
{
- gui_window_redraw_caret(g);
-
- g->caretx = x;
- g->carety = y + 1;
- g->careth = height;
-
- gui_window_redraw_caret(g);
-
- gtk_widget_grab_focus(g->drawing_area);
-}
-
+
+}
void gui_window_remove_caret(struct gui_window *g)
{
- gui_window_redraw_caret(g);
-
- g->careth = 0;
-}
-
+
+}
void gui_window_new_content(struct gui_window *g)
{
-}
-
+
+}
bool gui_window_scroll_start(struct gui_window *g)
{
@@ -818,90 +570,51 @@
}
bool gui_window_box_scroll_start(struct gui_window *g,
- int x0, int y0, int x1, int y1)
+ int x0, int y0, int x1, int y1)
{
return true;
}
void gui_drag_save_object(gui_save_type type, struct content *c,
- struct gui_window *g)
-{
-}
-
+ struct gui_window *g)
+{
+
+}
void gui_drag_save_selection(struct selection *s, struct gui_window *g)
{
-}
-
+
+}
void gui_start_selection(struct gui_window *g)
{
-}
-
+
+}
void gui_paste_from_clipboard(struct gui_window *g, int x, int y)
{
-}
-
+
+}
bool gui_empty_clipboard(void)
{
return true;
}
-
bool gui_add_to_clipboard(const char *text, size_t length, bool space)
{
+ return true;
+}
+
+bool gui_commit_clipboard(void)
+{
return true;
}
-bool gui_commit_clipboard(void)
+bool gui_copy_to_clipboard(struct selection *s)
{
return true;
}
-bool gui_copy_to_clipboard(struct selection *s)
-{
- return true;
-}
-
-wchar_t gdkkey_to_nskey(GdkEventKey *key)
-{
- /* this function will need to become much more complex to support
- * everything that the RISC OS version does. But this will do for
- * now. I hope.
- */
-
- switch (key->keyval)
- {
- case GDK_BackSpace: return KEY_DELETE_LEFT;
- case GDK_Delete: return KEY_DELETE_RIGHT;
- case GDK_Linefeed: return 13;
- case GDK_Return: return 10;
- case GDK_Left: return KEY_LEFT;
- case GDK_Right: return KEY_RIGHT;
- case GDK_Up: return KEY_UP;
- case GDK_Down: return KEY_DOWN;
-
- /* Modifiers - do nothing for now */
- case GDK_Shift_L:
- case GDK_Shift_R:
- case GDK_Control_L:
- case GDK_Control_R:
- case GDK_Caps_Lock:
- case GDK_Shift_Lock:
- case GDK_Meta_L:
- case GDK_Meta_R:
- case GDK_Alt_L:
- case GDK_Alt_R:
- case GDK_Super_L:
- case GDK_Super_R:
- case GDK_Hyper_L:
- case GDK_Hyper_R: return 0;
-
- default: return key->keyval;
- }
-}
-
16 years, 7 months
- 1
- 0
r2829 rjek - in /branches/rjek/glade/gtk: gtk_window.c netsurf.glade
by netsurf＠semichrome.net
Author: rjek
Date: Fri Aug 11 16:29:38 2006
New Revision: 2829
URL: http://svn.semichrome.net?rev=2829&view=rev
Log:
New window layout for nsgtk improvements (still a way off merging with mainline)
Modified:
branches/rjek/glade/gtk/gtk_window.c
branches/rjek/glade/gtk/netsurf.glade
Modified: branches/rjek/glade/gtk/gtk_window.c
URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_window.c?rev=2829&r...
==============================================================================
--- branches/rjek/glade/gtk/gtk_window.c (original)
+++ branches/rjek/glade/gtk/gtk_window.c Fri Aug 11 16:29:38 2006
@@ -43,6 +43,7 @@
GtkWidget *back_button;
GtkWidget *forward_button;
GtkWidget *reload_button;
+ GtkWidget *home_button;
struct browser_window *bw;
int target_width;
int target_height;
@@ -147,19 +148,23 @@
back_button = g->back_button = glade_xml_get_widget(xml, "toolBack");
forward_button = g->forward_button = glade_xml_get_widget(xml, "toolForward");
stop_button = g->stop_button = glade_xml_get_widget(xml, "toolStop");
- reload_button = g->reload_button = glade_xml_get_widget(xml, "toolHome");
+ reload_button = g->reload_button = glade_xml_get_widget(xml, "toolReload");
+ home_button = g->home_button = glade_xml_get_widget(xml, "toolHome");
zoomin_button = glade_xml_get_widget(xml, "toolZoomIn");
zoom100_button = glade_xml_get_widget(xml, "toolZoom100");
zoomout_button = glade_xml_get_widget(xml, "toolZoomOut");
history_button = glade_xml_get_widget(xml, "toolHistory");
choices_button = glade_xml_get_widget(xml, "toolChoices");
+ url_bar = glade_xml_get_widget(xml, "URLBar");
gtk_viewport_set_hadjustment(GTK_VIEWPORT(glade_xml_get_widget(xml, "viewport1")),
gtk_range_get_adjustment(GTK_RANGE(glade_xml_get_widget(xml, "hscrollbar1"))));
gtk_viewport_set_vadjustment(GTK_VIEWPORT(glade_xml_get_widget(xml, "viewport1")),
gtk_range_get_adjustment(GTK_RANGE(glade_xml_get_widget(xml, "vscrollbar1"))));
gtk_widget_set_size_request(GTK_WIDGET(glade_xml_get_widget(xml, "viewport1")), 0, 0);
-
+
+ gtk_tool_item_set_expand(glade_xml_get_widget(xml, "toolURLBar"), TRUE);
+
gtk_window_set_default_size(GTK_WINDOW(window), 600, 600);
gtk_window_set_title(GTK_WINDOW(window), "NetSurf");
@@ -233,8 +238,8 @@
G_CALLBACK(nsgtk_window_motion_notify_event), g);
g_signal_connect(G_OBJECT(drawing_area), "button_press_event",
G_CALLBACK(nsgtk_window_button_press_event), g);
-// g_signal_connect(G_OBJECT(scrolled), "size_allocate",
-// G_CALLBACK(nsgtk_window_size_allocate_event), g);
+ g_signal_connect(G_OBJECT(glade_xml_get_widget(xml, "viewport1")), "size_allocate",
+ G_CALLBACK(nsgtk_window_size_allocate_event), g);
g_signal_connect(G_OBJECT(drawing_area), "key_press_event",
G_CALLBACK(nsgtk_window_keypress_event), g);
@@ -253,7 +258,7 @@
NS_SIGNAL_CONNECT(history_button, "clicked", nsgtk_window_history_button_clicked, g);
NS_SIGNAL_CONNECT(choices_button, "clicked", nsgtk_window_choices_button_clicked, g);
- //NS_SIGNAL_CONNECT(home_button, "clicked", nsgtk_window_home_button_clicked, g);
+ NS_SIGNAL_CONNECT(home_button, "clicked", nsgtk_window_home_button_clicked, g);
/* History window events */
NS_SIGNAL_CONNECT(history_area, "expose_event",
@@ -533,6 +538,7 @@
if (g->bw->current_content->status != CONTENT_STATUS_READY &&
g->bw->current_content->status != CONTENT_STATUS_DONE)
return;
+ LOG(("Moo!!! %d x %d", g->target_width, g->target_height));
content_reformat(g->bw->current_content, g->target_width, g->target_height);
if (GTK_WIDGET_SENSITIVE (g->stop_button)) {
schedule(100, nsgtk_perform_deferred_resize, g);
@@ -543,7 +549,7 @@
GtkAllocation *allocation, gpointer data)
{
struct gui_window *g = data;
- GtkWidget *viewport = gtk_bin_get_child(GTK_BIN(widget));
+ GtkWidget *viewport = widget;//gtk_bin_get_child(GTK_BIN(widget));
/* The widget is the scrolled window, which is a GtkBin. We want
* The width and height of the allocation of its child
*/
@@ -572,8 +578,6 @@
struct gui_window *g = data;
int button = BROWSER_MOUSE_CLICK_1;
- LOG(("BUTTON PRESS: %d", event->button));
-
if (event->button == 2) /* 2 == middle button on X */
button = BROWSER_MOUSE_CLICK_2;
if (event->button == 3) /* 3 == right button on X */
@@ -738,7 +742,8 @@
void gui_window_set_url(struct gui_window *g, const char *url)
{
-// gtk_entry_set_text(GTK_ENTRY(g->url_bar), url);
+ gtk_entry_set_text(GTK_ENTRY(g->url_bar), url);
+ LOG(("URLBar: %x", g->url_bar));
}
static void nsgtk_throb(void *p)
Modified: branches/rjek/glade/gtk/netsurf.glade
URL: http://svn.semichrome.net/branches/rjek/glade/gtk/netsurf.glade?rev=2829&...
==============================================================================
--- branches/rjek/glade/gtk/netsurf.glade (original)
+++ branches/rjek/glade/gtk/netsurf.glade Fri Aug 11 16:29:38 2006
@@ -3240,7 +3240,7 @@
<widget class="GtkWindow" id="wndBrowser">
<property name="title" translatable="yes">NetSurf</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
@@ -3259,10 +3259,171 @@
<property name="spacing">0</property>
<child>
+ <widget class="GtkMenuBar" id="menubar1">
+ <property name="visible">True</property>
+ <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+ <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
+
+ <child>
+ <widget class="GtkMenuItem" id="menuitem4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_File</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="menu4">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="new1">
+ <property name="visible">True</property>
+ <property name="label">gtk-new</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_new1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="open1">
+ <property name="visible">True</property>
+ <property name="label">gtk-open</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_open1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="save1">
+ <property name="visible">True</property>
+ <property name="label">gtk-save</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_save1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="save_as1">
+ <property name="visible">True</property>
+ <property name="label">gtk-save-as</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_save_as1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="quit1">
+ <property name="visible">True</property>
+ <property name="label">gtk-quit</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_quit1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="menuitem5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Edit</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="menu5">
+
+ <child>
+ <widget class="GtkImageMenuItem" id="cut1">
+ <property name="visible">True</property>
+ <property name="label">gtk-cut</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_cut1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="copy1">
+ <property name="visible">True</property>
+ <property name="label">gtk-copy</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_copy1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="paste1">
+ <property name="visible">True</property>
+ <property name="label">gtk-paste</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_paste1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkImageMenuItem" id="delete1">
+ <property name="visible">True</property>
+ <property name="label">gtk-delete</property>
+ <property name="use_stock">True</property>
+ <signal name="activate" handler="on_delete1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="menuitem6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_View</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="menu6">
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="menuitem7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
+
+ <child>
+ <widget class="GtkMenu" id="menu7">
+
+ <child>
+ <widget class="GtkMenuItem" id="about1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_About</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_about1_activate" last_modification_time="Fri, 11 Aug 2006 14:58:59 GMT"/>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkToolbar" id="toolbar1">
<property name="visible">True</property>
<property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
- <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+ <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
<property name="tooltips">True</property>
<property name="show_arrow">True</property>
@@ -3311,9 +3472,21 @@
<child>
<widget class="GtkToolButton" id="toolReload">
<property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
<property name="stock_id">gtk-refresh</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkToolButton" id="toolHome">
+ <property name="visible">True</property>
+ <property name="stock_id">gtk-home</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
<property name="is_important">False</property>
@@ -3343,8 +3516,6 @@
<child>
<widget class="GtkToolButton" id="toolZoom100">
<property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
<property name="stock_id">gtk-zoom-100</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
@@ -3359,8 +3530,6 @@
<child>
<widget class="GtkToolButton" id="toolZoomOut">
<property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
<property name="stock_id">gtk-zoom-out</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
@@ -3375,8 +3544,6 @@
<child>
<widget class="GtkToolButton" id="toolHistory">
<property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
<property name="stock_id">gtk-open</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
@@ -3391,8 +3558,6 @@
<child>
<widget class="GtkToolButton" id="toolChoices">
<property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
<property name="stock_id">gtk-preferences</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
@@ -3405,7 +3570,7 @@
</child>
<child>
- <widget class="GtkToolItem" id="toolitem1">
+ <widget class="GtkToolItem" id="toolURLBar">
<property name="visible">True</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
@@ -3432,20 +3597,20 @@
</child>
<child>
- <widget class="GtkToolItem" id="toolitem2">
+ <widget class="GtkToolItem" id="toolitem3">
<property name="visible">True</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
<property name="is_important">False</property>
<child>
- <widget class="GtkImage" id="image7">
+ <widget class="GtkImage" id="throbber">
<property name="visible">True</property>
- <property name="icon_size">2</property>
- <property name="icon_name">stock_smiley-1</property>
+ <property name="icon_size">4</property>
+ <property name="icon_name">gtk-yes</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
- <property name="xpad">3</property>
+ <property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
</child>
@@ -3455,15 +3620,11 @@
<property name="homogeneous">False</property>
</packing>
</child>
-
- <child>
- <placeholder/>
- </child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
</packing>
</child>
@@ -3493,40 +3654,48 @@
</child>
<child>
+ <widget class="GtkViewport" id="viewport1">
+ <property name="visible">True</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+
+ <child>
+ <widget class="GtkDrawingArea" id="drawingArea">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkHPaned" id="hpaned1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <widget class="GtkHBox" id="hbox16">
+ <widget class="GtkLabel" id="statusBar">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="statusBar">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Status bar text goes here</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">Status bar text goes here</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.490000009537</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property>
+ <property name="width_chars">50</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="shrink">True</property>
@@ -3552,19 +3721,15 @@
<property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options">fill</property>
+ <property name="y_options">shrink</property>
</packing>
</child>
<child>
- <widget class="GtkImage" id="image8">
- <property name="visible">True</property>
- <property name="icon_size">1</property>
- <property name="icon_name">gtk-close</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <widget class="GtkStatusbar" id="statusbar1">
+ <property name="height_request">1</property>
+ <property name="visible">True</property>
+ <property name="has_resize_grip">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -3572,28 +3737,7 @@
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">fill</property>
- <property name="y_options">fill</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkDrawingArea" id="drawingArea">
- <property name="visible">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="y_options">shrink|fill</property>
</packing>
</child>
</widget>
16 years, 7 months
- 1
- 0
r2828 dsilvers - in /branches/rjek/glade/gtk: gtk_window.c netsurf.glade
by netsurf＠semichrome.net
Author: dsilvers
Date: Fri Aug 11 15:23:28 2006
New Revision: 2828
URL: http://svn.semichrome.net?rev=2828&view=rev
Log:
Fix up the glade and gtk_window.c to not need a scrolledwindow
Modified:
branches/rjek/glade/gtk/gtk_window.c
branches/rjek/glade/gtk/netsurf.glade
Modified: branches/rjek/glade/gtk/gtk_window.c
URL: http://svn.semichrome.net/branches/rjek/glade/gtk/gtk_window.c?rev=2828&r...
==============================================================================
--- branches/rjek/glade/gtk/gtk_window.c (original)
+++ branches/rjek/glade/gtk/gtk_window.c Fri Aug 11 15:23:28 2006
@@ -158,8 +158,7 @@
gtk_range_get_adjustment(GTK_RANGE(glade_xml_get_widget(xml, "hscrollbar1"))));
gtk_viewport_set_vadjustment(GTK_VIEWPORT(glade_xml_get_widget(xml, "viewport1")),
gtk_range_get_adjustment(GTK_RANGE(glade_xml_get_widget(xml, "vscrollbar1"))));
- gtk_widget_hide(GTK_SCROLLED_WINDOW(glade_xml_get_widget(xml, "scrolledwindow2"))->hscrollbar);
- gtk_widget_hide(GTK_SCROLLED_WINDOW(glade_xml_get_widget(xml, "scrolledwindow2"))->vscrollbar);
+ gtk_widget_set_size_request(GTK_WIDGET(glade_xml_get_widget(xml, "viewport1")), 0, 0);
gtk_window_set_default_size(GTK_WINDOW(window), 600, 600);
gtk_window_set_title(GTK_WINDOW(window), "NetSurf");
Modified: branches/rjek/glade/gtk/netsurf.glade
URL: http://svn.semichrome.net/branches/rjek/glade/gtk/netsurf.glade?rev=2828&...
==============================================================================
--- branches/rjek/glade/gtk/netsurf.glade (original)
+++ branches/rjek/glade/gtk/netsurf.glade Fri Aug 11 15:23:28 2006
@@ -3577,24 +3577,13 @@
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
+ <widget class="GtkViewport" id="viewport1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
<child>
- <widget class="GtkViewport" id="viewport1">
+ <widget class="GtkDrawingArea" id="drawingArea">
<property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkDrawingArea" id="drawingArea">
- <property name="visible">True</property>
- </widget>
- </child>
</widget>
</child>
</widget>
16 years, 7 months
- 1
- 0
r2827 adrianl - /trunk/netsurf/riscos/window.c
by netsurf＠semichrome.net
Author: adrianl
Date: Fri Aug 11 03:36:12 2006
New Revision: 2827
URL: http://svn.semichrome.net?rev=2827&view=rev
Log:
Make Home/End jump to top/bottom of page
Modified:
trunk/netsurf/riscos/window.c
Modified: trunk/netsurf/riscos/window.c
URL: http://svn.semichrome.net/trunk/netsurf/riscos/window.c?rev=2827&r1=2826&...
==============================================================================
--- trunk/netsurf/riscos/window.c (original)
+++ trunk/netsurf/riscos/window.c Fri Aug 11 03:36:12 2006
@@ -2093,7 +2093,9 @@
case IS_WIMP_KEY + wimp_KEY_DOWN:
case IS_WIMP_KEY + wimp_KEY_PAGE_UP:
case IS_WIMP_KEY + wimp_KEY_PAGE_DOWN:
+ case wimp_KEY_HOME:
case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_UP:
+ case IS_WIMP_KEY + wimp_KEY_END:
case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_DOWN:
if (toolbar)
return ro_gui_url_complete_keypress(g, c);
@@ -2129,9 +2131,11 @@
case IS_WIMP_KEY | wimp_KEY_PAGE_DOWN:
state.yscroll -= y;
break;
+ case wimp_KEY_HOME:
case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_UP:
state.yscroll = 1000;
break;
+ case IS_WIMP_KEY | wimp_KEY_END:
case IS_WIMP_KEY | wimp_KEY_CONTROL | wimp_KEY_DOWN:
state.yscroll = -0x10000000;
break;
16 years, 7 months
- 1
- 0
r2826 jmb - in /trunk/netsurfweb: info.de info.en info.nl
by netsurf＠semichrome.net
Author: jmb
Date: Thu Aug 10 00:15:59 2006
New Revision: 2826
URL: http://svn.semichrome.net?rev=2826&view=rev
Log:
Fix TTF2f link
Modified:
trunk/netsurfweb/info.de
trunk/netsurfweb/info.en
trunk/netsurfweb/info.nl
Modified: trunk/netsurfweb/info.de
URL: http://svn.semichrome.net/trunk/netsurfweb/info.de?rev=2826&r1=2825&r2=28...
==============================================================================
--- trunk/netsurfweb/info.de (original)
+++ trunk/netsurfweb/info.de Thu Aug 10 00:15:59 2006
@@ -134,7 +134,7 @@
<p>Werden die Codes 0091, 0092, 0096 oder andere mit 009 beginnende Codes angezeigt, bedeutet dies, daß die Web-Seite die verwendete Schriftform nicht ordentlich festlegt. Neue Zeichensätze zu installieren, hilft in diesem Fall nicht. Wir haben bisher noch nicht entschieden, wie wir dieses Problem sinnvoll umgehen.</p>
-<p>Jeder Zeichensatz mit einer korrekten "Encoding"-Datei sollte funktionieren. In der Praxis sind allerdings Zeichensätze rar, die über die Latin-1 Codierung hinaus Zeichen enthalten. Als Lösung bietet sich an, TrueType-Fonts mittels <a href="http://moose.mine.nu:6888/ttf2f2.zip">TTF2f</a> zu konvertieren (zur Zeit funktioniert das leider nur für RISC OS 5).</p>
+<p>Jeder Zeichensatz mit einer korrekten "Encoding"-Datei sollte funktionieren. In der Praxis sind allerdings Zeichensätze rar, die über die Latin-1 Codierung hinaus Zeichen enthalten. Als Lösung bietet sich an, TrueType-Fonts mittels <a href="http://moose.mine.nu/ttf2f_latest.zip">TTF2f</a> zu konvertieren (zur Zeit funktioniert das leider nur für RISC OS 5).</p>
<p>Nach dem Installieren neuer Schriftarten muß, um diese zu erkennen, NetSurf neu gestartet werden.</p>
Modified: trunk/netsurfweb/info.en
URL: http://svn.semichrome.net/trunk/netsurfweb/info.en?rev=2826&r1=2825&r2=28...
==============================================================================
--- trunk/netsurfweb/info.en (original)
+++ trunk/netsurfweb/info.en Thu Aug 10 00:15:59 2006
@@ -136,7 +136,7 @@
<p>If you see the codes 0091, 0092, 0096, or others starting 009, that indicates that the page is not specifying the character set that it is using correctly. Installing fonts won't help. We haven't yet decided what the best way to work around this problem is.</p>
-<p>Any font supplied with a correctly designed "Encoding" file should work. In practice, native fonts covering anything other than Latin 1 are rare. The solution is to convert TrueType fonts using <a href="http://moose.mine.nu:6888/ttf2f2.zip">TTF2f</a> (this currently produces fonts suitable for RISC OS 5 only).</p>
+<p>Any font supplied with a correctly designed "Encoding" file should work. In practice, native fonts covering anything other than Latin 1 are rare. The solution is to convert TrueType fonts using <a href="http://moose.mine.nu/ttf2f_latest.zip">TTF2f</a> (this currently produces fonts suitable for RISC OS 5 only).</p>
<p>After installing new fonts, NetSurf will need restarting so that it detects them.</p>
Modified: trunk/netsurfweb/info.nl
URL: http://svn.semichrome.net/trunk/netsurfweb/info.nl?rev=2826&r1=2825&r2=28...
==============================================================================
--- trunk/netsurfweb/info.nl (original)
+++ trunk/netsurfweb/info.nl Thu Aug 10 00:15:59 2006
@@ -131,7 +131,7 @@
<p>Codes beginnend met 009, geven aan dat de pagina het gebruikte lettertype niet juist specificeert. Installeren van lettertypes helpt niet. We hebben nog geen oplossing gevonden om dit probleem zo goed mogelijk te voorkomen/verhelpen.</p>
-<p>Elk lettertype dat ondersteund wordt door een goed ontworpen coderingbestand zal geen enkel probleem geven. In de praktijk komen zelden lettertypes voor die niet gedekt worden door Latin 1. De oplossing is om TrueType-lettertypes om te zetten met <a href="http://moose.mine.nu:6888/ttf2f2.zip"><strong>TTF2f</strong></a> (momenteel zijn alleen lettertypes voor RISC OS 5 beschikbaar).</p>
+<p>Elk lettertype dat ondersteund wordt door een goed ontworpen coderingbestand zal geen enkel probleem geven. In de praktijk komen zelden lettertypes voor die niet gedekt worden door Latin 1. De oplossing is om TrueType-lettertypes om te zetten met <a href="http://moose.mine.nu/ttf2f_latest.zip"><strong>TTF2f</strong></a> (momenteel zijn alleen lettertypes voor RISC OS 5 beschikbaar).</p>
<p>N.b. Na het installeren van lettertypes moet NetSurf opnieuw gestart worden om die lettertypes te kunnen detecteren.</p>
16 years, 7 months
- 1
- 0
r2825 dsilvers - /trunk/netsurf/depend
by netsurf＠semichrome.net
Author: dsilvers
Date: Wed Aug 9 16:07:28 2006
New Revision: 2825
URL: http://svn.semichrome.net?rev=2825&view=rev
Log:
Revert depend change from 2824
Modified:
trunk/netsurf/depend
Modified: trunk/netsurf/depend
URL: http://svn.semichrome.net/trunk/netsurf/depend?rev=2825&r1=2824&r2=2825&v...
==============================================================================
--- trunk/netsurf/depend (original)
+++ trunk/netsurf/depend Wed Aug 9 16:07:28 2006
@@ -1,104 +1,96 @@
-arm-riscos-aof/content.o arm-riscos-aof-small/content.o arm-ncos-aof/content.o i486-linux-gnu-debug/content.o i486-linux-gnu-gtk/content.o : content/content.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/directory.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/utils.h
-arm-riscos-aof/fetch.o arm-riscos-aof-small/fetch.o arm-ncos-aof/fetch.o i486-linux-gnu-debug/fetch.o i486-linux-gnu-gtk/fetch.o : content/fetch.c content/content_type.h content/fetch.h content/urldb.h desktop/options.h render/form.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/content.o arm-riscos-aof-small/content.o arm-ncos-aof/content.o i486-linux-gnu-debug/content.o i486-linux-gnu-gtk/content.o : content/content.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/utils.h
+arm-riscos-aof/fetch.o arm-riscos-aof-small/fetch.o arm-ncos-aof/fetch.o i486-linux-gnu-debug/fetch.o i486-linux-gnu-gtk/fetch.o : content/fetch.c content/content_type.h content/fetch.h content/urldb.h desktop/options.h desktop/tree.h render/form.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
arm-riscos-aof/fetchcache.o arm-riscos-aof-small/fetchcache.o arm-ncos-aof/fetchcache.o i486-linux-gnu-debug/fetchcache.o i486-linux-gnu-gtk/fetchcache.o : content/fetchcache.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
-arm-riscos-aof/urldb.o arm-riscos-aof-small/urldb.o arm-ncos-aof/urldb.o i486-linux-gnu-debug/urldb.o i486-linux-gnu-gtk/urldb.o : content/urldb.c content/content_type.h content/urldb.h desktop/cookies.h desktop/options.h image/bitmap.h riscos/bitmap.h utils/config.h utils/log.h utils/url.h utils/utils.h
+arm-riscos-aof/urldb.o arm-riscos-aof-small/urldb.o arm-ncos-aof/urldb.o i486-linux-gnu-debug/urldb.o i486-linux-gnu-gtk/urldb.o : content/urldb.c content/content_type.h content/urldb.h desktop/options.h desktop/tree.h image/bitmap.h riscos/bitmap.h utils/config.h utils/log.h utils/url.h utils/utils.h
arm-riscos-aof/css.o arm-riscos-aof-small/css.o arm-ncos-aof/css.o i486-linux-gnu-debug/css.o i486-linux-gnu-gtk/css.o : css/css.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h css/parser.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
arm-riscos-aof/css_enum.o arm-riscos-aof-small/css_enum.o arm-ncos-aof/css_enum.o i486-linux-gnu-debug/css_enum.o i486-linux-gnu-gtk/css_enum.o : css/css_enum.c css/css_enum.h
arm-riscos-aof/parser.o arm-riscos-aof-small/parser.o arm-ncos-aof/parser.o i486-linux-gnu-debug/parser.o i486-linux-gnu-gtk/parser.o : css/parser.c css/css.h css/css_enum.h utils/utils.h
-arm-riscos-aof/ruleset.o arm-riscos-aof-small/ruleset.o arm-ncos-aof/ruleset.o i486-linux-gnu-debug/ruleset.o i486-linux-gnu-gtk/ruleset.o : css/ruleset.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utils.h
+arm-riscos-aof/ruleset.o arm-riscos-aof-small/ruleset.o arm-ncos-aof/ruleset.o i486-linux-gnu-debug/ruleset.o i486-linux-gnu-gtk/ruleset.o : css/ruleset.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utils.h
arm-riscos-aof/scanner.o arm-riscos-aof-small/scanner.o arm-ncos-aof/scanner.o i486-linux-gnu-debug/scanner.o i486-linux-gnu-gtk/scanner.o : css/scanner.c css/css.h css/css_enum.h css/parser.h
arm-riscos-aof/debug_bitmap.o arm-riscos-aof-small/debug_bitmap.o arm-ncos-aof/debug_bitmap.o i486-linux-gnu-debug/debug_bitmap.o i486-linux-gnu-gtk/debug_bitmap.o : debug/debug_bitmap.c image/bitmap.h
arm-riscos-aof/filetyped.o arm-riscos-aof-small/filetyped.o arm-ncos-aof/filetyped.o i486-linux-gnu-debug/filetyped.o i486-linux-gnu-gtk/filetyped.o : debug/filetyped.c content/fetch.h utils/config.h utils/log.h utils/utils.h
arm-riscos-aof/fontd.o arm-riscos-aof-small/fontd.o arm-ncos-aof/fontd.o i486-linux-gnu-debug/fontd.o i486-linux-gnu-gtk/fontd.o : debug/fontd.c css/css.h css/css_enum.h render/font.h
-arm-riscos-aof/netsurfd.o arm-riscos-aof-small/netsurfd.o arm-ncos-aof/netsurfd.o i486-linux-gnu-debug/netsurfd.o i486-linux-gnu-gtk/netsurfd.o : debug/netsurfd.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/cookies.h desktop/gui.h desktop/options.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/save_complete.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/browser.o arm-riscos-aof-small/browser.o arm-ncos-aof/browser.o i486-linux-gnu-debug/browser.o i486-linux-gnu-gtk/browser.o : desktop/browser.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gesture_core.h desktop/gui.h desktop/history_core.h desktop/options.h desktop/selection.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/imagemap.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/gesture_core.o arm-riscos-aof-small/gesture_core.o arm-ncos-aof/gesture_core.o i486-linux-gnu-debug/gesture_core.o i486-linux-gnu-gtk/gesture_core.o : desktop/gesture_core.c desktop/gesture_core.h utils/log.h
+arm-riscos-aof/netsurfd.o arm-riscos-aof-small/netsurfd.o arm-ncos-aof/netsurfd.o i486-linux-gnu-debug/netsurfd.o i486-linux-gnu-gtk/netsurfd.o : debug/netsurfd.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h desktop/textinput.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/save_complete.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/browser.o arm-riscos-aof-small/browser.o arm-ncos-aof/browser.o i486-linux-gnu-debug/browser.o i486-linux-gnu-gtk/browser.o : desktop/browser.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/options.h desktop/selection.h desktop/textinput.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/imagemap.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utf8.h utils/utils.h
arm-riscos-aof/history_core.o arm-riscos-aof-small/history_core.o arm-ncos-aof/history_core.o i486-linux-gnu-debug/history_core.o i486-linux-gnu-gtk/history_core.o : desktop/history_core.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utils.h
-arm-riscos-aof/knockout.o arm-riscos-aof-small/knockout.o arm-ncos-aof/knockout.o i486-linux-gnu-debug/knockout.o i486-linux-gnu-gtk/knockout.o : desktop/knockout.c css/css.h css/css_enum.h desktop/knockout.h desktop/plotters.h image/bitmap.h utils/log.h
arm-riscos-aof/netsurf.o arm-riscos-aof-small/netsurf.o arm-ncos-aof/netsurf.o i486-linux-gnu-debug/netsurf.o i486-linux-gnu-gtk/netsurf.o : desktop/netsurf.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/buffer.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/options.o arm-riscos-aof-small/options.o arm-ncos-aof/options.o i486-linux-gnu-debug/options.o i486-linux-gnu-gtk/options.o : desktop/options.c content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/options.h desktop/tree.h gtk/options.h riscos/options.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/options.o arm-riscos-aof-small/options.o arm-ncos-aof/options.o i486-linux-gnu-debug/options.o i486-linux-gnu-gtk/options.o : desktop/options.c content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/options.h desktop/tree.h riscos/options.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/save_text.o arm-riscos-aof-small/save_text.o arm-ncos-aof/save_text.o i486-linux-gnu-debug/save_text.o i486-linux-gnu-gtk/save_text.o : desktop/save_text.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/save_text.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
arm-riscos-aof/selection.o arm-riscos-aof-small/selection.o arm-ncos-aof/selection.o i486-linux-gnu-debug/selection.o i486-linux-gnu-gtk/selection.o : desktop/selection.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/plotters.h desktop/selection.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/utf8.h utils/utils.h
arm-riscos-aof/textinput.o arm-riscos-aof-small/textinput.o arm-ncos-aof/textinput.o i486-linux-gnu-debug/textinput.o i486-linux-gnu-gtk/textinput.o : desktop/textinput.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/selection.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/talloc.h utils/utf8.h utils/utils.h
-arm-riscos-aof/tree.o arm-riscos-aof-small/tree.o arm-ncos-aof/tree.o i486-linux-gnu-debug/tree.o i486-linux-gnu-gtk/tree.o : desktop/tree.c content/content_type.h content/urldb.h desktop/options.h desktop/tree.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/tree.o arm-riscos-aof-small/tree.o arm-ncos-aof/tree.o i486-linux-gnu-debug/tree.o i486-linux-gnu-gtk/tree.o : desktop/tree.c content/content_type.h content/urldb.h desktop/options.h desktop/tree.h utils/config.h utils/log.h utils/utils.h
arm-riscos-aof/version.o arm-riscos-aof-small/version.o arm-ncos-aof/version.o i486-linux-gnu-debug/version.o i486-linux-gnu-gtk/version.o : desktop/version.c
arm-riscos-aof/font_pango.o arm-riscos-aof-small/font_pango.o arm-ncos-aof/font_pango.o i486-linux-gnu-debug/font_pango.o i486-linux-gnu-gtk/font_pango.o : gtk/font_pango.c css/css.h css/css_enum.h gtk/font_pango.h gtk/gtk_window.h render/font.h utils/log.h utils/utils.h
arm-riscos-aof/gtk_bitmap.o arm-riscos-aof-small/gtk_bitmap.o arm-ncos-aof/gtk_bitmap.o i486-linux-gnu-debug/gtk_bitmap.o i486-linux-gnu-gtk/gtk_bitmap.o : gtk/gtk_bitmap.c content/content.h content/content_type.h css/css.h css/css_enum.h gtk/gtk_window.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h
-arm-riscos-aof/gtk_completion.o arm-riscos-aof-small/gtk_completion.o arm-ncos-aof/gtk_completion.o i486-linux-gnu-debug/gtk_completion.o i486-linux-gnu-gtk/gtk_completion.o : gtk/gtk_completion.c content/content_type.h content/urldb.h desktop/options.h gtk/gtk_completion.h utils/config.h utils/log.h
-arm-riscos-aof/gtk_gui.o arm-riscos-aof-small/gtk_gui.o arm-ncos-aof/gtk_gui.o i486-linux-gnu-debug/gtk_gui.o i486-linux-gnu-gtk/gtk_gui.o : gtk/gtk_gui.c content/content.h content/content_type.h content/fetch.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/cookies.h desktop/gui.h desktop/netsurf.h desktop/options.h gtk/gtk_completion.h gtk/gtk_gui.h gtk/gtk_options.h gtk/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/gtk_login.o arm-riscos-aof-small/gtk_login.o arm-ncos-aof/gtk_login.o i486-linux-gnu-debug/gtk_login.o i486-linux-gnu-gtk/gtk_login.o : gtk/gtk_login.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gui.h gtk/gtk_gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/gtk_options.o arm-riscos-aof-small/gtk_options.o arm-ncos-aof/gtk_options.o i486-linux-gnu-debug/gtk_options.o i486-linux-gnu-gtk/gtk_options.o : gtk/gtk_options.c desktop/options.h gtk/gtk_gui.h gtk/gtk_options.h gtk/options.h utils/log.h
-arm-riscos-aof/gtk_plotters.o arm-riscos-aof-small/gtk_plotters.o arm-ncos-aof/gtk_plotters.o i486-linux-gnu-debug/gtk_plotters.o i486-linux-gnu-gtk/gtk_plotters.o : gtk/gtk_plotters.c css/css.h css/css_enum.h desktop/options.h desktop/plotters.h gtk/font_pango.h gtk/gtk_plotters.h gtk/gtk_window.h gtk/options.h render/font.h utils/log.h
+arm-riscos-aof/gtk_gui.o arm-riscos-aof-small/gtk_gui.o arm-ncos-aof/gtk_gui.o i486-linux-gnu-debug/gtk_gui.o i486-linux-gnu-gtk/gtk_gui.o : gtk/gtk_gui.c content/content.h content/content_type.h content/fetch.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h gtk/gtk_gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utf8.h utils/utils.h
+arm-riscos-aof/gtk_plotters.o arm-riscos-aof-small/gtk_plotters.o arm-ncos-aof/gtk_plotters.o i486-linux-gnu-debug/gtk_plotters.o i486-linux-gnu-gtk/gtk_plotters.o : gtk/gtk_plotters.c css/css.h css/css_enum.h desktop/plotters.h gtk/font_pango.h gtk/gtk_plotters.h gtk/gtk_window.h render/font.h utils/log.h
arm-riscos-aof/gtk_schedule.o arm-riscos-aof-small/gtk_schedule.o arm-ncos-aof/gtk_schedule.o i486-linux-gnu-debug/gtk_schedule.o i486-linux-gnu-gtk/gtk_schedule.o : gtk/gtk_schedule.c desktop/browser.h
arm-riscos-aof/gtk_thumbnail.o arm-riscos-aof-small/gtk_thumbnail.o arm-ncos-aof/gtk_thumbnail.o i486-linux-gnu-debug/gtk_thumbnail.o i486-linux-gnu-gtk/gtk_thumbnail.o : gtk/gtk_thumbnail.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/plotters.h gtk/gtk_plotters.h gtk/gtk_window.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h
arm-riscos-aof/gtk_treeview.o arm-riscos-aof-small/gtk_treeview.o arm-ncos-aof/gtk_treeview.o i486-linux-gnu-debug/gtk_treeview.o i486-linux-gnu-gtk/gtk_treeview.o : gtk/gtk_treeview.c desktop/tree.h
-arm-riscos-aof/gtk_window.o arm-riscos-aof-small/gtk_window.o arm-ncos-aof/gtk_window.o i486-linux-gnu-debug/gtk_window.o i486-linux-gnu-gtk/gtk_window.o : gtk/gtk_window.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gesture_core.h desktop/gui.h desktop/history_core.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/textinput.h gtk/gtk_completion.h gtk/gtk_gui.h gtk/gtk_options.h gtk/gtk_plotters.h gtk/gtk_window.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/gtk_window.o arm-riscos-aof-small/gtk_window.o arm-ncos-aof/gtk_window.o i486-linux-gnu-debug/gtk_window.o i486-linux-gnu-gtk/gtk_window.o : gtk/gtk_window.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/textinput.h desktop/tree.h gtk/gtk_gui.h gtk/gtk_plotters.h gtk/gtk_window.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/bmp.o arm-riscos-aof-small/bmp.o arm-ncos-aof/bmp.o i486-linux-gnu-debug/bmp.o i486-linux-gnu-gtk/bmp.o : image/bmp.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/bmpread.o arm-riscos-aof-small/bmpread.o arm-ncos-aof/bmpread.o i486-linux-gnu-debug/bmpread.o i486-linux-gnu-gtk/bmpread.o : image/bmpread.c image/bitmap.h image/bmpread.h utils/log.h
-arm-riscos-aof/gif.o arm-riscos-aof-small/gif.o arm-ncos-aof/gif.o i486-linux-gnu-debug/gif.o i486-linux-gnu-gtk/gif.o : image/gif.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/gif.o arm-riscos-aof-small/gif.o arm-ncos-aof/gif.o i486-linux-gnu-debug/gif.o i486-linux-gnu-gtk/gif.o : image/gif.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/gifread.o arm-riscos-aof-small/gifread.o arm-ncos-aof/gifread.o i486-linux-gnu-debug/gifread.o i486-linux-gnu-gtk/gifread.o : image/gifread.c image/bitmap.h utils/log.h
arm-riscos-aof/ico.o arm-riscos-aof-small/ico.o arm-ncos-aof/ico.o i486-linux-gnu-debug/ico.o i486-linux-gnu-gtk/ico.o : image/ico.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/jpeg.o arm-riscos-aof-small/jpeg.o arm-ncos-aof/jpeg.o i486-linux-gnu-debug/jpeg.o i486-linux-gnu-gtk/jpeg.o : image/jpeg.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/mng.o arm-riscos-aof-small/mng.o arm-ncos-aof/mng.o i486-linux-gnu-debug/mng.o i486-linux-gnu-gtk/mng.o : image/mng.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/box.o arm-riscos-aof-small/box.o arm-ncos-aof/box.o i486-linux-gnu-debug/box.o i486-linux-gnu-gtk/box.o : render/box.c content/content.h content/content_type.h css/css.h css/css_enum.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/talloc.h
-arm-riscos-aof/box_construct.o arm-riscos-aof-small/box_construct.o arm-ncos-aof/box_construct.o i486-linux-gnu-debug/box_construct.o i486-linux-gnu-gtk/box_construct.o : render/box_construct.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
+arm-riscos-aof/mng.o arm-riscos-aof-small/mng.o arm-ncos-aof/mng.o i486-linux-gnu-debug/mng.o i486-linux-gnu-gtk/mng.o : image/mng.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/box.o arm-riscos-aof-small/box.o arm-ncos-aof/box.o i486-linux-gnu-debug/box.o i486-linux-gnu-gtk/box.o : render/box.c content/content.h content/content_type.h css/css.h css/css_enum.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/talloc.h
+arm-riscos-aof/box_construct.o arm-riscos-aof-small/box_construct.o arm-ncos-aof/box_construct.o i486-linux-gnu-debug/box_construct.o i486-linux-gnu-gtk/box_construct.o : render/box_construct.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
arm-riscos-aof/box_normalise.o arm-riscos-aof-small/box_normalise.o arm-ncos-aof/box_normalise.o i486-linux-gnu-debug/box_normalise.o i486-linux-gnu-gtk/box_normalise.o : render/box_normalise.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/table.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h
-arm-riscos-aof/directory.o arm-riscos-aof-small/directory.o arm-ncos-aof/directory.o i486-linux-gnu-debug/directory.o i486-linux-gnu-gtk/directory.o : render/directory.c content/content.h content/content_type.h css/css.h css/css_enum.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/directory.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/messages.h utils/url.h
arm-riscos-aof/form.o arm-riscos-aof-small/form.o arm-ncos-aof/form.o i486-linux-gnu-debug/form.o i486-linux-gnu-gtk/form.o : render/form.c render/box.h render/form.h utils/config.h utils/log.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/html.o arm-riscos-aof-small/html.o arm-ncos-aof/html.o i486-linux-gnu-debug/html.o i486-linux-gnu-gtk/html.o : render/html.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/imagemap.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
-arm-riscos-aof/html_redraw.o arm-riscos-aof-small/html_redraw.o arm-ncos-aof/html_redraw.o i486-linux-gnu-debug/html_redraw.o i486-linux-gnu-gtk/html_redraw.o : render/html_redraw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/knockout.h desktop/options.h desktop/plotters.h desktop/selection.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/html.o arm-riscos-aof-small/html.o arm-ncos-aof/html.o i486-linux-gnu-debug/html.o i486-linux-gnu-gtk/html.o : render/html.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/imagemap.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
+arm-riscos-aof/html_redraw.o arm-riscos-aof-small/html_redraw.o arm-ncos-aof/html_redraw.o i486-linux-gnu-debug/html_redraw.o i486-linux-gnu-gtk/html_redraw.o : render/html_redraw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/plotters.h desktop/selection.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/imagemap.o arm-riscos-aof-small/imagemap.o arm-ncos-aof/imagemap.o i486-linux-gnu-debug/imagemap.o i486-linux-gnu-gtk/imagemap.o : render/imagemap.c content/content.h content/content_type.h css/css.h css/css_enum.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/imagemap.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/layout.o arm-riscos-aof-small/layout.o arm-ncos-aof/layout.o i486-linux-gnu-debug/layout.o i486-linux-gnu-gtk/layout.o : render/layout.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/talloc.h utils/utils.h
+arm-riscos-aof/layout.o arm-riscos-aof-small/layout.o arm-ncos-aof/layout.o i486-linux-gnu-debug/layout.o i486-linux-gnu-gtk/layout.o : render/layout.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/talloc.h utils/utils.h
arm-riscos-aof/list.o arm-riscos-aof-small/list.o arm-ncos-aof/list.o i486-linux-gnu-debug/list.o i486-linux-gnu-gtk/list.o : render/list.c css/css.h css/css_enum.h render/list.h utils/log.h
arm-riscos-aof/table.o arm-riscos-aof-small/table.o arm-ncos-aof/table.o i486-linux-gnu-debug/table.o i486-linux-gnu-gtk/table.o : render/table.c css/css.h css/css_enum.h render/box.h render/table.h utils/log.h utils/talloc.h
arm-riscos-aof/textplain.o arm-riscos-aof-small/textplain.o arm-ncos-aof/textplain.o i486-linux-gnu-debug/textplain.o i486-linux-gnu-gtk/textplain.o : render/textplain.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/plotters.h desktop/selection.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/utf8.h utils/utils.h
-arm-riscos-aof/401login.o arm-riscos-aof-small/401login.o arm-ncos-aof/401login.o i486-linux-gnu-debug/401login.o i486-linux-gnu-gtk/401login.o : riscos/401login.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/artworks.o arm-riscos-aof-small/artworks.o arm-ncos-aof/artworks.o i486-linux-gnu-debug/artworks.o i486-linux-gnu-gtk/artworks.o : riscos/artworks.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/401login.o arm-riscos-aof-small/401login.o arm-ncos-aof/401login.o i486-linux-gnu-debug/401login.o i486-linux-gnu-gtk/401login.o : riscos/401login.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/artworks.o arm-riscos-aof-small/artworks.o arm-ncos-aof/artworks.o i486-linux-gnu-debug/artworks.o i486-linux-gnu-gtk/artworks.o : riscos/artworks.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/assert.o arm-riscos-aof-small/assert.o arm-ncos-aof/assert.o i486-linux-gnu-debug/assert.o i486-linux-gnu-gtk/assert.o : riscos/assert.c
-arm-riscos-aof/bitmap.o arm-riscos-aof-small/bitmap.o arm-ncos-aof/bitmap.o i486-linux-gnu-debug/bitmap.o i486-linux-gnu-gtk/bitmap.o : riscos/bitmap.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/image.h riscos/options.h riscos/palettes.h riscos/plugin.h riscos/sprite.h riscos/tinct.h utils/config.h utils/filename.h utils/log.h utils/utils.h
-arm-riscos-aof/buffer.o arm-riscos-aof-small/buffer.o arm-ncos-aof/buffer.o i486-linux-gnu-debug/buffer.o i486-linux-gnu-gtk/buffer.o : riscos/buffer.c content/content_type.h desktop/browser.h desktop/options.h riscos/buffer.h riscos/gui.h riscos/options.h riscos/tinct.h riscos/wimp.h utils/config.h utils/log.h
-arm-riscos-aof/configure.o arm-riscos-aof-small/configure.o arm-ncos-aof/configure.o i486-linux-gnu-debug/configure.o i486-linux-gnu-gtk/configure.o : riscos/configure.c content/content_type.h desktop/browser.h riscos/configure.h riscos/configure/configure.h riscos/dialog.h riscos/gui.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/cookies.o arm-riscos-aof-small/cookies.o arm-ncos-aof/cookies.o i486-linux-gnu-debug/cookies.o i486-linux-gnu-gtk/cookies.o : riscos/cookies.c content/content_type.h content/urldb.h desktop/browser.h desktop/cookies.h desktop/options.h desktop/tree.h image/bitmap.h riscos/cookies.h riscos/dialog.h riscos/gui.h riscos/menus.h riscos/options.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/debugwin.o arm-riscos-aof-small/debugwin.o arm-ncos-aof/debugwin.o i486-linux-gnu-debug/debugwin.o i486-linux-gnu-gtk/debugwin.o : riscos/debugwin.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/dialog.o arm-riscos-aof-small/dialog.o arm-ncos-aof/dialog.o i486-linux-gnu-debug/dialog.o i486-linux-gnu-gtk/dialog.o : riscos/dialog.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/configure.h riscos/cookies.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/url_complete.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/download.o arm-riscos-aof-small/download.o arm-ncos-aof/download.o i486-linux-gnu-debug/download.o i486-linux-gnu-gtk/download.o : riscos/download.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/query.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/wimp.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/draw.o arm-riscos-aof-small/draw.o arm-ncos-aof/draw.o i486-linux-gnu-debug/draw.o i486-linux-gnu-gtk/draw.o : riscos/draw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/filetype.o arm-riscos-aof-small/filetype.o arm-ncos-aof/filetype.o i486-linux-gnu-debug/filetype.o i486-linux-gnu-gtk/filetype.o : riscos/filetype.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/font.o arm-riscos-aof-small/font.o arm-ncos-aof/font.o i486-linux-gnu-debug/font.o i486-linux-gnu-gtk/font.o : riscos/font.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h render/font.h riscos/gui.h riscos/options.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/global_history.o arm-riscos-aof-small/global_history.o arm-ncos-aof/global_history.o i486-linux-gnu-debug/global_history.o i486-linux-gnu-gtk/global_history.o : riscos/global_history.c content/content_type.h content/urldb.h desktop/browser.h desktop/options.h desktop/tree.h image/bitmap.h riscos/dialog.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/bitmap.o arm-riscos-aof-small/bitmap.o arm-ncos-aof/bitmap.o i486-linux-gnu-debug/bitmap.o i486-linux-gnu-gtk/bitmap.o : riscos/bitmap.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/image.h riscos/options.h riscos/palettes.h riscos/plugin.h riscos/sprite.h riscos/tinct.h utils/config.h utils/filename.h utils/log.h utils/utils.h
+arm-riscos-aof/buffer.o arm-riscos-aof-small/buffer.o arm-ncos-aof/buffer.o i486-linux-gnu-debug/buffer.o i486-linux-gnu-gtk/buffer.o : riscos/buffer.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/buffer.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/tinct.h riscos/wimp.h utils/config.h utils/log.h
+arm-riscos-aof/configure.o arm-riscos-aof-small/configure.o arm-ncos-aof/configure.o i486-linux-gnu-debug/configure.o i486-linux-gnu-gtk/configure.o : riscos/configure.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/configure.h riscos/configure/configure.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/debugwin.o arm-riscos-aof-small/debugwin.o arm-ncos-aof/debugwin.o i486-linux-gnu-debug/debugwin.o i486-linux-gnu-gtk/debugwin.o : riscos/debugwin.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/dialog.o arm-riscos-aof-small/dialog.o arm-ncos-aof/dialog.o i486-linux-gnu-debug/dialog.o i486-linux-gnu-gtk/dialog.o : riscos/dialog.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/configure.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/url_complete.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/download.o arm-riscos-aof-small/download.o arm-ncos-aof/download.o i486-linux-gnu-debug/download.o i486-linux-gnu-gtk/download.o : riscos/download.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/query.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/wimp.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/draw.o arm-riscos-aof-small/draw.o arm-ncos-aof/draw.o i486-linux-gnu-debug/draw.o i486-linux-gnu-gtk/draw.o : riscos/draw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/filetype.o arm-riscos-aof-small/filetype.o arm-ncos-aof/filetype.o i486-linux-gnu-debug/filetype.o i486-linux-gnu-gtk/filetype.o : riscos/filetype.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/font.o arm-riscos-aof-small/font.o arm-ncos-aof/font.o i486-linux-gnu-debug/font.o i486-linux-gnu-gtk/font.o : riscos/font.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/global_history.o arm-riscos-aof-small/global_history.o arm-ncos-aof/global_history.o i486-linux-gnu-debug/global_history.o i486-linux-gnu-gtk/global_history.o : riscos/global_history.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
arm-riscos-aof/gui.o arm-riscos-aof-small/gui.o arm-ncos-aof/gui.o i486-linux-gnu-debug/gui.o i486-linux-gnu-gtk/gui.o : riscos/gui.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/buffer.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/help.h riscos/menus.h riscos/message.h riscos/options.h riscos/plugin.h riscos/print.h riscos/query.h riscos/save.h riscos/save_complete.h riscos/sprite.h riscos/textselection.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/uri.h riscos/url_complete.h riscos/url_protocol.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/filename.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/help.o arm-riscos-aof-small/help.o arm-ncos-aof/help.o i486-linux-gnu-debug/help.o i486-linux-gnu-gtk/help.o : riscos/help.c content/content_type.h desktop/browser.h desktop/tree.h image/bitmap.h riscos/gui.h riscos/help.h riscos/menus.h riscos/theme.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utf8.h utils/utils.h
-arm-riscos-aof/history.o arm-riscos-aof-small/history.o arm-ncos-aof/history.o i486-linux-gnu-debug/history.o i486-linux-gnu-gtk/history.o : riscos/history.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/history_core.h desktop/options.h desktop/plotters.h riscos/dialog.h riscos/gui.h riscos/options.h riscos/theme.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/url.h utils/utils.h
-arm-riscos-aof/hotlist.o arm-riscos-aof-small/hotlist.o arm-ncos-aof/hotlist.o i486-linux-gnu-debug/hotlist.o i486-linux-gnu-gtk/hotlist.o : riscos/hotlist.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/image.o arm-riscos-aof-small/image.o arm-ncos-aof/image.o i486-linux-gnu-debug/image.o i486-linux-gnu-gtk/image.o : riscos/image.c content/content_type.h desktop/browser.h desktop/options.h riscos/gui.h riscos/image.h riscos/options.h riscos/tinct.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/menus.o arm-riscos-aof-small/menus.o arm-ncos-aof/menus.o i486-linux-gnu-debug/menus.o i486-linux-gnu-gtk/menus.o : riscos/menus.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/configure.h riscos/cookies.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/help.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/help.o arm-riscos-aof-small/help.o arm-ncos-aof/help.o i486-linux-gnu-debug/help.o i486-linux-gnu-gtk/help.o : riscos/help.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/help.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utf8.h utils/utils.h
+arm-riscos-aof/history.o arm-riscos-aof-small/history.o arm-ncos-aof/history.o i486-linux-gnu-debug/history.o i486-linux-gnu-gtk/history.o : riscos/history.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/url.h utils/utils.h
+arm-riscos-aof/hotlist.o arm-riscos-aof-small/hotlist.o arm-ncos-aof/hotlist.o i486-linux-gnu-debug/hotlist.o i486-linux-gnu-gtk/hotlist.o : riscos/hotlist.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/image.o arm-riscos-aof-small/image.o arm-ncos-aof/image.o i486-linux-gnu-debug/image.o i486-linux-gnu-gtk/image.o : riscos/image.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/image.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/tinct.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/menus.o arm-riscos-aof-small/menus.o arm-ncos-aof/menus.o i486-linux-gnu-debug/menus.o i486-linux-gnu-gtk/menus.o : riscos/menus.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/configure.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/help.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
arm-riscos-aof/message.o arm-riscos-aof-small/message.o arm-ncos-aof/message.o i486-linux-gnu-debug/message.o i486-linux-gnu-gtk/message.o : riscos/message.c riscos/message.h utils/log.h utils/utils.h
arm-riscos-aof/palettes.o arm-riscos-aof-small/palettes.o arm-ncos-aof/palettes.o i486-linux-gnu-debug/palettes.o i486-linux-gnu-gtk/palettes.o : riscos/palettes.c riscos/palettes.h
-arm-riscos-aof/plotters.o arm-riscos-aof-small/plotters.o arm-ncos-aof/plotters.o i486-linux-gnu-debug/plotters.o i486-linux-gnu-gtk/plotters.o : riscos/plotters.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/plotters.h image/bitmap.h render/font.h riscos/bitmap.h riscos/gui.h riscos/image.h utils/config.h utils/log.h
-arm-riscos-aof/plugin.o arm-riscos-aof-small/plugin.o arm-ncos-aof/plugin.o i486-linux-gnu-debug/plugin.o i486-linux-gnu-gtk/plugin.o : riscos/plugin.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/print.o arm-riscos-aof-small/print.o arm-ncos-aof/print.o i486-linux-gnu-debug/print.o i486-linux-gnu-gtk/print.o : riscos/print.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/print.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/query.o arm-riscos-aof-small/query.o arm-ncos-aof/query.o i486-linux-gnu-debug/query.o i486-linux-gnu-gtk/query.o : riscos/query.c content/content_type.h desktop/browser.h riscos/dialog.h riscos/gui.h riscos/query.h riscos/theme.h riscos/wimp.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/save.o arm-riscos-aof-small/save.o arm-ncos-aof/save.o i486-linux-gnu-debug/save.o i486-linux-gnu-gtk/save.o : riscos/save.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/save_text.h desktop/selection.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/save_complete.h riscos/save_draw.h riscos/sprite.h riscos/textselection.h riscos/theme.h riscos/thumbnail.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/save_complete.o arm-riscos-aof-small/save_complete.o arm-ncos-aof/save_complete.o i486-linux-gnu-debug/save_complete.o i486-linux-gnu-gtk/save_complete.o : riscos/save_complete.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/save_complete.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utils.h
-arm-riscos-aof/save_draw.o arm-riscos-aof-small/save_draw.o arm-ncos-aof/save_draw.o i486-linux-gnu-debug/save_draw.o i486-linux-gnu-gtk/save_draw.o : riscos/save_draw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/save_draw.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/schedule.o arm-riscos-aof-small/schedule.o arm-ncos-aof/schedule.o i486-linux-gnu-debug/schedule.o i486-linux-gnu-gtk/schedule.o : riscos/schedule.c content/content_type.h desktop/browser.h riscos/gui.h utils/config.h utils/log.h
-arm-riscos-aof/search.o arm-riscos-aof-small/search.o arm-ncos-aof/search.o i486-linux-gnu-debug/search.o i486-linux-gnu-gtk/search.o : riscos/search.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/selection.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/sprite.o arm-riscos-aof-small/sprite.o arm-ncos-aof/sprite.o i486-linux-gnu-debug/sprite.o i486-linux-gnu-gtk/sprite.o : riscos/sprite.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/image.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/sslcert.o arm-riscos-aof-small/sslcert.o arm-ncos-aof/sslcert.o i486-linux-gnu-debug/sslcert.o i486-linux-gnu-gtk/sslcert.o : riscos/sslcert.c content/content.h content/content_type.h content/fetch.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/textarea.h riscos/theme.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/textarea.o arm-riscos-aof-small/textarea.o arm-ncos-aof/textarea.o i486-linux-gnu-debug/textarea.o i486-linux-gnu-gtk/textarea.o : riscos/textarea.c content/content_type.h desktop/browser.h riscos/gui.h riscos/textarea.h riscos/ucstables.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utf8.h
-arm-riscos-aof/textselection.o arm-riscos-aof-small/textselection.o arm-ncos-aof/textselection.o i486-linux-gnu-debug/textselection.o i486-linux-gnu-gtk/textselection.o : riscos/textselection.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/selection.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/message.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/textselection.h utils/config.h utils/log.h utils/utf8.h utils/utils.h
-arm-riscos-aof/theme.o arm-riscos-aof-small/theme.o arm-ncos-aof/theme.o i486-linux-gnu-debug/theme.o i486-linux-gnu-gtk/theme.o : riscos/theme.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/theme_install.o arm-riscos-aof-small/theme_install.o arm-ncos-aof/theme_install.o i486-linux-gnu-debug/theme_install.o i486-linux-gnu-gtk/theme_install.o : riscos/theme_install.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/thumbnail.o arm-riscos-aof-small/thumbnail.o arm-ncos-aof/thumbnail.o i486-linux-gnu-debug/thumbnail.o i486-linux-gnu-gtk/thumbnail.o : riscos/thumbnail.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/thumbnail.h riscos/tinct.h utils/config.h utils/log.h
-arm-riscos-aof/treeview.o arm-riscos-aof-small/treeview.o arm-ncos-aof/treeview.o i486-linux-gnu-debug/treeview.o i486-linux-gnu-gtk/treeview.o : riscos/treeview.c content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/plotters.h desktop/tree.h image/bitmap.h riscos/bitmap.h riscos/dialog.h riscos/gui.h riscos/image.h riscos/menus.h riscos/textarea.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/plotters.o arm-riscos-aof-small/plotters.o arm-ncos-aof/plotters.o i486-linux-gnu-debug/plotters.o i486-linux-gnu-gtk/plotters.o : riscos/plotters.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/gui.h riscos/image.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h
+arm-riscos-aof/plugin.o arm-riscos-aof-small/plugin.o arm-ncos-aof/plugin.o i486-linux-gnu-debug/plugin.o i486-linux-gnu-gtk/plugin.o : riscos/plugin.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/print.o arm-riscos-aof-small/print.o arm-ncos-aof/print.o i486-linux-gnu-debug/print.o i486-linux-gnu-gtk/print.o : riscos/print.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/print.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/query.o arm-riscos-aof-small/query.o arm-ncos-aof/query.o i486-linux-gnu-debug/query.o i486-linux-gnu-gtk/query.o : riscos/query.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/query.h riscos/sprite.h riscos/theme.h riscos/wimp.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/save.o arm-riscos-aof-small/save.o arm-ncos-aof/save.o i486-linux-gnu-debug/save.o i486-linux-gnu-gtk/save.o : riscos/save.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/save_text.h desktop/selection.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/save_complete.h riscos/save_draw.h riscos/sprite.h riscos/textselection.h riscos/theme.h riscos/thumbnail.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/save_complete.o arm-riscos-aof-small/save_complete.o arm-ncos-aof/save_complete.o i486-linux-gnu-debug/save_complete.o i486-linux-gnu-gtk/save_complete.o : riscos/save_complete.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/save_complete.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utils.h
+arm-riscos-aof/save_draw.o arm-riscos-aof-small/save_draw.o arm-ncos-aof/save_draw.o i486-linux-gnu-debug/save_draw.o i486-linux-gnu-gtk/save_draw.o : riscos/save_draw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/save_draw.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/schedule.o arm-riscos-aof-small/schedule.o arm-ncos-aof/schedule.o i486-linux-gnu-debug/schedule.o i486-linux-gnu-gtk/schedule.o : riscos/schedule.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h
+arm-riscos-aof/search.o arm-riscos-aof-small/search.o arm-ncos-aof/search.o i486-linux-gnu-debug/search.o i486-linux-gnu-gtk/search.o : riscos/search.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/selection.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/sprite.o arm-riscos-aof-small/sprite.o arm-ncos-aof/sprite.o i486-linux-gnu-debug/sprite.o i486-linux-gnu-gtk/sprite.o : riscos/sprite.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/image.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/sslcert.o arm-riscos-aof-small/sslcert.o arm-ncos-aof/sslcert.o i486-linux-gnu-debug/sslcert.o i486-linux-gnu-gtk/sslcert.o : riscos/sslcert.c content/content.h content/content_type.h content/fetch.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/textselection.o arm-riscos-aof-small/textselection.o arm-ncos-aof/textselection.o i486-linux-gnu-debug/textselection.o i486-linux-gnu-gtk/textselection.o : riscos/textselection.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/selection.h desktop/textinput.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/message.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/textselection.h utils/config.h utils/log.h utils/utf8.h utils/utils.h
+arm-riscos-aof/theme.o arm-riscos-aof-small/theme.o arm-ncos-aof/theme.o i486-linux-gnu-debug/theme.o i486-linux-gnu-gtk/theme.o : riscos/theme.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/theme_install.o arm-riscos-aof-small/theme_install.o arm-ncos-aof/theme_install.o i486-linux-gnu-debug/theme_install.o i486-linux-gnu-gtk/theme_install.o : riscos/theme_install.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/thumbnail.o arm-riscos-aof-small/thumbnail.o arm-ncos-aof/thumbnail.o i486-linux-gnu-debug/thumbnail.o i486-linux-gnu-gtk/thumbnail.o : riscos/thumbnail.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/thumbnail.h riscos/tinct.h utils/config.h utils/log.h
+arm-riscos-aof/treeview.o arm-riscos-aof-small/treeview.o arm-ncos-aof/treeview.o i486-linux-gnu-debug/treeview.o i486-linux-gnu-gtk/treeview.o : riscos/treeview.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/image.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/ucstables.o arm-riscos-aof-small/ucstables.o arm-ncos-aof/ucstables.o i486-linux-gnu-debug/ucstables.o i486-linux-gnu-gtk/ucstables.o : riscos/ucstables.c riscos/ucstables.h utils/log.h utils/utf8.h utils/utils.h
-arm-riscos-aof/uri.o arm-riscos-aof-small/uri.o arm-ncos-aof/uri.o i486-linux-gnu-debug/uri.o i486-linux-gnu-gtk/uri.o : riscos/uri.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/url_protocol.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/url_complete.o arm-riscos-aof-small/url_complete.o arm-ncos-aof/url_complete.o i486-linux-gnu-debug/url_complete.o i486-linux-gnu-gtk/url_complete.o : riscos/url_complete.c content/content_type.h content/urldb.h desktop/browser.h desktop/options.h riscos/global_history.h riscos/gui.h riscos/options.h riscos/theme.h riscos/tinct.h riscos/url_complete.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/url_protocol.o arm-riscos-aof-small/url_protocol.o arm-ncos-aof/url_protocol.o i486-linux-gnu-debug/url_protocol.o i486-linux-gnu-gtk/url_protocol.o : riscos/url_protocol.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/uri.h riscos/url_protocol.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/wimp.o arm-riscos-aof-small/wimp.o arm-ncos-aof/wimp.o i486-linux-gnu-debug/wimp.o i486-linux-gnu-gtk/wimp.o : riscos/wimp.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h utils/config.h utils/log.h utils/utf8.h utils/utils.h
-arm-riscos-aof/wimp_event.o arm-riscos-aof-small/wimp_event.o arm-ncos-aof/wimp_event.o i486-linux-gnu-debug/wimp_event.o i486-linux-gnu-gtk/wimp_event.o : riscos/wimp_event.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/ucstables.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/window.o arm-riscos-aof-small/window.o arm-ncos-aof/window.o i486-linux-gnu-debug/window.o i486-linux-gnu-gtk/window.o : riscos/window.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/knockout.h desktop/options.h desktop/plotters.h desktop/textinput.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/buffer.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/thumbnail.h riscos/tinct.h riscos/url_complete.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/filename.o arm-riscos-aof-small/filename.o arm-ncos-aof/filename.o i486-linux-gnu-debug/filename.o i486-linux-gnu-gtk/filename.o : utils/filename.c utils/filename.h utils/log.h utils/utils.h
+arm-riscos-aof/uri.o arm-riscos-aof-small/uri.o arm-ncos-aof/uri.o i486-linux-gnu-debug/uri.o i486-linux-gnu-gtk/uri.o : riscos/uri.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/url_protocol.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/url_complete.o arm-riscos-aof-small/url_complete.o arm-ncos-aof/url_complete.o i486-linux-gnu-debug/url_complete.o i486-linux-gnu-gtk/url_complete.o : riscos/url_complete.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/url_complete.h riscos/wimp.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/url_protocol.o arm-riscos-aof-small/url_protocol.o arm-ncos-aof/url_protocol.o i486-linux-gnu-debug/url_protocol.o i486-linux-gnu-gtk/url_protocol.o : riscos/url_protocol.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/uri.h riscos/url_protocol.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/wimp.o arm-riscos-aof-small/wimp.o arm-ncos-aof/wimp.o i486-linux-gnu-debug/wimp.o i486-linux-gnu-gtk/wimp.o : riscos/wimp.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h utils/config.h utils/log.h utils/utf8.h utils/utils.h
+arm-riscos-aof/wimp_event.o arm-riscos-aof-small/wimp_event.o arm-ncos-aof/wimp_event.o i486-linux-gnu-debug/wimp_event.o i486-linux-gnu-gtk/wimp_event.o : riscos/wimp_event.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/window.o arm-riscos-aof-small/window.o arm-ncos-aof/window.o i486-linux-gnu-debug/window.o i486-linux-gnu-gtk/window.o : riscos/window.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/textinput.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/buffer.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/thumbnail.h riscos/tinct.h riscos/ucstables.h riscos/url_complete.h riscos/wimp.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/filename.o arm-riscos-aof-small/filename.o arm-ncos-aof/filename.o i486-linux-gnu-debug/filename.o i486-linux-gnu-gtk/filename.o : utils/filename.c utils/filename.h utils/log.h
arm-riscos-aof/memdebug.o arm-riscos-aof-small/memdebug.o arm-ncos-aof/memdebug.o i486-linux-gnu-debug/memdebug.o i486-linux-gnu-gtk/memdebug.o : utils/memdebug.c
arm-riscos-aof/messages.o arm-riscos-aof-small/messages.o arm-ncos-aof/messages.o i486-linux-gnu-debug/messages.o i486-linux-gnu-gtk/messages.o : utils/messages.c utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/talloc.o arm-riscos-aof-small/talloc.o arm-ncos-aof/talloc.o i486-linux-gnu-debug/talloc.o i486-linux-gnu-gtk/talloc.o : utils/talloc.c
16 years, 7 months
- 1
- 0
r2824 dsilvers - in /trunk/netsurf: depend gtk/gtk_bitmap.c gtk/gtk_bitmap.h gtk/gtk_plotters.c gtk/gtk_thumbnail.c
by netsurf＠semichrome.net
Author: dsilvers
Date: Wed Aug 9 16:06:14 2006
New Revision: 2824
URL: http://svn.semichrome.net?rev=2824&view=rev
Log:
Merge 2818:HEAD of branches/dsilvers/gtk-bitmap-pretile
Added:
trunk/netsurf/gtk/gtk_bitmap.h
- copied unchanged from r2823, branches/dsilvers/gtk-bitmap-pretile/gtk/gtk_bitmap.h
Modified:
trunk/netsurf/depend
trunk/netsurf/gtk/gtk_bitmap.c
trunk/netsurf/gtk/gtk_plotters.c
trunk/netsurf/gtk/gtk_thumbnail.c
Modified: trunk/netsurf/depend
URL: http://svn.semichrome.net/trunk/netsurf/depend?rev=2824&r1=2823&r2=2824&v...
==============================================================================
--- trunk/netsurf/depend (original)
+++ trunk/netsurf/depend Wed Aug 9 16:06:14 2006
@@ -1,96 +1,104 @@
-arm-riscos-aof/content.o arm-riscos-aof-small/content.o arm-ncos-aof/content.o i486-linux-gnu-debug/content.o i486-linux-gnu-gtk/content.o : content/content.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/utils.h
-arm-riscos-aof/fetch.o arm-riscos-aof-small/fetch.o arm-ncos-aof/fetch.o i486-linux-gnu-debug/fetch.o i486-linux-gnu-gtk/fetch.o : content/fetch.c content/content_type.h content/fetch.h content/urldb.h desktop/options.h desktop/tree.h render/form.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/content.o arm-riscos-aof-small/content.o arm-ncos-aof/content.o i486-linux-gnu-debug/content.o i486-linux-gnu-gtk/content.o : content/content.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/directory.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/utils.h
+arm-riscos-aof/fetch.o arm-riscos-aof-small/fetch.o arm-ncos-aof/fetch.o i486-linux-gnu-debug/fetch.o i486-linux-gnu-gtk/fetch.o : content/fetch.c content/content_type.h content/fetch.h content/urldb.h desktop/options.h render/form.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
arm-riscos-aof/fetchcache.o arm-riscos-aof-small/fetchcache.o arm-ncos-aof/fetchcache.o i486-linux-gnu-debug/fetchcache.o i486-linux-gnu-gtk/fetchcache.o : content/fetchcache.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
-arm-riscos-aof/urldb.o arm-riscos-aof-small/urldb.o arm-ncos-aof/urldb.o i486-linux-gnu-debug/urldb.o i486-linux-gnu-gtk/urldb.o : content/urldb.c content/content_type.h content/urldb.h desktop/options.h desktop/tree.h image/bitmap.h riscos/bitmap.h utils/config.h utils/log.h utils/url.h utils/utils.h
+arm-riscos-aof/urldb.o arm-riscos-aof-small/urldb.o arm-ncos-aof/urldb.o i486-linux-gnu-debug/urldb.o i486-linux-gnu-gtk/urldb.o : content/urldb.c content/content_type.h content/urldb.h desktop/cookies.h desktop/options.h image/bitmap.h riscos/bitmap.h utils/config.h utils/log.h utils/url.h utils/utils.h
arm-riscos-aof/css.o arm-riscos-aof-small/css.o arm-ncos-aof/css.o i486-linux-gnu-debug/css.o i486-linux-gnu-gtk/css.o : css/css.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h css/parser.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
arm-riscos-aof/css_enum.o arm-riscos-aof-small/css_enum.o arm-ncos-aof/css_enum.o i486-linux-gnu-debug/css_enum.o i486-linux-gnu-gtk/css_enum.o : css/css_enum.c css/css_enum.h
arm-riscos-aof/parser.o arm-riscos-aof-small/parser.o arm-ncos-aof/parser.o i486-linux-gnu-debug/parser.o i486-linux-gnu-gtk/parser.o : css/parser.c css/css.h css/css_enum.h utils/utils.h
-arm-riscos-aof/ruleset.o arm-riscos-aof-small/ruleset.o arm-ncos-aof/ruleset.o i486-linux-gnu-debug/ruleset.o i486-linux-gnu-gtk/ruleset.o : css/ruleset.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utils.h
+arm-riscos-aof/ruleset.o arm-riscos-aof-small/ruleset.o arm-ncos-aof/ruleset.o i486-linux-gnu-debug/ruleset.o i486-linux-gnu-gtk/ruleset.o : css/ruleset.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utils.h
arm-riscos-aof/scanner.o arm-riscos-aof-small/scanner.o arm-ncos-aof/scanner.o i486-linux-gnu-debug/scanner.o i486-linux-gnu-gtk/scanner.o : css/scanner.c css/css.h css/css_enum.h css/parser.h
arm-riscos-aof/debug_bitmap.o arm-riscos-aof-small/debug_bitmap.o arm-ncos-aof/debug_bitmap.o i486-linux-gnu-debug/debug_bitmap.o i486-linux-gnu-gtk/debug_bitmap.o : debug/debug_bitmap.c image/bitmap.h
arm-riscos-aof/filetyped.o arm-riscos-aof-small/filetyped.o arm-ncos-aof/filetyped.o i486-linux-gnu-debug/filetyped.o i486-linux-gnu-gtk/filetyped.o : debug/filetyped.c content/fetch.h utils/config.h utils/log.h utils/utils.h
arm-riscos-aof/fontd.o arm-riscos-aof-small/fontd.o arm-ncos-aof/fontd.o i486-linux-gnu-debug/fontd.o i486-linux-gnu-gtk/fontd.o : debug/fontd.c css/css.h css/css_enum.h render/font.h
-arm-riscos-aof/netsurfd.o arm-riscos-aof-small/netsurfd.o arm-ncos-aof/netsurfd.o i486-linux-gnu-debug/netsurfd.o i486-linux-gnu-gtk/netsurfd.o : debug/netsurfd.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h desktop/textinput.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/save_complete.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/browser.o arm-riscos-aof-small/browser.o arm-ncos-aof/browser.o i486-linux-gnu-debug/browser.o i486-linux-gnu-gtk/browser.o : desktop/browser.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/options.h desktop/selection.h desktop/textinput.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/imagemap.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/netsurfd.o arm-riscos-aof-small/netsurfd.o arm-ncos-aof/netsurfd.o i486-linux-gnu-debug/netsurfd.o i486-linux-gnu-gtk/netsurfd.o : debug/netsurfd.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/cookies.h desktop/gui.h desktop/options.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/save_complete.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/browser.o arm-riscos-aof-small/browser.o arm-ncos-aof/browser.o i486-linux-gnu-debug/browser.o i486-linux-gnu-gtk/browser.o : desktop/browser.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gesture_core.h desktop/gui.h desktop/history_core.h desktop/options.h desktop/selection.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/imagemap.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/gesture_core.o arm-riscos-aof-small/gesture_core.o arm-ncos-aof/gesture_core.o i486-linux-gnu-debug/gesture_core.o i486-linux-gnu-gtk/gesture_core.o : desktop/gesture_core.c desktop/gesture_core.h utils/log.h
arm-riscos-aof/history_core.o arm-riscos-aof-small/history_core.o arm-ncos-aof/history_core.o i486-linux-gnu-debug/history_core.o i486-linux-gnu-gtk/history_core.o : desktop/history_core.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utils.h
+arm-riscos-aof/knockout.o arm-riscos-aof-small/knockout.o arm-ncos-aof/knockout.o i486-linux-gnu-debug/knockout.o i486-linux-gnu-gtk/knockout.o : desktop/knockout.c css/css.h css/css_enum.h desktop/knockout.h desktop/plotters.h image/bitmap.h utils/log.h
arm-riscos-aof/netsurf.o arm-riscos-aof-small/netsurf.o arm-ncos-aof/netsurf.o i486-linux-gnu-debug/netsurf.o i486-linux-gnu-gtk/netsurf.o : desktop/netsurf.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/buffer.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/options.o arm-riscos-aof-small/options.o arm-ncos-aof/options.o i486-linux-gnu-debug/options.o i486-linux-gnu-gtk/options.o : desktop/options.c content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/options.h desktop/tree.h riscos/options.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/options.o arm-riscos-aof-small/options.o arm-ncos-aof/options.o i486-linux-gnu-debug/options.o i486-linux-gnu-gtk/options.o : desktop/options.c content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/options.h desktop/tree.h gtk/options.h riscos/options.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/save_text.o arm-riscos-aof-small/save_text.o arm-ncos-aof/save_text.o i486-linux-gnu-debug/save_text.o i486-linux-gnu-gtk/save_text.o : desktop/save_text.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/save_text.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
arm-riscos-aof/selection.o arm-riscos-aof-small/selection.o arm-ncos-aof/selection.o i486-linux-gnu-debug/selection.o i486-linux-gnu-gtk/selection.o : desktop/selection.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/plotters.h desktop/selection.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/utf8.h utils/utils.h
arm-riscos-aof/textinput.o arm-riscos-aof-small/textinput.o arm-ncos-aof/textinput.o i486-linux-gnu-debug/textinput.o i486-linux-gnu-gtk/textinput.o : desktop/textinput.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/selection.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/talloc.h utils/utf8.h utils/utils.h
-arm-riscos-aof/tree.o arm-riscos-aof-small/tree.o arm-ncos-aof/tree.o i486-linux-gnu-debug/tree.o i486-linux-gnu-gtk/tree.o : desktop/tree.c content/content_type.h content/urldb.h desktop/options.h desktop/tree.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/tree.o arm-riscos-aof-small/tree.o arm-ncos-aof/tree.o i486-linux-gnu-debug/tree.o i486-linux-gnu-gtk/tree.o : desktop/tree.c content/content_type.h content/urldb.h desktop/options.h desktop/tree.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/version.o arm-riscos-aof-small/version.o arm-ncos-aof/version.o i486-linux-gnu-debug/version.o i486-linux-gnu-gtk/version.o : desktop/version.c
arm-riscos-aof/font_pango.o arm-riscos-aof-small/font_pango.o arm-ncos-aof/font_pango.o i486-linux-gnu-debug/font_pango.o i486-linux-gnu-gtk/font_pango.o : gtk/font_pango.c css/css.h css/css_enum.h gtk/font_pango.h gtk/gtk_window.h render/font.h utils/log.h utils/utils.h
arm-riscos-aof/gtk_bitmap.o arm-riscos-aof-small/gtk_bitmap.o arm-ncos-aof/gtk_bitmap.o i486-linux-gnu-debug/gtk_bitmap.o i486-linux-gnu-gtk/gtk_bitmap.o : gtk/gtk_bitmap.c content/content.h content/content_type.h css/css.h css/css_enum.h gtk/gtk_window.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h
-arm-riscos-aof/gtk_gui.o arm-riscos-aof-small/gtk_gui.o arm-ncos-aof/gtk_gui.o i486-linux-gnu-debug/gtk_gui.o i486-linux-gnu-gtk/gtk_gui.o : gtk/gtk_gui.c content/content.h content/content_type.h content/fetch.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h gtk/gtk_gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utf8.h utils/utils.h
-arm-riscos-aof/gtk_plotters.o arm-riscos-aof-small/gtk_plotters.o arm-ncos-aof/gtk_plotters.o i486-linux-gnu-debug/gtk_plotters.o i486-linux-gnu-gtk/gtk_plotters.o : gtk/gtk_plotters.c css/css.h css/css_enum.h desktop/plotters.h gtk/font_pango.h gtk/gtk_plotters.h gtk/gtk_window.h render/font.h utils/log.h
+arm-riscos-aof/gtk_completion.o arm-riscos-aof-small/gtk_completion.o arm-ncos-aof/gtk_completion.o i486-linux-gnu-debug/gtk_completion.o i486-linux-gnu-gtk/gtk_completion.o : gtk/gtk_completion.c content/content_type.h content/urldb.h desktop/options.h gtk/gtk_completion.h utils/config.h utils/log.h
+arm-riscos-aof/gtk_gui.o arm-riscos-aof-small/gtk_gui.o arm-ncos-aof/gtk_gui.o i486-linux-gnu-debug/gtk_gui.o i486-linux-gnu-gtk/gtk_gui.o : gtk/gtk_gui.c content/content.h content/content_type.h content/fetch.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/cookies.h desktop/gui.h desktop/netsurf.h desktop/options.h gtk/gtk_completion.h gtk/gtk_gui.h gtk/gtk_options.h gtk/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/gtk_login.o arm-riscos-aof-small/gtk_login.o arm-ncos-aof/gtk_login.o i486-linux-gnu-debug/gtk_login.o i486-linux-gnu-gtk/gtk_login.o : gtk/gtk_login.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gui.h gtk/gtk_gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/gtk_options.o arm-riscos-aof-small/gtk_options.o arm-ncos-aof/gtk_options.o i486-linux-gnu-debug/gtk_options.o i486-linux-gnu-gtk/gtk_options.o : gtk/gtk_options.c desktop/options.h gtk/gtk_gui.h gtk/gtk_options.h gtk/options.h utils/log.h
+arm-riscos-aof/gtk_plotters.o arm-riscos-aof-small/gtk_plotters.o arm-ncos-aof/gtk_plotters.o i486-linux-gnu-debug/gtk_plotters.o i486-linux-gnu-gtk/gtk_plotters.o : gtk/gtk_plotters.c css/css.h css/css_enum.h desktop/options.h desktop/plotters.h gtk/font_pango.h gtk/gtk_plotters.h gtk/gtk_window.h gtk/options.h render/font.h utils/log.h
arm-riscos-aof/gtk_schedule.o arm-riscos-aof-small/gtk_schedule.o arm-ncos-aof/gtk_schedule.o i486-linux-gnu-debug/gtk_schedule.o i486-linux-gnu-gtk/gtk_schedule.o : gtk/gtk_schedule.c desktop/browser.h
arm-riscos-aof/gtk_thumbnail.o arm-riscos-aof-small/gtk_thumbnail.o arm-ncos-aof/gtk_thumbnail.o i486-linux-gnu-debug/gtk_thumbnail.o i486-linux-gnu-gtk/gtk_thumbnail.o : gtk/gtk_thumbnail.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/plotters.h gtk/gtk_plotters.h gtk/gtk_window.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h
arm-riscos-aof/gtk_treeview.o arm-riscos-aof-small/gtk_treeview.o arm-ncos-aof/gtk_treeview.o i486-linux-gnu-debug/gtk_treeview.o i486-linux-gnu-gtk/gtk_treeview.o : gtk/gtk_treeview.c desktop/tree.h
-arm-riscos-aof/gtk_window.o arm-riscos-aof-small/gtk_window.o arm-ncos-aof/gtk_window.o i486-linux-gnu-debug/gtk_window.o i486-linux-gnu-gtk/gtk_window.o : gtk/gtk_window.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/textinput.h desktop/tree.h gtk/gtk_gui.h gtk/gtk_plotters.h gtk/gtk_window.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/gtk_window.o arm-riscos-aof-small/gtk_window.o arm-ncos-aof/gtk_window.o i486-linux-gnu-debug/gtk_window.o i486-linux-gnu-gtk/gtk_window.o : gtk/gtk_window.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gesture_core.h desktop/gui.h desktop/history_core.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/textinput.h gtk/gtk_completion.h gtk/gtk_gui.h gtk/gtk_options.h gtk/gtk_plotters.h gtk/gtk_window.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/bmp.o arm-riscos-aof-small/bmp.o arm-ncos-aof/bmp.o i486-linux-gnu-debug/bmp.o i486-linux-gnu-gtk/bmp.o : image/bmp.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/bmpread.o arm-riscos-aof-small/bmpread.o arm-ncos-aof/bmpread.o i486-linux-gnu-debug/bmpread.o i486-linux-gnu-gtk/bmpread.o : image/bmpread.c image/bitmap.h image/bmpread.h utils/log.h
-arm-riscos-aof/gif.o arm-riscos-aof-small/gif.o arm-ncos-aof/gif.o i486-linux-gnu-debug/gif.o i486-linux-gnu-gtk/gif.o : image/gif.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/gif.o arm-riscos-aof-small/gif.o arm-ncos-aof/gif.o i486-linux-gnu-debug/gif.o i486-linux-gnu-gtk/gif.o : image/gif.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/gifread.o arm-riscos-aof-small/gifread.o arm-ncos-aof/gifread.o i486-linux-gnu-debug/gifread.o i486-linux-gnu-gtk/gifread.o : image/gifread.c image/bitmap.h utils/log.h
arm-riscos-aof/ico.o arm-riscos-aof-small/ico.o arm-ncos-aof/ico.o i486-linux-gnu-debug/ico.o i486-linux-gnu-gtk/ico.o : image/ico.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/jpeg.o arm-riscos-aof-small/jpeg.o arm-ncos-aof/jpeg.o i486-linux-gnu-debug/jpeg.o i486-linux-gnu-gtk/jpeg.o : image/jpeg.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/mng.o arm-riscos-aof-small/mng.o arm-ncos-aof/mng.o i486-linux-gnu-debug/mng.o i486-linux-gnu-gtk/mng.o : image/mng.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/box.o arm-riscos-aof-small/box.o arm-ncos-aof/box.o i486-linux-gnu-debug/box.o i486-linux-gnu-gtk/box.o : render/box.c content/content.h content/content_type.h css/css.h css/css_enum.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/talloc.h
-arm-riscos-aof/box_construct.o arm-riscos-aof-small/box_construct.o arm-ncos-aof/box_construct.o i486-linux-gnu-debug/box_construct.o i486-linux-gnu-gtk/box_construct.o : render/box_construct.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
+arm-riscos-aof/mng.o arm-riscos-aof-small/mng.o arm-ncos-aof/mng.o i486-linux-gnu-debug/mng.o i486-linux-gnu-gtk/mng.o : image/mng.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/box.o arm-riscos-aof-small/box.o arm-ncos-aof/box.o i486-linux-gnu-debug/box.o i486-linux-gnu-gtk/box.o : render/box.c content/content.h content/content_type.h css/css.h css/css_enum.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/talloc.h
+arm-riscos-aof/box_construct.o arm-riscos-aof-small/box_construct.o arm-ncos-aof/box_construct.o i486-linux-gnu-debug/box_construct.o i486-linux-gnu-gtk/box_construct.o : render/box_construct.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
arm-riscos-aof/box_normalise.o arm-riscos-aof-small/box_normalise.o arm-ncos-aof/box_normalise.o i486-linux-gnu-debug/box_normalise.o i486-linux-gnu-gtk/box_normalise.o : render/box_normalise.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/table.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h
+arm-riscos-aof/directory.o arm-riscos-aof-small/directory.o arm-ncos-aof/directory.o i486-linux-gnu-debug/directory.o i486-linux-gnu-gtk/directory.o : render/directory.c content/content.h content/content_type.h css/css.h css/css_enum.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/directory.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/messages.h utils/url.h
arm-riscos-aof/form.o arm-riscos-aof-small/form.o arm-ncos-aof/form.o i486-linux-gnu-debug/form.o i486-linux-gnu-gtk/form.o : render/form.c render/box.h render/form.h utils/config.h utils/log.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/html.o arm-riscos-aof-small/html.o arm-ncos-aof/html.o i486-linux-gnu-debug/html.o i486-linux-gnu-gtk/html.o : render/html.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/imagemap.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
-arm-riscos-aof/html_redraw.o arm-riscos-aof-small/html_redraw.o arm-ncos-aof/html_redraw.o i486-linux-gnu-debug/html_redraw.o i486-linux-gnu-gtk/html_redraw.o : render/html_redraw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/plotters.h desktop/selection.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/html.o arm-riscos-aof-small/html.o arm-ncos-aof/html.o i486-linux-gnu-debug/html.o i486-linux-gnu-gtk/html.o : render/html.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/imagemap.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utils.h
+arm-riscos-aof/html_redraw.o arm-riscos-aof-small/html_redraw.o arm-ncos-aof/html_redraw.o i486-linux-gnu-debug/html_redraw.o i486-linux-gnu-gtk/html_redraw.o : render/html_redraw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/knockout.h desktop/options.h desktop/plotters.h desktop/selection.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/form.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/imagemap.o arm-riscos-aof-small/imagemap.o arm-ncos-aof/imagemap.o i486-linux-gnu-debug/imagemap.o i486-linux-gnu-gtk/imagemap.o : render/imagemap.c content/content.h content/content_type.h css/css.h css/css_enum.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/imagemap.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/layout.o arm-riscos-aof-small/layout.o arm-ncos-aof/layout.o i486-linux-gnu-debug/layout.o i486-linux-gnu-gtk/layout.o : render/layout.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/talloc.h utils/utils.h
+arm-riscos-aof/layout.o arm-riscos-aof-small/layout.o arm-ncos-aof/layout.o i486-linux-gnu-debug/layout.o i486-linux-gnu-gtk/layout.o : render/layout.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/talloc.h utils/utils.h
arm-riscos-aof/list.o arm-riscos-aof-small/list.o arm-ncos-aof/list.o i486-linux-gnu-debug/list.o i486-linux-gnu-gtk/list.o : render/list.c css/css.h css/css_enum.h render/list.h utils/log.h
arm-riscos-aof/table.o arm-riscos-aof-small/table.o arm-ncos-aof/table.o i486-linux-gnu-debug/table.o i486-linux-gnu-gtk/table.o : render/table.c css/css.h css/css_enum.h render/box.h render/table.h utils/log.h utils/talloc.h
arm-riscos-aof/textplain.o arm-riscos-aof-small/textplain.o arm-ncos-aof/textplain.o i486-linux-gnu-debug/textplain.o i486-linux-gnu-gtk/textplain.o : render/textplain.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/plotters.h desktop/selection.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/utf8.h utils/utils.h
-arm-riscos-aof/401login.o arm-riscos-aof-small/401login.o arm-ncos-aof/401login.o i486-linux-gnu-debug/401login.o i486-linux-gnu-gtk/401login.o : riscos/401login.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/artworks.o arm-riscos-aof-small/artworks.o arm-ncos-aof/artworks.o i486-linux-gnu-debug/artworks.o i486-linux-gnu-gtk/artworks.o : riscos/artworks.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/401login.o arm-riscos-aof-small/401login.o arm-ncos-aof/401login.o i486-linux-gnu-debug/401login.o i486-linux-gnu-gtk/401login.o : riscos/401login.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/401login.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/artworks.o arm-riscos-aof-small/artworks.o arm-ncos-aof/artworks.o i486-linux-gnu-debug/artworks.o i486-linux-gnu-gtk/artworks.o : riscos/artworks.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/assert.o arm-riscos-aof-small/assert.o arm-ncos-aof/assert.o i486-linux-gnu-debug/assert.o i486-linux-gnu-gtk/assert.o : riscos/assert.c
-arm-riscos-aof/bitmap.o arm-riscos-aof-small/bitmap.o arm-ncos-aof/bitmap.o i486-linux-gnu-debug/bitmap.o i486-linux-gnu-gtk/bitmap.o : riscos/bitmap.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/image.h riscos/options.h riscos/palettes.h riscos/plugin.h riscos/sprite.h riscos/tinct.h utils/config.h utils/filename.h utils/log.h utils/utils.h
-arm-riscos-aof/buffer.o arm-riscos-aof-small/buffer.o arm-ncos-aof/buffer.o i486-linux-gnu-debug/buffer.o i486-linux-gnu-gtk/buffer.o : riscos/buffer.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/buffer.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/tinct.h riscos/wimp.h utils/config.h utils/log.h
-arm-riscos-aof/configure.o arm-riscos-aof-small/configure.o arm-ncos-aof/configure.o i486-linux-gnu-debug/configure.o i486-linux-gnu-gtk/configure.o : riscos/configure.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/configure.h riscos/configure/configure.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/debugwin.o arm-riscos-aof-small/debugwin.o arm-ncos-aof/debugwin.o i486-linux-gnu-debug/debugwin.o i486-linux-gnu-gtk/debugwin.o : riscos/debugwin.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/dialog.o arm-riscos-aof-small/dialog.o arm-ncos-aof/dialog.o i486-linux-gnu-debug/dialog.o i486-linux-gnu-gtk/dialog.o : riscos/dialog.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/configure.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/url_complete.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/download.o arm-riscos-aof-small/download.o arm-ncos-aof/download.o i486-linux-gnu-debug/download.o i486-linux-gnu-gtk/download.o : riscos/download.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/query.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/wimp.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/draw.o arm-riscos-aof-small/draw.o arm-ncos-aof/draw.o i486-linux-gnu-debug/draw.o i486-linux-gnu-gtk/draw.o : riscos/draw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/filetype.o arm-riscos-aof-small/filetype.o arm-ncos-aof/filetype.o i486-linux-gnu-debug/filetype.o i486-linux-gnu-gtk/filetype.o : riscos/filetype.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/font.o arm-riscos-aof-small/font.o arm-ncos-aof/font.o i486-linux-gnu-debug/font.o i486-linux-gnu-gtk/font.o : riscos/font.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/global_history.o arm-riscos-aof-small/global_history.o arm-ncos-aof/global_history.o i486-linux-gnu-debug/global_history.o i486-linux-gnu-gtk/global_history.o : riscos/global_history.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/bitmap.o arm-riscos-aof-small/bitmap.o arm-ncos-aof/bitmap.o i486-linux-gnu-debug/bitmap.o i486-linux-gnu-gtk/bitmap.o : riscos/bitmap.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/image.h riscos/options.h riscos/palettes.h riscos/plugin.h riscos/sprite.h riscos/tinct.h utils/config.h utils/filename.h utils/log.h utils/utils.h
+arm-riscos-aof/buffer.o arm-riscos-aof-small/buffer.o arm-ncos-aof/buffer.o i486-linux-gnu-debug/buffer.o i486-linux-gnu-gtk/buffer.o : riscos/buffer.c content/content_type.h desktop/browser.h desktop/options.h riscos/buffer.h riscos/gui.h riscos/options.h riscos/tinct.h riscos/wimp.h utils/config.h utils/log.h
+arm-riscos-aof/configure.o arm-riscos-aof-small/configure.o arm-ncos-aof/configure.o i486-linux-gnu-debug/configure.o i486-linux-gnu-gtk/configure.o : riscos/configure.c content/content_type.h desktop/browser.h riscos/configure.h riscos/configure/configure.h riscos/dialog.h riscos/gui.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/cookies.o arm-riscos-aof-small/cookies.o arm-ncos-aof/cookies.o i486-linux-gnu-debug/cookies.o i486-linux-gnu-gtk/cookies.o : riscos/cookies.c content/content_type.h content/urldb.h desktop/browser.h desktop/cookies.h desktop/options.h desktop/tree.h image/bitmap.h riscos/cookies.h riscos/dialog.h riscos/gui.h riscos/menus.h riscos/options.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/debugwin.o arm-riscos-aof-small/debugwin.o arm-ncos-aof/debugwin.o i486-linux-gnu-debug/debugwin.o i486-linux-gnu-gtk/debugwin.o : riscos/debugwin.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/dialog.o arm-riscos-aof-small/dialog.o arm-ncos-aof/dialog.o i486-linux-gnu-debug/dialog.o i486-linux-gnu-gtk/dialog.o : riscos/dialog.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/configure.h riscos/cookies.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/url_complete.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/download.o arm-riscos-aof-small/download.o arm-ncos-aof/download.o i486-linux-gnu-debug/download.o i486-linux-gnu-gtk/download.o : riscos/download.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/query.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/wimp.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/draw.o arm-riscos-aof-small/draw.o arm-ncos-aof/draw.o i486-linux-gnu-debug/draw.o i486-linux-gnu-gtk/draw.o : riscos/draw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/filetype.o arm-riscos-aof-small/filetype.o arm-ncos-aof/filetype.o i486-linux-gnu-debug/filetype.o i486-linux-gnu-gtk/filetype.o : riscos/filetype.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/font.o arm-riscos-aof-small/font.o arm-ncos-aof/font.o i486-linux-gnu-debug/font.o i486-linux-gnu-gtk/font.o : riscos/font.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h render/font.h riscos/gui.h riscos/options.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/global_history.o arm-riscos-aof-small/global_history.o arm-ncos-aof/global_history.o i486-linux-gnu-debug/global_history.o i486-linux-gnu-gtk/global_history.o : riscos/global_history.c content/content_type.h content/urldb.h desktop/browser.h desktop/options.h desktop/tree.h image/bitmap.h riscos/dialog.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
arm-riscos-aof/gui.o arm-riscos-aof-small/gui.o arm-ncos-aof/gui.o i486-linux-gnu-debug/gui.o i486-linux-gnu-gtk/gui.o : riscos/gui.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/buffer.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/help.h riscos/menus.h riscos/message.h riscos/options.h riscos/plugin.h riscos/print.h riscos/query.h riscos/save.h riscos/save_complete.h riscos/sprite.h riscos/textselection.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/uri.h riscos/url_complete.h riscos/url_protocol.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/filename.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/help.o arm-riscos-aof-small/help.o arm-ncos-aof/help.o i486-linux-gnu-debug/help.o i486-linux-gnu-gtk/help.o : riscos/help.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/help.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utf8.h utils/utils.h
-arm-riscos-aof/history.o arm-riscos-aof-small/history.o arm-ncos-aof/history.o i486-linux-gnu-debug/history.o i486-linux-gnu-gtk/history.o : riscos/history.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/url.h utils/utils.h
-arm-riscos-aof/hotlist.o arm-riscos-aof-small/hotlist.o arm-ncos-aof/hotlist.o i486-linux-gnu-debug/hotlist.o i486-linux-gnu-gtk/hotlist.o : riscos/hotlist.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/image.o arm-riscos-aof-small/image.o arm-ncos-aof/image.o i486-linux-gnu-debug/image.o i486-linux-gnu-gtk/image.o : riscos/image.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/image.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/tinct.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/menus.o arm-riscos-aof-small/menus.o arm-ncos-aof/menus.o i486-linux-gnu-debug/menus.o i486-linux-gnu-gtk/menus.o : riscos/menus.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/configure.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/help.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/help.o arm-riscos-aof-small/help.o arm-ncos-aof/help.o i486-linux-gnu-debug/help.o i486-linux-gnu-gtk/help.o : riscos/help.c content/content_type.h desktop/browser.h desktop/tree.h image/bitmap.h riscos/gui.h riscos/help.h riscos/menus.h riscos/theme.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utf8.h utils/utils.h
+arm-riscos-aof/history.o arm-riscos-aof-small/history.o arm-ncos-aof/history.o i486-linux-gnu-debug/history.o i486-linux-gnu-gtk/history.o : riscos/history.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/history_core.h desktop/options.h desktop/plotters.h riscos/dialog.h riscos/gui.h riscos/options.h riscos/theme.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/url.h utils/utils.h
+arm-riscos-aof/hotlist.o arm-riscos-aof-small/hotlist.o arm-ncos-aof/hotlist.o i486-linux-gnu-debug/hotlist.o i486-linux-gnu-gtk/hotlist.o : riscos/hotlist.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/image.o arm-riscos-aof-small/image.o arm-ncos-aof/image.o i486-linux-gnu-debug/image.o i486-linux-gnu-gtk/image.o : riscos/image.c content/content_type.h desktop/browser.h desktop/options.h riscos/gui.h riscos/image.h riscos/options.h riscos/tinct.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/menus.o arm-riscos-aof-small/menus.o arm-ncos-aof/menus.o i486-linux-gnu-debug/menus.o i486-linux-gnu-gtk/menus.o : riscos/menus.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/history_core.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/configure.h riscos/cookies.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/help.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
arm-riscos-aof/message.o arm-riscos-aof-small/message.o arm-ncos-aof/message.o i486-linux-gnu-debug/message.o i486-linux-gnu-gtk/message.o : riscos/message.c riscos/message.h utils/log.h utils/utils.h
arm-riscos-aof/palettes.o arm-riscos-aof-small/palettes.o arm-ncos-aof/palettes.o i486-linux-gnu-debug/palettes.o i486-linux-gnu-gtk/palettes.o : riscos/palettes.c riscos/palettes.h
-arm-riscos-aof/plotters.o arm-riscos-aof-small/plotters.o arm-ncos-aof/plotters.o i486-linux-gnu-debug/plotters.o i486-linux-gnu-gtk/plotters.o : riscos/plotters.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/gui.h riscos/image.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h
-arm-riscos-aof/plugin.o arm-riscos-aof-small/plugin.o arm-ncos-aof/plugin.o i486-linux-gnu-debug/plugin.o i486-linux-gnu-gtk/plugin.o : riscos/plugin.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/print.o arm-riscos-aof-small/print.o arm-ncos-aof/print.o i486-linux-gnu-debug/print.o i486-linux-gnu-gtk/print.o : riscos/print.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/print.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/query.o arm-riscos-aof-small/query.o arm-ncos-aof/query.o i486-linux-gnu-debug/query.o i486-linux-gnu-gtk/query.o : riscos/query.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/query.h riscos/sprite.h riscos/theme.h riscos/wimp.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/save.o arm-riscos-aof-small/save.o arm-ncos-aof/save.o i486-linux-gnu-debug/save.o i486-linux-gnu-gtk/save.o : riscos/save.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/save_text.h desktop/selection.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/save_complete.h riscos/save_draw.h riscos/sprite.h riscos/textselection.h riscos/theme.h riscos/thumbnail.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/save_complete.o arm-riscos-aof-small/save_complete.o arm-ncos-aof/save_complete.o i486-linux-gnu-debug/save_complete.o i486-linux-gnu-gtk/save_complete.o : riscos/save_complete.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/save_complete.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utils.h
-arm-riscos-aof/save_draw.o arm-riscos-aof-small/save_draw.o arm-ncos-aof/save_draw.o i486-linux-gnu-debug/save_draw.o i486-linux-gnu-gtk/save_draw.o : riscos/save_draw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/save_draw.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/schedule.o arm-riscos-aof-small/schedule.o arm-ncos-aof/schedule.o i486-linux-gnu-debug/schedule.o i486-linux-gnu-gtk/schedule.o : riscos/schedule.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h
-arm-riscos-aof/search.o arm-riscos-aof-small/search.o arm-ncos-aof/search.o i486-linux-gnu-debug/search.o i486-linux-gnu-gtk/search.o : riscos/search.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/selection.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/sprite.o arm-riscos-aof-small/sprite.o arm-ncos-aof/sprite.o i486-linux-gnu-debug/sprite.o i486-linux-gnu-gtk/sprite.o : riscos/sprite.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/image.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
-arm-riscos-aof/sslcert.o arm-riscos-aof-small/sslcert.o arm-ncos-aof/sslcert.o i486-linux-gnu-debug/sslcert.o i486-linux-gnu-gtk/sslcert.o : riscos/sslcert.c content/content.h content/content_type.h content/fetch.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/textselection.o arm-riscos-aof-small/textselection.o arm-ncos-aof/textselection.o i486-linux-gnu-debug/textselection.o i486-linux-gnu-gtk/textselection.o : riscos/textselection.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/selection.h desktop/textinput.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/message.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/textselection.h utils/config.h utils/log.h utils/utf8.h utils/utils.h
-arm-riscos-aof/theme.o arm-riscos-aof-small/theme.o arm-ncos-aof/theme.o i486-linux-gnu-debug/theme.o i486-linux-gnu-gtk/theme.o : riscos/theme.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/theme_install.o arm-riscos-aof-small/theme_install.o arm-ncos-aof/theme_install.o i486-linux-gnu-debug/theme_install.o i486-linux-gnu-gtk/theme_install.o : riscos/theme_install.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
-arm-riscos-aof/thumbnail.o arm-riscos-aof-small/thumbnail.o arm-ncos-aof/thumbnail.o i486-linux-gnu-debug/thumbnail.o i486-linux-gnu-gtk/thumbnail.o : riscos/thumbnail.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/thumbnail.h riscos/tinct.h utils/config.h utils/log.h
-arm-riscos-aof/treeview.o arm-riscos-aof-small/treeview.o arm-ncos-aof/treeview.o i486-linux-gnu-debug/treeview.o i486-linux-gnu-gtk/treeview.o : riscos/treeview.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/image.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/plotters.o arm-riscos-aof-small/plotters.o arm-ncos-aof/plotters.o i486-linux-gnu-debug/plotters.o i486-linux-gnu-gtk/plotters.o : riscos/plotters.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/plotters.h image/bitmap.h render/font.h riscos/bitmap.h riscos/gui.h riscos/image.h utils/config.h utils/log.h
+arm-riscos-aof/plugin.o arm-riscos-aof-small/plugin.o arm-ncos-aof/plugin.o i486-linux-gnu-debug/plugin.o i486-linux-gnu-gtk/plugin.o : riscos/plugin.c content/content.h content/content_type.h content/fetch.h content/fetchcache.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/print.o arm-riscos-aof-small/print.o arm-ncos-aof/print.o i486-linux-gnu-debug/print.o i486-linux-gnu-gtk/print.o : riscos/print.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/font.h render/html.h render/layout.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/print.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/query.o arm-riscos-aof-small/query.o arm-ncos-aof/query.o i486-linux-gnu-debug/query.o i486-linux-gnu-gtk/query.o : riscos/query.c content/content_type.h desktop/browser.h riscos/dialog.h riscos/gui.h riscos/query.h riscos/theme.h riscos/wimp.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/save.o arm-riscos-aof-small/save.o arm-ncos-aof/save.o i486-linux-gnu-debug/save.o i486-linux-gnu-gtk/save.o : riscos/save.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/save_text.h desktop/selection.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/save_complete.h riscos/save_draw.h riscos/sprite.h riscos/textselection.h riscos/theme.h riscos/thumbnail.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/save_complete.o arm-riscos-aof-small/save_complete.o arm-ncos-aof/save_complete.o i486-linux-gnu-debug/save_complete.o i486-linux-gnu-gtk/save_complete.o : riscos/save_complete.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/save_complete.h riscos/sprite.h utils/config.h utils/log.h utils/url.h utils/utils.h
+arm-riscos-aof/save_draw.o arm-riscos-aof-small/save_draw.o arm-ncos-aof/save_draw.o i486-linux-gnu-debug/save_draw.o i486-linux-gnu-gtk/save_draw.o : riscos/save_draw.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/save_draw.h riscos/sprite.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/schedule.o arm-riscos-aof-small/schedule.o arm-ncos-aof/schedule.o i486-linux-gnu-debug/schedule.o i486-linux-gnu-gtk/schedule.o : riscos/schedule.c content/content_type.h desktop/browser.h riscos/gui.h utils/config.h utils/log.h
+arm-riscos-aof/search.o arm-riscos-aof-small/search.o arm-ncos-aof/search.o i486-linux-gnu-debug/search.o i486-linux-gnu-gtk/search.o : riscos/search.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/selection.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/sprite.o arm-riscos-aof-small/sprite.o arm-ncos-aof/sprite.o i486-linux-gnu-debug/sprite.o i486-linux-gnu-gtk/sprite.o : riscos/sprite.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/image.h riscos/plugin.h riscos/sprite.h utils/config.h utils/log.h utils/messages.h utils/utils.h
+arm-riscos-aof/sslcert.o arm-riscos-aof-small/sslcert.o arm-ncos-aof/sslcert.o i486-linux-gnu-debug/sslcert.o i486-linux-gnu-gtk/sslcert.o : riscos/sslcert.c content/content.h content/content_type.h content/fetch.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/textarea.h riscos/theme.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/textarea.o arm-riscos-aof-small/textarea.o arm-ncos-aof/textarea.o i486-linux-gnu-debug/textarea.o i486-linux-gnu-gtk/textarea.o : riscos/textarea.c content/content_type.h desktop/browser.h riscos/gui.h riscos/textarea.h riscos/ucstables.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utf8.h
+arm-riscos-aof/textselection.o arm-riscos-aof-small/textselection.o arm-ncos-aof/textselection.o i486-linux-gnu-debug/textselection.o i486-linux-gnu-gtk/textselection.o : riscos/textselection.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/selection.h desktop/textinput.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/message.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/textselection.h utils/config.h utils/log.h utils/utf8.h utils/utils.h
+arm-riscos-aof/theme.o arm-riscos-aof-small/theme.o arm-ncos-aof/theme.o i486-linux-gnu-debug/theme.o i486-linux-gnu-gtk/theme.o : riscos/theme.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/theme_install.o arm-riscos-aof-small/theme_install.o arm-ncos-aof/theme_install.o i486-linux-gnu-debug/theme_install.o i486-linux-gnu-gtk/theme_install.o : riscos/theme_install.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/url.h utils/utils.h
+arm-riscos-aof/thumbnail.o arm-riscos-aof-small/thumbnail.o arm-ncos-aof/thumbnail.o i486-linux-gnu-debug/thumbnail.o i486-linux-gnu-gtk/thumbnail.o : riscos/thumbnail.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h desktop/plotters.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/font.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/draw.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/thumbnail.h riscos/tinct.h utils/config.h utils/log.h
+arm-riscos-aof/treeview.o arm-riscos-aof-small/treeview.o arm-ncos-aof/treeview.o i486-linux-gnu-debug/treeview.o i486-linux-gnu-gtk/treeview.o : riscos/treeview.c content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/plotters.h desktop/tree.h image/bitmap.h riscos/bitmap.h riscos/dialog.h riscos/gui.h riscos/image.h riscos/menus.h riscos/textarea.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/ucstables.o arm-riscos-aof-small/ucstables.o arm-ncos-aof/ucstables.o i486-linux-gnu-debug/ucstables.o i486-linux-gnu-gtk/ucstables.o : riscos/ucstables.c riscos/ucstables.h utils/log.h utils/utf8.h utils/utils.h
-arm-riscos-aof/uri.o arm-riscos-aof-small/uri.o arm-ncos-aof/uri.o i486-linux-gnu-debug/uri.o i486-linux-gnu-gtk/uri.o : riscos/uri.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/url_protocol.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/url_complete.o arm-riscos-aof-small/url_complete.o arm-ncos-aof/url_complete.o i486-linux-gnu-debug/url_complete.o i486-linux-gnu-gtk/url_complete.o : riscos/url_complete.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/tinct.h riscos/url_complete.h riscos/wimp.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/url_protocol.o arm-riscos-aof-small/url_protocol.o arm-ncos-aof/url_protocol.o i486-linux-gnu-debug/url_protocol.o i486-linux-gnu-gtk/url_protocol.o : riscos/url_protocol.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/uri.h riscos/url_protocol.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/wimp.o arm-riscos-aof-small/wimp.o arm-ncos-aof/wimp.o i486-linux-gnu-debug/wimp.o i486-linux-gnu-gtk/wimp.o : riscos/wimp.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h utils/config.h utils/log.h utils/utf8.h utils/utils.h
-arm-riscos-aof/wimp_event.o arm-riscos-aof-small/wimp_event.o arm-ncos-aof/wimp_event.o i486-linux-gnu-debug/wimp_event.o i486-linux-gnu-gtk/wimp_event.o : riscos/wimp_event.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
-arm-riscos-aof/window.o arm-riscos-aof-small/window.o arm-ncos-aof/window.o i486-linux-gnu-debug/window.o i486-linux-gnu-gtk/window.o : riscos/window.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/netsurf.h desktop/options.h desktop/plotters.h desktop/textinput.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/buffer.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/thumbnail.h riscos/tinct.h riscos/ucstables.h riscos/url_complete.h riscos/wimp.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/filename.o arm-riscos-aof-small/filename.o arm-ncos-aof/filename.o i486-linux-gnu-debug/filename.o i486-linux-gnu-gtk/filename.o : utils/filename.c utils/filename.h utils/log.h
+arm-riscos-aof/uri.o arm-riscos-aof-small/uri.o arm-ncos-aof/uri.o i486-linux-gnu-debug/uri.o i486-linux-gnu-gtk/uri.o : riscos/uri.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/url_protocol.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/url_complete.o arm-riscos-aof-small/url_complete.o arm-ncos-aof/url_complete.o i486-linux-gnu-debug/url_complete.o i486-linux-gnu-gtk/url_complete.o : riscos/url_complete.c content/content_type.h content/urldb.h desktop/browser.h desktop/options.h riscos/global_history.h riscos/gui.h riscos/options.h riscos/theme.h riscos/tinct.h riscos/url_complete.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/url_protocol.o arm-riscos-aof-small/url_protocol.o arm-ncos-aof/url_protocol.o i486-linux-gnu-debug/url_protocol.o i486-linux-gnu-gtk/url_protocol.o : riscos/url_protocol.c content/content.h content/content_type.h content/fetch.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/uri.h riscos/url_protocol.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/wimp.o arm-riscos-aof-small/wimp.o arm-ncos-aof/wimp.o i486-linux-gnu-debug/wimp.o i486-linux-gnu-gtk/wimp.o : riscos/wimp.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/wimp.h utils/config.h utils/log.h utils/utf8.h utils/utils.h
+arm-riscos-aof/wimp_event.o arm-riscos-aof-small/wimp_event.o arm-ncos-aof/wimp_event.o i486-linux-gnu-debug/wimp_event.o i486-linux-gnu-gtk/wimp_event.o : riscos/wimp_event.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/html.h render/textplain.h riscos/artworks.h riscos/dialog.h riscos/draw.h riscos/gui.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/theme.h riscos/ucstables.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/utils.h
+arm-riscos-aof/window.o arm-riscos-aof-small/window.o arm-ncos-aof/window.o i486-linux-gnu-debug/window.o i486-linux-gnu-gtk/window.o : riscos/window.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/gui.h desktop/knockout.h desktop/options.h desktop/plotters.h desktop/textinput.h desktop/tree.h image/bitmap.h image/bmp.h image/bmpread.h image/gif.h image/gifread.h image/ico.h image/jpeg.h image/mng.h render/box.h render/form.h render/html.h render/textplain.h riscos/artworks.h riscos/bitmap.h riscos/buffer.h riscos/dialog.h riscos/draw.h riscos/global_history.h riscos/gui.h riscos/menus.h riscos/options.h riscos/plugin.h riscos/save.h riscos/sprite.h riscos/theme.h riscos/thumbnail.h riscos/tinct.h riscos/url_complete.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/log.h utils/messages.h utils/talloc.h utils/url.h utils/utf8.h utils/utils.h
+arm-riscos-aof/filename.o arm-riscos-aof-small/filename.o arm-ncos-aof/filename.o i486-linux-gnu-debug/filename.o i486-linux-gnu-gtk/filename.o : utils/filename.c utils/filename.h utils/log.h utils/utils.h
arm-riscos-aof/memdebug.o arm-riscos-aof-small/memdebug.o arm-ncos-aof/memdebug.o i486-linux-gnu-debug/memdebug.o i486-linux-gnu-gtk/memdebug.o : utils/memdebug.c
arm-riscos-aof/messages.o arm-riscos-aof-small/messages.o arm-ncos-aof/messages.o i486-linux-gnu-debug/messages.o i486-linux-gnu-gtk/messages.o : utils/messages.c utils/log.h utils/messages.h utils/utils.h
arm-riscos-aof/talloc.o arm-riscos-aof-small/talloc.o arm-ncos-aof/talloc.o i486-linux-gnu-debug/talloc.o i486-linux-gnu-gtk/talloc.o : utils/talloc.c
Modified: trunk/netsurf/gtk/gtk_bitmap.c
URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_bitmap.c?rev=2824&r1=2823...
==============================================================================
--- trunk/netsurf/gtk/gtk_bitmap.c (original)
+++ trunk/netsurf/gtk/gtk_bitmap.c Wed Aug 9 16:06:14 2006
@@ -19,9 +19,18 @@
#include "netsurf/content/content.h"
#include "netsurf/gtk/gtk_window.h"
#include "netsurf/image/bitmap.h"
-
-
-struct bitmap;
+#include "netsurf/utils/log.h"
+
+
+struct bitmap {
+ GdkPixbuf *primary;
+ GdkPixbuf *pretile_x;
+ GdkPixbuf *pretile_y;
+ GdkPixbuf *pretile_xy;
+};
+
+#define MIN_PRETILE_WIDTH 256
+#define MIN_PRETILE_HEIGHT 256
/**
@@ -35,9 +44,11 @@
struct bitmap *bitmap_create(int width, int height, unsigned int state)
{
- GdkPixbuf *pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8,
- width, height);
- return (struct bitmap *) pixbuf;
+ struct bitmap *bmp = malloc(sizeof(struct bitmap));
+ bmp->primary = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8,
+ width, height);
+ bmp->pretile_x = bmp->pretile_y = bmp->pretile_xy = NULL;
+ return bmp;
}
@@ -94,7 +105,7 @@
char *bitmap_get_buffer(struct bitmap *bitmap)
{
assert(bitmap);
- return (char *)gdk_pixbuf_get_pixels((GdkPixbuf *) bitmap);
+ return (char *)gdk_pixbuf_get_pixels(bitmap->primary);
}
@@ -108,9 +119,19 @@
size_t bitmap_get_rowstride(struct bitmap *bitmap)
{
assert(bitmap);
- return gdk_pixbuf_get_rowstride((GdkPixbuf *) bitmap);
-}
-
+ return gdk_pixbuf_get_rowstride(bitmap->primary);
+}
+
+
+static void
+gtk_bitmap_free_pretiles(struct bitmap *bitmap)
+{
+#define FREE_TILE(XY) if (bitmap->pretile_##XY) g_object_unref(bitmap->pretile_##XY); bitmap->pretile_##XY = NULL
+ FREE_TILE(x);
+ FREE_TILE(y);
+ FREE_TILE(xy);
+#undef FREE_TILE
+}
/**
* Free a bitmap.
@@ -121,7 +142,9 @@
void bitmap_destroy(struct bitmap *bitmap)
{
assert(bitmap);
- g_object_unref((GdkPixbuf *) bitmap);
+ gtk_bitmap_free_pretiles(bitmap);
+ g_object_unref(bitmap->primary);
+ free(bitmap);
}
@@ -145,6 +168,7 @@
* \param bitmap a bitmap, as returned by bitmap_create()
*/
void bitmap_modified(struct bitmap *bitmap) {
+ gtk_bitmap_free_pretiles(bitmap);
}
@@ -159,3 +183,104 @@
void bitmap_set_suspendable(struct bitmap *bitmap, void *private_word,
void (*invalidate)(struct bitmap *bitmap, void *private_word)) {
}
+
+static GdkPixbuf *
+gtk_bitmap_generate_pretile(GdkPixbuf *primary, int repeat_x, int repeat_y)
+{
+ int width = gdk_pixbuf_get_width(primary);
+ int height = gdk_pixbuf_get_height(primary);
+ size_t primary_stride = gdk_pixbuf_get_rowstride(primary);
+ GdkPixbuf *result = gdk_pixbuf_new(GDK_COLORSPACE_RGB, true, 8,
+ width * repeat_x, height * repeat_y);
+ char *target_buffer = (char *)gdk_pixbuf_get_pixels(result);
+ size_t target_stride = gdk_pixbuf_get_rowstride(result);
+ int x,y,row;
+ /* This algorithm won't work if the strides are not multiples */
+ assert(target_stride == (primary_stride * repeat_x));
+
+ if (repeat_x == 1 && repeat_y == 1) {
+ g_object_ref(primary);
+ g_object_unref(result);
+ return primary;
+ }
+
+ for (y = 0; y < repeat_y; ++y) {
+ char *primary_buffer = (char *)gdk_pixbuf_get_pixels(primary);
+ for (row = 0; row < height; ++row) {
+ for (x = 0; x < repeat_x; ++x) {
+ memcpy(target_buffer,
+ primary_buffer, primary_stride);
+ target_buffer += primary_stride;
+ }
+ primary_buffer += primary_stride;
+ }
+ }
+ return result;
+}
+
+/**
+ * The primary image associated with this bitmap object.
+ *
+ * \param bitmap a bitmap, as returned by bitmap_create()
+ */
+GdkPixbuf *
+gtk_bitmap_get_primary(struct bitmap* bitmap)
+{
+ return bitmap->primary;
+}
+
+/**
+ * The X-pretiled image associated with this bitmap object.
+ *
+ * \param bitmap a bitmap, as returned by bitmap_create()
+ */
+GdkPixbuf *
+gtk_bitmap_get_pretile_x(struct bitmap* bitmap)
+{
+ if (!bitmap->pretile_x) {
+ int width = gdk_pixbuf_get_width(bitmap->primary);
+ int height = gdk_pixbuf_get_height(bitmap->primary);
+ int xmult = (MIN_PRETILE_WIDTH + width - 1)/width;
+ LOG(("Pretiling %p for X*%d", bitmap, xmult));
+ bitmap->pretile_x = gtk_bitmap_generate_pretile(bitmap->primary, xmult, 1);
+ }
+ return bitmap->pretile_x;
+
+}
+
+/**
+ * The Y-pretiled image associated with this bitmap object.
+ *
+ * \param bitmap a bitmap, as returned by bitmap_create()
+ */
+GdkPixbuf *
+gtk_bitmap_get_pretile_y(struct bitmap* bitmap)
+{
+ if (!bitmap->pretile_y) {
+ int width = gdk_pixbuf_get_width(bitmap->primary);
+ int height = gdk_pixbuf_get_height(bitmap->primary);
+ int ymult = (MIN_PRETILE_HEIGHT + height - 1)/height;
+ LOG(("Pretiling %p for Y*%d", bitmap, ymult));
+ bitmap->pretile_y = gtk_bitmap_generate_pretile(bitmap->primary, 1, ymult);
+ }
+ return bitmap->pretile_y;
+}
+
+/**
+ * The XY-pretiled image associated with this bitmap object.
+ *
+ * \param bitmap a bitmap, as returned by bitmap_create()
+ */
+GdkPixbuf *
+gtk_bitmap_get_pretile_xy(struct bitmap* bitmap)
+{
+ if (!bitmap->pretile_xy) {
+ int width = gdk_pixbuf_get_width(bitmap->primary);
+ int height = gdk_pixbuf_get_height(bitmap->primary);
+ int xmult = (MIN_PRETILE_WIDTH + width - 1)/width;
+ int ymult = (MIN_PRETILE_HEIGHT + height - 1)/height;
+ LOG(("Pretiling %p for X*%d Y*%d", bitmap, xmult, ymult));
+ bitmap->pretile_xy = gtk_bitmap_generate_pretile(bitmap->primary, xmult, ymult);
+ }
+ return bitmap->pretile_xy;
+}
Modified: trunk/netsurf/gtk/gtk_plotters.c
URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_plotters.c?rev=2824&r1=28...
==============================================================================
--- trunk/netsurf/gtk/gtk_plotters.c (original)
+++ trunk/netsurf/gtk/gtk_plotters.c Wed Aug 9 16:06:14 2006
@@ -26,6 +26,7 @@
#include "netsurf/utils/log.h"
#include "netsurf/desktop/options.h"
#include "netsurf/gtk/options.h"
+#include "netsurf/gtk/gtk_bitmap.h"
static bool nsgtk_plot_clg(colour c);
static bool nsgtk_plot_rectangle(int x0, int y0, int width, int height,
@@ -256,13 +257,12 @@
return true;
}
-bool nsgtk_plot_bitmap(int x, int y, int width, int height,
- struct bitmap *bitmap, colour bg)
+static bool nsgtk_plot_pixbuf(int x, int y, int width, int height,
+ GdkPixbuf *pixbuf, colour bg)
{
/* XXX: This currently ignores the background colour supplied.
* Does this matter?
*/
- GdkPixbuf *pixbuf = (GdkPixbuf *) bitmap;
if (width == 0 || height == 0)
return true;
@@ -298,18 +298,39 @@
return true;
}
+bool nsgtk_plot_bitmap(int x, int y, int width, int height,
+ struct bitmap *bitmap, colour bg)
+{
+ GdkPixbuf *pixbuf = gtk_bitmap_get_primary(bitmap);
+ nsgtk_plot_pixbuf(x, y, width, height, pixbuf, bg);
+}
bool nsgtk_plot_bitmap_tile(int x, int y, int width, int height,
struct bitmap *bitmap, colour bg,
bool repeat_x, bool repeat_y)
{
int doneheight = 0, donewidth = 0;
-
+ GdkPixbuf *primary;
+ GdkPixbuf *pretiled;
+
if (!(repeat_x || repeat_y)) {
/* Not repeating at all, so just pass it on */
return nsgtk_plot_bitmap(x,y,width,height,bitmap,bg);
}
-
+
+ if (repeat_x && !repeat_y)
+ pretiled = gtk_bitmap_get_pretile_x(bitmap);
+ if (repeat_x && repeat_y)
+ pretiled = gtk_bitmap_get_pretile_xy(bitmap);
+ if (!repeat_x && repeat_y)
+ pretiled = gtk_bitmap_get_pretile_y(bitmap);
+ primary = gtk_bitmap_get_primary(bitmap);
+ /* use the primary and pretiled widths to scale the w/h provided */
+ width *= gdk_pixbuf_get_width(pretiled);
+ width /= gdk_pixbuf_get_width(primary);
+ height *= gdk_pixbuf_get_height(pretiled);
+ height /= gdk_pixbuf_get_height(primary);
+
if (y > cliprect.y)
doneheight = (cliprect.y - height) + ((y - cliprect.y) % height);
else
@@ -321,8 +342,8 @@
else
donewidth = x;
while (donewidth < (cliprect.x + cliprect.width)) {
- nsgtk_plot_bitmap(donewidth, doneheight,
- width, height, bitmap, bg);
+ nsgtk_plot_pixbuf(donewidth, doneheight,
+ width, height, pretiled, bg);
donewidth += width;
if (!repeat_x) break;
}
Modified: trunk/netsurf/gtk/gtk_thumbnail.c
URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_thumbnail.c?rev=2824&r1=2...
==============================================================================
--- trunk/netsurf/gtk/gtk_thumbnail.c (original)
+++ trunk/netsurf/gtk/gtk_thumbnail.c Wed Aug 9 16:06:14 2006
@@ -24,6 +24,7 @@
#include "netsurf/utils/log.h"
#include "netsurf/gtk/gtk_window.h"
#include "netsurf/gtk/gtk_plotters.h"
+#include "netsurf/gtk/gtk_bitmap.h"
/**
* Create a thumbnail of a page.
@@ -35,7 +36,7 @@
bool thumbnail_create(struct content *content, struct bitmap *bitmap,
const char *url)
{
- GdkPixbuf *pixbuf = (GdkPixbuf *) bitmap;
+ GdkPixbuf *pixbuf = gtk_bitmap_get_primary(bitmap);
gint width = gdk_pixbuf_get_width(pixbuf);
gint height = gdk_pixbuf_get_height(pixbuf);
gint depth = (gdk_screen_get_system_visual(gdk_screen_get_default()))->depth;
16 years, 7 months
- 1
- 0