netsurf: branch master updated. 30efe4ba306f129f3d92108dee522b3eb132545a
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/30efe4ba306f129f3d921...
...commit http://git.netsurf-browser.org/netsurf.git/commit/30efe4ba306f129f3d92108...
...tree http://git.netsurf-browser.org/netsurf.git/tree/30efe4ba306f129f3d92108de...
The branch, master has been updated
via 30efe4ba306f129f3d92108dee522b3eb132545a (commit)
from ec7389a18f8cbfd79ec98da5b30ea616573c9f34 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/30efe4ba306f129f3d9...
commit 30efe4ba306f129f3d92108dee522b3eb132545a
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Updated Italian translation (credit: Samir Hawamdeh)
diff --git a/resources/FatMessages b/resources/FatMessages
index 80e7dbd..99cfce8 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -1212,12 +1212,12 @@ nl.all.HotlistFeatureRequest:NetSurf feature requests
en.ami.HotlistMenu:Hotlist menu
de.ami.HotlistMenu:Hotlist menu
fr.ami.HotlistMenu:Hotlist menu
-it.ami.HotlistMenu:Hotlist menu
+it.ami.HotlistMenu:Menu segnalibri
nl.ami.HotlistMenu:Hotlist menu
en.ami.HotlistToolbar:Hotlist toolbar
de.ami.HotlistToolbar:Hotlist toolbar
fr.ami.HotlistToolbar:Hotlist toolbar
-it.ami.HotlistToolbar:Hotlist toolbar
+it.ami.HotlistToolbar:Barra segnalibri
nl.ami.HotlistToolbar:Hotlist toolbar
@@ -2339,62 +2339,62 @@ nl.all.SelectMenu:Select
en.all.DrawTitle:%s (Draw image %lux%lu pixels)
de.all.DrawTitle:%s (Draw Bild %lux%lu pixels)
fr.all.DrawTitle:%s (Image Draw %lux%lu pixels)
-it.all.DrawTitle:%s (Immagine Draw %lux%lu pixels)
+it.all.DrawTitle:%s (Immagine Draw %lux%lu pixel)
nl.all.DrawTitle:%s (Draw image %lux%lu pixels)
en.all.GIFTitle:%s (GIF image %lux%lu pixels)
de.all.GIFTitle:%s (GIF Bild %lux%lu pixels)
fr.all.GIFTitle:%s (Image GIF %lux%lu pixels)
-it.all.GIFTitle:%s (Immagine GIF %lux%lu pixels)
+it.all.GIFTitle:%s (Immagine GIF %lux%lu pixel)
nl.all.GIFTitle:%s (GIF image %lux%lu pixels)
en.all.BMPTitle:%s (BMP image %lux%lu pixels)
de.all.BMPTitle:%s (BMP Bild %lux%lu pixels)
fr.all.BMPTitle:%s (Image BMP %lux%lu pixels)
-it.all.BMPTitle:%s (Immagine BMP %lux%lu pixels)
+it.all.BMPTitle:%s (Immagine BMP %lux%lu pixel)
nl.all.BMPTitle:%s (BMP image %lux%lu pixels)
en.all.ICOTitle:%s (ICO image %lux%lu pixels)
de.all.ICOTitle:%s (ICO Bild %lux%lu pixels)
fr.all.ICOTitle:%s (Image BMP %lux%lu pixels)
-it.all.ICOTitle:%s (Immagine ICO %lux%lu pixels)
+it.all.ICOTitle:%s (Immagine ICO %lux%lu pixel)
nl.all.ICOTitle:%s (ICO image %lux%lu pixels)
en.all.JPEGTitle:%s (JPEG image %lux%lu pixels)
de.all.JPEGTitle:%s (JPEG Bild %lux%lu pixels)
fr.all.JPEGTitle:%s (Image JPEG %lux%lu pixels)
-it.all.JPEGTitle:%s (Immagine JPEG %lux%lu pixels)
+it.all.JPEGTitle:%s (Immagine JPEG %lux%lu pixel)
nl.all.JPEGTitle:%s (JPEG image %lux%lu pixels)
en.all.PNGTitle:%s (PNG image %lux%lu pixels)
de.all.PNGTitle:%s (PNG Bild %lux%lu pixels)
fr.all.PNGTitle:%s (Image PNG %lux%lu pixels)
-it.all.PNGTitle:%s (Immagine PNG %lux%lu pixels)
+it.all.PNGTitle:%s (Immagine PNG %lux%lu pixel)
nl.all.PNGTitle:%s (PNG image %lux%lu pixels)
en.all.JNGTitle:%s (JNG image %lux%lu pixels)
de.all.JNGTitle:%s (JNG Bild %lux%lu pixels)
fr.all.JNGTitle:%s (Image JNG %lux%lu pixels)
-it.all.JNGTitle:%s (Immagine JNG %lux%lu pixels)
+it.all.JNGTitle:%s (Immagine JNG %lux%lu pixel)
nl.all.JNGTitle:%s (JNG image %lux%lu pixels)
en.all.MNGTitle:%s (MNG image %lux%lu pixels)
de.all.MNGTitle:%s (MNG Bild %lux%lu pixels)
fr.all.MNGTitle:%s (Image MNG %lux%lu pixels)
-it.all.MNGTitle:%s (Immagine MNG %lux%lu pixels)
+it.all.MNGTitle:%s (Immagine MNG %lux%lu pixel)
nl.all.MNGTitle:%s (MNG image %lux%lu pixels)
en.all.WebPTitle:%s (WebP image %lux%lu pixels)
de.all.WebPTitle:%s (WebP Bild %lux%lu pixels)
fr.all.WebPTitle:%s (Image WebP %lux%lu pixels)
-it.all.WebPTitle:%s (Immagine WebP %lux%lu pixels)
+it.all.WebPTitle:%s (Immagine WebP %lux%lu pixel)
nl.all.WebPTitle:%s (WebP image %lux%lu pixels)
en.all.SpriteTitle:%s (Sprite image %lux%lu pixels)
de.all.SpriteTitle:%s (Sprite Bild %lux%lu pixels)
fr.all.SpriteTitle:%s (Image Sprite %lux%lu pixels)
-it.all.SpriteTitle:%s (Immagine Sprite %lux%lu pixels)
+it.all.SpriteTitle:%s (Immagine Sprite %lux%lu pixel)
nl.all.SpriteTitle:%s (Sprite image %lux%lu pixels)
en.all.ArtWorksTitle:%s (ArtWorks image %lux%lu pixels)
de.all.ArtWorksTitle:%s (ArtWorks Bild %lux%lu pixels)
fr.all.ArtWorksTitle:%s (Image ArtWorks %lux%lu pixels)
-it.all.ArtWorksTitle:%s (Immagine ArtWorks %lux%lu pixels)
+it.all.ArtWorksTitle:%s (Immagine ArtWorks %lux%lu pixel)
nl.all.ArtWorksTitle:%s (ArtWorks image %lux%lu pixels)
en.ami.DataTypesTitle:%s (%s image %lux%lu pixels)
de.ami.DataTypesTitle:%s (%s Bild %lux%lu pixels)
fr.ami.DataTypesTitle:%s (Image %s %lux%lu pixels)
-it.ami.DataTypesTitle:%s (Immagine %s %lux%lu pixels)
+it.ami.DataTypesTitle:%s (Immagine %s %lux%lu pixel)
nl.ami.DataTypesTitle:%s (%s image %lux%lu pixels)
# HTML page character set
@@ -2678,17 +2678,17 @@ nl.ami.CompError:Unable to open
en.ami.MultiTabClose:Are you sure you want to close multiple tabs?
de.ami.MultiTabClose:Are you sure you want to close multiple tabs?
fr.ami.MultiTabClose:Are you sure you want to close multiple tabs?
-it.ami.MultiTabClose:Are you sure you want to close multiple tabs?
+it.ami.MultiTabClose:Sono rimaste aperte più schede, sei sicuro di voler uscire da NetSurf?
nl.ami.MultiTabClose:Are you sure you want to close multiple tabs?
en.ami.TCPIPShutdown:The TCP/IP stack has signalled that it is about to shutdown and NetSurf must exit. NetSurf will quit in 5 seconds unless this shutdown is aborted.
de.ami.TCPIPShutdown:The TCP/IP stack has signalled that it is about to shutdown and NetSurf must exit. NetSurf will quit in 5 seconds unless this shutdown is aborted.
fr.ami.TCPIPShutdown:The TCP/IP stack has signalled that it is about to shutdown and NetSurf must exit. NetSurf will quit in 5 seconds unless this shutdown is aborted.
-it.ami.TCPIPShutdown:The TCP/IP stack has signalled that it is about to shutdown and NetSurf must exit. NetSurf will quit in 5 seconds unless this shutdown is aborted.
+it.ami.TCPIPShutdown:Lo stack TCP/IP ha dato segnale di essere in procinto di arresto, NetSurf verrà chiuso. NetSurf si chiuderà entro 5 secondi a meno che lo shutdown non venga interrotto.
nl.ami.TCPIPShutdown:The TCP/IP stack has signalled that it is about to shutdown and NetSurf must exit. NetSurf will quit in 5 seconds unless this shutdown is aborted.
en.ami.AbortShutdown:Abort shutdown
de.ami.AbortShutdown:Abort shutdown
fr.ami.AbortShutdown:Abort shutdown
-it.ami.AbortShutdown:Abort shutdown
+it.ami.AbortShutdown:Interrompi lo shutdown
nl.ami.AbortShutdown:Abort shutdown
@@ -5299,7 +5299,7 @@ nl.ami.ScreenPublic:Public screen
en.ami.SimpleRefresh:Simple refresh
de.ami.SimpleRefresh:Simple refresh
fr.ami.SimpleRefresh:Simple refresh
-it.ami.SimpleRefresh:Simple refresh
+it.ami.SimpleRefresh:Refresh semplice
nl.ami.SimpleRefresh:Simple refresh
en.all.Theme:Theme
de.all.Theme:Thema
@@ -5369,7 +5369,7 @@ de.all.ScaleQuality:Skalieren hoher Qualität
fr.all.ScaleQuality:Higher quality scaling
it.all.ScaleQuality:Massima qualità di visualizzazione
nl.all.ScaleQuality:Higher quality scaling
-en.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+en.ami.DitherQuality:Qualità dither (<= solo modi a 8-bit)
de.ami.DitherQuality:Dither quality (<= 8-bit modes only)
fr.ami.DitherQuality:Dither quality (<= 8-bit modes only)
it.ami.DitherQuality:Dither quality (<= 8-bit modes only)
@@ -5377,17 +5377,17 @@ nl.ami.DitherQuality:Dither quality (<= 8-bit modes only)
en.ami.Low:Low
de.ami.Low:Low
fr.ami.Low:Low
-it.ami.Low:Low
+it.ami.Low:Bassa
nl.ami.Low:Low
en.ami.Medium:Medium
de.ami.Medium:Medium
fr.ami.Medium:Medium
-it.ami.Medium:Medium
+it.ami.Medium:Media
nl.ami.Medium:Medium
en.ami.High:High
de.ami.High:High
fr.ami.High:High
-it.ami.High:High
+it.ami.High:Alta
nl.ami.High:High
en.all.Animations:Animations
de.all.Animations:Animationen
@@ -5503,7 +5503,7 @@ nl.all.Pt:pt
en.ami.FontAntialiasing:Use anti-aliasing (when possible)
de.ami.FontAntialiasing:Use anti-aliasing (when possible)
fr.ami.FontAntialiasing:Use anti-aliasing (when possible)
-it.ami.FontAntialiasing:Use anti-aliasing (when possible)
+it.ami.FontAntialiasing:Usa anti-aliasing (quando possibile)
nl.ami.FontAntialiasing:Use anti-aliasing (when possible)
# Font scanning
@@ -5548,7 +5548,7 @@ nl.all.Duration:Duration
en.ami.Tabs:Tabs
de.ami.Tabs:Tabs
fr.ami.Tabs:Tabs
-it.ami.Tabs:Tabs
+it.ami.Tabs:Schede
nl.ami.Tabs:Tabs
en.all.TabbedBrowsing:Tabbed browsing
de.all.TabbedBrowsing:Registernavigation (Tabs)
@@ -5563,7 +5563,7 @@ nl.all.TabActive:Open new tabs in background
en.all.TabMiddle:Middle mouse button opens tabs
de.all.TabMiddle:Mittlere Maustaste öffnet Tab
fr.all.TabMiddle:Middle mouse button opens tabs
-it.all.TabMiddle:Tasto centrale per l'apertura delle schede
+it.all.TabMiddle:Usa tasto centrale del mouse per aprire le schede
nl.all.TabMiddle:Middle mouse button opens tabs
en.all.TabLast:Open new tabs after all existing tabs
de.all.TabLast:Open new tabs after all existing tabs
@@ -5573,12 +5573,12 @@ nl.all.TabLast:Open new tabs after all existing tabs
en.ami.TabClose:Warn when closing multiple tabs
de.ami.TabClose:Warn when closing multiple tabs
fr.ami.TabClose:Warn when closing multiple tabs
-it.ami.TabClose:Warn when closing multiple tabs
+it.ami.TabClose:Avvisa quando si chiudono più schede
nl.ami.TabClose:Warn when closing multiple tabs
en.ami.TabAlways:Always show tabs
de.ami.TabAlways:Always show tabs
fr.ami.TabAlways:Always show tabs
-it.ami.TabAlways:Always show tabs
+it.ami.TabAlways:Mostra sempre la barra delle schede
nl.ami.TabAlways:Always show tabs
# Advanced
-----------------------------------------------------------------------
Summary of changes:
resources/FatMessages | 54 ++++++++++++++++++++++++------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/resources/FatMessages b/resources/FatMessages
index 80e7dbd..99cfce8 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -1212,12 +1212,12 @@ nl.all.HotlistFeatureRequest:NetSurf feature requests
en.ami.HotlistMenu:Hotlist menu
de.ami.HotlistMenu:Hotlist menu
fr.ami.HotlistMenu:Hotlist menu
-it.ami.HotlistMenu:Hotlist menu
+it.ami.HotlistMenu:Menu segnalibri
nl.ami.HotlistMenu:Hotlist menu
en.ami.HotlistToolbar:Hotlist toolbar
de.ami.HotlistToolbar:Hotlist toolbar
fr.ami.HotlistToolbar:Hotlist toolbar
-it.ami.HotlistToolbar:Hotlist toolbar
+it.ami.HotlistToolbar:Barra segnalibri
nl.ami.HotlistToolbar:Hotlist toolbar
@@ -2339,62 +2339,62 @@ nl.all.SelectMenu:Select
en.all.DrawTitle:%s (Draw image %lux%lu pixels)
de.all.DrawTitle:%s (Draw Bild %lux%lu pixels)
fr.all.DrawTitle:%s (Image Draw %lux%lu pixels)
-it.all.DrawTitle:%s (Immagine Draw %lux%lu pixels)
+it.all.DrawTitle:%s (Immagine Draw %lux%lu pixel)
nl.all.DrawTitle:%s (Draw image %lux%lu pixels)
en.all.GIFTitle:%s (GIF image %lux%lu pixels)
de.all.GIFTitle:%s (GIF Bild %lux%lu pixels)
fr.all.GIFTitle:%s (Image GIF %lux%lu pixels)
-it.all.GIFTitle:%s (Immagine GIF %lux%lu pixels)
+it.all.GIFTitle:%s (Immagine GIF %lux%lu pixel)
nl.all.GIFTitle:%s (GIF image %lux%lu pixels)
en.all.BMPTitle:%s (BMP image %lux%lu pixels)
de.all.BMPTitle:%s (BMP Bild %lux%lu pixels)
fr.all.BMPTitle:%s (Image BMP %lux%lu pixels)
-it.all.BMPTitle:%s (Immagine BMP %lux%lu pixels)
+it.all.BMPTitle:%s (Immagine BMP %lux%lu pixel)
nl.all.BMPTitle:%s (BMP image %lux%lu pixels)
en.all.ICOTitle:%s (ICO image %lux%lu pixels)
de.all.ICOTitle:%s (ICO Bild %lux%lu pixels)
fr.all.ICOTitle:%s (Image BMP %lux%lu pixels)
-it.all.ICOTitle:%s (Immagine ICO %lux%lu pixels)
+it.all.ICOTitle:%s (Immagine ICO %lux%lu pixel)
nl.all.ICOTitle:%s (ICO image %lux%lu pixels)
en.all.JPEGTitle:%s (JPEG image %lux%lu pixels)
de.all.JPEGTitle:%s (JPEG Bild %lux%lu pixels)
fr.all.JPEGTitle:%s (Image JPEG %lux%lu pixels)
-it.all.JPEGTitle:%s (Immagine JPEG %lux%lu pixels)
+it.all.JPEGTitle:%s (Immagine JPEG %lux%lu pixel)
nl.all.JPEGTitle:%s (JPEG image %lux%lu pixels)
en.all.PNGTitle:%s (PNG image %lux%lu pixels)
de.all.PNGTitle:%s (PNG Bild %lux%lu pixels)
fr.all.PNGTitle:%s (Image PNG %lux%lu pixels)
-it.all.PNGTitle:%s (Immagine PNG %lux%lu pixels)
+it.all.PNGTitle:%s (Immagine PNG %lux%lu pixel)
nl.all.PNGTitle:%s (PNG image %lux%lu pixels)
en.all.JNGTitle:%s (JNG image %lux%lu pixels)
de.all.JNGTitle:%s (JNG Bild %lux%lu pixels)
fr.all.JNGTitle:%s (Image JNG %lux%lu pixels)
-it.all.JNGTitle:%s (Immagine JNG %lux%lu pixels)
+it.all.JNGTitle:%s (Immagine JNG %lux%lu pixel)
nl.all.JNGTitle:%s (JNG image %lux%lu pixels)
en.all.MNGTitle:%s (MNG image %lux%lu pixels)
de.all.MNGTitle:%s (MNG Bild %lux%lu pixels)
fr.all.MNGTitle:%s (Image MNG %lux%lu pixels)
-it.all.MNGTitle:%s (Immagine MNG %lux%lu pixels)
+it.all.MNGTitle:%s (Immagine MNG %lux%lu pixel)
nl.all.MNGTitle:%s (MNG image %lux%lu pixels)
en.all.WebPTitle:%s (WebP image %lux%lu pixels)
de.all.WebPTitle:%s (WebP Bild %lux%lu pixels)
fr.all.WebPTitle:%s (Image WebP %lux%lu pixels)
-it.all.WebPTitle:%s (Immagine WebP %lux%lu pixels)
+it.all.WebPTitle:%s (Immagine WebP %lux%lu pixel)
nl.all.WebPTitle:%s (WebP image %lux%lu pixels)
en.all.SpriteTitle:%s (Sprite image %lux%lu pixels)
de.all.SpriteTitle:%s (Sprite Bild %lux%lu pixels)
fr.all.SpriteTitle:%s (Image Sprite %lux%lu pixels)
-it.all.SpriteTitle:%s (Immagine Sprite %lux%lu pixels)
+it.all.SpriteTitle:%s (Immagine Sprite %lux%lu pixel)
nl.all.SpriteTitle:%s (Sprite image %lux%lu pixels)
en.all.ArtWorksTitle:%s (ArtWorks image %lux%lu pixels)
de.all.ArtWorksTitle:%s (ArtWorks Bild %lux%lu pixels)
fr.all.ArtWorksTitle:%s (Image ArtWorks %lux%lu pixels)
-it.all.ArtWorksTitle:%s (Immagine ArtWorks %lux%lu pixels)
+it.all.ArtWorksTitle:%s (Immagine ArtWorks %lux%lu pixel)
nl.all.ArtWorksTitle:%s (ArtWorks image %lux%lu pixels)
en.ami.DataTypesTitle:%s (%s image %lux%lu pixels)
de.ami.DataTypesTitle:%s (%s Bild %lux%lu pixels)
fr.ami.DataTypesTitle:%s (Image %s %lux%lu pixels)
-it.ami.DataTypesTitle:%s (Immagine %s %lux%lu pixels)
+it.ami.DataTypesTitle:%s (Immagine %s %lux%lu pixel)
nl.ami.DataTypesTitle:%s (%s image %lux%lu pixels)
# HTML page character set
@@ -2678,17 +2678,17 @@ nl.ami.CompError:Unable to open
en.ami.MultiTabClose:Are you sure you want to close multiple tabs?
de.ami.MultiTabClose:Are you sure you want to close multiple tabs?
fr.ami.MultiTabClose:Are you sure you want to close multiple tabs?
-it.ami.MultiTabClose:Are you sure you want to close multiple tabs?
+it.ami.MultiTabClose:Sono rimaste aperte più schede, sei sicuro di voler uscire da NetSurf?
nl.ami.MultiTabClose:Are you sure you want to close multiple tabs?
en.ami.TCPIPShutdown:The TCP/IP stack has signalled that it is about to shutdown and NetSurf must exit. NetSurf will quit in 5 seconds unless this shutdown is aborted.
de.ami.TCPIPShutdown:The TCP/IP stack has signalled that it is about to shutdown and NetSurf must exit. NetSurf will quit in 5 seconds unless this shutdown is aborted.
fr.ami.TCPIPShutdown:The TCP/IP stack has signalled that it is about to shutdown and NetSurf must exit. NetSurf will quit in 5 seconds unless this shutdown is aborted.
-it.ami.TCPIPShutdown:The TCP/IP stack has signalled that it is about to shutdown and NetSurf must exit. NetSurf will quit in 5 seconds unless this shutdown is aborted.
+it.ami.TCPIPShutdown:Lo stack TCP/IP ha dato segnale di essere in procinto di arresto, NetSurf verrà chiuso. NetSurf si chiuderà entro 5 secondi a meno che lo shutdown non venga interrotto.
nl.ami.TCPIPShutdown:The TCP/IP stack has signalled that it is about to shutdown and NetSurf must exit. NetSurf will quit in 5 seconds unless this shutdown is aborted.
en.ami.AbortShutdown:Abort shutdown
de.ami.AbortShutdown:Abort shutdown
fr.ami.AbortShutdown:Abort shutdown
-it.ami.AbortShutdown:Abort shutdown
+it.ami.AbortShutdown:Interrompi lo shutdown
nl.ami.AbortShutdown:Abort shutdown
@@ -5299,7 +5299,7 @@ nl.ami.ScreenPublic:Public screen
en.ami.SimpleRefresh:Simple refresh
de.ami.SimpleRefresh:Simple refresh
fr.ami.SimpleRefresh:Simple refresh
-it.ami.SimpleRefresh:Simple refresh
+it.ami.SimpleRefresh:Refresh semplice
nl.ami.SimpleRefresh:Simple refresh
en.all.Theme:Theme
de.all.Theme:Thema
@@ -5369,7 +5369,7 @@ de.all.ScaleQuality:Skalieren hoher Qualität
fr.all.ScaleQuality:Higher quality scaling
it.all.ScaleQuality:Massima qualità di visualizzazione
nl.all.ScaleQuality:Higher quality scaling
-en.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+en.ami.DitherQuality:Qualità dither (<= solo modi a 8-bit)
de.ami.DitherQuality:Dither quality (<= 8-bit modes only)
fr.ami.DitherQuality:Dither quality (<= 8-bit modes only)
it.ami.DitherQuality:Dither quality (<= 8-bit modes only)
@@ -5377,17 +5377,17 @@ nl.ami.DitherQuality:Dither quality (<= 8-bit modes only)
en.ami.Low:Low
de.ami.Low:Low
fr.ami.Low:Low
-it.ami.Low:Low
+it.ami.Low:Bassa
nl.ami.Low:Low
en.ami.Medium:Medium
de.ami.Medium:Medium
fr.ami.Medium:Medium
-it.ami.Medium:Medium
+it.ami.Medium:Media
nl.ami.Medium:Medium
en.ami.High:High
de.ami.High:High
fr.ami.High:High
-it.ami.High:High
+it.ami.High:Alta
nl.ami.High:High
en.all.Animations:Animations
de.all.Animations:Animationen
@@ -5503,7 +5503,7 @@ nl.all.Pt:pt
en.ami.FontAntialiasing:Use anti-aliasing (when possible)
de.ami.FontAntialiasing:Use anti-aliasing (when possible)
fr.ami.FontAntialiasing:Use anti-aliasing (when possible)
-it.ami.FontAntialiasing:Use anti-aliasing (when possible)
+it.ami.FontAntialiasing:Usa anti-aliasing (quando possibile)
nl.ami.FontAntialiasing:Use anti-aliasing (when possible)
# Font scanning
@@ -5548,7 +5548,7 @@ nl.all.Duration:Duration
en.ami.Tabs:Tabs
de.ami.Tabs:Tabs
fr.ami.Tabs:Tabs
-it.ami.Tabs:Tabs
+it.ami.Tabs:Schede
nl.ami.Tabs:Tabs
en.all.TabbedBrowsing:Tabbed browsing
de.all.TabbedBrowsing:Registernavigation (Tabs)
@@ -5563,7 +5563,7 @@ nl.all.TabActive:Open new tabs in background
en.all.TabMiddle:Middle mouse button opens tabs
de.all.TabMiddle:Mittlere Maustaste öffnet Tab
fr.all.TabMiddle:Middle mouse button opens tabs
-it.all.TabMiddle:Tasto centrale per l'apertura delle schede
+it.all.TabMiddle:Usa tasto centrale del mouse per aprire le schede
nl.all.TabMiddle:Middle mouse button opens tabs
en.all.TabLast:Open new tabs after all existing tabs
de.all.TabLast:Open new tabs after all existing tabs
@@ -5573,12 +5573,12 @@ nl.all.TabLast:Open new tabs after all existing tabs
en.ami.TabClose:Warn when closing multiple tabs
de.ami.TabClose:Warn when closing multiple tabs
fr.ami.TabClose:Warn when closing multiple tabs
-it.ami.TabClose:Warn when closing multiple tabs
+it.ami.TabClose:Avvisa quando si chiudono più schede
nl.ami.TabClose:Warn when closing multiple tabs
en.ami.TabAlways:Always show tabs
de.ami.TabAlways:Always show tabs
fr.ami.TabAlways:Always show tabs
-it.ami.TabAlways:Always show tabs
+it.ami.TabAlways:Mostra sempre la barra delle schede
nl.ami.TabAlways:Always show tabs
# Advanced
--
NetSurf Browser
10 years, 12 months
- 1
- 0
toolchains: branch master updated. 6ffb88792a63ed15117b01aae9ac844f7b6da1dc
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/6ffb88792a63ed1511...
...commit http://git.netsurf-browser.org/toolchains.git/commit/6ffb88792a63ed15117b...
...tree http://git.netsurf-browser.org/toolchains.git/tree/6ffb88792a63ed15117b01...
The branch, master has been updated
via 6ffb88792a63ed15117b01aae9ac844f7b6da1dc (commit)
from 9f96f97dcfacbed41ce1425072def3880f7d9a77 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commitdiff/6ffb88792a63ed15...
commit 6ffb88792a63ed15117b01aae9ac844f7b6da1dc
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fix jit build patch to be correct for armv3
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
index 9236477..2d7ddb0 100644
--- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
@@ -55,12 +55,13 @@
" add sp, sp, #(4*7 + 4*4)" "\n"
" mov r0, #0" "\n"
" pop {r4-r11,pc}" "\n"
-@@ -551,7 +551,7 @@
+@@ -551,7 +551,8 @@
* The arguments are identical to those for js_* except that the target function should be in
* 'ip'. */
" push {ip,lr}" "\n"
-" blx ip" "\n"
-+" bl ip" "\n"
++" mov lr, pc" "\n"
++" mov pc, ip" "\n"
" pop {ip,pc}" "\n"
);
-----------------------------------------------------------------------
Summary of changes:
.../spidermonkey/arm-unknown-riscos/MethodJIT.p | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
index 9236477..2d7ddb0 100644
--- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
@@ -55,12 +55,13 @@
" add sp, sp, #(4*7 + 4*4)" "\n"
" mov r0, #0" "\n"
" pop {r4-r11,pc}" "\n"
-@@ -551,7 +551,7 @@
+@@ -551,7 +551,8 @@
* The arguments are identical to those for js_* except that the target function should be in
* 'ip'. */
" push {ip,lr}" "\n"
-" blx ip" "\n"
-+" bl ip" "\n"
++" mov lr, pc" "\n"
++" mov pc, ip" "\n"
" pop {ip,pc}" "\n"
);
--
Cross-compilation toolchains and environments
11 years
- 1
- 0
netsurf: branch master updated. ec7389a18f8cbfd79ec98da5b30ea616573c9f34
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/ec7389a18f8cbfd79ec98...
...commit http://git.netsurf-browser.org/netsurf.git/commit/ec7389a18f8cbfd79ec98da...
...tree http://git.netsurf-browser.org/netsurf.git/tree/ec7389a18f8cbfd79ec98da5b...
The branch, master has been updated
via ec7389a18f8cbfd79ec98da5b30ea616573c9f34 (commit)
from 8698245ad2e7885368f71080154b6590b407e7b5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/ec7389a18f8cbfd79ec...
commit ec7389a18f8cbfd79ec98da5b30ea616573c9f34
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Update the current pressed qualifier keys at every RAWKEY event, as the update doesn't work during IDCMP_IDCMPUPDATE
diff --git a/amiga/gui.c b/amiga/gui.c
index bd0715e..4a50566 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1643,8 +1643,9 @@ void ami_handle_msg(void)
break;
case WMHI_RAWKEY:
+ ami_update_quals(gwin);
+
storage = result & WMHI_GADGETMASK;
-
if(storage >= IECODE_UP_PREFIX) break;
GetAttr(WINDOW_InputEvent,gwin->objects[OID_MAIN],(ULONG *)&ie);
@@ -4372,7 +4373,6 @@ void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg
if(node = (struct Node *)GetTagData(SPEEDBAR_SelectedNode, 0, msg->IAddress)) {
GetSpeedButtonNodeAttrs(node, SBNA_UserData, (ULONG *)&url, TAG_DONE);
- ami_update_quals(gwin);
if(gwin->key_state & BROWSER_MOUSE_MOD_2) {
browser_window_create(url, gwin->bw, NULL, false, true);
} else {
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index bd0715e..4a50566 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1643,8 +1643,9 @@ void ami_handle_msg(void)
break;
case WMHI_RAWKEY:
+ ami_update_quals(gwin);
+
storage = result & WMHI_GADGETMASK;
-
if(storage >= IECODE_UP_PREFIX) break;
GetAttr(WINDOW_InputEvent,gwin->objects[OID_MAIN],(ULONG *)&ie);
@@ -4372,7 +4373,6 @@ void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg
if(node = (struct Node *)GetTagData(SPEEDBAR_SelectedNode, 0, msg->IAddress)) {
GetSpeedButtonNodeAttrs(node, SBNA_UserData, (ULONG *)&url, TAG_DONE);
- ami_update_quals(gwin);
if(gwin->key_state & BROWSER_MOUSE_MOD_2) {
browser_window_create(url, gwin->bw, NULL, false, true);
} else {
--
NetSurf Browser
11 years
- 1
- 0
toolchains: branch master updated. 9f96f97dcfacbed41ce1425072def3880f7d9a77
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/9f96f97dcfacbed41c...
...commit http://git.netsurf-browser.org/toolchains.git/commit/9f96f97dcfacbed41ce1...
...tree http://git.netsurf-browser.org/toolchains.git/tree/9f96f97dcfacbed41ce142...
The branch, master has been updated
via 9f96f97dcfacbed41ce1425072def3880f7d9a77 (commit)
from 9942970edd9be6aa4ccd908b94fa0d2c81c3f863 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commitdiff/9f96f97dcfacbed4...
commit 9f96f97dcfacbed41ce1425072def3880f7d9a77
Author: Vincent Sanders <vincent.sanders(a)collabora.co.uk>
Commit: Vincent Sanders <vincent.sanders(a)collabora.co.uk>
fix compiling without interworking
diff --git a/sdk/Makefile b/sdk/Makefile
index 7d56ca1..7866b84 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -81,7 +81,7 @@ LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap telnet gopher tf
# Target Specific setup
ifeq ($(TARGET),arm-unknown-riscos)
- SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) nspr.d spidermonkey.d)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) spidermonkey.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares $(LIBCURL_DISABLES)
endif
@@ -467,7 +467,7 @@ $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz:
# nspr
$(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d
- cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) CROSS_COMPILE=1 CFLAGS=-D_PR_LOCAL_THREADS_ONLY ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-pthreads --with-cpu-arch=armv3
+ cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) CROSS_COMPILE=1 CFLAGS=-D_PR_LOCAL_THREADS_ONLY ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-pthreads --without-thumb --without-thumb-interwork --with-arch=armv3
cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make
cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make install
touch $@
@@ -483,9 +483,9 @@ $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz:
wget -q -O $@ https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION_NSPR)/sr...
-# spidermonkey (libmozjs)
-$(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/spidermonkey-src.d
- cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --disable-tracejit --disable-thumb2 --with-thumb=no --enable-static --with-system-nspr --with-nspr-prefix=$(GCCSDK_INSTALL_ENV) --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests
+# spidermonkey (libmozjs) --disable-methodjit
+$(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr.d $(BUILDSTEPS)/spidermonkey-src.d
+ cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --disable-tracejit --disable-thumb2 --without-thumb --enable-static --with-system-nspr --with-nspr-prefix=$(GCCSDK_INSTALL_ENV) --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests
cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make
cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make install
touch $@
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
new file mode 100644
index 0000000..9236477
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
@@ -0,0 +1,66 @@
+--- js/src/methodjit/MethodJIT.cpp 2012-12-10 19:03:08.000000000 +0000
++++ js/src/methodjit/MethodJIT.cpp 2012-12-10 19:04:11.000000000 +0000
+@@ -433,7 +433,7 @@
+ "ldr r1, [r11, #24]" "\n" /* fp->rval data */
+ "ldr r2, [r11, #28]" "\n" /* fp->rval type */
+ "ldr r11, [sp, #28]" "\n" /* load f.fp */
+- "bx lr" "\n"
++ "mov pc, lr" "\n"
+ );
+
+ asm volatile (
+@@ -487,12 +487,12 @@
+ " mov r11, r1" "\n"
+
+ " mov r0, sp" "\n"
+-" blx " SYMBOL_STRING_VMFRAME(SetVMFrameRegs) "\n"
++" bl " SYMBOL_STRING_VMFRAME(SetVMFrameRegs) "\n"
+ " mov r0, sp" "\n"
+-" blx " SYMBOL_STRING_VMFRAME(PushActiveVMFrame)"\n"
++" bl " SYMBOL_STRING_VMFRAME(PushActiveVMFrame)"\n"
+
+ /* Call the compiled JavaScript function. */
+-" bx r4" "\n"
++" mov pc, r4" "\n"
+ );
+
+ asm volatile (
+@@ -505,7 +505,7 @@
+
+ /* Tidy up. */
+ " mov r0, sp" "\n"
+-" blx " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n"
++" bl " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n"
+
+ /* Skip past the parameters we pushed (such as cx and the like). */
+ " add sp, sp, #(4*7 + 4*4)" "\n"
+@@ -524,17 +524,17 @@
+ " mov r0, sp" "\n"
+
+ /* Call the utility function that sets up the internal throw routine. */
+-" blx " SYMBOL_STRING_RELOC(js_InternalThrow) "\n"
++" bl " SYMBOL_STRING_RELOC(js_InternalThrow) "\n"
+
+ /* If js_InternalThrow found a scripted handler, jump to it. Otherwise, tidy
+ * up and return. */
+ " cmp r0, #0" "\n"
+ " it ne" "\n"
+-" bxne r0" "\n"
++" movne pc, r0" "\n"
+
+ /* Tidy up, then return '0' to represent an unhandled exception. */
+ " mov r0, sp" "\n"
+-" blx " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n"
++" bl " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n"
+ " add sp, sp, #(4*7 + 4*4)" "\n"
+ " mov r0, #0" "\n"
+ " pop {r4-r11,pc}" "\n"
+@@ -551,7 +551,7 @@
+ * The arguments are identical to those for js_* except that the target function should be in
+ * 'ip'. */
+ " push {ip,lr}" "\n"
+-" blx ip" "\n"
++" bl ip" "\n"
+ " pop {ip,pc}" "\n"
+ );
+
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
index 0dd914b..fcd012a 100644
--- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
@@ -11,3 +11,20 @@
*-android*)
cat >> confdefs.h <<\EOF
#define NO_PW_GECOS 1
+@@ -13341,6 +13341,16 @@
+ { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-ARM CPU architectures" 1>&2; exit 1; }
+ ;;
+ esac
++elif test "$MOZ_ARM_ARCH" = "armv3"; then
++ case "$target_cpu" in
++ arm*)
++ if test "$GNU_CC"; then
++ CFLAGS="$CFLAGS -march=armv3 -mno-thumb-interwork -msoft-float"
++ CXXFLAGS="$CXXFLAGS -march=armv3 -mno-thumb-interwork -msoft-float"
++ ASFLAGS="$ASFLAGS -march=armv3 -mno-thumb-interwork -msoft-float"
++ fi
++ ;;
++ esac
+ else
+ case "$target_cpu" in
+ arm*)
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 10 ++--
.../spidermonkey/arm-unknown-riscos/MethodJIT.p | 66 ++++++++++++++++++++
.../spidermonkey/arm-unknown-riscos/configure.p | 17 +++++
3 files changed, 88 insertions(+), 5 deletions(-)
create mode 100644 sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
diff --git a/sdk/Makefile b/sdk/Makefile
index 7d56ca1..7866b84 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -81,7 +81,7 @@ LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap telnet gopher tf
# Target Specific setup
ifeq ($(TARGET),arm-unknown-riscos)
- SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) nspr.d spidermonkey.d)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) spidermonkey.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares $(LIBCURL_DISABLES)
endif
@@ -467,7 +467,7 @@ $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz:
# nspr
$(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d
- cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) CROSS_COMPILE=1 CFLAGS=-D_PR_LOCAL_THREADS_ONLY ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-pthreads --with-cpu-arch=armv3
+ cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) CROSS_COMPILE=1 CFLAGS=-D_PR_LOCAL_THREADS_ONLY ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-pthreads --without-thumb --without-thumb-interwork --with-arch=armv3
cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make
cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make install
touch $@
@@ -483,9 +483,9 @@ $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz:
wget -q -O $@ https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION_NSPR)/sr...
-# spidermonkey (libmozjs)
-$(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/spidermonkey-src.d
- cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --disable-tracejit --disable-thumb2 --with-thumb=no --enable-static --with-system-nspr --with-nspr-prefix=$(GCCSDK_INSTALL_ENV) --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests
+# spidermonkey (libmozjs) --disable-methodjit
+$(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr.d $(BUILDSTEPS)/spidermonkey-src.d
+ cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --disable-tracejit --disable-thumb2 --without-thumb --enable-static --with-system-nspr --with-nspr-prefix=$(GCCSDK_INSTALL_ENV) --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests
cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make
cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make install
touch $@
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
new file mode 100644
index 0000000..9236477
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/MethodJIT.p
@@ -0,0 +1,66 @@
+--- js/src/methodjit/MethodJIT.cpp 2012-12-10 19:03:08.000000000 +0000
++++ js/src/methodjit/MethodJIT.cpp 2012-12-10 19:04:11.000000000 +0000
+@@ -433,7 +433,7 @@
+ "ldr r1, [r11, #24]" "\n" /* fp->rval data */
+ "ldr r2, [r11, #28]" "\n" /* fp->rval type */
+ "ldr r11, [sp, #28]" "\n" /* load f.fp */
+- "bx lr" "\n"
++ "mov pc, lr" "\n"
+ );
+
+ asm volatile (
+@@ -487,12 +487,12 @@
+ " mov r11, r1" "\n"
+
+ " mov r0, sp" "\n"
+-" blx " SYMBOL_STRING_VMFRAME(SetVMFrameRegs) "\n"
++" bl " SYMBOL_STRING_VMFRAME(SetVMFrameRegs) "\n"
+ " mov r0, sp" "\n"
+-" blx " SYMBOL_STRING_VMFRAME(PushActiveVMFrame)"\n"
++" bl " SYMBOL_STRING_VMFRAME(PushActiveVMFrame)"\n"
+
+ /* Call the compiled JavaScript function. */
+-" bx r4" "\n"
++" mov pc, r4" "\n"
+ );
+
+ asm volatile (
+@@ -505,7 +505,7 @@
+
+ /* Tidy up. */
+ " mov r0, sp" "\n"
+-" blx " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n"
++" bl " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n"
+
+ /* Skip past the parameters we pushed (such as cx and the like). */
+ " add sp, sp, #(4*7 + 4*4)" "\n"
+@@ -524,17 +524,17 @@
+ " mov r0, sp" "\n"
+
+ /* Call the utility function that sets up the internal throw routine. */
+-" blx " SYMBOL_STRING_RELOC(js_InternalThrow) "\n"
++" bl " SYMBOL_STRING_RELOC(js_InternalThrow) "\n"
+
+ /* If js_InternalThrow found a scripted handler, jump to it. Otherwise, tidy
+ * up and return. */
+ " cmp r0, #0" "\n"
+ " it ne" "\n"
+-" bxne r0" "\n"
++" movne pc, r0" "\n"
+
+ /* Tidy up, then return '0' to represent an unhandled exception. */
+ " mov r0, sp" "\n"
+-" blx " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n"
++" bl " SYMBOL_STRING_VMFRAME(PopActiveVMFrame) "\n"
+ " add sp, sp, #(4*7 + 4*4)" "\n"
+ " mov r0, #0" "\n"
+ " pop {r4-r11,pc}" "\n"
+@@ -551,7 +551,7 @@
+ * The arguments are identical to those for js_* except that the target function should be in
+ * 'ip'. */
+ " push {ip,lr}" "\n"
+-" blx ip" "\n"
++" bl ip" "\n"
+ " pop {ip,pc}" "\n"
+ );
+
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
index 0dd914b..fcd012a 100644
--- a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
@@ -11,3 +11,20 @@
*-android*)
cat >> confdefs.h <<\EOF
#define NO_PW_GECOS 1
+@@ -13341,6 +13341,16 @@
+ { echo "configure: error: --with-cpu-arch=armv7 is not supported for non-ARM CPU architectures" 1>&2; exit 1; }
+ ;;
+ esac
++elif test "$MOZ_ARM_ARCH" = "armv3"; then
++ case "$target_cpu" in
++ arm*)
++ if test "$GNU_CC"; then
++ CFLAGS="$CFLAGS -march=armv3 -mno-thumb-interwork -msoft-float"
++ CXXFLAGS="$CXXFLAGS -march=armv3 -mno-thumb-interwork -msoft-float"
++ ASFLAGS="$ASFLAGS -march=armv3 -mno-thumb-interwork -msoft-float"
++ fi
++ ;;
++ esac
+ else
+ case "$target_cpu" in
+ arm*)
--
Cross-compilation toolchains and environments
11 years
- 1
- 0
toolchains: branch master updated. 9942970edd9be6aa4ccd908b94fa0d2c81c3f863
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/9942970edd9be6aa4c...
...commit http://git.netsurf-browser.org/toolchains.git/commit/9942970edd9be6aa4ccd...
...tree http://git.netsurf-browser.org/toolchains.git/tree/9942970edd9be6aa4ccd90...
The branch, master has been updated
via 9942970edd9be6aa4ccd908b94fa0d2c81c3f863 (commit)
from 99bc3cfdd964685bb06a00a454db7276cf38baa3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commitdiff/9942970edd9be6aa...
commit 9942970edd9be6aa4ccd908b94fa0d2c81c3f863
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Update to latest libcurl.
diff --git a/sdk/Makefile b/sdk/Makefile
index d5c148f..7d56ca1 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -33,7 +33,7 @@ VERSION_LIBJPEG := 8d
VERSION_LIBLCMS := 2.3
VERSION_LIBMNG := 1.0.10
VERSION_LIBCARES := 1.9.1
-VERSION_LIBCURL := 7.28.0
+VERSION_LIBCURL := 7.28.1
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
VERSION_LIBCF := CVS-20120227
@@ -498,4 +498,4 @@ $(BUILDSTEPS)/spidermonkey-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/spiderm
touch $@
$(SOURCEDIR)/spidermonkey-$(VERSION_SPIDERMONKEY).tar.gz:
- wget -q -O $@ http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
\ No newline at end of file
+ wget -q -O $@ http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index d5c148f..7d56ca1 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -33,7 +33,7 @@ VERSION_LIBJPEG := 8d
VERSION_LIBLCMS := 2.3
VERSION_LIBMNG := 1.0.10
VERSION_LIBCARES := 1.9.1
-VERSION_LIBCURL := 7.28.0
+VERSION_LIBCURL := 7.28.1
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
VERSION_LIBCF := CVS-20120227
@@ -498,4 +498,4 @@ $(BUILDSTEPS)/spidermonkey-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/spiderm
touch $@
$(SOURCEDIR)/spidermonkey-$(VERSION_SPIDERMONKEY).tar.gz:
- wget -q -O $@ http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
\ No newline at end of file
+ wget -q -O $@ http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
--
Cross-compilation toolchains and environments
11 years
- 1
- 0
netsurf: branch master updated. 8698245ad2e7885368f71080154b6590b407e7b5
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/8698245ad2e7885368f71...
...commit http://git.netsurf-browser.org/netsurf.git/commit/8698245ad2e7885368f7108...
...tree http://git.netsurf-browser.org/netsurf.git/tree/8698245ad2e7885368f710801...
The branch, master has been updated
via 8698245ad2e7885368f71080154b6590b407e7b5 (commit)
from a1876073adc2d13cf0c493c21a485302f6333c77 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/8698245ad2e7885368f...
commit 8698245ad2e7885368f71080154b6590b407e7b5
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
use g++ to link on riscos
diff --git a/Makefile b/Makefile
index 428aa74..7b823ac 100644
--- a/Makefile
+++ b/Makefile
@@ -153,6 +153,7 @@ ifeq ($(TARGET),riscos)
SQUEEZE := squeeze
RUNEXT :=
CC := gcc
+ CXX := g++
EXEEXT :=
PKG_CONFIG :=
else
@@ -188,6 +189,7 @@ ifeq ($(TARGET),riscos)
SUBTARGET := -aof
EXEEXT := ,ff8
endif
+ CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
PKG_CONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
endif
else
@@ -432,7 +434,7 @@ $(EXETARGET): $(OBJECTS) $(RESOURCES)
ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
else
- $(Q)$(CC) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS)
+ $(Q)$(CXX) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS)
$(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET)
$(Q)$(RM) $(EXETARGET:,ff8=,e1f)
endif
-----------------------------------------------------------------------
Summary of changes:
Makefile | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 428aa74..7b823ac 100644
--- a/Makefile
+++ b/Makefile
@@ -153,6 +153,7 @@ ifeq ($(TARGET),riscos)
SQUEEZE := squeeze
RUNEXT :=
CC := gcc
+ CXX := g++
EXEEXT :=
PKG_CONFIG :=
else
@@ -188,6 +189,7 @@ ifeq ($(TARGET),riscos)
SUBTARGET := -aof
EXEEXT := ,ff8
endif
+ CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
PKG_CONFIG := $(GCCSDK_INSTALL_ENV)/ro-pkg-config
endif
else
@@ -432,7 +434,7 @@ $(EXETARGET): $(OBJECTS) $(RESOURCES)
ifneq ($(TARGET)$(SUBTARGET),riscos-elf)
$(Q)$(CC) -o $(EXETARGET) $(OBJECTS) $(LDFLAGS)
else
- $(Q)$(CC) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS)
+ $(Q)$(CXX) -o $(EXETARGET:,ff8=,e1f) $(OBJECTS) $(LDFLAGS)
$(Q)$(ELF2AIF) $(EXETARGET:,ff8=,e1f) $(EXETARGET)
$(Q)$(RM) $(EXETARGET:,ff8=,e1f)
endif
--
NetSurf Browser
11 years
- 1
- 0
netsurf: branch master updated. a1876073adc2d13cf0c493c21a485302f6333c77
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/a1876073adc2d13cf0c49...
...commit http://git.netsurf-browser.org/netsurf.git/commit/a1876073adc2d13cf0c493c...
...tree http://git.netsurf-browser.org/netsurf.git/tree/a1876073adc2d13cf0c493c21...
The branch, master has been updated
via a1876073adc2d13cf0c493c21a485302f6333c77 (commit)
via c1c3a067480b90a8d0747d92ea4a1bbb88228b0a (commit)
from 47579b468cb02886b2113e5bfcdee05978c7c940 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/a1876073adc2d13cf0c...
commit a1876073adc2d13cf0c493c21a485302f6333c77
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
add spidermonkey to riscos makefiles
diff --git a/riscos/Makefile.target b/riscos/Makefile.target
index 53b3296..bc09b7f 100644
--- a/riscos/Makefile.target
+++ b/riscos/Makefile.target
@@ -28,9 +28,13 @@ else
NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
+ NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
+ NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
$(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
$(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
$(eval $(call pkg_config_find_and_add,PNG,libpng,PNG ))
+ $(eval $(call pkg_config_find_and_add,MOZJS,mozjs185,JavaScript))
+ $(eval $(call pkg_config_find_and_add,JS,mozilla-js,JavaScript))
endif
TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/c1c3a067480b90a8d07...
commit c1c3a067480b90a8d0747d92ea4a1bbb88228b0a
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
document mouse interaction a bit
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 8dd613b..d22869e 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -400,12 +400,44 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
box_x = box->margin[LEFT];
box_y = box->margin[TOP];
+ /* descend through visible boxes setting more specific values for:
+ * box - deepest box at point
+ * html_object_box - html object
+ * html_object_pos_x - html object
+ * html_object_pos_y - html object
+ * object - non html object
+ * iframe - iframe
+ * url - href or imagemap
+ * target - href or imagemap or gadget
+ * url_box - href or imagemap
+ * imagemap - imagemap
+ * gadget - gadget
+ * gadget_box - gadget
+ * gadget_box_x - gadget
+ * gadget_box_y - gadget
+ * title - title
+ * pointer
+ *
+ * drag_candidate - first box with scroll
+ * padding_left - box with scroll
+ * padding_right
+ * padding_top
+ * padding_bottom
+ * scrollbar - inside padding box stops decent
+ * scroll_mouse_x - inside padding box stops decent
+ * scroll_mouse_y - inside padding box stops decent
+ *
+ * text_box - text box
+ * text_box_x - text_box
+ */
while ((next_box = box_at_point(box, x, y, &box_x, &box_y)) != NULL) {
box = next_box;
- if (box->style && css_computed_visibility(box->style) ==
- CSS_VISIBILITY_HIDDEN)
+ if ((box->style != NULL) &&
+ (css_computed_visibility(box->style) ==
+ CSS_VISIBILITY_HIDDEN)) {
continue;
+ }
if (box->node != NULL) {
node = box->node;
@@ -421,8 +453,9 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
}
}
- if (box->iframe)
+ if (box->iframe) {
iframe = box->iframe;
+ }
if (box->href) {
url = box->href;
@@ -448,12 +481,14 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
target = gadget->form->target;
}
- if (box->title)
+ if (box->title) {
title = box->title;
+ }
pointer = get_pointer_shape(box, false);
-
- if (box->scroll_y != NULL || box->scroll_x != NULL) {
+
+ if ((box->scroll_x != NULL) ||
+ (box->scroll_y != NULL)) {
if (drag_candidate == NULL) {
drag_candidate = box;
@@ -468,12 +503,14 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
padding_bottom = padding_top + box->padding[TOP] +
box->height + box->padding[BOTTOM];
- if (x > padding_left && x < padding_right &&
- y > padding_top && y < padding_bottom) {
+ if ((x > padding_left) &&
+ (x < padding_right) &&
+ (y > padding_top) &&
+ (y < padding_bottom)) {
/* mouse inside padding box */
- if (box->scroll_y != NULL && x > padding_right -
- SCROLLBAR_WIDTH) {
+ if ((box->scroll_y != NULL) &&
+ (x > (padding_right - SCROLLBAR_WIDTH))) {
/* mouse above vertical box scroll */
scrollbar = box->scroll_y;
@@ -482,9 +519,8 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
scroll_mouse_y = y - padding_top;
break;
- } else if (box->scroll_x != NULL &&
- y > padding_bottom -
- SCROLLBAR_WIDTH) {
+ } else if ((box->scroll_x != NULL) &&
+ (y > (padding_bottom - SCROLLBAR_WIDTH))) {
/* mouse above horizontal box scroll */
scrollbar = box->scroll_x;
-----------------------------------------------------------------------
Summary of changes:
render/html_interaction.c | 62 +++++++++++++++++++++++++++++++++++---------
riscos/Makefile.target | 4 +++
2 files changed, 53 insertions(+), 13 deletions(-)
diff --git a/render/html_interaction.c b/render/html_interaction.c
index 8dd613b..d22869e 100644
--- a/render/html_interaction.c
+++ b/render/html_interaction.c
@@ -400,12 +400,44 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
box_x = box->margin[LEFT];
box_y = box->margin[TOP];
+ /* descend through visible boxes setting more specific values for:
+ * box - deepest box at point
+ * html_object_box - html object
+ * html_object_pos_x - html object
+ * html_object_pos_y - html object
+ * object - non html object
+ * iframe - iframe
+ * url - href or imagemap
+ * target - href or imagemap or gadget
+ * url_box - href or imagemap
+ * imagemap - imagemap
+ * gadget - gadget
+ * gadget_box - gadget
+ * gadget_box_x - gadget
+ * gadget_box_y - gadget
+ * title - title
+ * pointer
+ *
+ * drag_candidate - first box with scroll
+ * padding_left - box with scroll
+ * padding_right
+ * padding_top
+ * padding_bottom
+ * scrollbar - inside padding box stops decent
+ * scroll_mouse_x - inside padding box stops decent
+ * scroll_mouse_y - inside padding box stops decent
+ *
+ * text_box - text box
+ * text_box_x - text_box
+ */
while ((next_box = box_at_point(box, x, y, &box_x, &box_y)) != NULL) {
box = next_box;
- if (box->style && css_computed_visibility(box->style) ==
- CSS_VISIBILITY_HIDDEN)
+ if ((box->style != NULL) &&
+ (css_computed_visibility(box->style) ==
+ CSS_VISIBILITY_HIDDEN)) {
continue;
+ }
if (box->node != NULL) {
node = box->node;
@@ -421,8 +453,9 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
}
}
- if (box->iframe)
+ if (box->iframe) {
iframe = box->iframe;
+ }
if (box->href) {
url = box->href;
@@ -448,12 +481,14 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
target = gadget->form->target;
}
- if (box->title)
+ if (box->title) {
title = box->title;
+ }
pointer = get_pointer_shape(box, false);
-
- if (box->scroll_y != NULL || box->scroll_x != NULL) {
+
+ if ((box->scroll_x != NULL) ||
+ (box->scroll_y != NULL)) {
if (drag_candidate == NULL) {
drag_candidate = box;
@@ -468,12 +503,14 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
padding_bottom = padding_top + box->padding[TOP] +
box->height + box->padding[BOTTOM];
- if (x > padding_left && x < padding_right &&
- y > padding_top && y < padding_bottom) {
+ if ((x > padding_left) &&
+ (x < padding_right) &&
+ (y > padding_top) &&
+ (y < padding_bottom)) {
/* mouse inside padding box */
- if (box->scroll_y != NULL && x > padding_right -
- SCROLLBAR_WIDTH) {
+ if ((box->scroll_y != NULL) &&
+ (x > (padding_right - SCROLLBAR_WIDTH))) {
/* mouse above vertical box scroll */
scrollbar = box->scroll_y;
@@ -482,9 +519,8 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
scroll_mouse_y = y - padding_top;
break;
- } else if (box->scroll_x != NULL &&
- y > padding_bottom -
- SCROLLBAR_WIDTH) {
+ } else if ((box->scroll_x != NULL) &&
+ (y > (padding_bottom - SCROLLBAR_WIDTH))) {
/* mouse above horizontal box scroll */
scrollbar = box->scroll_x;
diff --git a/riscos/Makefile.target b/riscos/Makefile.target
index 53b3296..bc09b7f 100644
--- a/riscos/Makefile.target
+++ b/riscos/Makefile.target
@@ -28,9 +28,13 @@ else
NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
+ NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0
+ NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0
$(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
$(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
$(eval $(call pkg_config_find_and_add,PNG,libpng,PNG ))
+ $(eval $(call pkg_config_find_and_add,MOZJS,mozjs185,JavaScript))
+ $(eval $(call pkg_config_find_and_add,JS,mozilla-js,JavaScript))
endif
TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \
--
NetSurf Browser
11 years
- 1
- 0
toolchains: branch master updated. 99bc3cfdd964685bb06a00a454db7276cf38baa3
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/99bc3cfdd964685bb0...
...commit http://git.netsurf-browser.org/toolchains.git/commit/99bc3cfdd964685bb06a...
...tree http://git.netsurf-browser.org/toolchains.git/tree/99bc3cfdd964685bb06a00...
The branch, master has been updated
via 99bc3cfdd964685bb06a00a454db7276cf38baa3 (commit)
from d5454c6f9ca42956a8e0a20fa008b34fe4ed4506 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commitdiff/99bc3cfdd964685b...
commit 99bc3cfdd964685bb06a00a454db7276cf38baa3
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
add javascript library build to riscos sdk
diff --git a/README b/README
index 8ed9e0b..2ca4dda 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ Pre-requisites for Debian systems
---------------------------------
$ apt-get install build-essential autoconf automake autogen flex bison
- $ apt-get install libtool texinfo help2man subversion
+ $ apt-get install libtool texinfo help2man subversion cvs
RISC OS
-------
diff --git a/sdk/Makefile b/sdk/Makefile
index eb0c627..d5c148f 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -43,6 +43,7 @@ VERSION_WINDOM := 2.0.1
VERSION_HERMES := 1.3.3
VERSION_FREETYPE := 2.4.10
VERSION_NSPR := 4.9.3
+VERSION_SPIDERMONKEY := 1.8.5
# Path
path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
@@ -80,7 +81,7 @@ LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap telnet gopher tf
# Target Specific setup
ifeq ($(TARGET),arm-unknown-riscos)
- SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) nspr.d)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) nspr.d spidermonkey.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares $(LIBCURL_DISABLES)
endif
@@ -466,17 +467,35 @@ $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz:
# nspr
$(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d
- mkdir -p $(BUILDDIR)/nspr
- cd $(BUILDDIR)/nspr && tar xzf $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
- for p in `ls $(RECIPES)/patches/nspr/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR) -p0 <$$p ; done
- cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) CROSS_COMPILE=1 CFLAGS=-D_PR_LOCAL_THREADS_ONLY ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-pthreads
+ cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) CROSS_COMPILE=1 CFLAGS=-D_PR_LOCAL_THREADS_ONLY ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-pthreads --with-cpu-arch=armv3
cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make
cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make install
touch $@
-
$(BUILDSTEPS)/nspr-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
+ $(RM) -rf $(BUILDDIR)/nspr
+ mkdir -p $(BUILDDIR)/nspr
+ cd $(BUILDDIR)/nspr && tar xzf $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
+ for p in `ls $(RECIPES)/patches/nspr/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR) -p0 <$$p ; done
touch $@
$(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz:
wget -q -O $@ https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION_NSPR)/sr...
+
+
+# spidermonkey (libmozjs)
+$(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/spidermonkey-src.d
+ cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --disable-tracejit --disable-thumb2 --with-thumb=no --enable-static --with-system-nspr --with-nspr-prefix=$(GCCSDK_INSTALL_ENV) --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests
+ cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make
+ cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make install
+ touch $@
+
+$(BUILDSTEPS)/spidermonkey-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/spidermonkey-$(VERSION_SPIDERMONKEY).tar.gz
+ $(RM) -rf $(BUILDDIR)/spidermonkey
+ mkdir -p $(BUILDDIR)/spidermonkey
+ cd $(BUILDDIR)/spidermonkey && tar xaf $(SOURCEDIR)/spidermonkey-$(VERSION_SPIDERMONKEY).tar.gz
+ for p in `ls $(RECIPES)/patches/spidermonkey/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY) -p0 <$$p ; done
+ touch $@
+
+$(SOURCEDIR)/spidermonkey-$(VERSION_SPIDERMONKEY).tar.gz:
+ wget -q -O $@ http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
\ No newline at end of file
diff --git a/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p b/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p
index ad77bdf..c97bf23 100644
--- a/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p
+++ b/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p
@@ -1,34 +1,3 @@
-=== modified file 'mozilla/nsprpub/pr/include/md/_riscos.h'
---- mozilla/nsprpub/pr/include/md/_riscos.h 2012-11-04 17:32:26 +0000
-+++ mozilla/nsprpub/pr/include/md/_riscos.h 2012-11-04 18:01:57 +0000
-@@ -22,6 +22,10 @@
- #define _PR_STAT_HAS_ONLY_ST_ATIME
- #define _PR_HAVE_POSIX_SEMAPHORES
-
-+#define _PR_STACK_VMBASE 0x50000000
-+#define _MD_MMAP_FLAGS MAP_PRIVATE
-+#define _MD_DEFAULT_STACK_SIZE 65536L
-+
- #include <sys/select.h>
- #include <sys/poll.h>
- #include <kernel.h>
-@@ -47,7 +51,6 @@
- #define _PR_CONTEXT_TYPE jmp_buf
- #define _PR_NUM_GCREGS _JBLEN
- #define _MD_GET_SP(_t) (_t)->md.context[7]
--
- #define CONTEXT(_th) ((_th)->md.context)
-
-
-@@ -84,6 +87,7 @@
- _PR_CONTEXT_TYPE context;
- int id;
- int errcode;
-+ int no_sched;
- };
-
- struct _MDThreadStack {
-
=== modified file 'mozilla/nsprpub/pr/include/private/primpl.h'
--- mozilla/nsprpub/pr/include/private/primpl.h 2012-11-04 17:32:26 +0000
+++ mozilla/nsprpub/pr/include/private/primpl.h 2012-11-04 17:57:04 +0000
@@ -117,3 +86,50 @@
}
+--- mozilla/nsprpub/pr/include/md/_riscos.h 2012-03-06 13:13:53.000000000 +0000
++++ mozilla/nsprpub/pr/include/md/_riscos.h 2012-12-10 01:29:32.341270324 +0000
+@@ -22,6 +22,10 @@
+ #define _PR_STAT_HAS_ONLY_ST_ATIME
+ #define _PR_HAVE_POSIX_SEMAPHORES
+
++#define _PR_STACK_VMBASE 0x50000000
++#define _MD_MMAP_FLAGS MAP_PRIVATE
++#define _MD_DEFAULT_STACK_SIZE 65536L
++
+ #include <sys/select.h>
+ #include <sys/poll.h>
+ #include <kernel.h>
+@@ -47,7 +51,6 @@
+ #define _PR_CONTEXT_TYPE jmp_buf
+ #define _PR_NUM_GCREGS _JBLEN
+ #define _MD_GET_SP(_t) (_t)->md.context[7]
+-
+ #define CONTEXT(_th) ((_th)->md.context)
+
+
+@@ -84,6 +87,7 @@
+ _PR_CONTEXT_TYPE context;
+ int id;
+ int errcode;
++ int no_sched;
+ };
+
+ struct _MDThreadStack {
+@@ -164,6 +168,7 @@
+ #define _MD_SUSPEND_THREAD(thread)
+ #define _MD_RESUME_THREAD(thread)
+ #define _MD_CLEAN_THREAD(_thread)
++#define _MD_SET_CURRENT_THREAD_NAME(thread)
+
+ /*
+ ** We wrapped the select() call. _MD_SELECT refers to the built-in,
+@@ -174,4 +179,9 @@
+ #include <sys/select.h>
+ #define _MD_SELECT select
+
++#ifdef _PR_POLL_AVAILABLE
++#include <sys/poll.h>
++#define _MD_POLL poll
++#endif
++
+ #endif /* nspr_riscos_defs_h___ */
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocator.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocator.h.p
new file mode 100644
index 0000000..30b811f
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocator.h.p
@@ -0,0 +1,11 @@
+--- js/src/assembler/jit/ExecutableAllocator.h.orig 2012-11-08 14:37:17.000000000 +0000
++++ js/src/assembler/jit/ExecutableAllocator.h 2012-11-08 14:46:42.000000000 +0000
+@@ -370,7 +370,7 @@
+ }
+ #elif WTF_CPU_ARM_TRADITIONAL && WTF_PLATFORM_LINUX && WTF_COMPILER_RVCT
+ static __asm void cacheFlush(void* code, size_t size);
+-#elif WTF_CPU_ARM_TRADITIONAL && (WTF_PLATFORM_LINUX || WTF_PLATFORM_ANDROID) && WTF_COMPILER_GCC
++#elif WTF_CPU_ARM_TRADITIONAL && (WTF_PLATFORM_LINUX || WTF_PLATFORM_ANDROID || WTF_PLATFORM_RISCOS) && WTF_COMPILER_GCC
+ static void cacheFlush(void* code, size_t size)
+ {
+ asm volatile (
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocatorPosix.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocatorPosix.cpp.p
new file mode 100644
index 0000000..2f31400
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocatorPosix.cpp.p
@@ -0,0 +1,11 @@
+--- js/src/assembler/jit/ExecutableAllocatorPosix.cpp.orig 2012-11-08 16:02:56.000000000 +0000
++++ js/src/assembler/jit/ExecutableAllocatorPosix.cpp 2012-11-08 15:34:03.000000000 +0000
+@@ -25,7 +25,7 @@
+
+ #include "ExecutableAllocator.h"
+
+-#if ENABLE_ASSEMBLER && WTF_PLATFORM_UNIX && !WTF_PLATFORM_SYMBIAN
++#if ENABLE_ASSEMBLER && (WTF_PLATFORM_UNIX || WTF_PLATFORM_RISCOS) && !WTF_PLATFORM_SYMBIAN
+
+ #include <sys/mman.h>
+ #include <unistd.h>
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/Platform.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/Platform.h.p
new file mode 100644
index 0000000..9d91ac8
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/Platform.h.p
@@ -0,0 +1,32 @@
+--- js/src/assembler/wtf/Platform.h.orig 2011-03-31 20:08:36.000000000 +0100
++++ js/src/assembler/wtf/Platform.h 2012-11-08 14:48:57.000000000 +0000
+@@ -188,6 +188,7 @@
+ #elif !defined(__ARM_EABI__) \
+ && !defined(__EABI__) \
+ && !defined(__VFP_FP__) \
++ && !defined(__riscos__) \
+ && !defined(ANDROID)
+ #define WTF_CPU_MIDDLE_ENDIAN 1
+
+@@ -232,6 +233,7 @@
+
+ #endif
+
++#ifndef __riscos__
+ /* Set WTF_THUMB_ARCH_VERSION */
+ #if defined(__ARM_ARCH_4T__)
+ #define WTF_THUMB_ARCH_VERSION 1
+@@ -263,6 +265,13 @@
+ #define WTF_THUMB_ARCH_VERSION 0
+ #endif
+
++#else
++
++#define WTF_THUMB_ARCH_VERSION 0
++#define WTF_PLATFORM_RISCOS 1
++#define WTF_CPU_ARM_TRADITIONAL 1
++
++#endif
+
+ /* CPU(ARMV5_OR_LOWER) - ARM instruction set v5 or earlier */
+ /* On ARMv5 and below the natural alignment is required.
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
new file mode 100644
index 0000000..0dd914b
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
@@ -0,0 +1,13 @@
+--- js/src/configure 2011-03-31 20:08:36.000000000 +0100
++++ js/src/configure 2012-12-10 00:34:27.312881924 +0000
+@@ -7779,6 +7785,10 @@
+ HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"'
+ ;;
+
++*-riscos*)
++ TARGET_NSPR_MDCPUCFG='\"md/_riscos.cfg\"'
++ ;;
++
+ *-android*)
+ cat >> confdefs.h <<\EOF
+ #define NO_PW_GECOS 1
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jscntxt.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jscntxt.cpp.p
new file mode 100644
index 0000000..d61d860
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jscntxt.cpp.p
@@ -0,0 +1,11 @@
+--- js/src/jscntxt.cpp.orig 2012-11-08 14:49:30.000000000 +0000
++++ js/src/jscntxt.cpp 2012-11-08 14:50:19.000000000 +0000
+@@ -179,7 +179,7 @@
+ #elif defined(XP_OS2)
+ DosFreeMem(base);
+ #else
+-#ifdef SOLARIS
++#if defined(SOLARIS) || defined(__riscos__)
+ munmap((caddr_t)base, CAPACITY_BYTES);
+ #else
+ munmap(base, CAPACITY_BYTES);
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsgcchunk.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsgcchunk.cpp.p
new file mode 100644
index 0000000..b8720e4
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsgcchunk.cpp.p
@@ -0,0 +1,27 @@
+--- js/src/jsgcchunk.cpp 2012-12-10 00:50:18.369597597 +0000
++++ js/src/jsgcchunk.cpp 2012-12-10 00:51:36.317984488 +0000
+@@ -322,13 +322,13 @@
+ * We don't use MAP_FIXED here, because it can cause the *replacement*
+ * of existing mappings, and we only want to create new mappings.
+ */
+- void *p = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON,
++ void *p = mmap((caddr_t)addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON,
+ -1, 0);
+ if (p == MAP_FAILED)
+ return NULL;
+ if (addr && p != addr) {
+ /* We succeeded in mapping memory, but not in the right place. */
+- JS_ALWAYS_TRUE(munmap(p, size) == 0);
++ JS_ALWAYS_TRUE(munmap((caddr_t)p, size) == 0);
+ return NULL;
+ }
+ return p;
+@@ -342,7 +342,7 @@
+ #ifdef SOLARIS
+ JS_ALWAYS_TRUE(munmap((caddr_t) addr, size) == 0);
+ #else
+- JS_ALWAYS_TRUE(munmap(addr, size) == 0);
++ JS_ALWAYS_TRUE(munmap((caddr_t)addr, size) == 0);
+ #endif
+ }
+
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsnativestack.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsnativestack.cpp.p
new file mode 100644
index 0000000..0e042a9
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsnativestack.cpp.p
@@ -0,0 +1,22 @@
+--- js/src/jsnativestack.cpp.orig 2012-11-08 14:53:01.000000000 +0000
++++ js/src/jsnativestack.cpp 2012-11-08 14:53:58.000000000 +0000
+@@ -204,7 +204,9 @@
+ * FIXME: this function is non-portable;
+ * other POSIX systems may have different np alternatives
+ */
++#ifndef __riscos__
+ pthread_getattr_np(thread, &sattr);
++#endif
+ # endif
+
+ void *stackBase = 0;
+@@ -212,7 +214,9 @@
+ # ifdef DEBUG
+ int rc =
+ # endif
++#ifndef __riscos__
+ pthread_attr_getstack(&sattr, &stackBase, &stackSize);
++#endif
+ JS_ASSERT(!rc);
+ JS_ASSERT(stackBase);
+ pthread_attr_destroy(&sattr);
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jstypedarray.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jstypedarray.cpp.p
new file mode 100644
index 0000000..0f4cfa9
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jstypedarray.cpp.p
@@ -0,0 +1,11 @@
+--- js/src/jstypedarray.cpp.orig 2012-11-08 16:22:50.000000000 +0000
++++ js/src/jstypedarray.cpp 2012-11-08 16:23:25.000000000 +0000
+@@ -454,7 +454,7 @@
+ inline operator uint8() const {
+ return val;
+ }
+-};
++} __attribute__((packed));
+
+ /* Make sure the compiler isn't doing some funky stuff */
+ JS_STATIC_ASSERT(sizeof(uint8_clamped) == 1);
-----------------------------------------------------------------------
Summary of changes:
README | 2 +-
sdk/Makefile | 31 ++++++--
.../patches/nspr/arm-unknown-riscos/thread_noops.p | 78 ++++++++++++--------
.../arm-unknown-riscos/ExecutableAllocator.h.p | 11 +++
.../ExecutableAllocatorPosix.cpp.p | 11 +++
.../spidermonkey/arm-unknown-riscos/Platform.h.p | 32 ++++++++
.../spidermonkey/arm-unknown-riscos/configure.p | 13 +++
.../spidermonkey/arm-unknown-riscos/jscntxt.cpp.p | 11 +++
.../arm-unknown-riscos/jsgcchunk.cpp.p | 27 +++++++
.../arm-unknown-riscos/jsnativestack.cpp.p | 22 ++++++
.../arm-unknown-riscos/jstypedarray.cpp.p | 11 +++
11 files changed, 211 insertions(+), 38 deletions(-)
create mode 100644 sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocator.h.p
create mode 100644 sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocatorPosix.cpp.p
create mode 100644 sdk/recipes/patches/spidermonkey/arm-unknown-riscos/Platform.h.p
create mode 100644 sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
create mode 100644 sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jscntxt.cpp.p
create mode 100644 sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsgcchunk.cpp.p
create mode 100644 sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsnativestack.cpp.p
create mode 100644 sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jstypedarray.cpp.p
diff --git a/README b/README
index 8ed9e0b..2ca4dda 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ Pre-requisites for Debian systems
---------------------------------
$ apt-get install build-essential autoconf automake autogen flex bison
- $ apt-get install libtool texinfo help2man subversion
+ $ apt-get install libtool texinfo help2man subversion cvs
RISC OS
-------
diff --git a/sdk/Makefile b/sdk/Makefile
index eb0c627..d5c148f 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -43,6 +43,7 @@ VERSION_WINDOM := 2.0.1
VERSION_HERMES := 1.3.3
VERSION_FREETYPE := 2.4.10
VERSION_NSPR := 4.9.3
+VERSION_SPIDERMONKEY := 1.8.5
# Path
path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
@@ -80,7 +81,7 @@ LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap telnet gopher tf
# Target Specific setup
ifeq ($(TARGET),arm-unknown-riscos)
- SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) nspr.d)
+ SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) nspr.d spidermonkey.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares $(LIBCURL_DISABLES)
endif
@@ -466,17 +467,35 @@ $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz:
# nspr
$(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d
- mkdir -p $(BUILDDIR)/nspr
- cd $(BUILDDIR)/nspr && tar xzf $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
- for p in `ls $(RECIPES)/patches/nspr/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR) -p0 <$$p ; done
- cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) CROSS_COMPILE=1 CFLAGS=-D_PR_LOCAL_THREADS_ONLY ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-pthreads
+ cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) CROSS_COMPILE=1 CFLAGS=-D_PR_LOCAL_THREADS_ONLY ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-pthreads --with-cpu-arch=armv3
cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make
cd $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR)/mozilla/nsprpub && $(env) make install
touch $@
-
$(BUILDSTEPS)/nspr-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
+ $(RM) -rf $(BUILDDIR)/nspr
+ mkdir -p $(BUILDDIR)/nspr
+ cd $(BUILDDIR)/nspr && tar xzf $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
+ for p in `ls $(RECIPES)/patches/nspr/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR) -p0 <$$p ; done
touch $@
$(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz:
wget -q -O $@ https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION_NSPR)/sr...
+
+
+# spidermonkey (libmozjs)
+$(BUILDSTEPS)/spidermonkey.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/spidermonkey-src.d
+ cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --disable-tracejit --disable-thumb2 --with-thumb=no --enable-static --with-system-nspr --with-nspr-prefix=$(GCCSDK_INSTALL_ENV) --disable-shared --disable-shared-js --with-cpu-arch=armv3 --disable-tests
+ cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make
+ cd $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY)/js/src && $(env) make install
+ touch $@
+
+$(BUILDSTEPS)/spidermonkey-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/spidermonkey-$(VERSION_SPIDERMONKEY).tar.gz
+ $(RM) -rf $(BUILDDIR)/spidermonkey
+ mkdir -p $(BUILDDIR)/spidermonkey
+ cd $(BUILDDIR)/spidermonkey && tar xaf $(SOURCEDIR)/spidermonkey-$(VERSION_SPIDERMONKEY).tar.gz
+ for p in `ls $(RECIPES)/patches/spidermonkey/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/spidermonkey/js-$(VERSION_SPIDERMONKEY) -p0 <$$p ; done
+ touch $@
+
+$(SOURCEDIR)/spidermonkey-$(VERSION_SPIDERMONKEY).tar.gz:
+ wget -q -O $@ http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
\ No newline at end of file
diff --git a/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p b/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p
index ad77bdf..c97bf23 100644
--- a/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p
+++ b/sdk/recipes/patches/nspr/arm-unknown-riscos/thread_noops.p
@@ -1,34 +1,3 @@
-=== modified file 'mozilla/nsprpub/pr/include/md/_riscos.h'
---- mozilla/nsprpub/pr/include/md/_riscos.h 2012-11-04 17:32:26 +0000
-+++ mozilla/nsprpub/pr/include/md/_riscos.h 2012-11-04 18:01:57 +0000
-@@ -22,6 +22,10 @@
- #define _PR_STAT_HAS_ONLY_ST_ATIME
- #define _PR_HAVE_POSIX_SEMAPHORES
-
-+#define _PR_STACK_VMBASE 0x50000000
-+#define _MD_MMAP_FLAGS MAP_PRIVATE
-+#define _MD_DEFAULT_STACK_SIZE 65536L
-+
- #include <sys/select.h>
- #include <sys/poll.h>
- #include <kernel.h>
-@@ -47,7 +51,6 @@
- #define _PR_CONTEXT_TYPE jmp_buf
- #define _PR_NUM_GCREGS _JBLEN
- #define _MD_GET_SP(_t) (_t)->md.context[7]
--
- #define CONTEXT(_th) ((_th)->md.context)
-
-
-@@ -84,6 +87,7 @@
- _PR_CONTEXT_TYPE context;
- int id;
- int errcode;
-+ int no_sched;
- };
-
- struct _MDThreadStack {
-
=== modified file 'mozilla/nsprpub/pr/include/private/primpl.h'
--- mozilla/nsprpub/pr/include/private/primpl.h 2012-11-04 17:32:26 +0000
+++ mozilla/nsprpub/pr/include/private/primpl.h 2012-11-04 17:57:04 +0000
@@ -117,3 +86,50 @@
}
+--- mozilla/nsprpub/pr/include/md/_riscos.h 2012-03-06 13:13:53.000000000 +0000
++++ mozilla/nsprpub/pr/include/md/_riscos.h 2012-12-10 01:29:32.341270324 +0000
+@@ -22,6 +22,10 @@
+ #define _PR_STAT_HAS_ONLY_ST_ATIME
+ #define _PR_HAVE_POSIX_SEMAPHORES
+
++#define _PR_STACK_VMBASE 0x50000000
++#define _MD_MMAP_FLAGS MAP_PRIVATE
++#define _MD_DEFAULT_STACK_SIZE 65536L
++
+ #include <sys/select.h>
+ #include <sys/poll.h>
+ #include <kernel.h>
+@@ -47,7 +51,6 @@
+ #define _PR_CONTEXT_TYPE jmp_buf
+ #define _PR_NUM_GCREGS _JBLEN
+ #define _MD_GET_SP(_t) (_t)->md.context[7]
+-
+ #define CONTEXT(_th) ((_th)->md.context)
+
+
+@@ -84,6 +87,7 @@
+ _PR_CONTEXT_TYPE context;
+ int id;
+ int errcode;
++ int no_sched;
+ };
+
+ struct _MDThreadStack {
+@@ -164,6 +168,7 @@
+ #define _MD_SUSPEND_THREAD(thread)
+ #define _MD_RESUME_THREAD(thread)
+ #define _MD_CLEAN_THREAD(_thread)
++#define _MD_SET_CURRENT_THREAD_NAME(thread)
+
+ /*
+ ** We wrapped the select() call. _MD_SELECT refers to the built-in,
+@@ -174,4 +179,9 @@
+ #include <sys/select.h>
+ #define _MD_SELECT select
+
++#ifdef _PR_POLL_AVAILABLE
++#include <sys/poll.h>
++#define _MD_POLL poll
++#endif
++
+ #endif /* nspr_riscos_defs_h___ */
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocator.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocator.h.p
new file mode 100644
index 0000000..30b811f
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocator.h.p
@@ -0,0 +1,11 @@
+--- js/src/assembler/jit/ExecutableAllocator.h.orig 2012-11-08 14:37:17.000000000 +0000
++++ js/src/assembler/jit/ExecutableAllocator.h 2012-11-08 14:46:42.000000000 +0000
+@@ -370,7 +370,7 @@
+ }
+ #elif WTF_CPU_ARM_TRADITIONAL && WTF_PLATFORM_LINUX && WTF_COMPILER_RVCT
+ static __asm void cacheFlush(void* code, size_t size);
+-#elif WTF_CPU_ARM_TRADITIONAL && (WTF_PLATFORM_LINUX || WTF_PLATFORM_ANDROID) && WTF_COMPILER_GCC
++#elif WTF_CPU_ARM_TRADITIONAL && (WTF_PLATFORM_LINUX || WTF_PLATFORM_ANDROID || WTF_PLATFORM_RISCOS) && WTF_COMPILER_GCC
+ static void cacheFlush(void* code, size_t size)
+ {
+ asm volatile (
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocatorPosix.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocatorPosix.cpp.p
new file mode 100644
index 0000000..2f31400
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/ExecutableAllocatorPosix.cpp.p
@@ -0,0 +1,11 @@
+--- js/src/assembler/jit/ExecutableAllocatorPosix.cpp.orig 2012-11-08 16:02:56.000000000 +0000
++++ js/src/assembler/jit/ExecutableAllocatorPosix.cpp 2012-11-08 15:34:03.000000000 +0000
+@@ -25,7 +25,7 @@
+
+ #include "ExecutableAllocator.h"
+
+-#if ENABLE_ASSEMBLER && WTF_PLATFORM_UNIX && !WTF_PLATFORM_SYMBIAN
++#if ENABLE_ASSEMBLER && (WTF_PLATFORM_UNIX || WTF_PLATFORM_RISCOS) && !WTF_PLATFORM_SYMBIAN
+
+ #include <sys/mman.h>
+ #include <unistd.h>
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/Platform.h.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/Platform.h.p
new file mode 100644
index 0000000..9d91ac8
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/Platform.h.p
@@ -0,0 +1,32 @@
+--- js/src/assembler/wtf/Platform.h.orig 2011-03-31 20:08:36.000000000 +0100
++++ js/src/assembler/wtf/Platform.h 2012-11-08 14:48:57.000000000 +0000
+@@ -188,6 +188,7 @@
+ #elif !defined(__ARM_EABI__) \
+ && !defined(__EABI__) \
+ && !defined(__VFP_FP__) \
++ && !defined(__riscos__) \
+ && !defined(ANDROID)
+ #define WTF_CPU_MIDDLE_ENDIAN 1
+
+@@ -232,6 +233,7 @@
+
+ #endif
+
++#ifndef __riscos__
+ /* Set WTF_THUMB_ARCH_VERSION */
+ #if defined(__ARM_ARCH_4T__)
+ #define WTF_THUMB_ARCH_VERSION 1
+@@ -263,6 +265,13 @@
+ #define WTF_THUMB_ARCH_VERSION 0
+ #endif
+
++#else
++
++#define WTF_THUMB_ARCH_VERSION 0
++#define WTF_PLATFORM_RISCOS 1
++#define WTF_CPU_ARM_TRADITIONAL 1
++
++#endif
+
+ /* CPU(ARMV5_OR_LOWER) - ARM instruction set v5 or earlier */
+ /* On ARMv5 and below the natural alignment is required.
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
new file mode 100644
index 0000000..0dd914b
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/configure.p
@@ -0,0 +1,13 @@
+--- js/src/configure 2011-03-31 20:08:36.000000000 +0100
++++ js/src/configure 2012-12-10 00:34:27.312881924 +0000
+@@ -7779,6 +7785,10 @@
+ HOST_NSPR_MDCPUCFG='\"md/_os2.cfg\"'
+ ;;
+
++*-riscos*)
++ TARGET_NSPR_MDCPUCFG='\"md/_riscos.cfg\"'
++ ;;
++
+ *-android*)
+ cat >> confdefs.h <<\EOF
+ #define NO_PW_GECOS 1
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jscntxt.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jscntxt.cpp.p
new file mode 100644
index 0000000..d61d860
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jscntxt.cpp.p
@@ -0,0 +1,11 @@
+--- js/src/jscntxt.cpp.orig 2012-11-08 14:49:30.000000000 +0000
++++ js/src/jscntxt.cpp 2012-11-08 14:50:19.000000000 +0000
+@@ -179,7 +179,7 @@
+ #elif defined(XP_OS2)
+ DosFreeMem(base);
+ #else
+-#ifdef SOLARIS
++#if defined(SOLARIS) || defined(__riscos__)
+ munmap((caddr_t)base, CAPACITY_BYTES);
+ #else
+ munmap(base, CAPACITY_BYTES);
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsgcchunk.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsgcchunk.cpp.p
new file mode 100644
index 0000000..b8720e4
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsgcchunk.cpp.p
@@ -0,0 +1,27 @@
+--- js/src/jsgcchunk.cpp 2012-12-10 00:50:18.369597597 +0000
++++ js/src/jsgcchunk.cpp 2012-12-10 00:51:36.317984488 +0000
+@@ -322,13 +322,13 @@
+ * We don't use MAP_FIXED here, because it can cause the *replacement*
+ * of existing mappings, and we only want to create new mappings.
+ */
+- void *p = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON,
++ void *p = mmap((caddr_t)addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON,
+ -1, 0);
+ if (p == MAP_FAILED)
+ return NULL;
+ if (addr && p != addr) {
+ /* We succeeded in mapping memory, but not in the right place. */
+- JS_ALWAYS_TRUE(munmap(p, size) == 0);
++ JS_ALWAYS_TRUE(munmap((caddr_t)p, size) == 0);
+ return NULL;
+ }
+ return p;
+@@ -342,7 +342,7 @@
+ #ifdef SOLARIS
+ JS_ALWAYS_TRUE(munmap((caddr_t) addr, size) == 0);
+ #else
+- JS_ALWAYS_TRUE(munmap(addr, size) == 0);
++ JS_ALWAYS_TRUE(munmap((caddr_t)addr, size) == 0);
+ #endif
+ }
+
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsnativestack.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsnativestack.cpp.p
new file mode 100644
index 0000000..0e042a9
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jsnativestack.cpp.p
@@ -0,0 +1,22 @@
+--- js/src/jsnativestack.cpp.orig 2012-11-08 14:53:01.000000000 +0000
++++ js/src/jsnativestack.cpp 2012-11-08 14:53:58.000000000 +0000
+@@ -204,7 +204,9 @@
+ * FIXME: this function is non-portable;
+ * other POSIX systems may have different np alternatives
+ */
++#ifndef __riscos__
+ pthread_getattr_np(thread, &sattr);
++#endif
+ # endif
+
+ void *stackBase = 0;
+@@ -212,7 +214,9 @@
+ # ifdef DEBUG
+ int rc =
+ # endif
++#ifndef __riscos__
+ pthread_attr_getstack(&sattr, &stackBase, &stackSize);
++#endif
+ JS_ASSERT(!rc);
+ JS_ASSERT(stackBase);
+ pthread_attr_destroy(&sattr);
diff --git a/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jstypedarray.cpp.p b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jstypedarray.cpp.p
new file mode 100644
index 0000000..0f4cfa9
--- /dev/null
+++ b/sdk/recipes/patches/spidermonkey/arm-unknown-riscos/jstypedarray.cpp.p
@@ -0,0 +1,11 @@
+--- js/src/jstypedarray.cpp.orig 2012-11-08 16:22:50.000000000 +0000
++++ js/src/jstypedarray.cpp 2012-11-08 16:23:25.000000000 +0000
+@@ -454,7 +454,7 @@
+ inline operator uint8() const {
+ return val;
+ }
+-};
++} __attribute__((packed));
+
+ /* Make sure the compiler isn't doing some funky stuff */
+ JS_STATIC_ASSERT(sizeof(uint8_clamped) == 1);
--
Cross-compilation toolchains and environments
11 years
- 1
- 0
netsurf: branch mono/removing-windom-dependency updated. e7329e11299f8e546a33f5a0fb5be0b147c21d59
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/e7329e11299f8e546a33f...
...commit http://git.netsurf-browser.org/netsurf.git/commit/e7329e11299f8e546a33f5a...
...tree http://git.netsurf-browser.org/netsurf.git/tree/e7329e11299f8e546a33f5a0f...
The branch, mono/removing-windom-dependency has been updated
via e7329e11299f8e546a33f5a0fb5be0b147c21d59 (commit)
via ec0c68503df1492bf35aad3a9f7ea55f3eee0721 (commit)
via 0a237c6e4793198829f2e9058d54b3eeb7bb0133 (commit)
from c4b09a8439c3465354aa7c8545ed54d099eb17fa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/e7329e11299f8e546a3...
commit e7329e11299f8e546a33f5a0fb5be0b147c21d59
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Do not uses windom functions for the login dialog.
diff --git a/atari/login.c b/atari/login.c
index ddcfeba..0fad4cd 100755
--- a/atari/login.c
+++ b/atari/login.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
-#include <windom.h>
+#include <cflib.h>
#include "utils/config.h"
#include "content/content.h"
#include "content/hlcache.h"
@@ -36,77 +36,39 @@
#include "utils/url.h"
#include "content/urldb.h"
#include "content/fetch.h"
+#include "atari/misc.h"
#include "atari/login.h"
#include "atari/res/netsurf.rsh"
-extern void * h_gem_rsrc;
-
-bool login_form_do( nsurl * url, char * realm, char ** out )
+bool login_form_do(nsurl * url, char * realm, char ** out)
{
- OBJECT *tree, *newtree;
- WINDOW * form;
char user[255];
char pass[255];
- bool bres = false;
- int res = 0;
- const char * auth;
- lwc_string * host = nsurl_get_component(url, NSURL_HOST);
- assert(host != NULL);
-
- if( realm == NULL ){
- realm = (char*)"Secure Area";
- }
+ //const char * auth;
+ short exit_obj = 0;
+ OBJECT * tree;
- int len = strlen(realm) + lwc_string_length(host) + 4;
- char * title = malloc( len );
- strncpy(title, realm, len );
- strncpy(title, ": ", len-strlen(realm) );
- strncat(title, lwc_string_data(host), len-strlen(realm)+2 );
-
- lwc_string_unref(host);
-
- auth = urldb_get_auth_details(url, realm);
user[0] = 0;
pass[0] = 0;
- /*
- TODO: use auth details if available:
- if( auth == NULL ){
- } else {
-
- }*/
-
- RsrcGaddr (h_gem_rsrc , R_TREE, LOGIN, &tree);
- ObjcChange( OC_OBJC, tree, LOGIN_BT_LOGIN, 0, 0 );
- ObjcChange( OC_OBJC, tree, LOGIN_BT_ABORT, 0, 0 );
- ObjcString( tree, LOGIN_TB_USER, (char*)&user );
- ObjcString( tree, LOGIN_TB_PASSWORD, (char*)&pass );
- form = FormWindBegin( tree, (char *)title );
- res = -1;
- while( res != LOGIN_BT_LOGIN && res != LOGIN_BT_ABORT ){
- res = FormWindDo( MU_MESAG );
- switch( res ){
- case LOGIN_BT_LOGIN:
- bres = true;
- break;
+ // TODO: use auth details for predefined login data
+ // auth = urldb_get_auth_details(url, realm);
+ tree = get_tree(LOGIN);
- case LOGIN_BT_ABORT:
- bres = false;
- break;
- }
- }
-
- if( bres ) {
- *out = malloc(strlen((char*)&user) + strlen((char*)&pass) + 2 );
- strcpy(*out, (char*)&user);
- strcat(*out, ":");
- strcat(*out, (char*)&pass);
+ assert(tree != NULL);
+
+ exit_obj = simple_mdial(tree, 0);
+
+ if(exit_obj == LOGIN_BT_LOGIN) {
+ get_string(tree, LOGIN_TB_USER, user);
+ get_string(tree, LOGIN_TB_PASSWORD, pass);
+ int size = strlen((char*)&user) + strlen((char*)&pass) + 2 ;
+ *out = malloc(size);
+ snprintf(*out, size, "%s:%s", user, pass);
} else {
*out = NULL;
}
-
- FormWindEnd( );
- free( title );
- return( bres );
+ return((exit_obj == LOGIN_BT_LOGIN));
}
+
diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index f911df9..6addf82 100755
Binary files a/atari/res/netsurf.rsc and b/atari/res/netsurf.rsc differ
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 649ea82..6c8e2e1 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -3,7 +3,7 @@ ResourceMaster v3.65
#N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
#R 0@0@1@1@1@1@
-#M 20010100@0@7728@622@
+#M 20010100@0@7728@623@
#T 0@1@MAINMENU@@62@@
#O 4@32@T_FILE@@
#O 5@32@T_EDIT@@
@@ -198,4 +198,4 @@ ResourceMaster v3.65
#O 5@33@BT_DOWN_PIC@@
#O 6@25@BT_UP@@
#O 4@33@BT_UP_PIC@@
-#c 780@
+#c 32640@
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/ec0c68503df1492bf35...
commit ec0c68503df1492bf35aad3a9f7ea55f3eee0721
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added function to retrieve current plotter dimensions.
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index e0d52a4..81c97c1 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -154,7 +154,7 @@ static HermesFormat vfmt;
/* netsurf source bitmap format */
static HermesFormat nsfmt;
-static struct s_vdi_sysinfo vdi_sysinfo;
+struct s_vdi_sysinfo vdi_sysinfo;
/* bit depth of framebuffers: */
static int atari_plot_bpp_virt;
static struct s_view view;
@@ -1900,6 +1900,16 @@ bool plot_set_dimensions(int x, int y, int w, int h)
return(true);
}
+bool plot_get_dimensions(GRECT *dst)
+{
+
+ dst->g_x = view.x;
+ dst->g_y = view.y;
+ dst->g_w = view.w;
+ dst->g_h = view.h;
+ return(true);
+}
+
bool plot_clip(const struct rect *clip)
{
// FIXME: consider the canvas size
diff --git a/atari/plot/plot.h b/atari/plot/plot.h
index 53a2645..0c1db0f 100755
--- a/atari/plot/plot.h
+++ b/atari/plot/plot.h
@@ -107,6 +107,7 @@ const char* plot_err_str(int i) ;
bool plot_lock(void);
bool plot_unlock(void);
bool plot_set_dimensions( int x, int y, int w, int h );
+bool plot_get_dimensions(GRECT *dst);
bool plot_get_clip(struct rect * out);
/* Get clipping for current framebuffer as GRECT */
void plot_get_clip_grect(GRECT * out);
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/0a237c6e4793198829f...
commit 0a237c6e4793198829f2e9058d54b3eeb7bb0133
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Removed global_evnt.* from source tree
diff --git a/atari/global_evnt.c b/atari/global_evnt.c
deleted file mode 100755
index 930b056..0000000
--- a/atari/global_evnt.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2010 Ole Loots <ole(a)monochrom.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <limits.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdbool.h>
-#include <assert.h>
-#include <windom.h>
-
-#include "desktop/gui.h"
-#include "utils/log.h"
-
-#include "atari/misc.h"
-#include "atari/gui.h"
-#include "atari/rootwin.h"
-#include "atari/toolbar.h"
-#include "atari/browser.h"
-#include "atari/global_evnt.h"
-#include "atari/res/netsurf.rsh"
-#include "atari/deskmenu.h"
-#include "cflib.h"
-
-extern struct gui_window *input_window;
-extern int mouse_click_time[3];
-extern int mouse_hold_start[3];
-extern browser_mouse_state bmstate;
-extern short last_drag_x;
-extern short last_drag_y;
-
-/* Global event handlers: */
-static void __CDECL global_evnt_apterm( WINDOW * win, short buff[8] );
-static void __CDECL global_evnt_m1( WINDOW * win, short buff[8] );
-static void __CDECL global_evnt_keybd( WINDOW * win, short buff[8],void * data);
-
-void __CDECL global_evnt_apterm(WINDOW * win, short buff[8])
-{
- int i = 0;
- LOG((""));
- netsurf_quit = true;
-}
-
-
-static void __CDECL global_evnt_m1(WINDOW * win, short buff[8])
-{
- struct gui_window * gw = input_window;
- static bool prev_url = false;
- static short prev_x=0;
- static short prev_y=0;
- bool within = false;
- GRECT urlbox, bwbox, sbbox;
- int nx, ny;
-
- if (gw == NULL)
- return;
-
- if (prev_x == evnt.mx && prev_y == evnt.my) {
- return;
- }
-
- short ghandle = wind_find( evnt.mx, evnt.my );
- if (guiwin_get_handle(input_window->root->win)==ghandle) {
-
- // The window found at x,y is an gui_window
- // and it's the input window.
-
- browser_get_rect(gw, BR_CONTENT, &bwbox);
- if (POINT_WITHIN(evnt.mx, evnt.my, bwbox)) {
- within = true;
- browser_window_mouse_track(
- input_window->browser->bw,
- 0,
- evnt.mx - bwbox.g_x + gw->browser->scroll.current.x,
- evnt.my - bwbox.g_y + gw->browser->scroll.current.y
- );
- }
-
- if (gw->root->toolbar && within == false) {
- browser_get_rect(gw, BR_URL_INPUT, &urlbox);
- if(POINT_WITHIN(evnt.mx, evnt.my, urlbox)) {
- gem_set_cursor( &gem_cursors.ibeam );
- prev_url = true;
- } else {
- if( prev_url ) {
- gem_set_cursor( &gem_cursors.arrow );
- prev_url = false;
- }
- }
- }
- } else {
- gem_set_cursor( &gem_cursors.arrow );
- prev_url = false;
- }
-
- prev_x = evnt.mx;
- prev_y = evnt.my;
-}
-
-void __CDECL global_evnt_keybd(WINDOW * win, short buff[8], void * data)
-{
- long kstate = 0;
- long kcode = 0;
- unsigned short nkc = 0;
- unsigned short nks = 0;
-
- int i=0;
- bool done = false;
- struct gui_window * gw = input_window;
- struct gui_window * gw_tmp;
- if( gw == NULL )
- return;
- kstate = evnt.mkstate;
- kcode = evnt.keybd;
- nkc= gem_to_norm( (short)kstate, (short)kcode );
- nks = (nkc & 0xFF00);
- if( kstate & (K_LSHIFT|K_RSHIFT))
- kstate |= K_LSHIFT|K_RSHIFT;
-
- if(window_url_widget_has_focus((void*)gw->root)) {
- /* make sure we report for the root window and report...: */
- done = toolbar_key_input(gw->root->toolbar, nkc);
- } else {
- gw_tmp = window_list;
- /* search for active browser component: */
- while( gw_tmp != NULL && done == false ) {
- /* todo: only handle when input_window == ontop */
- if( window_widget_has_focus(input_window->root, BROWSER,
- (void*)gw_tmp->browser)) {
- done = browser_input(gw_tmp, nkc);
- break;
- } else {
- gw_tmp = gw_tmp->next;
- }
- }
- }
- //if(!done)
- // deskmenu_dispatch_keypress(evnt.keybd, kstate, nkc);
-}
-
-
-/* Bind global and menu events to event handler functions, create accelerators */
-void bind_global_events( void )
-{
- memset( (void*)&evnt_data, 0, sizeof(struct s_evnt_data) );
- EvntDataAttach( NULL, WM_XKEYBD, global_evnt_keybd, (void*)&evnt_data );
- EvntAttach( NULL, AP_TERM, global_evnt_apterm );
- EvntAttach( NULL, WM_XM1, global_evnt_m1 );
-}
-
-void unbind_global_events( void )
-{
-
-}
-
diff --git a/atari/global_evnt.h b/atari/global_evnt.h
deleted file mode 100755
index 76e73fc..0000000
--- a/atari/global_evnt.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010 Ole Loots <ole(a)monochrom.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef NS_ATARI_GLOBAL_EVNT_H
-#define NS_ATARI_GLOBAL_EVNT_H
-
-#include <stdbool.h>
-
-struct s_keybd_evnt_data
-{
- char ascii;
-} keybd_evnt_data;
-
-struct s_evnt_data
-{
- bool ignore;
- union {
- struct s_keybd_evnt_data keybd;
- } u;
-};
-
-struct s_evnt_data evnt_data;
-
-/*
- Global event handlers
-*/
-
-void bind_global_events( void );
-void unbind_global_events( void );
-
-
-#endif
-----------------------------------------------------------------------
Summary of changes:
atari/global_evnt.c | 171 -------------------------------------------------
atari/global_evnt.h | 47 -------------
atari/login.c | 80 ++++++-----------------
atari/plot/plot.c | 12 +++-
atari/plot/plot.h | 1 +
atari/res/netsurf.rsc | Bin 35788 -> 35788 bytes
atari/res/netsurf.rsm | 4 +-
7 files changed, 35 insertions(+), 280 deletions(-)
delete mode 100755 atari/global_evnt.c
delete mode 100755 atari/global_evnt.h
diff --git a/atari/global_evnt.c b/atari/global_evnt.c
deleted file mode 100755
index 930b056..0000000
--- a/atari/global_evnt.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright 2010 Ole Loots <ole(a)monochrom.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <limits.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdbool.h>
-#include <assert.h>
-#include <windom.h>
-
-#include "desktop/gui.h"
-#include "utils/log.h"
-
-#include "atari/misc.h"
-#include "atari/gui.h"
-#include "atari/rootwin.h"
-#include "atari/toolbar.h"
-#include "atari/browser.h"
-#include "atari/global_evnt.h"
-#include "atari/res/netsurf.rsh"
-#include "atari/deskmenu.h"
-#include "cflib.h"
-
-extern struct gui_window *input_window;
-extern int mouse_click_time[3];
-extern int mouse_hold_start[3];
-extern browser_mouse_state bmstate;
-extern short last_drag_x;
-extern short last_drag_y;
-
-/* Global event handlers: */
-static void __CDECL global_evnt_apterm( WINDOW * win, short buff[8] );
-static void __CDECL global_evnt_m1( WINDOW * win, short buff[8] );
-static void __CDECL global_evnt_keybd( WINDOW * win, short buff[8],void * data);
-
-void __CDECL global_evnt_apterm(WINDOW * win, short buff[8])
-{
- int i = 0;
- LOG((""));
- netsurf_quit = true;
-}
-
-
-static void __CDECL global_evnt_m1(WINDOW * win, short buff[8])
-{
- struct gui_window * gw = input_window;
- static bool prev_url = false;
- static short prev_x=0;
- static short prev_y=0;
- bool within = false;
- GRECT urlbox, bwbox, sbbox;
- int nx, ny;
-
- if (gw == NULL)
- return;
-
- if (prev_x == evnt.mx && prev_y == evnt.my) {
- return;
- }
-
- short ghandle = wind_find( evnt.mx, evnt.my );
- if (guiwin_get_handle(input_window->root->win)==ghandle) {
-
- // The window found at x,y is an gui_window
- // and it's the input window.
-
- browser_get_rect(gw, BR_CONTENT, &bwbox);
- if (POINT_WITHIN(evnt.mx, evnt.my, bwbox)) {
- within = true;
- browser_window_mouse_track(
- input_window->browser->bw,
- 0,
- evnt.mx - bwbox.g_x + gw->browser->scroll.current.x,
- evnt.my - bwbox.g_y + gw->browser->scroll.current.y
- );
- }
-
- if (gw->root->toolbar && within == false) {
- browser_get_rect(gw, BR_URL_INPUT, &urlbox);
- if(POINT_WITHIN(evnt.mx, evnt.my, urlbox)) {
- gem_set_cursor( &gem_cursors.ibeam );
- prev_url = true;
- } else {
- if( prev_url ) {
- gem_set_cursor( &gem_cursors.arrow );
- prev_url = false;
- }
- }
- }
- } else {
- gem_set_cursor( &gem_cursors.arrow );
- prev_url = false;
- }
-
- prev_x = evnt.mx;
- prev_y = evnt.my;
-}
-
-void __CDECL global_evnt_keybd(WINDOW * win, short buff[8], void * data)
-{
- long kstate = 0;
- long kcode = 0;
- unsigned short nkc = 0;
- unsigned short nks = 0;
-
- int i=0;
- bool done = false;
- struct gui_window * gw = input_window;
- struct gui_window * gw_tmp;
- if( gw == NULL )
- return;
- kstate = evnt.mkstate;
- kcode = evnt.keybd;
- nkc= gem_to_norm( (short)kstate, (short)kcode );
- nks = (nkc & 0xFF00);
- if( kstate & (K_LSHIFT|K_RSHIFT))
- kstate |= K_LSHIFT|K_RSHIFT;
-
- if(window_url_widget_has_focus((void*)gw->root)) {
- /* make sure we report for the root window and report...: */
- done = toolbar_key_input(gw->root->toolbar, nkc);
- } else {
- gw_tmp = window_list;
- /* search for active browser component: */
- while( gw_tmp != NULL && done == false ) {
- /* todo: only handle when input_window == ontop */
- if( window_widget_has_focus(input_window->root, BROWSER,
- (void*)gw_tmp->browser)) {
- done = browser_input(gw_tmp, nkc);
- break;
- } else {
- gw_tmp = gw_tmp->next;
- }
- }
- }
- //if(!done)
- // deskmenu_dispatch_keypress(evnt.keybd, kstate, nkc);
-}
-
-
-/* Bind global and menu events to event handler functions, create accelerators */
-void bind_global_events( void )
-{
- memset( (void*)&evnt_data, 0, sizeof(struct s_evnt_data) );
- EvntDataAttach( NULL, WM_XKEYBD, global_evnt_keybd, (void*)&evnt_data );
- EvntAttach( NULL, AP_TERM, global_evnt_apterm );
- EvntAttach( NULL, WM_XM1, global_evnt_m1 );
-}
-
-void unbind_global_events( void )
-{
-
-}
-
diff --git a/atari/global_evnt.h b/atari/global_evnt.h
deleted file mode 100755
index 76e73fc..0000000
--- a/atari/global_evnt.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2010 Ole Loots <ole(a)monochrom.net>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef NS_ATARI_GLOBAL_EVNT_H
-#define NS_ATARI_GLOBAL_EVNT_H
-
-#include <stdbool.h>
-
-struct s_keybd_evnt_data
-{
- char ascii;
-} keybd_evnt_data;
-
-struct s_evnt_data
-{
- bool ignore;
- union {
- struct s_keybd_evnt_data keybd;
- } u;
-};
-
-struct s_evnt_data evnt_data;
-
-/*
- Global event handlers
-*/
-
-void bind_global_events( void );
-void unbind_global_events( void );
-
-
-#endif
diff --git a/atari/login.c b/atari/login.c
index ddcfeba..0fad4cd 100755
--- a/atari/login.c
+++ b/atari/login.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
-#include <windom.h>
+#include <cflib.h>
#include "utils/config.h"
#include "content/content.h"
#include "content/hlcache.h"
@@ -36,77 +36,39 @@
#include "utils/url.h"
#include "content/urldb.h"
#include "content/fetch.h"
+#include "atari/misc.h"
#include "atari/login.h"
#include "atari/res/netsurf.rsh"
-extern void * h_gem_rsrc;
-
-bool login_form_do( nsurl * url, char * realm, char ** out )
+bool login_form_do(nsurl * url, char * realm, char ** out)
{
- OBJECT *tree, *newtree;
- WINDOW * form;
char user[255];
char pass[255];
- bool bres = false;
- int res = 0;
- const char * auth;
- lwc_string * host = nsurl_get_component(url, NSURL_HOST);
- assert(host != NULL);
-
- if( realm == NULL ){
- realm = (char*)"Secure Area";
- }
+ //const char * auth;
+ short exit_obj = 0;
+ OBJECT * tree;
- int len = strlen(realm) + lwc_string_length(host) + 4;
- char * title = malloc( len );
- strncpy(title, realm, len );
- strncpy(title, ": ", len-strlen(realm) );
- strncat(title, lwc_string_data(host), len-strlen(realm)+2 );
-
- lwc_string_unref(host);
-
- auth = urldb_get_auth_details(url, realm);
user[0] = 0;
pass[0] = 0;
- /*
- TODO: use auth details if available:
- if( auth == NULL ){
- } else {
-
- }*/
-
- RsrcGaddr (h_gem_rsrc , R_TREE, LOGIN, &tree);
- ObjcChange( OC_OBJC, tree, LOGIN_BT_LOGIN, 0, 0 );
- ObjcChange( OC_OBJC, tree, LOGIN_BT_ABORT, 0, 0 );
- ObjcString( tree, LOGIN_TB_USER, (char*)&user );
- ObjcString( tree, LOGIN_TB_PASSWORD, (char*)&pass );
- form = FormWindBegin( tree, (char *)title );
- res = -1;
- while( res != LOGIN_BT_LOGIN && res != LOGIN_BT_ABORT ){
- res = FormWindDo( MU_MESAG );
- switch( res ){
- case LOGIN_BT_LOGIN:
- bres = true;
- break;
+ // TODO: use auth details for predefined login data
+ // auth = urldb_get_auth_details(url, realm);
+ tree = get_tree(LOGIN);
- case LOGIN_BT_ABORT:
- bres = false;
- break;
- }
- }
-
- if( bres ) {
- *out = malloc(strlen((char*)&user) + strlen((char*)&pass) + 2 );
- strcpy(*out, (char*)&user);
- strcat(*out, ":");
- strcat(*out, (char*)&pass);
+ assert(tree != NULL);
+
+ exit_obj = simple_mdial(tree, 0);
+
+ if(exit_obj == LOGIN_BT_LOGIN) {
+ get_string(tree, LOGIN_TB_USER, user);
+ get_string(tree, LOGIN_TB_PASSWORD, pass);
+ int size = strlen((char*)&user) + strlen((char*)&pass) + 2 ;
+ *out = malloc(size);
+ snprintf(*out, size, "%s:%s", user, pass);
} else {
*out = NULL;
}
-
- FormWindEnd( );
- free( title );
- return( bres );
+ return((exit_obj == LOGIN_BT_LOGIN));
}
+
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index e0d52a4..81c97c1 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -154,7 +154,7 @@ static HermesFormat vfmt;
/* netsurf source bitmap format */
static HermesFormat nsfmt;
-static struct s_vdi_sysinfo vdi_sysinfo;
+struct s_vdi_sysinfo vdi_sysinfo;
/* bit depth of framebuffers: */
static int atari_plot_bpp_virt;
static struct s_view view;
@@ -1900,6 +1900,16 @@ bool plot_set_dimensions(int x, int y, int w, int h)
return(true);
}
+bool plot_get_dimensions(GRECT *dst)
+{
+
+ dst->g_x = view.x;
+ dst->g_y = view.y;
+ dst->g_w = view.w;
+ dst->g_h = view.h;
+ return(true);
+}
+
bool plot_clip(const struct rect *clip)
{
// FIXME: consider the canvas size
diff --git a/atari/plot/plot.h b/atari/plot/plot.h
index 53a2645..0c1db0f 100755
--- a/atari/plot/plot.h
+++ b/atari/plot/plot.h
@@ -107,6 +107,7 @@ const char* plot_err_str(int i) ;
bool plot_lock(void);
bool plot_unlock(void);
bool plot_set_dimensions( int x, int y, int w, int h );
+bool plot_get_dimensions(GRECT *dst);
bool plot_get_clip(struct rect * out);
/* Get clipping for current framebuffer as GRECT */
void plot_get_clip_grect(GRECT * out);
diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index f911df9..6addf82 100755
Binary files a/atari/res/netsurf.rsc and b/atari/res/netsurf.rsc differ
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 649ea82..6c8e2e1 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -3,7 +3,7 @@ ResourceMaster v3.65
#N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
#R 0@0@1@1@1@1@
-#M 20010100@0@7728@622@
+#M 20010100@0@7728@623@
#T 0@1@MAINMENU@@62@@
#O 4@32@T_FILE@@
#O 5@32@T_EDIT@@
@@ -198,4 +198,4 @@ ResourceMaster v3.65
#O 5@33@BT_DOWN_PIC@@
#O 6@25@BT_UP@@
#O 4@33@BT_UP_PIC@@
-#c 780@
+#c 32640@
--
NetSurf Browser
11 years
- 1
- 0
netsurf: branch master updated. 47579b468cb02886b2113e5bfcdee05978c7c940
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/47579b468cb02886b2113...
...commit http://git.netsurf-browser.org/netsurf.git/commit/47579b468cb02886b2113e5...
...tree http://git.netsurf-browser.org/netsurf.git/tree/47579b468cb02886b2113e5bf...
The branch, master has been updated
via 47579b468cb02886b2113e5bfcdee05978c7c940 (commit)
via 589c8a28a4fb4c6e4ccb0f55cf6fc316dea6cc80 (commit)
via a6005c9a5bb529bde2e669aef84ff2a7ad25281f (commit)
from 02a4bfd375110c268837931a8714fab0dc154d50 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/47579b468cb02886b21...
commit 47579b468cb02886b2113e5bfcdee05978c7c940
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Add dither quality options to GUI
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index edc1856..092bb4c 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -99,6 +99,7 @@ enum
GID_OPTS_FETCHCACHE,
GID_OPTS_NATIVEBM,
GID_OPTS_SCALEQ,
+ GID_OPTS_DITHERQ,
GID_OPTS_ANIMSPEED,
GID_OPTS_ANIMDISABLE,
GID_OPTS_DPI_Y,
@@ -195,6 +196,7 @@ enum
#define OPTS_MAX_SCREEN 4
#define OPTS_MAX_PROXY 5
#define OPTS_MAX_NATIVEBM 3
+#define OPTS_MAX_DITHER 4
struct ami_gui_opts_window {
struct nsObject *node;
@@ -208,6 +210,7 @@ CONST_STRPTR tabs[OPTS_MAX_TABS];
static STRPTR screenopts[OPTS_MAX_SCREEN];
CONST_STRPTR proxyopts[OPTS_MAX_PROXY];
CONST_STRPTR nativebmopts[OPTS_MAX_NATIVEBM];
+CONST_STRPTR ditheropts[OPTS_MAX_DITHER];
CONST_STRPTR fontopts[6];
CONST_STRPTR gadlab[OPTS_LAST];
STRPTR *websearch_list;
@@ -248,6 +251,11 @@ void ami_gui_opts_setup(void)
nativebmopts[2] = (char *)ami_utf8_easy((char *)messages_get("All"));
nativebmopts[3] = NULL;
+ ditheropts[0] = (char *)ami_utf8_easy((char *)messages_get("Low"));
+ ditheropts[1] = (char *)ami_utf8_easy((char *)messages_get("Medium"));
+ ditheropts[2] = (char *)ami_utf8_easy((char *)messages_get("High"));
+ ditheropts[3] = NULL;
+
websearch_list = ami_gui_opts_websearch();
gadlab[GID_OPTS_HOMEPAGE] = (char *)ami_utf8_easy((char *)messages_get("HomePageURL"));
@@ -273,6 +281,7 @@ void ami_gui_opts_setup(void)
gadlab[GID_OPTS_FETCHCACHE] = (char *)ami_utf8_easy((char *)messages_get("FetchesCached"));
gadlab[GID_OPTS_NATIVEBM] = (char *)ami_utf8_easy((char *)messages_get("CacheNative"));
gadlab[GID_OPTS_SCALEQ] = (char *)ami_utf8_easy((char *)messages_get("ScaleQuality"));
+ gadlab[GID_OPTS_DITHERQ] = (char *)ami_utf8_easy((char *)messages_get("DitherQuality"));
gadlab[GID_OPTS_ANIMSPEED] = (char *)ami_utf8_easy((char *)messages_get("AnimSpeedLimit"));
gadlab[GID_OPTS_DPI_Y] = (char *)ami_utf8_easy((char *)messages_get("ResolutionY"));
gadlab[GID_OPTS_ANIMDISABLE] = (char *)ami_utf8_easy((char *)messages_get("AnimDisable"));
@@ -871,6 +880,16 @@ void ami_gui_opts_open(void)
CHILD_Label, LabelObject,
LABEL_Text, gadlab[GID_OPTS_NATIVEBM],
LabelEnd,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DITHERQ] = ChooserObject,
+ GA_ID, GID_OPTS_DITHERQ,
+ GA_RelVerify, TRUE,
+ CHOOSER_PopUp, TRUE,
+ CHOOSER_LabelArray, ditheropts,
+ CHOOSER_Selected, nsoption_int(dither_quality),
+ ChooserEnd,
+ CHILD_Label, LabelObject,
+ LABEL_Text, gadlab[GID_OPTS_DITHERQ],
+ LabelEnd,
LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = CheckBoxObject,
GA_ID, GID_OPTS_SCALEQ,
GA_Disabled, scaledisabled,
@@ -1624,6 +1643,8 @@ void ami_gui_opts_use(bool save)
nsoption_set_bool(scale_quality, false);
}
+ GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_DITHERQ],(ULONG *)&nsoption_int(dither_quality));
+
GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_ANIMSPEED],(ULONG *)&data);
animspeed = strtof((char *)data, NULL);
nsoption_set_int(minimum_gif_delay, (int)(animspeed * 100));
diff --git a/resources/FatMessages b/resources/FatMessages
index 0fe6a6f..80e7dbd 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -5369,6 +5369,26 @@ de.all.ScaleQuality:Skalieren hoher Qualität
fr.all.ScaleQuality:Higher quality scaling
it.all.ScaleQuality:Massima qualità di visualizzazione
nl.all.ScaleQuality:Higher quality scaling
+en.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+de.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+fr.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+it.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+nl.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+en.ami.Low:Low
+de.ami.Low:Low
+fr.ami.Low:Low
+it.ami.Low:Low
+nl.ami.Low:Low
+en.ami.Medium:Medium
+de.ami.Medium:Medium
+fr.ami.Medium:Medium
+it.ami.Medium:Medium
+nl.ami.Medium:Medium
+en.ami.High:High
+de.ami.High:High
+fr.ami.High:High
+it.ami.High:High
+nl.ami.High:High
en.all.Animations:Animations
de.all.Animations:Animationen
fr.all.Animations:Animations
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/589c8a28a4fb4c6e4cc...
commit 589c8a28a4fb4c6e4ccb0f55cf6fc316dea6cc80
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Add simple refresh option to GUI
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index dc86977..edc1856 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -85,6 +85,7 @@ enum
GID_OPTS_SCREEN,
GID_OPTS_SCREENMODE,
GID_OPTS_SCREENNAME,
+ GID_OPTS_WIN_SIMPLE,
GID_OPTS_THEME,
GID_OPTS_PTRTRUE,
GID_OPTS_PTROS,
@@ -152,6 +153,7 @@ enum
GRP_OPTS_PRIVACY,
GRP_OPTS_MISC,
GRP_OPTS_SCREEN,
+ GRP_OPTS_WINDOW,
GRP_OPTS_THEME,
GRP_OPTS_MOUSE,
GRP_OPTS_PROXY,
@@ -259,6 +261,7 @@ void ami_gui_opts_setup(void)
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_WIN_SIMPLE] = (char *)ami_utf8_easy((char *)messages_get("SimpleRefresh"));
gadlab[GID_OPTS_PTRTRUE] = (char *)ami_utf8_easy((char *)messages_get("TrueColour"));
gadlab[GID_OPTS_PTROS] = (char *)ami_utf8_easy((char *)messages_get("OSPointers"));
gadlab[GID_OPTS_PROXY] = (char *)ami_utf8_easy((char *)messages_get("ProxyType"));
@@ -328,6 +331,7 @@ void ami_gui_opts_setup(void)
gadlab[GRP_OPTS_SCRIPTING] = (char *)ami_utf8_easy((char *)messages_get("Scripting"));
gadlab[GRP_OPTS_MISC] = (char *)ami_utf8_easy((char *)messages_get("Miscellaneous"));
gadlab[GRP_OPTS_SCREEN] = (char *)ami_utf8_easy((char *)messages_get("Screen"));
+ gadlab[GRP_OPTS_WINDOW] = (char *)ami_utf8_easy((char *)messages_get("Window"));
gadlab[GRP_OPTS_THEME] = (char *)ami_utf8_easy((char *)messages_get("Theme"));
gadlab[GRP_OPTS_MOUSE] = (char *)ami_utf8_easy((char *)messages_get("MousePointers"));
gadlab[GRP_OPTS_PROXY] = (char *)ami_utf8_easy((char *)messages_get("Proxy"));
@@ -689,6 +693,18 @@ void ami_gui_opts_open(void)
LAYOUT_AddChild,VGroupObject,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
+ LAYOUT_Label, gadlab[GRP_OPTS_WINDOW],
+ LAYOUT_AddChild, gow->objects[GID_OPTS_WIN_SIMPLE] = CheckBoxObject,
+ GA_ID, GID_OPTS_WIN_SIMPLE,
+ GA_RelVerify, TRUE,
+ GA_Text, gadlab[GID_OPTS_WIN_SIMPLE],
+ GA_Selected, nsoption_bool(window_simple_refresh),
+ CheckBoxEnd,
+ LayoutEnd, // window
+ CHILD_WeightedHeight,0,
+ LAYOUT_AddChild,VGroupObject,
+ LAYOUT_SpaceOuter, TRUE,
+ LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_THEME],
LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = GetFileObject,
GA_ID, GID_OPTS_THEME,
@@ -1549,6 +1565,13 @@ void ami_gui_opts_use(bool save)
nsoption_set_charp(modeid, modeid);
}
+ GetAttr(GA_Selected,gow->objects[GID_OPTS_WIN_SIMPLE],(ULONG *)&data);
+ if (data) {
+ nsoption_set_bool(window_simple_refresh, true);
+ } else {
+ nsoption_set_bool(window_simple_refresh, false);
+ }
+
GetAttr(GETFILE_Drawer,gow->objects[GID_OPTS_THEME],(ULONG *)&data);
nsoption_set_charp(theme, (char *)strdup((char *)data));
diff --git a/resources/FatMessages b/resources/FatMessages
index bfd4caa..0fe6a6f 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -5296,6 +5296,11 @@ de.ami.ScreenPublic:Public Screen
fr.ami.ScreenPublic:Public screen
it.ami.ScreenPublic:Schermo pubblico
nl.ami.ScreenPublic:Public screen
+en.ami.SimpleRefresh:Simple refresh
+de.ami.SimpleRefresh:Simple refresh
+fr.ami.SimpleRefresh:Simple refresh
+it.ami.SimpleRefresh:Simple refresh
+nl.ami.SimpleRefresh:Simple refresh
en.all.Theme:Theme
de.all.Theme:Thema
fr.all.Theme:Theme
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/a6005c9a5bb529bde2e...
commit a6005c9a5bb529bde2e669aef84ff2a7ad25281f
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Add font anti-aliasing option to GUI
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index a84449e..dc86977 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -109,6 +109,7 @@ enum
GID_OPTS_FONT_DEFAULT,
GID_OPTS_FONT_SIZE,
GID_OPTS_FONT_MINSIZE,
+ GID_OPTS_FONT_ANTIALIASING,
GID_OPTS_CACHE_MEM,
GID_OPTS_CACHE_DISC,
GID_OPTS_OVERWRITE,
@@ -280,6 +281,7 @@ void ami_gui_opts_setup(void)
gadlab[GID_OPTS_FONT_DEFAULT] = (char *)ami_utf8_easy((char *)messages_get("Default"));
gadlab[GID_OPTS_FONT_SIZE] = (char *)ami_utf8_easy((char *)messages_get("Default"));
gadlab[GID_OPTS_FONT_MINSIZE] = (char *)ami_utf8_easy((char *)messages_get("Minimum"));
+ gadlab[GID_OPTS_FONT_ANTIALIASING] = (char *)ami_utf8_easy((char *)messages_get("FontAntialiasing"));
gadlab[GID_OPTS_CACHE_MEM] = (char *)ami_utf8_easy((char *)messages_get("Size"));
gadlab[GID_OPTS_CACHE_DISC] = (char *)ami_utf8_easy((char *)messages_get("Duration"));
gadlab[GID_OPTS_OVERWRITE] = (char *)ami_utf8_easy((char *)messages_get("ConfirmOverwrite"));
@@ -991,46 +993,59 @@ void ami_gui_opts_open(void)
LabelEnd,
LayoutEnd, // font faces
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild,VGroupObject,
- LAYOUT_SpaceOuter, TRUE,
- LAYOUT_BevelStyle, BVS_GROUP,
- LAYOUT_Label, gadlab[GRP_OPTS_FONTSIZE],
- LAYOUT_AddChild, HGroupObject,
- LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = IntegerObject,
- GA_ID, GID_OPTS_FONT_SIZE,
- GA_RelVerify, TRUE,
- INTEGER_Number, nsoption_int(font_size) / 10,
- INTEGER_Minimum, 1,
- INTEGER_Maximum, 99,
- INTEGER_Arrows, TRUE,
- IntegerEnd,
- CHILD_WeightedWidth, 0,
+ LAYOUT_AddChild, HGroupObject,
+ LAYOUT_AddChild,VGroupObject,
+ LAYOUT_SpaceOuter, TRUE,
+ LAYOUT_BevelStyle, BVS_GROUP,
+ LAYOUT_Label, gadlab[GRP_OPTS_FONTSIZE],
+ LAYOUT_AddChild, HGroupObject,
+ LAYOUT_LabelColumn, PLACETEXT_RIGHT,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = IntegerObject,
+ GA_ID, GID_OPTS_FONT_SIZE,
+ GA_RelVerify, TRUE,
+ INTEGER_Number, nsoption_int(font_size) / 10,
+ INTEGER_Minimum, 1,
+ INTEGER_Maximum, 99,
+ INTEGER_Arrows, TRUE,
+ IntegerEnd,
+ CHILD_WeightedWidth, 0,
+ CHILD_Label, LabelObject,
+ LABEL_Text, gadlab[LAB_OPTS_PT],
+ LabelEnd,
+ LayoutEnd,
CHILD_Label, LabelObject,
- LABEL_Text, gadlab[LAB_OPTS_PT],
+ LABEL_Text, gadlab[GID_OPTS_FONT_SIZE],
LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObject,
- LABEL_Text, gadlab[GID_OPTS_FONT_SIZE],
- LabelEnd,
- LAYOUT_AddChild, HGroupObject,
- LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = IntegerObject,
- GA_ID, GID_OPTS_FONT_MINSIZE,
- GA_RelVerify, TRUE,
- INTEGER_Number, nsoption_int(font_min_size) / 10,
- INTEGER_Minimum, 1,
- INTEGER_Maximum, 99,
- INTEGER_Arrows, TRUE,
- IntegerEnd,
- CHILD_WeightedWidth, 0,
+ LAYOUT_AddChild, HGroupObject,
+ LAYOUT_LabelColumn, PLACETEXT_RIGHT,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = IntegerObject,
+ GA_ID, GID_OPTS_FONT_MINSIZE,
+ GA_RelVerify, TRUE,
+ INTEGER_Number, nsoption_int(font_min_size) / 10,
+ INTEGER_Minimum, 1,
+ INTEGER_Maximum, 99,
+ INTEGER_Arrows, TRUE,
+ IntegerEnd,
+ CHILD_WeightedWidth, 0,
+ CHILD_Label, LabelObject,
+ LABEL_Text, gadlab[LAB_OPTS_PT],
+ LabelEnd,
+ LayoutEnd,
CHILD_Label, LabelObject,
- LABEL_Text, gadlab[LAB_OPTS_PT],
+ LABEL_Text, gadlab[GID_OPTS_FONT_MINSIZE],
LabelEnd,
LayoutEnd,
- CHILD_Label, LabelObject,
- LABEL_Text, gadlab[GID_OPTS_FONT_MINSIZE],
- LabelEnd,
+ LAYOUT_AddChild,VGroupObject,
+ LAYOUT_SpaceOuter, TRUE,
+ LAYOUT_BevelStyle, BVS_GROUP,
+ LAYOUT_Label, gadlab[GRP_OPTS_MISC],
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_ANTIALIASING] = CheckBoxObject,
+ GA_ID, GID_OPTS_FONT_ANTIALIASING,
+ GA_RelVerify, TRUE,
+ GA_Text, gadlab[GID_OPTS_FONT_ANTIALIASING],
+ GA_Selected, nsoption_bool(font_antialiasing),
+ CheckBoxEnd,
+ LayoutEnd,
LayoutEnd,
CHILD_WeightedHeight, 0,
LayoutEnd, // page vgroup
@@ -1639,6 +1654,13 @@ void ami_gui_opts_use(bool save)
GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FONT_MINSIZE],(ULONG *)&nsoption_int(font_min_size));
nsoption_set_int(font_min_size, nsoption_int(font_min_size) * 10);
+ GetAttr(GA_Selected, gow->objects[GID_OPTS_FONT_ANTIALIASING], (ULONG *)&data);
+ if(data) {
+ nsoption_set_bool(font_antialiasing, true);
+ } else {
+ nsoption_set_bool(font_antialiasing, false);
+ }
+
GetAttr(INTEGER_Number,gow->objects[GID_OPTS_CACHE_MEM],(ULONG *)&nsoption_int(memory_cache_size));
nsoption_set_int(memory_cache_size, nsoption_int(memory_cache_size) * 1048576);
diff --git a/resources/FatMessages b/resources/FatMessages
index c391a41..bfd4caa 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -5475,6 +5475,11 @@ de.all.Pt:pt
fr.all.Pt:pt
it.all.Pt:pt
nl.all.Pt:pt
+en.ami.FontAntialiasing:Use anti-aliasing (when possible)
+de.ami.FontAntialiasing:Use anti-aliasing (when possible)
+fr.ami.FontAntialiasing:Use anti-aliasing (when possible)
+it.ami.FontAntialiasing:Use anti-aliasing (when possible)
+nl.ami.FontAntialiasing:Use anti-aliasing (when possible)
# Font scanning
en.ami.FontScanning:Scanning fonts...
-----------------------------------------------------------------------
Summary of changes:
amiga/gui_options.c | 136 ++++++++++++++++++++++++++++++++++++-------------
resources/FatMessages | 30 +++++++++++
2 files changed, 131 insertions(+), 35 deletions(-)
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index a84449e..092bb4c 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -85,6 +85,7 @@ enum
GID_OPTS_SCREEN,
GID_OPTS_SCREENMODE,
GID_OPTS_SCREENNAME,
+ GID_OPTS_WIN_SIMPLE,
GID_OPTS_THEME,
GID_OPTS_PTRTRUE,
GID_OPTS_PTROS,
@@ -98,6 +99,7 @@ enum
GID_OPTS_FETCHCACHE,
GID_OPTS_NATIVEBM,
GID_OPTS_SCALEQ,
+ GID_OPTS_DITHERQ,
GID_OPTS_ANIMSPEED,
GID_OPTS_ANIMDISABLE,
GID_OPTS_DPI_Y,
@@ -109,6 +111,7 @@ enum
GID_OPTS_FONT_DEFAULT,
GID_OPTS_FONT_SIZE,
GID_OPTS_FONT_MINSIZE,
+ GID_OPTS_FONT_ANTIALIASING,
GID_OPTS_CACHE_MEM,
GID_OPTS_CACHE_DISC,
GID_OPTS_OVERWRITE,
@@ -151,6 +154,7 @@ enum
GRP_OPTS_PRIVACY,
GRP_OPTS_MISC,
GRP_OPTS_SCREEN,
+ GRP_OPTS_WINDOW,
GRP_OPTS_THEME,
GRP_OPTS_MOUSE,
GRP_OPTS_PROXY,
@@ -192,6 +196,7 @@ enum
#define OPTS_MAX_SCREEN 4
#define OPTS_MAX_PROXY 5
#define OPTS_MAX_NATIVEBM 3
+#define OPTS_MAX_DITHER 4
struct ami_gui_opts_window {
struct nsObject *node;
@@ -205,6 +210,7 @@ CONST_STRPTR tabs[OPTS_MAX_TABS];
static STRPTR screenopts[OPTS_MAX_SCREEN];
CONST_STRPTR proxyopts[OPTS_MAX_PROXY];
CONST_STRPTR nativebmopts[OPTS_MAX_NATIVEBM];
+CONST_STRPTR ditheropts[OPTS_MAX_DITHER];
CONST_STRPTR fontopts[6];
CONST_STRPTR gadlab[OPTS_LAST];
STRPTR *websearch_list;
@@ -245,6 +251,11 @@ void ami_gui_opts_setup(void)
nativebmopts[2] = (char *)ami_utf8_easy((char *)messages_get("All"));
nativebmopts[3] = NULL;
+ ditheropts[0] = (char *)ami_utf8_easy((char *)messages_get("Low"));
+ ditheropts[1] = (char *)ami_utf8_easy((char *)messages_get("Medium"));
+ ditheropts[2] = (char *)ami_utf8_easy((char *)messages_get("High"));
+ ditheropts[3] = NULL;
+
websearch_list = ami_gui_opts_websearch();
gadlab[GID_OPTS_HOMEPAGE] = (char *)ami_utf8_easy((char *)messages_get("HomePageURL"));
@@ -258,6 +269,7 @@ void ami_gui_opts_setup(void)
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_WIN_SIMPLE] = (char *)ami_utf8_easy((char *)messages_get("SimpleRefresh"));
gadlab[GID_OPTS_PTRTRUE] = (char *)ami_utf8_easy((char *)messages_get("TrueColour"));
gadlab[GID_OPTS_PTROS] = (char *)ami_utf8_easy((char *)messages_get("OSPointers"));
gadlab[GID_OPTS_PROXY] = (char *)ami_utf8_easy((char *)messages_get("ProxyType"));
@@ -269,6 +281,7 @@ void ami_gui_opts_setup(void)
gadlab[GID_OPTS_FETCHCACHE] = (char *)ami_utf8_easy((char *)messages_get("FetchesCached"));
gadlab[GID_OPTS_NATIVEBM] = (char *)ami_utf8_easy((char *)messages_get("CacheNative"));
gadlab[GID_OPTS_SCALEQ] = (char *)ami_utf8_easy((char *)messages_get("ScaleQuality"));
+ gadlab[GID_OPTS_DITHERQ] = (char *)ami_utf8_easy((char *)messages_get("DitherQuality"));
gadlab[GID_OPTS_ANIMSPEED] = (char *)ami_utf8_easy((char *)messages_get("AnimSpeedLimit"));
gadlab[GID_OPTS_DPI_Y] = (char *)ami_utf8_easy((char *)messages_get("ResolutionY"));
gadlab[GID_OPTS_ANIMDISABLE] = (char *)ami_utf8_easy((char *)messages_get("AnimDisable"));
@@ -280,6 +293,7 @@ void ami_gui_opts_setup(void)
gadlab[GID_OPTS_FONT_DEFAULT] = (char *)ami_utf8_easy((char *)messages_get("Default"));
gadlab[GID_OPTS_FONT_SIZE] = (char *)ami_utf8_easy((char *)messages_get("Default"));
gadlab[GID_OPTS_FONT_MINSIZE] = (char *)ami_utf8_easy((char *)messages_get("Minimum"));
+ gadlab[GID_OPTS_FONT_ANTIALIASING] = (char *)ami_utf8_easy((char *)messages_get("FontAntialiasing"));
gadlab[GID_OPTS_CACHE_MEM] = (char *)ami_utf8_easy((char *)messages_get("Size"));
gadlab[GID_OPTS_CACHE_DISC] = (char *)ami_utf8_easy((char *)messages_get("Duration"));
gadlab[GID_OPTS_OVERWRITE] = (char *)ami_utf8_easy((char *)messages_get("ConfirmOverwrite"));
@@ -326,6 +340,7 @@ void ami_gui_opts_setup(void)
gadlab[GRP_OPTS_SCRIPTING] = (char *)ami_utf8_easy((char *)messages_get("Scripting"));
gadlab[GRP_OPTS_MISC] = (char *)ami_utf8_easy((char *)messages_get("Miscellaneous"));
gadlab[GRP_OPTS_SCREEN] = (char *)ami_utf8_easy((char *)messages_get("Screen"));
+ gadlab[GRP_OPTS_WINDOW] = (char *)ami_utf8_easy((char *)messages_get("Window"));
gadlab[GRP_OPTS_THEME] = (char *)ami_utf8_easy((char *)messages_get("Theme"));
gadlab[GRP_OPTS_MOUSE] = (char *)ami_utf8_easy((char *)messages_get("MousePointers"));
gadlab[GRP_OPTS_PROXY] = (char *)ami_utf8_easy((char *)messages_get("Proxy"));
@@ -687,6 +702,18 @@ void ami_gui_opts_open(void)
LAYOUT_AddChild,VGroupObject,
LAYOUT_SpaceOuter, TRUE,
LAYOUT_BevelStyle, BVS_GROUP,
+ LAYOUT_Label, gadlab[GRP_OPTS_WINDOW],
+ LAYOUT_AddChild, gow->objects[GID_OPTS_WIN_SIMPLE] = CheckBoxObject,
+ GA_ID, GID_OPTS_WIN_SIMPLE,
+ GA_RelVerify, TRUE,
+ GA_Text, gadlab[GID_OPTS_WIN_SIMPLE],
+ GA_Selected, nsoption_bool(window_simple_refresh),
+ CheckBoxEnd,
+ LayoutEnd, // window
+ CHILD_WeightedHeight,0,
+ LAYOUT_AddChild,VGroupObject,
+ LAYOUT_SpaceOuter, TRUE,
+ LAYOUT_BevelStyle, BVS_GROUP,
LAYOUT_Label, gadlab[GRP_OPTS_THEME],
LAYOUT_AddChild, gow->objects[GID_OPTS_THEME] = GetFileObject,
GA_ID, GID_OPTS_THEME,
@@ -853,6 +880,16 @@ void ami_gui_opts_open(void)
CHILD_Label, LabelObject,
LABEL_Text, gadlab[GID_OPTS_NATIVEBM],
LabelEnd,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_DITHERQ] = ChooserObject,
+ GA_ID, GID_OPTS_DITHERQ,
+ GA_RelVerify, TRUE,
+ CHOOSER_PopUp, TRUE,
+ CHOOSER_LabelArray, ditheropts,
+ CHOOSER_Selected, nsoption_int(dither_quality),
+ ChooserEnd,
+ CHILD_Label, LabelObject,
+ LABEL_Text, gadlab[GID_OPTS_DITHERQ],
+ LabelEnd,
LAYOUT_AddChild, gow->objects[GID_OPTS_SCALEQ] = CheckBoxObject,
GA_ID, GID_OPTS_SCALEQ,
GA_Disabled, scaledisabled,
@@ -991,46 +1028,59 @@ void ami_gui_opts_open(void)
LabelEnd,
LayoutEnd, // font faces
CHILD_WeightedHeight, 0,
- LAYOUT_AddChild,VGroupObject,
- LAYOUT_SpaceOuter, TRUE,
- LAYOUT_BevelStyle, BVS_GROUP,
- LAYOUT_Label, gadlab[GRP_OPTS_FONTSIZE],
- LAYOUT_AddChild, HGroupObject,
- LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = IntegerObject,
- GA_ID, GID_OPTS_FONT_SIZE,
- GA_RelVerify, TRUE,
- INTEGER_Number, nsoption_int(font_size) / 10,
- INTEGER_Minimum, 1,
- INTEGER_Maximum, 99,
- INTEGER_Arrows, TRUE,
- IntegerEnd,
- CHILD_WeightedWidth, 0,
+ LAYOUT_AddChild, HGroupObject,
+ LAYOUT_AddChild,VGroupObject,
+ LAYOUT_SpaceOuter, TRUE,
+ LAYOUT_BevelStyle, BVS_GROUP,
+ LAYOUT_Label, gadlab[GRP_OPTS_FONTSIZE],
+ LAYOUT_AddChild, HGroupObject,
+ LAYOUT_LabelColumn, PLACETEXT_RIGHT,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_SIZE] = IntegerObject,
+ GA_ID, GID_OPTS_FONT_SIZE,
+ GA_RelVerify, TRUE,
+ INTEGER_Number, nsoption_int(font_size) / 10,
+ INTEGER_Minimum, 1,
+ INTEGER_Maximum, 99,
+ INTEGER_Arrows, TRUE,
+ IntegerEnd,
+ CHILD_WeightedWidth, 0,
+ CHILD_Label, LabelObject,
+ LABEL_Text, gadlab[LAB_OPTS_PT],
+ LabelEnd,
+ LayoutEnd,
CHILD_Label, LabelObject,
- LABEL_Text, gadlab[LAB_OPTS_PT],
+ LABEL_Text, gadlab[GID_OPTS_FONT_SIZE],
LabelEnd,
- LayoutEnd,
- CHILD_Label, LabelObject,
- LABEL_Text, gadlab[GID_OPTS_FONT_SIZE],
- LabelEnd,
- LAYOUT_AddChild, HGroupObject,
- LAYOUT_LabelColumn, PLACETEXT_RIGHT,
- LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = IntegerObject,
- GA_ID, GID_OPTS_FONT_MINSIZE,
- GA_RelVerify, TRUE,
- INTEGER_Number, nsoption_int(font_min_size) / 10,
- INTEGER_Minimum, 1,
- INTEGER_Maximum, 99,
- INTEGER_Arrows, TRUE,
- IntegerEnd,
- CHILD_WeightedWidth, 0,
+ LAYOUT_AddChild, HGroupObject,
+ LAYOUT_LabelColumn, PLACETEXT_RIGHT,
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_MINSIZE] = IntegerObject,
+ GA_ID, GID_OPTS_FONT_MINSIZE,
+ GA_RelVerify, TRUE,
+ INTEGER_Number, nsoption_int(font_min_size) / 10,
+ INTEGER_Minimum, 1,
+ INTEGER_Maximum, 99,
+ INTEGER_Arrows, TRUE,
+ IntegerEnd,
+ CHILD_WeightedWidth, 0,
+ CHILD_Label, LabelObject,
+ LABEL_Text, gadlab[LAB_OPTS_PT],
+ LabelEnd,
+ LayoutEnd,
CHILD_Label, LabelObject,
- LABEL_Text, gadlab[LAB_OPTS_PT],
+ LABEL_Text, gadlab[GID_OPTS_FONT_MINSIZE],
LabelEnd,
LayoutEnd,
- CHILD_Label, LabelObject,
- LABEL_Text, gadlab[GID_OPTS_FONT_MINSIZE],
- LabelEnd,
+ LAYOUT_AddChild,VGroupObject,
+ LAYOUT_SpaceOuter, TRUE,
+ LAYOUT_BevelStyle, BVS_GROUP,
+ LAYOUT_Label, gadlab[GRP_OPTS_MISC],
+ LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_ANTIALIASING] = CheckBoxObject,
+ GA_ID, GID_OPTS_FONT_ANTIALIASING,
+ GA_RelVerify, TRUE,
+ GA_Text, gadlab[GID_OPTS_FONT_ANTIALIASING],
+ GA_Selected, nsoption_bool(font_antialiasing),
+ CheckBoxEnd,
+ LayoutEnd,
LayoutEnd,
CHILD_WeightedHeight, 0,
LayoutEnd, // page vgroup
@@ -1534,6 +1584,13 @@ void ami_gui_opts_use(bool save)
nsoption_set_charp(modeid, modeid);
}
+ GetAttr(GA_Selected,gow->objects[GID_OPTS_WIN_SIMPLE],(ULONG *)&data);
+ if (data) {
+ nsoption_set_bool(window_simple_refresh, true);
+ } else {
+ nsoption_set_bool(window_simple_refresh, false);
+ }
+
GetAttr(GETFILE_Drawer,gow->objects[GID_OPTS_THEME],(ULONG *)&data);
nsoption_set_charp(theme, (char *)strdup((char *)data));
@@ -1586,6 +1643,8 @@ void ami_gui_opts_use(bool save)
nsoption_set_bool(scale_quality, false);
}
+ GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_DITHERQ],(ULONG *)&nsoption_int(dither_quality));
+
GetAttr(STRINGA_TextVal,gow->objects[GID_OPTS_ANIMSPEED],(ULONG *)&data);
animspeed = strtof((char *)data, NULL);
nsoption_set_int(minimum_gif_delay, (int)(animspeed * 100));
@@ -1639,6 +1698,13 @@ void ami_gui_opts_use(bool save)
GetAttr(INTEGER_Number,gow->objects[GID_OPTS_FONT_MINSIZE],(ULONG *)&nsoption_int(font_min_size));
nsoption_set_int(font_min_size, nsoption_int(font_min_size) * 10);
+ GetAttr(GA_Selected, gow->objects[GID_OPTS_FONT_ANTIALIASING], (ULONG *)&data);
+ if(data) {
+ nsoption_set_bool(font_antialiasing, true);
+ } else {
+ nsoption_set_bool(font_antialiasing, false);
+ }
+
GetAttr(INTEGER_Number,gow->objects[GID_OPTS_CACHE_MEM],(ULONG *)&nsoption_int(memory_cache_size));
nsoption_set_int(memory_cache_size, nsoption_int(memory_cache_size) * 1048576);
diff --git a/resources/FatMessages b/resources/FatMessages
index c391a41..80e7dbd 100644
--- a/resources/FatMessages
+++ b/resources/FatMessages
@@ -5296,6 +5296,11 @@ de.ami.ScreenPublic:Public Screen
fr.ami.ScreenPublic:Public screen
it.ami.ScreenPublic:Schermo pubblico
nl.ami.ScreenPublic:Public screen
+en.ami.SimpleRefresh:Simple refresh
+de.ami.SimpleRefresh:Simple refresh
+fr.ami.SimpleRefresh:Simple refresh
+it.ami.SimpleRefresh:Simple refresh
+nl.ami.SimpleRefresh:Simple refresh
en.all.Theme:Theme
de.all.Theme:Thema
fr.all.Theme:Theme
@@ -5364,6 +5369,26 @@ de.all.ScaleQuality:Skalieren hoher Qualität
fr.all.ScaleQuality:Higher quality scaling
it.all.ScaleQuality:Massima qualità di visualizzazione
nl.all.ScaleQuality:Higher quality scaling
+en.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+de.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+fr.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+it.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+nl.ami.DitherQuality:Dither quality (<= 8-bit modes only)
+en.ami.Low:Low
+de.ami.Low:Low
+fr.ami.Low:Low
+it.ami.Low:Low
+nl.ami.Low:Low
+en.ami.Medium:Medium
+de.ami.Medium:Medium
+fr.ami.Medium:Medium
+it.ami.Medium:Medium
+nl.ami.Medium:Medium
+en.ami.High:High
+de.ami.High:High
+fr.ami.High:High
+it.ami.High:High
+nl.ami.High:High
en.all.Animations:Animations
de.all.Animations:Animationen
fr.all.Animations:Animations
@@ -5475,6 +5500,11 @@ de.all.Pt:pt
fr.all.Pt:pt
it.all.Pt:pt
nl.all.Pt:pt
+en.ami.FontAntialiasing:Use anti-aliasing (when possible)
+de.ami.FontAntialiasing:Use anti-aliasing (when possible)
+fr.ami.FontAntialiasing:Use anti-aliasing (when possible)
+it.ami.FontAntialiasing:Use anti-aliasing (when possible)
+nl.ami.FontAntialiasing:Use anti-aliasing (when possible)
# Font scanning
en.ami.FontScanning:Scanning fonts...
--
NetSurf Browser
11 years
- 1
- 0