December 2011 - netsurf-commits - listmaster.pepperfish.net

r13349 vince - /branches/vince/netsurf-cairo/gtk/scaffolding.c

by netsurf＠semichrome.net

Author: vince Date: Tue Dec 27 14:59:08 2011 New Revision: 13349 URL: http://source.netsurf-browser.org?rev=13349&view=rev Log: still not working pixmap_from_cairo_surface Modified: branches/vince/netsurf-cairo/gtk/scaffolding.c Modified: branches/vince/netsurf-cairo/gtk/scaffolding.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/scaffo... ============================================================================== --- branches/vince/netsurf-cairo/gtk/scaffolding.c (original) +++ branches/vince/netsurf-cairo/gtk/scaffolding.c Tue Dec 27 14:59:08 2011 @@ -1992,33 +1992,29 @@ gtk_image_set_from_pixbuf(g->throbber, nsgtk_throbber->framedata[0]); } -/** - * set favicon - */ -void gui_window_set_icon(struct gui_window *_g, hlcache_handle *icon) -{ - struct gtk_scaffolding *g = nsgtk_get_scaffold(_g); - struct bitmap *icon_bitmap; - GtkImage *iconImage = NULL; - - if (g->top_level != _g) - return; - - icon_bitmap = (icon != NULL) ? content_get_bitmap(icon) : NULL; - - if (icon_bitmap != NULL) { - int bmwidth, bmheight; - cairo_surface_t *bmsurface = icon_bitmap->surface; - bmwidth = cairo_image_surface_get_width(bmsurface); - bmheight = cairo_image_surface_get_height(bmsurface); - - GdkPixmap *pixmap; - pixmap = gdk_pixmap_new(g->url_bar->window, 16, 16, -1); - - cairo_t *cr; - cr = gdk_cairo_create(pixmap); - - cairo_scale(cr, (double)16 / bmwidth, (double)16 / bmheight); +static GdkPixmap * +pixmap_from_cairo_surface(cairo_surface_t *bmsurface, + GdkDrawable *drawable, + int width, + int height) +{ + int bmwidth, bmheight; + GdkPixmap *pixmap; + cairo_t *cr; + + cairo_surface_flush(bmsurface); + + bmwidth = cairo_image_surface_get_width(bmsurface); + bmheight = cairo_image_surface_get_height(bmsurface); + + pixmap = gdk_pixmap_new(drawable, width, height, -1); + + cr = gdk_cairo_create(pixmap); + + if (cairo_status(cr) == CAIRO_STATUS_SUCCESS) { + cairo_scale(cr, + (double)width / bmwidth, + (double)height / bmheight); cairo_set_source_surface(cr, bmsurface, 0, 0); @@ -2037,10 +2033,38 @@ /* Do the actual drawing */ cairo_paint(cr); - cairo_destroy(cr); + cairo_surface_flush(cairo_get_target(cr)); + } else { + LOG(("%s", cairo_status_to_string(cairo_status(cr)))); + g_object_unref(pixmap); + pixmap = NULL; + } + + cairo_destroy(cr); + + return pixmap; +} + +/** + * set favicon + */ +void gui_window_set_icon(struct gui_window *_g, hlcache_handle *icon) +{ + struct gtk_scaffolding *g = nsgtk_get_scaffold(_g); + struct bitmap *icon_bitmap; + GtkImage *iconImage = NULL; + + if (g->top_level != _g) + return; + + icon_bitmap = (icon != NULL) ? content_get_bitmap(icon) : NULL; + + if (icon_bitmap != NULL) { + GdkPixmap *pixmap; + pixmap = pixmap_from_cairo_surface(icon_bitmap->surface, ((GtkWidget *)g->window)->window, 16, 16); iconImage = GTK_IMAGE(gtk_image_new_from_pixmap(pixmap, NULL)); - + LOG(("set to %p",iconImage)); g_object_unref(pixmap); }

11 years, 9 months

1
0
0 / 0

r13348 vince - /branches/vince/netsurf-cairo/gtk/scaffolding.c

by netsurf＠semichrome.net

Author: vince Date: Tue Dec 27 11:10:26 2011 New Revision: 13348 URL: http://source.netsurf-browser.org?rev=13348&view=rev Log: theoretically correct image setting Modified: branches/vince/netsurf-cairo/gtk/scaffolding.c Modified: branches/vince/netsurf-cairo/gtk/scaffolding.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/scaffo... ============================================================================== --- branches/vince/netsurf-cairo/gtk/scaffolding.c (original) +++ branches/vince/netsurf-cairo/gtk/scaffolding.c Tue Dec 27 11:10:26 2011 @@ -2007,19 +2007,44 @@ icon_bitmap = (icon != NULL) ? content_get_bitmap(icon) : NULL; if (icon_bitmap != NULL) { -#if 0 - GdkPixbuf *pb = gtk_bitmap_get_primary(icon_bitmap); - - if ((pb != NULL) && - (gdk_pixbuf_get_width(pb) > 0) && - (gdk_pixbuf_get_height(pb) > 0)) { - pb = gdk_pixbuf_scale_simple(pb, 16, 16, GDK_INTERP_HYPER); - iconImage = GTK_IMAGE(gtk_image_new_from_pixbuf(pb)); - } -#endif - } + int bmwidth, bmheight; + cairo_surface_t *bmsurface = icon_bitmap->surface; + bmwidth = cairo_image_surface_get_width(bmsurface); + bmheight = cairo_image_surface_get_height(bmsurface); + + GdkPixmap *pixmap; + pixmap = gdk_pixmap_new(g->url_bar->window, 16, 16, -1); + + cairo_t *cr; + cr = gdk_cairo_create(pixmap); + + cairo_scale(cr, (double)16 / bmwidth, (double)16 / bmheight); + + cairo_set_source_surface(cr, bmsurface, 0, 0); + + /* To avoid getting the edge pixels blended with 0 + * alpha, which would occur with the default + * EXTEND_NONE. Use EXTEND_PAD for 1.2 or newer (2) + */ + cairo_pattern_set_extend(cairo_get_source(cr), + CAIRO_EXTEND_REFLECT); + + /* Replace the destination with the source instead of + * overlaying + */ + cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); + + /* Do the actual drawing */ + cairo_paint(cr); + + cairo_destroy(cr); + + iconImage = GTK_IMAGE(gtk_image_new_from_pixmap(pixmap, NULL)); + + g_object_unref(pixmap); + } + if (iconImage == NULL) { - /** \todo Does pb need cleaning up? */ char imagepath[strlen(res_dir_location) + SLEN("favicon.png") + 1]; sprintf(imagepath, "%sfavicon.png", res_dir_location);

11 years, 9 months

1
0
0 / 0

r13347 jmb - in /branches/vince/netsurf-cairo: !NetSurf/Resources/de/ !NetSurf/Resources/en/ !NetSurf/Resources/fr/ !NetSurf/Resources/it/ !NetSurf/Resources/nl/ ./ Docs/ amiga/ amiga/dist/ amiga/resources/Themes/AISS/ atari/ atari/doc/ atari/plot/ atari/res/ atari/scripts/ beos/ cocoa/ content/ content/fetchers/ css/ desktop/ framebuffer/ framebuffer/fbtk/ gtk/ gtk/dialogs/ image/ monkey/ render/ riscos/ riscos/configure/ riscos/gui/ riscos/templates/ test/ utils/ windows/

by netsurf＠semichrome.net

Author: jmb Date: Sun Dec 25 15:38:12 2011 New Revision: 13347 URL: http://source.netsurf-browser.org?rev=13347&view=rev Log: Sync with trunk Added: branches/vince/netsurf-cairo/amiga/resources/Themes/AISS/Resource.map - copied unchanged from r13346, trunk/netsurf/amiga/resources/Themes/AISS/Resource.map branches/vince/netsurf-cairo/atari/encoding.c - copied unchanged from r13346, trunk/netsurf/atari/encoding.c branches/vince/netsurf-cairo/atari/encoding.h - copied unchanged from r13346, trunk/netsurf/atari/encoding.h branches/vince/netsurf-cairo/atari/redrawslots.c - copied unchanged from r13346, trunk/netsurf/atari/redrawslots.c branches/vince/netsurf-cairo/atari/redrawslots.h - copied unchanged from r13346, trunk/netsurf/atari/redrawslots.h branches/vince/netsurf-cairo/atari/save.c - copied unchanged from r13346, trunk/netsurf/atari/save.c branches/vince/netsurf-cairo/atari/save.h - copied unchanged from r13346, trunk/netsurf/atari/save.h branches/vince/netsurf-cairo/atari/settings.c - copied unchanged from r13346, trunk/netsurf/atari/settings.c branches/vince/netsurf-cairo/atari/settings.h - copied unchanged from r13346, trunk/netsurf/atari/settings.h branches/vince/netsurf-cairo/image/video.c - copied unchanged from r13346, trunk/netsurf/image/video.c branches/vince/netsurf-cairo/image/video.h - copied unchanged from r13346, trunk/netsurf/image/video.h Removed: branches/vince/netsurf-cairo/framebuffer/bitmap.h Modified: branches/vince/netsurf-cairo/!NetSurf/Resources/de/Messages branches/vince/netsurf-cairo/!NetSurf/Resources/en/Messages branches/vince/netsurf-cairo/!NetSurf/Resources/fr/Messages branches/vince/netsurf-cairo/!NetSurf/Resources/it/Messages branches/vince/netsurf-cairo/!NetSurf/Resources/nl/Messages branches/vince/netsurf-cairo/Docs/USING-Monkey branches/vince/netsurf-cairo/Makefile.defaults branches/vince/netsurf-cairo/Makefile.sources branches/vince/netsurf-cairo/amiga/Makefile.target branches/vince/netsurf-cairo/amiga/arexx.c branches/vince/netsurf-cairo/amiga/clipboard.c branches/vince/netsurf-cairo/amiga/context_menu.c branches/vince/netsurf-cairo/amiga/context_menu.h branches/vince/netsurf-cairo/amiga/dist/Install branches/vince/netsurf-cairo/amiga/drag.c branches/vince/netsurf-cairo/amiga/drag.h branches/vince/netsurf-cairo/amiga/file.c branches/vince/netsurf-cairo/amiga/font.c branches/vince/netsurf-cairo/amiga/gui.c branches/vince/netsurf-cairo/amiga/gui.h branches/vince/netsurf-cairo/amiga/gui_options.c branches/vince/netsurf-cairo/amiga/history_local.c branches/vince/netsurf-cairo/amiga/icon.c branches/vince/netsurf-cairo/amiga/iff_dr2d.c branches/vince/netsurf-cairo/amiga/menu.c branches/vince/netsurf-cairo/amiga/options.h branches/vince/netsurf-cairo/amiga/plugin_hack.c branches/vince/netsurf-cairo/amiga/print.c branches/vince/netsurf-cairo/amiga/thumbnail.c branches/vince/netsurf-cairo/amiga/tree.c branches/vince/netsurf-cairo/atari/Makefile.target branches/vince/netsurf-cairo/atari/bitmap.c branches/vince/netsurf-cairo/atari/browser.c branches/vince/netsurf-cairo/atari/browser.h branches/vince/netsurf-cairo/atari/browser_win.c branches/vince/netsurf-cairo/atari/browser_win.h branches/vince/netsurf-cairo/atari/ctxmenu.c branches/vince/netsurf-cairo/atari/doc/changes.txt branches/vince/netsurf-cairo/atari/doc/faq.txt branches/vince/netsurf-cairo/atari/doc/todo.txt branches/vince/netsurf-cairo/atari/download.c branches/vince/netsurf-cairo/atari/download.h branches/vince/netsurf-cairo/atari/dragdrop.c branches/vince/netsurf-cairo/atari/dragdrop.h branches/vince/netsurf-cairo/atari/filetype.c branches/vince/netsurf-cairo/atari/findfile.c branches/vince/netsurf-cairo/atari/findfile.h branches/vince/netsurf-cairo/atari/font.c branches/vince/netsurf-cairo/atari/font.h branches/vince/netsurf-cairo/atari/global_evnt.c branches/vince/netsurf-cairo/atari/global_evnt.h branches/vince/netsurf-cairo/atari/gui.c branches/vince/netsurf-cairo/atari/gui.h branches/vince/netsurf-cairo/atari/history.c branches/vince/netsurf-cairo/atari/hotlist.c branches/vince/netsurf-cairo/atari/misc.c branches/vince/netsurf-cairo/atari/misc.h branches/vince/netsurf-cairo/atari/options.h branches/vince/netsurf-cairo/atari/osspec.c branches/vince/netsurf-cairo/atari/plot.c branches/vince/netsurf-cairo/atari/plot.h branches/vince/netsurf-cairo/atari/plot/font_freetype.c branches/vince/netsurf-cairo/atari/plot/font_internal.c branches/vince/netsurf-cairo/atari/plot/font_internal.h branches/vince/netsurf-cairo/atari/plot/font_vdi.c branches/vince/netsurf-cairo/atari/plot/font_vdi.h branches/vince/netsurf-cairo/atari/plot/plotter.c branches/vince/netsurf-cairo/atari/plot/plotter.h branches/vince/netsurf-cairo/atari/plot/plotter_vdi.c branches/vince/netsurf-cairo/atari/plot/plotter_vdi.h branches/vince/netsurf-cairo/atari/res/netsurf.rsc branches/vince/netsurf-cairo/atari/res/netsurf.rsh branches/vince/netsurf-cairo/atari/res/netsurf.rsm branches/vince/netsurf-cairo/atari/schedule.c branches/vince/netsurf-cairo/atari/scripts/mkpkg.sh branches/vince/netsurf-cairo/atari/statusbar.c branches/vince/netsurf-cairo/atari/statusbar.h branches/vince/netsurf-cairo/atari/toolbar.c branches/vince/netsurf-cairo/atari/toolbar.h branches/vince/netsurf-cairo/atari/treeview.c branches/vince/netsurf-cairo/atari/treeview.h branches/vince/netsurf-cairo/beos/beos_fetch_rsrc.cpp branches/vince/netsurf-cairo/beos/beos_gui.cpp branches/vince/netsurf-cairo/beos/beos_scaffolding.cpp branches/vince/netsurf-cairo/beos/beos_thumbnail.cpp branches/vince/netsurf-cairo/beos/beos_window.cpp branches/vince/netsurf-cairo/cocoa/BookmarksController.m branches/vince/netsurf-cairo/cocoa/BrowserView.m branches/vince/netsurf-cairo/cocoa/HistoryView.m branches/vince/netsurf-cairo/cocoa/Tree.m branches/vince/netsurf-cairo/cocoa/thumbnail.m branches/vince/netsurf-cairo/content/content.c branches/vince/netsurf-cairo/content/content.h branches/vince/netsurf-cairo/content/content_protected.h branches/vince/netsurf-cairo/content/fetch.c branches/vince/netsurf-cairo/content/fetch.h branches/vince/netsurf-cairo/content/fetchers/about.c branches/vince/netsurf-cairo/content/fetchers/curl.c branches/vince/netsurf-cairo/content/fetchers/data.c branches/vince/netsurf-cairo/content/fetchers/file.c branches/vince/netsurf-cairo/content/fetchers/resource.c branches/vince/netsurf-cairo/content/hlcache.c branches/vince/netsurf-cairo/content/hlcache.h branches/vince/netsurf-cairo/content/llcache.c branches/vince/netsurf-cairo/content/mimesniff.c branches/vince/netsurf-cairo/content/urldb.c branches/vince/netsurf-cairo/css/css.c branches/vince/netsurf-cairo/desktop/browser.c branches/vince/netsurf-cairo/desktop/browser.h branches/vince/netsurf-cairo/desktop/frames.c branches/vince/netsurf-cairo/desktop/history_core.c branches/vince/netsurf-cairo/desktop/history_core.h branches/vince/netsurf-cairo/desktop/hotlist.c branches/vince/netsurf-cairo/desktop/hotlist.h branches/vince/netsurf-cairo/desktop/options.c branches/vince/netsurf-cairo/desktop/options.h branches/vince/netsurf-cairo/desktop/print.c branches/vince/netsurf-cairo/desktop/save_complete.c branches/vince/netsurf-cairo/desktop/scrollbar.c branches/vince/netsurf-cairo/desktop/scrollbar.h branches/vince/netsurf-cairo/desktop/searchweb.c branches/vince/netsurf-cairo/desktop/textarea.c branches/vince/netsurf-cairo/desktop/textarea.h branches/vince/netsurf-cairo/desktop/textinput.c branches/vince/netsurf-cairo/desktop/tree.c branches/vince/netsurf-cairo/desktop/tree.h branches/vince/netsurf-cairo/desktop/tree_url_node.c branches/vince/netsurf-cairo/framebuffer/Makefile.target branches/vince/netsurf-cairo/framebuffer/bitmap.c branches/vince/netsurf-cairo/framebuffer/convert_image.c branches/vince/netsurf-cairo/framebuffer/fbtk.h branches/vince/netsurf-cairo/framebuffer/fbtk/bitmap.c branches/vince/netsurf-cairo/framebuffer/fbtk/event.c branches/vince/netsurf-cairo/framebuffer/fbtk/fbtk.c branches/vince/netsurf-cairo/framebuffer/fbtk/osk.c branches/vince/netsurf-cairo/framebuffer/fbtk/scroll.c branches/vince/netsurf-cairo/framebuffer/fbtk/user.c branches/vince/netsurf-cairo/framebuffer/fbtk/widget.h branches/vince/netsurf-cairo/framebuffer/font_freetype.c branches/vince/netsurf-cairo/framebuffer/font_internal.c branches/vince/netsurf-cairo/framebuffer/framebuffer.c branches/vince/netsurf-cairo/framebuffer/framebuffer.h branches/vince/netsurf-cairo/framebuffer/gui.c branches/vince/netsurf-cairo/framebuffer/image_data.h branches/vince/netsurf-cairo/framebuffer/localhistory.c branches/vince/netsurf-cairo/framebuffer/thumbnail.c branches/vince/netsurf-cairo/gtk/Makefile.target branches/vince/netsurf-cairo/gtk/dialogs/options.c branches/vince/netsurf-cairo/gtk/dialogs/source.c branches/vince/netsurf-cairo/gtk/hotlist.c branches/vince/netsurf-cairo/gtk/scaffolding.c branches/vince/netsurf-cairo/gtk/thumbnail.c branches/vince/netsurf-cairo/gtk/toolbar.c branches/vince/netsurf-cairo/gtk/treeview.c branches/vince/netsurf-cairo/gtk/window.c branches/vince/netsurf-cairo/image/image_cache.c branches/vince/netsurf-cairo/image/jpeg.c branches/vince/netsurf-cairo/image/mng.c branches/vince/netsurf-cairo/image/svg.c branches/vince/netsurf-cairo/monkey/browser.c branches/vince/netsurf-cairo/monkey/plot.c branches/vince/netsurf-cairo/monkey/utils.c branches/vince/netsurf-cairo/render/box.c branches/vince/netsurf-cairo/render/box.h branches/vince/netsurf-cairo/render/box_construct.c branches/vince/netsurf-cairo/render/form.c branches/vince/netsurf-cairo/render/html.c branches/vince/netsurf-cairo/render/html.h branches/vince/netsurf-cairo/render/html_interaction.c branches/vince/netsurf-cairo/render/html_redraw.c branches/vince/netsurf-cairo/render/layout.c branches/vince/netsurf-cairo/riscos/configure/con_inter.c branches/vince/netsurf-cairo/riscos/filetype.c branches/vince/netsurf-cairo/riscos/gui.c branches/vince/netsurf-cairo/riscos/gui.h branches/vince/netsurf-cairo/riscos/gui/url_bar.c branches/vince/netsurf-cairo/riscos/history.c branches/vince/netsurf-cairo/riscos/hotlist.c branches/vince/netsurf-cairo/riscos/options.h branches/vince/netsurf-cairo/riscos/print.c branches/vince/netsurf-cairo/riscos/save.c branches/vince/netsurf-cairo/riscos/save_draw.c branches/vince/netsurf-cairo/riscos/search.c branches/vince/netsurf-cairo/riscos/templates/de branches/vince/netsurf-cairo/riscos/templates/en branches/vince/netsurf-cairo/riscos/templates/fr branches/vince/netsurf-cairo/riscos/templates/nl branches/vince/netsurf-cairo/riscos/thumbnail.c branches/vince/netsurf-cairo/riscos/toolbar.c branches/vince/netsurf-cairo/riscos/treeview.c branches/vince/netsurf-cairo/riscos/wimp.c branches/vince/netsurf-cairo/riscos/wimp.h branches/vince/netsurf-cairo/riscos/wimp_event.c branches/vince/netsurf-cairo/riscos/wimp_event.h branches/vince/netsurf-cairo/riscos/window.c branches/vince/netsurf-cairo/test/ (props changed) branches/vince/netsurf-cairo/test/nsurl.c branches/vince/netsurf-cairo/test/urldbtest.c branches/vince/netsurf-cairo/utils/nsurl.c branches/vince/netsurf-cairo/utils/nsurl.h branches/vince/netsurf-cairo/utils/types.h branches/vince/netsurf-cairo/windows/drawable.c branches/vince/netsurf-cairo/windows/localhistory.c branches/vince/netsurf-cairo/windows/thumbnail.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/vince/netsurf-cairo/!NetSurf/Resources/de/Messages URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/%21NetSurf... Modified: branches/vince/netsurf-cairo/!NetSurf/Resources/en/Messages URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/%21NetSurf... Modified: branches/vince/netsurf-cairo/!NetSurf/Resources/fr/Messages URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/%21NetSurf... Modified: branches/vince/netsurf-cairo/!NetSurf/Resources/it/Messages URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/%21NetSurf... Modified: branches/vince/netsurf-cairo/!NetSurf/Resources/nl/Messages URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/%21NetSurf... Modified: branches/vince/netsurf-cairo/Docs/USING-Monkey URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/Docs/USING... Modified: branches/vince/netsurf-cairo/Makefile.defaults URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/Makefile.d... Modified: branches/vince/netsurf-cairo/Makefile.sources URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/Makefile.s... Modified: branches/vince/netsurf-cairo/amiga/Makefile.target URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/Make... Modified: branches/vince/netsurf-cairo/amiga/arexx.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/arex... Modified: branches/vince/netsurf-cairo/amiga/clipboard.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/clip... Modified: branches/vince/netsurf-cairo/amiga/context_menu.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/cont... Modified: branches/vince/netsurf-cairo/amiga/context_menu.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/cont... Modified: branches/vince/netsurf-cairo/amiga/dist/Install URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/dist... Modified: branches/vince/netsurf-cairo/amiga/drag.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/drag... Modified: branches/vince/netsurf-cairo/amiga/drag.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/drag... Modified: branches/vince/netsurf-cairo/amiga/file.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/file... Modified: branches/vince/netsurf-cairo/amiga/font.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/font... Modified: branches/vince/netsurf-cairo/amiga/gui.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/gui.... Modified: branches/vince/netsurf-cairo/amiga/gui.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/gui.... Modified: branches/vince/netsurf-cairo/amiga/gui_options.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/gui_... Modified: branches/vince/netsurf-cairo/amiga/history_local.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/hist... Modified: branches/vince/netsurf-cairo/amiga/icon.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/icon... Modified: branches/vince/netsurf-cairo/amiga/iff_dr2d.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/iff_... Modified: branches/vince/netsurf-cairo/amiga/menu.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/menu... Modified: branches/vince/netsurf-cairo/amiga/options.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/opti... Modified: branches/vince/netsurf-cairo/amiga/plugin_hack.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/plug... Modified: branches/vince/netsurf-cairo/amiga/print.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/prin... Modified: branches/vince/netsurf-cairo/amiga/thumbnail.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/thum... Modified: branches/vince/netsurf-cairo/amiga/tree.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/amiga/tree... Modified: branches/vince/netsurf-cairo/atari/Makefile.target URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/Make... Modified: branches/vince/netsurf-cairo/atari/bitmap.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/bitm... Modified: branches/vince/netsurf-cairo/atari/browser.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/brow... Modified: branches/vince/netsurf-cairo/atari/browser.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/brow... Modified: branches/vince/netsurf-cairo/atari/browser_win.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/brow... Modified: branches/vince/netsurf-cairo/atari/browser_win.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/brow... Modified: branches/vince/netsurf-cairo/atari/ctxmenu.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/ctxm... Modified: branches/vince/netsurf-cairo/atari/doc/changes.txt URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/doc/... Modified: branches/vince/netsurf-cairo/atari/doc/faq.txt URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/doc/... Modified: branches/vince/netsurf-cairo/atari/doc/todo.txt URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/doc/... Modified: branches/vince/netsurf-cairo/atari/download.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/down... Modified: branches/vince/netsurf-cairo/atari/download.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/down... Modified: branches/vince/netsurf-cairo/atari/dragdrop.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/drag... Modified: branches/vince/netsurf-cairo/atari/dragdrop.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/drag... Modified: branches/vince/netsurf-cairo/atari/filetype.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/file... Modified: branches/vince/netsurf-cairo/atari/findfile.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/find... Modified: branches/vince/netsurf-cairo/atari/findfile.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/find... Modified: branches/vince/netsurf-cairo/atari/font.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/font... Modified: branches/vince/netsurf-cairo/atari/font.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/font... Modified: branches/vince/netsurf-cairo/atari/global_evnt.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/glob... Modified: branches/vince/netsurf-cairo/atari/global_evnt.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/glob... Modified: branches/vince/netsurf-cairo/atari/gui.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/gui.... Modified: branches/vince/netsurf-cairo/atari/gui.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/gui.... Modified: branches/vince/netsurf-cairo/atari/history.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/hist... Modified: branches/vince/netsurf-cairo/atari/hotlist.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/hotl... Modified: branches/vince/netsurf-cairo/atari/misc.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/misc... Modified: branches/vince/netsurf-cairo/atari/misc.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/misc... Modified: branches/vince/netsurf-cairo/atari/options.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/opti... Modified: branches/vince/netsurf-cairo/atari/osspec.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/ossp... Modified: branches/vince/netsurf-cairo/atari/plot.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/plot.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/plot/font_freetype.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/plot/font_internal.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/plot/font_internal.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/plot/font_vdi.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/plot/font_vdi.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/plot/plotter.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/plot/plotter.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/plot/plotter_vdi.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/plot/plotter_vdi.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/plot... Modified: branches/vince/netsurf-cairo/atari/res/netsurf.rsc URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/res/... Modified: branches/vince/netsurf-cairo/atari/res/netsurf.rsh URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/res/... Modified: branches/vince/netsurf-cairo/atari/res/netsurf.rsm URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/res/... Modified: branches/vince/netsurf-cairo/atari/schedule.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/sche... Modified: branches/vince/netsurf-cairo/atari/scripts/mkpkg.sh URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/scri... Modified: branches/vince/netsurf-cairo/atari/statusbar.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/stat... Modified: branches/vince/netsurf-cairo/atari/statusbar.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/stat... Modified: branches/vince/netsurf-cairo/atari/toolbar.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/tool... Modified: branches/vince/netsurf-cairo/atari/toolbar.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/tool... Modified: branches/vince/netsurf-cairo/atari/treeview.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/tree... Modified: branches/vince/netsurf-cairo/atari/treeview.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/atari/tree... Modified: branches/vince/netsurf-cairo/beos/beos_fetch_rsrc.cpp URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/beos/beos_... Modified: branches/vince/netsurf-cairo/beos/beos_gui.cpp URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/beos/beos_... Modified: branches/vince/netsurf-cairo/beos/beos_scaffolding.cpp URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/beos/beos_... Modified: branches/vince/netsurf-cairo/beos/beos_thumbnail.cpp URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/beos/beos_... Modified: branches/vince/netsurf-cairo/beos/beos_window.cpp URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/beos/beos_... Modified: branches/vince/netsurf-cairo/cocoa/BookmarksController.m URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/cocoa/Book... Modified: branches/vince/netsurf-cairo/cocoa/BrowserView.m URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/cocoa/Brow... Modified: branches/vince/netsurf-cairo/cocoa/HistoryView.m URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/cocoa/Hist... Modified: branches/vince/netsurf-cairo/cocoa/Tree.m URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/cocoa/Tree... Modified: branches/vince/netsurf-cairo/cocoa/thumbnail.m URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/cocoa/thum... Modified: branches/vince/netsurf-cairo/content/content.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/co... Modified: branches/vince/netsurf-cairo/content/content.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/co... Modified: branches/vince/netsurf-cairo/content/content_protected.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/co... Modified: branches/vince/netsurf-cairo/content/fetch.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/fe... Modified: branches/vince/netsurf-cairo/content/fetch.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/fe... Modified: branches/vince/netsurf-cairo/content/fetchers/about.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/fe... Modified: branches/vince/netsurf-cairo/content/fetchers/curl.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/fe... Modified: branches/vince/netsurf-cairo/content/fetchers/data.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/fe... Modified: branches/vince/netsurf-cairo/content/fetchers/file.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/fe... Modified: branches/vince/netsurf-cairo/content/fetchers/resource.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/fe... Modified: branches/vince/netsurf-cairo/content/hlcache.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/hl... Modified: branches/vince/netsurf-cairo/content/hlcache.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/hl... Modified: branches/vince/netsurf-cairo/content/llcache.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/ll... Modified: branches/vince/netsurf-cairo/content/mimesniff.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/mi... Modified: branches/vince/netsurf-cairo/content/urldb.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/content/ur... Modified: branches/vince/netsurf-cairo/css/css.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/css/css.c?... Modified: branches/vince/netsurf-cairo/desktop/browser.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/br... Modified: branches/vince/netsurf-cairo/desktop/browser.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/br... Modified: branches/vince/netsurf-cairo/desktop/frames.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/fr... Modified: branches/vince/netsurf-cairo/desktop/history_core.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/hi... Modified: branches/vince/netsurf-cairo/desktop/history_core.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/hi... Modified: branches/vince/netsurf-cairo/desktop/hotlist.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/ho... Modified: branches/vince/netsurf-cairo/desktop/hotlist.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/ho... Modified: branches/vince/netsurf-cairo/desktop/options.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/op... Modified: branches/vince/netsurf-cairo/desktop/options.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/op... Modified: branches/vince/netsurf-cairo/desktop/print.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/pr... Modified: branches/vince/netsurf-cairo/desktop/save_complete.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/sa... Modified: branches/vince/netsurf-cairo/desktop/scrollbar.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/sc... Modified: branches/vince/netsurf-cairo/desktop/scrollbar.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/sc... Modified: branches/vince/netsurf-cairo/desktop/searchweb.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/se... Modified: branches/vince/netsurf-cairo/desktop/textarea.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/te... Modified: branches/vince/netsurf-cairo/desktop/textarea.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/te... Modified: branches/vince/netsurf-cairo/desktop/textinput.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/te... Modified: branches/vince/netsurf-cairo/desktop/tree.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/tr... Modified: branches/vince/netsurf-cairo/desktop/tree.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/tr... Modified: branches/vince/netsurf-cairo/desktop/tree_url_node.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/desktop/tr... Modified: branches/vince/netsurf-cairo/framebuffer/Makefile.target URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/bitmap.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Removed: branches/vince/netsurf-cairo/framebuffer/bitmap.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/convert_image.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/fbtk.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/fbtk/bitmap.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/fbtk/event.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/fbtk/fbtk.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/fbtk/osk.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/fbtk/scroll.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/fbtk/user.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/fbtk/widget.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/font_freetype.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/font_internal.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/framebuffer.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/framebuffer.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/gui.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/image_data.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/localhistory.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/framebuffer/thumbnail.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/framebuffe... Modified: branches/vince/netsurf-cairo/gtk/Makefile.target URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/Makefi... Modified: branches/vince/netsurf-cairo/gtk/dialogs/options.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/dialog... Modified: branches/vince/netsurf-cairo/gtk/dialogs/source.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/dialog... Modified: branches/vince/netsurf-cairo/gtk/hotlist.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/hotlis... Modified: branches/vince/netsurf-cairo/gtk/scaffolding.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/scaffo... Modified: branches/vince/netsurf-cairo/gtk/thumbnail.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/thumbn... Modified: branches/vince/netsurf-cairo/gtk/toolbar.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/toolba... Modified: branches/vince/netsurf-cairo/gtk/treeview.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/treevi... Modified: branches/vince/netsurf-cairo/gtk/window.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/window... Modified: branches/vince/netsurf-cairo/image/image_cache.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/image/imag... Modified: branches/vince/netsurf-cairo/image/jpeg.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/image/jpeg... Modified: branches/vince/netsurf-cairo/image/mng.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/image/mng.... Modified: branches/vince/netsurf-cairo/image/svg.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/image/svg.... Modified: branches/vince/netsurf-cairo/monkey/browser.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/monkey/bro... Modified: branches/vince/netsurf-cairo/monkey/plot.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/monkey/plo... Modified: branches/vince/netsurf-cairo/monkey/utils.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/monkey/uti... Modified: branches/vince/netsurf-cairo/render/box.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/render/box... Modified: branches/vince/netsurf-cairo/render/box.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/render/box... Modified: branches/vince/netsurf-cairo/render/box_construct.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/render/box... Modified: branches/vince/netsurf-cairo/render/form.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/render/for... Modified: branches/vince/netsurf-cairo/render/html.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/render/htm... Modified: branches/vince/netsurf-cairo/render/html.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/render/htm... Modified: branches/vince/netsurf-cairo/render/html_interaction.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/render/htm... Modified: branches/vince/netsurf-cairo/render/html_redraw.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/render/htm... Modified: branches/vince/netsurf-cairo/render/layout.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/render/lay... Modified: branches/vince/netsurf-cairo/riscos/configure/con_inter.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/con... Modified: branches/vince/netsurf-cairo/riscos/filetype.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/fil... Modified: branches/vince/netsurf-cairo/riscos/gui.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/gui... Modified: branches/vince/netsurf-cairo/riscos/gui.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/gui... Modified: branches/vince/netsurf-cairo/riscos/gui/url_bar.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/gui... Modified: branches/vince/netsurf-cairo/riscos/history.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/his... Modified: branches/vince/netsurf-cairo/riscos/hotlist.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/hot... Modified: branches/vince/netsurf-cairo/riscos/options.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/opt... Modified: branches/vince/netsurf-cairo/riscos/print.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/pri... Modified: branches/vince/netsurf-cairo/riscos/save.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/sav... Modified: branches/vince/netsurf-cairo/riscos/save_draw.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/sav... Modified: branches/vince/netsurf-cairo/riscos/search.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/sea... Modified: branches/vince/netsurf-cairo/riscos/templates/de URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/tem... Modified: branches/vince/netsurf-cairo/riscos/templates/en URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/tem... Modified: branches/vince/netsurf-cairo/riscos/templates/fr URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/tem... Modified: branches/vince/netsurf-cairo/riscos/templates/nl URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/tem... Modified: branches/vince/netsurf-cairo/riscos/thumbnail.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/thu... Modified: branches/vince/netsurf-cairo/riscos/toolbar.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/too... Modified: branches/vince/netsurf-cairo/riscos/treeview.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/tre... Modified: branches/vince/netsurf-cairo/riscos/wimp.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/wim... Modified: branches/vince/netsurf-cairo/riscos/wimp.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/wim... Modified: branches/vince/netsurf-cairo/riscos/wimp_event.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/wim... Modified: branches/vince/netsurf-cairo/riscos/wimp_event.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/wim... Modified: branches/vince/netsurf-cairo/riscos/window.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/riscos/win... Modified: branches/vince/netsurf-cairo/test/nsurl.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/test/nsurl... Modified: branches/vince/netsurf-cairo/test/urldbtest.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/test/urldb... Modified: branches/vince/netsurf-cairo/utils/nsurl.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/utils/nsur... Modified: branches/vince/netsurf-cairo/utils/nsurl.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/utils/nsur... Modified: branches/vince/netsurf-cairo/utils/types.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/utils/type... Modified: branches/vince/netsurf-cairo/windows/drawable.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/windows/dr... Modified: branches/vince/netsurf-cairo/windows/localhistory.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/windows/lo... Modified: branches/vince/netsurf-cairo/windows/thumbnail.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/windows/th...

11 years, 9 months

1
0
0 / 0

r13346 vince - in /branches/vince/netsurf-cairo: gtk/bitmap.c gtk/bitmap.h gtk/plotters.c image/image.c

by netsurf＠semichrome.net

Author: vince Date: Sat Dec 24 18:56:02 2011 New Revision: 13346 URL: http://source.netsurf-browser.org?rev=13346&view=rev Log: cope with completely transparent spacers cache scaled cairo bitmaps Modified: branches/vince/netsurf-cairo/gtk/bitmap.c branches/vince/netsurf-cairo/gtk/bitmap.h branches/vince/netsurf-cairo/gtk/plotters.c branches/vince/netsurf-cairo/image/image.c Modified: branches/vince/netsurf-cairo/gtk/bitmap.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/bitmap... ============================================================================== --- branches/vince/netsurf-cairo/gtk/bitmap.c (original) +++ branches/vince/netsurf-cairo/gtk/bitmap.c Sat Dec 24 18:56:02 2011 @@ -133,6 +133,7 @@ unsigned char *pixels; int pcount; int ploop; + assert(gbitmap); pixels = cairo_image_surface_get_data(gbitmap->surface); @@ -140,7 +141,7 @@ pcount = cairo_image_surface_get_stride(gbitmap->surface) * cairo_image_surface_get_height(gbitmap->surface); - for (ploop=3; ploop < pcount; ploop+=4) { + for (ploop = 3; ploop < pcount; ploop += 4) { if (pixels[ploop] != 0xff) { return false; } @@ -236,7 +237,12 @@ struct bitmap *gbitmap = (struct bitmap *)vbitmap; assert(gbitmap); - cairo_surface_destroy(gbitmap->surface); + if (gbitmap->surface != NULL) { + cairo_surface_destroy(gbitmap->surface); + } + if (gbitmap->scsurface != NULL) { + cairo_surface_destroy(gbitmap->scsurface); + } free(gbitmap); } Modified: branches/vince/netsurf-cairo/gtk/bitmap.h URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/bitmap... ============================================================================== --- branches/vince/netsurf-cairo/gtk/bitmap.h (original) +++ branches/vince/netsurf-cairo/gtk/bitmap.h Sat Dec 24 18:56:02 2011 @@ -23,7 +23,8 @@ #include "image/bitmap.h" struct bitmap { - cairo_surface_t *surface; + cairo_surface_t *surface; /* original cairo surface */ + cairo_surface_t *scsurface; /* scaled surface */ bool converted; /** set if the surface data has been converted */ }; Modified: branches/vince/netsurf-cairo/gtk/plotters.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/gtk/plotte... ============================================================================== --- branches/vince/netsurf-cairo/gtk/plotters.c (original) +++ branches/vince/netsurf-cairo/gtk/plotters.c Sat Dec 24 18:56:02 2011 @@ -280,7 +280,7 @@ static bool nsgtk_plot_pixbuf(int x, int y, int width, int height, - cairo_surface_t *bmsurface, colour bg) + struct bitmap *bitmap, colour bg) { /* XXX: This currently ignores the background colour supplied. * Does this matter? @@ -289,6 +289,8 @@ int x0, y0, x1, y1; int dsrcx, dsrcy, dwidth, dheight; int bmwidth, bmheight; + + cairo_surface_t *bmsurface = bitmap->surface; /* Bail early if we can */ if (width == 0 || height == 0) @@ -351,32 +353,44 @@ } else { /* Bitmap is scaled */ - cairo_surface_t *scsurface = cairo_surface_create_similar(bmsurface,CAIRO_CONTENT_COLOR_ALPHA, width, height); - cairo_t *cr = cairo_create (scsurface); - - /* Scale *before* setting the source surface (1) */ - cairo_scale (cr, (double)width / bmwidth, (double)height / bmheight); - cairo_set_source_surface (cr, bmsurface, 0, 0); - - /* To avoid getting the edge pixels blended with 0 alpha, which would - * occur with the default EXTEND_NONE. Use EXTEND_PAD for 1.2 or newer (2) - */ - cairo_pattern_set_extend (cairo_get_source(cr), CAIRO_EXTEND_REFLECT); - - /* Replace the destination with the source instead of overlaying */ - cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); - - /* Do the actual drawing */ - cairo_paint (cr); + if ((bitmap->scsurface != NULL) && + ((cairo_image_surface_get_width(bitmap->scsurface) != width) || + (cairo_image_surface_get_height(bitmap->scsurface) != height))){ + cairo_surface_destroy(bitmap->scsurface); + bitmap->scsurface = NULL; + } + + if (bitmap->scsurface == NULL) { + bitmap->scsurface = cairo_surface_create_similar(bmsurface,CAIRO_CONTENT_COLOR_ALPHA, width, height); + cairo_t *cr = cairo_create(bitmap->scsurface); + + /* Scale *before* setting the source surface (1) */ + cairo_scale(cr, (double)width / bmwidth, (double)height / bmheight); + cairo_set_source_surface(cr, bmsurface, 0, 0); + + /* To avoid getting the edge pixels blended with 0 + * alpha, which would occur with the default + * EXTEND_NONE. Use EXTEND_PAD for 1.2 or newer (2) + */ + cairo_pattern_set_extend(cairo_get_source(cr), + CAIRO_EXTEND_REFLECT); + + /* Replace the destination with the source instead of + * overlaying + */ + cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); + + /* Do the actual drawing */ + cairo_paint(cr); - cairo_destroy (cr); - + cairo_destroy(cr); + + } /* Plot the scaled bitmap */ - cairo_set_source_surface(current_cr, scsurface, x, y); + cairo_set_source_surface(current_cr, bitmap->scsurface, x, y); cairo_rectangle(current_cr, dsrcx, dsrcy, dwidth, dheight); cairo_fill(current_cr); - cairo_surface_destroy(scsurface); } @@ -391,35 +405,43 @@ bool repeat_x = (flags & BITMAPF_REPEAT_X); bool repeat_y = (flags & BITMAPF_REPEAT_Y); - cairo_surface_t *bmsurface = bitmap->surface; - if (!(repeat_x || repeat_y)) { /* Not repeating at all, so just pass it on */ - return nsgtk_plot_pixbuf(x, y, width, height, bmsurface, bg); + return nsgtk_plot_pixbuf(x, y, width, height, bitmap, bg); } width = bitmap_get_width(bitmap); height = bitmap_get_height(bitmap); - - if (y > cliprect.y) + /* Bail early if we can */ + if (width == 0 || height == 0) + /* Nothing to plot */ + return true; + + if (y > cliprect.y) { doneheight = (cliprect.y - height) + ((y - cliprect.y) % height); - else + } else { doneheight = y; + } while (doneheight < (cliprect.y + cliprect.height)) { - if (x > cliprect.x) + if (x > cliprect.x) { donewidth = (cliprect.x - width) + ((x - cliprect.x) % width); - else + } else { donewidth = x; + } + while (donewidth < (cliprect.x + cliprect.width)) { nsgtk_plot_pixbuf(donewidth, doneheight, - width, height, bmsurface, bg); + width, height, bitmap, bg); donewidth += width; - if (!repeat_x) break; + if (!repeat_x) + break; } doneheight += height; - if (!repeat_y) break; + + if (!repeat_y) + break; } return true; Modified: branches/vince/netsurf-cairo/image/image.c URL: http://source.netsurf-browser.org/branches/vince/netsurf-cairo/image/imag... ============================================================================== --- branches/vince/netsurf-cairo/image/image.c (original) +++ branches/vince/netsurf-cairo/image/image.c Sat Dec 24 18:56:02 2011 @@ -131,14 +131,16 @@ plot_style_t fill_style; struct rect area; - if (bitmap_get_opaque(bitmap)) { - width = bitmap_get_width(bitmap); - if (width == 1) { - height = bitmap_get_height(bitmap); - if (height == 1) { - /* optimise 1x1 bitmap plot */ - pixel = bitmap_get_buffer(bitmap); - fill_style.fill_colour = pixel_to_colour(pixel); + width = bitmap_get_width(bitmap); + if (width == 1) { + height = bitmap_get_height(bitmap); + if (height == 1) { + /* optimise 1x1 bitmap plot */ + pixel = bitmap_get_buffer(bitmap); + fill_style.fill_colour = pixel_to_colour(pixel); + + if (bitmap_get_opaque(bitmap) || + ((fill_style.fill_colour & 0xff000000) == 0xff000000)) { area = *clip; @@ -154,11 +156,14 @@ fill_style.stroke_type = PLOT_OP_TYPE_NONE; fill_style.fill_type = PLOT_OP_TYPE_SOLID; - /* LOG(("area %d,%d -> %d,%d", area.x0, area.y0, area.x1, area.y1)); */ + return ctx->plot->rectangle(area.x0, area.y0, - area.x1, area.y1, - &fill_style); + area.x1, area.y1, + &fill_style); + } else if ((fill_style.fill_colour & 0xff000000) == 0) { + /* transparent pixel used as spacer, skip it */ + return true; } } }

11 years, 9 months

1
0
0 / 0

r13345 jmb - /trunk/tools/buildsystem/makefiles/Makefile.tools

by netsurf＠semichrome.net

Author: jmb Date: Sat Dec 24 07:55:07 2011 New Revision: 13345 URL: http://source.netsurf-browser.org?rev=13345&view=rev Log: Add -N to amiga LDFLAGS Modified: trunk/tools/buildsystem/makefiles/Makefile.tools Modified: trunk/tools/buildsystem/makefiles/Makefile.tools URL: http://source.netsurf-browser.org/trunk/tools/buildsystem/makefiles/Makef... ============================================================================== --- trunk/tools/buildsystem/makefiles/Makefile.tools (original) +++ trunk/tools/buildsystem/makefiles/Makefile.tools Sat Dec 24 07:55:07 2011 @@ -268,7 +268,7 @@ # TODO: this assumes GCC CFLAGS := $(CFLAGS) -U__STRICT_ANSI__ -I$(GCCSDK_INSTALL_ENV)/include CXXFLAGS := $(CXXFLAGS) -U__STRICT_ANSI__ -I$(GCCSDK_INSTALL_ENV)/include - LDFLAGS := $(LDFLAGS) -L$(GCCSDK_INSTALL_ENV)/lib + LDFLAGS := $(LDFLAGS) -N -L$(GCCSDK_INSTALL_ENV)/lib PREFIX ?= $(GCCSDK_INSTALL_ENV) endif

11 years, 9 months

1
0
0 / 0

r13344 chris_y - /trunk/netsurf/amiga/gui.c

by netsurf＠semichrome.net

Author: chris_y Date: Sat Dec 24 07:24:09 2011 New Revision: 13344 URL: http://source.netsurf-browser.org?rev=13344&view=rev Log: Remove unnecessary cache of scroll position Modified: trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=13344&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sat Dec 24 07:24:09 2011 @@ -3867,10 +3867,6 @@ case GID_HSCROLL: case OID_HSCROLL: case OID_VSCROLL: - gui_window_get_scroll(gwin->bw->window, - &gwin->bw->window->scrollx, - &gwin->bw->window->scrolly); - if(option_faster_scroll == true) gwin->redraw_scroll = true; else gwin->redraw_scroll = false;

11 years, 9 months

1
0
0 / 0

r13343 chris_y - /trunk/netsurf/amiga/Makefile.target

by netsurf＠semichrome.net

Author: chris_y Date: Sat Dec 24 07:20:01 2011 New Revision: 13343 URL: http://source.netsurf-browser.org?rev=13343&view=rev Log: Stop ELF binary sections aligning to 64K boundaries Modified: trunk/netsurf/amiga/Makefile.target Modified: trunk/netsurf/amiga/Makefile.target URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/Makefile.target?rev... ============================================================================== --- trunk/netsurf/amiga/Makefile.target (original) +++ trunk/netsurf/amiga/Makefile.target Sat Dec 24 07:20:01 2011 @@ -5,7 +5,7 @@ CFLAGS += -std=c99 -I . -Dnsamiga ifneq ($(SUBTARGET),os3) - CFLAGS += -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__ + CFLAGS += -N -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__ endif NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE @@ -14,6 +14,7 @@ NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG +NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO ifeq ($(HOST),amiga) $(eval $(call feature_enabled,ROSPRITE,-DWITH_NSSPRITE,-lrosprite,Sprite (librosprite))) @@ -23,6 +24,7 @@ $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) $(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng))) $(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp))) + $(eval $(call feature_enabled,VIDEO,-DWITH_VIDEO -I /SDK/local/newlib/include/glib-2.0,-lgstreamer-0.10 -lglib-2.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lintl -lffi,Video (libgstreamer))) $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon)) $(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))

11 years, 9 months

1
0
0 / 0

r13342 chris_y - /trunk/netsurf/amiga/gui.c

by netsurf＠semichrome.net

Author: chris_y Date: Sat Dec 24 06:57:42 2011 New Revision: 13342 URL: http://source.netsurf-browser.org?rev=13342&view=rev Log: Search for DejaVu Serif Italic before DejaVu Serif Oblique, this fixes the fonts used on the splash screen if newer DejaVu fonts have been installed and the old ones removed. Modified: trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=13342&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sat Dec 24 06:57:42 2011 @@ -3994,13 +3994,21 @@ SetRPAttrs(win->RPort, RPTAG_APenColor, 0x003F6DFE, TAG_DONE); SetDrMd(win->RPort, JAM1); - tattr.ta_Name = "DejaVu Serif Oblique.font"; + tattr.ta_Name = "DejaVu Serif Italic.font"; tattr.ta_YSize = 24; tattr.ta_Style = 0; tattr.ta_Flags = 0; if(tfont = ami_font_open_disk_font(&tattr)) + { SetFont(win->RPort, tfont); + } + else + { + tattr.ta_Name = "DejaVu Serif Oblique.font"; + if(tfont = ami_font_open_disk_font(&tattr)) + SetFont(win->RPort, tfont); + } Move(win->RPort, left + 5, top + 25); Text(win->RPort, "Initialising...", strlen("Initialising..."));

11 years, 9 months

1
0
0 / 0

r13341 chris_y - /trunk/netsurf/amiga/gui.c

by netsurf＠semichrome.net

Author: chris_y Date: Sat Dec 24 06:49:55 2011 New Revision: 13341 URL: http://source.netsurf-browser.org?rev=13341&view=rev Log: Fix scrollbar scroll Modified: trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=13341&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sat Dec 24 06:49:55 2011 @@ -3306,6 +3306,9 @@ ami_get_hscroll_pos(g, (ULONG *)&hcurrent); ami_get_vscroll_pos(g, (ULONG *)&vcurrent); + g->bw->window->scrollx = hcurrent; + g->bw->window->scrolly = vcurrent; + c = g->bw->current_content; width=bbox->Width; @@ -3864,6 +3867,10 @@ case GID_HSCROLL: case OID_HSCROLL: case OID_VSCROLL: + gui_window_get_scroll(gwin->bw->window, + &gwin->bw->window->scrollx, + &gwin->bw->window->scrolly); + if(option_faster_scroll == true) gwin->redraw_scroll = true; else gwin->redraw_scroll = false;

11 years, 9 months

1
0
0 / 0

r13340 tlsa - /trunk/netsurf/desktop/tree.c

by netsurf＠semichrome.net

Author: tlsa Date: Sat Dec 24 03:54:51 2011 New Revision: 13340 URL: http://source.netsurf-browser.org?rev=13340&view=rev Log: Redraw old width after deletion too. Modified: trunk/netsurf/desktop/tree.c Modified: trunk/netsurf/desktop/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=13340&... ============================================================================== --- trunk/netsurf/desktop/tree.c (original) +++ trunk/netsurf/desktop/tree.c Sat Dec 24 03:54:51 2011 @@ -1163,6 +1163,7 @@ { int y = node->box.y; int height = tree->height; + int width = tree->width; bool redraw_setting = tree->redraw; tree->redraw = false; @@ -1174,7 +1175,7 @@ if (tree->redraw) tree->callbacks->redraw_request(0, y, - tree->width, height, tree->client_data); + width, height, tree->client_data); tree_recalculate_size(tree); } @@ -2115,6 +2116,7 @@ struct node *next; int y = node->box.y; int height = tree->height; + int width = tree->width; bool redraw_setting = tree->redraw; tree->redraw = false; @@ -2127,7 +2129,7 @@ if (tree->redraw) tree->callbacks->redraw_request(0, y, - tree->width, height, + width, height, tree->client_data); return; } @@ -2145,7 +2147,7 @@ if (tree->redraw) tree->callbacks->redraw_request(0, y, - tree->width, height, + width, height, tree->client_data); }

11 years, 9 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits December 2011