r4262 adamblokus - in /branches/libharu/adamblokus: ./ include/hpdf.h src/hpdf_image.c
by netsurf＠semichrome.net
Author: adamblokus
Date: Thu Jun 5 06:04:23 2008
New Revision: 4262
URL: http://source.netsurf-browser.org?rev=4262&view=rev
Log:
-Added Transparency handling(via adding SMask propperty to HPDF_Images)
-Initialized merge tracking via "svnmerge" with revisions "1-4249" from
svn://svn.netsurf-browser.org/branches/libharu/upstream
Modified:
branches/libharu/adamblokus/ (props changed)
branches/libharu/adamblokus/include/hpdf.h
branches/libharu/adamblokus/src/hpdf_image.c
Propchange: branches/libharu/adamblokus/
------------------------------------------------------------------------------
svnmerge-integrated = /branches/libharu/upstream:1-4249
Modified: branches/libharu/adamblokus/include/hpdf.h
URL: http://source.netsurf-browser.org/branches/libharu/adamblokus/include/hpd...
==============================================================================
--- branches/libharu/adamblokus/include/hpdf.h (original)
+++ branches/libharu/adamblokus/include/hpdf.h Thu Jun 5 06:04:23 2008
@@ -516,6 +516,11 @@
HPDF_ColorSpace color_space,
HPDF_UINT bits_per_component);
+HPDF_EXPORT(HPDF_BOOL)
+HPDF_Image_AddSMask (HPDF_Doc pdf,
+ HPDF_Image image,
+ HPDF_Image smask);
+
HPDF_EXPORT(HPDF_Point)
HPDF_Image_GetSize (HPDF_Image image);
Modified: branches/libharu/adamblokus/src/hpdf_image.c
URL: http://source.netsurf-browser.org/branches/libharu/adamblokus/src/hpdf_im...
==============================================================================
--- branches/libharu/adamblokus/src/hpdf_image.c (original)
+++ branches/libharu/adamblokus/src/hpdf_image.c Thu Jun 5 06:04:23 2008
@@ -377,6 +377,15 @@
return image;
}
+HPDF_BOOL
+HPDF_Image_AddSMask (HPDF_Doc pdf,
+ HPDF_Image image,
+ HPDF_Image smask){
+ if((!image) || (!smask))
+ return HPDF_FALSE;
+
+ return HPDF_Dict_Add (image, "SMask", smask);
+}
HPDF_BOOL
HPDF_Image_Validate (HPDF_Image image)
14 years, 12 months
r4261 tlsa - in /trunk/netsurfweb: about/news.en index.en
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Jun 4 10:50:50 2008
New Revision: 4261
URL: http://source.netsurf-browser.org?rev=4261&view=rev
Log:
Update news.
Modified:
trunk/netsurfweb/about/news.en
trunk/netsurfweb/index.en
Modified: trunk/netsurfweb/about/news.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/about/news.en?rev=4261...
==============================================================================
--- trunk/netsurfweb/about/news.en (original)
+++ trunk/netsurfweb/about/news.en Wed Jun 4 10:50:50 2008
@@ -56,36 +56,38 @@
<h1>News</h1>
<dl class="news">
+<dt><a href="http://source.netsurf-browser.org/trunk/netsurf/">BeOS port started</a> <span>03 Jun 2008</span></dt>
+<dd>NetSurf is now running natively on the BeOS operating system. The early port is available from SVN.</dd>
<dt><a href="/developers/gsoc">GSoC projects selected</a> <span>22 Apr 2008</span></dt>
-<dd>The student projects that will be carried out this summer have been announced. See our <a href="/developers/gsoc">GSoC page</a> for details.<dd>
+<dd>The student projects that will be carried out this summer have been announced. See our <a href="/developers/gsoc">GSoC page</a> for details.</dd>
<dt><a href="/downloads/">NetSurf 1.2 released</a> <span>22 Mar 2008</span></dt>
-<dd>The second update to NetSurf 1 has been released. It offers several bug fixes over the previous release and we recommend that users upgrade.<dd>
-<dt><a href="/developers/gsoc">Google Summer of Code</a> <span>17 Mar 2008</span></dt>
-<dd>NetSurf is participating in Google Summer of Code 2008, as a mentoring organisation. Students interested in getting involved should apply to Google. More information on our <a href="/developers/gsoc">GSoC</a> page.<dd>
+<dd>The second update to NetSurf 1 has been released. It offers several bug fixes over the previous release and we recommend that users upgrade.</dd>
+<dt><a href="http://vlists.pepperfish.net/pipermail/netsurf-users-netsurf-browser.org/...">Google Summer of Code</a> <span>17 Mar 2008</span></dt>
+<dd>NetSurf is participating in Google Summer of Code 2008, as a mentoring organisation. Students interested in getting involved should apply to Google. More information on our <a href="/developers/gsoc">GSoC</a> page.</dd>
<dt><a href="http://vlists.pepperfish.net/pipermail/netsurf-users-netsurf-browser.org/...">Summary of recent development</a> <span>02 Mar 2008</span></dt>
-<dd>Pages are now periodically reflowed as images are downloaded. Handling of presentational markup is improved. Better form element handling and many other fixes and improvements.<dd>
+<dd>Pages are now periodically reflowed as images are downloaded. Handling of presentational markup is improved. Better form element handling and many other fixes and improvements.</dd>
<dt><a href="http://vlists.pepperfish.net/pipermail/netsurf-users-netsurf-browser.org/...">Summary of recent development</a> <span>03 Feb 2008</span></dt>
-<dd>NetSurf's cookie and HTTP redirect support have been enhanced. Layout upgrades, including better form element display and float positioning. SVG redraw is now faster on RISC OS.<dd>
+<dd>NetSurf's cookie and HTTP redirect support have been enhanced. Layout upgrades, including better form element display and float positioning. SVG redraw is now faster on RISC OS.</dd>
<dt><a href="/">NetSurf web site redesigned</a> <span>02 Jan 2008</span></dt>
-<dd>We've redesigned the web site to make it easier to navigate. Much of the content has been rewritten to make it clear that NetSurf is a multi-platform web browser.<dd>
+<dd>We've redesigned the web site to make it easier to navigate. Much of the content has been rewritten to make it clear that NetSurf is a multi-platform web browser.</dd>
<dt><a href="/developers/">Summary of recent development</a> <span>02 Jan 2008</span></dt>
-<dd>Recent work on the development branch of NetSurf has added SVG support to the GTK build and the beginnings of SVG Tiny support to the RISC OS version. Other changes have included refinements to the web page scaling facilities.<dd>
+<dd>Recent work on the development branch of NetSurf has added SVG support to the GTK build and the beginnings of SVG Tiny support to the RISC OS version. Other changes have included refinements to the web page scaling facilities.</dd>
<dt><a href="/downloads/">NetSurf 1.1 released</a> <span>13 Aug 2007</span></dt>
-<dd>The first update to NetSurf 1 has been released. It offers several bug fixes over the previous release and we recommend that users upgrade.<dd>
+<dd>The first update to NetSurf 1 has been released. It offers several bug fixes over the previous release and we recommend that users upgrade.</dd>
<dt><a href="http://packages.debian.org/netsurf">NetSurf in Debian testing</a> <span>03 Jun 2007</span></dt>
-<dd>NetSurf is now packaged in Debian linux. Currently it is in Debian testing.<dd>
+<dd>NetSurf is now packaged in Debian linux. Currently it is in Debian testing.</dd>
<dt><a href="/downloads/">NetSurf 1.0 released</a> <span>19 May 2007</span></dt>
-<dd>The first stable release of NetSurf is now available. The NetSurf project was first started in 2003 and development builds have been available from the project web site since then.<dd>
+<dd>The first stable release of NetSurf is now available. The NetSurf project was first started in 2003 and development builds have been available from the project web site since then.</dd>
<dt><a href="http://www.iconbar.com/articles/NetSurf_Update/index1098.html">Media watch</a> <span>04 Dec 2006</span></dt>
-<dd>An article at The Iconbar reviews recent developments and discusses future plans for the project.<dd>
+<dd>An article at The Iconbar reviews recent developments and discusses future plans for the project.</dd>
<dt><a href="http://vlists.pepperfish.net/pipermail/netsurf-users-netsurf-browser.org/...">Moved to subversion</a> <span>09 Apr 2006</span></dt>
-<dd>We have migrated to Subversion, a more powerful and advanced versioning system than CVS.<dd>
+<dd>We have migrated to Subversion, a more powerful and advanced versioning system than CVS.</dd>
<dt><a href="http://vlists.pepperfish.net/pipermail/netsurf-users-netsurf-browser.org/...">The road to 1.0</a> <span>25 Mar 2006</span></dt>
-<dd>Our plans for version 1.0 for the RISC OS and GTK builds.<dd>
+<dd>Our plans for version 1.0 for the RISC OS and GTK builds.</dd>
<dt><a href="http://source.netsurf-browser.org/import/netsurf/gtk/gtk_gui.c?rev=993&am...">Experimental GTK port</a> <span>22 Jun 2004</span></dt>
-<dd>A new GTK front end has been checked in. It allows NetSurf to be tested on Uinx-like systems.<dd>
+<dd>A new GTK front end has been checked in. It allows NetSurf to be tested on Uinx-like systems.</dd>
<dt><a href="http://sourceforge.net/projects/netsurf/">Sourceforge project registered</a> <span>19 Apr 2002</span></dt>
-<dd>After an online discussion about the deficiencies of existing web browser on the RISC OS plaform, the NetSurf web browser project has been started.<dd>
+<dd>After an online discussion about the deficiencies of existing web browser on the RISC OS plaform, the NetSurf web browser project has been started.</dd>
</dl>
Modified: trunk/netsurfweb/index.en
URL: http://source.netsurf-browser.org/trunk/netsurfweb/index.en?rev=4261&r1=4...
==============================================================================
--- trunk/netsurfweb/index.en (original)
+++ trunk/netsurfweb/index.en Wed Jun 4 10:50:50 2008
@@ -51,20 +51,20 @@
<dt>Sub-projects:</dt>
<dd>
<dl>
-<dt><a href="/projects/hubbub/">Hubbub</a><dt>
-<dd>HTML5 compliant parsing library<dd>
-<dt><a href="/projects/libdom/">Libdom</a><dt>
-<dd>DOM library<dd>
-<dt><a href="/projects/libsvgtiny/">Libsvgtiny</a><dt>
-<dd>SVG Tiny library<dd>
-<dt><a href="/projects/iconv/">Iconv</a><dt>
-<dd>RISC OS character encoding support module<dd>
-<dt><a href="/projects/rufl/">RUfl</a><dt>
-<dd>RISC OS Unicode font library<dd>
-<dt><a href="/projects/tinct/">Tinct</a><dt>
-<dd>Advanced RISC OS Sprite plotting module<dd>
-<dt><a href="/projects/libpencil/">Libpencil</a><dt>
-<dd>RISC OS Drawfile export library<dd>
+<dt><a href="/projects/hubbub/">Hubbub</a></dt>
+<dd>HTML5 compliant parsing library</dd>
+<dt><a href="/projects/libdom/">Libdom</a></dt>
+<dd>DOM library</dd>
+<dt><a href="/projects/libsvgtiny/">Libsvgtiny</a></dt>
+<dd>SVG Tiny library</dd>
+<dt><a href="/projects/iconv/">Iconv</a></dt>
+<dd>RISC OS character encoding support module</dd>
+<dt><a href="/projects/rufl/">RUfl</a></dt>
+<dd>RISC OS Unicode font library</dd>
+<dt><a href="/projects/tinct/">Tinct</a></dt>
+<dd>Advanced RISC OS Sprite plotting module</dd>
+<dt><a href="/projects/libpencil/">Libpencil</a></dt>
+<dd>RISC OS Drawfile export library</dd>
</dl>
</dd>
</dl>
@@ -122,19 +122,19 @@
<h2 id="news">Latest news</h2>
<dl class="frontnews">
+<dt><a href="http://source.netsurf-browser.org/trunk/netsurf/">BeOS port started</a> <span>03 Jun 2008</span></dt>
+<dd>NetSurf is now running natively on the BeOS operating system. The early port is available from SVN.</dd>
<dt><a href="/developers/gsoc">GSoC projects selected</a> <span>22 Apr 2008</span></dt>
-<dd>The student projects that will be carried out this summer have been announced. See our <a href="/developers/gsoc">GSoC page</a> for details.<dd>
+<dd>The student projects that will be carried out this summer have been announced. See our <a href="/developers/gsoc">GSoC page</a> for details.</dd>
<dt><a href="/downloads/">NetSurf 1.2 released</a> <span>22 Mar 2008</span></dt>
-<dd>The second update to NetSurf 1 has been released. It offers many bug fixes and improvements over the previous release. We recommend that users upgrade.<dd>
-<dt><a href="http://vlists.pepperfish.net/pipermail/netsurf-users-netsurf-browser.org/...">Google Summer of Code</a> <span>17 Mar 2008</span></dt>
-<dd>NetSurf is participating in Google Summer of Code 2008, as a mentoring organisation. Students interested in getting involved should apply to Google. More information on our <a href="/developers/gsoc">GSoC</a> page.<dd>
+<dd>The second update to NetSurf 1 has been released. It offers many bug fixes and improvements over the previous release. We recommend that users upgrade.</dd>
</dl>
<p class="more"><a href="/about/news" class="seemore">See more news</a></p>
<h2 id="features">NetSurf 1.2 features</h2>
<dl>
-<dt>General<dt>
+<dt>General</dt>
<dd>
<ul>
<li>Web standards: HTML 4.01 and CSS 2.1</li>
14 years, 12 months
r4260 tlsa - in /trunk/art/logo: NetSurf.svg NetSurfAW, d94 README emblem/ emblem/NetSurf, d94 emblem/NetSurf.svg full/ full/NetSurf, d94 full/NetSurf.svg
by netsurf＠semichrome.net
Author: tlsa
Date: Wed Jun 4 05:18:03 2008
New Revision: 4260
URL: http://source.netsurf-browser.org?rev=4260&view=rev
Log:
Add logo emblem and full logo.
Added:
trunk/art/logo/emblem/
trunk/art/logo/emblem/NetSurf,d94 (with props)
trunk/art/logo/emblem/NetSurf.svg
trunk/art/logo/full/
trunk/art/logo/full/NetSurf,d94 (with props)
trunk/art/logo/full/NetSurf.svg
- copied unchanged from r4259, trunk/art/logo/NetSurf.svg
Removed:
trunk/art/logo/NetSurf.svg
trunk/art/logo/NetSurfAW,d94
Modified:
trunk/art/logo/README
Removed: trunk/art/logo/NetSurf.svg
URL: http://source.netsurf-browser.org/trunk/art/logo/NetSurf.svg?rev=4259&vie...
==============================================================================
--- trunk/art/logo/NetSurf.svg (original)
+++ trunk/art/logo/NetSurf.svg (removed)
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
- "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="27.7474cm" height="7.7493cm" viewBox="956.7422 1537.8438 3932.6953 1098.3203" version="1.1"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink">
-<desc>
- Exported by the ArtWorks SVGExport module.
- Source document: ADFS::Stelmaria.$.NetSurfAW
-</desc>
-<g transform="matrix(1 0 0 -1 0 4174.0078)" stroke-miterlimit="16" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="bevel" stroke-linecap="butt">
-<g>
-<defs>
-<linearGradient id="_Fill0" gradientUnits="userSpaceOnUse" x1="1771.625" y1="3025.8906" x2="4854.0078" y2="2565.3047" spreadMethod="pad">
-<stop offset="0" stop-color="#3f6eff"/>
-<stop offset="1" stop-color="#93adff"/>
-</linearGradient>
-</defs>
-<path d="M956.7422 1537.8438 956.7422 2636.1641 4889.4375 2636.1641 4889.4375 1537.8438 956.7422 1537.8438 Z" fill="url(#_Fill0)"/>
-<path d="M1107.9766 2086.0078 C1107.9766 2277.8359 1263.4375 2433.3359 1455.2969 2433.3359 1647.1953 2433.3359 1802.6641 2277.8359 1802.6641 2086.0078 1802.6641 1894.1953 1647.1953 1738.6797 1455.3438 1738.6797 1263.4375 1738.6797 1107.9766 1894.1953 1107.9766 2086.0078 Z" stroke="#ffffff" stroke-width="75" fill="#ffffff"/>
-<defs>
-<radialGradient id="_Fill1" gradientUnits="userSpaceOnUse" cx="1270.75" cy="2292.1797" r="640.8281" spreadMethod="pad">
-<stop offset="0" stop-color="#b8f5ff"/>
-<stop offset="1" stop-color="#0097ff"/>
-</radialGradient>
-</defs>
-<path d="M1107.9766 2086.0078 C1107.9766 2277.8359 1263.4375 2433.3359 1455.2969 2433.3359 1647.1953 2433.3359 1802.6641 2277.8359 1802.6641 2086.0078 1802.6641 1894.1953 1647.1953 1738.6797 1455.3438 1738.6797 1263.4375 1738.6797 1107.9766 1894.1953 1107.9766 2086.0078 Z" stroke="#000000" stroke-width="26.4219" fill="url(#_Fill1)"/>
-<path d="M1686.0859 2141.7578 1664.2734 2202.1719 1714.1016 2232.1641 1655.9297 2259.4922 1669.9375 2315.8906 1609.5234 2294.0781 1579.5234 2343.9219 1552.2031 2285.7344 1495.7969 2299.7344 1517.6172 2239.3281 1467.7734 2209.3203 1525.9766 2182.0078 1511.9531 2125.6094 1572.3672 2147.4141 1602.3594 2097.5781 1629.6875 2155.7656 1686.0859 2141.7578 Z" stroke="#ffffff" stroke-width="1.25" fill="#ffffff"/>
-<path d="M1299.6328 2375.1563 1283.8047 2314.8203 1257.3516 2320.1094 1275.3359 2385.7344 1299.6328 2375.1563 Z" fill="#000000"/>
-<path d="M1271.0703 2253.5 1265.7813 2192.1328 1241.4922 2193.1563 1246.7891 2257.6953 1271.0703 2253.5 Z" fill="#000000"/>
-<path d="M1265.7813 2128.6563 1275.3359 2068.375 1248.8984 2063.0781 1241.4922 2127.5391 1265.7813 2128.6563 Z" fill="#000000"/>
-<path d="M1290.1172 2007.0156 1314.4609 1951.9844 1291.2031 1941.4219 1265.8281 2000.5625 1290.1172 2007.0156 Z" fill="#000000"/>
-<path d="M1344.1094 1895.9297 1380.0469 1847.2344 1358.8828 1830.3281 1321.9063 1883.125 1344.1094 1895.9297 Z" fill="#000000"/>
-<path d="M1419.1719 1796.4531 1464.6875 1749.9297 1439.3125 1737.25 1400.1875 1780.4609 1419.1719 1796.4531 Z" fill="#000000"/>
-<path d="M1147.3125 1947.7344 1200.2109 1925.5469 1193.8906 1903.3203 1148.3906 1917.0781 1147.3125 1947.7344 Z" fill="#000000"/>
-<path d="M1260.5078 1912.8359 1323.9766 1908.6094 1322.9453 1882.1719 1257.3516 1888.5313 1260.5078 1912.8359 Z" fill="#000000"/>
-<path d="M1386.4141 1907.5391 1448.8125 1913.8984 1451.9844 1888.5313 1387.4531 1882.1719 1386.4141 1907.5391 Z" fill="#000000"/>
-<path d="M1510.1719 1923.3516 1570.4688 1938.2344 1577.8672 1912.8359 1515.4688 1898.0391 1510.1719 1923.3516 Z" fill="#000000"/>
-<path d="M1630.8047 1958.2422 1686.8281 1983.7344 1697.4141 1961.5 1640.3125 1933.9766 1630.8047 1958.2422 Z" fill="#000000"/>
-<path d="M1737.6641 2017.4063 1779.9375 2059.8906 1803.2109 2045.0625 1754.5313 1997.4531 1737.6641 2017.4063 Z" fill="#000000"/>
-<path d="M2922.9844 1874.8516 C2922.9844 1783.5078 3003.1563 1743.4219 3155.9844 1781.6328 L3155.9844 1854.3359 C3098.2109 1843.1641 3066.5156 1856.2188 3066.5156 1922.3984 L3066.5156 2134.8906 3152.2578 2134.8906 3152.2578 2215.0625 3066.5156 2215.0625 C3066.5156 2260.7266 3068.375 2306.3984 3071.1797 2352.0703 L2919.25 2352.0703 C2921.1172 2306.3984 2922.9844 2260.7266 2922.9844 2215.0625 L2863.3359 2215.0625 2863.3359 2134.8906 2922.9844 2134.8906 2922.9844 1874.8516 Z" stroke="#ffffff" stroke-width="50" stroke-linejoin="round" fill="#ffffff"/>
-<path d="M1949.4688 2262.5781 1949.4688 1996.9531 C1949.4688 1924.25 1948.5469 1852.4844 1944.8203 1779.7891 L2063.1875 1779.7891 C2059.4609 1835.7109 2057.5938 1891.6328 2057.5938 1947.5391 L2057.5938 2172.1719 2270.1094 1779.7891 2404.3281 1779.7891 C2403.3984 1800.2813 2401.5313 1815.2031 2401.5313 1834.7813 L2401.5313 2195.4766 C2401.5313 2264.4453 2405.2578 2332.5 2408.0313 2401.4688 L2287.8203 2401.4688 C2292.4766 2335.2891 2293.4141 2269.1172 2293.4141 2202.9297 L2293.4141 2054.7422 2096.7422 2401.4688 1944.8203 2401.4688 C1948.5469 2354.8672 1949.4688 2317.5938 1949.4688 2262.5781 Z" stroke="#ffffff" stroke-width="50" stroke-linejoin="round" fill="#ffffff"/>
-<path d="M2788.2266 2174.9766 C2719.2422 2243.9531 2596.2188 2247.6641 2517.9141 2169.3906 2436.8359 2088.3047 2412.6094 1922.3984 2507.6797 1827.3203 2588.75 1746.2266 2741.6172 1749.9531 2839.5 1828.25 L2791.9375 1886.0469 C2732.3047 1838.4922 2668.9219 1843.1641 2641.8828 1870.1797 2624.1875 1887.9063 2611.1328 1915.8672 2607.3984 1944.75 L2839.5 2012.8047 C2846 2071.5078 2828.2969 2134.8906 2788.2266 2174.9766 Z M2599.0234 2020.2578 C2600.8828 2062.1953 2603.6797 2114.3828 2632.5703 2143.2891 2655.875 2166.5859 2699.6875 2158.1953 2699.6875 2076.1797 2699.6875 2033.2891 2629.7734 2028.6484 2599.0234 2020.2578 Z" stroke="#ffffff" stroke-width="50" stroke-linejoin="round" fill="#ffffff"/>
-<path d="M3200.5781 1804.9375 C3383.2656 1718.2734 3635.8672 1764.8672 3635.8672 1964.3359 3635.8672 2159.1328 3364.6172 2164.7188 3364.6172 2259.8047 3364.6172 2334.3594 3495.1172 2350.2109 3591.1328 2260.7266 L3591.1328 2400.5391 C3432.6719 2446.2109 3208.0469 2398.6797 3208.0469 2216.9141 3208.0469 2037.9688 3474.6172 2042.625 3474.6172 1926.1172 3474.6172 1837.5625 3324.5547 1814.2656 3200.5781 1956.875 L3200.5781 1804.9375 Z" stroke="#ffffff" stroke-width="50" stroke-linejoin="round" fill="#ffffff"/>
-<path d="M3825.7734 1935.4375 3825.7734 2103.2031 C3825.7734 2141.4219 3827.6328 2177.7734 3832.2813 2215.0625 L3673.8359 2215.0625 C3679.4297 2160.0625 3682.2188 2117.1875 3682.2188 2062.1953 L3682.2188 1896.2969 C3682.2188 1758.3438 3847.1953 1739.7109 3914.3125 1812.4063 L3919.9141 1779.7891 4060.6406 1779.7891 C4056.9141 1804.9375 4047.5938 1855.2656 4047.5938 1893.4844 L4047.5938 2081.7734 C4047.5938 2131.1719 4051.3203 2171.25 4055.0547 2215.0625 L3898.4844 2215.0625 C3902.1875 2180.5547 3904.0625 2161.9297 3904.0625 2118.1172 L3904.0625 1888.8359 C3888.2109 1857.1406 3825.7734 1842.2344 3825.7734 1935.4375 Z" stroke="#ffffff" stroke-width="50" stroke-linejoin="round" fill="#ffffff"/>
-<path d="M4396.3516 2226.2266 C4333.8984 2226.2266 4282.6406 2202.0078 4255.6016 2143.2891 4254.6719 2173.0938 4253.7344 2185.2266 4248.1484 2215.0625 L4099.0234 2215.0625 C4114.8672 2134.8906 4118.5938 2107.8594 4118.5938 2026.7891 L4118.5938 1933.5781 C4118.5938 1886.0469 4114.8672 1825.4453 4111.1406 1779.7891 L4268.6484 1779.7891 C4263.0625 1823.5781 4262.1328 1830.1172 4262.1328 1873.9141 L4262.1328 1976.4531 C4262.1328 2072.4531 4305.9453 2129.3047 4396.3516 2115.3203 L4396.3516 2226.2266 Z" stroke="#ffffff" stroke-width="50" stroke-linejoin="round" fill="#ffffff"/>
-<path d="M4645.7266 2305.4609 C4668.0859 2327.8281 4705.375 2325.0313 4741.7188 2299.8672 L4741.7188 2402.3984 C4677.4219 2421.9766 4586.0781 2404.2578 4542.2656 2360.4609 4508.7109 2326.8906 4500.3203 2299.8672 4500.3203 2215.0625 L4441.6016 2215.0625 4441.6016 2134.8906 4500.3203 2134.8906 4500.3203 2028.6484 C4500.3203 1945.6953 4497.5078 1862.7344 4491.0078 1779.7891 L4648.5156 1779.7891 C4644.7891 1817.9844 4643.8516 1862.7344 4643.8516 1904.6875 L4643.8516 2134.8906 4727.7344 2134.8906 4727.7344 2215.0625 4648.5156 2215.0625 C4629.8828 2241.1484 4623.3438 2283.0938 4645.7266 2305.4609 Z" stroke="#ffffff" stroke-width="50" stroke-linejoin="round" fill="#ffffff"/>
-<defs>
-<radialGradient id="_Fill2" gradientUnits="userSpaceOnUse" cx="3536.0234" cy="2005.5156" r="2982.2031" spreadMethod="pad">
-<stop offset="0" stop-color="#2668ee"/>
-<stop offset="1" stop-color="#b8f5ff"/>
-</radialGradient>
-</defs>
-<path d="M1949.4688 2262.5781 1949.4688 1996.9531 C1949.4688 1924.25 1948.5469 1852.4844 1944.8203 1779.7891 L2063.1875 1779.7891 C2059.4609 1835.7109 2057.5938 1891.6328 2057.5938 1947.5391 L2057.5938 2172.1719 2270.1094 1779.7891 2404.3281 1779.7891 C2403.3984 1800.2813 2401.5313 1815.2031 2401.5313 1834.7813 L2401.5313 2195.4766 C2401.5313 2264.4453 2405.2578 2332.5 2408.0313 2401.4688 L2287.8203 2401.4688 C2292.4766 2335.2891 2293.4141 2269.1172 2293.4141 2202.9297 L2293.4141 2054.7422 2096.7422 2401.4688 1944.8203 2401.4688 C1948.5469 2354.8672 1949.4688 2317.5938 1949.4688 2262.5781 Z" fill="url(#_Fill2)"/>
-<defs>
-<radialGradient id="_Fill3" gradientUnits="userSpaceOnUse" cx="3536.0234" cy="2005.5156" r="2982.2031" spreadMethod="pad">
-<stop offset="0" stop-color="#2668ee"/>
-<stop offset="1" stop-color="#b8f5ff"/>
-</radialGradient>
-</defs>
-<path d="M2788.2266 2174.9766 C2719.2422 2243.9531 2596.2188 2247.6641 2517.9141 2169.3906 2436.8359 2088.3047 2412.6094 1922.3984 2507.6797 1827.3203 2588.75 1746.2266 2741.6172 1749.9531 2839.5 1828.25 L2791.9375 1886.0469 C2732.3047 1838.4922 2668.9219 1843.1641 2641.8828 1870.1797 2624.1875 1887.9063 2611.1328 1915.8672 2607.3984 1944.75 L2839.5 2012.8047 C2846 2071.5078 2828.2969 2134.8906 2788.2266 2174.9766 Z M2599.0234 2020.2578 C2600.8828 2062.1953 2603.6797 2114.3828 2632.5703 2143.2891 2655.875 2166.5859 2699.6875 2158.1953 2699.6875 2076.1797 2699.6875 2033.2891 2629.7734 2028.6484 2599.0234 2020.2578 Z" fill="url(#_Fill3)"/>
-<defs>
-<radialGradient id="_Fill4" gradientUnits="userSpaceOnUse" cx="3536.0234" cy="2005.5156" r="2982.2031" spreadMethod="pad">
-<stop offset="0" stop-color="#2668ee"/>
-<stop offset="1" stop-color="#b8f5ff"/>
-</radialGradient>
-</defs>
-<path d="M2922.9844 1874.8516 C2922.9844 1783.5078 3003.1563 1743.4219 3155.9844 1781.6328 L3155.9844 1854.3359 C3098.2109 1843.1641 3066.5156 1856.2188 3066.5156 1922.3984 L3066.5156 2134.8906 3152.2578 2134.8906 3152.2578 2215.0625 3066.5156 2215.0625 C3066.5156 2260.7266 3068.375 2306.3984 3071.1797 2352.0703 L2919.25 2352.0703 C2921.1172 2306.3984 2922.9844 2260.7266 2922.9844 2215.0625 L2863.3359 2215.0625 2863.3359 2134.8906 2922.9844 2134.8906 2922.9844 1874.8516 Z" fill="url(#_Fill4)"/>
-<defs>
-<radialGradient id="_Fill5" gradientUnits="userSpaceOnUse" cx="3536.0234" cy="2005.5156" r="2982.2031" spreadMethod="pad">
-<stop offset="0" stop-color="#2668ee"/>
-<stop offset="1" stop-color="#b8f5ff"/>
-</radialGradient>
-</defs>
-<path d="M3200.5781 1804.9375 C3383.2656 1718.2734 3635.8672 1764.8672 3635.8672 1964.3359 3635.8672 2159.1328 3364.6172 2164.7188 3364.6172 2259.8047 3364.6172 2334.3594 3495.1172 2350.2109 3591.1328 2260.7266 L3591.1328 2400.5391 C3432.6719 2446.2109 3208.0469 2398.6797 3208.0469 2216.9141 3208.0469 2037.9688 3474.6172 2042.625 3474.6172 1926.1172 3474.6172 1837.5625 3324.5547 1814.2656 3200.5781 1956.875 L3200.5781 1804.9375 Z" fill="url(#_Fill5)"/>
-<defs>
-<radialGradient id="_Fill6" gradientUnits="userSpaceOnUse" cx="3536.0234" cy="2005.5156" r="2982.2031" spreadMethod="pad">
-<stop offset="0" stop-color="#2668ee"/>
-<stop offset="1" stop-color="#b8f5ff"/>
-</radialGradient>
-</defs>
-<path d="M3825.7734 1935.4375 3825.7734 2103.2031 C3825.7734 2141.4219 3827.6328 2177.7734 3832.2813 2215.0625 L3673.8359 2215.0625 C3679.4297 2160.0625 3682.2188 2117.1875 3682.2188 2062.1953 L3682.2188 1896.2969 C3682.2188 1758.3438 3847.1953 1739.7109 3914.3125 1812.4063 L3919.9141 1779.7891 4060.6406 1779.7891 C4056.9141 1804.9375 4047.5938 1855.2656 4047.5938 1893.4844 L4047.5938 2081.7734 C4047.5938 2131.1719 4051.3203 2171.25 4055.0547 2215.0625 L3898.4844 2215.0625 C3902.1875 2180.5547 3904.0625 2161.9297 3904.0625 2118.1172 L3904.0625 1888.8359 C3888.2109 1857.1406 3825.7734 1842.2344 3825.7734 1935.4375 Z" fill="url(#_Fill6)"/>
-<defs>
-<radialGradient id="_Fill7" gradientUnits="userSpaceOnUse" cx="3536.0234" cy="2005.5156" r="2982.2031" spreadMethod="pad">
-<stop offset="0" stop-color="#2668ee"/>
-<stop offset="1" stop-color="#b8f5ff"/>
-</radialGradient>
-</defs>
-<path d="M4396.3516 2226.2266 C4333.8984 2226.2266 4282.6406 2202.0078 4255.6016 2143.2891 4254.6719 2173.0938 4253.7344 2185.2266 4248.1484 2215.0625 L4099.0234 2215.0625 C4114.8672 2134.8906 4118.5938 2107.8594 4118.5938 2026.7891 L4118.5938 1933.5781 C4118.5938 1886.0469 4114.8672 1825.4453 4111.1406 1779.7891 L4268.6484 1779.7891 C4263.0625 1823.5781 4262.1328 1830.1172 4262.1328 1873.9141 L4262.1328 1976.4531 C4262.1328 2072.4531 4305.9453 2129.3047 4396.3516 2115.3203 L4396.3516 2226.2266 Z" fill="url(#_Fill7)"/>
-<defs>
-<radialGradient id="_Fill8" gradientUnits="userSpaceOnUse" cx="3536.0234" cy="2005.5156" r="2982.2031" spreadMethod="pad">
-<stop offset="0" stop-color="#2668ee"/>
-<stop offset="1" stop-color="#b8f5ff"/>
-</radialGradient>
-</defs>
-<path d="M4645.7266 2305.4609 C4668.0859 2327.8281 4705.375 2325.0313 4741.7188 2299.8672 L4741.7188 2402.3984 C4677.4219 2421.9766 4586.0781 2404.2578 4542.2656 2360.4609 4508.7109 2326.8906 4500.3203 2299.8672 4500.3203 2215.0625 L4441.6016 2215.0625 4441.6016 2134.8906 4500.3203 2134.8906 4500.3203 2028.6484 C4500.3203 1945.6953 4497.5078 1862.7344 4491.0078 1779.7891 L4648.5156 1779.7891 C4644.7891 1817.9844 4643.8516 1862.7344 4643.8516 1904.6875 L4643.8516 2134.8906 4727.7344 2134.8906 4727.7344 2215.0625 4648.5156 2215.0625 C4629.8828 2241.1484 4623.3438 2283.0938 4645.7266 2305.4609 Z" fill="url(#_Fill8)"/>
-<path d="M1949.4688 2262.5781 1949.4688 1996.9531 C1949.4688 1924.25 1948.5469 1852.4844 1944.8203 1779.7891 L2063.1875 1779.7891 C2059.4609 1835.7109 2057.5938 1891.6328 2057.5938 1947.5391 L2057.5938 2172.1719 2270.1094 1779.7891 2404.3281 1779.7891 C2403.3984 1800.2813 2401.5313 1815.2031 2401.5313 1834.7813 L2401.5313 2195.4766 C2401.5313 2264.4453 2405.2578 2332.5 2408.0313 2401.4688 L2287.8203 2401.4688 C2292.4766 2335.2891 2293.4141 2269.1172 2293.4141 2202.9297 L2293.4141 2054.7422 2096.7422 2401.4688 1944.8203 2401.4688 C1948.5469 2354.8672 1949.4688 2317.5938 1949.4688 2262.5781 Z" stroke="#2668ee" stroke-width="5" stroke-linejoin="miter" fill="none"/>
-<path d="M2788.2266 2174.9766 C2719.2422 2243.9531 2596.2188 2247.6641 2517.9141 2169.3906 2436.8359 2088.3047 2412.6094 1922.3984 2507.6797 1827.3203 2588.75 1746.2266 2741.6172 1749.9531 2839.5 1828.25 L2791.9375 1886.0469 C2732.3047 1838.4922 2668.9219 1843.1641 2641.8828 1870.1797 2624.1875 1887.9063 2611.1328 1915.8672 2607.3984 1944.75 L2839.5 2012.8047 C2846 2071.5078 2828.2969 2134.8906 2788.2266 2174.9766 Z M2599.0234 2020.2578 C2600.8828 2062.1953 2603.6797 2114.3828 2632.5703 2143.2891 2655.875 2166.5859 2699.6875 2158.1953 2699.6875 2076.1797 2699.6875 2033.2891 2629.7734 2028.6484 2599.0234 2020.2578 Z" stroke="#2668ee" stroke-width="5" stroke-linejoin="miter" fill="none"/>
-<path d="M2922.9844 1874.8516 C2922.9844 1783.5078 3003.1563 1743.4219 3155.9844 1781.6328 L3155.9844 1854.3359 C3098.2109 1843.1641 3066.5156 1856.2188 3066.5156 1922.3984 L3066.5156 2134.8906 3152.2578 2134.8906 3152.2578 2215.0625 3066.5156 2215.0625 C3066.5156 2260.7266 3068.375 2306.3984 3071.1797 2352.0703 L2919.25 2352.0703 C2921.1172 2306.3984 2922.9844 2260.7266 2922.9844 2215.0625 L2863.3359 2215.0625 2863.3359 2134.8906 2922.9844 2134.8906 2922.9844 1874.8516 Z" stroke="#2668ee" stroke-width="5" stroke-linejoin="miter" fill="none"/>
-<path d="M3200.5781 1804.9375 C3383.2656 1718.2734 3635.8672 1764.8672 3635.8672 1964.3359 3635.8672 2159.1328 3364.6172 2164.7188 3364.6172 2259.8047 3364.6172 2334.3594 3495.1172 2350.2109 3591.1328 2260.7266 L3591.1328 2400.5391 C3432.6719 2446.2109 3208.0469 2398.6797 3208.0469 2216.9141 3208.0469 2037.9688 3474.6172 2042.625 3474.6172 1926.1172 3474.6172 1837.5625 3324.5547 1814.2656 3200.5781 1956.875 L3200.5781 1804.9375 Z" stroke="#2668ee" stroke-width="5" stroke-linejoin="miter" fill="none"/>
-<path d="M3825.7734 1935.4375 3825.7734 2103.2031 C3825.7734 2141.4219 3827.6328 2177.7734 3832.2813 2215.0625 L3673.8359 2215.0625 C3679.4297 2160.0625 3682.2188 2117.1875 3682.2188 2062.1953 L3682.2188 1896.2969 C3682.2188 1758.3438 3847.1953 1739.7109 3914.3125 1812.4063 L3919.9141 1779.7891 4060.6406 1779.7891 C4056.9141 1804.9375 4047.5938 1855.2656 4047.5938 1893.4844 L4047.5938 2081.7734 C4047.5938 2131.1719 4051.3203 2171.25 4055.0547 2215.0625 L3898.4844 2215.0625 C3902.1875 2180.5547 3904.0625 2161.9297 3904.0625 2118.1172 L3904.0625 1888.8359 C3888.2109 1857.1406 3825.7734 1842.2344 3825.7734 1935.4375 Z" stroke="#2668ee" stroke-width="5" stroke-linejoin="miter" fill="none"/>
-<path d="M4396.3516 2226.2266 C4333.8984 2226.2266 4282.6406 2202.0078 4255.6016 2143.2891 4254.6719 2173.0938 4253.7344 2185.2266 4248.1484 2215.0625 L4099.0234 2215.0625 C4114.8672 2134.8906 4118.5938 2107.8594 4118.5938 2026.7891 L4118.5938 1933.5781 C4118.5938 1886.0469 4114.8672 1825.4453 4111.1406 1779.7891 L4268.6484 1779.7891 C4263.0625 1823.5781 4262.1328 1830.1172 4262.1328 1873.9141 L4262.1328 1976.4531 C4262.1328 2072.4531 4305.9453 2129.3047 4396.3516 2115.3203 L4396.3516 2226.2266 Z" stroke="#2668ee" stroke-width="5" stroke-linejoin="miter" fill="none"/>
-<path d="M4645.7266 2305.4609 C4668.0859 2327.8281 4705.375 2325.0313 4741.7188 2299.8672 L4741.7188 2402.3984 C4677.4219 2421.9766 4586.0781 2404.2578 4542.2656 2360.4609 4508.7109 2326.8906 4500.3203 2299.8672 4500.3203 2215.0625 L4441.6016 2215.0625 4441.6016 2134.8906 4500.3203 2134.8906 4500.3203 2028.6484 C4500.3203 1945.6953 4497.5078 1862.7344 4491.0078 1779.7891 L4648.5156 1779.7891 C4644.7891 1817.9844 4643.8516 1862.7344 4643.8516 1904.6875 L4643.8516 2134.8906 4727.7344 2134.8906 4727.7344 2215.0625 4648.5156 2215.0625 C4629.8828 2241.1484 4623.3438 2283.0938 4645.7266 2305.4609 Z" stroke="#2668ee" stroke-width="5" stroke-linejoin="miter" fill="none"/>
-</g>
-</g>
-</svg>
Removed: trunk/art/logo/NetSurfAW,d94
URL: http://source.netsurf-browser.org/trunk/art/logo/NetSurfAW%2Cd94?rev=4259...
==============================================================================
Binary file - no diff available.
Modified: trunk/art/logo/README
URL: http://source.netsurf-browser.org/trunk/art/logo/README?rev=4260&r1=4259&...
==============================================================================
--- trunk/art/logo/README (original)
+++ trunk/art/logo/README Wed Jun 4 05:18:03 2008
@@ -1,4 +1,7 @@
NetSurf Logo
-NetSurfAW the NetSurf logo in its original format (ArtWorks)
+full contains the full NetSurf logo, with text
+emblem contains the NetSurf globe, used for icons
+
+NetSurf the NetSurf logo in its original format (ArtWorks)
NetSurf.svg conversion of the NetSurf logo to SVG format
Added: trunk/art/logo/emblem/NetSurf,d94
URL: http://source.netsurf-browser.org/trunk/art/logo/emblem/NetSurf%2Cd94?rev...
==============================================================================
Binary file - no diff available.
Propchange: trunk/art/logo/emblem/NetSurf,d94
------------------------------------------------------------------------------
svn:executable = *
Propchange: trunk/art/logo/emblem/NetSurf,d94
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/art/logo/emblem/NetSurf.svg
URL: http://source.netsurf-browser.org/trunk/art/logo/emblem/NetSurf.svg?rev=4...
==============================================================================
--- trunk/art/logo/emblem/NetSurf.svg (added)
+++ trunk/art/logo/emblem/NetSurf.svg Wed Jun 4 05:18:03 2008
@@ -1,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg width="17.0129cm" height="17.0122cm" viewBox="842.6016 303.4219 2411.2813 2411.1719" version="1.0"
+ xmlns="http://www.w3.org/2000/svg">
+<desc>
+ Exported by the ArtWorks SVGExport module.
+ Source document: ADFS::Pan.$.Public.Michael.NetSurf.SVN.trunk.art.logo.emblem.NetSurf
+</desc>
+<g transform="matrix(1 0 0 -1 0 3018.0156)" stroke-miterlimit="16" fill-rule="evenodd" clip-rule="evenodd" stroke-linejoin="bevel" stroke-linecap="butt">
+<g>
+<defs>
+<radialGradient id="_Fill0" gradientUnits="userSpaceOnUse" cx="1431.0469" cy="2198.4453" r="2142.9219" spreadMethod="pad">
+<stop offset="0" stop-color="#b8f5ff"/>
+<stop offset="1" stop-color="#0097ff"/>
+</radialGradient>
+</defs>
+<path d="M886.7266 1509.0156 C886.7266 2150.4844 1406.5859 2670.4766 2048.1719 2670.4766 2689.8672 2670.4766 3209.7578 2150.4844 3209.7578 1509.0156 3209.7578 867.5938 2689.8672 347.5469 2048.3203 347.5469 1406.5859 347.5469 886.7266 867.5938 886.7266 1509.0156 Z" stroke="#000000" stroke-width="88.3516" fill="url(#_Fill0)"/>
+<path d="M2819.9219 1695.4375 2746.9844 1897.4609 2913.6016 1997.75 2719.0781 2089.1406 2765.9219 2277.7422 2563.8984 2204.7969 2463.5781 2371.4766 2372.2188 2176.8984 2183.5938 2223.7109 2256.5625 2021.7109 2089.8906 1921.3672 2284.5156 1830.0391 2237.625 1641.4375 2439.6484 1714.3516 2539.9453 1547.7031 2631.3281 1742.2734 2819.9219 1695.4375 Z" fill="#ffffff"/>
+<path d="M1527.625 2475.9219 1474.6953 2274.1563 1386.2422 2291.8438 1446.375 2511.2969 1527.625 2475.9219 Z" fill="#000000"/>
+<path d="M1432.1094 2069.1016 1414.4297 1863.8906 1333.2031 1867.3125 1350.9141 2083.1328 1432.1094 2069.1016 Z" fill="#000000"/>
+<path d="M1414.4297 1651.625 1446.375 1450.0469 1357.9688 1432.3359 1333.2031 1647.8906 1414.4297 1651.625 Z" fill="#000000"/>
+<path d="M1495.8047 1244.8594 1577.2109 1060.8359 1499.4297 1025.5156 1414.5859 1223.2891 1495.8047 1244.8594 Z" fill="#000000"/>
+<path d="M1676.3594 873.3906 1796.5234 710.5469 1725.7578 654.0156 1602.1094 830.5703 1676.3594 873.3906 Z" fill="#000000"/>
+<path d="M1927.3594 540.7344 2079.5625 385.1641 1994.7188 342.7578 1863.8828 487.2656 1927.3594 540.7344 Z" fill="#000000"/>
+<path d="M1018.2656 1046.625 1195.1563 972.4297 1174.0234 898.1094 1021.875 944.1094 1018.2656 1046.625 Z" fill="#000000"/>
+<path d="M1396.7891 929.9219 1609.0234 915.7891 1605.5859 827.3828 1386.2422 848.6484 1396.7891 929.9219 Z" fill="#000000"/>
+<path d="M1817.8203 912.2109 2026.4766 933.4766 2037.0859 848.6484 1821.2891 827.3828 1817.8203 912.2109 Z" fill="#000000"/>
+<path d="M2231.6641 965.0859 2433.2969 1014.8516 2458.0469 929.9219 2249.375 880.4375 2231.6641 965.0859 Z" fill="#000000"/>
+<path d="M2635.0625 1081.7656 2822.4063 1167.0156 2857.8125 1092.6563 2666.8594 1000.6172 2635.0625 1081.7656 Z" fill="#000000"/>
+<path d="M2992.4063 1279.6094 3133.7656 1421.6719 3211.5859 1372.0859 3048.8047 1212.8828 2992.4063 1279.6094 Z" fill="#000000"/>
+</g>
+</g>
+</svg>
Added: trunk/art/logo/full/NetSurf,d94
URL: http://source.netsurf-browser.org/trunk/art/logo/full/NetSurf%2Cd94?rev=4...
==============================================================================
Binary file - no diff available.
Propchange: trunk/art/logo/full/NetSurf,d94
------------------------------------------------------------------------------
svn:executable = *
Propchange: trunk/art/logo/full/NetSurf,d94
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
14 years, 12 months
r4259 mmu_man - in /trunk/netsurf/beos: ./ res/ res/throbber/
by netsurf＠semichrome.net
Author: mmu_man
Date: Tue Jun 3 20:53:20 2008
New Revision: 4259
URL: http://source.netsurf-browser.org?rev=4259&view=rev
Log:
- fixed alpha bitmap drawing
- fixed polygon drawing
- newstyle throbber, loosely copied from the gtk one.
Added:
trunk/netsurf/beos/res/throbber/
trunk/netsurf/beos/res/throbber/throbber0.png (with props)
trunk/netsurf/beos/res/throbber/throbber1.png (with props)
trunk/netsurf/beos/res/throbber/throbber2.png (with props)
trunk/netsurf/beos/res/throbber/throbber3.png (with props)
trunk/netsurf/beos/res/throbber/throbber4.png (with props)
trunk/netsurf/beos/res/throbber/throbber5.png (with props)
trunk/netsurf/beos/res/throbber/throbber6.png (with props)
trunk/netsurf/beos/res/throbber/throbber7.png (with props)
trunk/netsurf/beos/res/throbber/throbber8.png (with props)
Removed:
trunk/netsurf/beos/res/throbber.gif
Modified:
trunk/netsurf/beos/beos_bitmap.cpp
trunk/netsurf/beos/beos_gui.cpp
trunk/netsurf/beos/beos_plotters.cpp
trunk/netsurf/beos/beos_scaffolding.cpp
trunk/netsurf/beos/beos_throbber.cpp
trunk/netsurf/beos/beos_throbber.h
Modified: trunk/netsurf/beos/beos_bitmap.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_bitmap.cpp?rev=...
==============================================================================
--- trunk/netsurf/beos/beos_bitmap.cpp (original)
+++ trunk/netsurf/beos/beos_bitmap.cpp Tue Jun 3 20:53:20 2008
@@ -97,8 +97,10 @@
to[x].g = from[x].g;
to[x].r = from[x].r;
to[x].a = from[x].a;
+ /*
if (from[x].a == 0)
*(rgb_color *)&to[x] = B_TRANSPARENT_32_BIT;
+ */
}
from += rowstride;
to += rowstride;
@@ -168,7 +170,7 @@
{
assert(bitmap);
/* todo: test if bitmap as opaque */
- return bitmap->opaque;
+ return false;//bitmap->opaque;
}
@@ -181,7 +183,7 @@
{
assert(bitmap);
/* todo: get whether bitmap is opaque */
- return bitmap->opaque;
+ return false;//bitmap->opaque;
}
Modified: trunk/netsurf/beos/beos_gui.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_gui.cpp?rev=425...
==============================================================================
--- trunk/netsurf/beos/beos_gui.cpp (original)
+++ trunk/netsurf/beos/beos_gui.cpp Tue Jun 3 20:53:20 2008
@@ -334,8 +334,38 @@
//nsbeos_completion_init();
+
+ /* This is an ugly hack to just get the new-style throbber going.
+ * It, along with the PNG throbber loader, need making more generic.
+ */
+ {
+#define STROF(n) #n
+#define FIND_THROB(n) find_resource(filenames[(n)], \
+ "throbber/throbber" STROF(n) ".png", \
+ "./beos/res/throbber/throbber" STROF(n) ".png")
+ char filenames[9][PATH_MAX];
+ FIND_THROB(0);
+ FIND_THROB(1);
+ FIND_THROB(2);
+ FIND_THROB(3);
+ FIND_THROB(4);
+ FIND_THROB(5);
+ FIND_THROB(6);
+ FIND_THROB(7);
+ FIND_THROB(8);
+ nsbeos_throbber_initialise_from_png(9,
+ filenames[0], filenames[1], filenames[2], filenames[3],
+ filenames[4], filenames[5], filenames[6], filenames[7],
+ filenames[8]);
+#undef FIND_THROB
+#undef STROF
+ }
+
+#if 0
find_resource(buf, "throbber.gif", "./beos/res/throbber.gif");
- nsbeos_throbber_initialise(buf);
+ nsbeos_throbber_initialise_from_gif(buf);
+#endif
+
if (nsbeos_throbber == NULL)
die("Unable to load throbber image.\n");
Modified: trunk/netsurf/beos/beos_plotters.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_plotters.cpp?re...
==============================================================================
--- trunk/netsurf/beos/beos_plotters.cpp (original)
+++ trunk/netsurf/beos/beos_plotters.cpp Tue Jun 3 20:53:20 2008
@@ -107,6 +107,9 @@
};
+// #pragma mark - implementation
+
+
BView *nsbeos_current_gc(void)
{
return current_view;
@@ -158,8 +161,13 @@
nsbeos_set_colour(c);
+ float pensize = view->PenSize();
+ view->SetPenSize(line_width);
+
BRect rect(x0, y0, x0 + width - 1, y0 + height - 1);
view->StrokeRect(rect, pat);
+
+ view->SetPenSize(pensize);
//nsbeos_current_gc_unlock();
@@ -200,9 +208,14 @@
nsbeos_set_colour(c);
+ float pensize = view->PenSize();
+ view->SetPenSize(width);
+
BPoint start(x0, y0);
BPoint end(x1, y1);
view->StrokeLine(start, end, pat);
+
+ view->SetPenSize(pensize);
//nsbeos_current_gc_unlock();
@@ -236,8 +249,20 @@
return false;
}
- rgb_color color = nsbeos_rgb_colour(fill);
-
+ nsbeos_set_colour(fill);
+
+ BPoint points[n];
+
+ for (i = 0; i < n; i++) {
+ points[i] = BPoint(p[2 * i], p[2 * i + 1]);
+ }
+
+ if (fill == TRANSPARENT)
+ view->StrokePolygon(points, (int32)n);
+ else
+ view->FillPolygon(points, (int32)n);
+
+#if 0
view->BeginLineArray(n);
for (i = 0; i < n; i++) {
@@ -247,6 +272,7 @@
}
view->EndLineArray();
+#endif
//nsbeos_current_gc_unlock();
@@ -467,21 +493,29 @@
}
drawing_mode oldmode = view->DrawingMode();
- view->SetDrawingMode(B_OP_OVER);
+ source_alpha alpha;
+ alpha_function func;
+ view->GetBlendingMode(&alpha, &func);
+ //view->SetDrawingMode(B_OP_OVER);
+ view->SetDrawingMode(B_OP_ALPHA);
+ view->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
// XXX DrawBitmap() resamples if rect doesn't match,
// but doesn't do any filtering
// XXX: use Zeta API if available ?
BRect rect(x, y, x + width - 1, y + height - 1);
+ /*
rgb_color old = view->LowColor();
if (bg != TRANSPARENT) {
view->SetLowColor(nsbeos_rgb_colour(bg));
view->FillRect(rect, B_SOLID_LOW);
}
+ */
view->DrawBitmap(b, rect);
// maybe not needed?
- view->SetLowColor(old);
+ //view->SetLowColor(old);
+ view->SetBlendingMode(alpha, func);
view->SetDrawingMode(oldmode);
//nsbeos_current_gc_unlock();
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 Tue Jun 3 20:53:20 2008
@@ -527,6 +527,7 @@
url = data;
} else
url << path.Path();
+
browser_window_go(bw, url.String(), 0, true);
break;
}
@@ -1303,7 +1304,8 @@
toolbar->AddChild(g->throbber);
g->throbber->SetViewColor(toolbar->ViewColor());
g->throbber->SetLowColor(toolbar->ViewColor());
- g->throbber->SetDrawingMode(B_OP_OVER);
+ g->throbber->SetDrawingMode(B_OP_ALPHA);
+ g->throbber->SetBlendingMode(B_PIXEL_ALPHA, B_ALPHA_OVERLAY);
/* set up the throbber. */
g->throbber->SetBitmap(nsbeos_throbber->framedata[0]);
g->throb_frame = 0;
Modified: trunk/netsurf/beos/beos_throbber.cpp
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_throbber.cpp?re...
==============================================================================
--- trunk/netsurf/beos/beos_throbber.cpp (original)
+++ trunk/netsurf/beos/beos_throbber.cpp Tue Jun 3 20:53:20 2008
@@ -18,6 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
extern "C" {
#include "utils/log.h"
#include "image/gifread.h"
@@ -25,9 +26,85 @@
#include "beos/beos_throbber.h"
#include "beos/beos_bitmap.h"
+#include <File.h>
+#include <TranslationUtils.h>
+
struct nsbeos_throbber *nsbeos_throbber = NULL;
-bool nsbeos_throbber_initialise(const char *fn)
+/**
+ * Creates the throbber using a PNG for each frame. The number of frames must
+ * be at least two. The first frame is the inactive frame, others are the
+ * active frames.
+ *
+ * \param frames The number of frames. Must be at least two.
+ * \param ... Filenames of PNGs containing frames.
+ * \return true on success.
+ */
+bool nsbeos_throbber_initialise_from_png(const int frames, ...)
+{
+ va_list filenames;
+ status_t err;
+ struct nsbeos_throbber *throb; /**< structure we generate */
+ bool errors_when_loading = false; /**< true if a frame failed */
+
+ if (frames < 2) {
+ /* we need at least two frames - one for idle, one for active */
+ LOG(("Insufficent number of frames in throbber animation!"));
+ LOG(("(called with %d frames, where 2 is a minimum.)",
+ frames));
+ return false;
+ }
+
+ throb = (struct nsbeos_throbber *)malloc(sizeof(throb));
+ throb->nframes = frames;
+ throb->framedata = (BBitmap **)malloc(sizeof(BBitmap *) * throb->nframes);
+
+ va_start(filenames, frames);
+
+ for (int i = 0; i < frames; i++) {
+ const char *fn = va_arg(filenames, const char *);
+ BFile file(fn, B_READ_ONLY);
+ throb->framedata[i] = NULL;
+ err = file.InitCheck();
+ if (err < B_OK) {
+ LOG(("Error when loading %s: %s", fn, strerror(err)));
+ errors_when_loading = true;
+ continue;
+ }
+ throb->framedata[i] = BTranslationUtils::GetBitmap(&file);
+ if (throb->framedata[i] == NULL) {
+ LOG(("Error when loading %s: GetBitmap() returned NULL", fn));
+ errors_when_loading = true;
+ }
+ }
+
+ va_end(filenames);
+
+ if (errors_when_loading == true) {
+ for (int i = 0; i < frames; i++) {
+ delete throb->framedata[i];
+ }
+
+ free(throb->framedata);
+ free(throb);
+
+ return false;
+ }
+
+ nsbeos_throbber = throb;
+
+ return true;
+}
+
+/**
+ * Creates the throbber using a single GIF, using the first frame as the
+ * inactive throbber, and the others for the active animation. The GIF must
+ * therefor have at least two frames.
+ *
+ * \param fn Filename of GIF to use. It must have at least two frames.
+ * \return true on success.
+ */
+bool nsbeos_throbber_initialise_from_gif(const char *fn)
{
/* disect the GIF provided by filename in *fn into a series of
* BBitmap for use later.
Modified: trunk/netsurf/beos/beos_throbber.h
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_throbber.h?rev=...
==============================================================================
--- trunk/netsurf/beos/beos_throbber.h (original)
+++ trunk/netsurf/beos/beos_throbber.h Tue Jun 3 20:53:20 2008
@@ -29,7 +29,8 @@
extern struct nsbeos_throbber *nsbeos_throbber;
-bool nsbeos_throbber_initialise(const char *fn);
+bool nsbeos_throbber_initialise_from_gif(const char *fn);
+bool nsbeos_throbber_initialise_from_png(const int frames, ...);
void nsbeos_throbber_finalise(void);
#endif /* __BEOS_THROBBER_H__ */
Removed: trunk/netsurf/beos/res/throbber.gif
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/throbber.gif?rev...
==============================================================================
Binary file - no diff available.
Added: trunk/netsurf/beos/res/throbber/throbber0.png
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/throbber/throbbe...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurf/beos/res/throbber/throbber0.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurf/beos/res/throbber/throbber1.png
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/throbber/throbbe...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurf/beos/res/throbber/throbber1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurf/beos/res/throbber/throbber2.png
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/throbber/throbbe...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurf/beos/res/throbber/throbber2.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurf/beos/res/throbber/throbber3.png
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/throbber/throbbe...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurf/beos/res/throbber/throbber3.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurf/beos/res/throbber/throbber4.png
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/throbber/throbbe...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurf/beos/res/throbber/throbber4.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurf/beos/res/throbber/throbber5.png
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/throbber/throbbe...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurf/beos/res/throbber/throbber5.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurf/beos/res/throbber/throbber6.png
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/throbber/throbbe...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurf/beos/res/throbber/throbber6.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurf/beos/res/throbber/throbber7.png
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/throbber/throbbe...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurf/beos/res/throbber/throbber7.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: trunk/netsurf/beos/res/throbber/throbber8.png
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/res/throbber/throbbe...
==============================================================================
Binary file - no diff available.
Propchange: trunk/netsurf/beos/res/throbber/throbber8.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
14 years, 12 months
r4257 jmb - /trunk/netsurf/content/fetchcache.c
by netsurf＠semichrome.net
Author: jmb
Date: Tue Jun 3 17:17:35 2008
New Revision: 4257
URL: http://source.netsurf-browser.org?rev=4257&view=rev
Log:
Squash warning
Modified:
trunk/netsurf/content/fetchcache.c
Modified: trunk/netsurf/content/fetchcache.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchcache.c?rev=...
==============================================================================
--- trunk/netsurf/content/fetchcache.c (original)
+++ trunk/netsurf/content/fetchcache.c Tue Jun 3 17:17:35 2008
@@ -691,7 +691,7 @@
SKIP_ST(5);
strncpy(c->cache_data.etag, data + i, size - i);
c->cache_data.etag[size - i] = '\0';
- for (i = size - i - 1; i >= 0 &&
+ for (i = size - i - 1; ((int) i) >= 0 &&
(c->cache_data.etag[i] == ' ' ||
c->cache_data.etag[i] == '\t' ||
c->cache_data.etag[i] == '\r' ||
14 years, 12 months
r4256 tlsa - /trunk/netsurf/riscos/textselection.c
by netsurf＠semichrome.net
Author: tlsa
Date: Tue Jun 3 16:51:25 2008
New Revision: 4256
URL: http://source.netsurf-browser.org?rev=4256&view=rev
Log:
Don't constrain mouse pointer to window area during text selection.
Modified:
trunk/netsurf/riscos/textselection.c
Modified: trunk/netsurf/riscos/textselection.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/textselection.c?re...
==============================================================================
--- trunk/netsurf/riscos/textselection.c (original)
+++ trunk/netsurf/riscos/textselection.c Tue Jun 3 16:51:25 2008
@@ -125,10 +125,11 @@
gui_track_gui_window = g;
drag.type = wimp_DRAG_USER_POINT;
- drag.bbox.x0 = state.visible.x0;
- drag.bbox.y0 = state.visible.y0;
- drag.bbox.x1 = state.visible.x1;
- drag.bbox.y1 = state.visible.y1;
+ /* Don't constrain mouse pointer during drags */
+ drag.bbox.x0 = -16384;
+ drag.bbox.y0 = -16384;
+ drag.bbox.x1 = 16384;
+ drag.bbox.y1 = 16384;
error = xwimp_drag_box(&drag);
if (error) {
14 years, 12 months
r4255 mmu_man - /trunk/netsurf/Makefile
by netsurf＠semichrome.net
Author: mmu_man
Date: Tue Jun 3 15:13:34 2008
New Revision: 4255
URL: http://source.netsurf-browser.org?rev=4255&view=rev
Log:
Added BeOS specific host & target detection.
As BeOS needs gcc2 some hacking is required on the dependancy generation...
Added support for using resources, and C++ code.
Modified:
trunk/netsurf/Makefile
Modified: trunk/netsurf/Makefile
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile?rev=4255&r1=4254...
==============================================================================
--- trunk/netsurf/Makefile (original)
+++ trunk/netsurf/Makefile Tue Jun 3 15:13:34 2008
@@ -52,17 +52,36 @@
TARGET := riscos
endif
else
+ifeq ($(HOST),BeOS)
+HOST := beos
+endif
+ifeq ($(HOST),Haiku)
+# Haiku implements the BeOS API
+HOST := beos
+endif
+ifeq ($(HOST),beos)
+# Build happening on BeOS platform, default target is BeOS backend
+ifeq ($(TARGET),)
+TARGET := beos
+endif
+# BeOS still uses gcc2
+GCCVER := 2
+else
# Build happening on non-RO platform, default target is GTK backend
ifeq ($(TARGET),)
TARGET := gtk
endif
endif
+endif
SUBTARGET =
+RESOURCES =
ifneq ($(TARGET),riscos)
ifneq ($(TARGET),gtk)
+ifneq ($(TARGET),beos)
ifneq ($(TARGET),debug)
-$(error Unknown TARGET "$(TARGET)", should either be "riscos", "gtk", or "debug")
+$(error Unknown TARGET "$(TARGET)", should either be "riscos", "gtk", "beos" or "debug")
+endif
endif
endif
endif
@@ -97,8 +116,20 @@
PKG_CONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
endif
else
+ifeq ($(TARGET),beos)
+# Building for BeOS/Haiku
+#ifeq ($(HOST),beos)
+# Build for BeOS on BeOS
+GCCSDK_INSTALL_ENV := /boot/develop
+CC := gcc
+CXX := g++
+EXEEXT :=
+PKG_CONFIG :=
+#endif
+else
# Building for GTK or debug
PKG_CONFIG := pkg-config
+endif
endif
OBJROOT := build-$(HOST)-$(TARGET)$(SUBTARGET)
@@ -107,6 +138,12 @@
LDFLAGS := -Xlinker -symbols=$(OBJROOT)/sym -lxml2 -lz -lm -lcurl -lssl -lcrypto -lmng -ljpeg \
-lcares
else
+ifeq ($(HOST),beos)
+# some people do *not* have libm...
+LDFLAGS := -L/boot/home/config/lib
+LDFLAGS += -lxml2 -lz -lcurl -lssl -lcrypto -ljpeg -liconv
+#LDFLAGS += -lmng
+else
LDFLAGS := $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl openssl)
LDFLAGS += -lz -lm -lmng -ljpeg
@@ -114,6 +151,7 @@
ifneq ($(CCACHE),)
CC := $(CCACHE) $(CC)
+endif
endif
endif
@@ -169,6 +207,50 @@
endif
endif
+ifeq ($(TARGET),beos)
+CFLAGS += -I. -O $(WARNFLAGS) -Dnsbeos \
+ -D_BSD_SOURCE -D_POSIX_C_SOURCE \
+ -Drestrict="" -Wno-multichar
+# DEBUG
+CFLAGS += -g -O0
+# -DDEBUG=1
+
+BEOS_BERES := beres
+BEOS_XRES := xres
+BEOS_SETVER := setversion
+BEOS_MIMESET := mimeset
+VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c)
+VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
+VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
+RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS))))
+RESOURCES = $(RSRC_BEOS)
+ifeq ($(HOST),beos)
+CFLAGS += -I/boot/home/config/include \
+ -I/boot/home/config/include/libxml2 \
+ -I/boot/home/config/include/libmng
+ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),)
+LDFLAGS += -lzeta
+endif
+ifneq ($(wildcard /boot/develop/lib/*/libnetwork.so),)
+# Haiku
+NETLDFLAGS := -lnetwork
+else
+ifneq ($(wildcard /boot/develop/lib/*/libbind.so),)
+# BONE
+NETLDFLAGS := -lsocket -lbind
+else
+# net_server, will probably never work
+NETLDFLAGS := -lnet
+endif
+endif
+else
+# cross: Haiku ?
+NETLDFLAGS := -lnetwork
+endif
+LDFLAGS += -lbe $(NETLDFLAGS)
+endif
+
+
ifeq ($(TARGET),debug)
CFLAGS += -std=c99 -DDEBUG_BUILD \
-D_BSD_SOURCE \
@@ -195,7 +277,10 @@
WARNFLAGS = -W -Wall -Wundef -Wpointer-arith \
-Wcast-align -Wwrite-strings -Wstrict-prototypes \
-Wmissing-prototypes -Wmissing-declarations -Wredundant-decls \
- -Wnested-externs -Winline -Wno-unused-parameter
+ -Wnested-externs -Winline
+ifneq ($(GCCVER),2)
+WARNFLAGS += -Wno-unused-parameter
+endif
OPT0FLAGS = -O0
# -O and -O2 can use -Wuninitialized which gives us more static checking.
@@ -208,9 +293,9 @@
include Makefile.sources
-OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsubst %.s,%.o,$(SOURCES))))))
-
-$(EXETARGET): $(OBJECTS)
+OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.s,%.o,$(SOURCES)))))))
+
+$(EXETARGET): $(OBJECTS) $(RESOURCES)
$(VQ)echo " LINK: $(EXETARGET)"
ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
@@ -218,6 +303,22 @@
$(Q)$(CC) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS)
$(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET)
$(Q)$(RM) $(EXETARGET:,ff8=,e1f)
+endif
+ifeq ($(TARGET),beos)
+ $(VQ)echo " XRES: $(EXETARGET)"
+ $(Q)$(BEOS_XRES) -o $(EXETARGET) $(RSRC_BEOS)
+ $(VQ)echo " SETVER: $(EXETARGET)"
+ $(Q)$(BEOS_SETVER) $(EXETARGET) \
+ -app $(VERSION_MAJ) $(VERSION_MIN) 0 d 0 \
+ -short "NetSurf $(VERSION_FULL)" \
+ -long "NetSurf $(VERSION_FULL) ©"
+ $(VQ)echo " MIMESET: $(EXETARGET)"
+ $(Q)$(BEOS_MIMESET) $(EXETARGET)
+endif
+
+ifeq ($(TARGET),beos)
+$(RSRC_BEOS): $(RDEF_BEOS)
+ $(Q)$(BEOS_BERES) -o $@ $<
endif
clean-target:
@@ -239,6 +340,19 @@
# 1 = Source file
# 2 = dep filename, no prefix
# 3 = obj filename, no prefix
+ifeq ($(GCCVER),2)
+# simpler deps tracking for gcc2...
+define dependency_generate_c
+DEPFILES += $(2)
+$$(DEPROOT)/$(2): $$(DEPROOT)/created $(1) css/css_enum.h css/parser.h
+ $$(VQ)echo " DEP: $(1)"
+ $$(Q)$$(RM) $$(DEPROOT)/$(2)
+ $$(Q)$$(CC) $$(CFLAGS) -MM \
+ $(1) | sed 's,^.*:,$$(DEPROOT)/$2 $$(OBJROOT)/$(3):,' \
+ > $$(DEPROOT)/$(2)
+
+endef
+else
define dependency_generate_c
DEPFILES += $(2)
$$(DEPROOT)/$(2): $$(DEPROOT)/created $(1) css/css_enum.h css/parser.h
@@ -248,6 +362,7 @@
-MF $$(DEPROOT)/$(2) $(1)
endef
+endif
# 1 = Source file
# 2 = dep filename, no prefix
@@ -272,6 +387,13 @@
endef
+define compile_target_cpp
+$$(OBJROOT)/$(2): $$(OBJROOT)/created $$(DEPROOT)/$(3)
+ $$(VQ)echo " COMPILE: $(1)"
+ $$(Q)$$(CXX) $$(CFLAGS) -o $$@ -c $(1)
+
+endef
+
# 1 = Source file
# 2 = obj filename, no prefix
# 3 = dep filename, no prefix
@@ -286,6 +408,9 @@
$(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \
$(call dependency_generate_c,$(SOURCE),$(subst /,_,$(SOURCE:.c=.d)),$(subst /,_,$(SOURCE:.c=.o)))))
+$(eval $(foreach SOURCE,$(filter %.cpp,$(SOURCES)), \
+ $(call dependency_generate_c,$(SOURCE),$(subst /,_,$(SOURCE:.cpp=.d)),$(subst /,_,$(SOURCE:.cpp=.o)))))
+
# Cannot currently generate dep files for S files because they're objasm
# when we move to gas format, we will be able to.
@@ -301,6 +426,9 @@
$(eval $(foreach SOURCE,$(filter %.c,$(SOURCES)), \
$(call compile_target_c,$(SOURCE),$(subst /,_,$(SOURCE:.c=.o)),$(subst /,_,$(SOURCE:.c=.d)))))
+$(eval $(foreach SOURCE,$(filter %.cpp,$(SOURCES)), \
+ $(call compile_target_cpp,$(SOURCE),$(subst /,_,$(SOURCE:.cpp=.o)),$(subst /,_,$(SOURCE:.cpp=.d)))))
+
$(eval $(foreach SOURCE,$(filter %.s,$(SOURCES)), \
$(call compile_target_s,$(SOURCE),$(subst /,_,$(SOURCE:.s=.o)),$(subst /,_,$(SOURCE:.s=.d)))))
14 years, 12 months
r4254 mmu_man - /trunk/netsurf/Makefile.sources
by netsurf＠semichrome.net
Author: mmu_man
Date: Tue Jun 3 14:51:54 2008
New Revision: 4254
URL: http://source.netsurf-browser.org?rev=4254&view=rev
Log:
Add BeOS sources.
Modified:
trunk/netsurf/Makefile.sources
Modified: trunk/netsurf/Makefile.sources
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.sources?rev=4254...
==============================================================================
--- trunk/netsurf/Makefile.sources (original)
+++ trunk/netsurf/Makefile.sources Tue Jun 3 14:51:54 2008
@@ -56,6 +56,16 @@
gtk_login.c gtk_throbber.c \
gtk_history.c gtk_window.c gtk_filetype.c gtk_download.c
S_GTK := $(addprefix gtk/,$(S_GTK))
+
+# S_BEOS are sources purely for the BeOS build
+S_BEOS := beos_bitmap.cpp beos_fetch_rsrc.cpp beos_filetype.cpp beos_font.cpp \
+ beos_gui.cpp beos_history.cpp beos_login.cpp beos_options.cpp \
+ beos_plotters.cpp beos_scaffolding.cpp beos_schedule.cpp \
+ beos_thumbnail.cpp beos_treeview.cpp beos_throbber.cpp \
+ beos_window.cpp
+S_BEOS := $(addprefix beos/,$(S_BEOS))
+RDEF_BEOS := beos_res.rdef
+RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS))
# S_DEBUG are sources purely for the debug build
S_DEBUG := netsurfd.c debug_bitmap.c filetyped.c fontd.c
@@ -117,6 +127,11 @@
EXETARGET := nsgtk
endif
+ifeq ($(TARGET),beos)
+SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
+EXETARGET := NetSurf
+endif
+
ifeq ($(TARGET),debug)
SOURCES := $(S_COMMON) $(S_IMAGE) $(S_DEBUG)
EXETARGET := nsdebug
14 years, 12 months
