r2951 jmb - /trunk/netsurf/desktop/selection.c
by netsurf＠semichrome.net
Author: jmb
Date: Mon Sep 11 01:47:46 2006
New Revision: 2951
URL: http://svn.semichrome.net?rev=2951&view=rev
Log:
Squash warning
Modified:
trunk/netsurf/desktop/selection.c
Modified: trunk/netsurf/desktop/selection.c
URL: http://svn.semichrome.net/trunk/netsurf/desktop/selection.c?rev=2951&r1=2...
==============================================================================
--- trunk/netsurf/desktop/selection.c (original)
+++ trunk/netsurf/desktop/selection.c Mon Sep 11 01:47:46 2006
@@ -916,7 +916,8 @@
if (change > 0)
s->end_idx += change;
else
- s->end_idx += max(change, byte_offset - s->end_idx);
- }
-}
-
+ s->end_idx +=
+ max(change, (int)(byte_offset - s->end_idx));
+ }
+}
+
16 years, 8 months
- 1
- 0
r2950 jmb - /trunk/netsurf/gtk/gtk_window.c
by netsurf＠semichrome.net
Author: jmb
Date: Mon Sep 11 00:43:33 2006
New Revision: 2950
URL: http://svn.semichrome.net?rev=2950&view=rev
Log:
Fix GTK build
Modified:
trunk/netsurf/gtk/gtk_window.c
Modified: trunk/netsurf/gtk/gtk_window.c
URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_window.c?rev=2950&r1=2949...
==============================================================================
--- trunk/netsurf/gtk/gtk_window.c (original)
+++ trunk/netsurf/gtk/gtk_window.c Mon Sep 11 00:43:33 2006
@@ -561,28 +561,34 @@
MENUHANDLER(zoom_in)
{
- browser_window_set_scale(g->bw, g->scale + 0.05, true);
+ struct gui_window *gw = (struct gui_window *)g;
+
+ browser_window_set_scale(gw->bw, gw->scale + 0.05, true);
return TRUE;
}
MENUHANDLER(normal_size)
{
- browser_window_set_scale(g->bw, 1.0, true);
+ struct gui_window *gw = (struct gui_window *)g;
+
+ browser_window_set_scale(gw->bw, 1.0, true);
return TRUE;
}
MENUHANDLER(zoom_out)
{
- browser_window_set_scale(g->bw, g->scale - 0.05, true);
+ struct gui_window *gw = (struct gui_window *)g;
+
+ browser_window_set_scale(gw->bw, gw->scale - 0.05, true);
return TRUE;
}
MENUHANDLER(save_window_size)
{
- struct gui_window *gw = g;
+ struct gui_window *gw = (struct gui_window *)g;
option_toolbar_status_width = gtk_paned_get_position(gw->status_pane);
gtk_window_get_position(gw->window, &option_window_x, &option_window_y);
@@ -647,7 +653,7 @@
gboolean nsgtk_history_expose_event(GtkWidget *widget,
GdkEventExpose *event, gpointer g)
{
- struct gtk_history_window *hw = g;
+ struct gtk_history_window *hw = (struct gtk_history_window *)g;
current_widget = widget;
current_drawable = widget->window;
@@ -676,7 +682,7 @@
gboolean nsgtk_history_button_press_event(GtkWidget *widget,
GdkEventButton *event, gpointer g)
{
- struct gtk_history_window *hw = g;
+ struct gtk_history_window *hw = (struct gtk_history_window *)g;
history_click(hw->g->bw, hw->g->bw->history,
event->x, event->y, false);
16 years, 8 months
- 1
- 0
r2949 jmb - in /trunk/netsurf: depend makefile posix.mk riscos.mk
by netsurf＠semichrome.net
Author: jmb
Date: Mon Sep 11 00:43:06 2006
New Revision: 2949
URL: http://svn.semichrome.net?rev=2949&view=rev
Log:
Make compilation on RISC OS simpler - see http://netsurf.sf.net/robuild
Lose spurious echos of $OS when building on RISC OS.
Depend file is now autogenerated on all platforms, so need not be in SVN.
Removed:
trunk/netsurf/depend
Modified:
trunk/netsurf/makefile
trunk/netsurf/posix.mk
trunk/netsurf/riscos.mk
Removed: trunk/netsurf/depend
URL: http://svn.semichrome.net/trunk/netsurf/depend?rev=2948&view=auto
==============================================================================
--- trunk/netsurf/depend (original)
+++ trunk/netsurf/depend (removed)
@@ -1,110 +1,0 @@
-arm-riscos-aof/content.o arm-riscos-aof-small/content.o arm-ncos-aof/content.o arm-riscos-aof-debug/content.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/fetch.o arm-riscos-aof-gtk/fetch.o : content/fetch.c content/content.h content/content_type.h content/fetch.h content/urldb.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/form.h render/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/plugin.h riscos/sprite.h utils/config.h utils/hashtable.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 arm-riscos-aof-debug/fetchcache.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/urldb.o arm-riscos-aof-gtk/urldb.o : content/urldb.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/cookies.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/plugin.h riscos/sprite.h utils/config.h utils/filename.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 arm-riscos-aof-debug/css.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/css_enum.o arm-riscos-aof-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 arm-riscos-aof-debug/parser.o arm-riscos-aof-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 arm-riscos-aof-debug/ruleset.o arm-riscos-aof-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 arm-riscos-aof-debug/scanner.o arm-riscos-aof-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 arm-riscos-aof-debug/debug_bitmap.o arm-riscos-aof-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 arm-riscos-aof-debug/filetyped.o arm-riscos-aof-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 arm-riscos-aof-debug/fontd.o arm-riscos-aof-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 arm-riscos-aof-debug/netsurfd.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/browser.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/gesture_core.o arm-riscos-aof-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 arm-riscos-aof-debug/history_core.o arm-riscos-aof-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 arm-riscos-aof-debug/knockout.o arm-riscos-aof-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 arm-riscos-aof-debug/netsurf.o arm-riscos-aof-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 arm-riscos-aof-debug/options.o arm-riscos-aof-gtk/options.o : desktop/options.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/options.h desktop/tree.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/html.h render/textplain.h riscos/artworks.h riscos/draw.h riscos/options.h riscos/plugin.h riscos/sprite.h riscos/tinct.h utils/config.h utils/hashtable.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 arm-riscos-aof-debug/save_text.o arm-riscos-aof-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 arm-riscos-aof-debug/selection.o arm-riscos-aof-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 arm-riscos-aof-debug/textinput.o arm-riscos-aof-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 arm-riscos-aof-debug/tree.o arm-riscos-aof-gtk/tree.o : desktop/tree.c content/content.h content/content_type.h content/urldb.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/hashtable.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 arm-riscos-aof-debug/version.o arm-riscos-aof-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 arm-riscos-aof-debug/font_pango.o arm-riscos-aof-gtk/font_pango.o : gtk/font_pango.c css/css.h css/css_enum.h desktop/options.h desktop/plotters.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 arm-riscos-aof-debug/gtk_bitmap.o arm-riscos-aof-gtk/gtk_bitmap.o : gtk/gtk_bitmap.c content/content.h content/content_type.h css/css.h css/css_enum.h desktop/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/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_completion.o arm-riscos-aof-small/gtk_completion.o arm-ncos-aof/gtk_completion.o arm-riscos-aof-debug/gtk_completion.o arm-riscos-aof-gtk/gtk_completion.o : gtk/gtk_completion.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/options.h gtk/gtk_completion.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
-arm-riscos-aof/gtk_gui.o arm-riscos-aof-small/gtk_gui.o arm-ncos-aof/gtk_gui.o arm-riscos-aof-debug/gtk_gui.o arm-riscos-aof-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_history.h gtk/gtk_options.h gtk/gtk_throbber.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/hashtable.h utils/log.h utils/messages.h utils/url.h utils/utf8.h utils/utils.h
-arm-riscos-aof/gtk_history.o arm-riscos-aof-small/gtk_history.o arm-ncos-aof/gtk_history.o arm-riscos-aof-debug/gtk_history.o arm-riscos-aof-gtk/gtk_history.o : gtk/gtk_history.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h gtk/gtk_gui.h gtk/gtk_history.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
-arm-riscos-aof/gtk_login.o arm-riscos-aof-small/gtk_login.o arm-ncos-aof/gtk_login.o arm-riscos-aof-debug/gtk_login.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/gtk_options.o arm-riscos-aof-gtk/gtk_options.o : gtk/gtk_options.c css/css.h css/css_enum.h desktop/options.h desktop/plotters.h gtk/gtk_gui.h gtk/gtk_options.h gtk/gtk_window.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 arm-riscos-aof-debug/gtk_plotters.o arm-riscos-aof-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_bitmap.h gtk/gtk_plotters.h gtk/gtk_window.h gtk/options.h image/bitmap.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 arm-riscos-aof-debug/gtk_schedule.o arm-riscos-aof-gtk/gtk_schedule.o : gtk/gtk_schedule.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h render/html.h utils/config.h
-arm-riscos-aof/gtk_throbber.o arm-riscos-aof-small/gtk_throbber.o arm-ncos-aof/gtk_throbber.o arm-riscos-aof-debug/gtk_throbber.o arm-riscos-aof-gtk/gtk_throbber.o : gtk/gtk_throbber.c gtk/gtk_bitmap.h gtk/gtk_throbber.h image/bitmap.h image/gifread.h utils/log.h
-arm-riscos-aof/gtk_thumbnail.o arm-riscos-aof-small/gtk_thumbnail.o arm-ncos-aof/gtk_thumbnail.o arm-riscos-aof-debug/gtk_thumbnail.o arm-riscos-aof-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_bitmap.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 arm-riscos-aof-debug/gtk_treeview.o arm-riscos-aof-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 arm-riscos-aof-debug/gtk_window.o arm-riscos-aof-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_history.h gtk/gtk_options.h gtk/gtk_plotters.h gtk/gtk_throbber.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/hashtable.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 arm-riscos-aof-debug/bmp.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/bmpread.o arm-riscos-aof-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 arm-riscos-aof-debug/gif.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/gifread.o arm-riscos-aof-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 arm-riscos-aof-debug/ico.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/jpeg.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/mng.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/box.o arm-riscos-aof-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 arm-riscos-aof-debug/box_construct.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/box_normalise.o arm-riscos-aof-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 arm-riscos-aof-debug/directory.o arm-riscos-aof-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/hashtable.h utils/messages.h utils/url.h
-arm-riscos-aof/form.o arm-riscos-aof-small/form.o arm-ncos-aof/form.o arm-riscos-aof-debug/form.o arm-riscos-aof-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 arm-riscos-aof-debug/html.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/html_redraw.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/imagemap.o arm-riscos-aof-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 arm-riscos-aof-debug/layout.o arm-riscos-aof-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 arm-riscos-aof-debug/list.o arm-riscos-aof-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 arm-riscos-aof-debug/table.o arm-riscos-aof-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 arm-riscos-aof-debug/textplain.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/401login.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/artworks.o arm-riscos-aof-gtk/artworks.o : riscos/artworks.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/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/hashtable.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 arm-riscos-aof-debug/assert.o arm-riscos-aof-gtk/assert.o : riscos/assert.c
-arm-riscos-aof/bitmap.o arm-riscos-aof-small/bitmap.o arm-ncos-aof/bitmap.o arm-riscos-aof-debug/bitmap.o arm-riscos-aof-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 arm-riscos-aof-debug/buffer.o arm-riscos-aof-gtk/buffer.o : riscos/buffer.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h render/html.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 arm-riscos-aof-debug/configure.o arm-riscos-aof-gtk/configure.o : riscos/configure.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h render/html.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/hashtable.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 arm-riscos-aof-debug/cookies.o arm-riscos-aof-gtk/cookies.o : riscos/cookies.c content/content.h content/content_type.h content/urldb.h css/css.h css/css_enum.h desktop/browser.h desktop/cookies.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/cookies.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/hashtable.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 arm-riscos-aof-debug/debugwin.o arm-riscos-aof-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 arm-riscos-aof-debug/dialog.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/download.o arm-riscos-aof-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 riscos/wimp_event.h utils/config.h utils/hashtable.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 arm-riscos-aof-debug/draw.o arm-riscos-aof-gtk/draw.o : riscos/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/draw.h riscos/gui.h riscos/plugin.h riscos/sprite.h utils/config.h utils/hashtable.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 arm-riscos-aof-debug/filetype.o arm-riscos-aof-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 arm-riscos-aof-debug/font.o arm-riscos-aof-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 render/html.h riscos/gui.h riscos/options.h riscos/tinct.h utils/config.h utils/hashtable.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 arm-riscos-aof-debug/global_history.o arm-riscos-aof-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/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/hashtable.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 arm-riscos-aof-debug/gui.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/help.o arm-riscos-aof-gtk/help.o : riscos/help.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/tree.h image/bitmap.h render/html.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/hashtable.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 arm-riscos-aof-debug/history.o arm-riscos-aof-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 render/html.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 arm-riscos-aof-debug/hotlist.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/image.o arm-riscos-aof-gtk/image.o : riscos/image.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h desktop/options.h render/html.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 arm-riscos-aof-debug/menus.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/message.o arm-riscos-aof-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 arm-riscos-aof-debug/palettes.o arm-riscos-aof-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 arm-riscos-aof-debug/plotters.o arm-riscos-aof-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 render/html.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 arm-riscos-aof-debug/plugin.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/print.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/query.o arm-riscos-aof-gtk/query.o : riscos/query.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h render/html.h riscos/dialog.h riscos/gui.h riscos/query.h riscos/theme.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/hashtable.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 arm-riscos-aof-debug/save.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/save_complete.o arm-riscos-aof-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 arm-riscos-aof-debug/save_draw.o arm-riscos-aof-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 arm-riscos-aof-debug/schedule.o arm-riscos-aof-gtk/schedule.o : riscos/schedule.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h render/html.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 arm-riscos-aof-debug/search.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/sprite.o arm-riscos-aof-gtk/sprite.o : riscos/sprite.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/draw.h riscos/gui.h riscos/image.h riscos/plugin.h riscos/sprite.h utils/config.h utils/hashtable.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 arm-riscos-aof-debug/sslcert.o arm-riscos-aof-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 arm-riscos-aof-debug/textarea.o arm-riscos-aof-gtk/textarea.o : riscos/textarea.c content/content_type.h css/css.h css/css_enum.h desktop/browser.h render/html.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 arm-riscos-aof-debug/textselection.o arm-riscos-aof-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 arm-riscos-aof-debug/theme.o arm-riscos-aof-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 arm-riscos-aof-debug/theme_install.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/thumbnail.o arm-riscos-aof-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 arm-riscos-aof-debug/treeview.o arm-riscos-aof-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/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/dialog.h riscos/draw.h riscos/gui.h riscos/image.h riscos/menus.h riscos/plugin.h riscos/sprite.h riscos/textarea.h riscos/theme.h riscos/tinct.h riscos/treeview.h riscos/wimp.h riscos/wimp_event.h utils/config.h utils/hashtable.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 arm-riscos-aof-debug/ucstables.o arm-riscos-aof-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 arm-riscos-aof-debug/uri.o arm-riscos-aof-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 arm-riscos-aof-debug/url_complete.o arm-riscos-aof-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/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/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 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 arm-riscos-aof-debug/url_protocol.o arm-riscos-aof-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 arm-riscos-aof-debug/wimp.o arm-riscos-aof-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 arm-riscos-aof-debug/wimp_event.o arm-riscos-aof-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 arm-riscos-aof-debug/window.o arm-riscos-aof-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/hashtable.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 arm-riscos-aof-debug/filename.o arm-riscos-aof-gtk/filename.o : utils/filename.c utils/filename.h utils/log.h utils/url.h utils/utils.h
-arm-riscos-aof/hashtable.o arm-riscos-aof-small/hashtable.o arm-ncos-aof/hashtable.o arm-riscos-aof-debug/hashtable.o arm-riscos-aof-gtk/hashtable.o : utils/hashtable.c utils/hashtable.h utils/log.h
-arm-riscos-aof/memdebug.o arm-riscos-aof-small/memdebug.o arm-ncos-aof/memdebug.o arm-riscos-aof-debug/memdebug.o arm-riscos-aof-gtk/memdebug.o : utils/memdebug.c
-arm-riscos-aof/messages.o arm-riscos-aof-small/messages.o arm-ncos-aof/messages.o arm-riscos-aof-debug/messages.o arm-riscos-aof-gtk/messages.o : utils/messages.c utils/hashtable.h 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 arm-riscos-aof-debug/talloc.o arm-riscos-aof-gtk/talloc.o : utils/talloc.c
-arm-riscos-aof/url.o arm-riscos-aof-small/url.o arm-ncos-aof/url.o arm-riscos-aof-debug/url.o arm-riscos-aof-gtk/url.o : utils/url.c utils/log.h utils/url.h utils/utils.h
-arm-riscos-aof/utf8.o arm-riscos-aof-small/utf8.o arm-ncos-aof/utf8.o arm-riscos-aof-debug/utf8.o arm-riscos-aof-gtk/utf8.o : utils/utf8.c utils/log.h utils/utf8.h
-arm-riscos-aof/utils.o arm-riscos-aof-small/utils.o arm-ncos-aof/utils.o arm-riscos-aof-debug/utils.o arm-riscos-aof-gtk/utils.o : utils/utils.c utils/config.h utils/hashtable.h utils/log.h utils/messages.h utils/utf8.h utils/utils.h
Modified: trunk/netsurf/makefile
URL: http://svn.semichrome.net/trunk/netsurf/makefile?rev=2949&r1=2948&r2=2949...
==============================================================================
--- trunk/netsurf/makefile (original)
+++ trunk/netsurf/makefile Mon Sep 11 00:43:06 2006
@@ -97,6 +97,10 @@
SOURCES_GTK=$(OBJECTS_GTK:.o=.c)
OBJS_GTK=$(OBJECTS_GTK:%.o=$(OBJDIR_GTK)/%.o)
+# Default target - platform specific files may specify special-case rules for
+# various files.
+default: riscos
+
# Inclusion of platform specific files has to occur after the OBJDIR stuff as
# that is referred to in the files
@@ -132,8 +136,10 @@
# If you pass -std=<whatever> it appears to define __STRICT_ANSI__
# This causes use of functions such as vsnprintf to fail (as Cygwin's header
# files surround declarations of such things with #ifndef __STRICT_ANSI__)
+ifneq ($(OS),riscos)
ifeq ($(shell echo $$OS),Windows_NT)
CFLAGS_GTK += -U__STRICT_ANSI__
+endif
endif
AFLAGS_RISCOS = -I..,. $(PLATFORM_AFLAGS_RISCOS)
@@ -195,16 +201,6 @@
$(OBJDIR_NCOS)/%.o : %.s
@echo "==> $<"
$(ASM) -o $@ -c $(AFLAGS_NCOS) $<
-
-# special cases
-css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
- cd ..; perl netsurf/css/makeenum netsurf/css/css_enum < netsurf/css/css_enums
-css/parser.c css/parser.h: css/parser.y
- -cd css; lemon parser.y
-css/scanner.c: css/scanner.l
- cd css; re2c -s scanner.l > scanner.c
-utils/translit.c: transtab
- cd utils; perl tt2code < transtab > translit.c
# Generate dependencies.
# To disable automatic regeneration of dependencies (eg. if perl is not
@@ -218,10 +214,3 @@
@perl scandeps netsurf $(OBJDIR_RISCOS) $(OBJDIR_RISCOS_SMALL) $(OBJDIR_NCOS) $(OBJDIR_DEBUG) $(OBJDIR_GTK) -- $^ > depend
include depend
-
-# remove generated files
-clean:
- -rm $(OBJDIR_RISCOS)/* $(OBJDIR_RISCOS_SMALL)/* $(OBJDIR_NCOS)/* \
- $(OBJDIR_DEBUG)/* $(OBJDIR_GTK)/* \
- css/css_enum.c css/css_enum.h \
- css/parser.c css/parser.h css/scanner.c css/scanner.h
Modified: trunk/netsurf/posix.mk
URL: http://svn.semichrome.net/trunk/netsurf/posix.mk?rev=2949&r1=2948&r2=2949...
==============================================================================
--- trunk/netsurf/posix.mk (original)
+++ trunk/netsurf/posix.mk Mon Sep 11 00:43:06 2006
@@ -27,3 +27,20 @@
RUNIMAGE = !NetSurf/!RunImage,ff8
NCRUNIMAGE = !NCNetSurf/!RunImage,ff8
+
+# special cases - in here, cos RISC OS can't cope :(
+css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
+ cd ..; perl netsurf/css/makeenum netsurf/css/css_enum < netsurf/css/css_enums
+css/parser.c css/parser.h: css/parser.y
+ -cd css; lemon parser.y
+css/scanner.c: css/scanner.l
+ cd css; re2c -s scanner.l > scanner.c
+utils/translit.c: transtab
+ cd utils; perl tt2code < transtab > translit.c
+
+# remove generated files - again, RISC OS fails it
+clean:
+ -rm $(OBJDIR_RISCOS)/* $(OBJDIR_RISCOS_SMALL)/* $(OBJDIR_NCOS)/* \
+ $(OBJDIR_DEBUG)/* $(OBJDIR_GTK)/* \
+ css/css_enum.c css/css_enum.h \
+ css/parser.c css/parser.h css/scanner.c
Modified: trunk/netsurf/riscos.mk
URL: http://svn.semichrome.net/trunk/netsurf/riscos.mk?rev=2949&r1=2948&r2=294...
==============================================================================
--- trunk/netsurf/riscos.mk (original)
+++ trunk/netsurf/riscos.mk Mon Sep 11 00:43:06 2006
@@ -16,3 +16,34 @@
RUNIMAGE = !NetSurf/!RunImage
NCRUNIMAGE = !NCNetSurf/!RunImage
+
+# special cases
+css/css_enum.c css/css_enum.h: css/css_enums css/makeenum
+ @dir ^
+ perl netsurf/css/makeenum netsurf/css/css_enum < netsurf/css/css_enums
+ @dir netsurf
+css/parser.c css/parser.h: css/parser.y
+ @dir css
+ -lemon parser.y
+ @dir ^
+css/scanner.c: css/scanner.l
+ @dir css
+ re2c -s scanner.l > scanner.c
+ @dir ^
+utils/translit.c: transtab
+ @dir utils
+ perl tt2code < transtab > translit.c
+ @dir ^
+
+# remove generated files
+clean:
+ -wipe $(OBJDIR_RISCOS).* ~CFR~V
+ -wipe $(OBJDIR_RISCOS_SMALL).* ~CFR~V
+ -wipe $(OBJDIR_NCOS).* ~CFR~V
+ -wipe $(OBJDIR_DEBUG).* ~CFR~V
+ -wipe $(OBJDIR_GTK).* ~CFR~V
+ -wipe css.c.css_enum ~CFR~V
+ -wipe css.h.css_enum ~CFR~V
+ -wipe css.c.parser ~CFR~V
+ -wipe css.h.parser ~CFR~V
+ -wipe css.c.scanner ~CFR~V
16 years, 8 months
- 1
- 0
r2948 jmb - in /trunk/netsurfweb: develop.en robuild.en
by netsurf＠semichrome.net
Author: jmb
Date: Mon Sep 11 00:40:07 2006
New Revision: 2948
URL: http://svn.semichrome.net?rev=2948&view=rev
Log:
Explicitly state dependencies on developer page.
Rework and simplify RO build instructions.
Modified:
trunk/netsurfweb/develop.en
trunk/netsurfweb/robuild.en
Modified: trunk/netsurfweb/develop.en
URL: http://svn.semichrome.net/trunk/netsurfweb/develop.en?rev=2948&r1=2947&r2...
==============================================================================
--- trunk/netsurfweb/develop.en (original)
+++ trunk/netsurfweb/develop.en Mon Sep 11 00:40:07 2006
@@ -56,6 +56,33 @@
not include any of gui code, but runs natively on Linux so can be debugged and
checked using gdb, efence, valgrind, etc.</p>
+<h3>Dependencies</h3>
+
+<p>In addition to the compiler, NetSurf requires a number of additional tools to be available. These are enumerated below. Additionally, the libraries which NetSurf uses are also listed</p>
+
+<h4>Tools</h4>
+<ul>
+<li>Lemon parser generator (<a href="http://www.hwaci.com/sw/lemon/">http://www.hwaci.com/sw/lemon/</a>)</li>
+<li>re2c lexer (<a href="http://re2c.org/">http://re2c.org/</a>)</li>
+</ul>
+
+<h4>Libraries</h4>
+<ul>
+<li>cAres & cURL (<a href="http://curl.haxx.se/libcurl/">http://curl.haxx.se/libcurl/</a>)</li>
+<li>IJG JPEG library (<a href="http://www.ijg.org/">http://www.ijg.org/</a>)</li>
+<li>MNG decoding library (<a href="http://www.libmng.com/">http://www.libmng.com/</a>)</li>
+<li>OpenSSL (<a href="http://www.openssl.org/">http://www.openssl.org/</a>)</li>
+<li>libXML 2 (<a href="http://www.xmlsoft.org/">http://www.xmlsoft.org/</a>)</li>
+<li>Zlib (<a href="http://www.zlib.org/">http://www.zlib.org</a>)</li>
+</ul>
+
+<h5>RISC OS specific libraries</h5>
+<ul>
+<li>OSLib 6.80 or later (<a href="http://ro-oslib.sf.net/">http://ro-oslib.sf.net</a>)</li>
+<li>Pencil (<a href="http://svn.semichrome.net/trunk/pencil/">http://svn.semichrome.net/trunk/pencil/</a>)</li>
+<li>RUfl (<a href="http://zamez.org/rufl">http://zamez.org/rufl</a>)</li>
+</ul>
+
<h2>Source Documentation</h2>
Modified: trunk/netsurfweb/robuild.en
URL: http://svn.semichrome.net/trunk/netsurfweb/robuild.en?rev=2948&r1=2947&r2...
==============================================================================
--- trunk/netsurfweb/robuild.en (original)
+++ trunk/netsurfweb/robuild.en Mon Sep 11 00:40:07 2006
@@ -14,47 +14,48 @@
<ul>
<li><a href="#Overview">Overview</a></li>
<li><a href="#Requirements">Requirements</a></li>
-<li><a href="#UnpackingTheLibraries">Unpacking the Libraries</a></li>
+<li><a href="#QuickStart">Quick Start</a></li>
+<li><a href="#UnpackingTheLibraries">Fetching and Unpacking the Libraries</a></li>
<li><a href="#AcquiringAndCompilingTheSource">Acquiring and Compiling the source</a></li>
-<li><a href="#NotesOnAutogeneratedFiles">Notes on Autogenerated Files</a></li>
</ul>
-<p class="updated">Last updated 09th April 2006</p>
+<p class="updated">Last updated 10th September 2006</p>
<h2 id="Overview">Overview</h2>
-<p>This document outlines the process required to get a build system for NetSurf set up on a RISC OS machine. Much of what is discussed should be fairly obvious already, but it's worth being comprehensive.</p>
+<p>This document outlines the process required to get a build system for NetSurf set up on a RISC OS machine.</p>
<h2 id="Requirements">Requirements</h2>
<ul>
<li>A Filing System which supports long filenames</li>
-<li>!GCC (<a href="http://gccsdk.riscos.info/">http://gccsdk.riscos.info/</a>)</li>
-<li>Prebuilt libraries and sources (<a href="http://netsurf.strcprstskrzkrk.co.uk/developer">http://netsurf.strcprstskrzkrk.co.uk/developer</a>)</li>
+<li>!GCC 3.4.6 release 2 or later (<a href="http://gccsdk.riscos.info/">http://gccsdk.riscos.info/</a>)</li>
+<li>OSLib 6.80 or later (<a href="http://ro-oslib.sf.net/">http://ro-oslib.sf.net/</a>)</li>
+<li>Some version of Perl (<a href="http://www.cp15.org/programming/">http://www.cp15.org/programming/</a>)</li>
<li>RISC OS SVN client (<a href="http://www.cp15.org/versioncontrol/">http://www.cp15.org/versioncontrol/</a>)</li>
</ul>
-<h2 id="UnpackingTheLibraries">Unpacking the Libraries</h2>
+<h2 id="QuickStart">Quick Start</h2>
+
+<p>This section details quick-start instructions for getting NetSurf compiled under RISC OS. If you want more detail, see the rest of this document.</p>
<ol>
-<li>Create a directory named NSLibs in the location where you wish to install the libraries</li>
-<li>Into this directory, unpack the library zip files available from the URL above). This should give you a directory tree which looks like this:
+<li>Download and install the <a href="#Requirements">requirements</a> listed above.</li>
+<li>Download and install the pre-assembled <a href="nstools.zip">tool and library tree (2.3MB)</a>.</li>
+<li>Force the RISC OS SVN client to handle ,xxx extensions correctly by issuing <code>*Set svn$filetypeext ""</code>.</li>
+<li>Check out the latest source code from SVN. (<pre>svn co svn://svn.semichrome.net/trunk/netsurf</pre>)</li>
+<li>Set the CSD appropriately, set the next slot to 6000k and invoke <code>make</code> from a TaskWindow.</li>
+</ol>
-<div><object data="webimages/library1.png" type="image/png"><pre> NSLibs
- |
- | -- include
- | |
- | | -- curl
- | | -- libjpeg
- | | -- libpng
- | | -- libxml
- | | -- openssl
- | -- lib</pre></object></div>
-</li>
+<h2 id="UnpackingTheLibraries">Fetching and Unpacking the Libraries</h2>
-<li>Use a utility such as !Rename to rename the header files into RISC OS format (i.e. <code>foo/h</code> becomes <code>h.foo</code>). This should produce a directory tree like:
+<ol>
+<li>Download and unpack the pre-assembled <a href="nstools.zip">tool and library tree (2.3MB)</a>.</li>
+<li>Double-click on !NSTools to open the tree.</li>
+<li>Consult the !NSTools.!Help file in conjunction with <a href="http://netsurf.strcprstskrzkrk.co.uk/developer/">http://netsurf.strcprstskrzkrk.co.uk/developer/</a> in order to determine if any libraries need updating.</li>
+<li>If necessary, merge any updated libraries into the !NSTools directory structure, renaming files into RISC OS format as appropriate (i.e. <code>foo/h</code> becomes <code>h.foo</code>). This should produce a directory tree like:
-<div><object data="webimages/library2.png" type="image/png"><pre> NSLibs
+<div><object data="webimages/library2.png" type="image/png"><pre> !NSTools
|
| -- include
| |
@@ -80,18 +81,14 @@
with the headers in the "h" directories. [This step may not be required, depending upon the naming format used for the pre-built libraries]
</li>
-<li>Remove the filename extensions from the files in the lib directory
+<li>Remove any filename extensions from the files in the lib directory
(e.g. <code>libxml2/a</code> becomes <code>libxml2</code>)</li>
-<li>Create an Obey file with the following inside:
-<pre>Set NSLibs$Path <Obey$Dir>.</pre>
-(noting the trailing '.') and save it as <code>NSLibs.SetPath</code></li>
-<li>Run SetPath to set the path variable up</li>
-<li>Install OSLib as documented in its instructions and run it</li>
</ol>
<h2 id="AcquiringAndCompilingTheSource">Acquiring and Compiling the source</h2>
<ol>
+<li>Force the RISC OS SVN client to handle ,xxx extensions correctly by issuing <code>*Set svn$filetypeext ""</code>. (This may be set permanently by uncommenting the appropriate line in !SVN's !Boot file)</li>
<li>Use the RISC OS SVN client to check the source out from SVN, using the following command:
<pre>svn checkout svn://semichrome.net/trunk/netsurf</pre>
@@ -127,50 +124,9 @@
In the Options dialog box, ensure <em>Add ",xyz" suffix</em> is not checked, and enter <code>a:c:cc:f:h:i:ii:l:o:p:s:y</code> in the text field.
</li>-->
-<li>Modify the file <code>makefile</code> in the sources as follows:
-<pre>depend: */*.[ch]</pre>
-should be changed to
-<pre>depend:</pre>
-</li>
-
-<li>Take the pre-built sources and insert them into the <code>css</code> directory in the source tree, taking care to rename appropriately for RISC OS:
-
-<table style="font-family: monospace">
-<tbody>
-<tr><td>css_enum/c</td><td> > </td><td>css.c.css_enum</td></tr>
-<tr><td>css_enum/h</td><td> > </td><td>css.h.css_enum</td></tr>
-<tr><td>parser/c</td><td> > </td><td>css.c.parser</td></tr>
-<tr><td>parser/h</td><td> > </td><td>css.h.parser</td></tr>
-<tr><td>scanner/c</td><td> > </td><td>css.c.scanner</td></tr>
-</tbody>
-</table>
-</li>
-
-<li>Insert transtab/c into utils, renaming as per the css files above.</li>
-<li>Create an <code>arm-riscos-aof</code> directory at the root of the NetSurf source tree. This is where the compiled object files will end up. The source tree should now look like this:
-<div><object data="webimages/netsurftree2.png" type="image/png"><pre> netsurf
- |
- | -- !NCNetSurf
- | -- !NetSurf
- | -- arm-riscos-aof
- | -- content
- | -- css
- | -- debug
- | -- desktop
- | -- gtk
- | -- Docs
- | -- image
- | -- render
- | -- riscos
- | -- utils</pre></object></div>
-</li>
-<li>Set the netsurf directory as your CSD and invoke <code>make</code> from a TaskWindow</li>
+<li>Set the netsurf directory as your CSD, set the next slot to 6000k and invoke <code>make</code> from a TaskWindow</li>
<li>Go and make a cup of tea whilst the build happens (it takes approximately 30 minutes on a StrongARM RiscPC)</li>
</ol>
-
-<h2 id="NotesOnAutogeneratedFiles">Notes on Autogenerated Files</h2>
-
-<p>The NetSurf build process on Unix creates a number of source files automatically. This is not possible under RISC OS and so we provide pre-built versions of these alongside the pre-built libraries. You will need to ensure that your local copies of these are up to date, as build problems may occur otherwise. Simply checking the SVN activity log on the download page regularly should inform you of changes to the source for these autogenerated files.</p>
<div class="footer">
<p class="breadcrumbs"><a href="/">NetSurf</a> » <a href="develop"> Development Information</a> » Building NetSurf on RISC OS</p>
16 years, 8 months
- 1
- 0
r2947 phlamethrower - /trunk/netsurf/desktop/textinput.c
by netsurf＠semichrome.net
Author: phlamethrower
Date: Sun Sep 10 21:25:20 2006
New Revision: 2947
URL: http://svn.semichrome.net?rev=2947&view=rev
Log:
Fix wordwrap+horizontal scroll in textareas
Modified:
trunk/netsurf/desktop/textinput.c
Modified: trunk/netsurf/desktop/textinput.c
URL: http://svn.semichrome.net/trunk/netsurf/desktop/textinput.c?rev=2947&r1=2...
==============================================================================
--- trunk/netsurf/desktop/textinput.c (original)
+++ trunk/netsurf/desktop/textinput.c Sun Sep 10 21:25:20 2006
@@ -656,6 +656,9 @@
text_box = text_box->next;
assert(text_box);
assert(char_offset <= text_box->length);
+ /* Scroll back to the left */
+ box_x += textarea->scroll_x;
+ textarea->scroll_x = 0;
}
else
char_offset = text_box->length + text_box->space;
@@ -1934,7 +1937,7 @@
scrolly = textarea->scroll_y;
assert(textarea->gadget);
/* Calculate the caret coordinates */
- cx = textarea->gadget->caret_pixel_offset;
+ cx = textarea->gadget->caret_pixel_offset+textarea->gadget->caret_text_box->x;
cy = textarea->gadget->caret_text_box->y;
/* Ensure they are visible */
if (!box_hscrollbar_present(textarea))
16 years, 8 months
- 1
- 0
r2946 tlsa - /trunk/netsurfweb/robuild.en
by netsurf＠semichrome.net
Author: tlsa
Date: Sun Sep 10 20:26:10 2006
New Revision: 2946
URL: http://svn.semichrome.net?rev=2946&view=rev
Log:
Mention SVN client instead of CVS.
Modified:
trunk/netsurfweb/robuild.en
Modified: trunk/netsurfweb/robuild.en
URL: http://svn.semichrome.net/trunk/netsurfweb/robuild.en?rev=2946&r1=2945&r2...
==============================================================================
--- trunk/netsurfweb/robuild.en (original)
+++ trunk/netsurfweb/robuild.en Sun Sep 10 20:26:10 2006
@@ -31,7 +31,7 @@
<li>A Filing System which supports long filenames</li>
<li>!GCC (<a href="http://gccsdk.riscos.info/">http://gccsdk.riscos.info/</a>)</li>
<li>Prebuilt libraries and sources (<a href="http://netsurf.strcprstskrzkrk.co.uk/developer">http://netsurf.strcprstskrzkrk.co.uk/developer</a>)</li>
-<li>RISC OS CVS client (<a href="http://cvs.riscos.org.uk/">http://cvs.riscos.org.uk/</a>)</li>
+<li>RISC OS SVN client (<a href="http://www.cp15.org/versioncontrol/">http://www.cp15.org/versioncontrol/</a>)</li>
</ul>
<h2 id="UnpackingTheLibraries">Unpacking the Libraries</h2>
16 years, 8 months
- 1
- 0
r2945 tlsa - /trunk/netsurf/!NetSurf/Docs/about,faf
by netsurf＠semichrome.net
Author: tlsa
Date: Sun Sep 10 20:20:48 2006
New Revision: 2945
URL: http://svn.semichrome.net?rev=2945&view=rev
Log:
Update About page.
Modified:
trunk/netsurf/!NetSurf/Docs/about,faf
Modified: trunk/netsurf/!NetSurf/Docs/about,faf
URL: http://svn.semichrome.net/trunk/netsurf/%21NetSurf/Docs/about%2Cfaf?rev=2...
==============================================================================
--- trunk/netsurf/!NetSurf/Docs/about,faf (original)
+++ trunk/netsurf/!NetSurf/Docs/about,faf Sun Sep 10 20:20:48 2006
@@ -13,8 +13,8 @@
<p>Authors and contributors:
<em>(code)</em> Kevin Bagust, John M Bell, James Bursa, Matthew Hambley, Rob
-Jackson, Rob Kendrick, Adrian Lees, Phil Mellor, Philip Pemberton, Daniel
-Silverstone, Andrew Timmins, John Tytgat, Richard Wilson;
+Jackson, Rob Kendrick, Jeffrey Lee, Adrian Lees, Phil Mellor, Philip
+Pemberton, Daniel Silverstone, Andrew Timmins, John Tytgat, Richard Wilson;
<em>(graphics, documentation & translations)</em> Sebastian Barthel,
Bruno D'Arcangeli, Michael Drake, Andrew Duffell, Richard Hallas, Gerard van
Katwijk, Jérôme Mathevet, Simon Voortman.</p>
16 years, 8 months
- 1
- 0
r2944 phlamethrower - /trunk/netsurf/desktop/textinput.c
by netsurf＠semichrome.net
Author: phlamethrower
Date: Sun Sep 10 17:12:45 2006
New Revision: 2944
URL: http://svn.semichrome.net?rev=2944&view=rev
Log:
Fixed the other caret issues after pasting into textarea
Modified:
trunk/netsurf/desktop/textinput.c
Modified: trunk/netsurf/desktop/textinput.c
URL: http://svn.semichrome.net/trunk/netsurf/desktop/textinput.c?rev=2944&r1=2...
==============================================================================
--- trunk/netsurf/desktop/textinput.c (original)
+++ trunk/netsurf/desktop/textinput.c Sun Sep 10 17:12:45 2006
@@ -1229,9 +1229,26 @@
/* reflow textarea preserving width and height */
textarea_reflow(bw, textarea, inline_container);
- /* reflowing may have broken our caret offset */
- if(textarea->gadget->caret_box_offset > text_box->length)
- char_offset = textarea->gadget->caret_box_offset = text_box->length;
+ /* reflowing may have broken our caret offset
+ this bit should hopefully continue to work if textarea_reflow
+ is fixed to update the caret itself */
+ char_offset = textarea->gadget->caret_box_offset;
+ text_box = textarea->gadget->caret_text_box;
+ while((char_offset > text_box->length+text_box->space) && (text_box->next) && (text_box->next->type == BOX_TEXT))
+ {
+ LOG(("Caret out of range: Was %d in boxlen %d space %d",char_offset,text_box->length,text_box->space));
+ char_offset -= text_box->length+text_box->space;
+ text_box = text_box->next;
+ }
+ /* not sure if this will happen or not... but won't stick an assert here as we can recover from it */
+ if(char_offset > text_box->length)
+ {
+ LOG(("Caret moved beyond end of line: Was %d in boxlen %d",char_offset,text_box->length));
+ char_offset = text_box->length;
+ }
+ textarea->gadget->caret_text_box = text_box;
+ textarea->gadget->caret_box_offset = char_offset;
+
nsfont_width(text_box->style, text_box->text,
char_offset, &pixel_offset);
16 years, 8 months
- 1
- 0
r2943 phlamethrower - /trunk/netsurf/desktop/textinput.c
by netsurf＠semichrome.net
Author: phlamethrower
Date: Sun Sep 10 16:56:23 2006
New Revision: 2943
URL: http://svn.semichrome.net?rev=2943&view=rev
Log:
Fix some caret/scrolling issues after pasting into textarea
Modified:
trunk/netsurf/desktop/textinput.c
Modified: trunk/netsurf/desktop/textinput.c
URL: http://svn.semichrome.net/trunk/netsurf/desktop/textinput.c?rev=2943&r1=2...
==============================================================================
--- trunk/netsurf/desktop/textinput.c (original)
+++ trunk/netsurf/desktop/textinput.c Sun Sep 10 16:56:23 2006
@@ -1220,19 +1220,30 @@
utf8 = ++p;
}
+// textarea->gadget->caret_inline_container = inline_container;
+ textarea->gadget->caret_text_box = text_box;
+ textarea->gadget->caret_box_offset = char_offset;
+
if (update) {
int box_x, box_y;
/* reflow textarea preserving width and height */
textarea_reflow(bw, textarea, inline_container);
+ /* reflowing may have broken our caret offset */
+ if(textarea->gadget->caret_box_offset > text_box->length)
+ char_offset = textarea->gadget->caret_box_offset = text_box->length;
nsfont_width(text_box->style, text_box->text,
char_offset, &pixel_offset);
+ textarea->gadget->caret_pixel_offset = pixel_offset;
+
+ box_coords(textarea, &box_x, &box_y);
+ box_x += textarea->scroll_x;
+ box_y += textarea->scroll_y;
+ ensure_caret_visible(textarea);
box_x -= textarea->scroll_x;
box_y -= textarea->scroll_y;
-
- box_coords(textarea, &box_x, &box_y);
browser_window_place_caret(bw,
box_x + inline_container->x + text_box->x +
@@ -1244,14 +1255,9 @@
browser_window_textarea_move_caret,
textarea);
- textarea->gadget->caret_pixel_offset = pixel_offset;
-
browser_redraw_box(bw->current_content, textarea);
- }
-
-// textarea->gadget->caret_inline_container = inline_container;
- textarea->gadget->caret_text_box = text_box;
- textarea->gadget->caret_box_offset = char_offset;
+
+ }
return success;
}
16 years, 8 months
- 1
- 0
r2942 phlamethrower - in /trunk/netsurf/desktop: selection.c textinput.c
by netsurf＠semichrome.net
Author: phlamethrower
Date: Sun Sep 10 16:08:30 2006
New Revision: 2942
URL: http://svn.semichrome.net?rev=2942&view=rev
Log:
Fixed spurious newline after pasting into textarea; possibly fixed some selection processing/rendering bugs
Modified:
trunk/netsurf/desktop/selection.c
trunk/netsurf/desktop/textinput.c
Modified: trunk/netsurf/desktop/selection.c
URL: http://svn.semichrome.net/trunk/netsurf/desktop/selection.c?rev=2942&r1=2...
==============================================================================
--- trunk/netsurf/desktop/selection.c (original)
+++ trunk/netsurf/desktop/selection.c Sun Sep 10 16:08:30 2006
@@ -43,7 +43,8 @@
/** check whether the given text box is in the same number space as the
current selection; number spaces are identified by their uppermost nybble */
-#define SAME_SPACE(s, offset) (((s)->max_idx & 0xF0000000U) == ((offset) & 0xF0000000U))
+#define NUMBER_SPACE(x) ((x) & 0xF0000000U)
+#define SAME_SPACE(s, offset) (NUMBER_SPACE((s)->max_idx) == NUMBER_SPACE(offset))
struct rdw_info {
@@ -69,7 +70,8 @@
static bool selected_part(struct box *box, unsigned start_idx, unsigned end_idx,
unsigned *start_offset, unsigned *end_offset);
static bool traverse_tree(struct box *box, unsigned start_idx, unsigned end_idx,
- seln_traverse_handler handler, void *handle);
+ unsigned int num_space, seln_traverse_handler handler,
+ void *handle);
static struct box *get_box(struct box *b, unsigned offset, int *pidx);
@@ -409,13 +411,15 @@
* \param box box subtree
* \param start_idx start of range within textual representation (bytes)
* \param end_idx end of range
+ * \param num_space number space of the selection
* \param handler handler function to call
* \param handle handle to pass
* \return false iff traversal abandoned part-way through
*/
bool traverse_tree(struct box *box, unsigned start_idx, unsigned end_idx,
- seln_traverse_handler handler, void *handle)
+ unsigned int num_space, seln_traverse_handler handler,
+ void *handle)
{
struct box *child;
size_t box_length;
@@ -429,7 +433,7 @@
child = box->children;
box_length = box->length + box->space; /* include trailing space */
- if (IS_TEXT(box)) {
+ if (IS_TEXT(box) && (num_space == NUMBER_SPACE(box->byte_offset))) {
unsigned start_offset;
unsigned end_offset;
@@ -465,7 +469,7 @@
/* read before calling the handler in case it modifies the tree */
struct box *next = child->next;
- if (!traverse_tree(child, start_idx, end_idx, handler, handle))
+ if (!traverse_tree(child, start_idx, end_idx, num_space, handler, handle))
return false;
child = next;
@@ -493,7 +497,7 @@
return true; /* easy case, nothing to do */
if (s->root)
- return traverse_tree(s->root, s->start_idx, s->end_idx, handler, handle);
+ return traverse_tree(s->root, s->start_idx, s->end_idx, NUMBER_SPACE(s->max_idx), handler, handle);
c = s->bw->current_content;
if (!c) return true;
@@ -569,7 +573,7 @@
rdw.inited = false;
if (s->root) {
- if (!traverse_tree(s->root, start_idx, end_idx, redraw_handler, &rdw))
+ if (!traverse_tree(s->root, start_idx, end_idx, NUMBER_SPACE(s->max_idx), redraw_handler, &rdw))
return;
}
else {
Modified: trunk/netsurf/desktop/textinput.c
URL: http://svn.semichrome.net/trunk/netsurf/desktop/textinput.c?rev=2942&r1=2...
==============================================================================
--- trunk/netsurf/desktop/textinput.c (original)
+++ trunk/netsurf/desktop/textinput.c Sun Sep 10 16:08:30 2006
@@ -1199,6 +1199,8 @@
return false;
char_offset += utf8_len;
+ if (p == ep)
+ break;
new_text = textarea_insert_break(bw, text_box, char_offset);
if (!new_text) {
16 years, 8 months
- 1
- 0