May 2012 - netsurf-commits - listmaster.pepperfish.net

r13934 tlsa - /trunk/netsurfweb/downloads/atari/index.en

by netsurf＠semichrome.net

Author: tlsa Date: Wed May 30 16:00:52 2012 New Revision: 13934 URL: http://source.netsurf-browser.org?rev=13934&view=rev Log: Add OS version for Atari download. Thanks to m0n0. Modified: trunk/netsurfweb/downloads/atari/index.en Modified: trunk/netsurfweb/downloads/atari/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/downloads/atari/index.... ============================================================================== --- trunk/netsurfweb/downloads/atari/index.en (original) +++ trunk/netsurfweb/downloads/atari/index.en Wed May 30 16:00:52 2012 @@ -65,7 +65,7 @@  <p class="preul">Requires:</p> <ul> -<li>Atari OS version?</li> +<li>FreeMiNT 1.17</li> </ul> </div>

10 years, 10 months

1
0
0 / 0

r13933 jmb - /trunk/libcss/docs/Bytecode

by netsurf＠semichrome.net

Author: jmb Date: Tue May 29 12:49:27 2012 New Revision: 13933 URL: http://source.netsurf-browser.org?rev=13933&view=rev Log: Fix up documentation lies Modified: trunk/libcss/docs/Bytecode Modified: trunk/libcss/docs/Bytecode URL: http://source.netsurf-browser.org/trunk/libcss/docs/Bytecode?rev=13933&r1... ============================================================================== --- trunk/libcss/docs/Bytecode (original) +++ trunk/libcss/docs/Bytecode Tue May 29 12:49:27 2012 @@ -27,8 +27,8 @@ a fixed point value with 22 bits assigned to the integer part and 10 bits assigned to the fractional part. -Strings are stored as a pointer to an interned string. -The pointer's width is the native width of a pointer on the platform. +Strings are stored as a 32bit index into a table of interned string pointers. +The table is found in the stylesheet object. CSS dimensions are stored as two 32bit values: <length, units>. Length is a 32bit numeric value (as described above) and unit is as follows: @@ -71,12 +71,7 @@ 00000000 => Hz 00000001 => kHz -CSS colours are stored as one 32bit value: - - bits 24-31: Alpha component - bits 16-23: Red component - bits 8-15 : Green component - bits 0-7 : Blue component +CSS colours are stored as one 32bit value. See "Colour" for their format. Shorthand properties --------------------

10 years, 10 months

1
0
0 / 0

r13932 tlsa - in /trunk/netsurfweb/downloads: amiga/index.en atari/index.en beos/index.en gtk/index.en macosx/index.en riscos/index.en source/index.en

by netsurf＠semichrome.net

Author: tlsa Date: Mon May 28 16:01:41 2012 New Revision: 13932 URL: http://source.netsurf-browser.org?rev=13932&view=rev Log: Fix various links. Add Mac OS X NetSurf 2.9 download. Reorder source code download page. Modified: trunk/netsurfweb/downloads/amiga/index.en trunk/netsurfweb/downloads/atari/index.en trunk/netsurfweb/downloads/beos/index.en trunk/netsurfweb/downloads/gtk/index.en trunk/netsurfweb/downloads/macosx/index.en trunk/netsurfweb/downloads/riscos/index.en trunk/netsurfweb/downloads/source/index.en Modified: trunk/netsurfweb/downloads/amiga/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/downloads/amiga/index.... ============================================================================== --- trunk/netsurfweb/downloads/amiga/index.en (original) +++ trunk/netsurfweb/downloads/amiga/index.en Mon May 28 16:01:41 2012 @@ -47,7 +47,7 @@ <div class="content"> -<p class="breadcrumbs"><a href="/">Home</a> » <a href="/">Downloads</a> » AmigaOS</p> +<p class="breadcrumbs"><a href="/">Home</a> » <a href="/downloads/">Downloads</a> » AmigaOS</p> <h1>AmigaOS NetSurf Downloads</h1> Modified: trunk/netsurfweb/downloads/atari/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/downloads/atari/index.... ============================================================================== --- trunk/netsurfweb/downloads/atari/index.en (original) +++ trunk/netsurfweb/downloads/atari/index.en Mon May 28 16:01:41 2012 @@ -47,7 +47,7 @@ <div class="content"> -<p class="breadcrumbs"><a href="/">Home</a> » <a href="/">Downloads</a> » Atari</p> +<p class="breadcrumbs"><a href="/">Home</a> » <a href="/downloads/">Downloads</a> » Atari</p> <h1>Atari NetSurf Downloads</h1> Modified: trunk/netsurfweb/downloads/beos/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/downloads/beos/index.e... ============================================================================== --- trunk/netsurfweb/downloads/beos/index.en (original) +++ trunk/netsurfweb/downloads/beos/index.en Mon May 28 16:01:41 2012 @@ -47,7 +47,7 @@ <div class="content"> -<p class="breadcrumbs"><a href="/">Home</a> » <a href="/">Downloads</a> » BeOS</p> +<p class="breadcrumbs"><a href="/">Home</a> » <a href="/downloads/">Downloads</a> » BeOS</p> <h1>Haiku and BeOS NetSurf Downloads</h1> Modified: trunk/netsurfweb/downloads/gtk/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/downloads/gtk/index.en... ============================================================================== --- trunk/netsurfweb/downloads/gtk/index.en (original) +++ trunk/netsurfweb/downloads/gtk/index.en Mon May 28 16:01:41 2012 @@ -47,7 +47,7 @@ <div class="content"> -<p class="breadcrumbs"><a href="/">Home</a> » <a href="/">Downloads</a> » GTK</p> +<p class="breadcrumbs"><a href="/">Home</a> » <a href="/downloads/">Downloads</a> » GTK</p> <h1>GTK NetSurf Downloads</h1> Modified: trunk/netsurfweb/downloads/macosx/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/downloads/macosx/index... ============================================================================== --- trunk/netsurfweb/downloads/macosx/index.en (original) +++ trunk/netsurfweb/downloads/macosx/index.en Mon May 28 16:01:41 2012 @@ -47,7 +47,7 @@ <div class="content"> -<p class="breadcrumbs"><a href="/">Home</a> » <a href="/">Downloads</a> » Mac OS X</p> +<p class="breadcrumbs"><a href="/">Home</a> » <a href="/downloads/">Downloads</a> » Mac OS X</p> <h1>Mac OS X NetSurf Downloads</h1> @@ -61,7 +61,7 @@ <div class="downloadlatestouter"> <div class="downloadlatest"> <div class="downloadlatestbox"> -<p class="downloadmain downloadfirst"><a href="NetSurf-2.8.dmg"><span>NetSurf 2.8 for Mac OS X</span> <span>(1.3MB)</span> <span class="downloaddate">21 Sep 2011</span></a></p> +<p class="downloadmain downloadfirst"><a href="NetSurf-2.9.dmg"><span>NetSurf 2.9 for Mac OS X</span> <span>(1.3MB)</span> <span class="downloaddate">27 Mar 2012</span></a></p>  <p class="preul">Requires:</p> <ul> @@ -71,7 +71,7 @@ </div> <div class="downloadlatestbox downloadlast"> -<p class="downloadmain"><a href="/downloads/releases/netsurf-2.8-src.tar.gz"><span>NetSurf 2.8 source code</span> <span>(2.3MB)</span> <span class="downloaddate">21 Aep 2011</span></a></p> +<p class="downloadmain"><a href="/downloads/releases/netsurf-2.9-src.tar.gz"><span>NetSurf 2.9 source code</span> <span>(2.3MB)</span> <span class="downloaddate">27 Mar 2012</span></a></p> <p class="downloadinstructions"><a href="/downloads/source/#BuildInstructions">Build instructions</a></p> <p class="preul">Build NetSurf for:</p> <ul> @@ -89,10 +89,17 @@ <h2>Previous releases</h2> <dl> +<dt>NetSurf 2.8</dt> +<dd> +<ul> +<li><a href="NetSurf-2.8.dmg">NetSurf 2.8</a> – Mac OS X 10.6 or later, for x86_64 – (21 Sep 2011)</li> +<li><a href="/downloads/releases/netsurf-2.8-src.tar.gz">NetSurf 2.8 source code</a> (21 Sep 2011)</li> +</ul> +</dd> <dt>NetSurf 2.7</dt> <dd> <ul> -<li><a href="netsurf-2.7.zip">NetSurf 2.7 browser for AmigaOS 4</a> – Mac OS X 10.5 or later, for i386, x86_64 and ppc – (16 Apr 2011)</li> +<li><a href="netsurf-2.7.zip">NetSurf 2.7</a> – Mac OS X 10.5 or later, for i386, x86_64 and ppc – (16 Apr 2011)</li> <li><a href="/downloads/releases/netsurf-2.7-src.tar.gz">NetSurf 2.7 source code</a> (16 Apr 2011)</li> </ul> </dd> Modified: trunk/netsurfweb/downloads/riscos/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/downloads/riscos/index... ============================================================================== --- trunk/netsurfweb/downloads/riscos/index.en (original) +++ trunk/netsurfweb/downloads/riscos/index.en Mon May 28 16:01:41 2012 @@ -48,7 +48,7 @@ <div class="content"> -<p class="breadcrumbs"><a href="/">Home</a> » <a href="/">Downloads</a> » RISC OS</p> +<p class="breadcrumbs"><a href="/">Home</a> » <a href="/downloads/">Downloads</a> » RISC OS</p> <h1>RISC OS NetSurf Downloads</h1> Modified: trunk/netsurfweb/downloads/source/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/downloads/source/index... ============================================================================== --- trunk/netsurfweb/downloads/source/index.en (original) +++ trunk/netsurfweb/downloads/source/index.en Mon May 28 16:01:41 2012 @@ -51,6 +51,23 @@ <h1>NetSurf Source Code</h1> +<p>The source code for each release version of NetSurf is available.</p> + +<ul> +<li><a href="/downloads/releases/netsurf-2.9-full-src.tar.gz">NetSurf 2.9 source code</a> (27 Mar 2012)</li> +<li><a href="/downloads/releases/netsurf-2.8-full-src.tar.gz">NetSurf 2.8 source code</a> (21 Sep 2011)</li> +<li><a href="/downloads/releases/netsurf-2.7-full-src.tar.gz">NetSurf 2.7 source code</a> (16 Apr 2011)</li> +<li><a href="/downloads/releases/netsurf-2.6-src.tar.gz">NetSurf 2.6 source code</a> (21 Sep 2010)</li> +<li><a href="/downloads/releases/netsurf-2.5-src.tar.gz">NetSurf 2.5 source code</a> (18 Apr 2010)</li> +<li><a href="/downloads/releases/netsurf-2.1-src.tar.gz">NetSurf 2.1 source code</a> (23 May 2009)</li> +<li><a href="/downloads/releases/netsurf-2.0-src.tar.gz">NetSurf 2.0 source code</a> (25 Apr 2009)</li> +<li><a href="/downloads/releases/netsurf-1.2-src.tar.gz">NetSurf 1.2 source code</a> (22 Mar 2008)</li> +<li><a href="/downloads/releases/netsurf-1.1-src.tar.gz">NetSurf 1.1 source code</a> (13 Aug 2007)</li> +<li><a href="/downloads/releases/netsurf-1.0-src.tar.gz">NetSurf 1.0 source code</a> (17 May 2007)</li> +</ul> + +<h2>Development version source code</h2> + <p>NetSurf's source code is stored in a Subversion (SVN) repository. <strong>The best way to obtain the latest source code is to check it out of SVN.</strong> To do so, run the following command:</p> <p><code>$ svn co svn://svn.netsurf-browser.org/trunk/netsurf</code></p> @@ -79,26 +96,9 @@ <h3>AmigaOS</h3> <p>Users of AmigaOS should follow the build instructions provided in the <a href="http://source.netsurf-browser.org/*checkout*/trunk/netsurf/Docs/BUILDING-..."><code>Docs/BUILDING-AmigaOS</code></a> file. This can be found in the source tree or viewed via the SVN web interface.</p> -<h2>Release source code</h2> - -<p>The source code for each release version of NetSurf is also available.</p> - -<ul> -<li><a href="/downloads/releases/netsurf-2.9-full-src.tar.gz">NetSurf 2.9 source code</a> (27 Mar 2012)</li> -<li><a href="/downloads/releases/netsurf-2.8-full-src.tar.gz">NetSurf 2.8 source code</a> (21 Sep 2011)</li> -<li><a href="/downloads/releases/netsurf-2.7-full-src.tar.gz">NetSurf 2.7 source code</a> (16 Apr 2011)</li> -<li><a href="/downloads/releases/netsurf-2.6-src.tar.gz">NetSurf 2.6 source code</a> (21 Sep 2010)</li> -<li><a href="/downloads/releases/netsurf-2.5-src.tar.gz">NetSurf 2.5 source code</a> (18 Apr 2010)</li> -<li><a href="/downloads/releases/netsurf-2.1-src.tar.gz">NetSurf 2.1 source code</a> (23 May 2009)</li> -<li><a href="/downloads/releases/netsurf-2.0-src.tar.gz">NetSurf 2.0 source code</a> (25 Apr 2009)</li> -<li><a href="/downloads/releases/netsurf-1.2-src.tar.gz">NetSurf 1.2 source code</a> (22 Mar 2008)</li> -<li><a href="/downloads/releases/netsurf-1.1-src.tar.gz">NetSurf 1.1 source code</a> (13 Aug 2007)</li> -<li><a href="/downloads/releases/netsurf-1.0-src.tar.gz">NetSurf 1.0 source code</a> (17 May 2007)</li> -</ul> - <div class="footer"> -<p>Copyright 2003 - 2010 The NetSurf Developers</p> +<p>Copyright 2003 - 2012 The NetSurf Developers</p> </div> </div>

10 years, 10 months

1
0
0 / 0

r13931 tlsa - in /trunk/netsurfweb/downloads: macosx/index.en source/index.en

by netsurf＠semichrome.net

Author: tlsa Date: Mon May 28 09:44:16 2012 New Revision: 13931 URL: http://source.netsurf-browser.org?rev=13931&view=rev Log: Fix Mac OS page breadcrumbs. Add 2.9 to source download page. Modified: trunk/netsurfweb/downloads/macosx/index.en trunk/netsurfweb/downloads/source/index.en Modified: trunk/netsurfweb/downloads/macosx/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/downloads/macosx/index... ============================================================================== --- trunk/netsurfweb/downloads/macosx/index.en (original) +++ trunk/netsurfweb/downloads/macosx/index.en Mon May 28 09:44:16 2012 @@ -47,7 +47,7 @@ <div class="content"> -<p class="breadcrumbs"><a href="/">Home</a> » <a href="/">Downloads</a> » AmigaOS</p> +<p class="breadcrumbs"><a href="/">Home</a> » <a href="/">Downloads</a> » Mac OS X</p> <h1>Mac OS X NetSurf Downloads</h1> Modified: trunk/netsurfweb/downloads/source/index.en URL: http://source.netsurf-browser.org/trunk/netsurfweb/downloads/source/index... ============================================================================== --- trunk/netsurfweb/downloads/source/index.en (original) +++ trunk/netsurfweb/downloads/source/index.en Mon May 28 09:44:16 2012 @@ -84,6 +84,7 @@ <p>The source code for each release version of NetSurf is also available.</p> <ul> +<li><a href="/downloads/releases/netsurf-2.9-full-src.tar.gz">NetSurf 2.9 source code</a> (27 Mar 2012)</li> <li><a href="/downloads/releases/netsurf-2.8-full-src.tar.gz">NetSurf 2.8 source code</a> (21 Sep 2011)</li> <li><a href="/downloads/releases/netsurf-2.7-full-src.tar.gz">NetSurf 2.7 source code</a> (16 Apr 2011)</li> <li><a href="/downloads/releases/netsurf-2.6-src.tar.gz">NetSurf 2.6 source code</a> (21 Sep 2010)</li>

10 years, 10 months

1
0
0 / 0

r13930 dsilvers - /trunk/netsurf/utils/nsurl.c

by netsurf＠semichrome.net

Author: dsilvers Date: Wed May 23 05:34:30 2012 New Revision: 13930 URL: http://source.netsurf-browser.org?rev=13930&view=rev Log: Fix FTP detection. Thanks to Etienne Cochard <etienne.cochard(a)gmail.com> for spotting the bug. Modified: trunk/netsurf/utils/nsurl.c Modified: trunk/netsurf/utils/nsurl.c URL: http://source.netsurf-browser.org/trunk/netsurf/utils/nsurl.c?rev=13930&r... ============================================================================== --- trunk/netsurf/utils/nsurl.c (original) +++ trunk/netsurf/utils/nsurl.c Wed May 23 05:34:30 2012 @@ -310,7 +310,7 @@ (*(pos - off + 4) == 'S')))) { marker.scheme_type = NSURL_SCHEME_HTTPS; is_http = true; - } else if (off == SLEN("https") && + } else if (off == SLEN("ftp") && (((*(pos - off + 0) == 'f') || (*(pos - off + 0) == 'F')) && ((*(pos - off + 1) == 't') ||

10 years, 10 months

1
0
0 / 0

r13929 chris_y - in /trunk/netsurf: amiga/gui_options.c resources/FatMessages

by netsurf＠semichrome.net

Author: chris_y Date: Sun May 20 12:53:07 2012 New Revision: 13929 URL: http://source.netsurf-browser.org?rev=13929&view=rev Log: Add DoNotTrack to Amiga options GUI Modified: trunk/netsurf/amiga/gui_options.c trunk/netsurf/resources/FatMessages Modified: trunk/netsurf/amiga/gui_options.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui_options.c?rev=1... ============================================================================== --- trunk/netsurf/amiga/gui_options.c (original) +++ trunk/netsurf/amiga/gui_options.c Sun May 20 12:53:07 2012 @@ -78,6 +78,7 @@ GID_OPTS_FROMLOCALE, GID_OPTS_HISTORY, GID_OPTS_REFERRAL, + GID_OPTS_DONOTTRACK, GID_OPTS_FASTSCROLL, GID_OPTS_SCREEN, GID_OPTS_SCREENMODE, @@ -117,7 +118,7 @@ GID_OPTS_TAB_LAST, GID_OPTS_SEARCH_PROV, GID_OPTS_CLIPBOARD, - GID_OPTS_CMENU_ENABLE, + GID_OPTS_CONTEXTMENU, GID_OPTS_STARTUP_NO_WIN, GID_OPTS_CLOSE_NO_QUIT, GID_OPTS_DOCKY, @@ -143,6 +144,7 @@ GRP_OPTS_CONTENTBLOCKING, GRP_OPTS_CONTENTLANGUAGE, GRP_OPTS_HISTORY, + GRP_OPTS_PRIVACY, GRP_OPTS_MISC, GRP_OPTS_SCREEN, GRP_OPTS_THEME, @@ -160,7 +162,6 @@ GRP_OPTS_TABS, GRP_OPTS_SEARCH, GRP_OPTS_CLIPBOARD, - GRP_OPTS_CONTEXTMENU, GRP_OPTS_BEHAVIOUR, GRP_OPTS_MARGINS, GRP_OPTS_SCALING, @@ -249,6 +250,7 @@ gadlab[GID_OPTS_FROMLOCALE] = (char *)ami_utf8_easy((char *)messages_get("LocaleLang")); gadlab[GID_OPTS_HISTORY] = (char *)ami_utf8_easy((char *)messages_get("HistoryAge")); gadlab[GID_OPTS_REFERRAL] = (char *)ami_utf8_easy((char *)messages_get("SendReferer")); + gadlab[GID_OPTS_DONOTTRACK] = (char *)ami_utf8_easy((char *)messages_get("DoNotTrack")); gadlab[GID_OPTS_FASTSCROLL] = (char *)ami_utf8_easy((char *)messages_get("FastScrolling")); gadlab[GID_OPTS_PTRTRUE] = (char *)ami_utf8_easy((char *)messages_get("TrueColour")); gadlab[GID_OPTS_PTROS] = (char *)ami_utf8_easy((char *)messages_get("OSPointers")); @@ -283,7 +285,7 @@ gadlab[GID_OPTS_TAB_LAST] = (char *)ami_utf8_easy((char *)messages_get("TabLast")); gadlab[GID_OPTS_SEARCH_PROV] = (char *)ami_utf8_easy((char *)messages_get("SearchProvider")); gadlab[GID_OPTS_CLIPBOARD] = (char *)ami_utf8_easy((char *)messages_get("ClipboardUTF8")); - gadlab[GID_OPTS_CMENU_ENABLE] = (char *)ami_utf8_easy((char *)messages_get("Enable")); + gadlab[GID_OPTS_CONTEXTMENU] = (char *)ami_utf8_easy((char *)messages_get("ContextMenu")); gadlab[GID_OPTS_STARTUP_NO_WIN] = (char *)ami_utf8_easy((char *)messages_get("OptionNoWindow")); gadlab[GID_OPTS_CLOSE_NO_QUIT] = (char *)ami_utf8_easy((char *)messages_get("OptionNoQuit")); gadlab[GID_OPTS_DOCKY] = (char *)ami_utf8_easy((char *)messages_get("OptionDocky")); @@ -331,7 +333,7 @@ gadlab[GRP_OPTS_TABS] = (char *)ami_utf8_easy((char *)messages_get("TabbedBrowsing")); gadlab[GRP_OPTS_SEARCH] = (char *)ami_utf8_easy((char *)messages_get("SearchWeb")); gadlab[GRP_OPTS_CLIPBOARD] = (char *)ami_utf8_easy((char *)messages_get("Clipboard")); - gadlab[GRP_OPTS_CONTEXTMENU] = (char *)ami_utf8_easy((char *)messages_get("ContextMenu")); + gadlab[GRP_OPTS_PRIVACY] = (char *)ami_utf8_easy((char *)messages_get("Privacy")); gadlab[GRP_OPTS_BEHAVIOUR] = (char *)ami_utf8_easy((char *)messages_get("Behaviour")); gadlab[GRP_OPTS_MARGINS] = (char *)ami_utf8_easy((char *)messages_get("Margins")); gadlab[GRP_OPTS_SCALING] = (char *)ami_utf8_easy((char *)messages_get("Scaling")); @@ -607,18 +609,18 @@ LAYOUT_AddChild,VGroupObject, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, - LAYOUT_Label, gadlab[GRP_OPTS_MISC], + LAYOUT_Label, gadlab[GRP_OPTS_PRIVACY], LAYOUT_AddChild, gow->objects[GID_OPTS_REFERRAL] = CheckBoxObject, GA_ID, GID_OPTS_REFERRAL, GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_REFERRAL], GA_Selected, nsoption_bool(send_referer), CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = CheckBoxObject, - GA_ID, GID_OPTS_FASTSCROLL, + LAYOUT_AddChild, gow->objects[GID_OPTS_DONOTTRACK] = CheckBoxObject, + GA_ID, GID_OPTS_DONOTTRACK, GA_RelVerify, TRUE, - GA_Text, gadlab[GID_OPTS_FASTSCROLL], - GA_Selected, nsoption_bool(faster_scroll), + GA_Text, gadlab[GID_OPTS_DONOTTRACK], + GA_Selected, nsoption_bool(do_not_track), CheckBoxEnd, LayoutEnd, // misc CHILD_WeightedHeight, 0, @@ -1205,16 +1207,22 @@ LayoutEnd, // hgroup CHILD_WeightedHeight, 0, - LAYOUT_AddChild,VGroupObject, + LAYOUT_AddChild,HGroupObject, LAYOUT_BevelStyle, BVS_GROUP, - LAYOUT_Label, gadlab[GRP_OPTS_CONTEXTMENU], - LAYOUT_SpaceOuter, TRUE, - LAYOUT_AddChild, gow->objects[GID_OPTS_CMENU_ENABLE] = CheckBoxObject, - GA_ID, GID_OPTS_CMENU_ENABLE, + LAYOUT_Label, gadlab[GRP_OPTS_MISC], + LAYOUT_SpaceOuter, TRUE, + LAYOUT_AddChild, gow->objects[GID_OPTS_CONTEXTMENU] = CheckBoxObject, + GA_ID, GID_OPTS_CONTEXTMENU, GA_RelVerify, TRUE, - GA_Text, gadlab[GID_OPTS_CMENU_ENABLE], + GA_Text, gadlab[GID_OPTS_CONTEXTMENU], GA_Selected, nsoption_bool(context_menu), CheckBoxEnd, + LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = CheckBoxObject, + GA_ID, GID_OPTS_FASTSCROLL, + GA_RelVerify, TRUE, + GA_Text, gadlab[GID_OPTS_FASTSCROLL], + GA_Selected, nsoption_bool(faster_scroll), + CheckBoxEnd, LayoutEnd, // context menus CHILD_WeightedHeight, 0, @@ -1446,6 +1454,13 @@ nsoption_set_bool(send_referer, false); } + GetAttr(GA_Selected,gow->objects[GID_OPTS_DONOTTRACK],(ULONG *)&data); + if (data) { + nsoption_set_bool(do_not_track, true); + } else { + nsoption_set_bool(do_not_track, false); + } + GetAttr(GA_Selected,gow->objects[GID_OPTS_FASTSCROLL],(ULONG *)&data); if (data) { nsoption_set_bool(faster_scroll, true); @@ -1648,7 +1663,7 @@ nsoption_set_bool(utf8_clipboard, false); } - GetAttr(GA_Selected,gow->objects[GID_OPTS_CMENU_ENABLE],(ULONG *)&data); + GetAttr(GA_Selected,gow->objects[GID_OPTS_CONTEXTMENU],(ULONG *)&data); if (data) { nsoption_set_bool(context_menu, true); } else { Modified: trunk/netsurf/resources/FatMessages URL: http://source.netsurf-browser.org/trunk/netsurf/resources/FatMessages?rev... ============================================================================== --- trunk/netsurf/resources/FatMessages (original) +++ trunk/netsurf/resources/FatMessages Sun May 20 12:53:07 2012 @@ -5186,11 +5186,11 @@ fr.all.ContentLanguage:Content language it.all.ContentLanguage:Lingua contenuti nl.all.ContentLanguage:Content language -en.all.LocaleLang:Get from Locale prefs -de.all.LocaleLang:Rechnervorgabe nutzen -fr.all.LocaleLang:Get from Locale prefs -it.all.LocaleLang:Ottieni da preferenze localizzazione -nl.all.LocaleLang:Get from Locale prefs +en.ami.LocaleLang:Get from Locale prefs +de.ami.LocaleLang:Rechnervorgabe nutzen +fr.ami.LocaleLang:Get from Locale prefs +it.ami.LocaleLang:Ottieni da preferenze localizzazione +nl.ami.LocaleLang:Get from Locale prefs en.all.HistoryAge:Keep history for de.all.HistoryAge:History behalten fÃ¼r fr.all.HistoryAge:Keep history for @@ -5206,11 +5206,21 @@ fr.all.Miscellaneous:Miscellaneous it.all.Miscellaneous:Impostazioni varie nl.all.Miscellaneous:Miscellaneous +en.ami.Privacy:Privacy +de.ami.Privacy:Privacy +fr.ami.Privacy:Privacy +it.ami.Privacy:Privacy +nl.ami.Privacy:Privacy en.all.SendReferer:Send site referral information de.all.SendReferer:Seitenreferenzen senden fr.all.SendReferer:Send site referral information it.all.SendReferer:Invia informazioni sul referral del sito nl.all.SendReferer:Send site referral information +en.ami.DoNotTrack:Send header to tell websites not to track +de.ami.DoNotTrack:Send header to tell websites not to track +fr.ami.DoNotTrack:Send header to tell websites not to track +it.ami.DoNotTrack:Send header to tell websites not to track +nl.ami.DoNotTrack:Send header to tell websites not to track en.all.FastScrolling:Fast scrolling de.all.FastScrolling:Schnelles Scrollen fr.all.FastScrolling:Fast scrolling

10 years, 10 months

1
0
0 / 0

r13928 chris_y - in /trunk/netsurf: content/fetchers/curl.c desktop/options_main.h

by netsurf＠semichrome.net

Author: chris_y Date: Sun May 20 11:29:57 2012 New Revision: 13928 URL: http://source.netsurf-browser.org?rev=13928&view=rev Log: Add support for sending DoNotTrack header. Modified: trunk/netsurf/content/fetchers/curl.c trunk/netsurf/desktop/options_main.h Modified: trunk/netsurf/content/fetchers/curl.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchers/curl.c?r... ============================================================================== --- trunk/netsurf/content/fetchers/curl.c (original) +++ trunk/netsurf/content/fetchers/curl.c Sun May 20 11:29:57 2012 @@ -422,6 +422,10 @@ nsoption_charp(accept_charset)); s[sizeof s - 1] = 0; APPEND(fetch->headers, s); + } + + if (nsoption_bool(do_not_track) == true) { + APPEND(fetch->headers, "DNT: 1"); } /* And add any headers specified by the caller */ Modified: trunk/netsurf/desktop/options_main.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/options_main.h?re... ============================================================================== --- trunk/netsurf/desktop/options_main.h (original) +++ trunk/netsurf/desktop/options_main.h Sun May 20 11:29:57 2012 @@ -70,6 +70,9 @@ int disc_cache_age; \ /** Whether to block advertisements */ \ bool block_ads; \ + /** Disable website tracking, see \ + * http://www.w3.org/Submission/2011/SUBM-web-tracking-protection-20110224/#... */ \ + bool do_not_track; \ /** Minimum GIF animation delay */ \ int minimum_gif_delay; \ /** Whether to send the referer HTTP header */ \ @@ -217,6 +220,7 @@ .memory_cache_size = 12 * 1024 * 1024, \ .disc_cache_age = 28, \ .block_ads = false, \ + .do_not_track = false, \ .minimum_gif_delay = 10, \ .send_referer = true, \ .foreground_images = true, \ @@ -310,6 +314,7 @@ { "memory_cache_size", OPTION_INTEGER, &nsoptions.memory_cache_size }, \ { "disc_cache_age", OPTION_INTEGER, &nsoptions.disc_cache_age }, \ { "block_advertisements", OPTION_BOOL, &nsoptions.block_ads }, \ + { "do_not_track", OPTION_BOOL, &nsoptions.do_not_track }, \ { "minimum_gif_delay", OPTION_INTEGER, &nsoptions.minimum_gif_delay }, \ { "send_referer", OPTION_BOOL, &nsoptions.send_referer }, \ { "foreground_images", OPTION_BOOL, &nsoptions.foreground_images }, \

10 years, 10 months

1
0
0 / 0

r13927 vince - in /trunk/netsurf/gtk: compat.c compat.h dialogs/about.c dialogs/source.c gui.c scaffolding.c theme.c treeview.c window.c

by netsurf＠semichrome.net

Author: vince Date: Thu May 17 11:48:20 2012 New Revision: 13927 URL: http://source.netsurf-browser.org?rev=13927&view=rev Log: fix build on gtk 2.12 Modified: trunk/netsurf/gtk/compat.c trunk/netsurf/gtk/compat.h trunk/netsurf/gtk/dialogs/about.c trunk/netsurf/gtk/dialogs/source.c trunk/netsurf/gtk/gui.c trunk/netsurf/gtk/scaffolding.c trunk/netsurf/gtk/theme.c trunk/netsurf/gtk/treeview.c trunk/netsurf/gtk/window.c Modified: trunk/netsurf/gtk/compat.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/compat.c?rev=13927&r1... ============================================================================== --- trunk/netsurf/gtk/compat.c (original) +++ trunk/netsurf/gtk/compat.c Thu May 17 11:48:20 2012 @@ -24,6 +24,10 @@ #include "gtk/compat.h" +#if !GTK_CHECK_VERSION(2,16,0) +#include "gtk/sexy_icon_entry.c" +#endif + void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus) { #if GTK_CHECK_VERSION(2,22,0) @@ -250,7 +254,11 @@ #if GTK_CHECK_VERSION(3,0,0) return gtk_widget_get_state_flags(widget); #else +#if GTK_CHECK_VERSION(2,18,0) return gtk_widget_get_state(widget); +#else + return 0; /* FIXME */ +#endif #endif } @@ -300,4 +308,95 @@ #endif } - +GdkWindow *nsgtk_widget_get_window(GtkWidget *widget) +{ +#if GTK_CHECK_VERSION(2,14,0) +return gtk_widget_get_window(widget); +#else + return widget->window; +#endif +} + +GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_dialog_get_content_area(dialog); +#else + return dialog->vbox; +#endif +} + +GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_dialog_get_action_area(dialog); +#else + return dialog->action_area; +#endif +} + +gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, GError **error) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_show_uri(screen, uri, timestamp, error); +#else + return FALSE; /* FIXME */ +#endif +} + +GdkWindow *nsgtk_layout_get_bin_window(GtkLayout *layout) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_layout_get_bin_window(layout); +#else + return layout->bin_window; +#endif +} + +gdouble nsgtk_adjustment_get_step_increment(GtkAdjustment *adjustment) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_adjustment_get_step_increment(adjustment); +#else + return adjustment->step_increment; +#endif +} + +gdouble nsgtk_adjustment_get_upper(GtkAdjustment *adjustment) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_adjustment_get_upper(adjustment); +#else + return adjustment->upper; +#endif +} + +gdouble nsgtk_adjustment_get_lower(GtkAdjustment *adjustment) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_adjustment_get_lower(adjustment); +#else + return adjustment->lower; +#endif +} + +gdouble nsgtk_adjustment_get_page_increment(GtkAdjustment *adjustment) +{ +#if GTK_CHECK_VERSION(2,14,0) + return gtk_adjustment_get_page_increment(adjustment); +#else + return adjustment->page_increment; +#endif +} + +void nsgtk_widget_get_allocation(GtkWidget *widget, GtkAllocation *allocation) +{ +#if GTK_CHECK_VERSION(2,18,0) + gtk_widget_get_allocation(widget, allocation); +#else + allocation->x = widget->allocation.x; + allocation->y = widget->allocation.y; + allocation->width = widget->allocation.width; + allocation->height = widget->allocation.height; +#endif +} Modified: trunk/netsurf/gtk/compat.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/compat.h?rev=13927&r1... ============================================================================== --- trunk/netsurf/gtk/compat.h (original) +++ trunk/netsurf/gtk/compat.h Thu May 17 11:48:20 2012 @@ -62,10 +62,6 @@ void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf); void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id); void nsgtk_widget_override_background_color(GtkWidget *widget, GtkStateFlags state, uint16_t a, uint16_t r, uint16_t g, uint16_t b); -GtkAdjustment *nsgtk_layout_get_vadjustment(GtkLayout *layout); -GtkAdjustment *nsgtk_layout_get_hadjustment(GtkLayout *layout); -void nsgtk_layout_set_hadjustment(GtkLayout *layout, GtkAdjustment *adj); -void nsgtk_layout_set_vadjustment(GtkLayout *layout, GtkAdjustment *adj); GtkWidget* nsgtk_hbox_new(gboolean homogeneous, gint spacing); GtkWidget* nsgtk_vbox_new(gboolean homogeneous, gint spacing); GtkStateFlags nsgtk_widget_get_state_flags(GtkWidget *widget); @@ -74,5 +70,21 @@ gulong nsgtk_connect_draw_event(GtkWidget *widget, GCallback callback, gpointer g); void nsgdk_cursor_unref(GdkCursor *cursor); void nsgtk_widget_modify_font(GtkWidget *widget, PangoFontDescription *font_desc); +GdkWindow *nsgtk_widget_get_window(GtkWidget *widget); +GtkWidget *nsgtk_dialog_get_action_area(GtkDialog *dialog); +GtkWidget *nsgtk_dialog_get_content_area(GtkDialog *dialog); +gboolean nsgtk_show_uri(GdkScreen *screen, const gchar *uri, guint32 timestamp, GError **error); +GdkWindow *nsgtk_layout_get_bin_window(GtkLayout *layout); +void nsgtk_widget_get_allocation(GtkWidget *widget, GtkAllocation *allocation); + +GtkAdjustment *nsgtk_layout_get_vadjustment(GtkLayout *layout); +GtkAdjustment *nsgtk_layout_get_hadjustment(GtkLayout *layout); +void nsgtk_layout_set_hadjustment(GtkLayout *layout, GtkAdjustment *adj); +void nsgtk_layout_set_vadjustment(GtkLayout *layout, GtkAdjustment *adj); +gdouble nsgtk_adjustment_get_step_increment(GtkAdjustment *adjustment); +gdouble nsgtk_adjustment_get_upper(GtkAdjustment *adjustment); +gdouble nsgtk_adjustment_get_lower(GtkAdjustment *adjustment); +gdouble nsgtk_adjustment_get_page_increment(GtkAdjustment *adjustment); + #endif /* NETSURF_GTK_COMPAT_H */ Modified: trunk/netsurf/gtk/dialogs/about.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/dialogs/about.c?rev=1... ============================================================================== --- trunk/netsurf/gtk/dialogs/about.c (original) +++ trunk/netsurf/gtk/dialogs/about.c Thu May 17 11:48:20 2012 @@ -59,7 +59,7 @@ vbox = nsgtk_vbox_new(FALSE, 8); - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(nsgtk_dialog_get_content_area(GTK_DIALOG(dialog))), vbox, TRUE, TRUE, 0); if (pixbufs != NULL) { GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf(GDK_PIXBUF(g_list_nth_data(pixbufs, 0))); @@ -103,16 +103,16 @@ /* Add the credits button */ button = gtk_button_new_from_stock ("Credits"); - gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), + gtk_box_pack_end(GTK_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, FALSE, TRUE, 0); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE); + gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE); g_signal_connect(button, "clicked", G_CALLBACK(nsgtk_about_dialog_credits), (gpointer)bw); /* Add the Licence button */ button = gtk_button_new_from_stock ("Licence"); - gtk_box_pack_end(GTK_BOX (GTK_DIALOG(gtk_dialog_get_action_area(GTK_DIALOG(dialog)))), + gtk_box_pack_end(GTK_BOX (GTK_DIALOG(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog)))), button, FALSE, TRUE, 0); - gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(gtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE); + gtk_button_box_set_child_secondary (GTK_BUTTON_BOX(nsgtk_dialog_get_action_area(GTK_DIALOG(dialog))), button, TRUE); g_signal_connect(button, "clicked", G_CALLBACK(nsgtk_about_dialog_licence), (gpointer)bw); Modified: trunk/netsurf/gtk/dialogs/source.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/dialogs/source.c?rev=... ============================================================================== --- trunk/netsurf/gtk/dialogs/source.c (original) +++ trunk/netsurf/gtk/dialogs/source.c Thu May 17 11:48:20 2012 @@ -332,7 +332,7 @@ warn[len] = '\0'; label = gtk_label_new(warn); - gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(confd))), + gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_content_area(GTK_DIALOG(confd))), label); gtk_widget_show(label); if (gtk_dialog_run(GTK_DIALOG(confd)) == GTK_RESPONSE_ACCEPT) { @@ -360,7 +360,7 @@ g_signal_connect_swapped(notif, "response", G_CALLBACK(gtk_widget_destroy), notif); label = gtk_label_new(temp); - gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(notif))), label); + gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_content_area(GTK_DIALOG(notif))), label); gtk_widget_show_all(notif); } Modified: trunk/netsurf/gtk/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gui.c?rev=13927&r1=13... ============================================================================== --- trunk/netsurf/gtk/gui.c (original) +++ trunk/netsurf/gtk/gui.c Thu May 17 11:48:20 2012 @@ -670,7 +670,7 @@ gboolean ok; GError *error = NULL; - ok = gtk_show_uri(NULL, url, GDK_CURRENT_TIME, &error); + ok = nsgtk_show_uri(NULL, url, GDK_CURRENT_TIME, &error); if (ok == TRUE) return; Modified: trunk/netsurf/gtk/scaffolding.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/scaffolding.c?rev=139... ============================================================================== --- trunk/netsurf/gtk/scaffolding.c (original) +++ trunk/netsurf/gtk/scaffolding.c Thu May 17 11:48:20 2012 @@ -1410,7 +1410,7 @@ gtk_widget_show(GTK_WIDGET(g->history_window->window)); gtk_window_move(g->history_window->window, x + g->historybase, y + g->toolbarbase); - gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(g->history_window->window))); + gdk_window_raise(nsgtk_widget_get_window(GTK_WIDGET(g->history_window->window))); return TRUE; } @@ -1418,7 +1418,7 @@ MULTIHANDLER(globalhistory) { gtk_widget_show(GTK_WIDGET(wndHistory)); - gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(wndHistory))); + gdk_window_raise(nsgtk_widget_get_window(GTK_WIDGET(wndHistory))); return TRUE; } @@ -1437,7 +1437,7 @@ MULTIHANDLER(showbookmarks) { gtk_widget_show(GTK_WIDGET(wndHotlist)); - gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(wndHotlist))); + gdk_window_raise(nsgtk_widget_get_window(GTK_WIDGET(wndHotlist))); gtk_window_set_focus(wndHotlist, NULL); return TRUE; @@ -1446,7 +1446,7 @@ MULTIHANDLER(showcookies) { gtk_widget_show(GTK_WIDGET(wndCookies)); - gdk_window_raise(gtk_widget_get_window(GTK_WIDGET(wndCookies))); + gdk_window_raise(nsgtk_widget_get_window(GTK_WIDGET(wndCookies))); return TRUE; } @@ -1577,7 +1577,7 @@ current_widget = widget; - current_cr = gdk_cairo_create(gtk_widget_get_window(widget)); + current_cr = gdk_cairo_create(nsgtk_widget_get_window(widget)); clip.x0 = event->area.x; clip.y0 = event->area.y; Modified: trunk/netsurf/gtk/theme.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/theme.c?rev=13927&r1=... ============================================================================== --- trunk/netsurf/gtk/theme.c (original) +++ trunk/netsurf/gtk/theme.c Thu May 17 11:48:20 2012 @@ -18,12 +18,14 @@ #include <gtk/gtk.h> #include <stdio.h> +#include <stdint.h> #include <sys/stat.h> #include <unistd.h> #include "content/content.h" #include "content/content_type.h" #include "content/hlcache.h" +#include "gtk/compat.h" #include "gtk/gui.h" #include "gtk/scaffolding.h" #include "gtk/menu.h" @@ -254,7 +256,7 @@ } g_signal_connect_swapped(notification, "response", G_CALLBACK(gtk_widget_destroy), notification); - gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area(GTK_DIALOG(notification))), label); + gtk_container_add(GTK_CONTAINER(nsgtk_dialog_get_action_area(GTK_DIALOG(notification))), label); gtk_widget_show_all(notification); /* update combo */ Modified: trunk/netsurf/gtk/treeview.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/treeview.c?rev=13927&... ============================================================================== --- trunk/netsurf/gtk/treeview.c (original) +++ trunk/netsurf/gtk/treeview.c Thu May 17 11:48:20 2012 @@ -215,7 +215,7 @@ height = event->area.height; current_widget = widget; - current_cr = gdk_cairo_create(gtk_widget_get_window(widget)); + current_cr = gdk_cairo_create(nsgtk_widget_get_window(widget)); tree_set_redraw(tree, true); tree_draw(tree, 0, 0, x, y, width, height, &ctx); @@ -422,7 +422,7 @@ if (edited) break; scroll = vscroll; - value = gtk_adjustment_get_lower(scroll); + value = nsgtk_adjustment_get_lower(scroll); break; case GDK_KEY(End): @@ -430,9 +430,9 @@ if (edited) break; scroll = vscroll; - value = gtk_adjustment_get_upper(scroll) - vpage; - if (value < gtk_adjustment_get_lower(scroll)) - value = gtk_adjustment_get_lower(scroll); + value = nsgtk_adjustment_get_upper(scroll) - vpage; + if (value < nsgtk_adjustment_get_lower(scroll)) + value = nsgtk_adjustment_get_lower(scroll); break; case GDK_KEY(Left): @@ -441,18 +441,18 @@ break; scroll = hscroll; value = gtk_adjustment_get_value(scroll) - - gtk_adjustment_get_step_increment(scroll); - if (value < gtk_adjustment_get_lower(scroll)) - value = gtk_adjustment_get_lower(scroll); + nsgtk_adjustment_get_step_increment(scroll); + if (value < nsgtk_adjustment_get_lower(scroll)) + value = nsgtk_adjustment_get_lower(scroll); break; case GDK_KEY(Up): case GDK_KEY(KP_Up): scroll = vscroll; value = gtk_adjustment_get_value(scroll) - - gtk_adjustment_get_step_increment(scroll); - if (value < gtk_adjustment_get_lower(scroll)) - value = gtk_adjustment_get_lower(scroll); + nsgtk_adjustment_get_step_increment(scroll); + if (value < nsgtk_adjustment_get_lower(scroll)) + value = nsgtk_adjustment_get_lower(scroll); break; case GDK_KEY(Right): @@ -461,28 +461,28 @@ break; scroll = hscroll; value = gtk_adjustment_get_value(scroll) + - gtk_adjustment_get_step_increment(scroll); - if (value > gtk_adjustment_get_upper(scroll) - hpage) - value = gtk_adjustment_get_upper(scroll) - hpage; + nsgtk_adjustment_get_step_increment(scroll); + if (value > nsgtk_adjustment_get_upper(scroll) - hpage) + value = nsgtk_adjustment_get_upper(scroll) - hpage; break; case GDK_KEY(Down): case GDK_KEY(KP_Down): scroll = vscroll; value = gtk_adjustment_get_value(scroll) + - gtk_adjustment_get_step_increment(scroll); - if (value > gtk_adjustment_get_upper(scroll) - vpage) - value = gtk_adjustment_get_upper(scroll) - vpage; + nsgtk_adjustment_get_step_increment(scroll); + if (value > nsgtk_adjustment_get_upper(scroll) - vpage) + value = nsgtk_adjustment_get_upper(scroll) - vpage; break; case GDK_KEY(Page_Up): case GDK_KEY(KP_Page_Up): scroll = vscroll; value = gtk_adjustment_get_value(scroll) - - gtk_adjustment_get_page_increment(scroll); - - if (value < gtk_adjustment_get_lower(scroll)) - value = gtk_adjustment_get_lower(scroll); + nsgtk_adjustment_get_page_increment(scroll); + + if (value < nsgtk_adjustment_get_lower(scroll)) + value = nsgtk_adjustment_get_lower(scroll); break; @@ -490,10 +490,10 @@ case GDK_KEY(KP_Page_Down): scroll = vscroll; value = gtk_adjustment_get_value(scroll) + - gtk_adjustment_get_page_increment(scroll); - - if (value > gtk_adjustment_get_upper(scroll) - vpage) - value = gtk_adjustment_get_upper(scroll) - vpage; + nsgtk_adjustment_get_page_increment(scroll); + + if (value > nsgtk_adjustment_get_upper(scroll) - vpage) + value = nsgtk_adjustment_get_upper(scroll) - vpage; break; default: Modified: trunk/netsurf/gtk/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/window.c?rev=13927&r1... ============================================================================== --- trunk/netsurf/gtk/window.c (original) +++ trunk/netsurf/gtk/window.c Thu May 17 11:48:20 2012 @@ -218,7 +218,7 @@ assert(GTK_WIDGET(gw->layout) == widget); current_widget = (GtkWidget *)gw->layout; - current_cr = gdk_cairo_create(gtk_layout_get_bin_window(gw->layout)); + current_cr = gdk_cairo_create(nsgtk_layout_get_bin_window(gw->layout)); clip.x0 = event->area.x; clip.y0 = event->area.y; @@ -391,10 +391,10 @@ /* core did not handle event do horizontal scroll */ value = gtk_adjustment_get_value(hscroll) - - (gtk_adjustment_get_step_increment(hscroll) *2); - - if (value < gtk_adjustment_get_lower(hscroll)) { - value = gtk_adjustment_get_lower(hscroll); + (nsgtk_adjustment_get_step_increment(hscroll) *2); + + if (value < nsgtk_adjustment_get_lower(hscroll)) { + value = nsgtk_adjustment_get_lower(hscroll); } gtk_adjustment_set_value(hscroll, value); @@ -411,10 +411,10 @@ */ value = gtk_adjustment_get_value(vscroll) - - (gtk_adjustment_get_step_increment(vscroll) * 2); - - if (value < gtk_adjustment_get_lower(vscroll)) { - value = gtk_adjustment_get_lower(vscroll); + (nsgtk_adjustment_get_step_increment(vscroll) * 2); + + if (value < nsgtk_adjustment_get_lower(vscroll)) { + value = nsgtk_adjustment_get_lower(vscroll); } gtk_adjustment_set_value(vscroll, value); @@ -432,13 +432,13 @@ */ value = gtk_adjustment_get_value(hscroll) + - (gtk_adjustment_get_step_increment(hscroll) * 2); + (nsgtk_adjustment_get_step_increment(hscroll) * 2); /* @todo consider gtk_widget_get_allocated_width() */ - gtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); - - if (value > gtk_adjustment_get_upper(hscroll) - alloc.width) { - value = gtk_adjustment_get_upper(hscroll) - + nsgtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); + + if (value > nsgtk_adjustment_get_upper(hscroll) - alloc.width) { + value = nsgtk_adjustment_get_upper(hscroll) - alloc.width; } @@ -456,12 +456,12 @@ */ value = gtk_adjustment_get_value(vscroll) + - (gtk_adjustment_get_step_increment(vscroll) * 2); + (nsgtk_adjustment_get_step_increment(vscroll) * 2); /* @todo consider gtk_widget_get_allocated_height */ - gtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); - - if (value > gtk_adjustment_get_upper(vscroll) - alloc.height) { - value = gtk_adjustment_get_upper(vscroll) - + nsgtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); + + if (value > nsgtk_adjustment_get_upper(vscroll) - alloc.height) { + value = nsgtk_adjustment_get_upper(vscroll) - alloc.height; } @@ -494,22 +494,22 @@ GtkAllocation alloc; /* @todo consider gtk_widget_get_allocated_width() */ - gtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); + nsgtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); switch (event->keyval) { case GDK_KEY(Home): case GDK_KEY(KP_Home): - value = gtk_adjustment_get_lower(vscroll); + value = nsgtk_adjustment_get_lower(vscroll); gtk_adjustment_set_value(vscroll, value); break; case GDK_KEY(End): case GDK_KEY(KP_End): - value = gtk_adjustment_get_upper(vscroll) - alloc.height; - - if (value < gtk_adjustment_get_lower(vscroll)) - value = gtk_adjustment_get_lower(vscroll); + value = nsgtk_adjustment_get_upper(vscroll) - alloc.height; + + if (value < nsgtk_adjustment_get_lower(vscroll)) + value = nsgtk_adjustment_get_lower(vscroll); gtk_adjustment_set_value(vscroll, value); break; @@ -517,10 +517,10 @@ case GDK_KEY(Left): case GDK_KEY(KP_Left): value = gtk_adjustment_get_value(hscroll) - - gtk_adjustment_get_step_increment(hscroll); - - if (value < gtk_adjustment_get_lower(hscroll)) - value = gtk_adjustment_get_lower(hscroll); + nsgtk_adjustment_get_step_increment(hscroll); + + if (value < nsgtk_adjustment_get_lower(hscroll)) + value = nsgtk_adjustment_get_lower(hscroll); gtk_adjustment_set_value(hscroll, value); break; @@ -528,10 +528,10 @@ case GDK_KEY(Up): case GDK_KEY(KP_Up): value = gtk_adjustment_get_value(vscroll) - - gtk_adjustment_get_step_increment(vscroll); - - if (value < gtk_adjustment_get_lower(vscroll)) - value = gtk_adjustment_get_lower(vscroll); + nsgtk_adjustment_get_step_increment(vscroll); + + if (value < nsgtk_adjustment_get_lower(vscroll)) + value = nsgtk_adjustment_get_lower(vscroll); gtk_adjustment_set_value(vscroll, value); break; @@ -539,10 +539,10 @@ case GDK_KEY(Right): case GDK_KEY(KP_Right): value = gtk_adjustment_get_value(hscroll) + - gtk_adjustment_get_step_increment(hscroll); - - if (value > gtk_adjustment_get_upper(hscroll) - alloc.width) - value = gtk_adjustment_get_upper(hscroll) - alloc.width; + nsgtk_adjustment_get_step_increment(hscroll); + + if (value > nsgtk_adjustment_get_upper(hscroll) - alloc.width) + value = nsgtk_adjustment_get_upper(hscroll) - alloc.width; gtk_adjustment_set_value(hscroll, value); break; @@ -550,10 +550,10 @@ case GDK_KEY(Down): case GDK_KEY(KP_Down): value = gtk_adjustment_get_value(vscroll) + - gtk_adjustment_get_step_increment(vscroll); - - if (value > gtk_adjustment_get_upper(vscroll) - alloc.height) - value = gtk_adjustment_get_upper(vscroll) - alloc.height; + nsgtk_adjustment_get_step_increment(vscroll); + + if (value > nsgtk_adjustment_get_upper(vscroll) - alloc.height) + value = nsgtk_adjustment_get_upper(vscroll) - alloc.height; gtk_adjustment_set_value(vscroll, value); break; @@ -561,10 +561,10 @@ case GDK_KEY(Page_Up): case GDK_KEY(KP_Page_Up): value = gtk_adjustment_get_value(vscroll) - - gtk_adjustment_get_page_increment(vscroll); - - if (value < gtk_adjustment_get_lower(vscroll)) - value = gtk_adjustment_get_lower(vscroll); + nsgtk_adjustment_get_page_increment(vscroll); + + if (value < nsgtk_adjustment_get_lower(vscroll)) + value = nsgtk_adjustment_get_lower(vscroll); gtk_adjustment_set_value(vscroll, value); break; @@ -572,10 +572,10 @@ case GDK_KEY(Page_Down): case GDK_KEY(KP_Page_Down): value = gtk_adjustment_get_value(vscroll) + - gtk_adjustment_get_page_increment(vscroll); - - if (value > gtk_adjustment_get_upper(vscroll) - alloc.height) - value = gtk_adjustment_get_upper(vscroll) - alloc.height; + nsgtk_adjustment_get_page_increment(vscroll); + + if (value > nsgtk_adjustment_get_upper(vscroll) - alloc.height) + value = nsgtk_adjustment_get_upper(vscroll) - alloc.height; gtk_adjustment_set_value(vscroll, value); break; @@ -775,7 +775,7 @@ g->bw->reformat_pending = false; /* @todo consider gtk_widget_get_allocated_width() */ - gtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); + nsgtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); browser_window_reformat(g->bw, false, alloc.width, alloc.height); } @@ -1042,7 +1042,7 @@ gtk_widget_get_display( GTK_WIDGET(g->layout)), cursortype); - gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(g->layout)), + gdk_window_set_cursor(nsgtk_widget_get_window(GTK_WIDGET(g->layout)), cursor); if (!nullcursor) @@ -1100,7 +1100,7 @@ GtkAllocation alloc; /* @todo consider gtk_widget_get_allocated_width() */ - gtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); + nsgtk_widget_get_allocation(GTK_WIDGET(g->layout), &alloc); *width = alloc.width; *height = alloc.height;

10 years, 10 months

1
0
0 / 0

r13926 vince - in /trunk/netsurf: ./ gtk/ gtk/dialogs/ gtk/res/ image/

by netsurf＠semichrome.net

Author: vince Date: Wed May 16 14:57:43 2012 New Revision: 13926 URL: http://source.netsurf-browser.org?rev=13926&view=rev Log: allow netsurf to build with gtk3 Added: trunk/netsurf/gtk/res/cookies.gtk2.ui trunk/netsurf/gtk/res/cookies.gtk3.ui trunk/netsurf/gtk/res/downloads.gtk2.ui trunk/netsurf/gtk/res/downloads.gtk3.ui trunk/netsurf/gtk/res/history.gtk2.ui trunk/netsurf/gtk/res/history.gtk3.ui trunk/netsurf/gtk/res/hotlist.gtk2.ui trunk/netsurf/gtk/res/hotlist.gtk3.ui trunk/netsurf/gtk/res/login.gtk2.ui trunk/netsurf/gtk/res/login.gtk3.ui trunk/netsurf/gtk/res/menu_cursor.png (with props) trunk/netsurf/gtk/res/menu_cursor.xbm trunk/netsurf/gtk/res/menu_cursor_mask.xbm trunk/netsurf/gtk/res/menu_cursor_mask.xpm trunk/netsurf/gtk/res/netsurf.gtk2.ui trunk/netsurf/gtk/res/netsurf.gtk3.ui trunk/netsurf/gtk/res/options.gtk2.ui trunk/netsurf/gtk/res/options.gtk3.ui trunk/netsurf/gtk/res/password.gtk2.ui trunk/netsurf/gtk/res/password.gtk3.ui trunk/netsurf/gtk/res/source.gtk2.ui trunk/netsurf/gtk/res/source.gtk3.ui trunk/netsurf/gtk/res/ssl.gtk2.ui trunk/netsurf/gtk/res/ssl.gtk3.ui trunk/netsurf/gtk/res/tabcontents.gtk2.ui trunk/netsurf/gtk/res/tabcontents.gtk3.ui trunk/netsurf/gtk/res/toolbar.gtk2.ui trunk/netsurf/gtk/res/toolbar.gtk3.ui trunk/netsurf/gtk/res/warning.gtk2.ui trunk/netsurf/gtk/res/warning.gtk3.ui Removed: trunk/netsurf/gtk/res/cookies.glade trunk/netsurf/gtk/res/downloads.glade trunk/netsurf/gtk/res/history.glade trunk/netsurf/gtk/res/hotlist.glade trunk/netsurf/gtk/res/login.glade trunk/netsurf/gtk/res/netsurf.glade trunk/netsurf/gtk/res/options.glade trunk/netsurf/gtk/res/password.glade trunk/netsurf/gtk/res/source.glade trunk/netsurf/gtk/res/ssl.glade trunk/netsurf/gtk/res/toolbar.glade trunk/netsurf/gtk/res/warning.glade Modified: trunk/netsurf/Makefile.defaults trunk/netsurf/gtk/Makefile.target trunk/netsurf/gtk/compat.c trunk/netsurf/gtk/compat.h trunk/netsurf/gtk/cookies.c trunk/netsurf/gtk/dialogs/about.c trunk/netsurf/gtk/dialogs/options.c trunk/netsurf/gtk/dialogs/source.c trunk/netsurf/gtk/download.c trunk/netsurf/gtk/gui.c trunk/netsurf/gtk/gui.h trunk/netsurf/gtk/history.c trunk/netsurf/gtk/hotlist.c trunk/netsurf/gtk/login.c trunk/netsurf/gtk/menu.c trunk/netsurf/gtk/plotters.h trunk/netsurf/gtk/print.c trunk/netsurf/gtk/scaffolding.c trunk/netsurf/gtk/scaffolding.h trunk/netsurf/gtk/search.c trunk/netsurf/gtk/tabs.c trunk/netsurf/gtk/theme.c trunk/netsurf/gtk/toolbar.c trunk/netsurf/gtk/treeview.c trunk/netsurf/gtk/window.c trunk/netsurf/image/rsvg.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/netsurf/Makefile.defaults URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.defaults?rev=139... Modified: trunk/netsurf/gtk/Makefile.target URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/Makefile.target?rev=1... Modified: trunk/netsurf/gtk/compat.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/compat.c?rev=13926&r1... Modified: trunk/netsurf/gtk/compat.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/compat.h?rev=13926&r1... Modified: trunk/netsurf/gtk/cookies.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/cookies.c?rev=13926&r... Modified: trunk/netsurf/gtk/dialogs/about.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/dialogs/about.c?rev=1... Modified: trunk/netsurf/gtk/dialogs/options.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/dialogs/options.c?rev... Modified: trunk/netsurf/gtk/dialogs/source.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/dialogs/source.c?rev=... Modified: trunk/netsurf/gtk/download.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/download.c?rev=13926&... Modified: trunk/netsurf/gtk/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gui.c?rev=13926&r1=13... Modified: trunk/netsurf/gtk/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gui.h?rev=13926&r1=13... Modified: trunk/netsurf/gtk/history.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/history.c?rev=13926&r... Modified: trunk/netsurf/gtk/hotlist.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/hotlist.c?rev=13926&r... Modified: trunk/netsurf/gtk/login.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/login.c?rev=13926&r1=... Modified: trunk/netsurf/gtk/menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/menu.c?rev=13926&r1=1... Modified: trunk/netsurf/gtk/plotters.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/plotters.h?rev=13926&... Modified: trunk/netsurf/gtk/print.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/print.c?rev=13926&r1=... Removed: trunk/netsurf/gtk/res/cookies.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/cookies.glade?rev... Added: trunk/netsurf/gtk/res/cookies.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/cookies.gtk2.ui?r... Added: trunk/netsurf/gtk/res/cookies.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/cookies.gtk3.ui?r... Removed: trunk/netsurf/gtk/res/downloads.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/downloads.glade?r... Added: trunk/netsurf/gtk/res/downloads.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/downloads.gtk2.ui... Added: trunk/netsurf/gtk/res/downloads.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/downloads.gtk3.ui... Removed: trunk/netsurf/gtk/res/history.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/history.glade?rev... Added: trunk/netsurf/gtk/res/history.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/history.gtk2.ui?r... Added: trunk/netsurf/gtk/res/history.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/history.gtk3.ui?r... Removed: trunk/netsurf/gtk/res/hotlist.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/hotlist.glade?rev... Added: trunk/netsurf/gtk/res/hotlist.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/hotlist.gtk2.ui?r... Added: trunk/netsurf/gtk/res/hotlist.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/hotlist.gtk3.ui?r... Removed: trunk/netsurf/gtk/res/login.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/login.glade?rev=1... Added: trunk/netsurf/gtk/res/login.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/login.gtk2.ui?rev... Added: trunk/netsurf/gtk/res/login.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/login.gtk3.ui?rev... Added: trunk/netsurf/gtk/res/menu_cursor.png URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/menu_cursor.png?r... Added: trunk/netsurf/gtk/res/menu_cursor.xbm URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/menu_cursor.xbm?r... Added: trunk/netsurf/gtk/res/menu_cursor_mask.xbm URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/menu_cursor_mask.... Added: trunk/netsurf/gtk/res/menu_cursor_mask.xpm URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/menu_cursor_mask.... Removed: trunk/netsurf/gtk/res/netsurf.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/netsurf.glade?rev... Added: trunk/netsurf/gtk/res/netsurf.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/netsurf.gtk2.ui?r... Added: trunk/netsurf/gtk/res/netsurf.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/netsurf.gtk3.ui?r... Removed: trunk/netsurf/gtk/res/options.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/options.glade?rev... Added: trunk/netsurf/gtk/res/options.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/options.gtk2.ui?r... Added: trunk/netsurf/gtk/res/options.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/options.gtk3.ui?r... Removed: trunk/netsurf/gtk/res/password.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/password.glade?re... Added: trunk/netsurf/gtk/res/password.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/password.gtk2.ui?... Added: trunk/netsurf/gtk/res/password.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/password.gtk3.ui?... Removed: trunk/netsurf/gtk/res/source.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/source.glade?rev=... Added: trunk/netsurf/gtk/res/source.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/source.gtk2.ui?re... Added: trunk/netsurf/gtk/res/source.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/source.gtk3.ui?re... Removed: trunk/netsurf/gtk/res/ssl.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/ssl.glade?rev=139... Added: trunk/netsurf/gtk/res/ssl.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/ssl.gtk2.ui?rev=1... Added: trunk/netsurf/gtk/res/ssl.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/ssl.gtk3.ui?rev=1... Added: trunk/netsurf/gtk/res/tabcontents.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/tabcontents.gtk2.... Added: trunk/netsurf/gtk/res/tabcontents.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/tabcontents.gtk3.... Removed: trunk/netsurf/gtk/res/toolbar.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/toolbar.glade?rev... Added: trunk/netsurf/gtk/res/toolbar.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/toolbar.gtk2.ui?r... Added: trunk/netsurf/gtk/res/toolbar.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/toolbar.gtk3.ui?r... Removed: trunk/netsurf/gtk/res/warning.glade URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/warning.glade?rev... Added: trunk/netsurf/gtk/res/warning.gtk2.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/warning.gtk2.ui?r... Added: trunk/netsurf/gtk/res/warning.gtk3.ui URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/res/warning.gtk3.ui?r... Modified: trunk/netsurf/gtk/scaffolding.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/scaffolding.c?rev=139... Modified: trunk/netsurf/gtk/scaffolding.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/scaffolding.h?rev=139... Modified: trunk/netsurf/gtk/search.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/search.c?rev=13926&r1... Modified: trunk/netsurf/gtk/tabs.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/tabs.c?rev=13926&r1=1... Modified: trunk/netsurf/gtk/theme.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/theme.c?rev=13926&r1=... Modified: trunk/netsurf/gtk/toolbar.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/toolbar.c?rev=13926&r... Modified: trunk/netsurf/gtk/treeview.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/treeview.c?rev=13926&... Modified: trunk/netsurf/gtk/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/window.c?rev=13926&r1... Modified: trunk/netsurf/image/rsvg.c URL: http://source.netsurf-browser.org/trunk/netsurf/image/rsvg.c?rev=13926&r1...

10 years, 10 months

1
0
0 / 0

r13925 mono - in /trunk/netsurf/atari/plot: plotter.h plotter_vdi.c

by netsurf＠semichrome.net

Author: mono Date: Sun May 13 10:33:58 2012 New Revision: 13925 URL: http://source.netsurf-browser.org?rev=13925&view=rev Log: Fixed prototyp, comments. Modified: trunk/netsurf/atari/plot/plotter.h trunk/netsurf/atari/plot/plotter_vdi.c Modified: trunk/netsurf/atari/plot/plotter.h URL: http://source.netsurf-browser.org/trunk/netsurf/atari/plot/plotter.h?rev=... ============================================================================== --- trunk/netsurf/atari/plot/plotter.h (original) +++ trunk/netsurf/atari/plot/plotter.h Sun May 13 10:33:58 2012 @@ -98,8 +98,8 @@ typedef int (*_fpmf_text)( FONT_PLOTTER self, int x, int y, const char *text, size_t length, const plot_font_style_t *fstyle); -typedef void (*_fpmf_draw_glyph)(FONT_PLOTTER self, GRECT * loc, uint8_t * pixdata, - int pitch, uint32_t colour); +typedef void (*_fpmf_draw_glyph)(FONT_PLOTTER self, GRECT * clip, GRECT * loc, + uint8_t * pixdata, int pitch, uint32_t colour); typedef int (*_fpmf_dtor)( FONT_PLOTTER self ); Modified: trunk/netsurf/atari/plot/plotter_vdi.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/plot/plotter_vdi.c?... ============================================================================== --- trunk/netsurf/atari/plot/plotter_vdi.c (original) +++ trunk/netsurf/atari/plot/plotter_vdi.c Sun May 13 10:33:58 2012 @@ -131,6 +131,7 @@ static int set_clip(GEM_PLOTTER self, const struct rect * clip) { + // FIXME: consider the canvas size VIEW( self ).clipping.x0 = clip->x0; VIEW( self ).clipping.y0 = clip->y0; VIEW( self ).clipping.x1 = clip->x1; @@ -697,7 +698,6 @@ } if( pstyle->fill_type != PLOT_OP_TYPE_NONE ){ - short stroke_width = (short)(pstyle->stroke_type != PLOT_OP_TYPE_NONE) ? pstyle->stroke_width : 0;

10 years, 10 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 May 2012