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

r12107 chris_y - in /trunk/netsurf/amiga: gui.c gui.h

by netsurf＠semichrome.net

Author: chris_y Date: Sat Mar 19 08:00:45 2011 New Revision: 12107 URL: http://source.netsurf-browser.org?rev=12107&view=rev Log: Redraw the area under a caret when it is cleared, rather than relying on a potentially out-of-date off-screen copy of what used to be there. Modified: trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/gui.h Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=12107&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sat Mar 19 08:00:45 2011 @@ -3755,14 +3755,12 @@ if(((x-xs) <= 0) || ((x-xs+2) >= (bbox->Width)) || ((y-ys) <= 0) || ((y-ys) >= (bbox->Height))) return; -/* Backup the area under the cursor - args need checking - BltBitMap(g->shared->win->RPort->BitMap, bbox->Left+x-xs, bbox->Top+y-ys, - browserglob.bm, x-xs, y-ys,2+1, height+1, 0x0C0, 0xff, NULL); -*/ + g->c_w = 2; SetDrMd(g->shared->win->RPort,COMPLEMENT); - RectFill(g->shared->win->RPort,x+bbox->Left-xs,y+bbox->Top-ys,x+bbox->Left+2-xs,y+bbox->Top+height-ys); + RectFill(g->shared->win->RPort, x + bbox->Left - xs, y + bbox->Top - ys, + x + bbox->Left + g->c_w - xs, y+bbox->Top + height - ys); SetDrMd(g->shared->win->RPort,JAM1); @@ -3787,11 +3785,8 @@ (g->shared->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) OffMenu(g->shared->win, AMI_MENU_PASTE); - GetAttr(SPACE_AreaBox, g->shared->objects[GID_BROWSER], (ULONG *)&bbox); - ami_get_hscroll_pos(g->shared, (ULONG *)&xs); - ami_get_vscroll_pos(g->shared, (ULONG *)&ys); - - BltBitMapRastPort(browserglob.bm,g->c_x-xs,g->c_y-ys,g->shared->win->RPort,bbox->Left+g->c_x-xs,bbox->Top+g->c_y-ys,2+1,g->c_h+1,0x0C0); + ami_do_redraw_limits(g, g->shared->bw, g->c_x, g->c_y, + g->c_x + g->c_w + 1, g->c_y + g->c_h + 1); g->c_h = 0; } Modified: trunk/netsurf/amiga/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.h?rev=12107&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.h (original) +++ trunk/netsurf/amiga/gui.h Sat Mar 19 08:00:45 2011 @@ -116,9 +116,10 @@ struct gui_window_2 *shared; int tab; struct Node *tab_node; - int c_x; - int c_y; - int c_h; + int c_x; /* Caret X posn */ + int c_y; /* Caret Y posn */ + int c_w; /* Caret width */ + int c_h; /* Caret height */ int c_h_temp; int scrollx; int scrolly;

12 years, 6 months

1
0
0 / 0

r12106 vince - in /trunk/netsurf/desktop: netsurf.c options.c options.h

by netsurf＠semichrome.net

Author: vince Date: Fri Mar 18 16:58:29 2011 New Revision: 12106 URL: http://source.netsurf-browser.org?rev=12106&view=rev Log: commandline option setting Modified: trunk/netsurf/desktop/netsurf.c trunk/netsurf/desktop/options.c trunk/netsurf/desktop/options.h Modified: trunk/netsurf/desktop/netsurf.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/netsurf.c?rev=121... ============================================================================== --- trunk/netsurf/desktop/netsurf.c (original) +++ trunk/netsurf/desktop/netsurf.c Fri Mar 18 16:58:29 2011 @@ -95,6 +95,7 @@ const char *messages) { struct utsname utsname; + nserror ret = NSERROR_OK; #ifdef HAVE_SIGPIPE /* Ignore SIGPIPE - this is necessary as OpenSSL can generate these @@ -152,7 +153,9 @@ /* Initialize system colours */ gui_system_colour_init(); - return NSERROR_OK; + options_commandline(pargc, *pargv); + + return ret; } Modified: trunk/netsurf/desktop/options.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/options.c?rev=121... ============================================================================== --- trunk/netsurf/desktop/options.c (original) +++ trunk/netsurf/desktop/options.c Fri Mar 18 16:58:29 2011 @@ -342,14 +342,50 @@ #define option_table_entries (sizeof option_table / sizeof option_table[0]) - +/** + * Set an option value based on a string + */ +static bool +strtooption(const char *value, struct option_entry_s *option_entry) +{ + bool ret = false; + colour rgbcolour; /* RRGGBB */ + + switch (option_entry->type) { + case OPTION_BOOL: + *((bool *)option_entry->p) = value[0] == '1'; + ret = true; + break; + + case OPTION_INTEGER: + *((int *)option_entry->p) = atoi(value); + ret = true; + break; + + case OPTION_COLOUR: + sscanf(value, "%x", &rgbcolour); + *((colour *)option_entry->p) = + ((0x000000FF & rgbcolour) << 16) | + ((0x0000FF00 & rgbcolour) << 0) | + ((0x00FF0000 & rgbcolour) >> 16); + ret = true; + break; + + case OPTION_STRING: + free(*((char **)option_entry->p)); + *((char **)option_entry->p) = strdup(value); + ret = true; + break; + } + + return ret; +} /* exported interface documented in options.h */ void options_read(const char *path) { char s[100]; FILE *fp; - colour rgbcolour; /* RRGGBB */ fp = fopen(path, "r"); if (!fp) { @@ -374,34 +410,7 @@ if (strcasecmp(s, option_table[i].key) != 0) continue; - switch (option_table[i].type) { - case OPTION_BOOL: - *((bool *) option_table[i].p) = - value[0] == '1'; - break; - - case OPTION_INTEGER: - *((int *) option_table[i].p) = - atoi(value); - break; - - case OPTION_COLOUR: - sscanf(value, "%x", &rgbcolour); - *((colour *) option_table[i].p) = - ((0x000000FF & - rgbcolour) << 16) | - ((0x0000FF00 & - rgbcolour) << 0) | - ((0x00FF0000 & - rgbcolour) >> 16); - break; - - case OPTION_STRING: - free(*((char **) option_table[i].p)); - *((char **) option_table[i].p) = - strdup(value); - break; - } + strtooption(value, option_table + i); break; } } @@ -568,6 +577,64 @@ return slen; } +/* exported interface documented in options.h */ +void options_commandline(int *pargc, char **argv) +{ + char *arg; + char *val; + int arglen; + int idx = 1; + int mv_loop; + + unsigned int entry_loop; + + while (idx < *pargc) { + arg = argv[idx]; + arglen = strlen(arg); + + /* check we have an option */ + /* option must start -- and be as long as the shortest option*/ + if ((arglen < (2+5) ) || (arg[0] != '-') || (arg[1] != '-')) + break; + + arg += 2; /* skip -- */ + + val = strchr(arg, '='); + if (val == NULL) { + /* no equals sign - next parameter is val */ + idx++; + if (idx >= *pargc) + break; + val = argv[idx]; + } else { + /* equals sign */ + arglen = val - arg ; + val++; + } + + /* arg+arglen is the option to set, val is the value */ + + LOG(("%.*s = %s",arglen,arg,val)); + + for (entry_loop = 0; + entry_loop < option_table_entries; + entry_loop++) { + if (strncmp(arg, option_table[entry_loop].key, + arglen) == 0) { + strtooption(val, option_table + entry_loop); + break; + } + } + + idx++; + } + + /* remove processed options from argv */ + for (mv_loop=0;mv_loop < (*pargc - idx); mv_loop++) { + argv[mv_loop + 1] = argv[mv_loop + idx]; + } + *pargc -= (idx - 1); +} /* exported interface documented in options.h */ int options_snoptionf(char *string, size_t size, unsigned int option, Modified: trunk/netsurf/desktop/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/options.h?rev=121... ============================================================================== --- trunk/netsurf/desktop/options.h (original) +++ trunk/netsurf/desktop/options.h Fri Mar 18 16:58:29 2011 @@ -190,5 +190,10 @@ int options_snoptionf(char *string, size_t size, unsigned int option, const char *fmt); +/** + * Process commandline and set options approriately. + */ +void options_commandline(int *pargc, char **argv); + #endif

12 years, 6 months

1
0
0 / 0

r12105 tlsa - in /trunk/netsurf: !NetSurf/Resources/en/credits.html, faf !NetSurf/Resources/en/licence.html, faf content/fetchers/about.c

by netsurf＠semichrome.net

Author: tlsa Date: Fri Mar 18 07:10:15 2011 New Revision: 12105 URL: http://source.netsurf-browser.org?rev=12105&view=rev Log: Various changes to about: content markup. Added me to LibNSFB bit. Modified: trunk/netsurf/!NetSurf/Resources/en/credits.html,faf trunk/netsurf/!NetSurf/Resources/en/licence.html,faf trunk/netsurf/content/fetchers/about.c Modified: trunk/netsurf/!NetSurf/Resources/en/credits.html,faf URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/c... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/en/credits.html,faf (original) +++ trunk/netsurf/!NetSurf/Resources/en/credits.html,faf Fri Mar 18 07:10:15 2011 @@ -3,7 +3,7 @@ <html> <head> <title>NetSurf | About Credits</title> -<link rel="stylesheet" title="Standard" type="text/css" href="resource:internal.css"> +<link rel="stylesheet" type="text/css" href="resource:internal.css"> <style> div#DevList li { float: left; Modified: trunk/netsurf/!NetSurf/Resources/en/licence.html,faf URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/l... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/en/licence.html,faf (original) +++ trunk/netsurf/!NetSurf/Resources/en/licence.html,faf Fri Mar 18 07:10:15 2011 @@ -3,7 +3,7 @@ <html> <head> <title>NetSurf | About Licence</title> -<link rel="stylesheet" title="Standard" type="text/css" href="resource:internal.css"> +<link rel="stylesheet" type="text/css" href="resource:internal.css"> <style> div.licence { background: #ddd; @@ -36,9 +36,18 @@ <h1>NetSurf Licence</h1> -<p>NetSurf, the source code, documentation, translatable messages files and UI definitions are licensed under the GNU General Public Licence, version 2.0. In addition, as a special exception, permission is granted to link the code of this release of NetSurf with the OpenSSL project's "OpenSSL" library (or with modified versions of it that use the same licence as the "OpenSSL" library), and distribute the linked executables.</p> - -<p>You must obey the GNU General Public License version 2 in all respects for all of the code used other than "OpenSSL". If you modify the code, you may extend this exception to your version of the code, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.</p> +<p>NetSurf, the source code, documentation, translatable messages files and UI +definitions are licensed under the GNU General Public Licence, version 2.0. In +addition, as a special exception, permission is granted to link the code of this +release of NetSurf with the OpenSSL project's "OpenSSL" library (or with +modified versions of it that use the same licence as the "OpenSSL" library), +and distribute the linked executables.</p> + +<p>You must obey the GNU General Public License version 2 in all respects for +all of the code used other than "OpenSSL". If you modify the code, you may +extend this exception to your version of the code, but you are not obligated to +do so. If you do not wish to do so, delete this exception statement from your +version.</p> <h2>Component Licencing</h2> @@ -63,7 +72,7 @@ <dt><a href="http://www.netsurf-browser.org/projects/hubbub/">Hubbub</a></dt> <dd> -<span>© 2007–2011 John-Mark Bell<br />© 2008–2009 Andrew Sidwell</span> +<span>© 2007–2011 John-Mark Bell<br>© 2008–2009 Andrew Sidwell</span> <span><a href="#mit">MIT</a></span> </dd> @@ -99,13 +108,13 @@ <dt><a href="http://source.netsurf-browser.org/trunk/libnsbmp/">Libnsbmp</a></dt> <dd> -<span>© 2006 Richard Wilson<br />© 2008 Sean Fox</span> +<span>© 2006 Richard Wilson<br>© 2008 Sean Fox</span> <span><a href="#mit">MIT</a></span> </dd> <dt><a href="http://source.netsurf-browser.org/trunk/libnsfb/">Libnsfb</a></dt> <dd> -<span>© 2009–2011 Vincent Sanders</span> +<span>© 2009–2011 Vincent Sanders<br>© 2009–2011 Michael Drake</span> <span><a href="#mit">MIT</a></span> </dd> @@ -163,7 +172,7 @@ <dt><a href="http://www.openssl.org/">OpenSSL</a></dt> <dd> -<span>© 1995–1998 Eric A. Young, Tim J. Hudson<br />© 1998–2010 The OpenSSL Project</span> +<span>© 1995–1998 Eric A. Young, Tim J. Hudson<br>© 1998–2010 The OpenSSL Project</span> <span><a href="#openssl">OpenSSL</a></span> </dd> @@ -181,7 +190,10 @@ <dt><a href="http://www.riscos.info/websvn/listing.php?repname=gccsdk&path=%2Ftrunk%2F...">UnixLib</a></dt> <dd> -<span>© 1995–1999 Simon Callan, Nick Burrett, Nicholas Clark and Peter Burwood<br />© 1999–2009 Nick Burrett, John Tytgat, Peter Naulls, Lee Noar, Peter Teichmann, Alex Waugh, Christian Ludlam, Theo Markettos, Graham Shaw, James Bursa and John-Mark Bell.</span> +<span>© 1995–1999 Simon Callan, Nick Burrett, Nicholas Clark and +Peter Burwood<br>© 1999–2009 Nick Burrett, John Tytgat, Peter Naulls, +Lee Noar, Peter Teichmann, Alex Waugh, Christian Ludlam, Theo Markettos, +Graham Shaw, James Bursa and John-Mark Bell.</span> <span><a href="#unixlib">UnixLib</a></span> </dd> @@ -194,8 +206,10 @@ <h2>Licence texts</h2> -<p>Generic forms of the licence texts appear here where possible. Some components may vary the licence slightly, and our best effort has been made to detect these -changes and have the different licence listed here. Changes in white space, etc, were not considered.</p> +<p>Generic forms of the licence texts appear here where possible. Some +components may vary the licence slightly, and our best effort has been made to +detect these changes and have the different licence listed here. Changes in +white space, etc, were not considered.</p> <a name="gplv2" /> <h3>GNU General Public Licence, Version 2</h3> Modified: trunk/netsurf/content/fetchers/about.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchers/about.c?... ============================================================================== --- trunk/netsurf/content/fetchers/about.c (original) +++ trunk/netsurf/content/fetchers/about.c Fri Mar 18 07:10:15 2011 @@ -173,17 +173,18 @@ goto fetch_about_config_handler_aborted; slen = snprintf(buffer, sizeof buffer, - "<html><head><title>NetSurf Browser Config</title>" - "<link rel=\"stylesheet\" title=\"Standard\" " - "type=\"text/css\" href=\"resource:internal.css\">" - "</head>" - "<body id =\"configlist\">" + "<html>\n<head>\n" + "<title>NetSurf Browser Config</title>\n" + "<link rel=\"stylesheet\" type=\"text/css\" " + "href=\"resource:internal.css\">\n" + "</head>\n" + "<body id =\"configlist\">\n" "<p class=\"banner\">" "<a href=\"http://www.netsurf-browser.org/\">" "<img src=\"resource:netsurf.png\" alt=\"NetSurf\"></a>" - "</p>" - "<h1>NetSurf Browser Config</h1>" - "<table class=\"config\">" + "</p>\n" + "<h1>NetSurf Browser Config</h1>\n" + "<table class=\"config\">\n" "<tr><th></th><th></th><th></th></tr>\n"); do { @@ -207,7 +208,7 @@ } while (res > 0); slen += snprintf(buffer + slen, sizeof buffer - slen, - "</table></body></html>"); + "</table>\n</body>\n</html>\n"); if (fetch_about_send_callback(FETCH_DATA, ctx, buffer, slen, FETCH_ERROR_NO_ERROR)) @@ -310,7 +311,9 @@ #elif defined(WT_BRANCHISRELEASE) "# This is a release build of NetSurf\n\n" #elif defined(WT_NO_SVN) - "# This NetSurf was built outside of our revision control environment.\n# This testament is therefore very useful.\n\n" + "# This NetSurf was built outside of our revision " + "control environment.\n" + "# This testament is therefore very useful.\n\n" #else "# This NetSurf was built from a branch.\n\n" #endif @@ -414,16 +417,17 @@ goto fetch_about_config_handler_aborted; slen = snprintf(buffer, sizeof buffer, - "<html><head><title>NetSurf List of About pages</title>" - "<link rel=\"stylesheet\" title=\"Standard\" " - "type=\"text/css\" href=\"resource:internal.css\">" - "</head>" - "<body id =\"aboutlist\">" + "<html>\n<head>\n" + "<title>NetSurf List of About pages</title>\n" + "<link rel=\"stylesheet\" type=\"text/css\" " + "href=\"resource:internal.css\">\n" + "</head>\n" + "<body id =\"aboutlist\">\n" "<p class=\"banner\">" "<a href=\"http://www.netsurf-browser.org/\">" "<img src=\"resource:netsurf.png\" alt=\"NetSurf\"></a>" - "</p>" - "<h1>NetSurf List of About pages</h1>" + "</p>\n" + "<h1>NetSurf List of About pages</h1>\n" "<ul>\n"); for (abt_loop = 0; abt_loop < about_handler_list_len; abt_loop++) { @@ -452,7 +456,7 @@ } slen += snprintf(buffer + slen, sizeof buffer - slen, - "</ul></body></html>"); + "</ul>\n</body>\n</html>\n"); if (fetch_about_send_callback(FETCH_DATA, ctx, buffer, slen, FETCH_ERROR_NO_ERROR))

12 years, 6 months

1
0
0 / 0

r12104 chris_y - /trunk/netsurf/amiga/dist/Install

by netsurf＠semichrome.net

Author: chris_y Date: Thu Mar 17 18:17:05 2011 New Revision: 12104 URL: http://source.netsurf-browser.org?rev=12104&view=rev Log: Don't add NetSurf as FTP (launch-)handler. Probably need to document how to add another app to handle FTP though, as it's not obvious but could be useful. Modified: trunk/netsurf/amiga/dist/Install Modified: trunk/netsurf/amiga/dist/Install URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/Install?rev=12... ============================================================================== --- trunk/netsurf/amiga/dist/Install (original) +++ trunk/netsurf/amiga/dist/Install Thu Mar 17 18:17:05 2011 @@ -564,7 +564,7 @@ (p_fitr "ENVARC:launch-handler/URL/HTTP.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"URL=*\"http://%s*\"\"") (p_fitr "ENVARC:launch-handler/URL/HTTPS.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"URL=*\"https://%s*\"\"") (p_fitr "ENVARC:launch-handler/URL/WWW.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"URL=*\"http://www.%s*\"\"") - (p_fitr "ENVARC:launch-handler/URL/FTP.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"URL=*\"ftp://%s*\"\"") +; (p_fitr "ENVARC:launch-handler/URL/FTP.LH" "ClientName=\"NETSURF\" ClientPath=\"APPDIR:NETSURF\" CMDFORMAT=\"URL=*\"ftp://%s*\"\"") ) )

12 years, 6 months

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: chris_y Date: Thu Mar 17 18:13:50 2011 New Revision: 12103 URL: http://source.netsurf-browser.org?rev=12103&view=rev Log: Enable fast scrolling for non-HTML contents Modified: trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=12103&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Thu Mar 17 18:13:50 2011 @@ -3295,7 +3295,7 @@ if(g->bw->scale != 1.0) g->redraw_scroll = false; } - if(g->redraw_scroll && content_get_type(c) == CONTENT_HTML) + if(g->redraw_scroll) { g->bw->window->c_h_temp = g->bw->window->c_h; gui_window_remove_caret(g->bw->window);

12 years, 6 months

1
0
0 / 0

r12102 jmb - in /branches/jmb/content-factory: ./ amiga/ cocoa/ content/ css/ desktop/ framebuffer/ gtk/ image/ render/ riscos/ riscos/gui/

by netsurf＠semichrome.net

Author: jmb Date: Thu Mar 17 17:20:31 2011 New Revision: 12102 URL: http://source.netsurf-browser.org?rev=12102&view=rev Log: Introduce a content factory and make content handlers register with it. Added: branches/jmb/content-factory/content/content_factory.c branches/jmb/content-factory/content/content_factory.h branches/jmb/content-factory/image/image.c branches/jmb/content-factory/image/image.h Modified: branches/jmb/content-factory/Makefile.sources branches/jmb/content-factory/amiga/Makefile.target branches/jmb/content-factory/amiga/filetype.c branches/jmb/content-factory/amiga/gui.c branches/jmb/content-factory/amiga/icon.c branches/jmb/content-factory/amiga/icon.h branches/jmb/content-factory/amiga/menu.c branches/jmb/content-factory/cocoa/NetsurfApp.m branches/jmb/content-factory/cocoa/apple_image.h branches/jmb/content-factory/cocoa/apple_image.m branches/jmb/content-factory/content/content.c branches/jmb/content-factory/content/content.h branches/jmb/content-factory/content/content_protected.h branches/jmb/content-factory/content/content_type.h branches/jmb/content-factory/content/hlcache.c branches/jmb/content-factory/content/hlcache.h branches/jmb/content-factory/css/css.c branches/jmb/content-factory/css/css.h branches/jmb/content-factory/css/select.c branches/jmb/content-factory/desktop/browser.c branches/jmb/content-factory/desktop/netsurf.c branches/jmb/content-factory/desktop/save_complete.c branches/jmb/content-factory/desktop/searchweb.c branches/jmb/content-factory/desktop/tree.c branches/jmb/content-factory/desktop/tree_url_node.c branches/jmb/content-factory/framebuffer/tree.c branches/jmb/content-factory/gtk/scaffolding.c branches/jmb/content-factory/gtk/treeview.c branches/jmb/content-factory/image/bmp.c branches/jmb/content-factory/image/bmp.h branches/jmb/content-factory/image/gif.c branches/jmb/content-factory/image/gif.h branches/jmb/content-factory/image/ico.c branches/jmb/content-factory/image/ico.h branches/jmb/content-factory/image/jpeg.c branches/jmb/content-factory/image/jpeg.h branches/jmb/content-factory/image/mng.c branches/jmb/content-factory/image/mng.h branches/jmb/content-factory/image/nssprite.c branches/jmb/content-factory/image/nssprite.h branches/jmb/content-factory/image/png.c branches/jmb/content-factory/image/png.h branches/jmb/content-factory/image/rsvg.c branches/jmb/content-factory/image/rsvg.h branches/jmb/content-factory/image/svg.c branches/jmb/content-factory/image/svg.h branches/jmb/content-factory/image/webp.c branches/jmb/content-factory/image/webp.h branches/jmb/content-factory/render/box.c branches/jmb/content-factory/render/box_construct.c branches/jmb/content-factory/render/favicon.c branches/jmb/content-factory/render/form.c branches/jmb/content-factory/render/html.c branches/jmb/content-factory/render/html.h branches/jmb/content-factory/render/imagemap.c branches/jmb/content-factory/render/layout.c branches/jmb/content-factory/render/textplain.c branches/jmb/content-factory/render/textplain.h branches/jmb/content-factory/riscos/artworks.c branches/jmb/content-factory/riscos/artworks.h branches/jmb/content-factory/riscos/draw.c branches/jmb/content-factory/riscos/draw.h branches/jmb/content-factory/riscos/filetype.c branches/jmb/content-factory/riscos/gui.c branches/jmb/content-factory/riscos/gui/url_bar.c branches/jmb/content-factory/riscos/save.c branches/jmb/content-factory/riscos/sprite.c branches/jmb/content-factory/riscos/sprite.h branches/jmb/content-factory/riscos/treeview.c branches/jmb/content-factory/riscos/window.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/jmb/content-factory/Makefile.sources URL: http://source.netsurf-browser.org/branches/jmb/content-factory/Makefile.s... Modified: branches/jmb/content-factory/amiga/Makefile.target URL: http://source.netsurf-browser.org/branches/jmb/content-factory/amiga/Make... Modified: branches/jmb/content-factory/amiga/filetype.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/amiga/file... Modified: branches/jmb/content-factory/amiga/gui.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/amiga/gui.... Modified: branches/jmb/content-factory/amiga/icon.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/amiga/icon... Modified: branches/jmb/content-factory/amiga/icon.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/amiga/icon... Modified: branches/jmb/content-factory/amiga/menu.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/amiga/menu... Modified: branches/jmb/content-factory/cocoa/NetsurfApp.m URL: http://source.netsurf-browser.org/branches/jmb/content-factory/cocoa/Nets... Modified: branches/jmb/content-factory/cocoa/apple_image.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/cocoa/appl... Modified: branches/jmb/content-factory/cocoa/apple_image.m URL: http://source.netsurf-browser.org/branches/jmb/content-factory/cocoa/appl... Modified: branches/jmb/content-factory/content/content.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/content/co... Modified: branches/jmb/content-factory/content/content.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/content/co... Added: branches/jmb/content-factory/content/content_factory.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/content/co... Added: branches/jmb/content-factory/content/content_factory.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/content/co... Modified: branches/jmb/content-factory/content/content_protected.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/content/co... Modified: branches/jmb/content-factory/content/content_type.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/content/co... Modified: branches/jmb/content-factory/content/hlcache.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/content/hl... Modified: branches/jmb/content-factory/content/hlcache.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/content/hl... Modified: branches/jmb/content-factory/css/css.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/css/css.c?... Modified: branches/jmb/content-factory/css/css.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/css/css.h?... Modified: branches/jmb/content-factory/css/select.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/css/select... Modified: branches/jmb/content-factory/desktop/browser.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/desktop/br... Modified: branches/jmb/content-factory/desktop/netsurf.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/desktop/ne... Modified: branches/jmb/content-factory/desktop/save_complete.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/desktop/sa... Modified: branches/jmb/content-factory/desktop/searchweb.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/desktop/se... Modified: branches/jmb/content-factory/desktop/tree.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/desktop/tr... Modified: branches/jmb/content-factory/desktop/tree_url_node.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/desktop/tr... Modified: branches/jmb/content-factory/framebuffer/tree.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/framebuffe... Modified: branches/jmb/content-factory/gtk/scaffolding.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/gtk/scaffo... Modified: branches/jmb/content-factory/gtk/treeview.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/gtk/treevi... Modified: branches/jmb/content-factory/image/bmp.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/bmp.... Modified: branches/jmb/content-factory/image/bmp.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/bmp.... Modified: branches/jmb/content-factory/image/gif.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/gif.... Modified: branches/jmb/content-factory/image/gif.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/gif.... Modified: branches/jmb/content-factory/image/ico.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/ico.... Modified: branches/jmb/content-factory/image/ico.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/ico.... Added: branches/jmb/content-factory/image/image.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/imag... Added: branches/jmb/content-factory/image/image.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/imag... Modified: branches/jmb/content-factory/image/jpeg.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/jpeg... Modified: branches/jmb/content-factory/image/jpeg.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/jpeg... Modified: branches/jmb/content-factory/image/mng.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/mng.... Modified: branches/jmb/content-factory/image/mng.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/mng.... Modified: branches/jmb/content-factory/image/nssprite.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/nssp... Modified: branches/jmb/content-factory/image/nssprite.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/nssp... Modified: branches/jmb/content-factory/image/png.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/png.... Modified: branches/jmb/content-factory/image/png.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/png.... Modified: branches/jmb/content-factory/image/rsvg.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/rsvg... Modified: branches/jmb/content-factory/image/rsvg.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/rsvg... Modified: branches/jmb/content-factory/image/svg.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/svg.... Modified: branches/jmb/content-factory/image/svg.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/svg.... Modified: branches/jmb/content-factory/image/webp.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/webp... Modified: branches/jmb/content-factory/image/webp.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/image/webp... Modified: branches/jmb/content-factory/render/box.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/render/box... Modified: branches/jmb/content-factory/render/box_construct.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/render/box... Modified: branches/jmb/content-factory/render/favicon.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/render/fav... Modified: branches/jmb/content-factory/render/form.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/render/for... Modified: branches/jmb/content-factory/render/html.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/render/htm... Modified: branches/jmb/content-factory/render/html.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/render/htm... Modified: branches/jmb/content-factory/render/imagemap.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/render/ima... Modified: branches/jmb/content-factory/render/layout.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/render/lay... Modified: branches/jmb/content-factory/render/textplain.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/render/tex... Modified: branches/jmb/content-factory/render/textplain.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/render/tex... Modified: branches/jmb/content-factory/riscos/artworks.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/art... Modified: branches/jmb/content-factory/riscos/artworks.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/art... Modified: branches/jmb/content-factory/riscos/draw.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/dra... Modified: branches/jmb/content-factory/riscos/draw.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/dra... Modified: branches/jmb/content-factory/riscos/filetype.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/fil... Modified: branches/jmb/content-factory/riscos/gui.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/gui... Modified: branches/jmb/content-factory/riscos/gui/url_bar.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/gui... Modified: branches/jmb/content-factory/riscos/save.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/sav... Modified: branches/jmb/content-factory/riscos/sprite.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/spr... Modified: branches/jmb/content-factory/riscos/sprite.h URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/spr... Modified: branches/jmb/content-factory/riscos/treeview.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/tre... Modified: branches/jmb/content-factory/riscos/window.c URL: http://source.netsurf-browser.org/branches/jmb/content-factory/riscos/win...

12 years, 6 months

1
0
0 / 0

r12101 jmb - /branches/jmb/content-factory/

by netsurf＠semichrome.net

Author: jmb Date: Thu Mar 17 17:19:07 2011 New Revision: 12101 URL: http://source.netsurf-browser.org?rev=12101&view=rev Log: Branch for content factory work Added: branches/jmb/content-factory/ - copied from r12100, trunk/netsurf/

12 years, 6 months

1
0
0 / 0

r12100 mmu_man - in /trunk/netsurf/beos: beos_scaffolding.cpp beos_window.cpp

by netsurf＠semichrome.net

Author: mmu_man Date: Thu Mar 17 15:53:59 2011 New Revision: 12100 URL: http://source.netsurf-browser.org?rev=12100&view=rev Log: Fix BeOS build: - missing include, - use css_computed_color() accessor instead of struct css_computed_style member as it's now opaque to us. Modified: trunk/netsurf/beos/beos_scaffolding.cpp trunk/netsurf/beos/beos_window.cpp Modified: trunk/netsurf/beos/beos_scaffolding.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_scaffolding.cpp... ============================================================================== --- trunk/netsurf/beos/beos_scaffolding.cpp (original) +++ trunk/netsurf/beos/beos_scaffolding.cpp Thu Mar 17 15:53:59 2011 @@ -54,6 +54,7 @@ #include "render/form.h" #include "render/html.h" #include "utils/messages.h" +#include "utils/schedule.h" #include "utils/utils.h" #include "utils/log.h" } Modified: trunk/netsurf/beos/beos_window.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_window.cpp?rev=... ============================================================================== --- trunk/netsurf/beos/beos_window.cpp (original) +++ trunk/netsurf/beos/beos_window.cpp Thu Mar 17 15:53:59 2011 @@ -1885,7 +1885,10 @@ nsbeos_style_to_font(font, &style); run->offset = current_selection.Length(); run->font = font; - run->color = nsbeos_rgb_colour(nscss_color_to_ns(box->style->color)); + css_color csscolor; + if (css_computed_color(box->style, &csscolor) == CSS_COLOR_COLOR) { + run->color = nsbeos_rgb_colour(nscss_color_to_ns(csscolor)); + } current_selection_textruns.AddItem(run); space = box->space != 0; }

12 years, 6 months

1
0
0 / 0

r12099 tlsa - /trunk/netsurf/amiga/gui.c

by netsurf＠semichrome.net

Author: tlsa Date: Thu Mar 17 13:53:04 2011 New Revision: 12099 URL: http://source.netsurf-browser.org?rev=12099&view=rev Log: Remove what should now be redundant special casing of text/plain. Modified: trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=12099&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Thu Mar 17 13:53:04 2011 @@ -3347,12 +3347,6 @@ clip.y0 = 0; clip.x1 = width; clip.y1 = height; - - if(content_get_type(c) == CONTENT_TEXTPLAIN) - { - clip.x1 += hcurrent; - clip.y1 += vcurrent; - } } else {

12 years, 6 months

1
0
0 / 0

r12098 tlsa - /trunk/netsurf/render/textplain.c

by netsurf＠semichrome.net

Author: tlsa Date: Thu Mar 17 13:49:25 2011 New Revision: 12098 URL: http://source.netsurf-browser.org?rev=12098&view=rev Log: Handle scaled rendering of text/plain with plot origin offset too. Modified: trunk/netsurf/render/textplain.c Modified: trunk/netsurf/render/textplain.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/textplain.c?rev=12... ============================================================================== --- trunk/netsurf/render/textplain.c (original) +++ trunk/netsurf/render/textplain.c Thu Mar 17 13:49:25 2011 @@ -557,8 +557,8 @@ unsigned long line_count = c->data.textplain.physical_line_count; float line_height = textplain_line_height(); float scaled_line_height = line_height * scale; - long line0 = (clip->y0 - y) / scaled_line_height - 1; - long line1 = (clip->y1 - y) / scaled_line_height + 1; + long line0 = (clip->y0 - y * scale) / scaled_line_height - 1; + long line1 = (clip->y1 - y * scale) / scaled_line_height + 1; struct textplain_line *line = c->data.textplain.physical_line; size_t length; plot_style_t *plot_style_highlight; @@ -590,8 +590,8 @@ /* Set up font plot style */ textplain_style.background = background_colour; - x += MARGIN * scale; - y += MARGIN * scale; + x = (x + MARGIN) * scale; + y = (y + MARGIN) * scale; for (lineno = line0; lineno != line1; lineno++) { const char *text = utf8_data + line[lineno].start; int tab_width = textplain_tab_width * scale;

12 years, 6 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 March 2011