netsurf-commits February 2017

netsurf-commits@netsurf-browser.org

1 participants
94 discussions

netsurf-wiki: branch setup created. 3eac7ff5269b52ac322fb2328802df5ca517bc1b

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/3eac7ff5269b52ac... ...commit http://git.netsurf-browser.org/netsurf-wiki.git/commit/3eac7ff5269b52ac32... ...tree http://git.netsurf-browser.org/netsurf-wiki.git/tree/3eac7ff5269b52ac322f... The branch, setup has been created at 3eac7ff5269b52ac322fb2328802df5ca517bc1b (commit) - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf-wiki.git/commit/?id=3eac7ff5269b52... commit 3eac7ff5269b52ac322fb2328802df5ca517bc1b Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> Initial setup content diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b25c15b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/ikiwiki-bootstrap-theme/README.md b/ikiwiki-bootstrap-theme/README.md new file mode 100644 index 0000000..c3945be --- /dev/null +++ b/ikiwiki-bootstrap-theme/README.md @@ -0,0 +1,27 @@ +ikiwiki-bootstrap-theme +======================= + +Twitter bootstrap theme for ikiwiki + +Usage +----- + +``` +cd ~ +git clone git@github.com:ramseydsilva/ikiwiki-bootstrap-theme.git + +# edit wiki.setup and add +templatedir: ~/ikiwiki-bootstrap-theme + +# Recompile wiki +ikiwiki --setup wiki.setup + +# Install your own logo at /logo.png in your webroot +``` + +Issues +------ + +This theme is a WIP and has been flushed out only for the main pages/most commonly used options. If you notice that it breaks any particular page or feature, please report it [here] and we can fix it. + +[here]: https://github.com/ramseydsilva/ikiwiki-bootstrap-theme/issues diff --git a/ikiwiki-bootstrap-theme/aggregatepost.tmpl b/ikiwiki-bootstrap-theme/aggregatepost.tmpl new file mode 100644 index 0000000..a89ccfc --- /dev/null +++ b/ikiwiki-bootstrap-theme/aggregatepost.tmpl @@ -0,0 +1,19 @@ +<TMPL_VAR CONTENT> +<TMPL_LOOP TAGS> +[[!tag <TMPL_VAR TAG>]] +</TMPL_LOOP> +<TMPL_IF TITLE> +[[!meta title="<TMPL_VAR TITLE ESCAPE=HTML>"]] +</TMPL_IF> +<TMPL_IF PERMALINK> +[[!meta permalink="<TMPL_VAR PERMALINK ESCAPE=HTML>"]] +</TMPL_IF> +<TMPL_IF COPYRIGHT> +[[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]] +</TMPL_IF> +<TMPL_IF AUTHOR> +[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>: <TMPL_VAR AUTHOR ESCAPE=HTML>"]] +<TMPL_ELSE> +[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]] +</TMPL_IF> +[[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]] diff --git a/ikiwiki-bootstrap-theme/archivepage.tmpl b/ikiwiki-bootstrap-theme/archivepage.tmpl new file mode 100644 index 0000000..3e0bd9b --- /dev/null +++ b/ikiwiki-bootstrap-theme/archivepage.tmpl @@ -0,0 +1,19 @@ +<div class="archivepage"> +<TMPL_IF PERMALINK> +<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br /> +<TMPL_ELSE> +<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br /> +</TMPL_IF> +<span class="archivepagedate"> +Posted <TMPL_VAR CTIME> +<TMPL_IF AUTHOR> +by <span class="author"> +<TMPL_IF AUTHORURL> +<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a> +<TMPL_ELSE> +<TMPL_VAR AUTHOR> +</TMPL_IF> +</span> +</TMPL_IF> +</span> +</div> diff --git a/ikiwiki-bootstrap-theme/atomitem.tmpl b/ikiwiki-bootstrap-theme/atomitem.tmpl new file mode 100644 index 0000000..5b9d62a --- /dev/null +++ b/ikiwiki-bootstrap-theme/atomitem.tmpl @@ -0,0 +1,49 @@ +<entry> + <title><TMPL_VAR TITLE></title> +<TMPL_IF GUID> + <id><TMPL_VAR GUID></id> +<TMPL_ELSE> + <id><TMPL_VAR URL></id> +</TMPL_IF> + <link href="<TMPL_VAR PERMALINK>"/> +<TMPL_IF AUTHOR> + <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author> +</TMPL_IF> +<TMPL_IF COPYRIGHT> + <rights type="html" xml:lang="en"> +<TMPL_IF LICENSE> + <TMPL_VAR LICENSE ESCAPE=HTML> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> +<TMPL_ELSE> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> +</TMPL_IF> + </rights> +<TMPL_ELSE> +<TMPL_IF LICENSE> + <rights type="html" xml:lang="en"> + <TMPL_VAR LICENSE ESCAPE=HTML> + </rights> +</TMPL_IF> +</TMPL_IF> +<TMPL_IF CATEGORIES> +<TMPL_LOOP CATEGORIES> + <category term="<TMPL_VAR CATEGORY>" /> +</TMPL_LOOP> +</TMPL_IF> + <updated><TMPL_VAR MDATE_3339></updated> + <published><TMPL_VAR CDATE_3339></published> +<TMPL_IF ENCLOSURE> + <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" /> +</TMPL_IF> +<TMPL_UNLESS SIMPLEPODCAST> + <content type="html" xml:lang="en"> + <TMPL_VAR CONTENT ESCAPE=HTML> + </content> +</TMPL_UNLESS> +<TMPL_IF COMMENTSURL> + <link rel="replies" href="<TMPL_VAR COMMENTSURL>" type="text/html" /> +</TMPL_IF> +<TMPL_IF ATOMCOMMENTSURL> + <link rel="replies" href="<TMPL_VAR ATOMCOMMENTSURL>" type="application/atom+xml" /> +</TMPL_IF> +</entry> diff --git a/ikiwiki-bootstrap-theme/atompage.tmpl b/ikiwiki-bootstrap-theme/atompage.tmpl new file mode 100644 index 0000000..3cdd71d --- /dev/null +++ b/ikiwiki-bootstrap-theme/atompage.tmpl @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> + +<feed xmlns="http://www.w3.org/2005/Atom"> +<title><TMPL_VAR TITLE></title> +<link href="<TMPL_VAR PAGEURL>"/> +<link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/> +<author> +<TMPL_IF AUTHOR> +<name><TMPL_VAR AUTHOR></name> +<TMPL_ELSE> +<name><TMPL_VAR WIKINAME></name> +</TMPL_IF> +</author> +<TMPL_IF COPYRIGHT> +<rights type="html" xml:lang="en"> +<TMPL_IF LICENSE> + <TMPL_VAR LICENSE> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> +<TMPL_ELSE> + <TMPL_VAR COPYRIGHT ESCAPE=HTML> +</TMPL_IF> +</rights> +<TMPL_ELSE> +<TMPL_IF LICENSE> +<rights type="html"> + <TMPL_VAR LICENSE ESCAPE=HTML> +</rights> +</TMPL_IF> +</TMPL_IF> +<TMPL_IF GUID> +<id><TMPL_VAR GUID></id> +<TMPL_ELSE> +<id><TMPL_VAR PAGEURL></id> +</TMPL_IF> +<subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle> +<generator uri="http://ikiwiki.info/">ikiwiki</generator> +<updated><TMPL_VAR FEEDDATE></updated> +<TMPL_VAR CONTENT> +</feed> diff --git a/ikiwiki-bootstrap-theme/autoindex.tmpl b/ikiwiki-bootstrap-theme/autoindex.tmpl new file mode 100644 index 0000000..d5ec3b8 --- /dev/null +++ b/ikiwiki-bootstrap-theme/autoindex.tmpl @@ -0,0 +1 @@ +[[!map pages="<TMPL_VAR PAGE>/* and ! <TMPL_VAR PAGE>/*/*"]] diff --git a/ikiwiki-bootstrap-theme/autotag.tmpl b/ikiwiki-bootstrap-theme/autotag.tmpl new file mode 100644 index 0000000..9162e9e --- /dev/null +++ b/ikiwiki-bootstrap-theme/autotag.tmpl @@ -0,0 +1,4 @@ +[[!meta title="pages tagged <TMPL_VAR TAGNAME>"]] + +[[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes" +feedshow=10]] diff --git a/ikiwiki-bootstrap-theme/blogpost.tmpl b/ikiwiki-bootstrap-theme/blogpost.tmpl new file mode 100644 index 0000000..9e49c47 --- /dev/null +++ b/ikiwiki-bootstrap-theme/blogpost.tmpl @@ -0,0 +1,16 @@ +<form <TMPL_IF POSTFORMID>id="<TMPL_VAR POSTFORMID ESCAPE=HTML>"</TMPL_IF> action="<TMPL_VAR CGIURL>" method="get"> +<div class="blogform"> +<TMPL_IF RSSURL> +<a class="feedbutton" type="application/rss+xml" rel="alternate" title="<TMPL_VAR RSSDESC>" href="<TMPL_VAR RSSURL>">RSS</a> +</TMPL_IF> +<TMPL_IF ATOMURL> +<a class="feedbutton" type="application/atom+xml" rel="alternate" title="<TMPL_VAR ATOMDESC>" href="<TMPL_VAR ATOMURL>">Atom</a> +</TMPL_IF> +<input type="hidden" name="do" value="blog" /> +<input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>" /> +<input type="hidden" name="subpage" value="1" /> +<TMPL_VAR POSTFORMTEXT> +<input name="title" size="40" /> +<input type="submit" value="Edit" /> +</div> +</form> diff --git a/ikiwiki-bootstrap-theme/calendarmonth.tmpl b/ikiwiki-bootstrap-theme/calendarmonth.tmpl new file mode 100644 index 0000000..23cd954 --- /dev/null +++ b/ikiwiki-bootstrap-theme/calendarmonth.tmpl @@ -0,0 +1,5 @@ +[[!sidebar content=""" +[[!calendar type=month month=<TMPL_VAR MONTH> year=<TMPL_VAR YEAR> pages="<TMPL_VAR PAGESPEC>"]] +"""]] + +[[!inline pages="creation_month(<TMPL_VAR MONTH>) and creation_year(<TMPL_VAR YEAR>) and <TMPL_VAR PAGESPEC>" show=0 feeds=no reverse=yes]] diff --git a/ikiwiki-bootstrap-theme/calendaryear.tmpl b/ikiwiki-bootstrap-theme/calendaryear.tmpl new file mode 100644 index 0000000..714bd6d --- /dev/null +++ b/ikiwiki-bootstrap-theme/calendaryear.tmpl @@ -0,0 +1 @@ +[[!calendar type=year year=<TMPL_VAR YEAR> pages="<TMPL_VAR PAGESPEC>"]] diff --git a/ikiwiki-bootstrap-theme/change.tmpl b/ikiwiki-bootstrap-theme/change.tmpl new file mode 100644 index 0000000..c4ef9c7 --- /dev/null +++ b/ikiwiki-bootstrap-theme/change.tmpl @@ -0,0 +1,72 @@ +[[!meta author="""<TMPL_VAR AUTHOR>"""]] +<TMPL_IF AUTHORURL> +[[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]] +</TMPL_IF> +[[!meta title="""change to<TMPL_LOOP PAGES> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]] +<TMPL_IF PERMALINK> +[[!meta permalink="<TMPL_VAR PERMALINK>"]] +</TMPL_IF> + +<td> + <div class="changelog"> + <TMPL_LOOP MESSAGE> + <TMPL_IF LINE> + <TMPL_VAR LINE><br /> + </TMPL_IF> + </TMPL_LOOP> + </div> +  +</td> + +<td> + <TMPL_LOOP PAGES> + <TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK> + <TMPL_ELSE><TMPL_VAR LINK></TMPL_IF> + </TMPL_LOOP> +</td> +<td> + <TMPL_IF AUTHORURL> + <a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a> + <TMPL_ELSE> + <TMPL_VAR USER> + </TMPL_IF> +</td> +<td><TMPL_VAR COMMITTYPE></td> +<td><TMPL_VAR COMMITDATE></td> +<td> + + <TMPL_UNLESS HAS_DIFFURL> + <TMPL_IF DIFF> + <a href="#diff-<TMPL_VAR REV>" class="toggle" title="diff" rel="nofollow"> + <i class="glyphicon glyphicon-eye-open"></i> + </a> + </TMPL_IF> + </TMPL_UNLESS> + + + <TMPL_IF REVERTURL> + <span class="revert"> + <a href="<TMPL_VAR REVERTURL>" title="revert" rel="nofollow"> + <i class="glyphicon glyphicon-remove-circle"></i> + </a> + </span> + </TMPL_IF> +</td> + + + <TMPL_IF DIFF> + </tr> + <tr> + <td colspan="6"> + <TMPL_IF HAS_DIFFURL> + <div class="diff"> + <TMPL_ELSE> + <div class="toggleable" id="diff-<TMPL_VAR REV>"> + </TMPL_IF> + <pre> + <TMPL_VAR DIFF> + </pre> + </div> + </td> + </TMPL_IF> + diff --git a/ikiwiki-bootstrap-theme/comment.tmpl b/ikiwiki-bootstrap-theme/comment.tmpl new file mode 100644 index 0000000..c16ca7c --- /dev/null +++ b/ikiwiki-bootstrap-theme/comment.tmpl @@ -0,0 +1,66 @@ +<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR COMMENTID>"> +<TMPL_ELSE><div class="comment" id="<TMPL_VAR COMMENTID>"></TMPL_IF> + +<TMPL_IF COMMENTAUTHORAVATAR><div class="comment-avatar"> +<img src="<TMPL_VAR COMMENTAUTHORAVATAR>" alt="" /> +</div></TMPL_IF> + +<TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF> +<TMPL_IF PERMALINK> +<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a> +<TMPL_ELSE> +<TMPL_VAR TITLE> +</TMPL_IF> +<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF> + +<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF> +<TMPL_VAR CONTENT> +<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> + +<TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF> +<TMPL_IF COMMENTUSER> +Comment by +<TMPL_IF COMMENTOPENID> +<span class="author" title="OpenID"> +<a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a> +</span> +<TMPL_ELSE> +<span class="author" title="Signed in"> +<TMPL_IF COMMENTAUTHORURL> +<a href="<TMPL_VAR COMMENTAUTHORURL>"><TMPL_VAR COMMENTAUTHOR></a> +<TMPL_ELSE> +<TMPL_VAR COMMENTAUTHOR> +</TMPL_IF> +</span> +</TMPL_IF> +<TMPL_ELSE> +<TMPL_IF AUTHOR> +Comment by +<TMPL_IF COMMENTIP> +<span class="author" title="Unauthenticated, from <TMPL_VAR COMMENTIP>"> +<TMPL_ELSE> +<span class="author" title="Unauthenticated, from unknown IP address"> +</TMPL_IF> +<TMPL_IF AUTHORURL> +<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a> +<TMPL_ELSE> +<TMPL_VAR AUTHOR> +</TMPL_IF> +</TMPL_IF> +</span> +</TMPL_IF> +— <TMPL_VAR CTIME> +<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF> + +<TMPL_IF HAVE_ACTIONS> +<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF> +<ul> +<TMPL_IF REMOVEURL> +<li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li> +</TMPL_IF> +</ul> +<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> +</TMPL_IF> + +<div style="clear: both"></div> +<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF> diff --git a/ikiwiki-bootstrap-theme/commentmoderation.tmpl b/ikiwiki-bootstrap-theme/commentmoderation.tmpl new file mode 100644 index 0000000..dfa63c2 --- /dev/null +++ b/ikiwiki-bootstrap-theme/commentmoderation.tmpl @@ -0,0 +1,32 @@ +<TMPL_IF COMMENTS> +<br /> +<form action="<TMPL_VAR CGIURL>" method="post"> +<input type="hidden" name="do" value="commentmoderation" /> +<input type="hidden" name="sid" value="<TMPL_VAR SID>" /> +<input type="submit" value="Submit" /> +<input id="rejectalldefer" type="checkbox" name="rejectalldefer" value="1" /> +<label for="rejectalldefer">Reject all comments marked <em>Defer</em></label> +<br /> +<TMPL_LOOP COMMENTS> +<div> +<div> +<TMPL_VAR VIEW> +</div> +<input id="defer_<TMPL_VAR ID>" type="radio" value="Defer" name="<TMPL_VAR ID>" checked="checked" /> +<label for="defer_<TMPL_VAR ID>">Defer</label> +<input id="dccept_<TMPL_VAR ID>" type="radio" value="Accept" name="<TMPL_VAR ID>" /> +<label for="dccept_<TMPL_VAR ID>">Accept</label> +<input id="reject_<TMPL_VAR ID>" type="radio" value="Reject" name="<TMPL_VAR ID>" /> +<label for="reject_<TMPL_VAR ID>">Reject</label> +</div> +<br /> +</TMPL_LOOP> +<input type="submit" value="Submit" /> +<input id="rejectalldefer2" type="checkbox" name="rejectalldefer" value="1" /> +<label for="rejectalldefer2">Reject all comments marked <em>Defer</em></label> +</form> +<TMPL_ELSE> +<p> +No comments need moderation at this time. +</p> +</TMPL_IF> diff --git a/ikiwiki-bootstrap-theme/editcomment.tmpl b/ikiwiki-bootstrap-theme/editcomment.tmpl new file mode 100644 index 0000000..e177db9 --- /dev/null +++ b/ikiwiki-bootstrap-theme/editcomment.tmpl @@ -0,0 +1,43 @@ +<div class="editcomment"> +<TMPL_VAR MESSAGE> +<br /> +<TMPL_VAR FORM-START> +<TMPL_VAR FIELD-DO> +<TMPL_VAR FIELD-SID> +<TMPL_VAR FIELD-PAGE> +<TMPL_UNLESS NAME=USERNAME> +<TMPL_IF NAME=ALLOWAUTHOR> +<label for="author" class="block">Name:</label> +<TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>) +<br/> +<label for="url" class="block">Website:</label> +<TMPL_VAR NAME=FIELD-URL> (optional) +<br /> +<label for="url" class="block">Email:</label> +<TMPL_VAR NAME=FIELD-EMAIL> <TMPL_VAR FIELD-ANONSUBSCRIBE> +<br /> +<TMPL_ELSE> +(You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?) +<br /> +</TMPL_IF> +</TMPL_UNLESS> +<label for="subject" class="block">Subject:</label> +<TMPL_VAR FIELD-SUBJECT><br /> +<label for="editcontent" class="block">Comment:</label> +<TMPL_VAR FIELD-EDITCONTENT><br /> +<TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK> +<TMPL_VAR FIELD-SUBSCRIBE><br /> +<TMPL_VAR NAME="FORM-END"> +<TMPL_VAR WMD_PREVIEW> + +<TMPL_IF NAME="PAGE_PREVIEW"> +<hr /> +<div class="header"> +<span>Comment preview:</span> +</div> +<div id="preview"> +<TMPL_VAR PAGE_PREVIEW> +</div> +</TMPL_IF> + +</div> diff --git a/ikiwiki-bootstrap-theme/editconflict.tmpl b/ikiwiki-bootstrap-theme/editconflict.tmpl new file mode 100644 index 0000000..1252033 --- /dev/null +++ b/ikiwiki-bootstrap-theme/editconflict.tmpl @@ -0,0 +1,7 @@ +<p class="error"> +<b>Your changes conflict with other changes made to the page.</b> +</p> +<p> +Conflict markers have been inserted into the page content. Reconcile the +conflict and commit again to save your changes. +</p> diff --git a/ikiwiki-bootstrap-theme/editcreationconflict.tmpl b/ikiwiki-bootstrap-theme/editcreationconflict.tmpl new file mode 100644 index 0000000..c99102f --- /dev/null +++ b/ikiwiki-bootstrap-theme/editcreationconflict.tmpl @@ -0,0 +1,9 @@ +<p class="error"> +<b>While you were creating this page, someone else independently created a page +with the same name.</b> +</p> +<p> +The edit box below contains the page's current content, followed by the +content you entered previously, to allow you to merge the two +together before saving. +</p> diff --git a/ikiwiki-bootstrap-theme/editfailedsave.tmpl b/ikiwiki-bootstrap-theme/editfailedsave.tmpl new file mode 100644 index 0000000..5184f7d --- /dev/null +++ b/ikiwiki-bootstrap-theme/editfailedsave.tmpl @@ -0,0 +1,10 @@ +<p class="error"> +<b>Failed to save your changes.</b> +</p> +<p> +Your changes were not able to be saved to disk. The system gave the error: +<blockquote> +<TMPL_VAR ERROR_MESSAGE> +</blockquote> +Your changes are preserved below, and you can try again to save them. +</p> diff --git a/ikiwiki-bootstrap-theme/editpage.tmpl b/ikiwiki-bootstrap-theme/editpage.tmpl new file mode 100644 index 0000000..b30c892 --- /dev/null +++ b/ikiwiki-bootstrap-theme/editpage.tmpl @@ -0,0 +1,98 @@ +<TMPL_VAR JAVASCRIPT> +<TMPL_VAR MESSAGE> +<br /> +<TMPL_VAR FORM-START> +<TMPL_VAR FIELD-DO> +<TMPL_VAR FIELD-SID> +<TMPL_VAR FIELD-FROM> +<TMPL_VAR FIELD-RCSINFO> +<TMPL_VAR FIELD-NEWFILE> +<TMPL_IF NAME="PAGE_SELECT"> +<label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE> +<label for="type" class="inline">Page type:</label><TMPL_VAR FIELD-TYPE> +<TMPL_ELSE> +<TMPL_VAR FIELD-PAGE> +<TMPL_VAR FIELD-TYPE> +</TMPL_IF> +<div class="editcontentdiv"> + <TMPL_VAR FIELD-EDITCONTENT> +</div> +<br/> +<TMPL_IF NAME="CAN_COMMIT"> + <TMPL_VAR FIELD-EDITMESSAGE> + <br/> +</TMPL_IF> + +<TMPL_VAR FORM-SUBMIT> + +<TMPL_VAR HELPONFORMATTINGLINK> +<TMPL_IF NAME="FIELD-ATTACHMENT"> +<a class="toggle" href="#attachments">Attachments</a> +</TMPL_IF> +<TMPL_VAR FIELD-SUBSCRIBE> +<TMPL_IF NAME="FIELD-ATTACHMENT"> +<div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments"> +<div id="fileupload"> +<script> +$(function () { + $('#fileupload').fileupload(); +}); // initialize upload widget +</script> +<script id="template-upload" type="text/x-jquery-tmpl"> + <tr class="template-upload{{if error}} ui-state-error{{/if}}"> + <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td> + {{if error}} + <td class="error" colspan="2">failed!</td> + {{else}} + <td class="progress" colspan="2"><div></div></td> + <td class="start"><button>Start</button></td> + {{/if}} + <td class="cancel"><button>Cancel</button></td> + </tr> +</script> +<script id="template-download" type="text/x-jquery-tmpl"> + <tr class="template-download{{if error}} ui-state-error{{/if}}"> + <td><input type="checkbox" checked name="attachment_select" value="${name}" />${name}</td> + <td>${humansize}</td> + {{if error}} + <td class="error" colspan="2">failed!</td> + {{else}} + <td>${stored_msg}</td> + {{/if}} + </tr> +</script> +<div class="fileupload-content"> +<table class="files"> +<TMPL_LOOP NAME="ATTACHMENT_LIST"> +<tr><td><input type="checkbox" name="attachment_select" value="<TMPL_VAR NAME ESCAPE="HTML">" /><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr> +</TMPL_LOOP> +</table> +</div> +<TMPL_VAR FIELD-ATTACHMENT> +<noscript><TMPL_VAR FIELD-UPLOAD></noscript> +<TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE> +</div> +</div> +</TMPL_IF> +<TMPL_VAR FORM-END> +<TMPL_VAR WMD_PREVIEW> +<TMPL_IF NAME="PAGE_PREVIEW"> +<hr /> +<div class="header"> +<span>Page preview:</span> +</div> +<div id="preview"> +<TMPL_VAR PAGE_PREVIEW> +</div> +</TMPL_IF> +<TMPL_IF NAME="PAGE_DIFF"> +<hr /> +<div class="header"> +<span>Diff:</span> +</div> +<div id="diff"> +<TMPL_VAR PAGE_DIFF> +</div> +</TMPL_IF> + +<br/><br/><br/><br/> diff --git a/ikiwiki-bootstrap-theme/editpagegone.tmpl b/ikiwiki-bootstrap-theme/editpagegone.tmpl new file mode 100644 index 0000000..2eed03a --- /dev/null +++ b/ikiwiki-bootstrap-theme/editpagegone.tmpl @@ -0,0 +1,7 @@ +<p class="error"> +<b>The page you were editing has disappeared.</b> +</p> +<p> +Perhaps someone else has deleted it or moved it. If you want to recreate +this page with your text, click "Save Page" again. +</p> diff --git a/ikiwiki-bootstrap-theme/feedlink.tmpl b/ikiwiki-bootstrap-theme/feedlink.tmpl new file mode 100644 index 0000000..6f8c478 --- /dev/null +++ b/ikiwiki-bootstrap-theme/feedlink.tmpl @@ -0,0 +1,9 @@ +<div <TMPL_IF ID>id="<TMPL_VAR ID ESCAPE=HTML>"</TMPL_IF> class="feedlink text-right"> + <TMPL_IF RSSURL> + <a class="label label-warning feedbutton" type="application/rss+xml" rel="alternate" title="<TMPL_VAR RSSDESC>" href="<TMPL_VAR RSSURL>">RSS</a> + </TMPL_IF> + <TMPL_IF ATOMURL> + <a class="label label-primary feedbutton" type="application/atom+xml" rel="alternate" title="<TMPL_VAR ATOMDESC>" href="<TMPL_VAR ATOMURL>">Atom</a> + </TMPL_IF> +</div> +<div class="spacer"></div> diff --git a/ikiwiki-bootstrap-theme/googleform.tmpl b/ikiwiki-bootstrap-theme/googleform.tmpl new file mode 100644 index 0000000..9468e06 --- /dev/null +++ b/ikiwiki-bootstrap-theme/googleform.tmpl @@ -0,0 +1,8 @@ + +<form method="get" action="http://www.google.com/search" id="searchform"> + <div> + <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" /> + <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text" + <TMPL_IF HTML5>placeholder="search"</TMPL_IF> /> + </div> +</form> diff --git a/ikiwiki-bootstrap-theme/imgpage.tmpl b/ikiwiki-bootstrap-theme/imgpage.tmpl new file mode 100644 index 0000000..b2e0284 --- /dev/null +++ b/ikiwiki-bootstrap-theme/imgpage.tmpl @@ -0,0 +1,6 @@ +# <TMPL_VAR NAME=alt> + +<img src="<TMPL_VAR NAME=imglink>" width="<TMPL_VAR NAME=width>" + height="<TMPL_VAR NAME=height>" alt="<TMPL_VAR NAME=alt>" /> +<br /> +<TMPL_LOOP NAME=sizes>[[<TMPL_VAR NAME=dimensions>|<TMPL_VAR NAME=htmllink>]] </TMPL_LOOP> diff --git a/ikiwiki-bootstrap-theme/inlinepage.tmpl b/ikiwiki-bootstrap-theme/inlinepage.tmpl new file mode 100644 index 0000000..ed82a00 --- /dev/null +++ b/ikiwiki-bootstrap-theme/inlinepage.tmpl @@ -0,0 +1,78 @@ +<TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF> + +<TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF> +<TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF> +<TMPL_IF PERMALINK> +<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a> +<TMPL_ELSE> +<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a> +</TMPL_IF> +<TMPL_IF AUTHOR> +<span class="author"> +<TMPL_IF AUTHORURL> +<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a> +<TMPL_ELSE> +<TMPL_VAR AUTHOR> +</TMPL_IF> +</span> +</TMPL_IF> +<TMPL_IF HTML5></header><TMPL_ELSE></span></TMPL_IF> +<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> + +<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF> +<TMPL_VAR CONTENT> +<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> + +<TMPL_IF ENCLOSURE> +<TMPL_IF HTML5><section id="inlineenclosure"><TMPL_ELSE><div id="inlineenclosure"></TMPL_IF> +<a href="<TMPL_VAR ENCLOSURE>">Download</a> +<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> +</TMPL_IF> + +<TMPL_IF HTML5><footer class="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF> + +<span class="pagedate"> +Posted <TMPL_VAR CTIME> +</span> + +<TMPL_IF TAGS> +<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF> +Tags: +<TMPL_LOOP TAGS> +<TMPL_VAR LINK> +</TMPL_LOOP> +<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF> +</TMPL_IF> + +<TMPL_IF COPYRIGHT> +<div class="pagecopyright"> +<TMPL_VAR COPYRIGHT> +</div> +</TMPL_IF> + +<TMPL_IF LICENSE> +<div class="pagelicense"> +License: <TMPL_VAR LICENSE> +</div> +</TMPL_IF> + +<TMPL_IF HAVE_ACTIONS> +<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF> +<ul> +<TMPL_IF EDITURL> +<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li> +</TMPL_IF> +<TMPL_IF COMMENTSLINK> +<li><TMPL_VAR COMMENTSLINK></li> +<TMPL_ELSE> +<TMPL_IF DISCUSSIONLINK> +<li><TMPL_VAR DISCUSSIONLINK></li> +</TMPL_IF> +</TMPL_IF> +</ul> +<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> +</TMPL_IF> + +<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF> + +<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF> diff --git a/ikiwiki-bootstrap-theme/local.css b/ikiwiki-bootstrap-theme/local.css new file mode 100644 index 0000000..b5f3579 --- /dev/null +++ b/ikiwiki-bootstrap-theme/local.css @@ -0,0 +1,59 @@ +body { + font-family: Verdana, Arial; +} + +h1 { + font-size: 24px; +} + +h2 { + font-size: 18px; +} + +h3 { + font-size: 17px; +} + +header nav { + padding: 40px 0 10px 0; +} + +.actions.navbar-default { + border: none; + background: none; +} + +.wiki-logo { + margin-top: -50px; +} + +.title { + text-transform: capitalize; +} + +.navbar-nav>li>span { + color: rgb(119, 119, 119); + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25); +} + +@media (min-width: 768px) +.navbar-nav>li>span { + padding-top: 15px; + padding-bottom: 15px; +} + +.nav>li>span { + line-height: 20px; + position: relative; + display: block; + padding: 15px 15px; +} + +.spacer { + height: 10px; + padding: 10px 0; +} + +.recentchanges-table { + table-layout: fixed; +} diff --git a/ikiwiki-bootstrap-theme/microblog.tmpl b/ikiwiki-bootstrap-theme/microblog.tmpl new file mode 100644 index 0000000..e22d65c --- /dev/null +++ b/ikiwiki-bootstrap-theme/microblog.tmpl @@ -0,0 +1,22 @@ +<div class="microblog"> + +<div class="inlinecontent"> +<TMPL_VAR CONTENT> +</div> + +<div class="microblog-header"> + +<TMPL_IF AUTHOR> +<span class="author"> +<TMPL_IF AUTHORURL> +<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a> +<TMPL_ELSE> +<TMPL_VAR AUTHOR> +</TMPL_IF> +</span> +</TMPL_IF> + +— <TMPL_VAR CTIME> + +</div>  +</div>  diff --git a/ikiwiki-bootstrap-theme/notifyemail.tmpl b/ikiwiki-bootstrap-theme/notifyemail.tmpl new file mode 100644 index 0000000..5087668 --- /dev/null +++ b/ikiwiki-bootstrap-theme/notifyemail.tmpl @@ -0,0 +1,9 @@ +A <TMPL_IF NAME=ISCOMMENT>comment has been posted at<TMPL_ELSE>change has been made to</TMPL_IF> <TMPL_VAR URL> +<TMPL_IF NAME=SHOWCONTENT> +---- + +<TMPL_VAR CONTENT> + +---- +</TMPL_IF> +To stop these notifications, visit <TMPL_VAR PREFSURL> diff --git a/ikiwiki-bootstrap-theme/openid-selector.tmpl b/ikiwiki-bootstrap-theme/openid-selector.tmpl new file mode 100644 index 0000000..b6be272 --- /dev/null +++ b/ikiwiki-bootstrap-theme/openid-selector.tmpl @@ -0,0 +1,43 @@ +<script type="text/javascript" src="ikiwiki/jquery.min.js"></script> +<script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script> +<script type="text/javascript"> +$(document).ready(function() { + openid.init('openid_identifier','<TMPL_IF NONOPENIDFORM>nonopenidform</TMPL_IF>'); +}); +</script> + +<noscript> +<h2>OpenID:</h2> +</noscript> + +<form action="<TMPL_VAR CGIURL>" method="get" id="openid_form"> + <fieldset> + <script> + $('fieldset').append("<legend>Select your account provider</legend>"); + </script> + + <input type="hidden" name="do" value="signin" /> + <input type="hidden" name="action" value="verify" /> + <div id="openid_choice"> + <div id="openid_btns"></div> + </div> + <div id="openid_input_area"> + <label for="openid_identifier" class="block">Enter your OpenID:</label> + <input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR OPENID_URL>"/> + <input id="openid_submit" type="submit" value="Login"/> + </div> + <TMPL_IF OPENID_ERROR> + <div class="error"><TMPL_VAR OPENID_ERROR></div> + </TMPL_IF> + </fieldset> +</form> + +<div id="nonopenidform"> +<TMPL_IF NONOPENIDFORM> +<br /> +<noscript> +<h2>Other:</h2> +</noscript> +</TMPL_IF> +<TMPL_VAR NONOPENIDFORM> +</div> diff --git a/ikiwiki-bootstrap-theme/page.tmpl b/ikiwiki-bootstrap-theme/page.tmpl new file mode 100644 index 0000000..41e5086 --- /dev/null +++ b/ikiwiki-bootstrap-theme/page.tmpl @@ -0,0 +1,288 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <TMPL_IF DYNAMIC> + <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE> + <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF> + </TMPL_IF> + </TMPL_IF> + + <meta charset="utf-8" /> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + + <title><TMPL_VAR TITLE></title> + <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" /> + +  + <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css"> + +  + <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css"> + +  + <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> + <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script> + + <TMPL_IF LOCAL_CSS> + <link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" /> + <TMPL_ELSE> + <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" /> + </TMPL_IF> + + <TMPL_UNLESS DYNAMIC> + <TMPL_IF EDITURL> + <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" /> + </TMPL_IF> + <TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF> + <TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF> + <TMPL_IF META><TMPL_VAR META></TMPL_IF> + <TMPL_LOOP TRAILLOOP> + <TMPL_IF PREVPAGE> + <link rel="prev" href="<TMPL_VAR PREVURL>" title="<TMPL_VAR PREVTITLE>" /> + </TMPL_IF> + <link rel="up" href="<TMPL_VAR TRAILURL>" title="<TMPL_VAR TRAILTITLE>" /> + <TMPL_IF NEXTPAGE> + <link rel="next" href="<TMPL_VAR NEXTURL>" title="<TMPL_VAR NEXTTITLE>" /> + </TMPL_IF> + </TMPL_LOOP> + </TMPL_UNLESS> +</head> +<body> + + + +<div class="container"> + <div class="row"><div class="col-md-12"> + + <article class="page"> + <section class="pageheader"> + + <nav class="actions navbar navbar-default" role="navigation"> + <div class="container"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + </div> + + <span class="navbar-brand"> + <TMPL_VAR TITLE> + <TMPL_IF ISTRANSLATION> +  (<TMPL_VAR PERCENTTRANSLATED>%) + </TMPL_IF> + </span> + + <div class="collapse navbar-collapse navbar-right" id="bs-example-navbar-collapse-1"> + <TMPL_IF HAVE_ACTIONS> + <ul class="nav navbar-nav"> + <TMPL_IF EDITURL> + <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li> + </TMPL_IF> + <TMPL_IF RECENTCHANGESURL> + <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li> + </TMPL_IF> + <TMPL_IF HISTORYURL> + <li><a href="<TMPL_VAR HISTORYURL>">History</a></li> + </TMPL_IF> + <TMPL_IF GETSOURCEURL> + <li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li> + </TMPL_IF> + <TMPL_IF PREFSURL> + <li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li> + </TMPL_IF> + <TMPL_IF ACTIONS> + <TMPL_LOOP ACTIONS> + <li><TMPL_VAR ACTION></li> + </TMPL_LOOP> + </TMPL_IF> + <TMPL_IF COMMENTSLINK> + <li><TMPL_VAR COMMENTSLINK></li> + <TMPL_ELSE> + <TMPL_IF DISCUSSIONLINK> + <li><TMPL_VAR DISCUSSIONLINK></li> + </TMPL_IF> + </TMPL_IF> + </ul> + </TMPL_IF> + + <TMPL_UNLESS DYNAMIC> + <TMPL_IF SEARCHFORM> + <TMPL_VAR SEARCHFORM> + </TMPL_IF> + </TMPL_UNLESS> + </div> + </div> + </nav> + + <TMPL_IF PARENTLINKS> + <ol class="breadcrumb"> + <TMPL_LOOP PARENTLINKS> + <li class="parentlinks"> + <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a> + </li> + </TMPL_LOOP> + <li class="active"><TMPL_VAR TITLE></li> + </ol> + </TMPL_IF> + + <TMPL_IF OTHERLANGUAGES> + <TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF> + <ul> + <TMPL_LOOP OTHERLANGUAGES> + <li> + <a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a> + <TMPL_IF MASTER> + (master) + <TMPL_ELSE> +  (<TMPL_VAR PERCENT>%) + </TMPL_IF> + </li> + </TMPL_LOOP> + </ul> + <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> + </TMPL_IF> + + <TMPL_UNLESS DYNAMIC> + <TMPL_VAR TRAILS> + </TMPL_UNLESS> + + </section> + </div></div> + <div class="row"><div class="col-md-10"> + <div id="pagebody"> + + <section id="content"> + <TMPL_VAR CONTENT> + </section> + + <TMPL_IF ENCLOSURE> + <TMPL_IF HTML5><section id="enclosure"><TMPL_ELSE><div id="enclosure"></TMPL_IF> + <a href="<TMPL_VAR ENCLOSURE>">Download</a> + <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> + </TMPL_IF> + + <TMPL_UNLESS DYNAMIC> + <TMPL_IF COMMENTS> + <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF> + <TMPL_VAR COMMENTS> + <TMPL_IF ADDCOMMENTURL> + <div class="addcomment"> + <a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a> + </div> + <TMPL_ELSE> + <div class="addcomment">Comments on this page are closed.</div> + </TMPL_IF> + <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> + </TMPL_IF> + </TMPL_UNLESS> + + </div> + </div><div class="col-md-2"> + <TMPL_UNLESS DYNAMIC> + <TMPL_IF SIDEBAR> + <TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF> + <TMPL_VAR SIDEBAR> + <TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF> + </TMPL_IF> + </TMPL_UNLESS> + </div></div> + <div class="row"><div class="col-md-12"> + + <footer id="footer" class="pagefooter"> + <TMPL_UNLESS DYNAMIC> + <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF> + + <TMPL_VAR TRAILS> + + <TMPL_IF TAGS> + <TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF> + Tags: + <TMPL_LOOP TAGS> + <TMPL_VAR LINK> + </TMPL_LOOP> + <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> + </TMPL_IF> + + <TMPL_IF BACKLINKS> + <TMPL_IF HTML5><nav id="backlinks"><TMPL_ELSE><div id="backlinks"></TMPL_IF> + Links: + <TMPL_LOOP BACKLINKS> + <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a> + </TMPL_LOOP> + <TMPL_IF MORE_BACKLINKS> + <span class="popup">... + <span class="balloon"> + <TMPL_LOOP MORE_BACKLINKS> + <a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a> + </TMPL_LOOP> + </span> + </span> + </TMPL_IF> + <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> + </TMPL_IF> + + <TMPL_IF COPYRIGHT> + <div class="pagecopyright"> + <a name="pagecopyright"></a> + <TMPL_VAR COPYRIGHT> + </div> + </TMPL_IF> + + <TMPL_IF LICENSE> + <div class="pagelicense"> + <a name="pagelicense"></a> + License: <TMPL_VAR LICENSE> + </div> + </TMPL_IF> + + <div class="pagedate"> + Last edited <TMPL_VAR MTIME> +  + </div> + + <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> + + <br/><br/><br/><br/> + + <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons Licence" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/80x15.png" /></a><br />The content of this site is under the <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a> unless otherwise stated.<br /> + <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons Licence" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/80x15.png" /></a><br />The artwork on this site is copyright 2017 <a href="http://www.maxinegreen.co.uk/">Maxine Green</a> and is provided under the <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.<br /> +For the community guidelines, please see <a href="https://www.gitano.org.uk/covenant/">The Gitano Community Covenant</a>. + + <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF> + </TMPL_UNLESS> +  + </footer> + + </article> + + </div></div> +</div> + +<script> +$(function () { + $('input[name="_submit"]').addClass('btn btn-default'); + $('textarea, input[type="text"]').addClass('form-control'); + $('.toc').addClass('panel-body').wrap('<div class="panel panel-default"></div>') + .parent().prepend('<div class="panel-heading"><div class="panel-title">Table of Contents</div></div>'); +}); +</script> + + +</body> +</html> diff --git a/ikiwiki-bootstrap-theme/passwordmail.tmpl b/ikiwiki-bootstrap-theme/passwordmail.tmpl new file mode 100644 index 0000000..aa8a68c --- /dev/null +++ b/ikiwiki-bootstrap-theme/passwordmail.tmpl @@ -0,0 +1,15 @@ +Someone[1], possibly you, requested that the password for +<TMPL_VAR USER_NAME> on <TMPL_VAR WIKINAME>[2] be reset. + +To change your password, visit the following url, and enter a new password: + +<TMPL_VAR PASSWORDURL> + +This url can only be used once to change your password, and it will also +stop working the next time you successfully log in. + +-- +ikiwiki + +[1] Their IP address was <TMPL_VAR REMOTE_ADDR> +[2] Located at <TMPL_VAR WIKIURL> diff --git a/ikiwiki-bootstrap-theme/pocreatepage.tmpl b/ikiwiki-bootstrap-theme/pocreatepage.tmpl new file mode 100644 index 0000000..f22ee50 --- /dev/null +++ b/ikiwiki-bootstrap-theme/pocreatepage.tmpl @@ -0,0 +1,3 @@ +<p> +<b>WARNING</b> this page must be written in <TMPL_VAR LANG>. +</p> diff --git a/ikiwiki-bootstrap-theme/recentchanges.tmpl b/ikiwiki-bootstrap-theme/recentchanges.tmpl new file mode 100644 index 0000000..6099d1b --- /dev/null +++ b/ikiwiki-bootstrap-theme/recentchanges.tmpl @@ -0,0 +1,23 @@ +<TMPL_IF FIRST> +<div id="change-<TMPL_VAR REV>" class="metadata table-responsive"> + <table class="table table-bordered recentchanges-table"> + <thead> + <tr> + <th width="25%">Message</th> + <th width="25%">Changed pages</th> + <th width="10%">Changed by</th> + <th width="10%">Commit type</th> + <th width="20%">Date</th> + <th width="10%">Actions</th> + </tr> + </thead> + <tbody> +</TMPL_IF> + <tr> + <TMPL_VAR CONTENT> + </tr> +<TMPL_IF LAST> + </tbody> + </table> +</div> +</TMPL_IF> diff --git a/ikiwiki-bootstrap-theme/renamesummary.tmpl b/ikiwiki-bootstrap-theme/renamesummary.tmpl new file mode 100644 index 0000000..7a8dc92 --- /dev/null +++ b/ikiwiki-bootstrap-theme/renamesummary.tmpl @@ -0,0 +1,26 @@ +<TMPL_IF ERROR> +<p> +<b>Failed to rename <TMPL_VAR SRC> to <TMPL_VAR DEST>: </b> +<TMPL_VAR ERROR> +</p> +<TMPL_ELSE> +<p> +<b>Successfully renamed <TMPL_VAR SRC> to <TMPL_VAR DEST>.</b> +</p> +<p> +<TMPL_IF FIXEDLINKS> +The following pages have been automatically modified to update their links to <TMPL_VAR DEST>: +<ul> +<TMPL_LOOP FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP> +</ul> +</TMPL_IF> +<TMPL_IF BROKENLINKS_CHECKED> +<TMPL_IF BROKENLINKS> +The following pages still link to <TMPL_VAR SRC>: +<ul> +<TMPL_LOOP BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP> +</ul> +</TMPL_IF> +</TMPL_IF> +</p> +</TMPL_IF> diff --git a/ikiwiki-bootstrap-theme/revert.tmpl b/ikiwiki-bootstrap-theme/revert.tmpl new file mode 100644 index 0000000..0de3281 --- /dev/null +++ b/ikiwiki-bootstrap-theme/revert.tmpl @@ -0,0 +1,21 @@ +<TMPL_VAR FORM-START> +<div> + <TMPL_VAR FIELD-DO> + <TMPL_VAR FIELD-SID> + <TMPL_VAR FIELD-REV> +<label for="revertmessage" class="block">Optional comment about this change:</label> + <TMPL_VAR FIELD-REVERTMESSAGE> +</div> +<div class="revert buttons"> +<TMPL_VAR form-submit> +<TMPL_VAR form-cancel> +</div> +<TMPL_VAR FORM-END> +<br \> +<div class="header"> +<span>Diff being reverted:</span> +</div> +<div id="diff"> +<pre> +<TMPL_VAR diff> +</pre> diff --git a/ikiwiki-bootstrap-theme/rssitem.tmpl b/ikiwiki-bootstrap-theme/rssitem.tmpl new file mode 100644 index 0000000..bb03ca5 --- /dev/null +++ b/ikiwiki-bootstrap-theme/rssitem.tmpl @@ -0,0 +1,28 @@ +<item> + <title><TMPL_VAR TITLE></title> +<TMPL_IF GUID> + <guid isPermaLink="false"><TMPL_VAR GUID></guid> +<TMPL_ELSE> + <guid isPermaLink="false"><TMPL_VAR URL></guid> +</TMPL_IF> + <link><TMPL_VAR PERMALINK></link> +<TMPL_IF AUTHOR> + <dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc:creator> +</TMPL_IF> +<TMPL_IF CATEGORIES> +<TMPL_LOOP CATEGORIES> + <category><TMPL_VAR CATEGORY></category> +</TMPL_LOOP> +</TMPL_IF> + <pubDate><TMPL_VAR CDATE_822></pubDate> + <dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified> +<TMPL_IF ENCLOSURE> + <enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" /> +</TMPL_IF> +<TMPL_UNLESS SIMPLEPODCAST> + <description><TMPL_VAR CONTENT ESCAPE=HTML></description> +</TMPL_UNLESS> +<TMPL_IF COMMENTSURL> + <comments><TMPL_VAR COMMENTSURL></comments> +</TMPL_IF> +</item> diff --git a/ikiwiki-bootstrap-theme/rsspage.tmpl b/ikiwiki-bootstrap-theme/rsspage.tmpl new file mode 100644 index 0000000..45265f2 --- /dev/null +++ b/ikiwiki-bootstrap-theme/rsspage.tmpl @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<rss version="2.0" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:dcterms="http://purl.org/dc/terms/" > +<channel> +<title><TMPL_VAR TITLE></title> +<link><TMPL_VAR PAGEURL></link> +<TMPL_IF COPYRIGHT> +<copyright><TMPL_VAR COPYRIGHT ESCAPE=HTML></copyright> +</TMPL_IF> +<description><TMPL_VAR FEEDDESC ESCAPE=HTML></description> +<generator>ikiwiki</generator> +<pubDate><TMPL_VAR FEEDDATE_822></pubDate> +<TMPL_VAR CONTENT> +</channel> +</rss> diff --git a/ikiwiki-bootstrap-theme/searchform.tmpl b/ikiwiki-bootstrap-theme/searchform.tmpl new file mode 100644 index 0000000..4f51c5a --- /dev/null +++ b/ikiwiki-bootstrap-theme/searchform.tmpl @@ -0,0 +1,9 @@ +<form class="navbar-form navbar-right" role="search" method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform"> + <div class="form-group"> + <div class="input-group"> + <span class="input-group-addon"><i class="glyphicon glyphicon-search"></i></span> + <input class="form-control" placeholder="Search" type="text" id="searchbox" name="P" value="" size="16" /> + </div> + </div> + <button type="submit" class="btn btn-default">Submit</button> +</form> diff --git a/ikiwiki-bootstrap-theme/searchquery.tmpl b/ikiwiki-bootstrap-theme/searchquery.tmpl new file mode 100644 index 0000000..3c5d2a9 --- /dev/null +++ b/ikiwiki-bootstrap-theme/searchquery.tmpl @@ -0,0 +1,125 @@ +$setmap{prefix,title,S} +$setmap{prefix,link,XLINK} +$set{thousand,$.}$set{decimal,.}$setmap{BN,,Any Country,uk,England,fr,France} +${ +$def{PREV, +$if{$ne{$topdoc,0},<INPUT TYPE=image NAME="<" ALT="<" +SRC="/images/xapian-omega/prev.png" BORDER=0 HEIGHT=30 WIDTH=30>, +<IMG ALT="" SRC="/images/xapian-omega/prevoff.png" HEIGHT=30 WIDTH=30>} +} + +$def{NEXT, +$if{$ne{$last,$msize},<INPUT TYPE=image NAME=">" ALT=">" +SRC="/images/xapian-omega/next.png" BORDER=0 HEIGHT=30 WIDTH=30>, +<IMG ALT="" SRC="/images/xapian-omega/nextoff.png" HEIGHT=30 WIDTH=30>} +} + +$def{P,<INPUT TYPE=image NAME="$1" VALUE="$1" SRC="/images/xapian-omega/page-$2.png" BORDER=0$opt{a} ALT="$1">} +$def{PAGE,$if{$gt{$1,9},$if{$gt{$1,99},$P{$1,$div{$1,100}}}$P{$1,$mod{$div{$1,10},10}}}$P{$1,$mod{$1,10}}} + +$def{S,<IMG SRC="/images/xapian-omega/page-$2s.png"$opt{a} ALT=$1>} +$def{SPAGE,$if{$gt{$1,9},$if{$gt{$1,99},$S{$1,$div{$1,100}}}$S{$1,$mod{$div{$1,10},10}}}$S{$1,$mod{$1,10}}} +} + +$def{PREV,$if{$ne{$topdoc,0},<INPUT class="btn btn-default" TYPE=submit NAME="<" VALUE="Previous">}} + +$def{PAGE,<INPUT class="btn btn-default" TYPE=submit NAME="[" VALUE="$1">} + +$def{SPAGE,<INPUT class="btn btn-default" TYPE=submit NAME="[" VALUE="$1" DISABLED=disabled>} + +$def{NEXT,$if{$ne{$last,$msize},<INPUT class="btn btn-default" TYPE=submit NAME=">" VALUE="Next">}} + +<p> + +<FORM class="container form-inline" role="form" NAME=P METHOD=GET ACTION="$html{$env{CGIURL}}" TARGET="_top"> + <div class="row"> + <div style="text-align:center" class="form-group col-12 col-centered"> + <INPUT class="form-control" placeholder="Search query" NAME=P VALUE="$html{$query}" SIZE=65> + <SELECT class="form-control" NAME=DEFAULTOP> + <OPTION VALUE=or $if{$eq{$defaultop,or},SELECTED}>Matching any words + <OPTION VALUE=and $if{$eq{$defaultop,and},SELECTED}>Matching all words + </SELECT> + <INPUT class="btn btn-default" TYPE=SUBMIT VALUE="Search"> + $env{HELPLINK} + </div> + </div> + + + <div class="row"> + <div class="col-12"> + <hr> + $or{$html{$error}, + $if{$eq{$msize,0}, + $if{$query,No documents match your query, + <hr>Searching $nice{$dbsize} documents + }, + $if{$not{$msizeexact}, + $nice{$add{$topdoc,1}}-$nice{$last} of about $nice{$msize} matches, + $if{$and{$eq{$last,$msize},$eq{$topdoc,0}}, + All $nice{$msize} matches, + $nice{$add{$topdoc,1}}$if{$ne{$add{$topdoc,1},$last},-$nice{$last}} of exactly $nice{$msize} matches} + } + $list{$map{$queryterms,$list{$html{$uniq{$unstem{$_}}},<b>,</b>/<b>,</b>}: $nice{$freq{$_}}},Term frequencies: ,$. ,} + <br><small>Search took $time seconds</small> + </div> + </div> + + <br/> + + <div class="row"><div class="col-12"> + <table class="table table-bordered table-striped"> + $hitlist{<tr><td valign=top> + ${<IMG SRC="/images/xapian-omega/score-$div{$percentage,10}.png" ALT="$percentage%" HEIGHT=16 WIDTH=32>} + <div title="$percentage%" style='float:left;width:60px;height:10px;border:1px solid black;margin-top:4px;'> + <div style='width:$div{$mul{$percentage,6},10}px; height:10px; background-color: red;'> + </div></div> + <div style='float:left;margin-top:2px;font-size:x-small;'> + <span title="$html{$date{$field{modtime},%Y-%m-%d %H:%M:%S}}"> + Modified:<br><b>$html{$date{$field{modtime},%Y-%m-%d}}</b></span><br> + $if{$field{language},Language: <bold>$html{$field{language}}</bold><br>} + $if{$field{size},<span title="$html{$field{size}} bytes">Size: <b>$html{$filesize{$field{size}}}</b></span><br>} + </div> + </td> + <td><B><A HREF="$html{$field{url}}">$html{$or{$field{caption},$field{title},$field{url},Untitled}}</A></B><BR> + <small>$highlight{$field{sample},$terms}$if{$field{sample},...}</small><br> + <small> + $percentage% relevant$. matching: + <i>$list{$map{$terms,$html{$prettyterm{$_}}},$. ,</i> and <i>}</i></small>${for lynx:}<p></td></tr>} + </table> + </div></div> + + <br /> + + <div style="text-align:center"> + ${suppress next, prev, and page links if there's only one page} + $if{$ne{$lastpage,1}, + $set{a,$if{$opt{pagelink_height}, HEIGHT=$opt{pagelink_height}}$if{$opt{pagelink_width}, WIDTH=$opt{pagelink_width}}} + + ${1-W ... X-(this)-Y ...} + $set{w,$min{3,$add{$thispage,-1}}} + $set{x,$max{$add{$opt{w},1},$add{$thispage,-3}}} + $set{y,$min{$lastpage,$add{$thispage,8}}} + $PREV + $map{$range{1,$opt{w}},$PAGE{$_}} + $if{$ne{$add{$opt{w},1},$opt{x}},...} + $map{$range{$opt{x},$add{$thispage,-1}},$PAGE{$_}} + $SPAGE{$thispage} + $map{$range{$add{$thispage,1},$opt{y}},$PAGE{$_}} + $if{$ne{$opt{y},$lastpage},...} + $NEXT + } + }} + </div><br /> + $if{$dbname,<INPUT TYPE=hidden NAME=DB VALUE="$html{$dbname}">} + $if{$ne{$topdoc,0},<INPUT TYPE=hidden NAME=TOPDOC VALUE=$topdoc>} + $if{$ne{$hitsperpage,10},<INPUT TYPE=hidden NAME=HITSPERPAGE VALUE=$hitsperpage>} + $if{$fmt,<INPUT TYPE=hidden NAME=FMT VALUE="$html{$fmt}">} + $if{$cgi{COLLAPSE},<INPUT TYPE=hidden NAME=COLLAPSE VALUE="$html{$cgi{COLLAPSE}}">} + $if{$queryterms,<INPUT TYPE=hidden NAME=xP VALUE="$html{$queryterms}">} + <INPUT TYPE=hidden NAME=xDB VALUE="$html{$dbname}"> + <INPUT TYPE=hidden NAME=xFILTERS VALUE="$html{$filters}"> + $list{$relevants,<INPUT TYPE=hidden NAME=R VALUE=",.,">} + $if{$cgi{THRESHOLD},<INPUT TYPE=hidden NAME=THRESHOLD VALUE="$html{$cgi{THRESHOLD}}">} + +</FORM> +<hr><div align=right><i><small><a href="http://www.xapian.org/">$html{$version}</a></small></i></div> diff --git a/ikiwiki-bootstrap-theme/titlepage.tmpl b/ikiwiki-bootstrap-theme/titlepage.tmpl new file mode 100644 index 0000000..0e61037 --- /dev/null +++ b/ikiwiki-bootstrap-theme/titlepage.tmpl @@ -0,0 +1,7 @@ +<h2> +<TMPL_IF PERMALINK> +<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a> +<TMPL_ELSE> +<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a> +</TMPL_IF> +</h2> diff --git a/ikiwiki-bootstrap-theme/trails.tmpl b/ikiwiki-bootstrap-theme/trails.tmpl new file mode 100644 index 0000000..54c0460 --- /dev/null +++ b/ikiwiki-bootstrap-theme/trails.tmpl @@ -0,0 +1,23 @@ +<TMPL_LOOP TRAILLOOP> +<TMPL_IF __FIRST__><TMPL_IF HTML5><nav class="trails"><TMPL_ELSE><div class="trails"></TMPL_IF></TMPL_IF> +<div class="trail"> +<TMPL_IF PREVPAGE> +<span class="trailprev"> +<span class="trailarrow">←</span> +<a href="<TMPL_VAR PREVURL>"><TMPL_VAR PREVTITLE></a> +<span class="trailsep">|</span> +</span> +</TMPL_IF> +<span class="trailup"> +<a href="<TMPL_VAR TRAILURL>"><TMPL_VAR TRAILTITLE></a> +</span> +<TMPL_IF NEXTPAGE> +<span class="trailnext"> +<span class="trailsep">|</span> +<a href="<TMPL_VAR NEXTURL>"><TMPL_VAR NEXTTITLE></a> +<span class="trailarrow">→</span> +</span> +</TMPL_IF> +</div> +<TMPL_IF __LAST__><TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF></TMPL_IF> +</TMPL_LOOP> diff --git a/nswiki.setup b/nswiki.setup new file mode 100644 index 0000000..0125de2 --- /dev/null +++ b/nswiki.setup @@ -0,0 +1,406 @@ +# IkiWiki::Setup::Yaml - YAML formatted setup file +# +# Setup file for ikiwiki. +# +# Passing this to ikiwiki --setup will make ikiwiki generate +# wrappers and build the wiki. +# +# Remember to re-run ikiwiki --setup any time you edit this file. +# +# name of the wiki +wikiname: NetSurf Developers Wiki +# contact email for wiki +#adminemail: me(a)example.com +# users who are wiki admins +adminuser: [] +# users who are banned from the wiki +banned_users: [] +# where the source of the wiki is located +srcdir: '/home/netsurf/websites/wiki.netsurf-browser.org/gitroot' +# where to build the wiki +destdir: '/home/netsurf/websites/wiki.netsurf-browser.org/html' +# base url to the wiki +url: 'http://wiki.netsurf-browser.org/' +# url to the ikiwiki.cgi +cgiurl: '' +# do not adjust cgiurl if CGI is accessed via different URL +reverse_proxy: 0 +# filename of cgi wrapper to generate +cgi_wrapper: '' +# mode for cgi_wrapper (can safely be made suid) +cgi_wrappermode: 06755 +# number of seconds to delay CGI requests when overloaded +cgi_overload_delay: '' +# message to display when overloaded (may contain html) +cgi_overload_message: '' +# enable optimization of only refreshing committed changes? +only_committed_changes: 0 +# rcs backend to use +rcs: '' +# plugins to add to the default configuration +add_plugins: +- goodstuff +- websetup +- comments +- blogspam +- underlay +- jscalendar +- sidebar +- trail +- openid +- remove +- pingee +- moderatedcomments +- attachment +- rename +- htmlscrubber +- relativedate +- version +- lockedit +- favicon +- format +- highlight +- getsource +- edittemplate +# plugins to disable +disable_plugins: [] +# additional directory to search for t=emplate files +templatedir: /home/netsurf/websites/wiki.netsurf-browser.org/gitsetup/ikiwiki-bootstrap-theme +# base wiki source location +underlaydir: /usr/share/ikiwiki/basewiki +# display verbose messages? +#verbose: 1 +# log to syslog? +#syslog: 1 +# create output files named page/index.html? +usedirs: 1 +# use '!'-prefixed preprocessor directives? +prefix_directives: 1 +# use page/index.mdwn source files +indexpages: 0 +# enable Discussion pages? +discussion: 1 +# name of Discussion pages +discussionpage: Discussion +# use elements new in HTML5 like <section>? +html5: 1 +# only send cookies over SSL connections? +sslcookie: 0 +# extension to use for new pages +default_pageext: mdwn +# extension to use for html files +htmlext: html +# strftime format string to display date +timeformat: '%c' +# UTF-8 locale to use +#locale: en_US.UTF-8 +# put user pages below specified page +userdir: '' +# how many backlinks to show before hiding excess (0 to show all) +numbacklinks: 10 +# attempt to hardlink source files? (optimisation for large files) +hardlink: 0 +# force ikiwiki to use a particular umask (keywords public, group or private, or a number) +#umask: public +# group for wrappers to run in +#wrappergroup: ikiwiki +# extra library and plugin directories +libdirs: [] +# extra library and plugin directory (searched after libdirs) +libdir: '/home/dsilvers/websites/digital-scurf.org/blog/gresille-ikiwiki/jscalendar' +# environment variables +ENV: {} +# time zone name +#timezone: US/Eastern +# regexp of normally excluded files to include +#include: ^\.htaccess$ +# regexp of files that should be skipped +#exclude: ^(*\.private|Makefile)$ +# specifies the characters that are allowed in source filenames +wiki_file_chars: -[:alnum:]+/.:_ +# allow symlinks in the path leading to the srcdir (potentially insecure) +allow_symlinks_before_srcdir: 0 +# cookie control +cookiejar: + file: /home/dsilvers/.ikiwiki/cookies +# set custom user agent string for outbound HTTP requests e.g. when fetching aggregated RSS feeds +useragent: ikiwiki/3.20150107 +# theme has a responsive layout? (mobile-optimized) +responsive_layout: 1 + +###################################################################### +# core plugins +# (editpage, htmlscrubber, inline, link, meta, parentlinks, templatebody) +###################################################################### + +# htmlscrubber plugin +# PageSpec specifying pages not to scrub +#htmlscrubber_skip: '!*/Discussion' + +# inline plugin +# enable rss feeds by default? +#rss: 0 +# enable atom feeds by default? +#atom: 0 +# allow rss feeds to be used? +#allowrss: 0 +# allow atom feeds to be used? +#allowatom: 0 +# urls to ping (using XML-RPC) on feed update +pingurl: [] + +###################################################################### +# auth plugins +# (anonok, blogspam, httpauth, lockedit, moderatedcomments, +# opendiscussion, openid, passwordauth, signinedit) +###################################################################### + +# anonok plugin +# PageSpec to limit which pages anonymous users can edit +#anonok_pagespec: '*/discussion' + +# blogspam plugin +# PageSpec of pages to check for spam +#blogspam_pagespec: postcomment(*) +# options to send to blogspam server +#blogspam_options: blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10 +# blogspam server JSON url +#blogspam_server: '' + +# httpauth plugin +# url to redirect to when authentication is needed +#cgiauthurl: http://example.com/wiki/auth/ikiwiki.cgi +# PageSpec of pages where only httpauth will be used for authentication +#httpauth_pagespec: '!*/Discussion' + +# lockedit plugin +# PageSpec controlling which pages are locked +#locked_pages: '!*/Discussion' + +# moderatedcomments plugin +# PageSpec matching users or comment locations to moderate +#moderate_pagespec: '*' + +# openid plugin +# url pattern of openid realm (default is cgiurl) +#openid_realm: '' +# url to ikiwiki cgi to use for openid authentication (default is cgiurl) +#openid_cgiurl: '' + +# passwordauth plugin +# a password that must be entered when signing up for an account +#account_creation_password: s3cr1t +# cost of generating a password using Authen::Passphrase::BlowfishCrypt +#password_cost: 8 + +###################################################################### +# format plugins +# (creole, highlight, hnb, html, mdwn, otl, rawhtml, rst, textile, txt) +###################################################################### + +# highlight plugin +# types of source files to syntax highlight +#tohighlight: .c .h .cpp .pl .py Makefile:make +# location of highlight's filetypes.conf +#filetypes_conf: /etc/highlight/filetypes.conf +# location of highlight's langDefs directory +#langdefdir: /usr/share/highlight/langDefs + +# mdwn plugin +# enable multimarkdown features? +multimarkdown: 1 +# disable use of markdown discount? +nodiscount: 1 + +###################################################################### +# special-purpose plugins +# (osm, underlay) +###################################################################### + +# osm plugin +# the default zoom when you click on the map link +#osm_default_zoom: 15 +# the icon shown on links and on the main map +#osm_default_icon: ikiwiki/images/osm.png +# the alt tag of links, defaults to empty +#osm_alt: '' +# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated) +#osm_format: KML +# the icon attached to a tag, displayed on the map for tagged pages +#osm_tag_default_icon: icon.png +# Url for the OpenLayers.js file +#osm_openlayers_url: http://www.openlayers.org/api/OpenLayers.js +# Layers to use in the map. Can be either the 'OSM' string or a type option for Google maps (GoogleNormal, GoogleSatellite, GoogleHybrid or GooglePhysical). It can also be an arbitrary URL in a syntax acceptable for OpenLayers.Layer.OSM.url parameter. +#osm_layers: +# OSM: GoogleSatellite +# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key +#osm_google_apikey: '' + +# underlay plugin +# extra underlay directories to add +#add_underlays: +#- /home/dsilvers/wiki.underlay + +###################################################################### +# web plugins +# (404, attachment, comments, editdiff, edittemplate, getsource, google, +# goto, mirrorlist, remove, rename, repolist, search, theme, userlist, +# websetup, wmd) +###################################################################### + +# attachment plugin +# enhanced PageSpec specifying what attachments are allowed +#allowed_attachments: virusfree() and mimetype(image/*) and maxsize(50kb) +# virus checker program (reads STDIN, returns nonzero if virus found) +#virus_checker: clamdscan - + +# comments plugin +# PageSpec of pages where comments are allowed +#comments_pagespec: blog/* and !*/Discussion +# PageSpec of pages where posting new comments is not allowed +#comments_closed_pagespec: blog/controversial or blog/flamewar +# Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12" +#comments_pagename: '' +# Interpret directives in comments? +#comments_allowdirectives: 0 +# Allow anonymous commenters to set an author name? +#comments_allowauthor: 0 +# commit comments to the VCS +#comments_commit: 1 +# Restrict formats for comments to (no restriction if empty) +#comments_allowformats: mdwn txt + +# getsource plugin +# Mime type for returned source. +#getsource_mimetype: text/plain; charset=utf-8 + +# mirrorlist plugin +# list of mirrors +#mirrorlist: {} +# generate links that point to the mirrors' ikiwiki CGI +#mirrorlist_use_cgi: 1 + +# repolist plugin +# URIs of repositories containing the wiki's source +#repositories: +#- svn://svn.example.org/wiki/trunk + +# search plugin +# path to the omega cgi program +#omega_cgi: /usr/lib/cgi-bin/omega/omega +# use google site search rather than internal xapian index? +#google_search: 1 + +# theme plugin +# name of theme to enable +#theme: actiontabs + +# websetup plugin +# list of plugins that cannot be enabled/disabled via the web interface +#websetup_force_plugins: [] +# list of additional setup field keys to treat as unsafe +#websetup_unsafe: [] +# show unsafe settings, read-only, in web interface? +#websetup_show_unsafe: 1 + +###################################################################### +# widget plugins +# (calendar, color, conditional, cutpaste, date, format, fortune, +# graphviz, haiku, headinganchors, img, linkmap, listdirectives, map, +# more, orphans, pagecount, pagestats, poll, polygen, postsparkline, +# progress, shortcut, sparkline, table, template, teximg, toc, toggle, +# version) +###################################################################### + +# calendar plugin +# base of the archives hierarchy +#archivebase: archives +# PageSpec of pages to include in the archives, if option `calendar_autocreate` is true. +#archive_pagespec: page(posts/*) and !*/Discussion +# autocreate new calendar pages? +#calendar_autocreate: 1 +# if set, when building calendar pages, also build pages of year and month when no pages were published (building empty calendars). +#calendar_fill_gaps: 1 + +# listdirectives plugin +# directory in srcdir that contains directive descriptions +#directive_description_dir: ikiwiki/directive + +# teximg plugin +# Should teximg use dvipng to render, or dvips and convert? +#teximg_dvipng: '' +# LaTeX prefix for teximg plugin +#teximg_prefix: '\documentclass{article} +# +# \usepackage[utf8]{inputenc} +# +# \usepackage{amsmath} +# +# \usepackage{amsfonts} +# +# \usepackage{amssymb} +# +# \pagestyle{empty} +# +# \begin{document} +# +#' +# LaTeX postfix for teximg plugin +#teximg_postfix: \end{document} + +###################################################################### +# other plugins +# (aggregate, autoindex, brokenlinks, camelcase, ddate, embed, favicon, +# filecheck, flattr, goodstuff, htmlbalance, localstyle, notifyemail, +# pagetemplate, pingee, pinger, prettydate, recentchanges, +# recentchangesdiff, relativedate, rsync, sidebar, smiley, +# sortnaturally, tag, testpagespec, trail, transient) +###################################################################### + +# aggregate plugin +# enable aggregation to internal pages? +#aggregateinternal: 1 +# allow aggregation to be triggered via the web? +#aggregate_webtrigger: 0 + +# autoindex plugin +# commit autocreated index pages +#autoindex_commit: 1 + +# camelcase plugin +# list of words to not turn into links +#camelcase_ignore: [] + +# flattr plugin +# userid or user name to use by default for Flattr buttons +#flattr_userid: joeyh + +# pinger plugin +# how many seconds to try pinging before timing out +#pinger_timeout: 15 + +# prettydate plugin +# format to use to display date +#prettydateformat: '%X, %B %o, %Y' + +# recentchanges plugin +# name of the recentchanges page +recentchangespage: recentchanges +# number of changes to track +recentchangesnum: 100 + +# rsync plugin +# command to run to sync updated pages +#rsync_command: rsync -qa --delete . user@host:/path/to/docroot/ + +# sidebar plugin +# show sidebar page on all pages? +#global_sidebars: 1 + +# tag plugin +# parent page tags are located under +#tagbase: tag +# autocreate new tag pages? +#tag_autocreate: 1 +# commit autocreated tag pages +#tag_autocreate_commit: 1 ----------------------------------------------------------------------- -- NetSurf Developer Wiki Backing Store

5 years, 12 months

1
0
0 / 0

netsurf-wiki: branch master created. e7366bf41f68cfe07e9ea03fc4a398baecbae651

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/e7366bf41f68cfe0... ...commit http://git.netsurf-browser.org/netsurf-wiki.git/commit/e7366bf41f68cfe07e... ...tree http://git.netsurf-browser.org/netsurf-wiki.git/tree/e7366bf41f68cfe07e9e... The branch, master has been created at e7366bf41f68cfe07e9ea03fc4a398baecbae651 (commit) - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf-wiki.git/commit/?id=e7366bf41f68cf... commit e7366bf41f68cfe07e9ea03fc4a398baecbae651 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> Initial conversion from MediaWiki, 20170204 diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d60efe4 --- /dev/null +++ b/COPYING @@ -0,0 +1,437 @@ +Attribution-NonCommercial-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More_considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International +Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-NonCommercial-ShareAlike 4.0 International Public License +("Public License"). To the extent this Public License may be +interpreted as a contract, You are granted the Licensed Rights in +consideration of Your acceptance of these terms and conditions, and the +Licensor grants You such rights in consideration of benefits the +Licensor receives from making the Licensed Material available under +these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-NC-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution, NonCommercial, and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. NonCommercial means not primarily intended for or directed towards + commercial advantage or monetary compensation. For purposes of + this Public License, the exchange of the Licensed Material for + other material subject to Copyright and Similar Rights by digital + file-sharing or similar means is NonCommercial provided there is + no payment of monetary compensation in connection with the + exchange. + + l. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + m. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + n. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part, for NonCommercial purposes only; and + + b. produce, reproduce, and Share Adapted Material for + NonCommercial purposes only. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties, including when + the Licensed Material is used other than for NonCommercial + purposes. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-NC-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database for NonCommercial purposes + only; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/autobuilder_requirements.mdwn b/autobuilder_requirements.mdwn new file mode 100644 index 0000000..511fec8 --- /dev/null +++ b/autobuilder_requirements.mdwn @@ -0,0 +1,25 @@ +[[!meta title="Autobuilder requirements"]] +[[!meta author="Tlsa"]] +[[!meta date="2009-07-08T13:38:43Z"]] + + +[[!toc]] The current autobuilder +script is in need of an overhaul. Additionally, we need more features +for it to be useful in the future. This page enumerates the features we +need. + +- Automated fetch of component sources +- Detection of updated components +- Configurable installation prefix/destdir and build environment +- Ability to specify which versions of components are built for a + given product +- Dependency tracking (so, e.g a change to Hubbub results in a new + NetSurf binary) +- Robust rewriting of URLs in documentation (maybe better handled in + component buildsystems) +- Retain features of existing autobuild.pl +- Automated packaging of components for release +- Automated creation of NSTools distribution for RISC OS. +- Automatically run component testsuites, notifying any failures. + Also, compute code coverage statistics. + diff --git a/bug_tracker.mdwn b/bug_tracker.mdwn new file mode 100644 index 0000000..9afa23e --- /dev/null +++ b/bug_tracker.mdwn @@ -0,0 +1,8 @@ +[[!meta title="Bug Tracker"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-06-17T07:41:58Z"]] + + +[[!toc]] The Mantis issue tracker +is located at <http://bugs.netsurf-browser.org/mantis/> + diff --git a/caveat_risc_os.mdwn b/caveat_risc_os.mdwn new file mode 100644 index 0000000..f55f6bf --- /dev/null +++ b/caveat_risc_os.mdwn @@ -0,0 +1,85 @@ +[[!meta title="Caveat RISC OS"]] +[[!meta author="James Bursa"]] +[[!meta date="2010-03-01T02:57:12Z"]] + + +[[!toc]] When working on software +that must run under RISC OS, there are many issues that you must keep in +mind that might not be obvious or apparent to people who have never +written software for RISC OS before. This page describes some of them. + +Some of the NetSurf Project's sponsors have donated us the equipment and +bandwidth required to give accepted students access to an open-access +RISC OS computer over the internet, so they can test and experiment with +it. This is done via an IP KVM using a rather ghastly, but usable, Java +applet in a web page. The machine is an A9 Home donated by Advantage Six +Ltd. + +RISC OS is co-operatively multi-tasked +-------------------------------------- + +RISC OS GUI applications must 'yield' to the OS before another process +can be scheduled. This is done via the Wimp\_Poll system call. In +NetSurf, this is wrapped inside gui\_multitask(), which handles yielding +to the OS, getting GUI events from it, and running scheduled functions. + +RISC OS has a limited number of shared-namespace file descriptors +----------------------------------------------------------------- + +RISC OS has 255 file handles - and that's it. You can't possibly have +more files than that open at anyone time, and there is a single pool of +file handles shared by all processes. Don't leave files open that you +don't need to keep open, and don't blindly close other handles. + +RISC OS has a limited number of shared-namespace socket descriptors +------------------------------------------------------------------- + +Unlike on other operating systems, RISC OS's sockets are allocated from +a different pool of numbers. They may, for example, overlap with file +descriptors. Also note that as with file descriptors, there is a single +pool of them shared by all processes. There's also a limit on the number +you can have open at once. This can be as low as 64. + +RISC OS's environment variables are global to the system +-------------------------------------------------------- + +RISC OS uses environment variables extensively: much of the +configuration of the system is done via them. They are shared by all +processes. Because of this, RISC OS has a naming convention for them so +they don't clash. If you really feel the need to use an environment +variable, you should prefix its name with NetSurf\$. + +Memory is valuable +------------------ + +RISC OS machines may have as little as 64MB of RAM, and the OS provides +no support for swap or paging. Additionally, much of the memory +allocated via malloc() will end up being allocated in what is called a +Dynamic Area. The upshot of this is that if you fragment the heap too +much, you've basically wasted memory, and no process will be able to use +the spaces you have freed. + +RISC OS hardware is slow +------------------------ + +The fastest RISC OS computer you can buy is a 600MHz ARM clone with no +floating point and a tiny cache. Make sure your code is tight, but +remember readability and maintenability is paramount! + +RISC OS is delicate and lacks wide-spread memory protection +----------------------------------------------------------- + +It's trivial to take down the entire OS if you're not careful, where on +other OSes you'd just get a SIGSEGV. Be careful! + +RISC OS lacks shared libraries +------------------------------ + +While the GTK version of NetSurf's binary is less than 600kB, RISC OS +has no shared libraries, meaning it's over 3MB. Given the speed of RISC +OS machines, this is already a problem. If you want to make use of a new +library, make sure it's not too huge, and that it doesn't depend on a +dozen other libraries. + +[[!inline raw=yes pages="Documentation"]] + diff --git a/continuous_integration.mdwn b/continuous_integration.mdwn new file mode 100644 index 0000000..193d8d9 --- /dev/null +++ b/continuous_integration.mdwn @@ -0,0 +1,42 @@ +[[!meta title="Continuous Integration"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-02-06T11:38:14Z"]] + + +[[!toc]] The CI system is a jenkins +instance on <http://ci.netsurf-browser.org/> + +The old discussion on [[Autobuilder requirements|autobuilder_requirements]] — +lists requirements for the new autobuilder. + +Master +------ + +The master instance is a VPS provided by Mythic beasts. + +A VPN between it and all the build slaves provides a network where no +machines are publicly accessible. This is in addition to the ssh based +tunnels used to copy data between CI nodes. + +The Jenkins install on the master server is a snapshot release version + +Slave +----- + +The majority of the build slaves are provided by our own +[[virtual host server|virtual_host_server]] excepting operating +systems which cannot be virtualised (principally MAC OS X). + +### [[Continuous Integration Debian Jessie Setup|continuous_integration_debian_jessie_setup]] + +### [[Continuous Integration Debian Wheezy Setup|continuous_integration_debian_wheezy_setup]] + +### [[Continuous Integration OpenBSD Setup|continuous_integration_openbsd_setup]] + +### [[Continuous Integration FreeBSD Setup|continuous_integration_freebsd_setup]] + +### [[Continuous Integration Haiku Slave Setup|continuous_integration_haiku_slave_setup]] + +### [[Continuous Integration Mac OS X Snow Leopard Setup|continuous_integration_mac_os_x_snow_leopard_setup]] + +### [[Continuous Integration Mac OS X Yosemite Setup|continuous_integration_mac_os_x_yosemite_setup]] diff --git a/continuous_integration_debian_jessie_setup.mdwn b/continuous_integration_debian_jessie_setup.mdwn new file mode 100644 index 0000000..fb794a8 --- /dev/null +++ b/continuous_integration_debian_jessie_setup.mdwn @@ -0,0 +1,421 @@ +[[!meta title="Continuous Integration Debian Jessie Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-07-06T12:46:14Z"]] + + +[[!toc]] + +Debian jessie (8.x) OS install +------------------------------ + +### amd64 VDS install from media + +[[Virtual server setup|virtual_host_server]] + +Install minimal system from netinst CD (attached when VDS is created on +phoenix) Config options: + +- In the "role" selection select "ssh server" and "system utilities" + only. +- The whole disc default partitioning is fine +- The base user the install insists on creating should be the netsurf + user. +- Boot loader in MBR + +Once installed: + +- install sudo package and add netsurf user to sudo group +- edit /etc/default/grub + +`GRUB_CMDLINE_LINUX="console=tty0 console=ttyS0,115200n8"` + +`# update-grub2` + +### arm64 VDS install + +[[ARM64 virtual server setup|virtual_host_server_arm64]] + +Once installed: + +- create netsurf user +- install sudo package and add netsurf user to sudo group +- edit /etc/inittab comment pty 3 through 6 and uncomment serial T0 +- enable backports + +`echo "deb `[`http://http.debian.net/debian`](http://http.debian.net/debian)` jessie-backports main" > /etc/apt/sources.list.d/backports.list` +`apt-get update` + +- install updated kernel + +`apt-get install linux-image-4.3.0-0.bpo.1-arm64` + +### Banana Pi + +This system is a dual core ARMv7 allwinner using the armhf ABI + +Used the install SD media from +[[http://www.igorpecovnik.com/2014/09/07/banana-pi-debian-sd-image/ Igor Pecovnik|http///www.igorpecovnik.com/2014/09/07/banana-pi-debian-sd-image... + +- unzip and write raw file to full size SD card. + +Once installed: + +- first login as root:1234 which will need to be immediately changed +- use the nand-sata-install script and moved the install to sata disc. + The drive needs to be a clean drive with a recognised partition + table (DOS or GPT) and a single partition where the OS will be + installed. +- edit /etc/init.d/armhwinfo to remove the toilet dynamic MOTD banner +- (re)move /etc/bash.bashrc.custom as it issues a lot of unnecessary + commands +- adduser netsurf +- change /etc/apt/sources.list to point at a local mirror +- apt-get update +- apt-get upgrade +- install sudo package and add netsurf user to sudo group + +### Raspberry Pi 2 + +This system is a quad core ARMv7 Broadcom using the armhf ABI + +Used install media from [[http://sjoerd.luon.net/posts/2015/02/debian-jessie-on-rpi2/ Sjored|http///sjoerd.luon.net/posts/2015/02/debian-jessie-on-rpi2/_sjored]] + +- unpack onto micro SD card with bmap-tools + +`On any debian-based linux type "sudo apt-get install bmap-tools" and install it.` +`Then type "sudo bmaptool copy --nobmap 'yourlocation/jessie-rpi2.img' /dev/sdx" (Change yourlocation to the location of the .img file and sdx for the letter where the SD is mounted, if you don't know it type "sudo fdisk -l" and look for it).` + +Once installed: + +- first login as root:debian which will need to be immediately changed +- Prevent package FLASH-KERNEL UPDATING FROM OFFICIAL REPO WITH APT + PINNING + +`'touch /etc/apt/preferences.d/flash-kernel' create a new file` +`'vi /etc/apt/preferences.d/flash-kernel' edit it an add the following lines to it:` +`Package: flash-kernel` +`Pin: origin repositories.collabora.co.uk` +`Pin-Priority: 1000` +`'apt-cache policy flash-kernel' check if the package is pinned` + +- change /etc/apt/sources.list to point at a local mirror +- apt-get update +- apt-get upgrade +- adduser netsurf +- install sudo package and add netsurf user to sudo group + +### Orange Pi PC + +This system is a quad core ARMv7 allwinner H3 using the armhf ABI + +Used "mini" install media from +[[http://www.orangepi.org/orangepibbsen/forum.php?mod=viewthread&tid=342 loboris|http///www.orangepi.org/orangepibbsen/forum.php?mod=viewthread&ti... + +- unpack image and write to micro SD card and configure as per loboris + instructions, careful installation steps are not immediately obvious + +Once installed: + +- first login as orangepi:orangepi which will need to be immediately + changed + +`* superuser available via sudo -i` + +- change /etc/apt/sources.list to point at a local mirror +- apt-get update +- apt-get upgrade +- alter orangepi user to netsurf by editing + +`/etc/group (dont forget to replace orangepi on the sudo group)` +`/etc/passwd` +`/etc/shadow` +`mv /home/orangepi /home/netsurf` + +Packaged CI worker install +-------------------------- + +Do a base OS install + +The recommended hostname for CI workers is "ciworker13" this allows us +to clearly identify CI worker nodes. Note historically we have used +"cislave1" which has been objected to by several users. See +[[https://wiki.debian.org/HowTo/ChangeHostname changing hostname|https///wiki.debian.org/howto/changehostname_changing_hostname]] on how to achive this. + +On master jenkins use "manage nodes" to create new node. Ensure "remote +fs root" is set to /var/lib/jenkins add variable JENKINS\_HOME set to +/var/lib/jenkins + +Note: replace arm64 with architecture name as required (armhf etc.) + +As superuser: + +- create jenkins user + +`adduser --system --group --home /var/lib/jenkins/ --disabled-login jenkins` + +- Add CI server repo to slave apt sources + +`echo "deb `[`http://ci.netsurf-browser.org/debian/`](http://ci.netsurf-browser.org/debian/)` jessie/amd64/" >> /etc/apt/sources.list.d/netsurf-browser.list` + +- update repos + +`apt-get update` + +- install ns-ci-worker package. accept the large package list and the + unsigned package install for gcovr and ns-ci-slave + +`apt-get install ns-ci-worker` + +- edit /etc/default/ns-ci-worker to set the correct url and secret + parameters +- If toolchains are to be built on the node ensure /opt is setup + correctly + +`mkdir -p /opt/netsurf` +`chown jenkins:jenkins /opt/netsurf` + +- become jenkins user + +`su -s/bin/bash - jenkins` + +- create ssh keypair (accept defaults - no password) + +`ssh-keygen -t rsa -C "netsurf(a)cislave12.netsurf-browser.org"` + +- copy .ssh/id\_rsa.pub from slave to jenkins master node and append + to /home/netsurf/.ssh/authorized\_keys + +`scp /home/jenkins/.ssh/id_rsa.pub netsurf@ci.netsurf-browser.org:ciworker12_id_rsa.pub` + +- exit jenkins user shell +- start CI worker daemon + +`/etc/init.d/ns-ci-worker start` + +Manual CI worker install +------------------------ + +### required packages + +The Netsurf repository has necessary updated packages in it and can be +accessed by doing the following: + +- Add CI server repo to slave apt sources + +`echo "deb `[`http://ci.netsurf-browser.org/builds/debian/`](http://ci.netsurf-browser.org/builds/debian/)` jessie/amd64/" >> /etc/apt/sources.list` + +- update repos + +`apt-get update` + +use apt to install these packages: + +`openjdk-7-jre-headless ` +`screen ` +`build-essential` +`ccache` +`clang` +`git` +`pkg-config` +`check` +`doxygen` +`libjson0-dev (from our repo - needs bugfixes `[`http://ci.netsurf-browser.org/builds/debian/`](http://ci.netsurf-browser.org/builds/debian/)`)` +`libexpat1-dev` +`libxml-perl` +`libxml-xpath-perl` +`lcov` +`gcovr (from our repo)` +`gperf` +`flex` +`bison` +`libpng-dev` +`libjpeg-dev` +`libmozjs185-dev` +`libglib2.0-dev` +`libcurl4-openssl-dev` +`liblcms1-dev` +`libxml2-dev` +`librsvg2-dev` +`libmng-dev` +`libgtk2.0-dev` +`libmozjs-dev` + +### config + +- on master jenkins use "manage nodes" to create new node. Ensure + "remote fs root" is set to /home/netsurf/jenkins +- create netsurf user +- as netsurf user: + - wget <http://ci.netsurf-browser.org/jenkins/jnlpJars/slave.jar> + - run screen + - create jenkins-slave.sh + +`#!/bin/bash` + +`java -Djava.awt.headless=true -jar slave.jar -jnlpUrl `[`http://ci.netsurf-browser.org/jenkins/computer/chimera/slave-agent.jnlp`](http://ci.netsurf-browser.org/jenkins/computer/chimera/slave-agent.jnlp)` -secret 0123456789abcdef01234567890abcdef` + +- - run jenkins-slave.sh + - create new screen tab + - create ssh keypair (accept defaults - no password) + +`ssh-keygen -t rsa -C "netsurf(a)cislave0.netsurf-browser.org"` + +- - copy .ssh/id\_rsa.pub from slave to jenkins master node and + append to /home/netsurf/.ssh/authorized\_keys + +`scp ci.netsurf-browser.org:.ssh/id_rsa.pub .id_rsa.pub` +`cat id_rsa.pub >> .ssh/authorized_keys` + +- - copy .ssh/id\_rsa.pub from master node to slave and append to + /home/netsurf/.ssh/authorized\_keys + - create reverse-ssh.sh (change tunnel port number!) + +`#!/bin/sh` + +`ssh -R 22224:localhost:22 netsurf(a)ci.netsurf-browser.org 'bash -c "while true; do echo .; sleep 60; done"'` + +- - run reverse-ssh.sh + - on the master create a shell script to use the ssh tunnel + connection, thus firewalls etc are moot as long as the slave can + connect to the master + +`ssh netsurf@localhost -p 22223` + +Pbuilder setup +-------------- + +This allows a worker to build Debian packages. The worker should be +installed as a normal CI worker node and then: + +as superuser on node: + +- apt-get install pbuilder +- addgroup pbuilder +- addgroup jenkins pbuilder +- create /etc/sudoers.d/pbuilder + +`jenkins ALL = NOPASSWD:/usr/sbin/pbuilder` + +- visudo and alter Defaults + +`Defaults env_reset,env_keep="DIST ARCH"` + +- replace /etc/pbuilderrc + +`# this is your configuration file for pbuilder.` +`# the file in /usr/share/pbuilder/pbuilderrc is the default template.` +`# /etc/pbuilderrc is the one meant for overwriting defaults in` +`# the default template` +`#` +`# read pbuilderrc.5 document for notes on specific options.` +`# List of Debian suites.` +`DEBIAN_SUITES=("sid", "stretch", "jessie", "wheezy", "squeeze")` +`` +`# List of Ubuntu suites.` +`UBUNTU_SUITES=("vivid" "utopic" "trusty" "saucy" "raring" "quantal" "precise" "oneiric" "natty" "lucid" "hardy")` +`` +`# Mirrors to use. Update these to your preferred mirror.` +`DEBIAN_MIRROR="ftp.uk.debian.org"` +`UBUNTU_MIRROR="mirrors.kernel.org"` +`` +`# set a default distribution if none is used.` +`: ${DIST:="$(lsb_release --short --codename)"}` +`` +`# set the architecture to the host architecture if none set.` +`: ${ARCH:="$(dpkg --print-architecture)"}` +`` +`NAME="$DIST"` +`if [ -n "${ARCH}" ]; then` +` NAME="$NAME-$ARCH"` +` DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")` +`fi` +`BASETGZ="/var/cache/pbuilder/$NAME-base.tgz"` +`DISTRIBUTION="$DIST"` +`BUILDRESULT="/var/cache/pbuilder/$NAME/result/"` +`APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"` +`BUILDPLACE="/var/cache/pbuilder/build/"` +`` +`if $(echo ${DEBIAN_SUITES[@]} | grep -q $DIST); then` +` # Debian configuration` +` MIRRORSITE="http://$DEBIAN_MIRROR/debian/"` +` COMPONENTS="main contrib non-free"` +` if $(echo "$STABLE_CODENAME stable" | grep -q $DIST); then` +` OTHERMIRROR="$OTHERMIRROR | deb $MIRRORSITE $STABLE_BACKPORTS_SUITE $COMPONENTS"` +` fi` +`elif $(echo ${UBUNTU_SUITES[@]} | grep -q $DIST); then` +` # Ubuntu configuration` +` MIRRORSITE="http://$UBUNTU_MIRROR/ubuntu/"` +` COMPONENTS="main restricted universe multiverse"` +`else` +` echo "Unknown distribution: $DIST"` +` exit 1` +`fi` + +The architecture is assumed to be the native one from + +`dpkg --print-architecture` + +This can be set by passing ARCH to pbuilder (useful for i386 maybe?) + +for each distribution this node will build for: + +- create pbuilder result directory and set ownership permissions + +`mkdir -p /var/cache/pbuilder/jessie-armhf/result` +`chown root:pbuilder /var/cache/pbuilder/jessie-armhf/result` +`chmod g+w /var/cache/pbuilder/jessie-armhf/result` + +- become jenkins user + +`su -s/bin/bash - jenkins` + +- create pbuilder base for distribution + +`sudo DIST=jessie pbuilder create` + +- if desired additional packages and config can be made to the base + with + +`sudo DIST=jessie pbuilder login --save-after-login` + +distcc worker node +------------------ + +Do a basic OS install but \*not\* a CI worker setup. + +A recommended hostname for distcc worker is something like "cicpu0" this +allows us to use systems as processing node for other purposes than just +distcc in future. See debians +[[https://wiki.debian.org/HowTo/ChangeHostname changing hostname|https///wiki.debian.org/howto/changehostname_changing_hostname]] on how to achive this. + +The Netsurf repository has necessary updated packages in it and can be +accessed by doing the following: + +- Add CI server repo to slave apt sources + +`echo "deb `[`http://ci.netsurf-browser.org/builds/debian/`](http://ci.netsurf-browser.org/builds/debian/)` jessie/amd64/" >> /etc/apt/sources.list` + +- update repos + +`apt-get update` + +- use apt to install these packages: + +`build-essential` +`gcc` +`clang` +`distcc` + +- edit /etc/default/distcc + +`STARTDISTCC="true"` +`ALLOWEDNETS="192.168.211.0/24"` +`LISTEN="0.0.0.0"` +`JOBS="8"` + +- start the service + +`service distcc start` + +- ensure the client has hosts set to use the new worker + diff --git a/continuous_integration_debian_wheezy_setup.mdwn b/continuous_integration_debian_wheezy_setup.mdwn new file mode 100644 index 0000000..9127b32 --- /dev/null +++ b/continuous_integration_debian_wheezy_setup.mdwn @@ -0,0 +1,164 @@ +[[!meta title="Continuous Integration Debian Wheezy Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2014-12-20T11:46:57Z"]] + + +[[!toc]] + +Debian wheezy (7.0) OS install +------------------------------ + +Install minimal system from netinst CD (attached when VDS is created on +phoenix) Config options: + +- In the "role" selection select "ssh server" and "system utilities" + only. +- The whole disc default partitioning is fine +- The base user the install insists on creating should be the netsurf + user. +- Boot loader in MBR + +Once installed: + +- install sudo package and add netsurf user to sudo group +- edit /etc/inittab comment pty 3 through 6 and uncomment serial T0 + +Packaged Setup for Debian wheezy (7.0) +-------------------------------------- + +on master jenkins use "manage nodes" to create new node. Ensure "remote +fs root" is set to /var/lib/jenkins add variable JENKINS\_HOME set to +/var/lib/jenkins + +As superuser: + +- create jenkins user + +`adduser --system --group --home /var/lib/jenkins/ --disabled-login jenkins` + +- Add CI server repo to slave apt sources + +`echo "deb `[`http://ci.netsurf-browser.org/debian/`](http://ci.netsurf-browser.org/debian/)` wheezy/amd64/" >> /etc/apt/sources.list.d/netsurf-browser.list` + +- update repos + +`apt-get update` + +- install ns-ci-slave package. accept the large package list and the + unsigned package install for gcovr and ns-ci-slave + +`apt-get install ns-ci-slave` + +- edit /etc/default/ns-ci-slave to set the correct url and secret + parameters +- If toolchains are to be built on the node ensure /opt is setup + correctly + +`mkdir -p /opt/netsurf` +`chown jenkins:jenkins /opt/netsurf` + +- become jenkins user + +`su -s/bin/bash - jenkins` + +- create ssh keypair (accept defaults - no password) + +`ssh-keygen -t rsa -C "netsurf(a)cislave10.netsurf-browser.org"` + +- copy .ssh/id\_rsa.pub from slave to jenkins master node and append + to /home/netsurf/.ssh/authorized\_keys + +`scp /home/jenkins/.ssh/id_rsa.pub netsurf@ci.netsurf-browser.org:cislave10_id_rsa.pub` + +- exit jenkins user shell +- start slave daemon + +`/etc/init.d/ns-ci-slave start` + +Manual Setup of Debian wheezy (7.0) +----------------------------------- + +### required packages + +use apt to install all these. The Netsurf repository has the necessary +updated packages in it and can be accessed by doing the following: + +- Add CI server repo to slave apt sources + +`echo "deb `[`http://ci.netsurf-browser.org/builds/debian/`](http://ci.netsurf-browser.org/builds/debian/)` wheezy/amd64/" >> /etc/apt/sources.list` + +- update repos + +`apt-get update` + +`openjdk-7-jre-headless ` +`screen ` +`build-essential` +`ccache` +`clang` +`git` +`pkg-config` +`check` +`doxygen` +`libjson0-dev (from our repo - needs bugfixes `[`http://ci.netsurf-browser.org/builds/debian/`](http://ci.netsurf-browser.org/builds/debian/)`)` +`libexpat1-dev` +`libxml-perl` +`libxml-xpath-perl` +`lcov` +`gcovr (from our repo)` +`gperf` +`flex` +`bison` +`libpng-dev` +`libjpeg-dev` +`libmozjs185-dev` +`libglib2.0-dev` +`libcurl4-openssl-dev` +`liblcms1-dev` +`libxml2-dev` +`librsvg2-dev` +`libmng-dev` +`libgtk2.0-dev` +`libmozjs-dev` + +### config + +- on master jenkins use "manage nodes" to create new node. Ensure + "remote fs root" is set to /home/netsurf/jenkins +- create netsurf user +- as netsurf user: + - wget <http://ci.netsurf-browser.org/jenkins/jnlpJars/slave.jar> + - run screen + - create jenkins-slave.sh + +`#!/bin/bash` + +`java -Djava.awt.headless=true -jar slave.jar -jnlpUrl `[`http://ci.netsurf-browser.org/jenkins/computer/chimera/slave-agent.jnlp`](http://ci.netsurf-browser.org/jenkins/computer/chimera/slave-agent.jnlp)` -secret 0123456789abcdef01234567890abcdef` + +- - run jenkins-slave.sh + - create new screen tab + - create ssh keypair (accept defaults - no password) + +`ssh-keygen -t rsa -C "netsurf(a)cislave0.netsurf-browser.org"` + +- - copy .ssh/id\_rsa.pub from slave to jenkins master node and + append to /home/netsurf/.ssh/authorized\_keys + +`scp ci.netsurf-browser.org:.ssh/id_rsa.pub .id_rsa.pub` +`cat id_rsa.pub >> .ssh/authorized_keys` + +- - copy .ssh/id\_rsa.pub from master node to slave and append to + /home/netsurf/.ssh/authorized\_keys + - create reverse-ssh.sh (change tunnel port number!) + +`#!/bin/sh` + +`ssh -R 22224:localhost:22 netsurf(a)ci.netsurf-browser.org 'bash -c "while true; do echo .; sleep 60; done"'` + +- - run reverse-ssh.sh + - on the master create a shell script to use the ssh tunnel + connection, thus firewalls etc are moot as long as the slave can + connect to the master + +`ssh netsurf@localhost -p 22223` + diff --git a/continuous_integration_freebsd_setup.mdwn b/continuous_integration_freebsd_setup.mdwn new file mode 100644 index 0000000..d2bde05 --- /dev/null +++ b/continuous_integration_freebsd_setup.mdwn @@ -0,0 +1,67 @@ +[[!meta title="Continuous Integration FreeBSD Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2014-12-21T02:25:02Z"]] + + +[[!toc]] + +Manual setup of FreeBSD 10.1 +---------------------------- + +Install VM from ISO the usual 1G of RAM and 40G of disc is sufficient. +The install will ask for root password, also create a jenkins user and +give it a password and home dir of /var/lib/jenkins . + +I had lots of issues trying to get ps2 mouse support working, the usb +mouse did work but a CI slave does not need it. + +enable serial console + +`echo 'console="comconsole"' >> /boot/loader.conf` + +ensure pkg-config is replaced by the freebsd equivalent + +`pkg set -o devel/pkg-config:devel/pkgconf` +`pkg install -f devel/pkgconf` + +### required packages + +Ensure all ports were added in the install or mess with ports as needed + +The first run of the pkg command will prompt you to install it. + +`pkg install curl` + +is a good starting place. + +Required packages: + +`git` +`gmake` +`bash` +`ccache` +`flex` +`bison` +`png` +`jpeg` +`wget ` +`gtk2` +`openssl` +`p5-HTML-Parser` +`screen` +`gperf` +`rsync` +`openjdk` + +### config + +on master jenkins use "manage nodes" to create new node. Ensure "remote +fs root" is set to /var/lib/jenkins add variable JENKINS\_HOME set to +/var/lib/jenkins + +As superuser on slave: + +- create jenkins user + +`adduser -home /var/lib` + diff --git a/continuous_integration_haiku_slave_setup.mdwn b/continuous_integration_haiku_slave_setup.mdwn new file mode 100644 index 0000000..cde58e8 --- /dev/null +++ b/continuous_integration_haiku_slave_setup.mdwn @@ -0,0 +1,83 @@ +[[!meta title="Continuous Integration Haiku Slave Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2014-11-21T12:14:02Z"]] + + +[[!toc]] install nightly x86 GCC 2 +Hybrid (http://download.haiku-os.org/nightly-images/x86\_gcc2\_hybrid/) + +once installed + +enable sshd with + +`useradd sshd` + +default user is "user" + +set default password with passwd + +` shutdown -r` + +restart system + +install build deps (possibly some already present) + +`pkgman install git curl_devel libpng_devel jpeg_devel openssl_devel libiconv_devel expat_devel gperf html_parser devel:libiconv_x86 devel:libssl_x86 devel:libexpat_x86 cmd:pkg_config_x86 ccache` + +ssh keys +-------- + +create ssh keypair (accept defaults - no password) + +`ssh-keygen -t rsa -C "netsurf(a)cislave0.netsurf-browser.org"` + +copy /boot/home/config/settings/ssh/id\_rsa.pub from slave to jenkins +master node and append to /home/netsurf/.ssh/authorized\_keys + +`scp /boot/home/config/settings/ssh/id_rsa.pub foo@ci.netsurf-browser.org:cislave3.id_rsa.pub` + +copy .ssh/id\_rsa.pub from master node to slave and append to +/boot/home/config/settings/ssh/authorized\_keys + +`scp ci.netsurf-browser.org:.ssh/id_rsa.pub id_rsa.pub` +`cat id_rsa.pub >> /boot/home/config/settings/ssh/authorized_keys` + +jenkins slave setup +------------------- + +install java\_x86 + +`pkgman install openjdk` + +edit shell profile /etc/profile.d/openjdk.sh + +`` JAVA_CONFIG=`which java-config || which java-config-x86` `` +`` JAVA_HOME=`$JAVA_CONFIG -H` `` +`export JAVA_HOME` + +create jenkins-slave.sh + +`#!/bin/bash` + +`# use gcc4 in preference to gcc2 as some libraries use c99 constructs` +`export PATH=/system/bin/x86:$PATH` + +`nohup java -Djava.awt.headless=true -jar slave.jar -jnlpUrl `[`http://ci.netsurf-browser.org/jenkins/computer/cislave3/slave-agent.jnlp`](http://ci.netsurf-browser.org/jenkins/computer/cislave3/slave-agent.jnlp)` -secret 1234 >jenkins-slave.output &` + +copy the script to /boot/home/config/settings/boot/launch/ to make it +start on boot + +system can be manually restarted with + +`shutdown -r` + +current issues +-------------- + +As of 24th June 2014 we have some persistant kernel crashes on the +active CI slave. Bugs are: + +<https://dev.haiku-os.org/ticket/10975> + +<https://dev.haiku-os.org/ticket/10977> + diff --git a/continuous_integration_mac_os_x_setup.mdwn b/continuous_integration_mac_os_x_setup.mdwn new file mode 100644 index 0000000..9fa4895 --- /dev/null +++ b/continuous_integration_mac_os_x_setup.mdwn @@ -0,0 +1,9 @@ +[[!meta title="Continuous Integration Mac OS X Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-02-06T11:36:48Z"]] + + +[[!toc]] + +1. REDIRECT [[Continuous Integration Mac OS X Snow Leopard Setup|continuous_integration_mac_os_x_snow_leopard_setup]] + diff --git a/continuous_integration_mac_os_x_snow_leopard_setup.mdwn b/continuous_integration_mac_os_x_snow_leopard_setup.mdwn new file mode 100644 index 0000000..5df37ab --- /dev/null +++ b/continuous_integration_mac_os_x_snow_leopard_setup.mdwn @@ -0,0 +1,80 @@ +[[!meta title="Continuous Integration Mac OS X Snow Leopard Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-02-06T11:52:56Z"]] + + +[[!toc]] + +Manual Installation +------------------- + +Install snow leopard from master discs + +Create jenkins user + +Install XCode + +Software update to latest version + +Enable remote login (sshd) + +if xcode 4 is installed you need to do: + +`sudo xcodebuild -license` + +Install [[https://code.google.com/p/tunnelblick/ tunnelblick|https///code.google.com/p/tunnelblick/_tunnelblick]] and configure for +auto start openvpn to ci master + +Download Mac Ports: + +`curl -o MacPorts-2.3.1-10.6-SnowLeopard.pkg `[`https://distfiles.macports.org/MacPorts/MacPorts-2.3.1-10.6-SnowLeopard.pkg`](https://distfiles.macports.org/MacPorts/MacPorts-2.3.1-10.6-SnowLeopard.pkg) + +double click on the pkg file to install + +Update ports database ready for use + +`export PATH=/opt/local/bin:/opt/local/sbin:$PATH` +`sudo port -v selfupdate` + +install required packages + +`sudo port install git ccache expat openssl curl libjpeg-turbo libpng p5-html-parser screen bison` + +As jenkins user: + +create jenkins workspace directory + +`mkdir jenkins` + +download slave jar + +`curl -o slave.jar `[`http://ci.netsurf-browser.org/jenkins/jnlpJars/slave.jar`](http://ci.netsurf-browser.org/jenkins/jnlpJars/slave.jar) + +Add node on jenkins master CI instance + +`Name cislave7` +`Description Mac os X build slave` +`# of executors 1` +`Remote FS root /Users/jenkins/jenkins` +`Labels i686-apple-darwin10` + +take note of secret for use. + +create jenkins slave script + +`cat << EOF > jenkins-slave.sh` +`#!/bin/sh` + +`java -Djava.awt.headless=true -jar slave.jar -jnlpUrl `[`http://ci.netsurf-browser.org/jenkins/computer/cislave7/slave-agent.jnlp`](http://ci.netsurf-browser.org/jenkins/computer/cislave7/slave-agent.jnlp)` -secret 1234` +`EOF` +`chmod a+x jenkins-slave.sh` + +create ssh keypair (accept defaults - no password) + +`ssh-keygen -t rsa -C "netsurf(a)cislave8.netsurf-browser.org"` + +copy .ssh/id\_rsa.pub from slave to jenkins master node and append to +/home/netsurf/.ssh/authorized\_keys + +start slave daemon in screen + diff --git a/continuous_integration_mac_os_x_yosemite_setup.mdwn b/continuous_integration_mac_os_x_yosemite_setup.mdwn new file mode 100644 index 0000000..8acf882 --- /dev/null +++ b/continuous_integration_mac_os_x_yosemite_setup.mdwn @@ -0,0 +1,77 @@ +[[!meta title="Continuous Integration Mac OS X Yosemite Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-02-06T14:27:38Z"]] + + +[[!toc]] Install yosemite + +set system name in system preferences-\>sharing + +Update system in app store + +Install Xcode from app store + +install xcode commandline tools + +`xcode-select --install` + +accept licence + +`xcodebuild -license` + +install java + +install [[https://www.macports.org/install.php Mac Ports|https///www.macports.org/install.php_mac_ports]] + +Update ports database ready for use + +`sudo port -v selfupdate` +`sudo port upgrade outdated` + +install required packages + +`sudo port install git ccache expat openssl curl libjpeg-turbo libpng p5-html-parser screen bison pkgconfig` + +create jenkins user + +enable ssh login for jenkins user in system +preferences-\>sharing-\>remote login + +Add node on jenkins master CI instance. + +`Name cislave14` +`Description Mac os X yosemite build slave` +`# of executors 2` +`Remote FS root /Users/jenkins/jenkins` +`Labels x86_64-apple-darwin14.5.0` + +take note of secret and slave url for use in next steps. + +As jenkins user: + +create jenkins workspace directory + +`mkdir jenkins` + +download slave jar + +`curl -o slave.jar `[`http://ci.netsurf-browser.org/jenkins/jnlpJars/slave.jar`](http://ci.netsurf-browser.org/jenkins/jnlpJars/slave.jar) + +create jenkins slave script + +`cat << EOF > jenkins-slave.sh` +`#!/bin/sh` + +`java -Djava.awt.headless=true -jar slave.jar -jnlpUrl `[`http://ci.netsurf-browser.org/jenkins/computer/cislave7/slave-agent.jnlp`](http://ci.netsurf-browser.org/jenkins/computer/cislave7/slave-agent.jnlp)` -secret 1234` +`EOF` +`chmod a+x jenkins-slave.sh` + +create ssh keypair (accept defaults - no password) + +`ssh-keygen -t rsa -C "netsurf(a)cislave8.netsurf-browser.org"` + +copy .ssh/id\_rsa.pub from slave to jenkins master node and append to +/home/netsurf/.ssh/authorized\_keys + +start slave daemon in screen + diff --git a/continuous_integration_manual_debian_wheezy_setup.mdwn b/continuous_integration_manual_debian_wheezy_setup.mdwn new file mode 100644 index 0000000..cbea4da --- /dev/null +++ b/continuous_integration_manual_debian_wheezy_setup.mdwn @@ -0,0 +1,9 @@ +[[!meta title="Continuous Integration Manual Debian Wheezy Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2014-09-18T15:54:45Z"]] + + +[[!toc]] + +1. REDIRECT [[Continuous Integration Debian Wheezy Setup|continuous_integration_debian_wheezy_setup]] + diff --git a/continuous_integration_manual_haiku_slave_setup.mdwn b/continuous_integration_manual_haiku_slave_setup.mdwn new file mode 100644 index 0000000..0b0a4d4 --- /dev/null +++ b/continuous_integration_manual_haiku_slave_setup.mdwn @@ -0,0 +1,9 @@ +[[!meta title="Continuous Integration Manual Haiku Slave Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2014-09-18T15:58:26Z"]] + + +[[!toc]] + +1. REDIRECT [[Continuous Integration Haiku Slave Setup|continuous_integration_haiku_slave_setup]] + diff --git a/continuous_integration_manual_openbsd_setup.mdwn b/continuous_integration_manual_openbsd_setup.mdwn new file mode 100644 index 0000000..8a83191 --- /dev/null +++ b/continuous_integration_manual_openbsd_setup.mdwn @@ -0,0 +1,9 @@ +[[!meta title="Continuous Integration Manual OpenBSD Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2014-09-18T15:56:47Z"]] + + +[[!toc]] + +1. REDIRECT [[Continuous Integration OpenBSD Setup|continuous_integration_openbsd_setup]] + diff --git a/continuous_integration_openbsd_setup.mdwn b/continuous_integration_openbsd_setup.mdwn new file mode 100644 index 0000000..6057e69 --- /dev/null +++ b/continuous_integration_openbsd_setup.mdwn @@ -0,0 +1,127 @@ +[[!meta title="Continuous Integration OpenBSD Setup"]] +[[!meta author="Kyllikki"]] +[[!meta date="2015-05-03T07:53:24Z"]] + + +[[!toc]] + +Manual setup of OpenBSD 5.7 +--------------------------- + +### system prep + +- set serial console up for VM + <http://www.openbsd.org/faq/faq7.html#SerCon> + +### required packages + +Ensure all ports were added in the install or mess with ports as needed + +`pkg_add -v jdk-1.7.0.71v0 screen-4.0.3p4 ccache gcc-4.9.2p3` +`pkg_add -v rsync-3.1.1-iconv git check doxygen ` +`pkg_add -v gperf flex bison gtk+2 png jpeg spidermonkey-1.9.2.28p1v0` +`pkg_add -v wget curl bash gmake p5-HTML-Parser` + +### config + +Add node on jenkins master CI instance + +`Name cislave6` +`Description OpenBSD 5.7 worker` +`# of executors 1` +`Remote FS root /var/lib/jenkins` +`Labels amd64-unknown-openbsd5.7` + +take note of secret for use. + +add jenkins user + +`mkdir /var/lib` +`adduser -home /var/lib` + +login as jenkins user + +download slave jar + +`curl -o slave.jar `[`http://ci.netsurf-browser.org/jenkins/jnlpJars/slave.jar`](http://ci.netsurf-browser.org/jenkins/jnlpJars/slave.jar) + +create jenkins slave script + +`cat << EOF > jenkins-slave.sh` +`#!/bin/sh` + +`java -Djava.awt.headless=true -jar slave.jar -jnlpUrl `[`http://ci.netsurf-browser.org/jenkins/computer/cislave6/slave-agent.jnlp`](http://ci.netsurf-browser.org/jenkins/computer/cislave6/slave-agent.jnlp)` -secret 1234` +`EOF` +`chmod a+x jenkins-slave.sh` + +create ssh keypair (accept defaults - no password) + +`ssh-keygen -t rsa -C "netsurf(a)cislave8.netsurf-browser.org"` + +copy .ssh/id\_rsa.pub from slave to jenkins master node and append to +/home/netsurf/.ssh/authorized\_keys + +start slave daemon in screen + +Manual setup of OpenBSD 5.5 +--------------------------- + +### required packages + +Ensure all ports were added in the install or mess with ports as needed + +`pkg_add -v jdk-1.7.0.21p2v0 screen-4.0.3p4 ccache gcc-4.8.2p2` +`pkg_add -v rsync-3.1.0-iconv git check doxygen ` +`pkg_add -v gperf flex bison gtk+2 png jpeg spidermonkey-1.9.2.28p1v0` +`pkg_add -v wget curl bash gmake p5-HTML-Parser` + +### config + +- on master jenkins use "manage nodes" to create new node. Ensure + "remote fs root" is set to /var/lib/jenkins add variable + JENKINS\_HOME set to /var/lib/jenkins +- As superuser on slave + - mkdir /var/lib + - create jenkins user + +`adduser -home /var/lib` + +Manual setup of OpenBSD 5.4 +--------------------------- + +### required packages + +Ensure all ports were added in the install or mess with ports as needed + +`jdk-1.7.0.21v0` +`screen-4.0.3p3` +`ccache` +`gcc-4.8.1p2` +`rsync-3.0.9p3-iconv` +`git` +`check` +`doxygen` +`gperf` +`flex` +`bison` +`gtk+2` +`png` +`jpeg` +`spidermonkey-1.9.2.28p0v0` +`wget` +`curl` +`bash` +`gmake` +`p5-HTML-Parser` + +### config + +- on master jenkins use "manage nodes" to create new node. Ensure + "remote fs root" is set to /var/lib/jenkins add variable + JENKINS\_HOME set to /var/lib/jenkins +- As superuser on slave + - mkdir /var/lib + - create jenkins user + +`adduser -home /var/lib` + diff --git a/continuous_integration_setup_haiku_slave.mdwn b/continuous_integration_setup_haiku_slave.mdwn new file mode 100644 index 0000000..35b4348 --- /dev/null +++ b/continuous_integration_setup_haiku_slave.mdwn @@ -0,0 +1,7 @@ +[[!meta title="Continuous Integration Setup Haiku Slave"]] +[[!meta author="Kyllikki"]] +[[!meta date="2014-06-20T15:03:32Z"]] + + +[[!toc]] **Page was empty** + diff --git a/css_media_queries.mdwn b/css_media_queries.mdwn new file mode 100644 index 0000000..cbd91f7 --- /dev/null +++ b/css_media_queries.mdwn @@ -0,0 +1,116 @@ +[[!meta title="Css media queries"]] +[[!meta author="Kyllikki"]] +[[!meta date="2015-04-03T13:09:32Z"]] + + +[[!toc]] + +irc discussion +============== + +**jmb** if this is in libcss, then you probably only need to alter +parseMediaList (and friends) + +**kyllikki** oh thats a thought, this should probably be an interface in +libcss rather than open coded in the browser + +**jmb** seems reasonable, given libcss needs it too + +**kyllikki** I worked my way to where it was currently done and it +extracts the entry from the link and does string messing on it + +**jmb** yeah; that's hideous, and should die + +**kyllikki** ok so how ought we to do it? + +**jmb** first, we need to change how libcss represents media. currently, +it's a bitfield. which clearly doesn't work for media queries. so, that +needs to be an object, instead. which probably isn't much work to +change. then, in libcss' parser, parseMediaList will need to change to +understand the new media query grammar + +**kyllikki** ok, i think i know what you mean. thats just altering the +internal libcss representation? + +**jmb** mostly. And then, finally, we need to expose an api to allow a +client to parse an arbitrary string as if it were a media query list. +that should return the new media object. that's needed, because of + +` `<link type="stylesheet" media="<query>`">` + +**kyllikki** right, which is all we currently support right? + +**jmb** libcss supports @media rules. + +<style markdown="1"> +may also have a media attribute. though I don't recall if NetSurf +supports that. + +**kyllikki** +<https://html.spec.whatwg.org/multipage/semantics.html#the-style-element> +it does indeed carry it and netsurf does not support it + +**kyllikki** so how does libcss make decisions about applying the rules? +it obviously has no knowledge of any of the state + +**jmb** see the selection api. when you add a stylesheet to a selection +context, the client provides the media it applies to (e.g. +css\_select\_ctx\_append\_sheet) + +**kyllikki** so we have netsurf call the new libcss api to get the media +object and pass that instead? + +**jmb** seems reasonable + +**kyllikki** but how does libcss make an actual decision whether to +apply the styling or not? + +**jmb** there needs to be a way to construct one computationally, too +(rather than from string), as the client must also pass a media +descriptor into css\_select\_style. which I think answers your question +:) + +**kyllikki** not sure how they are comparable though. I guess thats +implementation detail + +**jmb** likely. today's implementation uses & .the basic concept is: +style information has associated metadata that says what kinds of media +it applies to + +**kyllikki** I guess we have to figure that providing a media object +that represents the browsers current media state is enough to make media +selection comparisons + +*'jmb* and then, when selecting a style, you know what media you are +selecting for, and can then include/exclude specific style information +based on that. and the metadata either applies to the whole of a +stylesheet (be that <link> or + +<style markdown="1"> +), or it applies to part of a stylesheet (through the use of @media +within the CSS). libcss already has all the plumbing for that logic; it +just doesn't have a rich enough mechanism for expressing media +information. or the parse implementation for media queries ;) + +**kyllikki** so + +- first up is moving the existing media api to be an object +- then ensuring the browser creates such objects where needed and + passes them +- only then should the parse api in libcss be expanded, given it + already has one for @media and we want it to be universal + +**jmb** ya + +**kyllikki** so we are already just fucking doing it wrong + +**jmb** well, media queries weren't mature enough when libcss was first +designed for them to be considered and all the stuff in NS mostly +predates libcss, anyway -- certainly that media attribute parsing on +link elements has been around forever + +**kyllikki** yeah but we always add sheets fetched from the dom as +screen! + +**jmb** "oops" :) + diff --git a/developer_weekend__jan_2014_.mdwn b/developer_weekend__jan_2014_.mdwn new file mode 100644 index 0000000..caf32e9 --- /dev/null +++ b/developer_weekend__jan_2014_.mdwn @@ -0,0 +1,72 @@ +[[!meta title="Developer Weekend (Jan 2014)"]] +[[!meta author="Kyllikki"]] +[[!meta date="2013-12-18T11:25:18Z"]] + + +[[!toc]] + +When +---- + +To be held afternoon of 3rd to afternoon of 5th + +Who +--- + +Anyone interested in contributing to NetSurf, we generally have small +discussion times and a great deal of hacking time. Previous events have +crammed in excess of 20 hours working time into the weekend. + +You **must** confirm your attendance no later than the 2nd of January +2014 so i can update the security list. We cannot offer travel +sponsorship to the event and free accommodation is limited (and basic). + +Currently confirmed are + +- Vincent Sanders +- Michael Drake +- Daniel Silverstone +- Rob Kendrick +- John Mark-Bell + +Where +----- + +At the Collabora Cambridge offices: Kett house Station Road Cambridge + +CB1 2JH + +<http://goo.gl/maps/iOb9R> + +This venue has easy access from the railway station and is a twenty +minute walk from the city cenre where national express coaches stop. +Nearest airport is Stanstead and the railway provides good links. + +Vincent has arranged to have accommodation for two people. More might be +accommodated if they do not mind sleeping bags on the floor. Vincent +also has a car and will be designated driver. + +Agenda +------ + +List of ideas to consider and/or work on, if they've not already been +addressed: + +- Forms to use LibDOM +- New layout engine discussion +- State of JS discussion +- More LibCSS work (style interning & sharing) +- Release process was a mad rush for 3.0 + - Do we need to sort anything out? + - Non RISC OS platforms still haven't had a 3.0 release on our + site. + - Sort out the autobuilder generating releases +- Can LibDOM be optimised? +- Hubbub is years behind spec, and causing real bugs. +- media and GStreamer 1.0 integration +- libjpeg turbo +- haru pdf integration +- printing +- Any other 3.1 blockers? +- Urgent bugs? + diff --git a/developer_weekend__mar_2010_.mdwn b/developer_weekend__mar_2010_.mdwn new file mode 100644 index 0000000..2e7b917 --- /dev/null +++ b/developer_weekend__mar_2010_.mdwn @@ -0,0 +1,30 @@ +[[!meta title="Developer Weekend (Mar 2010)"]] +[[!meta author="Tlsa"]] +[[!meta date="2016-09-21T10:30:48Z"]] + + +[[!toc]] + +Goals for NetSurf +----------------- + + 1. Complete jmb/newcache + 2. Fix favicons, godsdamnit + 3. Refactor initialisation to unthread it slightly + -- Make ParserUtils build aliases in, and refactor Hubbub and thus netsurf to not pass it in. + 4. Plan the 2.5 release -- RM=vince + -- RISC OS, Gtk/Linux (Ubuntu/Debian packages?), Framebuffer?, Amiga (if Chris is ready). + -- Bug François about BeOS/Haiku port + -- Check libraries and prepare releases for them + 5. Consider renaming /my_?realloc/i + 6. Plan the abstract IO streams thingy + + + + If we have time for the following, we've not done the above properly: + + + Examine use of libxml tree thingy and see if we can magically replace them with lwc_string + -- If we can, hubbub string interning is worth doing at this time. + + Bring hubbub up to html5 again diff --git a/developer_weekend__nov_2012_.mdwn b/developer_weekend__nov_2012_.mdwn new file mode 100644 index 0000000..b9af068 --- /dev/null +++ b/developer_weekend__nov_2012_.mdwn @@ -0,0 +1,22 @@ +[[!meta title="Developer Weekend (Nov 2012)"]] +[[!meta author="Kyllikki"]] +[[!meta date="2012-11-01T16:00:28Z"]] + + +[[!toc]] List of ideas to consider +and/or work on, if they've not already been addressed: + +- <about:testament> to include library versions +- Release automation +- Purge LibXML usage +- Migrate previous release tags in git repo +- Handle LINK, META, STYLE, etc tags as they're added to the DOM. +- Examine porting spidermonkey to RO +- LibDOM optimisation + - <http://www.netsurf-browser.org/temp/Profiles> + - \_dom\_node\_dispatch\_event takes \>8% causing some of + post-libDOM speed regression + - CSS selection still dominates + - CSS parse takes some time too. +- More? + diff --git a/developer_weekend__nov_2014_.mdwn b/developer_weekend__nov_2014_.mdwn new file mode 100644 index 0000000..dfe9386 --- /dev/null +++ b/developer_weekend__nov_2014_.mdwn @@ -0,0 +1,182 @@ +[[!meta title="Developer Weekend (Nov 2014)"]] +[[!meta author="Tlsa"]] +[[!meta date="2014-11-21T17:41:48Z"]] + + +[[!toc]] There will be a NetSurf +developer weekend on 14, 15, 16 November 2014 in Manchester, hosted at +the offices of Codethink. + +People +------ + +- jmb +- Kinnison +- kyllikki +- rjek +- tlsa + +Stuff +----- + +Some things that may be discussed or worked on include: + +- Review, fix and merge GSoC Hubbub work +- Testing + - Layout: bitmap export via framebuffer frontend, and comparison + - Browser: scripting monkey front end +- Current state of JS + - Duktape? (Quack.) +- URLdb rewrite +- Current state of core browser API +- New layout engine planning +- Squashing old bugs +- Filterable logging stuff +- Performance +- NetSurf to core buildsystem + +Discussions +----------- + +### Libraries + +- Vince recently split out utf8proc and all present hurrahed. +- Libharu appears to be abandonware -- Do we want to take it on, or do + we want to drop it? Decision is to drop it for now, and worry about + it again when we have paginating layout +- Break out most of utils/\* and shunt the rest around? -- Non-urgent + but not vetoed (call it libnsutils) + - Officially, John-Mark Bell acknowledges he's okay to re-license + his code as MIT/Expat + - Officially, Daniel Silverstone acknowledges he's okay to + re-license his code as MIT/Expat + - Officially, Rob Kendrick acknowledges he's okay to re-license + his code as MIT/Expat + - Officially, Michael Drake acknowledges he's okay to re-license + his code as MIT/Expat + - Officially, Vincent Sanders acknowledges he's okay to re-license + his code as MIT/Expat + - Missing permissions: Chris Young, Achal-Aggarwal, Adrian Lees, + Adrien Destuegues, Andrew Duffell, Andrew Sidwell, Andrew + Timmins, Anthony J. Bentley, Chris Williams, François Revol, + James Bursa, James Shaw, Jeffrey Lee, John Tytgat, Kevin Bagust, + Matthew Hambley, Mike Lester, Ole Loots, Philip Pemberton, Phil + Mellor, Richard Wilson, Rob Jackson, Sean Fox, Steve Fryatt, + Sven Weidauer +- Toolchains + - Atari is bugged + - libcurl/openssl updates are often and annoying + - We need to lorry all the things -- Daniel to assist + - GCCSDK not compilable with modern ubuntu (14.04) currently + (maybe update?) (Wheezy works) +- Michael has a load of libcss stuff he hasn't pushed because he's a + silly moo. +- TODO: come back and think about hubbub + +### URLDB + +1. URL (normalised fragmentless nsurl) -\> key/value store (avec + \$indices of various smells) +2. Cookie jar +3. Password bucket +4. Autocompletion database +5. hostname pattern -\> key/value store + +This should be part of libnsutils + +Further design discussion at that time. + +### Layout + +libfandango + +layout context hangs off a DOM document + +Needs: + +- Render API (potentially extended with compositing) +- Font Metrics API +- Scheduler +- CSS handling +- Event injection API? + +Research: + +- Text layout algorithms +- CSS3 features and impact vs. currently understood layout + +Deep thought: + +- inlines + +### JavaScript + +Vince is concerned about nsgenbind -- He feels the idl vs. bnd thing +might be a pain. There are two branches, one in nsgenbind and one in +NetSurf which need finishing. Basically restructuring the output. This +is idle from 12 months ago and needs adopting. + +A C mirror of the IDL object model has to be constructed in order that +we can then bind to an engine. + +Duktape (finally released in October 2014) lacks a lazy evaluation +model. This means that we'd have to build 400 prototypes up front on +every engine initialisation. Expensive in time and memory (can we +perhaps handle this with duktape threads?) + +Spidermonkey JSVERSION is not Spidermonkey's API version -- oopsie + +Our Spidermonkey API version is, unfortunately orphaned (1.7 is pre-NSPR +and we use this everywhere but Linux) 1.8 and 1.85 are post-NSPR and are +the last separable library releases of spidermonkey (and here is the +orphaning). Between 1.7 and 1.8[5] we have significant API/ABI +differences. We currently "patch" this with a header file full of +macros. 1.85 actually refers to the javascript version not spidermonkey. +We're not seeing API stability and we cannot build against more modern +Spidermonkey + +We'd like to split out spidermonkey version and make the macros use +those. Unfortunately pkg-config is a tad pants here due to missing +version information. + +Perhaps we need someone (not Vince to save his brain) to research +duktape's status, capabilities and write a mini report for Vince. + +Ultimate goal would be something like libnsjavascript which builds on +top of duktape, contains the bindings, and abstracts all of that out of +the netsurf repository, so that netsurf simply ends up gluing +browser\_window, libnsjavascript, the dom it got content and fandango +together. + +### Buildsystem + +1. Core buildsystem -\> triplets + - BUILD/HOST/TARGET + - Move the warning flags into the core + - If a platform lacks a triplet, inventorizificate one. + +1. Port NetSurf to the core build system + - May need extensions to core build + - May be feature discovery stuff + - Ensure that testrunner can run any of the random + mini-test-suites we have in NetSurf currently + +So core-buildsystem gains pkg-config.mk kinda thing + +Migration of NetSurf to core build system may be predicated on moving +platform content from frontends into libnsutils + +### Core Window Thing + +Coalescence of all core vs. frontend window abstractions: + +1. Browser Window +2. Treeviews +3. Local history + +Approaches: + +1. Everything is a browser window (abuse Content model) +2. Have a 'Window' superclass, move most interaction to that + abstraction, browser\_window is effectively a subclass + diff --git a/developer_weekend__nov_2016_.mdwn b/developer_weekend__nov_2016_.mdwn new file mode 100644 index 0000000..7e53553 --- /dev/null +++ b/developer_weekend__nov_2016_.mdwn @@ -0,0 +1,36 @@ +[[!meta title="Developer Weekend (Nov 2016)"]] +[[!meta author="Tlsa"]] +[[!meta date="2016-09-21T10:04:30Z"]] + + +[[!toc]] + +People +------ + +Confirmed: + +- John-Mark Bell +- Michael Drake +- Vincent Sanders +- Daniel Silverstone + +Unknown: + +- Rob Kendrick +- Chris Young +- ? + +Agenda +------ + +### Discussions + +- urldb/metadata handling +- ? + +### Possible work items + +- LibCSS media queries +- JavaScript + diff --git a/development_plan.mdwn b/development_plan.mdwn new file mode 100644 index 0000000..c9e8f55 --- /dev/null +++ b/development_plan.mdwn @@ -0,0 +1,98 @@ +[[!meta title="Development Plan"]] +[[!meta author="Chris"]] +[[!meta date="2014-05-11T18:53:19Z"]] + + +[[!toc]] This is a planning +document covering NetSurf development and release goals. + +General +------- + +Historical NetSurf 2 and before +------------------------------- + +These editions are now completely obsolete and upgrading is recommended. + +The SVN revision control system and RISC OS only autobuilder were used +to provide rudimentary CI. + +Releases were principally manual in nature and were oriented around +stability and incremental improvements. + +Development concentrated on expanding functionality in a progression +towards important core functionality. + +Major completed milestones in the 2.x series were: + +- The Hubbub parse library and integrating into NetSurf +- The LibCSS CSS library and integation into NetSurf + +NetSurf 3 +--------- + +This is the current release series where development is concentrated. + +We use git for our [control +system](http://git.netsurf-browser.org|source) and have a full multi +platform [Integration](http://ci.netsurf-browser.org/|Continuous) +system. + +### Improvements in 3.0 + +The first release in the 3 series had several important technical +improvements the main ones were: + +- LibDOM Document Object Model library completed and integrated with + NetSurf +- Libraries using the core buildsystem +- Script support including Spidermonkey javascript interpreter and + basic DOM bindings +- Integrated frame support +- Integrated core treeview allowing for all frontends to benefit from + global history, bookmarks, cookie management + +### The 3 series development overview + +The focus of this series will be on: + +- improving speed and memory efficiency +- improvement of user interaction, e.g. with form widgets +- treeview improvements. +- Improve url database handling +- Improve coockie handling +- Improving DOM integration +- No major improvements are planned for the layout engine until + NetSurf 4.0. +- APNGs are already used in the wild (unlike MNG). While we can + display the first frame, thanks to PNG backwards compatibility, it + would be good to support the animation extension. +- We have always put XHTML though an HTML parser, which works well + enough currently, but it will be good to handle XHTML properly. + +### Active 3 release + +We maintain a page for the forthcoming release listing specific issues +for that release. + +Next release will be [[NetSurf_3.2|netsurf_3.2]] + +Netsurf 4 +--------- + +The focus of this release will be a +[[new layout engine|layout]]. The new layout engine +will enable dynamic changes to pages such as `:hover`, reflowing for +scrollbar insertion. + +It will also add support for features missing from the old layout engine +such as `z-index` and `vertical-align`. + +Javascript DOM integration should be completed and use the dynamic +layout capabilities. + +### Core features + +- [[New layout engine|layout]], capable of dynamic + changes + diff --git a/disc_caching_and_history.mdwn b/disc_caching_and_history.mdwn new file mode 100644 index 0000000..7e84c21 --- /dev/null +++ b/disc_caching_and_history.mdwn @@ -0,0 +1,34 @@ +[[!meta title="Disc Caching and History"]] +[[!meta author="Tlsa"]] +[[!meta date="2009-07-08T14:34:46Z"]] + + +[[!toc]] This page contains ideas +for adding a disk cache and improving browsing history. + +Aims +---- + +- Faster page loading using a disk cache +- Navigating local or global history will show page exactly as it was +- Groundwork for exciting future features like :- +- "This page has changed since your last visit 3 minutes ago!" +- Offline browsing +- Go back to the past +- Highlight new text / diff +- ??? + +Ideas +----- + +- Each retrieved resource is assigned an id (could just be an + incrementing counter) (so the id refers to a URL at a particular + time and as the result of a particular GET or POST) +- Almost everything refers to those ids instead of URLs (pages with + objects, local history, global history) +- Disk caching can be switched on or off (for devices without storage, + private mode, etc.) +- Disk cache stores headers, data, various metadata, ids of objects it + uses +- Memory cache remains (but modified to be like disk cache) + diff --git a/documentation.mdwn b/documentation.mdwn new file mode 100644 index 0000000..aee953b --- /dev/null +++ b/documentation.mdwn @@ -0,0 +1,27 @@ +[[!meta title="Documentation"]] +[[!meta author="DanielSilverstone"]] +[[!meta date="2012-07-01T07:10:01Z"]] + + +[[!toc]] + +|colspan=2 style="background: gray; color: white" | NetSurf Code Documentation| +|-----------------------------------------------------------------------------| +|Organization and Conventions|1. [[Modular coding style|documentation/modular_coding_style]] +2. [[Directory structure|documentation/directory_structure]] +3. [[Error handling|documentation/errors]] +4. [[Memory management|documentation/memory]]| +|Features|1. [[Content handling|documentation/contents]] +2. [[Layout engine|documentation/layout]] +3. [[Frames|documentation/frames]] +4. [[Printing|documentation/printing]] +5. [[Treeview|documentation/treeview]]| +|Platform-specifics|1. [[Front end functions|documentation/front_end_functions]] +2. [[Caveat RISC OS|caveat_risc_os]] +3. [[GTK interface|documentation/gtk_interface]]| +|References|1. [[References|documentation/references]] +2. [[Getting started|documentation/gettingcoding]] (with coding on + NetSurf) +3. [[Git Cheat Sheet|documentation/gitcheatsheet]]| + + diff --git a/documentation/buildingforamigaos.mdwn b/documentation/buildingforamigaos.mdwn new file mode 100644 index 0000000..23fcb26 --- /dev/null +++ b/documentation/buildingforamigaos.mdwn @@ -0,0 +1,57 @@ +[[!meta title="Documentation/BuildingForAmigaOS"]] +[[!meta author="Chris"]] +[[!meta date="2016-06-27T19:13:10Z"]] + + +[[!toc]] + +Building NetSurf for AmigaOS 3.5+ (m68k-unknown-amigaos) +======================================================== + +Rough notes on how to build NetSurf for AmigaOS 3.5+. There may be an +easier way, but this works for me! + +Building for AmigaOS 4.x (ppc-amigaos) is similar. + +Toolchain +--------- + +Toolchain is built using something like this: + +`git clone `[`git://git.netsurf-browser.org/toolchains.git`](git://git.netsurf-browser.org/toolchains.git) +`cd ./toolchains/m68k-unknown-amigaos` +`sudo make` +`cd ../sdk` +`sudo GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/m68k-unknown-amigaos/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/m68k-unknown-amigaos/env make` + +Libraries +--------- + +Make/install buildsystem first! + +Clone and build the libraries with: + +`make HOST=m68k-unknown-amigaos` +`sudo make HOST=m68k-unknown-amigaos install` + +NetSurf +------- + +Build NetSurf with + +`make TARGET=amigaos3` + +Building under Cygwin +===================== + +Cygwin is a bit troublesome, as the toolchain setup is designed for +Debian 64-bit. Cygwin apparently works but there are two changes +required (I know nothing about these changes beyond what's here): + +- c-parse.in: I must replace two occurrences of YYLEX by yylex() +- collect2.c: I must add 0666 as parameter of the open for + redir\_handle. + +There is a script to build NetSurf for AmigaOS3 under Cygwin here: +<https://github.com/DNADNL/NetScript> + diff --git a/documentation/buildingforriscosquickstart.mdwn b/documentation/buildingforriscosquickstart.mdwn new file mode 100644 index 0000000..5a4d53a --- /dev/null +++ b/documentation/buildingforriscosquickstart.mdwn @@ -0,0 +1,85 @@ +[[!meta title="Documentation/BuildingForRISCOSQuickStart"]] +[[!meta author="Sprow"]] +[[!meta date="2015-08-11T21:40:32Z"]] + + +[[!toc]] + +<strong>Note:</strong> +<span style="text-indent:2em; display: inline-block;">Commands proceeded +by \# should be done as root</span> +<span style="text-indent:2em; display: inline-block;">Commands proceeded +by \$ should be done as your normal user</span> +Depending on how your system is configured you may need to log in as +root, or you may be able to use sudo. + +Building for the first time +--------------------------- + +### Install Debian or Ubuntu in a Virtual Machine, such as Virtual Box or kvm. + +Follow the rest of these instructions inside it. + +An example [guide for installing Debian in virtualbox on +windows](http://www.brianlinkletter.com/installing-debian-linux-in-a-virtualbox-virtual-machine/) +is linked here, however this is for Debian 6 but if followed current +Debian (version 8) should be installed. + +### Get a copy of env.sh, which manages a build environment for you, and have it install the dependencies. + +`$ wget `[`http://git.netsurf-browser.org/netsurf.git/plain/Docs/env.sh`](http://git.netsurf-browser.org/netsurf.git/plain/Docs/env.sh) +`# source env.sh` +`# ns-package-install` + +### Download and install the latest arm-unknown-riscos toolchain from <http://ci.netsurf-browser.org/builds/toolchains/> + +<strong>Note :</strong> +The pre-compiled toolchains are for x86\_64 (64 bit x86 processors) and +therefore require the Virtual Machine be installed 64Bit + +`$ wget `[`http://ci.netsurf-browser.org/builds/toolchains/arm-unknown-riscos-2015-03-19_14-33-21.tar.xz`](http://ci.netsurf-browser.org/builds/toolchains/arm-unknown-riscos-2015-03-19_14-33-21.tar.xz) +`# tar xvf arm-unknown-riscos-2015-01-15_13-14-02.tar.xz -C /` + +### Clone all the NetSurf repositories. This creates a workspace for you to work in, /home/yourname/dev-netsurf/workspace + +`$ TARGET_ABI=arm-unknown-riscos source env.sh` +`$ ns-clone` + +### Build and install the libraries + +`$ ns-pull-install` + +### Switch to your newly created NetSurf workspace + +`$ rm env.sh` +`$ cd ~/dev-netsurf/workspace` +`$ TARGET_ABI=arm-unknown-riscos source env.sh` + +### Build NetSurf + +`$ cd netsurf` +`$ make TARGET=riscos` + +### Zip up the build for transfer to your RISC OS machine + +`$ make TARGET=riscos package` + +You can alternatively use Sunfish to access your VM via NFS and run your +build directly, but that is outside the scope of this document. + +To confirm you're running what you just build, you can visit +<about:testament> in NetSurf to view information about the build. + +Updating and building again +--------------------------- + +Next time you come to build NetSurf, remember to execute this before +working with the workspace: + +`$ TARGET_ABI=arm-unknown-riscos source env.sh` + +You can re-pull and re-install the libraries (to get the latest +versions) by simply reexecuting this: + +` $ ns-pull-install` + diff --git a/documentation/contents.mdwn b/documentation/contents.mdwn new file mode 100644 index 0000000..dea18da --- /dev/null +++ b/documentation/contents.mdwn @@ -0,0 +1,148 @@ +[[!meta title="Documentation/Contents"]] +[[!meta author="James Bursa"]] +[[!meta date="2010-03-01T02:56:11Z"]] + + +[[!toc]] The modules in the content +directory provide the infrastructure for fetching data, managing it in +memory, and converting it for display. + +Contents +-------- + +The data related to each URL used by NetSurf is stored in a 'struct +content' (known as a "content"). A content contains + +- a 'content type' which corresponds to the MIME type of the URL (for + example CONTENT\_HTML, CONTENT\_JPEG, or CONTENT\_OTHER) +- a status (for example LOADING, DONE, or ERROR) +- type independent data such as the URL and raw source bytes +- a union of structs for type dependent data (for example 'struct + content\_html\_data') + +Contents are stored in a global linked list 'content\_list', also known +as the "memory cache". + +The content\_\* functions provide a general interface for handling these +structures. They use a table of handlers to call type-specific code +('handler\_map'). For example, content\_redraw() may call html\_redraw() +or nsjpeg\_redraw() depending on the type of content. + +Each content has a list of users. A user is a callback function which is +sent a message (called) when something interesting happens to the +content (for example, it's ready to be displayed). Examples of users are +browser windows (of HTML contents) and HTML contents (of JPEG contents). + +Some content types may not be shared among users: an HTML content is +dependent on the width of the window, so sharing by two or more windows +wouldn't work. Thus there may be more than one content with the same URL +in memory. + +Content status +-------------- + +The status of a content follows a fixed order. Certain content functions +change the status, and each change of status results in a message to all +users of the content: + +- content\_create() creates a content in status TYPE\_UNKNOWN +- content\_set\_type() takes a content TYPE\_UNKNOWN to one of + - LOADING (sends optional MSG\_NEWPTR followed by MSG\_LOADING) + - ERROR (sends MSG\_ERROR) +- content\_process\_data() takes LOADING to one of + - LOADING (no message) + - ERROR (MSG\_ERROR) +- content\_convert() takes LOADING to one of + - READY (MSG\_READY) + - DONE (MSG\_READY, MSG\_DONE) + - ERROR (MSG\_ERROR) +- a content can move from READY to DONE by itself, for example HTML + contents become DONE when all images are fetched and the document is + reformatted (MSG\_DONE) +- content\_stop() aborts loading of a READY content and results in + status DONE (MSG\_DONE) + +Type functions +-------------- + +The type-specific functions for a content are as follows (where 'type' +is replaced by something): + +- type\_create():: called to initialise type-specific fields in the + content structure. Optional. +- type\_process\_data():: called when some data arrives. Optional. +- type\_convert():: called when data has finished arriving. The + content needs to be converted for display. Must set the status to + one of CONTENT\_STATUS\_READY or CONTENT\_STATUS\_DONE if no error + occurs. Optional, but probably required for non-trivial types. +- type\_reformat():: called when, for example, the window has been + resized, and the content needs reformatting for the new size. + Optional. +- type\_destroy():: called when the content is being destroyed. Free + all resources. Optional. +- type\_redraw():: called to plot the content to screen. +- type\_redraw\_tiled():: called to plot the content tiled across the + screen. Optional. +- type\_stop(): called when the user interrupts in status + CONTENT\_STATUS\_READY. Must stop any processing and set the status + to CONTENT\_STATUS\_DONE. Required iff the status can be + CONTENT\_STATUS\_READY. +- type\_open(): called when a window containing the content is opened. + Probably only makes sense if no\_share is set for the content type + in handler\_map. Optional. +- type\_close():: called when the window containing the content is + closed. Optional. + +If an error occurs in type\_create(), type\_process\_data(), +type\_convert(), CONTENT\_MSG\_ERROR must be broadcast and false +returned. The \_destroy function will be called soon after. + +Memory allocation +----------------- + +Each content structure is allocated using talloc, and all data related +to a content should be allocated as a child block of the content +structure using talloc. This will ensure that all memory used by a +content is freed. + +Contents must keep an estimate of non-talloc allocations in the +total\_size attribute. This is used to control the size of the memory +cache. + +Creating and fetching contents +------------------------------ + +A high-level interface to starting the process of fetching and +converting an URL is provided by the fetchcache functions, which check +the memory cache for a url and fetch, convert, and cache it if not +present. + +The fetch module provides a low-level URL fetching interface. + +Adding support for a new content type +------------------------------------- + +Addition of support for new content types is fairly simple and the +process is as follows: + +- Implement, or at least stub out, the new content type handler. See + the 'Type Functions' section above for details of the type handler + API. +- Add a type value to the 'content\_type' enumeration + (content\_type.h) +- Add an entry for the new type's private data in the 'data' union + within 'struct content' (content.h) +- Add appropriate mappings in the 'mime\_map' table from MIME type + strings to the 'content\_type' value created. (content.c) +- Add a textual name for the new content type to + 'content\_type\_name'. This array is indexed by 'content\_type'. + (content.c) +- Add an entry for the new content type's handler in the + 'handler\_map' array. This array is indexed by 'content\_type'. + (content.c) + +For examples of content type handlers, consult the image/ directory. The +JPEG handler is fairly self-explanatory. + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/directory_structure.mdwn b/documentation/directory_structure.mdwn new file mode 100644 index 0000000..e9d00a7 --- /dev/null +++ b/documentation/directory_structure.mdwn @@ -0,0 +1,45 @@ +[[!meta title="Documentation/Directory Structure"]] +[[!meta author="Tlsa"]] +[[!meta date="2012-10-23T10:53:54Z"]] + + +[[!toc]] NetSurf's code is broadly +split into two; core code, and front end code. All ports make use of the +core code and each port has its own front end code. + +Directory Structure +------------------- + +The source is split at top level as follows: + +### Core + +#### Content handling + +- **content** -- Generic content handling: Fetching, caching, + managing, etc +- **css** -- CSS content specific handling +- **image** -- Image content specific handling (conversion) +- **javascript** -- JavaScript content specific handling +- **render** -- HTML and Text content specific handling (processing, + layout, render) + +#### Other core components + +- **desktop** -- Non-platform specific front-end +- **utils** -- Misc reusable components + +### Front ends + +- **amiga** -- AmigaOS specific code +- **atari** -- Atari FreeMiNT code +- **beos** -- BeOS/Haiku specific code +- **cocoa** -- Mac OS X specific code +- **framebuffer** -- Framebuffer specific code +- **gtk** -- GTK specific code +- **monkey** -- Terminal based test engine specific code +- **riscos** -- RISC OS specific code +- **windows** -- Windows specific code + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/errors.mdwn b/documentation/errors.mdwn new file mode 100644 index 0000000..2e818ab --- /dev/null +++ b/documentation/errors.mdwn @@ -0,0 +1,36 @@ +[[!meta title="Documentation/Errors"]] +[[!meta author="James Bursa"]] +[[!meta date="2010-03-01T02:55:53Z"]] + + +[[!toc]] This section describes +error handling in the code. + +The most common serious error is memory exhaustion. If malloc(), +strdup(), etc. fails, clean up and free any partially complete +structures leaving data in a consistent state, and return a value which +indicates failure, eg. 0 for functions which return a pointer (document +the value in the function documentation). The caller should then +propagate the failure up in the same way. At some point, the error +should stop being passed up and be reported to the user using + + warn_user("NoMemory", 0); + +The other common error is one returned by a RISC OS SWI. Always use "X" +SWIs, something like this: + + os_error *error; + error = xwimp_get_pointer_info(&pointer); + if (error) { + LOG(("xwimp_get_pointer_info: 0x%x: %s\n", + error->errnum, error->errmess)); + warn_user("WimpError", error->errmess); + return false; + } + +If an error occurs during initialisation, in most cases exit immediately +using die(), since this indicates that there is already insufficient +memory, or a resource file is corrupted, etc. + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/frames.mdwn b/documentation/frames.mdwn new file mode 100644 index 0000000..236277f --- /dev/null +++ b/documentation/frames.mdwn @@ -0,0 +1,64 @@ +[[!meta title="Documentation/Frames"]] +[[!meta author="James Bursa"]] +[[!meta date="2010-03-01T02:56:32Z"]] + + +[[!toc]] Frames cut across many +parts of the browser. + +Representation in content +------------------------- + +During box-tree construction (box\_construct.c), frameset, frame, and +iframe elements are converted into structures in the 'struct content' +for the HTML document. + +Framesets and frames form a tree of 'struct content\_html\_frames' at +content-\>data.html.frameset. For example, the source + + <nowiki> + <frameset rows="50%,50%"> + <frameset cols="40,200"> + <frame name="A" src="aaa"> + <frame name="B" src="bbb"> + </frameset> + <frameset cols="3*,*"> + <frame name="C" src="ccc"> + <frame name="D" src="ddd"> + </frameset> + </frameset> + </nowiki> + +results in the tree + + 0x6099f2f4 (2 1) w0px h0px (margin w0 h0) (scrolling no) + (0 0): 0x608b730c (1 2) w100% h50% (margin w0 h0) (scrolling no) + (0 0): 0x608dae74 (0 0) w40px h100% (margin w0 h0) 'A' <aaa> (scrolling auto) border 0 + (0 1): 0x608daeb0 (0 0) w200px h100% (margin w0 h0) 'B' <bbb> (scrolling auto) border 0 + (1 0): 0x608b7348 (1 2) w100% h50% (margin w0 h0) (scrolling no) + (0 0): 0x608d9b4c (0 0) w3* h100% (margin w0 h0) 'C' <ccc> (scrolling auto) border 0 + (0 1): 0x608d9b88 (0 0) w1* h100% (margin w0 h0) 'D' <ddd> (scrolling auto) border 0 + +(output from html\_dump\_frameset()). + +Creation of browser windows +--------------------------- + +When a document containing frames is displayed in a browser window, +child windows are created for frames and iframes. This occurs when a +browser window receives a CONTENT\_MSG\_READY in +browser\_window\_callback(), which calls +browser\_window\_create\_frameset(). + +browser\_window\_create\_frameset() constructs a tree of 'struct +browser\_window' corresponding to the tree of 'struct +content\_html\_frames'. For each new browser\_window, it calls +gui\_create\_browser\_window() to create and open the actual +platform-specific window (represented by a 'struct gui\_window'). + +When this is completed it calls browser\_window\_recalculate\_frameset() +which calculates the positions of each frame in pixels and calls +gui\_window\_position\_frame() to position each one. + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/front_end_functions.mdwn b/documentation/front_end_functions.mdwn new file mode 100644 index 0000000..4e056f4 --- /dev/null +++ b/documentation/front_end_functions.mdwn @@ -0,0 +1,81 @@ +[[!meta title="Documentation/Front end functions"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-11-26T22:20:01Z"]] + + +[[!toc]] This page documents the +functions that need to be implemented by each platform's front end. + +: *Note: in progress and incomplete* + +The prototypes for these functions are usually in gui/gui.h. The +implementations live in the platform code, for example **gui\_init()** +is implemented in each of amiga/gui.c, beos/beos\_gui.cpp, +framebuffer/gui.c, gtk/gtk\_gui.c, riscos/gui.c, and windows/gui.c. Of +course only one of those implementations is ever compiled into a binary +of NetSurf. + +Initialization and clean-up +--------------------------- + +### int main(int argc, char\*\* argv) + +This is the standard C entry point. It should do any critical very-early +initialization is required, and finish with + +`return netsurf_main(argc, argv);` + +The prototype may differ on some platforms. + +### void gui\_init(int argc, char\*\* argv) + +General initialization of platform stuff. Prepare the gui for use, but +don't yet open any windows. + +It should call: + +- hubbub\_initialise(), with the platform-specific path to the Aliases + file +- options\_read(), if saving and loading options is supported +- messages\_load(), with the platform-specific path to the Messages + file +- save\_complete\_init(), if save complete is used +- urldb\_load() and urldb\_load\_cookies() + +Should set default\_stylesheet\_url, quirks\_stylesheet\_url, and +adblock\_stylesheet\_url. + +(Called by netsurf\_init() in desktop/netsurf.c.) + +### void gui\_init2(int argc, char\*\* argv) + +Last-step of initialization. Can open window(s) by calling +browser\_window\_create() (e.g. depending on argv). + +(Called by netsurf\_init() in desktop/netsurf.c.) + +### void gui\_quit(void) + +Prepare for exit by doing whatever is needed by the platform. + +It should call: + +- urldb\_save\_cookies() and urldb\_save() +- hubbub\_finalise() + +(Called by netsurf\_exit() in desktop/netsurf.c.) + +Multitasking +------------ + +### void gui\_multitask(void) + +NetSurf's core will occasionally call this during long-running +operations. It should yield briefly to the OS if applicable, and handle +urgent gui events to keep NetSurf responsive. Then it should return +quickly. + +It **must not** call any function in the core or non-platform code. + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/gettingcoding.mdwn b/documentation/gettingcoding.mdwn new file mode 100644 index 0000000..d53fe33 --- /dev/null +++ b/documentation/gettingcoding.mdwn @@ -0,0 +1,155 @@ +[[!meta title="Documentation/GettingCoding"]] +[[!meta author="Tlsa"]] +[[!meta date="2014-03-15T12:02:06Z"]] + + +[[!toc]] + +Getting started with the NetSurf code base +========================================== + +NetSurf and its libraries are kept in the `git` revision control system. +This document guides though setting up an envronment to build and +develop NetSurf and the NetSurf project libraries from scratch.. + +You can see the `git` repositories at [The NetSurf +Gitweb](http://git.netsurf-browser.org/). + +There are two ways to go. You can use our +[env.sh](http://git.netsurf-browser.org/netsurf.git/plain/Docs/env.sh) +which will fetch the sources from git and build NetSurf and the +libraries with a few commands, or you can set up things manually. + +Easy way: Using NetSurf's env.sh and QUICK-START +------------------------------------------------ + +This makes it simple to git clone the sources for NetSurf and the +project libraries, build and install them. + +To use +[env.sh](http://git.netsurf-browser.org/netsurf.git/plain/Docs/env.sh), +follow the steps in our +[QUICK-START](http://git.netsurf-browser.org/netsurf.git/plain/Docs/QUICK-START) +document. + +Less easy: Manual setup +----------------------- + +If you need to do things manually, the rest of this section will take +you through the process. + +### Preparing your workspace + +NetSurf has a number of libraries which must be built in-order and +installed into your workspace. Each library depends on a core build +system which NetSurf projects use. This build system relies on the +presence of things like `pkg-config` to find libraries and also certain +environment variables in order to work correctly. Assuming you are +preparing a workspace in /home/netsurf/workspace then the following +sequence of commands will set you up. + +`# Make the workspace directory` +`mkdir -p ${HOME}/netsurf/workspace` +`# Change to it` +`cd ${HOME}/netsurf/workspace` +`# Make the temporary install space` +`mkdir inst` +`# Prepare environment script` +`cat > env.sh <<'EOF'` +`export PKG_CONFIG_PATH=${HOME}/netsurf/workspace/inst/lib/pkgconfig::` +`export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${HOME}/netsurf/workspace/inst/lib` +`export PREFIX=${HOME}/netsurf/workspace/inst` +`EOF` + +Whenever you wish to start development in a new shell, run the +following. + +`# Change to workspace` +`cd ${HOME}/netsurf/workspace` +`# Prepare shell environment` +`source env.sh` + +From here down, any commands in this document assume you have prepared +your shell environment and you are starting from the workspace +directory. + +### Checking the codebase out for the first time + +Now you can clone all of the core libraries and build them in turn. Some +may have additional dependencies outside of the NetSurf project's +codebase, and you should check the documentation in each library for +information about that. + +`# Acquire all the core libraries and NetSurf codebase` +`for REPO in buildsystem libwapcaplet libparserutils libcss libdom libhubbub libnsgif libnsbmp libsvgtiny librosprite libnsfb netsurf; do \` +` git clone `[`git://git.netsurf-browser.org/`](git://git.netsurf-browser.org/)`${REPO}.git ; \` +`done` + +### Compiling the codebase + +Assuming you have done the above and checked out all of the code, the +following is the process of getting it all built. The assumption is +being made that you're on a GTK development system on Linux. Different +environments may require slightly different instructions. Refer to the +documentation in the codebase for more help. + +If you wish to run the tests for each of the libraries, then refer to +that library's documentation. Some of the libraries require additional +test harnesses to be installed. + +`# Install the shared build system` +`make -C buildsystem install` +`# Build the core libraries in turn (order matters due to dependencies)` +`make -C libwapcaplet install` +`make -C libparserutils install` +`make -C libcss install` +`make -C libhubbub install` +`make -C libdom install` +`# Build the core image decoders` +`make -C libnsbmp install` +`make -C libnsgif install` +`# Build the optional decoders` +`make -C librosprite install` +`make -C libsvgtiny install` +`# Build NetSurf` +`cd netsurf` +`make` +`# Try running NetSurf (GTK) from the build tree` +`./test-nsgtk` + +Configuring `git` for pushing changes +===================================== + +If you have push rights to the NetSurf repository, you need to ensure +you're pushing to the `ssh://` url rather than the `git://` one. + +The easiest way to do this is to run `git config --global -e` and ensure +that a section is inserted like the one below. + +`[url "`[`ssh://nsgit@git.netsurf-browser.org/`](ssh://nsgit@git.netsurf-browser.org/)`"]` +` pushInsteadOf = `[`git://git.netsurf-browser.org/`](git://git.netsurf-browser.org/) + +This will cause `git` to automatically convert any `git://` url to the +NetSurf codebase to the corresponding `ssh://` one when pushing. Pulling +changes still happens over the more efficient and lighter weight +`git://` protocol. You can verify that this change is working correctly +by running `git remote -v` in any of your NetSurf code trees. It should +show something like the following. + +`origin `[`git://git.netsurf-browser.org/netsurf.git`](git://git.netsurf-browser.org/netsurf.git)` (fetch)` +`origin `[`ssh://nsgit@netsurf-browser.org/netsurf.git`](ssh://nsgit@netsurf-browser.org/netsurf.git)` (push)` + +Rules on branches +----------------- + +The `git` server (a [Gitano](http://www.gitano.org.uk/) instance on +[Pepperfish](http://www.pepperfish.net/)) has varying rules regarding +where you are allowed to push in terms of branch names. Usually core +developers may push to the `master` ref (equivalent of the trunk in +subversion) and anyone else must push to a ref named after their +username. + +All developers are encouraged to work in branches anyway, merging to +`master` only when changes are ready for others to use. See the +[[Git Cheat Sheet|documentation/gitcheatsheet]] for more help. + diff --git a/documentation/gitcheatsheet.mdwn b/documentation/gitcheatsheet.mdwn new file mode 100644 index 0000000..4a0e462 --- /dev/null +++ b/documentation/gitcheatsheet.mdwn @@ -0,0 +1,278 @@ +[[!meta title="Documentation/GitCheatSheet"]] +[[!meta author="Chris"]] +[[!meta date="2016-04-28T18:32:38Z"]] + + +[[!toc]] + +Git cheat sheet +=============== + +This document is here to help NetSurf developers who are more used to +non-distributed revision control systems, or to DVCSs which are not +`git`. It also contains a few helpful hints for people used to `git` so +it's worth a skim even to those who think they know it all already. + +`Git` is one of the least obvious, least intuitive distributed revision +control systems out there. However it is also very powerful and very +fast. `Git` appears to have won the DVCS race for the most part, and as +such, NetSurf uses it. + +Identify yourself +================= + +Every commit you make with `git` contains an identity. (Actually you can +differentiate between the identity of the author of a patch and the +person committing it to the repository if you want.) As such, you must +teach `git` who you are. + +`git config --global user.name "My Name"` +`git config --global user.email whoever(a)domain.name` + +Note that if you don't specify `--global` the name/email address will +only be local to the `git` tree you are inside when you run the command. + +The first time you make a commit, if you have not configured your +identity, `git` will give you a reminder. + +Useful bits and bobs +==================== + +It's well worth running: + +`git config --global push.default current` + +Since it tells git to only push the branch you're on. + +Repositories, Trees and Branches +================================ + +Each `git` repository is a project. As such, NetSurf has many +repositories. NetSurf's repositories reside on the NetSurf +[Gitano](http://www.gitano.org.uk/) instance. We will refer to this as +the *server* from now on. + +You acquire a copy of a repository by asking `git` to *clone* it. + +`git clone `[`git://git.netsurf-browser.org/buildsystem.git`](git://git.netsurf-browser.org/buildsystem.git) + +By default, `git` will create a directory named after the repository and +clone all the branches in that repository into it. + +When you have a local clone of a repository, we refer to that as a +*tree*. `Git` may also refer to it as a *working tree* and it is where +changes are made and commits are done. + +Each repository may have many branches. `Git` keeps them tucked away, +showing you only one at a time in your tree. You can list your local +branches with: + +`git branch` + +By default, a fresh clone will only contain one branch called `master` +which is the equivalent of Subversion's *trunk*. + +You can switch between local branches with: + +`git checkout branchname` + +Different bits of `git` documentation may also refer to *refs*. In `git` +branches, tags, etc are all represented by their commits. To give those +commits useful-to-a-human names, `git` has the concept of a *ref* which +is simply a name given to a commit. Refs in the namespace `refs/heads/` +are referred to as branches. + +Revisions and commits +===================== + +There are no traditional revision numbers in `git`. Instead each commit +is given a unique identifier. It is a long (40 character) hexadecimal +string but it is also commonly shortened to its first 7 characters. For +example, at the time of writing, the tip of the `master` branch in the +`NetSurf` repository was `00f76b5`. + +Remotes +======= + +Because your `git` tree is also a full local copy of the repository, +`git` keeps track of the server's copy of the repository in a data +structure called a *remote*. The default name for a remote is `origin` +and you will see that crop up in various places as we continue. + +You can update your local view of the server with the command: + +`git remote update` + +Or, assuming you're on `master` you may find *pull* to be of more use: + +`git pull` + +If you *pull* then `git` first updates its view of the remote, and then +attempts to merge in changes from the remote into your local branch. If +you've not made changes locally then this will be done by +*fast-forwarding* you to the server's revision. + +You can see the branches available on any remotes you have registered in +your tree with: + +`git branch -r` + +Making a branch to work on +========================== + +We recommend that everyone work on branches, merging to `master` only +when work is ready for others. In the past we've all worked on `trunk` +because it was such a pain in Subversion to merge work. However one of +`git`'s strengths is its merge functionality so this habit should end. + +Before making a new branch, it's customary to ensure that you've got +everything up-to-date from the server: + +`git remote update` + +Then you can create a new branch, from the server's idea of `master` +with: + +`git checkout -b username/branch origin/master` + +You should put your own username in for *username* (note it should be +the username which the server has for you. You can find that out by +running `ssh nsgit(a)netsurf-browser.org whoami`). + +For the branch name, give it something reasonably descriptive but not +too long. For example `fandango-experiment` is good, where +`experiment-with-new-layout-engine-idea` is probably too long. + +The `origin/master` is where you tell `git` that you want to track the +`master` branch of the `origin` remote. This not only gives you a +starting point for your branch, but also informs `git` where to get +changes from if you run `git pull` while you have that branch checked +out. + +To then inform the server of your new branch, run: + +`git push origin username/branch` + +When you wish to inform the server of new commits on your branch, you +can subsequently just run: + +`git push` + +Deleting a branch +================= + +To delete a branch from the server when it is no longer required: + +`git push origin :username/branch` + +Making changes and committing them +================================== + +You can make any amount of local changes before you commit, although we +recommend each commit be a reasonable self-contained "patch". Obviously +it is better to commit early and often; and `git` does contain a variety +of tools for helping you to turn a long line of small commits into a +neater set of commits ready for merging. We're not too bothered about +that with NetSurf for now; but if you want further reading on the +subject, go and search the web for *git rebase*. + +You can ask `git` about your working tree any time you like with: + +`git status` + +You can see changes in your working tree which you've not told `git` +about yet, with: + +`git diff` + +When you have edited the code and you are ready to commit, you should +run: + +`git add filename another/filename etc/etc/etc` + +You can run `git add` as many times as you like. Each time you do, +you're saying to `git` *I want you to remember this file just like it is +right now*. + +If you need to remove files then run: + +`git rm filename` + +You can see the diff which `git` has prepared for committing, with + +`git diff --cached` + +Once you're happy you've told git about any edited, new or deleted +files, you can run: + +`git commit` + +This will pop up an editor, telling you what will be committed and +encouraging you to write a change comment. The first line of the change +comment should be short (60 or so chars or less) and pithy. It will be +shown on the IRC channel as the commit message and also forms what `git` +refers to as the *short log message*. The rest of the message (ideally +separated from the first line by a blank) should explain what you did +and why. Normal good commit message etiquette applies here. + +You can see the log with: + +`git log` + +Don't forget to `git push` your commits to the server if you want anyone +else to see them. + +Merging branches +================ + +Since we're encouraging work on branches, we also need to know how to +merge those into the `master` branch. In order to keep things neat and +tidy, we ask that branches be merged in the following way: + +`# Switch to the master branch` +`git checkout master` +`# Ensure we're up-to-date relative to the server` +`git pull` +`# Merge the local branch in` +`git merge --no-commit --no-ff username/branch` +`# Review the changes here (git diff --cached)` +`# Commit the changes` +`git commit` + +Note that the commit will default to a message about the merge. That is +sufficient, although obviously any more useful message would be +appreciated. If the branch is not a local one, but one retrieved from +the server, then simply insert `origin/` in front of the branch name (so +it becomes `origin/username/branch`) to tell `git` the location of the +branch. + +Once the commit is done on `master` you can `git push` it to the server. + +The options to `git merge` are important. The `--no-commit` causes `git` +to leave the tree at the point that it has done the merge but hasn't +committed it to the branch. By default, `git` will commit merges which +had no conflicts. Since our code base is complex this is not always +sufficient, hence the review step above. The `--no-ff` causes `git` to +prepare a merge commit. Without it, if the `master` has not moved on +from where the branch was created, `git` will instead simply shunt the +commits onto the `master` branch. While not a bad thing in and of +itself, this would mean that when you did `git push` the `CIA.vc` bot +would announce every single commit from the branch. + +Merging changes from a 3rd party's repo +======================================= + +To merge from the "foo" branch of Somebody's github clone of the NetSurf +repo we can do this: + +`git remote add somebody `[`git://github.com/Somebody/netsurf`](git://github.com/Somebody/netsurf) +`git remote update somebody` +`git merge --no-ff --no-commit somebody/foo` +`git diff --cached` + +Check that the diff shows what we want to merge. If so, commit it. + +If you don't want to keep the remote around: + +`git remote rm somebody` + diff --git a/documentation/gtk_interface.mdwn b/documentation/gtk_interface.mdwn new file mode 100644 index 0000000..f480a52 --- /dev/null +++ b/documentation/gtk_interface.mdwn @@ -0,0 +1,36 @@ +[[!meta title="Documentation/GTK Interface"]] +[[!meta author="James Bursa"]] +[[!meta date="2010-04-07T17:05:44Z"]] + + +[[!toc]] This page describes the +GTK interface, which lives in the **gtk** directory. This interface is +used on Linux, BSD, and can be used on other platforms which have a port +of GTK. + +Windows and Scaffolding +----------------------- + +A "scaffolding" is a top-level main window, which contains a toolbar, +menu bar, and one or more tabs containing web pages. Each tab +corresponds to a gui\_window (and each frame if frames are present). + +All the UI designs for the main window are in netsurf.glade. +**wndBrowser** is a scaffolding. It contains a VBox containing a +MenuBar, Toolbar, Toolbar for search (normally hidden), and Notebook. + +The **tabContents** GtkTable (in tabContentsWindow) is used for each +tab. It contains a table with two rows and two columns, which contain +(line 1) a Layout, VScrollbar, (line 2) HPaned, and Statusbar (used for +resizing only). The HPaned contains the actual status bar (as a Label), +and a HScrollbar. + +Tab creation is implemented in gui\_create\_browser\_window() in +gtk/gtk\_window.c. The scrollbars are linked to the layout here. + +Frames are implemented as a ScrolledWindow containing a Layout, which is +then placed on the parent's Layout. This is also in +gui\_create\_browser\_window(). + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/layout.mdwn b/documentation/layout.mdwn new file mode 100644 index 0000000..414253f --- /dev/null +++ b/documentation/layout.mdwn @@ -0,0 +1,70 @@ +[[!meta title="Documentation/Layout"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-11-26T22:20:06Z"]] + + +[[!toc]] The modules in the render +directory process and layout HTML pages. + +Overview +-------- + +This is the process to render an HTML document: + +First the HTML is parsed to a tree of xmlNodes using the HTML parser in +libxml. This happens simultaneously with the fetch +[html\_process\_data()]. + +Any stylesheets which the document depends on are fetched and parsed. + +The tree is converted to a 'box tree' by xml\_to\_box(). The box tree +contains a node for each block, inline element, table, etc. The aim of +this stage is to determine the 'display' or 'float' CSS property of each +element, and create the corresponding node in the box tree. At this +stage the style for each element is also calculated (from CSS rules and +element attributes). The tree is normalised so that each node only has +children of permitted types (eg. TABLE\_CELLs must be within +TABLE\_ROWs) by adding missing boxes. + +The box tree is passed to the layout engine [layout\_document()], which +finds the space required by each element and assigns coordinates to the +boxes, based on the style of each element and the available width. This +includes formatting inline elements into lines, laying out tables, and +positioning floats. The layout engine can be invoked again on a already +laid out box tree to reformat it to a new width. Coordinates in the box +tree are relative to the position of the parent node. + +The box tree can then be rendered using each node's coordinates. + +Lists +----- + +Lists are one or more elements with 'display: list-item' (which is set +for 'li' by the default CSS). A list-item is constructed as a BLOCK box +and a box for the marker attached at block-\>list\_marker. The marker +contains the bullet, number, or similar, depending on the +list-style-type. + +Layout of the block is as normal. A pass of layout after main layout +places list marker boxes to the left of their block (see +layout\_lists()). + +Absolute positioning +-------------------- + +Absolutely positioned boxes are constructed in the box tree in the same +place as if they were not absolutely positioned. Inline boxes are +created as INLINE\_BLOCK, tables as TABLE, and other boxes as BLOCK (see +box\_solve\_display()). + +During layout, absolutely positioned boxes in block context (BLOCK or +TABLE) are given a position in layout\_block\_context(), but treated as +having no height. In inline context (INLINE\_BLOCK), they are given a +position in layout\_line(), but treated as having no width or height. +This is done to determine the static position. + +An additional pass after main layout positions and layouts all +absolutely positioned boxes (see layout\_position\_absolute()). + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/memory.mdwn b/documentation/memory.mdwn new file mode 100644 index 0000000..f595e08 --- /dev/null +++ b/documentation/memory.mdwn @@ -0,0 +1,26 @@ +[[!meta title="Documentation/Memory"]] +[[!meta author="James Bursa"]] +[[!meta date="2010-03-01T02:56:01Z"]] + + +[[!toc]] This section describes +memory management. See Error handling for how memory exhaustion is +handled. + +Finding leaks on RISC OS +------------------------ + +Memory allocation can be traced and leaks can be found using dmalloc. + +Install dmalloc from the riscos.info autobuilder. Set the environment +variable TLINK\_MEMCHECK=dmalloc and re-link !RunImage. + +On RISC OS, + + *Set DMALLOC_OPTIONS debug=0x2,log=dmalloc_log + +set the working directory to a RAM disc, and run NetSurf. When it quits, +dmalloc\_log will contain a list of unfreed blocks. + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/modular_coding_style.mdwn b/documentation/modular_coding_style.mdwn new file mode 100644 index 0000000..da07a8a --- /dev/null +++ b/documentation/modular_coding_style.mdwn @@ -0,0 +1,39 @@ +[[!meta title="Documentation/Modular Coding Style"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-11-26T22:20:15Z"]] + + +[[!toc]] + +Modules +------- + +NetSurf's source is organised in modules. A module usually consists of a +.c and .h file. For example the html module is in html.c and html.h. + +All functions (including static functions) in a module should start +<module>\_, for example html\_create(), html\_process\_data(), etc. This +makes functions easy to find and names unique through the source, which +is helpful for backtraces, documentation, etc. + +Global variables in a module (including static) should also start +<module>\_. + +Static functions should all be declared at the top. + +Put functions in a logical order, for example any init function first, +then functions it calls, then the next externally available function, +functions it calls, etc. + +Coding Style +------------ + +We use K&R (2nd edition ANSI C) style, tabs for indent, 80 characters +wide, lower\_case\_with\_underscores. + +See the [Style +Guide](http://www.netsurf-browser.org/developers/StyleGuide.pdf) for +further information and examples. + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/overview.mdwn b/documentation/overview.mdwn new file mode 100644 index 0000000..b742296 --- /dev/null +++ b/documentation/overview.mdwn @@ -0,0 +1,9 @@ +[[!meta title="Documentation/Overview"]] +[[!meta author="James Bursa"]] +[[!meta date="2010-03-01T02:41:51Z"]] + + +[[!toc]] + +1. REDIRECT [[Documentation/Directory Structure|documentation/directory_structure]] + diff --git a/documentation/printing.mdwn b/documentation/printing.mdwn new file mode 100644 index 0000000..a7f9ee2 --- /dev/null +++ b/documentation/printing.mdwn @@ -0,0 +1,65 @@ +[[!meta title="Documentation/Printing"]] +[[!meta author="James Bursa"]] +[[!meta date="2010-03-01T02:56:52Z"]] + + +[[!toc]] This document is supposed +to be a short guide of adding paged output to NetSurf. Currently the two +pieces of code using the print implementation are PDF export and GTK +printing. + +printer.h +--------- + +The first thing the new paged output has to do is implementing the +printer interface located in printer.h. It consists of four elements: + +- plotter. This are the plotters which will be used while redrawing + the content. +- print\_begin. This function is called right after the set up and + should manage all the remaining user-specific initialisation stuff. +- print\_next\_page. This function is called before the actual + printing of each page allowing to prepare the content to be printed. +- print\_end. This function is called right before the printing + routines clean after themselves and should be used for saving the + output to a file, freeing previously allocated memory, relesing + document handles etc. + +print.h +------- + +The provided print interface consists of a set of functions which can be +used seperately and one integrating them all making the print a matter +of one call. If it is enough you can just call print\_basic\_run and +wait for it to return. However, for the case you can't accompish the +printing task this way the print interface gives you the possiblity of +calling the print steps individually. + +Only if you are using print\_basic\_run you can omit specifying the +print settings. If this is the case the default ones will be used. + +As you will notice the functions correspond to those you had to +implement in the printer. The reason for this is adding some flexibility +to the system which occured necessary i.e in the GTK print +implementation. + +- print\_set\_up. This sets the printing system up and calls + print\_begin +- print\_draw\_next\_page. Here after calling print\_next\_page one + full page of the dimensions given in the print settings is plotted +- print\_cleanup. This function is responsible for freeing all used + resources right after calling print\_end + +Settings +-------- + +This is where the besic information about the print job is held. You can +use one of the predifined sets(DEFAULT and OPTIONS) or add your own. In +order to do that you have to follow this steps: + +- add your entry to the print\_configuration enum +- add handling of it to the switch in print\_make\_settings +- add the entry name to this document + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/references.mdwn b/documentation/references.mdwn new file mode 100644 index 0000000..ddbfe1e --- /dev/null +++ b/documentation/references.mdwn @@ -0,0 +1,37 @@ +[[!meta title="Documentation/References"]] +[[!meta author="James Bursa"]] +[[!meta date="2010-03-01T02:57:22Z"]] + + +[[!toc]] + +Web Specifications +------------------ + +|---|---| +|HTML|- [W3C HTML 4.01](http://www.w3.org/TR/html401/) +- [W3C Mark up](http://www.w3.org/MarkUp/)| +|XHTML 1.0|- [W3C XHTML 1.0](http://www.w3.org/TR/xhtml1/)| +|CSS|- [W3C CSS 2.1](http://www.w3.org/TR/CSS21/)| +|HTTP/1.1|- <http://www.w3.org/Protocols/rfc2616/rfc2616.html> +- <http://purl.org/NET/http-errata> +- <http://www.w3.org/Protocols/>| +|HTTP Authentication|- <http://www.cis.ohio-state.edu/cgi-bin/rfc/rfc2617.html>| +|PNG|- <http://www.w3.org/Graphics/PNG/>| +|URI|- <http://www.cis.ohio-state.edu/cgi-bin/rfc/rfc2396.html> +- <http://www.w3.org/Addressing/>| +|Cookies|- <http://wp.netscape.com/newsref/std/cookie_spec.html> +- <http://www.cis.ohio-state.edu/cgi-bin/rfc/rfc2109.html>| + +RISC OS +------- + +|---|---| +|Plugin|- <http://www.ecs.soton.ac.uk/~jmb202/riscos/acorn/funcspec.html> +- <http://www.ecs.soton.ac.uk/~jmb202/riscos/acorn/browse-plugins.html>| +|URI|- <http://www.ecs.soton.ac.uk/~jmb202/riscos/acorn/uri.html>| +|URL|- <http://www.vigay.com/inet/inet_url.html>| +|Nested WIMP|- <http://www.ecs.soton.ac.uk/~jmb202/riscos/acorn/nested.html>| + +[[!inline raw=yes pages="Documentation"]] + diff --git a/documentation/treeview.mdwn b/documentation/treeview.mdwn new file mode 100644 index 0000000..3f6ecc9 --- /dev/null +++ b/documentation/treeview.mdwn @@ -0,0 +1,88 @@ +[[!meta title="Documentation/Treeview"]] +[[!meta author="James Bursa"]] +[[!meta date="2010-03-01T02:57:03Z"]] + + +[[!toc]] Using the treeview gadget +(together with core hotlist/history/cookies/sslcert) + +Providing front end specific bits +--------------------------------- + +Most of the treeview logic is located in core code but there still are +some functions that need implementing on the front end side. These +include: + +- Functions marked as front end specific ones and listed at the end of + +` tree_url_node.h.` + +- Functions in treeview\_table located in tree.h + +Additionally the option\_tree\_icons\_dir option should be set. It +should be pointing at the directory containing the frontend specific +icon set for the treeview. + +During GUI initialisation the following functions should be called: + +- cookies\_initialise +- history\_global\_initialise +- hotlist\_initialise +- sslcert\_init + +On GUI closure: + +- cookies\_cleanup +- history\_global\_cleanup +- hotlist\_cleanup +- no function for sslcert here! + +The sslcert tree is created and deleted each time the dialog gets +invoked. This is done with sslcert\_create\_tree and sslcert\_cleanup. +Make sure that closing the window with any other method will also +perform the cleanup. + +The remaining functions in the header files of +hotlist/history/cookies/sslcert have to be connected to the front end +specific buttons and menu or tool bars. + +The front end is responsible for creating the windows and toolbars as +well as empty core trees passed to the cookies/history/hotlist/sslcert +initialisation functions. Use the \*\_get\_tree\_flags functions to +obtain the flags with which the particular tree should be created. + +Using the treeview +------------------ + +### Creating and modifying the tree structure + +- Create an empty tree with tree\_create. +- Create the necessary folder/leave nodes. +- Fill the leave nodes with tree\_create\_node\_element and assign + content to the elements with tree\_update\_node\_element. +- Use tree\_link\_node to connect the created nodes in the required + structure. +- With tree\_set\_redraw set the redraw flag on the tree to true, any + further changes will result in tree redraws. The flag can be + set/unset multiple times. +- Call tree\_draw to draw the tree for the first time. + +### Client -\> Tree communication + +To make the tree respond to mouse action, all such has to be passed to +tree\_mouse\_action and tree\_drag\_end. The mouse coordinates have to +be given with respect to the tree origin. + +### Tree -\> Client communication + +Use tree\_set\_node\_user\_callback to provide a callback for any node +related events. At the moment it can be used for(default behavior for a +not handled event in brackets): + +- handling a node launch (no action) +- custom node element deletion (free text/bitmap) +- accepting/rejecting edited text (any text accepted) +- informing about edit end (no action) + +[[!inline raw=yes pages="Documentation"]] + diff --git a/frames.mdwn b/frames.mdwn new file mode 100644 index 0000000..c1b1bc2 --- /dev/null +++ b/frames.mdwn @@ -0,0 +1,115 @@ +[[!meta title="Frames"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-11-26T22:20:19Z"]] + + +[[!toc]] HTML5 Spec: + +- [4.8.4 The iframe + element](http://www.whatwg.org/specs/web-apps/current-work/multipage/the-... +- [11.5 Frames and + framesets](http://www.whatwg.org/specs/web-apps/current-work/multipage/re... +- [12.3.3 + Frames](http://www.whatwg.org/specs/web-apps/current-work/multipage/obsol... + +This is just a quick draft of a proposal for changing how frames are +handled in NetSurf. Updates, changes, comments, etc are welcome. + +Current frames implementation +----------------------------- + +See the [[frames documentation|documentation/frames]]. + +### Problems + +- Complication of front end / core interface +- Only RO implementation works +- Not possible on some platforms +- Front ends poke around inside several browser\_windows per window + (or tab) +- Can be several gui\_windows per window (or tab) + +New frames implementation +------------------------- + +In the following, "*canvas*" refers to the front end's "surface" onto +which it plots whatever the core tells it to. There would only be one +per window (or tab). + +The front end only creates one gui\_window per window (or tab). It never +needs to know about browser\_window objects, which will be internal to +the core. The front end tells the core the size of the viewport. The +front end never knows whether the viewport contains a simple page or a +frameset, it just passes mouse actions in and plots into the canvas as +the core instructs it. + +For iframes, the core just renders the HTML content in the area of the +page that the iframe occupies during HTML redraw. If scrollbars are +present they are handled by the core scrollbar widget, and html\_redraw +calls for them to be redrawn. Clicks and mouse movement over iframes are +passed on through to the content in question. IIRC we "drill down" into +iframes already, so apart form getting the scroll offsets this may +already be implemented. + +For framesets, the canvas area we render into does not exceed the size +of the viewable area in the window. So canvas size is equal to viewport +size, and the front end's surface would be unscrollable. This means for +large fixed-size frames in a small window, part of the frameset would +get cropped. html\_redraw would be updated to handle framesets. The +canvas would be split up into rectangles with different contents in each +rectangular area, according to the frameset. If the frame is scrollable +and has scrollbars, scrollbars will be rendered for it. The core mouse +tracking and clicking handling would be updated to handle framesets. It +also needs to handle actions on the framesets themselves, e.g. frame +resizing. + +For regular pages (and possibly root framesets containing one frame and +no nested framesets), the rendered canvas size is defined by layout in +the normal way. So canvas size may exceed front end viewport size, +making the front end's surface scrollable. + +### Evaluation + +#### Advantages + +- Much easier to develop a NetSurf front end +- Simplify existing front ends +- Fixes frames in all front ends without any work from front end + maintainers +- All frames stuff in the core, so if somone fixes or improves it, + it's improved on all platforms +- Fixes thumbnailing + +#### Disadvantages + +- Don't get native scrollbars or surfaces for individual frames + +Mitigation - core scrollbar widget could optionally be overridden by +front ends for native looking scrollbars + +### Changes required + +- html\_redraw() changed to handle frameset & iframe internally +- Mouse tracking and click handling updated to handle framesets +- Need to pass scrollwheel events to the core. If whatever the core + has under the pointer can't be scrolled (further in that direction), + the core tells the front end that it couldn't scroll anything and + the front end can scroll the main viewport. + +Thumbnailing should "just work". + +Scrollbars +---------- + +Possibility of front ends overriding core scrollbar widgets, for native +look. + +- Need to tell core the scollbar widths for layout +- Override scrollbar redraw +- Handle scrollbar clicks and core-generated scrollable area movements + +Other considerations +-------------------- + +- Frames history - Whole different kettle of ball games. + diff --git a/gsoc.mdwn b/gsoc.mdwn new file mode 100644 index 0000000..f90458b --- /dev/null +++ b/gsoc.mdwn @@ -0,0 +1,18 @@ +[[!meta title="GSoC"]] +[[!meta author="Tlsa"]] +[[!meta date="2010-04-11T10:08:22Z"]] + + +[[!toc]] NetSurf is participating +in Google Summer of Code 2009. + +- [[GSoC Student Guidelines|gsoc/student_guidelines]] +- [GSoC Ideas + page](http://www.netsurf-browser.org/developers/gsoc/2009ideas) + +The project mentors are: + +- John-Mark Bell (jmb) +- Rob Kendrick (rjek) +- Michael Drake (tlsa) + diff --git a/gsoc/application.mdwn b/gsoc/application.mdwn new file mode 100644 index 0000000..f66ab8b --- /dev/null +++ b/gsoc/application.mdwn @@ -0,0 +1,151 @@ +[[!meta title="GSoC/Application"]] +[[!meta author="Tlsa"]] +[[!meta date="2014-02-12T18:44:36Z"]] + + +[[!toc]] + +About Our Organization +---------------------- + +### Organisation Name + +NetSurf + +### Organisation Homepage + +<http://www.netsurf-browser.org/> + +### About the NetSurf Organisation + +We are the developers of NetSurf, a fast and small open source browser +written in C with its own layout engine. As well as producing NetSurf we +have created various other libraries which other software can use. These +libraries include libHubbub (an HTML5 parsing library), libCSS (a CSS +parsing and selection engine), and libDOM (a Document Object Model +implementation). All our libraries are written in C, and are written +with a focus on low memory usage, high performance and robust stability. +More about the memebers of the team may be found at +<http://www.netsurf-browser.org/about/team> + +### NetSurf Orgnisation's reason for applying to GSoC 2014 + +We have specific ideas for new development that will be useful for our +project and for other projects that rely on our libraries. We're +applying to GSoC for a couple of reasons: first, because we don't have +time to do all the work we wish to do on the project, and second because +there is useful work that a student with no prior knowlage of NetSurf +could realisitcally do over the summer. We hope to gain a new developer +and new and improved code. + +### Previous GSoC Participation GSoC + +We applied to participate in GSoC in 2008 and 2009, and both +applications were accepted. + +In GSoC 2008 we mentored 4 students, all of whom completed their +projects to a satisfactory standard. + +In GSoC 2009 we mentored 3 students, all of whom completed their +projects to a satisfactory standard. + +This is our first application to GSoC since 2009. + +### Project licenses + +GPL2 for NetSurf itself and MIT for the libraries (libHubbub, libDOM, +libCSS, and others). + +### NetSurf Organisation's Ideas Page + +<http://wiki.netsurf-browser.org/GSoC_2014> + +### Development mailing list + +netsurf-dev(a)netsurf-browser.org + +<http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-dev-netsurf...> + +### IRC channel + +\#netsurf on FreeNode + +### Organization application template + +None. + +### Our backup organization administrator + +<span style="color:red;">TODO</span> + +About Our Mentors +----------------- + +### Our mentor selection criteria + +We have a relatively small number of core developers, all of whom have a +reasonably good knowledge of the codebase. Lack of knowledge about how +something works is addressed through regular communication. Therefore, +our main criterion for being a mentor was an expressed willingness to +perform the role. + +We have five core developers who are all willing to help a student find +their feet and get the best out of their GSoC experience. + +### Our Mentor listing + +<span style="color: red;">TBC</span> + +- John-Mark Bell +- Michael Drake +- Rob Kendrick +- Vincent Sanders +- Daniel Silverstone + +About Our Participation in the Program +-------------------------------------- + +### Our plan for dealing with disappearing students + +We'll encourage students to check their work into version control +regularly for testing so that at least their work won't be lost. However +we'll try to avoid this problem by constant communication, +encouragement, and help. + +### Our plan for dealing with disappearing mentors + +The offical mentor(s) will be backed up by the other project developers, +who are happy to help and mentor too. + +### Steps we will take to encourage students to interact with our project's community before, during and after the program + +The home of our development community is the \#netsurf IRC channel, +which always has some of the developers and daily discussion of the +browser. We will encourage students to join this channel and the +development mailing list so they are best able to interact with us. + +### What we will do to ensure that your accepted students stick with the project after GSoC concludes + +We will endeavour to ensure that they feel they are making a useful +contribution to the project and that their work is valued. We'll also +try to make the project enjoyable and give regular feedback on their +ideas and work. + +<span style="color:red;">TODO</span> +------------------------------------ + +- Are you a new organization who has a Googler or other organization + to vouch for you? If so, please list their name(s) here. +- Are you an established or larger organization who would like to + vouch for a new organization applying this year? If so, please list + their name(s) here. +- The email addresses associated with the Google Account information + provided during the proposal process will be used as the primary + mode of contact by Google throughout the program, e.g. the email + address which we will use to subscribe you to the Google Summer of + Code mentors/admins-only mailing list. + +Last point means we need google accounts for all mentors/admins. + +--tlsa + diff --git a/gsoc/information.mdwn b/gsoc/information.mdwn new file mode 100644 index 0000000..58a2398 --- /dev/null +++ b/gsoc/information.mdwn @@ -0,0 +1,9 @@ +[[!meta title="GSoC/Information"]] +[[!meta author="Tlsa"]] +[[!meta date="2009-07-08T17:00:22Z"]] + + +[[!toc]] + +1. REDIRECT [[GSoC/|gsoc/]] + diff --git a/gsoc/requirements.mdwn b/gsoc/requirements.mdwn new file mode 100644 index 0000000..4d4dfc7 --- /dev/null +++ b/gsoc/requirements.mdwn @@ -0,0 +1,85 @@ +[[!meta title="GSoC/Requirements"]] +[[!meta author="James Bursa"]] +[[!meta date="2009-05-27T01:14:50Z"]] + + +[[!toc]] + +Basic requirements for GSoC students +------------------------------------ + +Students are expected to work a "standard" work week. Anything above +that is fine too, but we expect a commitment similar to normal +employment. After all, Google are paying for your time. + +Expectations for communications +------------------------------- + +The NetSurf team use IRC, so you will be expected to be on \#netsurf on +Freenode and communicate there. + +Each week, (or more often if suitable) you are expected to send a report +to your mentor indicating what you have achieved, what you intend to +achieve over the coming week, and anything which is blocking you from +proceeding. Your mentor will then post to the netsurf-dev mailing list +providing a redux of this information suitable for others. + +If you have any issues with anyone else, you are expected to take it up +with your mentor, or if the issue is with your mentor, with one of the +other mentors in the project. The mentors are: John-Mark Bell (jmb), +Michael Drake (tlsa), Rob Kendrick (rjek) and Daniel Silverstone +(kinnison). + +Who to talk to +-------------- + +Your mentor is your first point of call for anything directly related to +the running of GSoC. They are the person responsible for your midterm +and final assessment and you should be using them for this. + +For queries about your actual project work, you are encouraged to ask +for advice or help on the IRC channel or mailing list. Generally the IRC +channel is most suitable for but for involved questions or issues that +require a lot of planning, use the netsurf-dev mailing list. This allows +the entire NetSurf team to help and advise you. + +Sometimes we may ask you to work something out for yourself, not out of +spite or laziness, but to encourage you to learn more for yourself. GSoC +is not just a chance to make money, but a chance for you to learn new +skills and to interact with other ways of developing software. + +How to work +----------- + +In terms of your work environment, we recommend that you have a well-lit +comfortable place to work, and that you isolate it from your normal home +computing environment in the sense that if you normally have hundreds of +IRC channels open, browse tens of websites etc, you try not to during +your "work day" -- we're not saying you can't enjoy yourself, just that +the fewer distractions, the easier you will find it to begin with. + +We recommend that you don't have the television or a talk-radio station +on while working. Music however is fine and often encouraged. + +Repository layout +----------------- + +You will be given a branch space on our Subversion repository. It will +be in /branches/<yourname> and you will have total control over that +part of the repository. You are encouraged to make feature branches and +to request that your mentor review and merge them regularly. Ideally you +will make a branch, implement one feature (or one packet of work towards +a feature) and get it reviewed and merged. Then make a new branch and +work on the next bit. + +This sounds a little long-winded, but it means that we don't get huge +merge jobs at the end of GSoC, but still fulfils the requirements that +we have to provide to Google your work so that they can see that you +didn't cheat them out of their money. + +You are encouraged to commit early and often to your branch. Changes you +make will be sent to the public commits list, so be sensible in your +commit logs. Regular smaller commits will allow the team to review your +code in-flight and suggest improvements or ideas which might mean you +waste less time writing something which ultimately isn't suitable. + diff --git a/gsoc/student_guidelines.mdwn b/gsoc/student_guidelines.mdwn new file mode 100644 index 0000000..30912da --- /dev/null +++ b/gsoc/student_guidelines.mdwn @@ -0,0 +1,66 @@ +[[!meta title="GSoC/Student Guidelines"]] +[[!meta author="James Bursa"]] +[[!meta date="2009-05-27T01:13:40Z"]] + + +[[!toc]] This page details some of +the things students thinking of applying to the NetSurf Project during +the Google Summer of Code 2009 should know, do, and keep in mind. + +Read the section at the top of our ideas page +--------------------------------------------- + +It has all sorts of details and advice for students interested in +working with NetSurf for Google Summer of Code. + +Build NetSurf and play with it for a while +------------------------------------------ + +Building NetSurf should be quite easy. You should get the source with +Subversion, as described [on the developer +pages](http://www.netsurf-browser.org/documentation/develop#Subversion). +Don't download a tarball from the websvn interface: it's broken. If you +have any trouble building it, ask on \#netsurf. The only common gotcha +is obtaining the lemon parser generator, it only appears to be Debian +and Ubuntu who package it separately. Fedora, specifically, builds it +during the creation of the SQLite packages, but then throws it away! +Fortunately, it's very trivial to build yourself: just ask Google for +"lemon parser generator". + +Explore the NetSurf website +--------------------------- + +There's loads of background information, documentation, and other juicy +tidbits on our main website. Explore it thoroughly. Find it at +[www.netsurf-browser.org](http://www.netsurf-browser.org/). + +We have a commitment to support RISC OS +--------------------------------------- + +You've most likely not heard of RISC OS. It's possible by the end of +your work with us you'll wish you never had. We have a history of +supporting RISC OS (it was our first platform) and we have a commitment +to continue doing so. Anything you write that's platform agnostic should +work well on RISC OS. See Caveat RISC OS for a list of gotchas. + +Read what documentation exists +------------------------------ + +There isn't currently much documentation for NetSurf's source code, but +it's all well worth reading. Start with the documents in Subversion. + +Remember, we're British +----------------------- + +Well, in the most part, anyway. We consider tea, beer and curry all more +important than NetSurf. We have a seemingly unnatural fascination with +the weather. Don't be surprised by this. Also, our source code has an +(unwritten, mostly) rule that things should be spelt in British English. +So colour rather than color, etc. + +Please don't cut corners in your communications +----------------------------------------------- + +Contractions like **u** for **you** in emails and IRC conversation make +us cringe. Please avoid! + diff --git a/gsoc_2014.mdwn b/gsoc_2014.mdwn new file mode 100644 index 0000000..f4adc2d --- /dev/null +++ b/gsoc_2014.mdwn @@ -0,0 +1,9 @@ +[[!meta title="GSoC 2014"]] +[[!meta author="Tlsa"]] +[[!meta date="2014-02-14T15:04:04Z"]] + + +[[!toc]] + +1. REDIRECT [[GSoC 2014 Ideas|gsoc_2014_ideas]] + diff --git a/gsoc_2014_ideas.mdwn b/gsoc_2014_ideas.mdwn new file mode 100644 index 0000000..d2c0e67 --- /dev/null +++ b/gsoc_2014_ideas.mdwn @@ -0,0 +1,124 @@ +[[!meta title="GSoC 2014 Ideas"]] +[[!meta author="Tlsa"]] +[[!meta date="2014-02-14T15:04:04Z"]] + + +[[!toc]] This is the +[NetSurf](http://www.netsurf-browser.org/) project's ideas page for +Google Summer of Code 2014. + +This page lists our project ideas for **[Google Summer of Code +2014](http://code.google.com/soc/)**. + +General Information +------------------- + +### Before applying for a project + +- Join our IRC channel `#netsurf` on [Freenode](http://freenode.net/) + and introduce yourself. Also, subscribe to the [developer mailing + list](http://www.netsurf-browser.org/lists/netsurf-dev). +- Get up to speed with + [Git](http://wiki.netsurf-browser.org/Documentation/GettingCoding), + as we use this for source control, and get the NetSurf [source + code](http://www.netsurf-browser.org/documentation/develop#SourceControl). +- [Build + NetSurf](http://www.netsurf-browser.org/documentation/develop#Compiling) + and enjoy using it. (Ask if you need help.) +- Get familiarised with the source code – read the [source + code](http://source.netsurf-browser.org/). +- Consider submitting a patch to fix an issue on our [bug + tracker](http://bugs.netsurf-browser.org/) + +### When applying for a project + +- Tell us about yourself, your experience, and why you want to work + with us. +- Describe the project you want to do, and how you plan to go about + doing it. **Do not simply copy the project description from the + ideas page.** +- Create a set of project milestones (ranging from a couple to maximum + 10) with expected completion dates. This will be useful for you as + guidance and for us to set our expectations right. +- Describe how you will test your contributions. +- Include your IRC nick in your application if you've spoken with us + on `#netsurf`, so that we recognise you. **We strongly recommend + that you communicate with us before submitting an application.** +- We expect GSoC to be mostly equivalent to a full-time job. + Therefore, please tell us if you have any other demands on your + time. + +### During the project + +- Most of NetSurf team communication happens via \#netsurf IRC during + evenings and nights + ([CET](http://en.wikipedia.org/wiki/Central_European_Time)). We + expect you to join in on a regular basis for help, discussions and + project updates. Note that you're not restricted to speaking to your + assigned mentor; the whole development team are willing to help + wherever they can. +- Keep NetSurf's [project + goals](http://www.netsurf-browser.org/about/#ProjectGoals) in mind, + especially the first point. + +There is some more information in the [GSoC +section](http://wiki.netsurf-browser.org/google-summer-of-code) of our +wiki. Note particularly the [student +guidelines](http://wiki.netsurf-browser.org/gsoc-student-guidelines). + +Please [get in touch](http://www.netsurf-browser.org/contact/) if our +project idea appeals to you or if you have your own idea for either +[NetSurf](http://www.netsurf-browser.org/) or one of NetSurf's +[sub-projects](http://www.netsurf-browser.org/projects/). Come and chat +to the developers in the NetSurf IRC channel or post to the developer +mailing list. + +Project: Update Core Web Technology Libraries +--------------------------------------------- + +This is a project to improve and add features to the [NetSurf +project](http://www.netsurf-browser.org/)'s core web-technology +libraries. These libraries are MIT licenced and are available to, and +used by, other projects. The libraries in question are: + +- [LibHubbub](http://www.netsurf-browser.org/projects/hubbub/) - HTML5 + Parsing library +- [LibCSS](http://www.netsurf-browser.org/projects/libcss/) - CSS + Parser and Selection Engine +- [LibDOM](http://www.netsurf-browser.org/projects/libdom/) - Document + Object Model library + +### Project Outline + +- Phase 1 (Easy) + 1. Implement reamining LibDOM html element specialisations. + **Existing code:** + [libdom/src/html](http://git.netsurf-browser.org/libdom.git/tree/src/html) + Some, like html\_button\_element.c have implementations, while + most like html\_anchor\_element.c do not. + **Specification:** [Level 2 Document Object Model + HTML](http://www.w3.org/TR/2003/REC-DOM-Level-2-HTML-20030109/idl-definit... +- Phase 2 (One of the following) + 1. Bring Hubbub up to latest HTML5 spec. This involves comparing + the current implementation with the specification and updating + our implemenation where appropriate. + **Existing code:** + [libhubbub/src](http://git.netsurf-browser.org/libhubbub.git/tree/) + **Specification:** [HTML5 + Parsing](http://www.whatwg.org/specs/web-apps/current-work/multipage/pars... + + 2. Add CSS3 properties to LibCSS. + **Existing code:** + [libcss/src](http://git.netsurf-browser.org/libcss.git/tree/src) + **Specification:** [CSS + Specs](http://www.w3.org/Style/CSS/specs.en.html) + +The decision on Phase 2 will be made by the student and mentors, +depending on the interests of the student, ability shown in Phase 1, and +time remaining. It is not anticipated that there will be time for a +student to do both items of Phase 2, however the work is there if a +gifted student makes good progress. + +**Skills required:** Experience of the C programming language +**Skills desirable:** HTML, DOM, CSS + diff --git a/index.mdwn b/index.mdwn new file mode 100644 index 0000000..63c1771 --- /dev/null +++ b/index.mdwn @@ -0,0 +1,71 @@ +[[!meta title="Main Page"]] +[[!meta author="Chris"]] +[[!meta date="2016-09-10T17:42:15Z"]] + + +Welcome to the NetSurf development wiki! + +This is a MediaWiki and the +[[NetSurf_Development_Wiki:Formatting|netsurf_development_wiki/formatting]] page shows the markup that +can be used. + +Code Documentation +------------------ + +[[!inline raw=yes pages="Documentation"]] + +Development planning +-------------------- + +- [[NetSurf Development Plan|development_plan]] — contains planning + for the next major release. +- [[Todo Lists|todo]] — contains various + planning documents +- [[LibDOM|libdom]] — status of LibDOM + project +- [[LibCSS|test/libcss/nstests]] — status of tests +- [[NetSurf using core buildsystem|netsurf_corebuild]] - proposal for source + restructure and use of core buildsystem + +### historical + +- [[Disc Caching and History|disc_caching_and_history]] — proposal for new + functionality +- [[Frames|frames]] — proposal for new + implementation +- [[LibHubbub|libhubbub]] - status of bugs + +Release planning +---------------- + +The [[Release Process|release_process]] details what needs to +be done for a release. + +[[Unreleased|netsurf_3.6]] — Organisation of next +release. + +[[Releases|released_versions]] + +Google Summer of Code +--------------------- + +- [[Google Summer of Code Information|gsoc]] +- [[GSoC Student Guidelines|gsoc/student_guidelines]] — contains helpful + information for students interested in working on NetSurf over the + Google Summer of Code 2009. Specially, how to get on our good side! +- [[GSoC Requirements|gsoc/requirements]] + +Other Resources +--------------- + +- [[NetSurf Society|society/]] — Information about + the society. +- [NetSurf Web Site](http://www.netsurf-browser.org/) — contains + user-facing and high-level development information. +- [Source code viewer](http://source.netsurf-browser.org/) — is a web + interface for our source repository. +- [[The CI system setup|continuous_integration]] — Information for + dealing with the CI system. +- [[The Mantis issue tracker|bug_tracker]] — Information for + using the NetSurf bug tracker. + diff --git a/layout.mdwn b/layout.mdwn new file mode 100644 index 0000000..ba97b22 --- /dev/null +++ b/layout.mdwn @@ -0,0 +1,34 @@ +[[!meta title="Layout"]] +[[!meta author="Tlsa"]] +[[!meta date="2010-04-17T21:17:08Z"]] + + +[[!toc]] This page is for planning +the new layout engine [[scheduled for NetSurf 4.0|development_plan]]. + +### Overview + +At the moment NetSurf can only run layout on the whole box tree. This +happens every time the window width is changed, to let NetSurf reflow +the content. There are some optimisations where the layout code knows if +bits of the layout are fixed-width and won't be affected by a reflow. + +Currently we don't handle partial layouts of sections of the box tree. +For example, if a scroll:auto; is laid out to available width, and the +contained content exceeds a specified height, a scrollbar needs to be +inserted. This should cause the descendants to the scroll:auto; to be +laid out to available width - scrollbar width. + +Things that require the layout engine to be able to run on parts of an +already-laid-out page are: + +- New image fetched and it has width/height not specified in HTML or + CSS +- Overflow scrollbar insertion affects available width +- Frame scrollbar insertion affects available width +- Dynamic CSS pseudo classes +- JavaScript changing stuff or adding stuff + +Working out which bits of the page are affected by any given change may +not be easy. + diff --git a/libcss_style_sharing.mdwn b/libcss_style_sharing.mdwn new file mode 100644 index 0000000..1c8a635 --- /dev/null +++ b/libcss_style_sharing.mdwn @@ -0,0 +1,48 @@ +[[!meta title="LibCSS Style Sharing"]] +[[!meta author="Tlsa"]] +[[!meta date="2014-01-03T15:21:20Z"]] + + +[[!toc]] At the moment NetSurf does +not share computed styles. Every element on every page has its own +unique computed style allocated. Computed styles are quite large. +Consider the following page: + +- <http://git.netsurf-browser.org/netsurf.git/tree/render/layout.c> + +It has over twenty thousand element nodes each with its own computed +style. But there are less than 40 unique computed styles on the page. +This is a massive waste of memory. + +Computed Style Sharing +---------------------- + +If different elements can reference the same computed styles, we can +save a lot of memory. + +- Computed styles will become reference counted. +- There are two ways to go about sharing computed styles: + 1. Memoising calls to css\_get\_style() + - We'll use selection calbacks to find if node has previous + sibling with same element name, classes, etc. If so the + style for node can be an extra reference to the computed + style of the previous sibling. + - Presentational hint gathering for nodes needs to change such + that presentational hints for two nodes can be compared. + - Only shares styles between siblings. Could be extended to + share between cousins, etc. + - As well as saving memory, this will make selection faster. + - It will be a big saving in cases where styles can be + shared, by bypassing the need to iterate over the + applicable selector chains. + - In cases where the styles can't be shared, it will have + a relatively small cost. + + 2. Interning computed styles + - Will have a performance cost. + - Much greater scope for sharing computed styles than the + above. + - Can even share computed styles between different pages. + (NetSurf will be unique in doing that.) + - Fully compatible with the above, so we can do both. + diff --git a/libdom.mdwn b/libdom.mdwn new file mode 100644 index 0000000..2aa05df --- /dev/null +++ b/libdom.mdwn @@ -0,0 +1,22 @@ +[[!meta title="LibDOM"]] +[[!meta author="Parwana"]] +[[!meta date="2014-03-12T13:43:04Z"]] + + +[[!toc]] + +- [LibDOM homepage](http://www.netsurf-browser.org/projects/libdom/) + +Standard Support Status +----------------------- + +- [[Core Support Status|libdom/core_support_status]] +- [[Events Support Status|libdom/events_support_status]] + +Design/TODO +----------- + +- [[MutationEvent generation|libdom/the_mutationevent_generation]] +- [[Minimal subset|libdom/minimalsubset]] +- [[Sequence planning for LibDOM specialisations|sequence_planning_for_libdom_specialisations]] + diff --git a/libdom/core_support_status.mdwn b/libdom/core_support_status.mdwn new file mode 100644 index 0000000..428b761 --- /dev/null +++ b/libdom/core_support_status.mdwn @@ -0,0 +1,254 @@ +[[!meta title="LibDOM/Core Support Status"]] +[[!meta author="Struggleyb"]] +[[!meta date="2009-08-14T09:09:29Z"]] + + +[[!toc]] + +DOM Level 1 +----------- + +The DOMTS test result for this level are: + + Total: 527 + Passed: 421 + Failed: 106 + Conversion Error: 2 + Compile Error: 19 + Run Error: 52 + Not Support: 33 + +The errors mostly root from our XML parser, libxml's SAX parsing ability +is not very well for entity and namespace. The errors will be fixed +after we change a XML parser. + + + DocumentFragment: All + + Document: + docType: Yes + implementation: Yes + documentElement: Yes + createDocument: Yes + createDocumentFragment: Yes + createTextNode: Yes + createComment: Yes + createCdataSection: Yes + createProcessingInstruction: Yes + createAttribute: Yes + createEntityReference: Yes + getElementsByTagName: Yes + + Node: + nodeName: Yes + nodeValue: Yes + nodeType: Yes + parentNode: Yes + childNodes: Yes + firstChild: Yes + lastChild: Yes + previousSibling: Yes + nextSibling: Yes + attributes: Yes + inserBefore: Yes + replaceChild: Yes + removeChild: Yes + appendChild: Yes + hasChildNodes: Yes + cloneNode: Yes + + NodeList: + item: Yes + length: Yes + + NamedNodeMap: + getNamedItem: Yes + setNamedItem: Yes + removeNamedItem: Yes + item: Yes + length: Yes + + CharacterData: + data: Yes + length: Yes + substringData: Yes + appendData: Yes + insertData: Yes + deleteData: Yes + replaceData: Yes + + Attr: + name: Yes + specified: Yes + value: Yes + + Element: + tagName: Yes + getAttribute: Yes + setAttribute: Yes + removeAttribute: Yes + getAttributeNode: Yes + setAttributeNode: Yes + removeAttributeNode: Yes + getElementsByTagName: Yes + normalize: No + + Text: + splitText: Yes + + Comment: All + + CDATASection: All + + DocumentType: + name: Yes + entities: No + notations: No + + Notatoin: No Interface + + Entity: No Interface + + EntityReference: All + + ProcessingInstruction: All + +DOM Level 2 +----------- + +The DOMTS test result for this level are: + + Total: 282 + Passed: 171 + Failed: 111 + Conversion Error: 5 + Compile Error: 14 + Run Error: 90 + Not Support: 18 + +The errors mostly root from our XML parser, libxml's SAX parsing ability +is not very well for entity and namespace. The errors will be fixed +after we change a XML parser. + + + DOMImplementation: + hasFeature: Yes + createDocumentType: Yes + createDocument: Yes + + Document: + importNode: Yes + createElementNS: Yes + createAttributeNS: Yes + getElementsByTagNameNS: Yes + getElementById: Yes + + Node: + normalize: No + isSupported: Yes + namespaceURI: No + prefix: No + localName: Yes + hasAttributes: Yes + + NamedNodeMap: + getNamedItemNS: Yes + setNamedItemNS: Yes + removeNamedItemNS: Yes + + Attr: + ownerElement: Yes + + Element: + getAttributeNS: Yes + setAttributeNS: Yes + removeAttributeNS: Yes + getAttributeNodeNS: Yes + setAttributeNodeNS: Yes + getElementsByTagNameNS: Yes + hasAttribute: Yes + hasAttributeNS: Yes + + DocumentType: + publicId: Yes + systemId: Yes + internalSubset: No + +DOM Level 3 +----------- + +The DOMTS test result for this level are: + + Total: 722 + Passed: 82 + Failed: 640 + Conversion Error: 135 + Compile Error: 313 + Run Error: 92 + Not Support: 100 + +We did not support many features in level 3 now. After we change our XML +parser, we should support now. + + + DOMStringList: No Interface + + NameList: No Interface + + DOMImplementationList: All + + DOMImplementationSource: All + + DOMImplementation: + hasFeature: No + + Document: + inputEncoding: No + xmlEncoding: No + xmlStandalone: No + xmlVersion: No + strictErrorChecking: No + documentURI: Yes + adoptNode: Yes + domConfig: No + normalizeDocument: No + renameNode: No + + Node: + compareDocumentPosition: No + textContent: Yes + isSameNode: Yes + lookupPrefix: No + isDefaultNamespace: No + lookupNamespaceURI: No + isEqualNode: Yes + getFeature: Yes + setUserData: Yes + getUserData: Yes + + Attr: + schemaTypeInfo: No + isId: Yes + + Element: + schemaTypeInfo: No + setIdAttribute: Yes + setIdAttributeNS: Yes + setIdAttributeNode: Yes + + Text: + isElementContentWhitespace: No + wholeText: No + replaceWholeText: No + + TypeInfo: No + + UserDataHandler: All + + DOMError: No Interface + + DOMErrorHandler: No Interface + + DOMLocator: No Interface + + DOMConfiguration: No Interface diff --git a/libdom/events_support_status.mdwn b/libdom/events_support_status.mdwn new file mode 100644 index 0000000..4f92122 --- /dev/null +++ b/libdom/events_support_status.mdwn @@ -0,0 +1,115 @@ +[[!meta title="LibDOM/Events Support Status"]] +[[!meta author="Struggleyb"]] +[[!meta date="2009-08-14T09:08:39Z"]] + + +[[!toc]] + +Level 1 +------- + + Level 1 has No Events model defined at all. ^_^ + +Level 2 +------- + +The DOMTS test result for this level are: + + Total: 26 + Passed: 19 + Failed: 7 + Conversion Error: 5 + Compile Error: 1 + Run Error: 1 + Not Support: 0 + +The errors mostly root from our conversion script, there are many new +XML elements need to be converted before all the testcase's XML file can +be converted successfully. But there are only 6 test cases failed, I +don't think it worth the work to write a more complex conversion script +to just deal with 6 trivial test cases. So, just leave it as this. + + + EventTarget: + addEventListener: Yes + removeEventListener: Yes + dispatchEvent: Yes + + EventListener: All + + Event: + type: Yes + target: Yes + currentTarget: Yes + eventPhase: Yes + bubbles: Yes + cancelable: Yes + timeStamp: Yes + stopPropagation: Yes + preventDefault: Yes + initEvent: Yes + + EventException: All + + DocumentEvent: + createEvent: Yes + + UIEvent: + view: Yes(But no AbstractView support!) + detail: Yes + initUIEvent: Yes + + MouseEvent: All + + MutationEvent: All + +Level 3 +------- + +The DOMTS test result for this level are: + + Total: 1 + Passed: 0 + Failed: 1 + Conversion Error: 1 + Compile Error: 0 + Run Error: 0 + Not Support: 0 + +The errors mostly root from our conversion script, there are many new +XML elements need to be converted before all the testcase's XML file can +be converted successfully. But there are only 1 test case failed, I +don't think it worth the work to write a more complex conversion script +to just deal with 6 trivial test cases. So, just leave it as this. + + + Event: + namespaceURI: No + stopImmediatePropagation: Yes + defaultPrevented: Yes + initEventNS: Yes + + CustomEvent: All + + EventTarget: + addEventListenerNS: No + removeEventListenerNS: No + + DocumentEvent: + canDispatch: No + + UIEvent: All + + TextEvent: All + + KeyboardEvent: All + + MouseEvent: All + + MouseMultiWheelEvent: All + + MouseWheelEvent: All + + MutationEvent: All + + MutationNameEvent: All diff --git a/libdom/minimalsubset.mdwn b/libdom/minimalsubset.mdwn new file mode 100644 index 0000000..808a5f3 --- /dev/null +++ b/libdom/minimalsubset.mdwn @@ -0,0 +1,99 @@ +[[!meta title="LibDOM/MinimalSubset"]] +[[!meta author="Tlsa"]] +[[!meta date="2012-03-31T09:51:42Z"]] + + +[[!toc]] + +Overview +-------- + +This page enumerates the minimal subset required before it's worth +integrating LibDOM with NetSurf's current engine: + +- Core (Document, Element, Attribute, etc) +- EventTarget +- HTMLDocument, HTMLElement + +With the above interfaces, we can create an HTMLDocument instance per +page and create a tree of HTMLElement instances for the content. +Specialised HTMLElement subclasses can be added as required. + +Current Status +-------------- + +We now have all the above interfaces implemented (to some level of +completeness). The example dom-structure-dump code is now capable of +building an HTMLDocument using HTMLElement nodes and not leaking dynamic +resources. + +Before integration can proceed, the following (at least) needs doing: + +- <s>We need to invent an API to permit comparison of classes to + satisfy LibCSS' has\_class selection callback's needs.</s> + - <s>Implement this API</s>. + +Once the above things are complete, integration may proceed as follows: + +- <s>Remove the parser binding infrastructure from NetSurf's HTML + content handler and replace it with instantiation of LibDOM.</s> +- <s>Port the box tree constructor to the LibDOM API</s> +- <s>Fix up anything else that expects a libxml tree (save complete is + a likely candidate)</s> +- Construct form gadgets during box tree construction & register them + with the relevant DOM node + +In order to not have memory consumption issues and performance +regressions, we also need to to: + +- <s>Replace the hash table of EventListeners on an EventTarget with a + linked list, or similar -- the current implementation is both a + memory hog and broken.</s> +- <s>Replace the hash tables for Attributes attached to Element nodes + with linked lists, or similar. Again, this is currently wasting + memory for no benefit.</s> +- The Hubbub parser binding needs bringing into sync with the feature + set of the parser binding used in NetSurf. Feature parity must be + ensured to avoid regressions. Specifically: + - <s>There needs to be a way to set the quirks mode of a document, + and retrieve it (i.e. specialised API on HTMLDocument)</s> + - Form association needs implementing (i.e. specialised API on + HTMLFormElement) + - Fix the mess that is/implement HTMLCollection, + HTMLOptionsCollection, HTMLFormElement, HTMLInputElement, + HTMLSelectElement, HTMLOptionElement, HTMLTextareaElement + (May get away with just HTMLCollection and HTMLFormElement + initially) + - HTMLCollection can \*not\* assume that the collection + contents all live beneath a fixed root node + (particularly for form inputs) + - Register form control elements with their form + - Work out when to deregister them again + - <s>Class/id attribute optimisations need retaining (see + below)</s> +- <s>HTMLElement needs to gain optimisations for class attributes + (i.e. pre-parse the value string into individual class identifiers). + See NetSurf's existing Hubbub binding for an approximation of what's + needed -- HTMLElement.setAttr(NS) is probably where this needs to + live (or possibly implement it in Element.setAttr(NS) or + Attr.setValue if we want the same behaviour for XML documents). </s> + +The above work can be done in parallel with the integration work but +must be completed before a release can occur. + +To tidy things up before a libdom release, we need to do the following: + +- Get speed back to pre-libdom. +- Sort out DOM events. +- Cleanup idea: + - Every point in netsurf which uses libdom should ensure any time + it passes a pointer to a dom\_node pointer, it makes it NULL + first. + - Then every API in libdom which takes a pointer to a dom\_node + pointer in order to return a dom\_node pointer, it asserts that + the pointer points to a NULL. + - Then once we're sure that no user is asserting we alter that + assert to an "if not NULL, unref and set to NULL" + - Then we can simplify callers, often into for() loops rather than + complex while loops with unreffings. + diff --git a/libdom/the_mutationevent_generation.mdwn b/libdom/the_mutationevent_generation.mdwn new file mode 100644 index 0000000..ae00db3 --- /dev/null +++ b/libdom/the_mutationevent_generation.mdwn @@ -0,0 +1,96 @@ +[[!meta title="LibDOM/The MutationEvent generation"]] +[[!meta author="Struggleyb"]] +[[!meta date="2009-08-09T10:20:48Z"]] + + +[[!toc]] + +Events with Methods Generate them +--------------------------------- + + + DOMSubtreeModified: + + + DOMNodeRemovedFromDocument: + Node.replaceChild + Node.removeChild + Element.removeAttribute + Element.setAttributeNode + Element.removeAttributeNode + Element.removeAttributeNS + Element.setAttributeNodeNS + + DOMNodeInsertedIntoDocument: + Node.insertBefore + Node.replaceChild + Node.appendChild + Element.setAttribute + Element.setAttributeNode + Element.setAttributeNS + Element.setAttributeNodeNS + + DOMNodeInserted: + Node.insertBefore + Node.replaceChild + Node.appendChild + Element.setAttribute + Element.setAttributeNode + Element.setAttributeNS + Element.setAttributeNodeNS + + DOMNodeRemoved: + Node.replaceChild + Node.removeChild + Element.removeAttribute + Element.setAttributeNode + Element.removeAttributeNode + Element.removeAttributeNS + Element.setAttributeNodeNS + + DOMAttrModified: + Element.setAttribute + Element.removeAttribute + Element.setAttributeNode + Element.removeAttributeNode + Element.setAttributeNS + Element.removeAttributeNS + Element.setAttributeNodeNS + + DOMCharacterDataModified: + Node.nodeValue + CharacterData.data + CharacterData.appendData + CharacterData.deleteData + CharacterData.insertData + CharacterData.replaceData + ProcessingInstruction.data + +#### Some Event Generation Order consideration + +As above, some changes of DOM caused by certain API can emit multiple +Events. In some situation, the DOM spec define the order of the events. +For example, when an Attr is removed from an element, the implementation +should send the following events as the following order: + + DOMNodeRemoved + DOMAttrModified + DOMSubtreeModified + +But in other situation, the events order are not specified. For example, +when an Attr is added to an element, the implement should may send: + + DOMNodeInserted + DOMAttrModified + DOMSubtreeModified + +or + + DOMAttrModified + DOMNodeInserted + DOMSubtreeModified + +The point here is, the DOMAttrModified and DOMNodeInserted can be +dispatched in any order, but the DOMSubtreeModified event should always +the last event after bunch of events. + diff --git a/libdom_core_support_status.mdwn b/libdom_core_support_status.mdwn new file mode 100644 index 0000000..2b0dc5b --- /dev/null +++ b/libdom_core_support_status.mdwn @@ -0,0 +1,9 @@ +[[!meta title="LibDOM Core Support Status"]] +[[!meta author="Tlsa"]] +[[!meta date="2009-08-07T11:48:15Z"]] + + +[[!toc]] + +1. REDIRECT [[LibDOM/Core Support Status|libdom/core_support_status]] + diff --git a/libdom_events_support_status.mdwn b/libdom_events_support_status.mdwn new file mode 100644 index 0000000..fa5e5a0 --- /dev/null +++ b/libdom_events_support_status.mdwn @@ -0,0 +1,9 @@ +[[!meta title="LibDOM Events Support Status"]] +[[!meta author="Tlsa"]] +[[!meta date="2009-08-07T11:48:51Z"]] + + +[[!toc]] + +1. REDIRECT [[LibDOM/Events Support Status|libdom/events_support_status]] + diff --git a/libhubbub.mdwn b/libhubbub.mdwn new file mode 100644 index 0000000..739072c --- /dev/null +++ b/libhubbub.mdwn @@ -0,0 +1,59 @@ +[[!meta title="LibHubbub"]] +[[!meta author="Parwana"]] +[[!meta date="2014-07-21T14:30:43Z"]] + + +[[!toc]] Following are the places +where Libhubbub still lacks, although it is now reliable at most places. + +1\) Element stack size inflates on repeated pushing, without reducing its +size during pop. The proposed solution is to reduce size by 1/2 once the +used proportion falls to below 1/3. A simillar increase to twice it's +size once it's full. An approval from core developers is neccessary +before trying to implement this. + +2\) The tokeniser has become very messy & unreadable because of +introduction of script related states. The proposed solution is to have +standalone handlers for each state, But this may mean a significant +increase in code size and redundant code, giving a blow to code +reusability. + +3\) The library has been significantly slowed down because it is now +required to store tag Attributes. I have currently stored it on the +context details. But repeated use of strndup to copy attribute strings +during stack push as well as during formatting list push, has severely +slowed down things. However, it works reliably. + +4\) Assumption: The client currently doesn't support creation of template +elements. Libhubbub can now properly handle template tags, assuming +template to be equivalent to any other tag. When template creation +support is provided, the only thing to be done would be to incorporate +it into the insert\_element method of the treebuilder. + +5\) Handling script tags in SVG mode requires the client to support it +too. The specs are a bit hazy and any input on it would be appreciated: +www.whatwg.org/specs/web-apps/current-work/multipage/tree-construction.html\#parsing-main-inforeign +\<-look under the script end tag . + +6\) I couldn't guess how to find out whether the document is an +iframe-source document. If any inputs can be provided, it would be +helpful enough. :) + +7\) The charset detection mechanism previously prescaned the doc upto 512 +bytes to find the meta tag. This has been increased it to 1024 bytes, +and this requires approval of the core developers. Also, currently, no +algorithms have been implemented to auto-detect document encoding. If +appropriate sources are provided, I will try implementing those in +Hubbub. + +8\) XML violations are a special set of rules to make make the API safe +for the xml pipeline. And Hubbub currently doesn't support it. If the +core developers see this to be neccessary at all, I will try +implementing it. Ref: +<http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#c...> + +9\) Some errors out of my knowledge may have crept into the library. +After all human is all but err :-P + +Rupinder Singh Khokhar + diff --git a/module/index.mdwn b/module/index.mdwn new file mode 100644 index 0000000..63a668a --- /dev/null +++ b/module/index.mdwn @@ -0,0 +1,20 @@ +[[!meta title="Module:Index"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-01-09T22:43:50Z"]] + + +[[!toc]] + +|colspan=3 style="background: gray; color: white" | NetSurf Code Modules| +|-----------------------------------------------------------------------| +|Module|Prefix|Purpose| +|[[Module:utils/container|module/utils/container]]|container|File format for themes| +|[[Module:utils/errors|module/utils/errors]]|nserror|Common error codes| +|[[Module:utils/filename|module/utils/filename]]|filename|Allocation of unique filenames| +|[[Module:utils/findresource|module/utils/findresource]]|*various*|Finds resource files in a list of locations| +|[[Module:utils/hashtable|module/utils/hashtable]]|hash|Write-once string to string hash tables| +|[[Module:utils/http|module/utils/http]]|http|HTTP header parsing| +|[[Module:utils/locale|module/utils/locale]]|ls|Locale-specific variants of ctype.h functions| + +[[!tag module]] + diff --git a/module/utils/container.mdwn b/module/utils/container.mdwn new file mode 100644 index 0000000..5025c2b --- /dev/null +++ b/module/utils/container.mdwn @@ -0,0 +1,38 @@ +[[!meta title="Module:utils/container"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-01-09T22:28:35Z"]] + + +[[!toc]] File format for NetSurf +themes. + +: ''Note: possibly incomplete; no themes currently exist. + +Prefix +------ + +`container_` + +Depends on +---------- + +- [[Module:utils/log|module/utils/log]] +- [[Module:utils/messages|module/utils/messages]] +- [[Module:utils/utils|module/utils/utils]] + +Description +----------- + +This module implements a simple file format which contains a series of +files (i.e. named chunks of data). + +Files +----- + +utils/container.h +: Interface +utils/container.c +: Implementation + +[[!inline raw=yes pages="Module:Index"]] + diff --git a/module/utils/errors.mdwn b/module/utils/errors.mdwn new file mode 100644 index 0000000..e2b5237 --- /dev/null +++ b/module/utils/errors.mdwn @@ -0,0 +1,38 @@ +[[!meta title="Module:utils/errors"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-01-09T22:36:17Z"]] + + +[[!toc]] Common error (and OK) +return codes. + +Prefix +------ + +`nserror` +`NSERROR_` + +Depends on +---------- + +None. + +Description +----------- + +This module defines standard return codes used throughout NetSurf. It +defines the enum **nserror**. + +**NSERROR\_OK** indicates that a function was successful. Other values +indicate an error as described in utils/error.h. + +Files +----- + +utils/error.h +: Interface + +There is no associated .c file. + +[[!inline raw=yes pages="Module:Index"]] + diff --git a/module/utils/filename.mdwn b/module/utils/filename.mdwn new file mode 100644 index 0000000..6c97e46 --- /dev/null +++ b/module/utils/filename.mdwn @@ -0,0 +1,38 @@ +[[!meta title="Module:utils/filename"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-01-09T22:36:41Z"]] + + +[[!toc]] Central method of +obtaining unique filenames. + +Prefix +------ + +`filename_` + +Depends on +---------- + +- [[Module:utils/log|module/utils/log]] +- [[Module:utils/utils|module/utils/utils]] + +Description +----------- + +This module allocates unique filenames in a tree in NetSurf's cache +directory. Files are arranged in a tree 4 levels deep with up to 64 +files per lowest level directory. + +Performance appears to be O(number of files). + +Files +----- + +utils/filename.h +: Interface +utils/filename.c +: Implementation + +[[!inline raw=yes pages="Module:Index"]] + diff --git a/module/utils/findresource.mdwn b/module/utils/findresource.mdwn new file mode 100644 index 0000000..437367c --- /dev/null +++ b/module/utils/findresource.mdwn @@ -0,0 +1,35 @@ +[[!meta title="Module:utils/findresource"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-01-09T22:37:11Z"]] + + +[[!toc]] Finds resource files in a +list of locations. + +Prefix +------ + +Does not conform to convention; see header. + +Depends on +---------- + +None. + +Description +----------- + +This module supplies functions to find files in a list of directories. +This is used to load resource files, for example looking in the home +directory first, and then other standard locations. + +Files +----- + +utils/findresources.h +: Interface +utils/findresources.c +: Implementation + +[[!inline raw=yes pages="Module:Index"]] + diff --git a/module/utils/hashtable.mdwn b/module/utils/hashtable.mdwn new file mode 100644 index 0000000..94b59f9 --- /dev/null +++ b/module/utils/hashtable.mdwn @@ -0,0 +1,38 @@ +[[!meta title="Module:utils/hashtable"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-01-09T22:37:26Z"]] + + +[[!toc]] Write-once string to +string hash tables. + +Prefix +------ + +`hash_` + +Depends on +---------- + +- [[Module:utils/log|module/utils/log]] + +Description +----------- + +This module implements mappings from string to string using a hash +table. Pairs can not be removed once added. + +The tables have a fixed number of buckets specified on creation, but +don't grow beyond that. Entries are chained in a linked list in each +bucket. + +Files +----- + +utils/hashtable.h +: Interface +utils/hashtable.c +: Implementation + +[[!inline raw=yes pages="Module:Index"]] + diff --git a/module/utils/http.mdwn b/module/utils/http.mdwn new file mode 100644 index 0000000..16b8cbc --- /dev/null +++ b/module/utils/http.mdwn @@ -0,0 +1,34 @@ +[[!meta title="Module:utils/http"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-01-09T22:37:40Z"]] + + +[[!toc]] HTTP header parsing +functions. + +Prefix +------ + +`http_` + +Depends on +---------- + +- [[Module:utils/errors|module/utils/errors]] + +Description +----------- + +This module contains functions to assist with parsing certain types of +HTTP headers. + +Files +----- + +utils/http.h +: Interface +utils/http.c +: Implementation + +[[!inline raw=yes pages="Module:Index"]] + diff --git a/module/utils/locale.mdwn b/module/utils/locale.mdwn new file mode 100644 index 0000000..4faa680 --- /dev/null +++ b/module/utils/locale.mdwn @@ -0,0 +1,38 @@ +[[!meta title="Module:utils/locale"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-01-09T22:42:48Z"]] + + +[[!toc]] Locale-specific variants +of ctype.h functions. + +Prefix +------ + +`ls_` + +Depends on +---------- + +None. + +Description +----------- + +This module supplies versions of the character classification functions +in <ctype.h> that respect the current locale. + +NetSurf has a setlocale(LC\_ALL, "C") call in initialization for +consistent and predictable behaviour. These functions however use the +environment's locale. + +Files +----- + +utils/locale.h +: Interface +utils/locale.c +: Implementation + +[[!inline raw=yes pages="Module:Index"]] + diff --git a/netsurf_2.5.mdwn b/netsurf_2.5.mdwn new file mode 100644 index 0000000..a72ae8c --- /dev/null +++ b/netsurf_2.5.mdwn @@ -0,0 +1,28 @@ +[[!meta title="NetSurf 2.5"]] +[[!meta author="Jmb"]] +[[!meta date="2010-04-19T20:56:42Z"]] + + +[[!toc]] This is a list of things +that need to be done before NetSurf 2.5 can be released. + +Code +---- + +### Potential crashers + +### Other + +- GTK: Local history window redraw is broken in areas you have to + scroll to see + +Admin +----- + +- Target frontends for release (RISC OS, GTK and Amiga OS 4.0) +- [Changelog](http://www.netsurf-browser.org/temp/ChangeLog) +- Testing +- [Preparing release + branch](http://source.netsurf-browser.org/branches/release/netsurf/2/Rele... +- ISO Image for burning to CDs? + diff --git a/netsurf_2.6.mdwn b/netsurf_2.6.mdwn new file mode 100644 index 0000000..55b53f4 --- /dev/null +++ b/netsurf_2.6.mdwn @@ -0,0 +1,50 @@ +[[!meta title="NetSurf 2.6"]] +[[!meta author="Reverse101"]] +[[!meta date="2011-10-31T23:41:23Z"]] + + +[[!toc]] This is a list of things +that still need to be fixed before NetSurf 2.6 can be released. + +Code +---- + +### Potential crashers + +- ? + +### Memory usage + +- ? + +### Other + +- GTK: URL bar and search bar border messed up with Ubuntu theme + +### WONTFIX in 2.6 + +- SSL / https breakage has been reported. (RISC OS on Beagleboard + only) + +Admin +----- + +[reverse phone lookup](http://reversephonelookuppages.com/) [reverse +cell phone +lookup](http://www.prlog.org/11684341-reverse-cell-phone-lookup-number.html) +[phone number +lookup](http://www.prlog.org/11289974-phone-number-lookup-verizon-phone-number-reverse-lookup-to-get-information-you-need-quickly.html) +[<http://ezinearticles.com/?Unpublished-Phone-Number-Lookup>---Find-Out-the-Identity-of-Your-Wifes-Lover&id=4664636 +phone number lookup] [reverse cell phone +lookup](http://www.reversecellphonelookup.me/) [reverse phone +lookup](http://www.linkedin.com/in/reversephonelookup1) [reverse phone +lookup](http://www.reversephonelookuped.com/) [reverse phone +lookup](http://www.reversephonelookupz.com/) [phone number +lookup](http://www.articlesbase.com/information-technology-articles/reverse-cell-phone-number-lookup-how-to-choose-the-best-phone-number-lookup-service-3869930.html) + +- Target frontends for release (RISC OS, GTK and Amiga OS 4.0) +- [Changelog](http://www.netsurf-browser.org/temp/ChangeLog) +- Testing +- [Preparing release + branch](http://source.netsurf-browser.org/branches/release/netsurf/2/Rele... + diff --git a/netsurf_2.7.mdwn b/netsurf_2.7.mdwn new file mode 100644 index 0000000..52cabdf --- /dev/null +++ b/netsurf_2.7.mdwn @@ -0,0 +1,71 @@ +[[!meta title="NetSurf 2.7"]] +[[!meta author="Tlsa"]] +[[!meta date="2011-03-13T09:59:48Z"]] + + +[[!toc]] This is a list of things +that still need to be fixed before NetSurf 2.7 can be released. + +Code +---- + +### Potential crashers + +- ? + +### Memory usage + +- ? + +### Other + +- Install targets have bitrotted +- Debian/Ubuntu packages + +### WONTFIX in 2.7 + +- GTK: URL bar and search bar border messed up with Ubuntu 10.04 theme + -- Rounded corners are clipped. Probably the lib sexey thing is + broken. +- framebuffer: leaks font stuff (Well, leaks in that it doesn't free + them on exit) +- RISC OS: SSL / https breakage has been reported. (on Beagleboard + only) +- core: cURL handles are huge, can we reduce our defaults or are we at + the minimum limit of acceptability? +- core: Frames + +Admin +----- + +### Timeline + +- Sat/Sun 12th/13th March developer weekend +- Sunday 27th March SVN branch made +- Sunday 10th April CD iso ready +- Saturday 16th April Wakefield + +### Target frontends for release + +- RISC OS +- GTK +- Amiga OS 4.0 +- Cocoa +- Windows - Currently set for tech. preview only + +### Misc + +- [Changelog](http://www.netsurf-browser.org/temp/ChangeLog) +- Testing +- [Preparing release + branch](http://source.netsurf-browser.org/branches/release/netsurf/2/Rele... + +Website +------- + +- For each front end, screenshots (1024x768 window size prefered) of + the following: + 1. <http://www.netsurf-browser.org/> + 2. <http://en.wikipedia.org/wiki/Main_Page> + 3. <http://www.bbc.co.uk/> + diff --git a/netsurf_2.8.mdwn b/netsurf_2.8.mdwn new file mode 100644 index 0000000..847028c --- /dev/null +++ b/netsurf_2.8.mdwn @@ -0,0 +1,70 @@ +[[!meta title="NetSurf 2.8"]] +[[!meta author="Tlsa"]] +[[!meta date="2011-09-18T12:12:56Z"]] + + +[[!toc]] This is a list of things +that still need to be fixed before NetSurf 2.8 can be released. + +Code +---- + +### Potential crashers + +- <s>Floating point exception on quit when no images have been + displayed. Divide by zero in image\_cache\_fini()</s> - Fixed in + revision 12794 + +### Memory usage + +- ? + +### Other + +- <s>RISC OS: LWC strings remaining on exit</s> - fixed in r12805 +- <s>Amiga: resize frames redraw is broken</s> - fixed in r12802 +- Have any install targets broken? Missing resources? Trying to copy + things that have gone? +- Debian/Ubuntu packages + +### WONTFIX in 2.8 + +- GTK: URL bar and search bar border messed up with Ubuntu 10.04 theme + -- Rounded corners are clipped. Probably the lib sexey thing is + broken. +- framebuffer: leaks font stuff (Well, leaks in that it doesn't free + them on exit) +- core: cURL handles are huge, can we reduce our defaults or are we at + the minimum limit of acceptability? +- New warnings since 2.7 in core (gcc version 3.4.6 (RISC OS GCCSDK + 3.4.6 Release 2)): + + + + image/png.c: In function `png_cache_convert': + image/png.c:430: warning: variable 'bitmap' might be clobbered by `longjmp' or `vfork' + image/png.c:433: warning: variable 'row_pointers' might be clobbered by `longjmp' or `vfork' + +Admin +----- + +### Timeline + +- Branch some time around 17th September 2011 + +### Target frontends for release + +- RISC OS +- GTK +- Amiga OS 4.0 +- Cocoa +- Windows - Currently set for tech. preview only +- Atari? + +### Misc + +- [Changelog](http://www.netsurf-browser.org/temp/ChangeLog) +- Testing +- [Preparing release + branch](http://source.netsurf-browser.org/branches/release/netsurf/2/Rele... + diff --git a/netsurf_2.9.mdwn b/netsurf_2.9.mdwn new file mode 100644 index 0000000..96642f5 --- /dev/null +++ b/netsurf_2.9.mdwn @@ -0,0 +1,83 @@ +[[!meta title="NetSurf 2.9"]] +[[!meta author="Tlsa"]] +[[!meta date="2012-04-26T13:28:42Z"]] + + +[[!toc]] This is a list of things +that still need to be fixed before NetSurf 2.9 can be released. + +Code +---- + +### Potential crashers + +- ? + +### Memory usage + +- ? + +### Other + +- <s>GTK: Changing between tabs does not update the favicon to match + the current tab's page.</s> r13460 +- Framebuffer: Linux surface support. +- Have any install targets broken? Missing resources? Trying to copy + things that have gone? +- Debian/Ubuntu packages + +### WONTFIX in 2.9 + +- Framebuffer: leaks font stuff (Well, leaks in that it doesn't free + them on exit) +- Core: cURL handles are huge, can we reduce our defaults or are we at + the minimum limit of acceptability? +- New warnings since 2.7 in core (gcc version 3.4.6 (RISC OS GCCSDK + 3.4.6 Release 2)): + + + + image/png.c: In function `png_cache_convert': + image/png.c:430: warning: variable 'bitmap' might be clobbered by `longjmp' or `vfork' + image/png.c:433: warning: variable 'row_pointers' might be clobbered by `longjmp' or `vfork' + +Admin +----- + +### Timeline + +- Branch some time in Jan 2012 + +### Target frontends for release + +- RISC OS +- GTK +- Amiga OS 4.0 +- Cocoa +- Atari +- ? + +### Misc + +- [Changelog](http://www.netsurf-browser.org/temp/ChangeLog) +- Testing +- [Preparing release + branch](http://source.netsurf-browser.org/branches/release/netsurf/2/Rele... +- Run the autobuilder. For example, with user:netsurf on + semichrome.net: + + + + $ svn export svn://svn.netsurf-browser.org/trunk/netsurfbuild netsurfbuild-v2.9 + $ cd netsurfbuild-v2.9 + $ svn co svn://svn.netsurf-browser.org/tags/hubbub/<version> hubbub + $ svn co svn://svn.netsurf-browser.org/tags/libcss/<version> libcss + $ svn co svn://svn.netsurf-browser.org/tags/libnsbmp/<version> libnsbmp + $ svn co svn://svn.netsurf-browser.org/tags/libnsgif/<version> libnsgif + $ svn co svn://svn.netsurf-browser.org/tags/libparserutils/<version> libparserutils + $ svn co svn://svn.netsurf-browser.org/tags/libsvgtiny/<version> libsvgtiny + $ svn co svn://svn.netsurf-browser.org/tags/libwapcaplet/<version> libwapcaplet + $ svn co svn://svn.netsurf-browser.org/tags/netsurf/<version> netsurf + $ svn co svn://svn.netsurf-browser.org/trunk/netsurfweb + $ mkdir -p downloads/releases/ + $ ./autobuild.pl --release="2.9" diff --git a/netsurf_3.0.mdwn b/netsurf_3.0.mdwn new file mode 100644 index 0000000..f5d52ba --- /dev/null +++ b/netsurf_3.0.mdwn @@ -0,0 +1,88 @@ +[[!meta title="NetSurf 3.0"]] +[[!meta author="Tlsa"]] +[[!meta date="2013-04-08T14:35:32Z"]] + + +[[!toc]] This is a list of things +that still need to be fixed before NetSurf 3.0 can be released. + +Code +---- + +### Potential crashers + +- ? + +### Memory usage + +- ? + +### Other + +- Buildsystem: Generate messages as part of build. +- <s>Core: LibDOM: DOM events are a big performance regression.</s> +- <s>Core: Remove last dependencies on LibXML.</s> +- <s>Core: LibSVGTiny: Use LibDOM instead of LibXML.</s> +- <s>GTK: Scrollwheel not working.</s> +- <s>Buildsystem: We've all developed separate bash scripts to + automate library fetch/update/build. Get this unified and into + version control.</s> +- <s>Documentation: Explain JS builds, their status, and what (not) to + expect.</s> + +### WONTFIX in 3.0 + +- Core: Fix forms to use libdom properly. -- Postpone to 3.1. +- Core: Fix entities getting separate BOX\_TEXT in box construction. + -- Postpone to 3.1. +- Core: Use new treeview. -- Postpone to 3.1. +- Framebuffer: Linux surface support. -- Postpone to 3.1. +- New logo? -- Postpone to 3.1. + +Admin +----- + +- <strong>Can we automate production of releases?</strong> +- Have any install targets broken? Missing resources? Trying to copy + things that have gone? +- Debian/Ubuntu packages + +### Timeline + +- Branch in Apr 2013 + +### Target frontends for release + +- RISC OS +- GTK +- Amiga OS 4.0 +- Cocoa +- Atari +- ? + +### Misc + +- For releases, turn Logging off in RISC OS front end. In + !NetSurf.!Run: Set NetSurf\$Logging 0 +- [Changelog](http://www.netsurf-browser.org/temp/ChangeLog) +- Testing +- [Preparing release + branch](http://source.netsurf-browser.org/branches/release/netsurf/2/Rele... +- <strong>Old and out of date:</strong> Run the autobuilder. For + example, with user:netsurf on semichrome.net: + + + + $ svn export svn://svn.netsurf-browser.org/trunk/netsurfbuild netsurfbuild-v2.9 + $ cd netsurfbuild-v2.9 + $ svn co svn://svn.netsurf-browser.org/tags/hubbub/<version> hubbub + $ svn co svn://svn.netsurf-browser.org/tags/libcss/<version> libcss + $ svn co svn://svn.netsurf-browser.org/tags/libnsbmp/<version> libnsbmp + $ svn co svn://svn.netsurf-browser.org/tags/libnsgif/<version> libnsgif + $ svn co svn://svn.netsurf-browser.org/tags/libparserutils/<version> libparserutils + $ svn co svn://svn.netsurf-browser.org/tags/libsvgtiny/<version> libsvgtiny + $ svn co svn://svn.netsurf-browser.org/tags/libwapcaplet/<version> libwapcaplet + $ svn co svn://svn.netsurf-browser.org/tags/netsurf/<version> netsurf + $ svn co svn://svn.netsurf-browser.org/trunk/netsurfweb + $ mkdir -p downloads/releases/ + $ ./autobuild.pl --release="2.9" diff --git a/netsurf_3.1.mdwn b/netsurf_3.1.mdwn new file mode 100644 index 0000000..25a949d --- /dev/null +++ b/netsurf_3.1.mdwn @@ -0,0 +1,127 @@ +[[!meta title="NetSurf 3.1"]] +[[!meta author="Kyllikki"]] +[[!meta date="2013-06-09T08:41:26Z"]] + + +[[!toc]] This is a list of things +that still need to be done for the NetSurf 3.1 release. + +Admin +----- + +- <strong>Improve automatic production of releases</strong> +- Have any install targets broken? Missing resources? Trying to copy + things that have gone? +- For releases, turn Logging off in RISC OS front end. In + !NetSurf.!Run: Set NetSurf\$Logging 0 +- Update and correct + [Changelog](http://www.netsurf-browser.org/temp/ChangeLog) +- Testing +- [[Release_Process|release_process]] +- Debian/Ubuntu packages + +### Timeline + +- Branch in July 2013 + +### Target frontends for release + +- RISC OS +- GTK +- Amiga OS 4.0 +- Cocoa +- Atari +- Windows + +### Misc + +- ? + +Code +---- + +### Potential crashers + +- ? + +### Memory usage + +- ? + +### Feature + +- One bitmap image content type, instead of one for each of JPEG, GIF, + etc. Make image format handlers into simple data converters for the + image content type. +- Implement cloning of HTML contents (required for printing) +- Keep source data in chunks; currently about a third of the heap is + wastage. Not possible until image handlers can stream. +- Support for APNGs? +- Use an XML parser for XHTML? +- Rewrite URL database +- Advert blocking needs overhaul + - current source of adblock css is long gone (nov 2004) + - the original idea source for css based blocking is + <http://www.floppymoose.com/userContent.css> but thats + inadequate for our purposes + - another source used in our current css was last updated 2008 + <http://www.gozer.org/mozilla/ad_blocking/css/ad_blocking.css> + - an adblock plus source which might be worth adding instead of + doing it by css + <https://easylist-downloads.adblockplus.org/easylist.txt> where + <http://adblockplus.org/en/filters> is the file format. We might + be able to convert from the adblock format to css? + +### Other + +- Core: Fix forms to use libdom properly. +- Core: Fix entities getting separate BOX\_TEXT in box construction. +- Core: Use new treeview. +- New logo? +- Tidy up printing system +- Drop \_GNU\_SOURCE on the floor + +#### RISC OS + +- riscos: Choices/options review and implement missing ones in UI +- ? + +#### GTK + +- Use freetype directly, as pango makes us far slower for the sake of + functionality we don't use +- Get rid of libsexy + +#### Framebuffer + +- Framebuffer: Linux surface and input support. +- Support for mouse drags +- Support for page scaling (needs work on plotters) +- Caret rendering +- Tabs + +#### Windows + +- Fix scrolling +- windows: Choices/options review and implement missing ones in UI + +#### Amiga + +- amiga: Choices/options review and implement missing ones in UI +- ? + +#### cocoa + +- cocoa: Choices/options review and implement missing ones in UI +- ? + +#### Atari + +- atari: Choices/options review and implement missing ones in UI +- ? + +WONTFIX +------- + +Code entries explicitly omitted from this release + diff --git a/netsurf_3.2.mdwn b/netsurf_3.2.mdwn new file mode 100644 index 0000000..295e3f9 --- /dev/null +++ b/netsurf_3.2.mdwn @@ -0,0 +1,31 @@ +[[!meta title="NetSurf 3.2"]] +[[!meta author="Tlsa"]] +[[!meta date="2014-04-26T15:00:59Z"]] + + +[[!toc]] This page lists the main +goals for post NetSurf 3.1 development. + +Important / Urgent +------------------ + +### Core + +- Remove utils/container.{c|h} +- [[LibCSS style sharing|libcss_style_sharing]] +- Make NetSurf use core buildsystem +- Make core buildsystem support tripples + +### GTK + +- Remove themes code + +### Framebuffer + +- Get linux framebuffer surface working + +Less Important / Less Urgent +---------------------------- + +- ? + diff --git a/netsurf_3.3.mdwn b/netsurf_3.3.mdwn new file mode 100644 index 0000000..d49fac9 --- /dev/null +++ b/netsurf_3.3.mdwn @@ -0,0 +1,34 @@ +[[!meta title="NetSurf 3.3"]] +[[!meta author="Kyllikki"]] +[[!meta date="2015-03-08T11:57:14Z"]] + + +[[!toc]] This page lists the main +goals for post NetSurf 3.2 development. + +Important / Urgent +------------------ + +### Core + +- Remove utils/container.{c|h} +- [[LibCSS style sharing|libcss_style_sharing]] +- Make NetSurf use core buildsystem +- fix css media queries + +### GTK + +- Remove themes code + +### Framebuffer + +- Get linux framebuffer surface working + +Less Important / Less Urgent +---------------------------- + +### Javascript + +- nsgenbind DOM constructors +- Make a decision on ducktape + diff --git a/netsurf_3.4.mdwn b/netsurf_3.4.mdwn new file mode 100644 index 0000000..bf07594 --- /dev/null +++ b/netsurf_3.4.mdwn @@ -0,0 +1,34 @@ +[[!meta title="NetSurf 3.4"]] +[[!meta author="Tlsa"]] +[[!meta date="2016-02-09T11:08:51Z"]] + + +[[!toc]] This page lists the main +goals for post NetSurf 3.3 development. + +Important / Urgent +------------------ + +### Core + +- <s>Remove utils/container.{c|h}</s> +- [[LibCSS style sharing|libcss_style_sharing]] +- Make NetSurf use core buildsystem +- [[fix css media queries|css_media_queries]] + +### GTK + +- Remove themes code + +### Framebuffer + +- Get linux framebuffer surface working + +Less Important / Less Urgent +---------------------------- + +### Javascript + +- nsgenbind DOM constructors +- <s>Make a decision on duktape</s> + diff --git a/netsurf_3.5.mdwn b/netsurf_3.5.mdwn new file mode 100644 index 0000000..4f80e33 --- /dev/null +++ b/netsurf_3.5.mdwn @@ -0,0 +1,88 @@ +[[!meta title="NetSurf 3.5"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-03-22T21:58:40Z"]] + + +[[!toc]] This page lists the main +goals for NetSurf 3.5. + +Important +--------- + +ensure no library updates please, this is a fixup release because 3.4 is +a bit of a lemon + +Core +---- + +- <s>it's probably worth checking if the root certificates need an + update</s> +- check library is noisy if missing +- need to fix build without libutf8proc +- fix build without libcurl (for local only and non standard http + fetchers) + +Docs +---- + +- need to go on a docs rampage as everything is a bit out of date or + missing references + +Frontends +--------- + +### GTK + +- <s>themes integration causes segfault at start with installed + versions due to resource changes</s> + - gutted GTK application themes, now rely on GTK theming --vince +- openBSD report issues with tests? + +### RISC OS + +- <s>system etc. merges have bad dates - master branch has a script to + fix this on install - verify results are ok</s> + - Done: I asked Dave Higton to verify this, and all was well. + --tlsa +- bundled resource updates +- any critical bugs? + +### Amiga + +- <s>3.4 shipped broken</s> + - needs pile of fixes already applied to HEAD +- <s>New compiler, needs testing and checking new binaries are + correct</s> + - have all the libraries been re-built with the new toolchain? + - Yes. --tlsa + - chrisy assures us it is all good --vince +- <s>should we be doing something with os3 release yet?</s> + - probably not, it's still beta quality + +### haiku + +- need to sort out binary stripping. + +### windows + +- <s>nasty crashes on redraw due to unexpected core locking</s> +- <s>the Windows version has never worked on Windows 10 . nasty issues + in font splitting + <http://bugs.netsurf-browser.org/mantis/view.php?id=2445> </s> + - This front end has never been a release candidate. I suggest we + don't expend effort on this for 3.5 unless a Windows maintainer + steps up. --tlsa + - mostly work again so possible preview release candidate + +### cocoa + +- completely non functional - crashes badly + +### framebuffer + +- Linux framebuffer surface input still broken + +### atari + +- no feedback on if either version build properly on CI + diff --git a/netsurf_3.6.mdwn b/netsurf_3.6.mdwn new file mode 100644 index 0000000..a60256b --- /dev/null +++ b/netsurf_3.6.mdwn @@ -0,0 +1,67 @@ +[[!meta title="NetSurf 3.6"]] +[[!meta author="Chris"]] +[[!meta date="2016-10-25T17:21:43Z"]] + + +[[!toc]] This page lists the main +goals for NetSurf 3.6. + +Important +--------- + +Core +---- + +- <s>it's probably worth checking if the root certificates need an + update</s> +- <s>check library is noisy if missing</s> +- need to fix build without libutf8proc +- <s>fix build without libcurl (for local only and non standard http + fetchers)</s> + +Docs +---- + +- need to go on a docs rampage as everything is a bit out of date or + missing references + +Frontends +--------- + +### GTK + +- <s>SSL cert window is broken again</s> + +### RISC OS + +- SSL cert window broken + +### Amiga + +- should we be doing something with os3 release yet? + - maybe enable CI builds now JS is working? +- <s>I might have an issue with NetSurf freezing which I need to + confirm/fix before release (bug 2478)</s> + +### haiku + +- need to sort out binary stripping. + - (building with NETSURF\_STRIP\_BINARY=YES seems to work, what's + wrong??) + +### windows + +- mostly work again so possible preview release candidate + +### cocoa + +- completely non functional - crashes badly + +### framebuffer + +- Linux framebuffer surface input still broken + +### atari + +- no feedback on if either version build properly on CI + diff --git a/netsurf_corebuild.mdwn b/netsurf_corebuild.mdwn new file mode 100644 index 0000000..e1a8f5e --- /dev/null +++ b/netsurf_corebuild.mdwn @@ -0,0 +1,148 @@ +[[!meta title="NetSurf Corebuild"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-06-11T11:09:28Z"]] + + +[[!toc]] NetSurf itself does not +use the core build system that all libraries and tools do which must be +fixed. + +Additionally the current source layout is in need of improvement and is +best done alongside the move to core buildsystem + +current layout June 2016 + +` + netsurf` +` + resources` +` + test` +` + Docs` +` + desktop` +` + render` +` + utils` +` | + http` +` + include` +` | + netsurf` +` + content` +` | + fetchers` +` | + handlers` +` | + image` +` | + css` +` | + javascript` +` | + duktape` +` | + none` +` | + WebIDL` +` + frontends` +` + amiga` +` + atari` +` + beos` +` + cocoa` +` + framebuffer` +` + gtk` +` + monkey` +` + riscos` +` + windows` + +current target + +` + netsurf` +` + resources` +` + url` +` + utils` +` + test` +` + docs` +` + include` +` | + netsurf` +` + content` +` | + cache` +` | + fetchers` +` | + handlers` +` | + css` +` | + image` +` | + html` +` | + javascript` +` | + text` +` + ui` +` | + browser` +` | + widgets` +` | + textarea` +` | + treeview` +` + frontends` +` + amiga` +` + atari` +` + beos` +` + cocoa` +` + framebuffer` +` + gtk` +` + monkey` +` + riscos` +` + windows` +` ` + +tlsa's proposal: + +` + netsurf` +` + test` +` + docs` +` + utils` +` + core` +` | + include` +` | + content` +` | | + cache` +` | | + fetch` +` | | + handlers` +` | | + css` +` | | + image` +` | | | + bmp` +` | | | + jpeg` +` | | | + gif` +` | | | + png` +` | | | + svg` +` | | + html` +` | | + javascript` +` | | + text` +` | + ui` +` | | + browser` +` | | + widgets` +` | | + textarea` +` | | + treeview` +` | + resources` +` | + url` +` | + utils` +` + frontends` +` + amiga` +` + atari` +` + beos` +` + cocoa` +` + framebuffer` +` + gtk` +` + monkey` +` + riscos` +` + windows` + +Previous attempt: + +` + netsurf` +` + core` +` | + api` +` | + browser` +` | + content` +` | + css` +` | + html` +` | + image` +` | + javascript` +` | + resource` +` | + widgets` +` + frontends` +` | + amiga` +` | + atari` +` | + beos` +` | + cocoa` +` | + framebuffer` +` | + gtk` +` | + monkey` +` | + riscos` +` | + windows` +` + utils` +` + test` +` + docs` + diff --git a/release_admin.mdwn b/release_admin.mdwn new file mode 100644 index 0000000..953430a --- /dev/null +++ b/release_admin.mdwn @@ -0,0 +1,69 @@ +[[!meta title="Release Admin"]] +[[!meta author="Tlsa"]] +[[!meta date="2010-04-19T18:32:10Z"]] + + +[[!toc]] + +NetSurf +------- + +A new NetSurf release is created as follows + +### Ready the release branch + +Readying the release branch depends on the type of release. + +#### Major releases + +If it is a major new release with loads of new features, branch from +`trunk/netsurf` into `branches/netsurf/[version number]`. + +Commit the branch. + +#### Bug fix releases + +If it is a bug fix release, merge the revisions that are to be included +from trunk into an existing release branch. Fix up any failed merges, +and remove from Makefile.sources any references to source files that are +on trunk and are not in the release branch. + +Commit the branch. + +### Release miscellanea + +- Prepend this release's changes to ChangeLog +- Bump version number in desktop/version.c +- Update Docs/BUILDING-\* docs to link to appropriate library tags, + rather than trunk versions + +Commit these changes. + +### Create release tag + +Tag the branch for the appropriate version. + +### Autobuilder + +Update the autobuilder's release tree to the latest autobuilder sources. +Run the autobuilder to produce the release archives. +(`./autobuild.pl --release=[release version`) This will also: + +- Upload the source and binary archives to /downloads/releases +- Upload new ChangeLog to /downloads/releases/ChangeLog.txt + +### Web site + +Update version numbers all over the site. Update feature list on +homepage. Add release to project history on about page. Update download +pages to point at new releases. + +### Announce release + +Announce in the appropriate places. + +Libraries +--------- + +?? + diff --git a/release_process.mdwn b/release_process.mdwn new file mode 100644 index 0000000..9243a7c --- /dev/null +++ b/release_process.mdwn @@ -0,0 +1,273 @@ +[[!meta title="Release Process"]] +[[!meta author="DanielSilverstone"]] +[[!meta date="2016-11-19T12:05:07Z"]] + + +[[!toc]] + +Releasing a new version of NetSurf and libraries +------------------------------------------------ + +firstly the libraries and tool sources should be created (only if they +need an update) + +Order to release components in (if they require releasing) + +buildsystem is first and has an extra step + +Then libraries using the core buildsystem + +- libwapcaplet +- libparserutils +- libcss +- libhubbub +- libdom +- libnsbmp +- libnsgif +- librosprite +- libnsfb +- libsvgtiny +- nsgenbind +- libutf8proc +- libnsutils +- libnspsl +- libpencil +- librufl + +NetSurf itself is last + +Release of the buildsystem +-------------------------- + +The buildsystem follows exactly the same process as below except there +is an additional step + +Because this is the buildsystem and provides the makefiles for all the +other source builds you must go to the CI server and ensure the +source-buildsystem job has successfully run and produced output in +<http://ci.netsurf-browser.org/builds/sources/> + +Release for projects using buildsystem +-------------------------------------- + +We perform all releases from git simply by pushing a +release/<version number> tag + +Before creating the tag you should do some basic checks + +check the COMPONENT\_VERSION in the root Makefile matches the version +number you are releasing, if not change it and commit it so it does. + +Any files that should not be put in the distribution archive must be +placed in the .gitattributes file, as a minimum it should contain +attributes for the .gitignore and gitattributes files e.g. + +`.gitignore export-ignore` +`.gitattributes export-ignore` + +in your clone do + +`git branch -vv` + +ensure the top commit looks right and is what you want to tag, for extra +paranoia check the .git/config to ensure the origin is the correct +server. You do **not** have to tag from master, for example if this is a +maintenance release of an old edition and you are tagging from a branch +etc. just **ensure** you are where you want the release to be. + +Create the tag with + +`git tag -s -m 'Official Release' release/`<version number> + +Ensure the version number in the tag matches the component version. + +Now run + +`make dist` + +if you get + +Makefile:45: \*\*\* Component Version "1.0" and GIT tag version "1.1" do +not match. Stop. + +you did not get the tag and version numbers lined up, go back, remove +your local tag with + +`git tag -d release/`<bad version> + +and try again + +when you get a buildsystem-1.0.tar.gz (with appropriate version number) +well done + +Check the contents of the tar are what you intended to release and +adjust if not (obviously you will need to remove your local tag and +start over with fresh commits. + +Next do a dry run push + +`git push -n --tags` + +ensure this shown the correct repo and the release tag something like + +`[gitano] Welcome to the NetSurf Gitano instance.` +`To `[`ssh://nsgit@git.netsurf-browser.org/buildsystem.git`](ssh://nsgit@git.netsurf-browser.org/buildsystem.git) +` * [new tag] release/1.0 -> release/1.0` + +If that verifies as correct + +`git push --tags` +`git push` + +and the release tag is pushed, too late now so be careful and check! + +Releasing NetSurf +----------------- + +ensure you are at the commit from which you want to create the release + +`git branch -vv` + +Remember that if you are releasing X.Y then amiga calls that X.Y+1 so +don't be confused and do update amiga stuff. + +check the resources for the frontends you are releasing are up to date + +- copyright years +- amiga/pkg/netsurf.readme and amiga/pkg/netsurf\_os3.readme +- windows/res/installer.nsi + +create a branch release/<version number> and switch to it + +`git branch release/3.1` +`git checkout release/3.1` + +update desktop/version.c to something like + +`#include "testament.h"` + +`const char * const netsurf_version = "3.6 (25th April 2016)";` +`const int netsurf_version_major = 3;` +`const int netsurf_version_minor = 6;` + +update amiga/version.c along the same lines + +once you are sure everything is correct, committed push it to the repo + +`git push origin release/3.1` + +finally tag the branch for release + +`git tag -s -m 'Official Release' release/`<version number> + +Next do a dry run push + +`git push -n --tags` + +ensure this shown the correct repo and the release tag something like + +`[gitano] Welcome to the NetSurf Gitano instance.` +`To `[`ssh://nsgit@git.netsurf-browser.org/buildsystem.git`](ssh://nsgit@git.netsurf-browser.org/buildsystem.git) +` * [new tag] release/3.1 -> release/3.1` + +If that verifies as correct + +`git push --tags` + +and the release tag is pushed, too late now so be careful and check! + +Next the branch must be merged back to master. + +`git checkout master` +`git merge -s ours heads/release/3.1` + +Then edit desktop/version.c ready for the next release cycle + +`git add desktop/version.c` +`git commit -m 'update version info for next development cycle'` + +finally push master + +`git push origin master` + +Please do ensure you \*thoroughly\* check your work at each step as +mistakes are hard to fix once pushed. + +Releasing the all source +------------------------ + +clone the all repo + +`git clone `[`ssh://nsgit@git.netsurf-browser.org/netsurf-all.git`](ssh://nsgit@git.netsurf-browser.org/netsurf-all.git) + +ensure ther submodules are initialised + +`git submodule init` + +output will be something like + +`Submodule 'buildsystem' () registered for path 'buildsystem'` +`Submodule 'libcss' () registered for path 'libcss'` +`Submodule 'libdom' () registered for path 'libdom'` +`Submodule 'libhubbub' () registered for path 'libhubbub'` +`Submodule 'libnsbmp' () registered for path 'libnsbmp'` +`Submodule 'libnsfb' () registered for path 'libnsfb'` +`Submodule 'libnsgif' () registered for path 'libnsgif'` +`Submodule 'libparserutils' () registered for path 'libparserutils'` +`Submodule 'libpencil' () registered for path 'libpencil'` +`Submodule 'librosprite' () registered for path 'librosprite'` +`Submodule 'librufl' () registered for path 'librufl'` +`Submodule 'libsvgtiny' () registered for path 'libsvgtiny'` +`Submodule 'libwapcaplet' () registered for path 'libwapcaplet'` +`Submodule 'netsurf' () registered for path 'netsurf'` +`Submodule 'nsgenbind' () registered for path 'nsgenbind'` + +ensure the submodules are updated + +`git submodule update` + +for each submodule listed above the correct revision must be set. A +utility target is provided in the makefile + +`make release-checkout` + +This obtains the most recent release tag for each submodule and checks +it out, equivalent to: + +`cd buildsystem` +`git checkout origin/HEAD` +`git checkout $(git describe --abbrev=0 --match="release/*" )` +`cd ..` + +once each submodule has been updated in the top level netsurf-all +directory. The modified submodules should then be added ready for commit + +`git add buildsystem libcss libdom libhubbub libnsbmp libnsfb libnsgif libparserutils librosprite libsvgtiny libwapcaplet netsurf nsgenbind` +`git commit -m 'Update for 3.1 release'` + +finally tag the branch for release + +`git tag -s -m 'Official Release' release/`<version number> + +Next do a dry run push + +`git push -n --tags` + +ensure this shown the correct repo and the release tag something like + +`[gitano] Welcome to the NetSurf Gitano instance.` +`To `[`ssh://nsgit@git.netsurf-browser.org/buildsystem.git`](ssh://nsgit@git.netsurf-browser.org/buildsystem.git) +` * [new tag] release/3.1 -> release/3.1` + +If that verifies as correct + +`git push --tags` + +and the release tag is pushed, too late now so be careful and check! + +Bugtracker +---------- + +The netsurf release version must be marked as released in mantis and the +next development version added if its not already present + diff --git a/released_versions.mdwn b/released_versions.mdwn new file mode 100644 index 0000000..30e554e --- /dev/null +++ b/released_versions.mdwn @@ -0,0 +1,20 @@ +[[!meta title="Released Versions"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-04-29T10:18:46Z"]] + + +[[!toc]] Release planning pages + +- [[NetSurf 3.6|netsurf_3.6]] +- [[NetSurf 3.5|netsurf_3.5]] +- [[NetSurf 3.4|netsurf_3.4]] +- [[NetSurf 3.3|netsurf_3.3]] +- [[NetSurf 3.2|netsurf_3.2]] +- [[NetSurf 3.1|netsurf_3.1]] +- [[NetSurf 3.0|netsurf_3.0]] +- [[NetSurf 2.9|netsurf_2.9]] +- [[NetSurf 2.8|netsurf_2.8]] +- [[NetSurf 2.7|netsurf_2.7]] +- [[NetSurf 2.6|netsurf_2.6]] +- [[NetSurf 2.5|netsurf_2.5]] + diff --git a/sequence_planning_for_libdom_specialisations.mdwn b/sequence_planning_for_libdom_specialisations.mdwn new file mode 100644 index 0000000..23faf58 --- /dev/null +++ b/sequence_planning_for_libdom_specialisations.mdwn @@ -0,0 +1,348 @@ +[[!meta title="Sequence planning for LibDOM specialisations"]] +[[!meta author="Parwana"]] +[[!meta date="2014-05-18T10:57:02Z"]] + + +[[!toc]] The following development +sequence will avoid any dependency conflicts in implementing them: + +` interface HTMLBaseFontElement : HTMLElement {` +` attribute DOMString color;` +` attribute DOMString face;` +` // Modified in DOM Level 2:` +` attribute long size;` +` };` + +` interface HTMLAnchorElement : HTMLElement {` +` attribute DOMString accessKey;` +` attribute DOMString charset;` +` attribute DOMString coords;` +` attribute DOMString href;` +` attribute DOMString hreflang;` +` attribute DOMString name;` +` attribute DOMString rel;` +` attribute DOMString rev;` +` attribute DOMString shape;` +` attribute long tabIndex;` +` attribute DOMString target;` +` attribute DOMString type;` +` void blur();` +` void focus();` +` };` + +` interface HTMLImageElement : HTMLElement {` +` attribute DOMString name;` +` attribute DOMString align;` +` attribute DOMString alt;` +` attribute DOMString border;` +` // Modified in DOM Level 2:` +` attribute long height;` +` // Modified in DOM Level 2:` +` attribute long hspace;` +` attribute boolean isMap;` +` attribute DOMString longDesc;` +` attribute DOMString src;` +` attribute DOMString useMap;` +` // Modified in DOM Level 2:` +` attribute long vspace;` +` // Modified in DOM Level 2:` +` attribute long width;` +` };` + +` interface HTMLObjectElement : HTMLElement {` +` readonly attribute HTMLFormElement form;` +` attribute DOMString code;` +` attribute DOMString align;` +` attribute DOMString archive;` +` attribute DOMString border;` +` attribute DOMString codeBase;` +` attribute DOMString codeType;` +` attribute DOMString data;` +` attribute boolean declare;` +` attribute DOMString height;` +` attribute long hspace;` +` attribute DOMString name;` +` attribute DOMString standby;` +` attribute long tabIndex;` +` attribute DOMString type;` +` attribute DOMString useMap;` +` attribute long vspace;` +` attribute DOMString width;` +` // Introduced in DOM Level 2:` +` readonly attribute Document contentDocument;` +` };` + +` interface HTMLParamElement : HTMLElement {` +` attribute DOMString name;` +` attribute DOMString type;` +` attribute DOMString value;` +` attribute DOMString valueType;` +` };` + +` interface HTMLAppletElement : HTMLElement {` +` attribute DOMString align;` +` attribute DOMString alt;` +` attribute DOMString archive;` +` attribute DOMString code;` +` attribute DOMString codeBase;` +` attribute DOMString height;` +` // Modified in DOM Level 2:` +` attribute long hspace;` +` attribute DOMString name;` +` // Modified in DOM Level 2:` +` attribute DOMString object;` +` // Modified in DOM Level 2:` +` attribute long vspace;` +` attribute DOMString width;` +` };` + +` interface HTMLMapElement : HTMLElement {` +` readonly attribute HTMLCollection areas;` +` attribute DOMString name;` +` };` + +` interface HTMLAreaElement : HTMLElement {` +` attribute DOMString accessKey;` +` attribute DOMString alt;` +` attribute DOMString coords;` +` attribute DOMString href;` +` attribute boolean noHref;` +` attribute DOMString shape;` +` attribute long tabIndex;` +` attribute DOMString target;` +` };` + +` interface HTMLScriptElement : HTMLElement {` +` attribute DOMString text;` +` attribute DOMString htmlFor;` +` attribute DOMString event;` +` attribute DOMString charset;` +` attribute boolean defer;` +` attribute DOMString src;` +` attribute DOMString type;` +` };` + +` interface HTMLTableCaptionElement : HTMLElement {` +` attribute DOMString align;` +` };` + +interface HTMLTableColElement : HTMLElement { + +` attribute DOMString align;` +` attribute DOMString ch;` +` attribute DOMString chOff;` +` attribute long span;` +` attribute DOMString vAlign;` +` attribute DOMString width;` +` };` +` interface HTMLTableCellElement : HTMLElement {` +` readonly attribute long cellIndex;` +` attribute DOMString abbr;` +` attribute DOMString align;` +` attribute DOMString axis;` +` attribute DOMString bgColor;` +` attribute DOMString ch;` +` attribute DOMString chOff;` +` attribute long colSpan;` +` attribute DOMString headers;` +` attribute DOMString height;` +` attribute boolean noWrap;` +` attribute long rowSpan;` +` attribute DOMString scope;` +` attribute DOMString vAlign;` +` attribute DOMString width;` +` };` + +` interface HTMLTableRowElement : HTMLElement {` +` // Modified in DOM Level 2:` +` readonly attribute long rowIndex;` +` // Modified in DOM Level 2:` +` readonly attribute long sectionRowIndex;` +` // Modified in DOM Level 2:` +` readonly attribute HTMLCollection cells;` +` attribute DOMString align;` +` attribute DOMString bgColor;` +` attribute DOMString ch;` +` attribute DOMString chOff;` +` attribute DOMString vAlign;` +` // Modified in DOM Level 2:` +` HTMLElement insertCell(in long index)` +` raises(dom::DOMException);` +` // Modified in DOM Level 2:` +` void deleteCell(in long index)` +` raises(dom::DOMException);` +` };` +`interface HTMLTableSectionElement : HTMLElement {` +` attribute DOMString align;` +` attribute DOMString ch;` +` attribute DOMString chOff;` +` attribute DOMString vAlign;` +` readonly attribute HTMLCollection rows;` +` // Modified in DOM Level 2:` +` HTMLElement insertRow(in long index)` +` raises(dom::DOMException);` +` // Modified in DOM Level 2:` +` void deleteRow(in long index)` +` raises(dom::DOMException);` +` };` +` interface HTMLTableElement : HTMLElement {` +` // Modified in DOM Level 2:` +` attribute HTMLTableCaptionElement caption;` +` // raises(dom::DOMException) on setting` + +` // Modified in DOM Level 2:` +` attribute HTMLTableSectionElement tHead;` +` // raises(dom::DOMException) on setting` + +` // Modified in DOM Level 2:` +` attribute HTMLTableSectionElement tFoot;` +` // raises(dom::DOMException) on setting` + +` readonly attribute HTMLCollection rows;` +` readonly attribute HTMLCollection tBodies;` +` attribute DOMString align;` +` attribute DOMString bgColor;` +` attribute DOMString border;` +` attribute DOMString cellPadding;` +` attribute DOMString cellSpacing;` +` attribute DOMString frame;` +` attribute DOMString rules;` +` attribute DOMString summary;` +` attribute DOMString width;` +` HTMLElement createTHead();` +` void deleteTHead();` +` HTMLElement createTFoot();` +` void deleteTFoot();` +` HTMLElement createCaption();` +` void deleteCaption();` +` // Modified in DOM Level 2:` +` HTMLElement insertRow(in long index)` +` raises(dom::DOMException);` +` // Modified in DOM Level 2:` +` void deleteRow(in long index)` +` raises(dom::DOMException);` +` };` + +` interface HTMLFrameSetElement : HTMLElement {` +` attribute DOMString cols;` +` attribute DOMString rows;` +` };` + +` interface HTMLFrameElement : HTMLElement {` +` attribute DOMString frameBorder;` +` attribute DOMString longDesc;` +` attribute DOMString marginHeight;` +` attribute DOMString marginWidth;` +` attribute DOMString name;` +` attribute boolean noResize;` +` attribute DOMString scrolling;` +` attribute DOMString src;` +` // Introduced in DOM Level 2:` +` readonly attribute Document contentDocument;` +` };` + +` interface HTMLIFrameElement : HTMLElement {` +` attribute DOMString align;` +` attribute DOMString frameBorder;` +` attribute DOMString height;` +` attribute DOMString longDesc;` +` attribute DOMString marginHeight;` +` attribute DOMString marginWidth;` +` attribute DOMString name;` +` attribute DOMString scrolling;` +` attribute DOMString src;` +` attribute DOMString width;` +` // Introduced in DOM Level 2:` +` readonly attribute Document contentDocument;` +` };` + +}; + +Done: interface HTMLDListElement : HTMLElement { + +` attribute boolean compact;` +` };` + +` interface HTMLDirectoryElement : HTMLElement {` +` attribute boolean compact;` +` };` + +` interface HTMLMenuElement : HTMLElement {` +` attribute boolean compact;` +` };` + +` interface HTMLFieldSetElement : HTMLElement {` +` readonly attribute HTMLFormElement form;` +` };` +` interface HTMLDivElement : HTMLElement {` +` attribute DOMString align;` +` };` + +` interface HTMLParagraphElement : HTMLElement {` +` attribute DOMString align;` +` };` + +` interface HTMLHeadingElement : HTMLElement {` +` attribute DOMString align;` +` };` + +` interface HTMLQuoteElement : HTMLElement {` +` attribute DOMString cite;` +` };` + +` interface HTMLPreElement : HTMLElement {` +` attribute long width;` +` };` + +` interface HTMLBRElement : HTMLElement {` +` attribute DOMString clear;` +` };` + +` interface HTMLLabelElement : HTMLElement {` +` readonly attribute HTMLFormElement form;` +` attribute DOMString accessKey;` +` attribute DOMString htmlFor;` +` };` + +` interface HTMLLegendElement : HTMLElement {` +` readonly attribute HTMLFormElement form;` +` attribute DOMString accessKey;` +` attribute DOMString align;` +` };` + +` interface HTMLUListElement : HTMLElement {` +` attribute boolean compact;` +` attribute DOMString type;` +` };` + +` interface HTMLOListElement : HTMLElement {` +` attribute boolean compact;` +` attribute long start;` +` attribute DOMString type;` +` };` + +` interface HTMLLIElement : HTMLElement {` +` attribute DOMString type;` +` attribute long value;` +` };` + +interface HTMLFontElement : HTMLElement { + +` attribute DOMString color;` +` attribute DOMString face;` +` attribute DOMString size;` +` };` + +` interface HTMLHRElement : HTMLElement {` +` //In reiview` +` attribute DOMString align;` +` attribute boolean noShade;` +` attribute DOMString size;` +` attribute DOMString width;` +` };` + +` interface HTMLModElement : HTMLElement {` +` attribute DOMString cite;` +` attribute DOMString dateTime;` +` };` + diff --git a/society.mdwn b/society.mdwn new file mode 100644 index 0000000..2b5a201 --- /dev/null +++ b/society.mdwn @@ -0,0 +1,9 @@ +[[!meta title="Society"]] +[[!meta author="Tlsa"]] +[[!meta date="2009-07-08T16:58:15Z"]] + + +[[!toc]] + +1. REDIRECT [[Society/|society/]] + diff --git a/society/constitution.mdwn b/society/constitution.mdwn new file mode 100644 index 0000000..b3fa836 --- /dev/null +++ b/society/constitution.mdwn @@ -0,0 +1,117 @@ +[[!meta title="Society/Constitution"]] +[[!meta author="Tlsa"]] +[[!meta date="2009-07-08T14:55:53Z"]] + + +[[!toc]] This is the constitution +of the NetSurf Society. + +1. This document details the constitution of the the NetSurf Project + Society, hereinafter referred to as "the Society". +2. Membership of the Society is non-transferable and is open to any + person who fulfils any of the following: + 1. The person is an active developer of any of the NetSurf + Project's programmes or libraries or documentation or websites + thereof. Such a person is defined by their having commit access + to the NetSurf Project's central revision control system and + having made a non-trivial commit within the past 12 months. + 2. The person is an active developer as defined in A but, instead + of having commit access to the NetSurf Project's central + revision control system, their non-trivial updates, patches, + modifications or new content is sponsored by an extant Member of + the Society such that it is committed to the NetSurf Project's + central revision control system on their behalf. + +3. Membership is free of charge, no subscription payments will be due. +4. The Committee comprises three roles: Chair, Secretary and Treasurer. +5. Membership applications and resignations must be made in writing + (email or by post) or in person to the current holder of the + Secretary role. +6. The Secretary will accept and approve any such application providing + the applicant fulfils any of the subclauses of 2. Resignation of + membership is subject to no conditions for normal Members, and is + predicated on a replacement having been elected for Committee + Members. +7. Membership is automatically terminated if any of the following are + determined to be true: + 1. The Member dies + 2. The Member ceases to fulfil any of the requirements as laid out + in the subclauses of 2. + +8. The Society's objects (the Objects) are: + 1. To promote the use of, and advance the development of the + NetSurf Web Browser + 2. To promote the use of, and advance the development of the + NetSurf Project's other applications and libraries. + +9. All income and property of the Society shall be applied towards + furthering the Objects. +10. The Society will hold an annual general meeting (AGM) each year. At + least 11 months and no more than 15 months may elapse between + successive AGMs. +11. Any single member of the Committee, or 3 Members of the Society + acting in concert may call an EGM at any time by requesting it of + the Secretary in writing or in person. +12. No less than two weeks will elapse between the calling of a meeting + (either AGM or EGM) and the meeting taking place. +13. Meetings may occur physically or in the IRC channel \#netsurf on the + Freenode IRC network. +14. The Committee is elected at the AGM and the Committee Members serve + the period starting immediately after the end of the AGM at which + they were elected and ending at the end of the subsequent AGM. +15. Nominations for Committee roles and any motions to be considered at + an AGM or EGM will be announced to the Members no more than one week + and no less than four days before the meeting. +16. Motions and nominations for Committee members must be submitted to + the Secretary after the announcement of the AGM (or an EGM called + for the purpose of electing a new Committee member) and must arrive + no less than one week before the meeting so that they can be + included in the announcement detailed in 15. A candidate for a + Committee role may withdraw themselves from consideration at any + time up to the point at which the vote is called at the meeting. + Should a given committee role not have any nominations by this time, + or should all nominees withdraw before the vote, the incumbent is + considered to be automatically re-nominated. +17. All Members of the Society have one vote. +18. Votes may only be cast by the Member unless previously delegated in + writing to the Secretary. +19. Votes may be cast ahead of the meeting by providing a written + account of the vote the Member wishes to cast to the Secretary no + less than 24 hours ahead of the meeting. +20. A meeting is considered quorate if at least one Committee member is + present and at least three other Members are present or have + registered absent votes for all motions and nominations being + considered. +21. Should a Committee member wish to resign, an EGM shall be called to + elect a different Member to that role. The Member wishing to resign + the role shall serve until such a meeting can take place. The newly + elected Member will serve until the end of the subsequent AGM. +22. Should membership of the Society fall below five Members, or should + it prove not possible to elect a Committee, then an EGM will be + called to attempt to resolve the situation. Should the EGM end + without membership increasing to at least five or without an elected + Committee, then the Society will be dissolved. +23. Should a motion at an EGM or AGM be to dissolve the Society, then a + two-thirds majority including at least one Committee Member will be + required for the motion to pass. +24. Should the society be dissolved, the following must be fulfilled: + 1. A resolution detailing the procedure for disposing of any assets + belonging to the Society must be passed by a two-thirds majority + of the remaining Members of the Society + 2. The most recently elected Committee will then execute the + resolution as passed. + +25. No Member may simultaneously occupy more than one role on the + Committee. +26. Signatories on any bank accounts held in the name of the Society + shall be the members of the Committee. +27. Should the membership of the Committee change, it shall be the task + of the Secretary (both old and new if changing) to ensure that the + Bank remain informed of the permitted signatories and to ensure that + any required paperwork is executed to that effect. +28. All votes are non-secret and all Members will be notified of the + results of motions and nominations by the Secretary after any + general meeting. +29. This Constitution may be amended by a motion passed by simple + majority at any quorate general meeting. + diff --git a/society/members.mdwn b/society/members.mdwn new file mode 100644 index 0000000..3de7500 --- /dev/null +++ b/society/members.mdwn @@ -0,0 +1,31 @@ +[[!meta title="Society/Members"]] +[[!meta author="DanielSilverstone"]] +[[!meta date="2013-07-20T09:58:57Z"]] + + +[[!toc]] Currently the Committee +is: + +- Michael Drake, Chair +- John-Mark Bell, Treasurer +- Daniel Silverstone, Secretary + +Current non-committee membership is: + +- Rob Kendrick +- Chris Young +- Vincent Sanders +- François Revol +- Steve Fryatt + +The society is therefore quorate. + +The following are eligible to join: + +- Ole Loots +- Vivek Dasmohapatra +- Anthony J. Bentley +- Adrien Destugues +- Craig Barnes +- John Tytgat + diff --git a/spec/htm5_alignment.mdwn b/spec/htm5_alignment.mdwn new file mode 100644 index 0000000..8804f73 --- /dev/null +++ b/spec/htm5_alignment.mdwn @@ -0,0 +1,9 @@ +[[!meta title="Spec/HTM5 Alignment"]] +[[!meta author="Tlsa"]] +[[!meta date="2009-08-21T16:48:16Z"]] + + +[[!toc]] + +1. REDIRECT [[Spec/HTML5 Alignment|spec/html5_alignment]] + diff --git a/spec/html5_alignment.mdwn b/spec/html5_alignment.mdwn new file mode 100644 index 0000000..a04da50 --- /dev/null +++ b/spec/html5_alignment.mdwn @@ -0,0 +1,59 @@ +[[!meta title="Spec/HTML5 Alignment"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-11-26T22:20:33Z"]] + + +[[!toc]] The way HTML's align +attribute interacts with CSS properties is only really explained in the +HTML5 spec. However, the explanation there is quite opaque. Here there +is a clearer version with more explanation. + +Spec +---- + + | When a user agent is to align descendants of a node, the user + | agent is expected to align only those descendants that have both + | their 'margin-left' and 'margin-right' properties computing to a + | value other than 'auto', that are over-constrained and that have + | one of those two margins with a used value forced to a greater + | value, and that do not themselves have an applicable align + | attribute. + -- HTML5 10.2.4 original + +Simplified: + + | When a user agent is to align descendants of a node, the user agent + | is expected to align only those descendants that: + | + | 1 have both their 'margin-left' and 'margin-right' properties + | computing to a value other than 'auto', + | + | 2 are over-constrained, and that have a left or right margin with + | a used value forced to a greater value, and + | + | 3 do not themselves have an applicable align attribute. + + -- tlsa's interpretation + +I have separated the sentence where I think the criteria are and made it +more clear. + +Further explanation +------------------- + +### Criterion 1 detail: + +A box that doesn't have either left, right, or both left & right margins +set to 'auto', to align the box "the CSS way". + +### Criterion 2 example: + + #example2 { width:200px; + margin-left: 0; + margin-right: 0; } + + <div style="width:800px;"> + <div id="example2"> + This div meets criterion 2 + </div> + </div> diff --git a/test/libcss/nstests.mdwn b/test/libcss/nstests.mdwn new file mode 100644 index 0000000..c0fe52a --- /dev/null +++ b/test/libcss/nstests.mdwn @@ -0,0 +1,187 @@ +[[!meta title="Test/LibCSS/NStests"]] +[[!meta author="Jmb"]] +[[!meta date="2009-07-16T14:01:30Z"]] + + +[[!toc]] Testing the NetSurf port +to LibCSS for regressions against the netsurftest/works test suite. + + 3d-border-colour.html ---------------------------------------------- OK + absolute-container-assertion.html ---------------------------------- OK + absolute.html ------------------------------------------------------ OK + absolute-padding.html ---------------------------------------------- OK + absolute-position-first-child-of-containing-block.html ------------- OK + absolute-position-table.html --------------------------------------- OK + amazon-2.html ------------------------------------------------------ OK + amazon.html -------------------------------------------------------- OK + anim-display-none.html --------------------------------------------- OK + animgif.html ------------------------------------------------------- OK + animgifobj.html ---------------------------------------------------- OK + artworks-transparency.html ----------------------------------------- OK + background-edge.html ----------------------------------------------- OK + background-image-failure2.html ------------------------------------- OK + background-image-failure3.html ------------------------------------- OK + background-image-failure.html -------------------------------------- OK + background-on-TEXT.html -------------------------------------------- OK + background-position-repeat.html ------------------------------------ OK + background-redraw-bug.html ----------------------------------------- OK + block-formatting-context-top-margin.html --------------------------- OK + body-margin-padding-bgimage-test.html ------------------------------ OK + border-background.html --------------------------------------------- OK + borders.html ------------------------------------------------------- OK + box-at-point-test.html --------------------------------------------- OK + br.html ------------------------------------------------------------ OK + bunnies.html ------------------------------------------------------- OK + button-height.html ------------------------------------------------- OK + button-width.html -------------------------------------------------- OK + cellpadding-csspadding.html ---------------------------------------- OK + cellpadding.html --------------------------------------------------- OK + clear-on-float2.html ----------------------------------------------- OK + clear-on-float.html ------------------------------------------------ OK + collapse.html ------------------------------------------------------ OK + colspan-issue.html ------------------------------------------------- OK + containing-block.html ---------------------------------------------- OK + csszen1.html ------------------------------------------------------- OK + default-page-margin--no-body-margin-test.html ---------------------- OK + default-page-margin--no-body-padding-test.html --------------------- OK + default-page-margin--no-html-margin-test.html ---------------------- OK + default-page-margin--no-html-padding-test.html --------------------- OK + default-page-margin--test.html ------------------------------------- OK + digglayout.html ---------------------------------------------------- OK + div-and-table-width-tests.html ------------------------------------- OK + drawfile.html ------------------------------------------------------ OK + float-absolute.html ------------------------------------------------ OK + float-based-layout.html -------------------------------------------- OK + float-clear2.html -------------------------------------------------- OK + float-clear3.html -------------------------------------------------- OK + float-clear4.html -------------------------------------------------- OK + float-clear5.html -------------------------------------------------- OK + float-clear6.html -------------------------------------------------- OK + float-clear7.html -------------------------------------------------- OK + float-clear-block-formatting-context.html -------------------------- OK + float-clear-first2.html -------------------------------------------- OK + float-clear-first3.html -------------------------------------------- OK + float-clear-first.html --------------------------------------------- OK + float-clear.html --------------------------------------------------- OK + float-clearing.html ------------------------------------------------ OK + float-clearing-issue.html ------------------------------------------ OK + floated-list-items.html -------------------------------------------- OK + float-gaps2.html --------------------------------------------------- OK + float-gaps.html ---------------------------------------------------- OK + float-layout.html -------------------------------------------------- OK + float-li.html ------------------------------------------------------ OK + floatmargin.html --------------------------------------------------- OK + float-negative-margin.html ----------------------------------------- OK + float-nested-table.html -------------------------------------------- OK + float-overlap.html ------------------------------------------------- OK + floatpadding.html -------------------------------------------------- OK + float-positioning.html --------------------------------------------- OK + floats-and-position.html ------------------------------------------- OK + floats-block-formatting-context2.html ------------------------------ OK + floats-block-formatting-context3.html ------------------------------ OK + floats-block-formatting-context4.html ------------------------------ OK + floats-block-formatting-context5.html ------------------------------ OK + floats-block-formatting-context6.html ------------------------------ OK + floats-block-formatting-context7.html ------------------------------ OK + floats-block-formatting-context.html ------------------------------- OK + floats-inside-overflow-scroll.html --------------------------------- OK + floats-off-by-one.html --------------------------------------------- OK + float-wrap.html ---------------------------------------------------- OK + form-elements.html ------------------------------------------------- OK + form-element-size.html --------------------------------------------- OK + form-hidden-tab-assert.html ---------------------------------------- OK* + +No problems with libcss, but this shows how tabbing between forms is +broken on GTK NS. + + form.html ---------------------------------------------------------- OK + form-margins.html -------------------------------------------------- OK + form-width.html ---------------------------------------------------- OK + fractional-css-unit-test-cm.html ----------------------------------- OK + fractional-css-unit-test-em.html ----------------------------------- OK + frame1.html -------------------------------------------------------- N/A + frame2.html -------------------------------------------------------- N/A + frame3.html -------------------------------------------------------- N/A + frames2.html ------------------------------------------------------- N/A + frames.html -------------------------------------------------------- N/A + +Frames are broken on GTK anyway. + + gaps-in-lists.html ------------------------------------------------- OK + giftest.html ------------------------------------------------------- OK + html-body-margin-padding-test.html --------------------------------- OK + html-margin-body-margin-padding-test.html -------------------------- OK + html-margin-padding-bgimage-body-margin-padding-bgimage-test.html -- OK + html-margin-padding-bgimage-test.html ------------------------------ OK + html-margin-padding-body-margin-padding-test.html ------------------ OK + html-padding-body-margin-padding-test.html ------------------------- OK + image-sizing.html -------------------------------------------------- OK + inline-background.html --------------------------------------------- OK + inline-background-position.html ------------------------------------ OK + inline-block2.html ------------------------------------------------- OK + inline-block3.html ------------------------------------------------- OK + inline-block6.html ------------------------------------------------- OK + inline-block.html -------------------------------------------------- OK + inline-block-images.html ------------------------------------------- OK + inline-test.html --------------------------------------------------- OK + knockout.html ------------------------------------------------------ OK + layout_line-floats2.html ------------------------------------------- OK + layout_line-floats.html -------------------------------------------- OK + link-underlines.html ----------------------------------------------- OK + lists.html --------------------------------------------------------- OK + margin-background1.html -------------------------------------------- OK + margin-background2.html -------------------------------------------- OK + margin-background3.html -------------------------------------------- OK + margintest.html ---------------------------------------------------- OK + metacharset.html --------------------------------------------------- OK + min-height-in-float.html ------------------------------------------- OK + minmax-height-1.html ----------------------------------------------- OK + minmax-height-2.html ----------------------------------------------- OK + minmax-height-3.html ----------------------------------------------- OK + minmax-height-4.html ----------------------------------------------- OK + minmax-height-5.html ----------------------------------------------- OK + negative.html ------------------------------------------------------ OK + negative-inline-margin.html ---------------------------------------- OK + negative-margin-crash.html ----------------------------------------- OK + negative-text-indent.html ------------------------------------------ OK + netsurf-crash-1a.html ---------------------------------------------- OK + netsurf-crash-1b.html ---------------------------------------------- OK + netsurf-crash-2.html ----------------------------------------------- OK + nocharset.html ----------------------------------------------------- OK + nsgtk-redraw.html -------------------------------------------------- OK + object-block.html -------------------------------------------------- OK + object.html -------------------------------------------------------- OK + overflow-auto-height.html ------------------------------------------ OK + overflow.html ------------------------------------------------------ OK + overflow-scrollbars.html ------------------------------------------- OK + percentage-height-2.html ------------------------------------------- OK + percentage-height-absolute-position-2.html ------------------------- OK + percentage-height-absolute-position.html --------------------------- OK + percentage-height-float-2.html ------------------------------------- OK + percentage-height-float-3.html ------------------------------------- OK + percentage-height-float.html --------------------------------------- OK + percentage-height.html --------------------------------------------- OK + percentage-height-inline-block-2.html ------------------------------ OK + percentage-height-inline-block.html -------------------------------- OK + place_float_below.html --------------------------------------------- OK + relative.html ------------------------------------------------------ OK + relative-position-and-floats.html ---------------------------------- OK + relative-position-floats.html -------------------------------------- OK + rowspan-overflow.html ---------------------------------------------- OK + slashdot-overlap.html ---------------------------------------------- OK + static-position.html ----------------------------------------------- OK + stripped-down-bbc-test-layout.html --------------------------------- OK + table-cell-width-and-height.html ----------------------------------- OK + tablecollapse.html ------------------------------------------------- OK + table-defaults.html ------------------------------------------------ OK + table-form-breakage.html ------------------------------------------- OK + tableseparate.html ------------------------------------------------- OK + tags-before-body.html ---------------------------------------------- OK + targets.html ------------------------------------------------------- N/A + +Frames. + + textalign.html ----------------------------------------------------- OK + unclickable-link.html ---------------------------------------------- OK + w3c-links.html ----------------------------------------------------- OK + wiki-test.html ----------------------------------------------------- OK diff --git a/the_attr_node_todo.mdwn b/the_attr_node_todo.mdwn new file mode 100644 index 0000000..f90a6c8 --- /dev/null +++ b/the_attr_node_todo.mdwn @@ -0,0 +1,11 @@ +[[!meta title="The Attr Node todo"]] +[[!meta author="Struggleyb"]] +[[!meta date="2009-08-22T13:35:45Z"]] + + +[[!toc]] + + + 1. For bool property, we deal it as: if there is a Attr node for it, its value is true, otherwise its value is false; + 2. All Attr node's value type are DOMString, there is no other types if the design now is correct; + 3. Remove the include/dom/core/attr.h additional attribute's type code when making sure the design is correct. diff --git a/the_mutationevent_generation.mdwn b/the_mutationevent_generation.mdwn new file mode 100644 index 0000000..1f88093 --- /dev/null +++ b/the_mutationevent_generation.mdwn @@ -0,0 +1,9 @@ +[[!meta title="The MutationEvent generation"]] +[[!meta author="Tlsa"]] +[[!meta date="2009-08-07T11:49:22Z"]] + + +[[!toc]] + +1. REDIRECT [[LibDOM/The MutationEvent generation|libdom/the_mutationevent_generation]] + diff --git a/todo.mdwn b/todo.mdwn new file mode 100644 index 0000000..f27e98f --- /dev/null +++ b/todo.mdwn @@ -0,0 +1,23 @@ +[[!meta title="Todo"]] +[[!meta author="Chris"]] +[[!meta date="2011-03-03T19:05:47Z"]] + + +[[!toc]] Various Todo lists are +collected here. + +Components +---------- + +- [[Framebuffer frontend|todo/framebuffer_frontend]] +- [[GTK Frontend|todo/gtk_frontend]] +- [[RISC OS Frontend|todo/risc_os_frontend]] +- [[Win32 Windows frontend|todo/win32]] +- [[AmigaOS frontend|todo/amigaos_frontend]] + +Individuals +----------- + +- [[jmb|todo/jmb]] +- [[tlsa|todo/tlsa]] + diff --git a/todo/amigaos_frontend.mdwn b/todo/amigaos_frontend.mdwn new file mode 100644 index 0000000..8b0c45e --- /dev/null +++ b/todo/amigaos_frontend.mdwn @@ -0,0 +1,175 @@ +[[!meta title="Todo/AmigaOS frontend"]] +[[!meta author="Chris"]] +[[!meta date="2017-01-12T19:51:28Z"]] + + +[[!toc]] + +Plotters +-------- + +- <s>Speed up plotting on 16-bit screenmodes</s> + - Think this is now largely irrelevant as font\_antialiasing:0 + makes a huge difference. However, would like to add + hardware-accelerated anti-aliased text rendering + (CompositeTags() does not support ALPHATEMPLATE so this is not + possible at present - see also the chris/composite-text branch) + +- Direct rendering - problems + - inline image placement + - grey background for all text + - won't work with Cairo renderer + - may crash with certain gfx lib operations (AreaFill - need to + alloc AreaInfo/TmpRas, check if this is ok to do on window + rastports or if one or the other is allocated already) + - completely broken with tiled renderer + - Will probably only leave this in for debugging purposes, has no + real use now. + +- Text + - Replace ligatures? + - Use splay trees for font cache + +- Simple Refresh + - Dragging blocking windows (eg. About) over the top of a render + area does not redraw <i>at all</i> + - Favicon and throbbers do not redraw when damaged (the redraw + functions just crash when they are initiated from the + hook/ami\_handle\_msg) + - Change to \*queue\* redraws same as corewindows + +- bitmap scaling + - not always accurate + - switching to triangle mode is more accurate, but causing + freezing at least on SAM440 with built-in gfx + +User Interface +-------------- + +- Shiny new treeview toolbar +- treeview window redraw needs optimising +- Drag-related + - Support the drag'n'drop of icons from/to OpenAmiga Filer project + - Drag to hotlist from WB? + - Drag selections within text input fields should do a move rather + than a copy (might be core bug?) + - Clicks to become drags only after 5px or so movement (done for + treeviews) + - Text selection should have auto-scroll ability at window's edge + - Dragging text to the URL or search bar should immediately enact + that option +- Iconify gadget - for non-WB screens. Add extra AppIcons functions, + eg Info, Delete. Dynamic updates? +- Allow multiple homepages - see + <http://bugs.netsurf-browser.org/mantis/view.php?id=2270> +- Add play/stop buttons in sound DT handler +- Experiment with label.image in clicktabs (favicon; text in more + appropriate charset) + - More appropriate charset also useful for hotlist menu, toolbar + and history context menu +- Use menuclass for pull-down menu +- Fix passing of commandline options to the core (NSOPTS/M) +- Use new Ringhio progress notifications for downloads (if we can + upload the header) + +Core windows +------------ + +- Share off-screen bitmaps (with browser etc) +- Allow simple refresh windows +- Optimise redraw (on scroll) +- Drag select redraw not working correctly +- Regression: dragging from global history no longer working + +popupmenu deadlock blockers +--------------------------- + +These need doing now a bug in popupmenu.library has been fixed. + +- Context sensitive help + - Add Help key processing in gui\_options.c and anywhere else + needed (local history, treeviews, etc) + - <s>Fix asynchronous close signal thing now but is fixed in + lib</s> - doesn't appear to need any changes, AFAICT I didn't + bother working around this bug + +Misc +---- + +- <s>Switch to malloc/free so OS3 gets full benefit of clib2's slab + allocator</s> + - <s>should have no impact on OS4 perf, but may be worth + abstracting this so we can switch and change easier in future + (unless it makes the debug info from clib2 useless... hmm... + maybe use \#defines)</s> + - when done, enable clib2's debug mem handler: "The settings for + the memory debugging layer can be found in the + "stdlib\_memory.h" header file, right in the first few lines. + Just uncomment the lines for "\_\_MEM\_DEBUG", + "\_\_MEM\_DEBUG\_LOG" and "\_\_USE\_MEM\_TREES" as needed." + - Enable stats collection so we can tune the slab size - see + <https://github.com/adtools/clib2/blob/master/library/include/stdlib.h#L190> +- <s>Reduce signals usage (if possible)</s> - believe this is no + longer an issue +- Replace ExAll() usage in menu.c with whatever the new OS4 equivalent + is +- Font styles in clipboard (might need new chunk defined) +- Revamp About requester +- Add a low memory handler which calls llcache\_clean(true). Need to + somehow guard this as it isn't thread-safe (set a "ok to clean", + "clean in progress" flag which is set/cleared/blocks the GUI?) + - MEM\_TRY\_AGAIN might help, return this until safe to purge, or + until purge can happen in main loop + - <s>Safe to do this to call \_\_free\_unused\_slabs() on OS3</s> +- <s>Ditch libauto</s> + - Hopefully this fixes starting NetSurf on OS4.0 - program is + apparently terminating before it starts running any code. Unable + to test, awaiting feedback from the person who reported + problems. + - See also + <http://www.amiga.org/forums/showpost.php?p=773311&postcount=9> + - Probably doesn't work on OS4.0, as I saw a note that random() + needed a v53 newlib.library when rebuilding the toolchain + +OS3 Support +----------- + +Please see <http://www.amiga.org/forums/showthread.php?t=56813> and +<http://amigaworld.net/modules/newbb/viewtopic.php?topic_id=34237&forum=27> +for various discussion around this topic, as well as +<http://www.amiga.org/forums/showthread.php?t=63990> for more recent +updates. + +NetSurf will now build for OS3. For a quick start on building NetSurf +see [[OS3 build notes|documentation/buildingforamigaos]]. + +There are some outstanding known issues: + +- Fonts + - There seems to be a (lack of) spacing problem with some fonts. + May need to manually add OT\_SpaceWidth? + - Bitmap fonts (with limitations, ie. no UTF-8) support partially + working - line break detection is broken and sometimes causes an + infinite loop. (is this still the case?) + - The font scanner might be broken. + +- Plotters/Bitmaps + - We are currently ignoring the p96 stuff and treating all screens + as palette-mapped. This works but means the faster direct 32-bit + bitmap code is not being used when P96 is available. If we take + the P96 path, bitmaps work but everything else is rendered + unreadable. + - PDTM\_SCALE (used when getting palette mapped bitmaps) only + works on v45, need to use BitMapScale for OS3.5 compatibility. + (this might be fixed since guigfx change?) + +- GUI + - Tabs working but closing them causes NetSurf to crash. + - The status bar is not in the window border (frbuttonclass is + irredeemably broken in OS3) + - A lot of the GUI hasn't tmk been tested. + - The treeview windows eat memory for breakfast (might be better + now using corewindows with tiles and simplerefresh option) + +- Memory freed twice (recoverable alert 010000009) on exit + diff --git a/todo/framebuffer_frontend.mdwn b/todo/framebuffer_frontend.mdwn new file mode 100644 index 0000000..d4d5554 --- /dev/null +++ b/todo/framebuffer_frontend.mdwn @@ -0,0 +1,72 @@ +[[!meta title="Todo/Framebuffer frontend"]] +[[!meta author="James Bursa"]] +[[!meta date="2011-11-26T22:20:37Z"]] + + +[[!toc]] + +Bugs +---- + +General +------- + +- Use pointer hot spot data. +- Can't press and hold a key to get auto-repeat. e.g. for delete. +- local history scrolling does not work +- url text input widget is not great +- crash with x frontend with some wm +- animated gif/internal font render funny +- obscured widget ordering issue +- Need a text cursor. +- Use path plotter and LibSVGTiny. +- Support page scaling. + +nsfb wrinkles from RJEK + +- URL bar text size seems... overbearing. +- Home toolbar button? +- Local history thumbnails are all black +- On-screen keyboard gets overwritten by content. (It might be worth + rethinking how this works. How about the keyboard taking up the + whole screen with its own entry box, and then inserting that text + when the user is finished? Android does it this way when screen + space is tight, and it would eliminate the problem of having to + scroll the content so the text area is visible with the keyboard + open.) +- You can't grab the scroll handle when it's really small (try HTML5.) +- No dragging support means it isn't as nice to use as it could be on + touch screens. +- Form buttons don't work on the Joggler; strangeness on how the touch + screen delivers the events? +- When configuring the scroll bar size, the arrows become distorted. + Perhaps draw them using the drawing commands, rather than using + images? +- At high-resolutions, the OSK's key bevels are so small in comparison + to the keys they're essentially invisible. +- Pressing the arrow keys on the OSK to scroll causes the + newly-redrawn document to obliterate the keyboard. +- When loading a page, the arrow adds an hourglass. If you do not move + the mouse after this, the hourglass remains until you do. (Repaint + the pointer when the throbber stops?) +- The stop/refresh buttons don't grey out when unneeded. (ie, the stop + button isn't needed when the throbber isn't going, and the refresh + button isn't needed when it is. Some browsers combine them to save + space, ie the button is a stop button when loading, and a refresh + button when not.) +- No caret drawing. +- Lots of libnsfb/fbtk debug output; have this runtime selectable? +- Can FreeType be auto-detected and used if available at build time? + Our Makefile.config stuff would still allow this to be turned off + should the user want it. +- Mouse input becomes laggy/follows movement some time after the real + movement, when loading occurs. Is there any way to prioritise mouse + inputs, or drop pending movement when a new movement event comes in? +- Aesthetic only: Can we get anti-aliased line drawing on the local + history window? :) +- Go to Wikipedia. Scroll down using the wheel so the logo and + logotext in the top left corner is no longer visible. Slowly scroll + up only enough to get to the top of the document again. Scroll up + once more, and note the logotext change position. (It moves up a + couple of pixels.) + diff --git a/todo/gtk_frontend.mdwn b/todo/gtk_frontend.mdwn new file mode 100644 index 0000000..5cd1ee6 --- /dev/null +++ b/todo/gtk_frontend.mdwn @@ -0,0 +1,17 @@ +[[!meta title="Todo/GTK frontend"]] +[[!meta author="Jmb"]] +[[!meta date="2010-12-05T11:23:44Z"]] + + +[[!toc]] + +Code quality/Organisation +------------------------- + +- We should probably test with -DG\_DISABLE\_SINGLE\_INCLUDES + -DGTK\_DISABLE\_SINGLE\_INCLUDES to check for GTK 3.0 compatibility +- Also worth checking with -DPANGO\_DISABLE\_DEPRECATED + -DG\_DISABLE\_DEPRECATED -DGDK\_PIXBUF\_DISABLE\_DEPRECATED + -DGDK\_DISABLE\_DEPRECATED -DGTK\_DISABLE\_DEPRECATED + -DGDK\_MULTIHEAD\_SAFE -DGTK\_MULTIHEAD\_SAFE + diff --git a/todo/jmb.mdwn b/todo/jmb.mdwn new file mode 100644 index 0000000..e06b4f8 --- /dev/null +++ b/todo/jmb.mdwn @@ -0,0 +1,49 @@ +[[!meta title="Todo/jmb"]] +[[!meta author="Jmb"]] +[[!meta date="2011-02-02T00:29:55Z"]] + + +[[!toc]] John-Mark's todo list. + +LibParserUtils +-------------- + +- Charset conversion should use Unicode Normalisation Form C +- Optimisation + +Hubbub +------ + +- String interning in treebuilder +- Parse error reporting +- Extraneous chunk insertion/tokenisation (i.e. script support) +- Fragment parsing +- Serialisation +- Optimisation + +LibCSS +------ + +- Cascade of aural/page properties +- Some kind of API to provide access to the @page stuff +- Parse error reporting +- Documentation +- Optimisation + +LibDOM +------ + +- Rest of DOM +- Documentation +- Optimisation + +NetSurf +------- + +- Use libcurl 7.19.x's certificate chain inspection API & bin our own + OpenSSL stuff (no -- distros aren't packaging sufficiently modern + libcurl at present) +- Add generic key:value pair storage to URLdb +- Make layout engine completely fixed point, instead of the hideous + hybrid it currently is. + diff --git a/todo/risc_os_frontend.mdwn b/todo/risc_os_frontend.mdwn new file mode 100644 index 0000000..acb2ff2 --- /dev/null +++ b/todo/risc_os_frontend.mdwn @@ -0,0 +1,61 @@ +[[!meta title="Todo/RISC OS frontend"]] +[[!meta author="Stevef"]] +[[!meta date="2011-03-02T23:29:28Z"]] + + +[[!toc]] + +Core Treeview +------------- + +Updating the front-end to work with the Core Treeview changes. Largely +complete, the following items are either low priority (?) or waiting for +other changes such as the toolbar widget re-implementation. + +This work is (at present) in the trunk. + +### Outstanding work + +- Should the font used in treeviews be configurable? + +- Textarea code should call the front end to render the caret. (Like + the form code.) + +- Hotlist editing dialogues need to be reinstated, or all associated + templates and code need to be removed. + +- URL Suggest Menu module may require re-implementation as a + stand-alone entity which collects URLs entered directly into the + address bar and Open URL dialogue, instead of relying on URLdb. Low + priority? + +Toolbar Update +-------------- + +Updating the toolbar implementation to break the component parts into +stand-alone widgets. This will serve two main purposes: allowing some +outstanding Core Treeview issues to be closed off cleanly, and allowing +additional features to be added to the GUI without the risk of breaking +the existing components. + +This work is underway in /branches/stevef/toolbars. + +### Niggles + +- Toolbar menus shade unsupported widgets, instead of hiding them. + +- Check and confirm the correct content types for + ro\_gui\_url\_bar\_set\_site\_favicon() to accept from the core. + +- URL Completion needs to be migrated from the Window module towards + the Toolbar / URL Bar modules. + +### Further improvements + +- "Unlimited" length URL field in URL Bar Widget. + +- Tab Bar Widget. + +- URL Suggest module could identify menu availability more + efficiently. + diff --git a/todo/tlsa.mdwn b/todo/tlsa.mdwn new file mode 100644 index 0000000..61b94f4 --- /dev/null +++ b/todo/tlsa.mdwn @@ -0,0 +1,47 @@ +[[!meta title="Todo/tlsa"]] +[[!meta author="Tlsa"]] +[[!meta date="2011-09-07T14:12:14Z"]] + + +[[!toc]] Michael's todo list + +NetSurf +------- + +### Render + +- Form widget overhaul, treat as replaced elements and use core + textarea + +### Layout + +- If specified table height is greater than used height, share extra + height over rows +- Stacking, z-index + +### Core stuff + +- Status bar updates +- Pointer image updates +- Move input handling to content handlers +- Debug window +- Window showing all the errors encountered when loading a page + +Web site +-------- + +- About team page. Add zamez info, new folk (porters, GSoC folk who + stay) +- Adverts section with banners, buttons and mag. ads. + +Releases +-------- + +- Update homepage +- Update download page +- Update about NS page +- Update screenshots page +- Announce on user and dev MLs +- Announce on csa.a, various RO software DB sites. ANS filebase thing. +- There are various DBs of Linux software to get NS submitted to + diff --git a/todo/win32.mdwn b/todo/win32.mdwn new file mode 100644 index 0000000..0e3e726 --- /dev/null +++ b/todo/win32.mdwn @@ -0,0 +1,28 @@ +[[!meta title="Todo/Win32"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-03-22T11:01:47Z"]] + + +[[!toc]] + +Issues noted by rjw +------------------- + +- No auto complete +- Non-standard URL bar +- Non-standard icon set +- Throbber looks incorrect +- Toolbar continues to contract horizontally even when it can't shrink + correctly +- File-\>Save Page As is not greyed out, but entire sub-menu is +- File-\>Open Location does not work +- Edit-\>Find does not work +- No form of selection works for the document +- View-\>Page Source does not function +- View-\>Zoom does not display the current zoom level anywhere +- View-\>Full Screen does not function correctly when returning from + full screen mode +- Local History draws outside the containing window, and has no close + icon +- Tools-\>Downloads does not function + diff --git a/virtual_host_server.mdwn b/virtual_host_server.mdwn new file mode 100644 index 0000000..2b3def8 --- /dev/null +++ b/virtual_host_server.mdwn @@ -0,0 +1,56 @@ +[[!meta title="Virtual Host Server"]] +[[!meta author="Kyllikki"]] +[[!meta date="2016-01-08T11:57:28Z"]] + + +[[!toc]] The system providing the +virtual host services for the NetSurf project is currently named +phoenix. + +Access is \*only\* via the NetSurf VPN. For VPN access contact vince +though you can also use your ssh key access to ci.netsurf-browser.org + +phoenix is currently 192.168.211.50 if the DNS is unavailable + +Creating a new VPS +------------------ + +Become superuser with sudo + +### Debian VPS + +If you are creating a new Debian box there is a helper script +(new-wheezy-vps.sh ) which just just need to pass a system name to and +you will get a 40G disc/ 512MB RAM system. + +for example: + +`new-wheezy-vps.sh ciworker13` + +will create a system named ciworker13 with 40G of disc and 512MB of +memory with the Debian wheezy boot iso connected to the cdrom drive. + +### Other VPS + +The manual setup for other systems is: + +- create lvm device for the system + +`lvcreate --size 40G -n system_name vg` + +- if the OS requires a cdrom install media download and place in + /var/lib/libvirt/images/ +- use virt install to create the new VM substitutig appropriate values + for volume name, memory, boot disc + +`virt-install -n ciworker13 -r 512 --disk path=/dev/mapper/vg-ciworker13,bus=virtio \` +`-c /var/lib/libvirt/images/cd54.iso --accelerate --network=bridge:br0 \` +`--connect=qemu:///system --vnc --noautoconsole -v` + +Admin +----- + +You can either use virsh on phoenix to directly admin consoles or +alternatively use virt-admin over the VPN which is by far the easier +option. + ----------------------------------------------------------------------- -- NetSurf Developer Wiki Backing Store

5 years, 12 months

1
0
0 / 0

libcss: branch master updated. release/0.6.1-27-g4729f01

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libcss.git/shortlog/4729f01919b7ba3f99abfe... ...commit http://git.netsurf-browser.org/libcss.git/commit/4729f01919b7ba3f99abfea8... ...tree http://git.netsurf-browser.org/libcss.git/tree/4729f01919b7ba3f99abfea890... The branch, master has been updated via 4729f01919b7ba3f99abfea8900931616fbb8320 (commit) from cb99ab8db4246f28e4bbf25f4e1ef7716473602a (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/libcss.git/commit/?id=4729f01919b7ba3f99ab... commit 4729f01919b7ba3f99abfea8900931616fbb8320 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Select: Squash error-path leak. If we allocated a font-face array previously, and failed to extend it, then we failed to free it on the error path. diff --git a/src/select/select.c b/src/select/select.c index a44ef4a..f1c3637 100644 --- a/src/select/select.c +++ b/src/select/select.c @@ -1942,7 +1942,6 @@ static css_error _select_font_face_from_rule( new_faces = realloc(faces->font_faces, new_size); if (new_faces == NULL) { - faces->count = 0; return CSS_NOMEM; } faces->font_faces = new_faces; ----------------------------------------------------------------------- Summary of changes: src/select/select.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/select/select.c b/src/select/select.c index a44ef4a..f1c3637 100644 --- a/src/select/select.c +++ b/src/select/select.c @@ -1942,7 +1942,6 @@ static css_error _select_font_face_from_rule( new_faces = realloc(faces->font_faces, new_size); if (new_faces == NULL) { - faces->count = 0; return CSS_NOMEM; } faces->font_faces = new_faces; -- Cascading Style Sheets library

6 years

1
0
0 / 0

netsurf: branch dsilvers/eventtarget updated. release/3.6-220-gbfde01c

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/bfde01c854284a9dcf1ae... ...commit http://git.netsurf-browser.org/netsurf.git/commit/bfde01c854284a9dcf1ae1e... ...tree http://git.netsurf-browser.org/netsurf.git/tree/bfde01c854284a9dcf1ae1e11... The branch, dsilvers/eventtarget has been updated discards 6b9a2e3aba35ea890604356fcf888268667ab9c5 (commit) discards c0aadc56162e73509a1557e2cd69e2fd6125cf8f (commit) discards bf80b18929da2dc3beb36aa96a6cea645e4088ef (commit) via bfde01c854284a9dcf1ae1e11639566c79cf8019 (commit) via 238d03fbe245b45e25033796b502b1ee3eab8e31 (commit) via ce43bc236847b51e7ca833ea76c237130c1d6209 (commit) via 1f52b2d514ac12bfbcb97f4ed3eb556d5e38739d (commit) via b23f55c81bca21de7841111ace809df0f6408d65 (commit) via e96bf013394c0dd06cb25e666e8c68d22c12a318 (commit) via 6075feb4875ed2035de460fcdc7858f314ad0bef (commit) via 11f11e0a7f8f7dd03d5b1fc22a8e54af305fbe6f (commit) via 10248264ff43a917dd18796daa61ee5a5f1229d5 (commit) via d1246c20612c6f6ad23b0e47497949bf2c0ec0a6 (commit) via 70d700b26c13e04b601c4ac3db09514db473d01c (commit) via a99c7a5c44fdd3f6ee1a0ec2b9beb5a1d6a32501 (commit) via 2083375ec45d159a916caee3b7b570aa6670684c (commit) via 53ce28c170ac5264405a7a12a718cf57a382518d (commit) via d871be3ea00ef74ab28b936526768bbf121e3eb0 (commit) via d843f78c202900409b0cd0c16397f6dae77bbe2b (commit) via 9e814fd0f0f03584debb43b6d8acf144bd8675a2 (commit) via b78d6f458e5d5cb9c78d7430aacf10abd227eb32 (commit) via b8640956d48af03f2f7f6c07e66958fa825a4972 (commit) via 8e7603e6a263eb765df4886a321537f209d88245 (commit) via 606cc0c2196f5934a7c48e89ab05da7d5e05081f (commit) via 52f98c9fb2b3dc04412ad25b7c24fa8cf357e78d (commit) via 24fed9d51ccf3e786e59983ae84b4f13e68b0ea4 (commit) via b6f7ea536cececaa07fb2c46c129675d91167177 (commit) via e4d6d9a972736bbea70eb0af62a430e77cc05ee5 (commit) via 313aaabdde2e6f0bb1f0dfe571b77261cc697a95 (commit) via 9f10babe645fe67b02fae90f852d5e4cdfcbb70e (commit) via 7dab7cb43d4091648ceb40684ff70aff7091c648 (commit) via 0d9023148d2a34bd908aac38e44d449359b03438 (commit) via 8ffc2e753b04a9e794e7a6302d57d590b311e41f (commit) via 74e73a3b8b5ab3effd8e3d94c10463907d4c4ea9 (commit) via 9e037376276aaa042b529499f1978766b9535f7b (commit) via 439deddba14f509fa0be90beff07481643178b69 (commit) via 4fab8f830bd4ffaf8faca408a5c1265887712704 (commit) via c19ea4deaa61f8418db2c92f1843456be0389b7e (commit) via 05e4463230d8ae9880ac3aef38ca12f09d30d960 (commit) via 074afb43f424d671ce6d00b140df851a26f3ddd7 (commit) via 3436c097d2be579440a021fe418d22957db7dbe6 (commit) via bf3ba5c97bac5aa79c43153311ea0d3d5945bd4d (commit) via 01e116ee1f5603ef6adeb365f403563a684a47b4 (commit) via ae8959fa8b46fd21100b72669dcd4da03d91fd97 (commit) via d885c79743a3169669d6400011ee667aa70e88d9 (commit) via 22e25971ed4bc23d742cff7823a9f8224f544db7 (commit) via 0f58d92ab6b4fa13e971b0b07d7ee58e7493c4ee (commit) via 83840dca49ef6f720e825606555db19b2b659cc6 (commit) via d1693c27c0d9658b655c158a9652f87683719325 (commit) via 9be0f4ccaf9696173fb910660352be6648811040 (commit) via a4bedbbaebec62294bcf6e7210c4c2b0b64f936c (commit) via 917a602dce32286260a34d61b7c0db4bee502ec0 (commit) via a86f2c8dd35c0cd8ba2f87097a68ad32373c28b5 (commit) via 2d9ed9cbc4bd611d027b07f40bcf2dad68632857 (commit) via 047b37d5f8c3810f8942f5744bb92640fbd4879f (commit) via 5687f6c27d40ec596b4d64c705d16a97bdb3c893 (commit) via e98a05bb087fb5c2c2ee8d94b3011ae8b3aa5c7a (commit) via 6e957396a9bdc78a7d9823aaf76764bbb30c184a (commit) via d6f6326ce9b6e60fcf9865e726b718ccfbbbea65 (commit) via 26b98ac51b2f5a7c3d35050fcf79f521bfdb05f8 (commit) via 57a2bb85992844b644433142e687940b3870ce40 (commit) via 695783e33b9c100b1ce28ef71a59a00f52cc374f (commit) via 2e11f7f3cbd7d563cb525a26ce79d76502ba7686 (commit) via 5eb7ee97ed641e152c488dab6c33c37d0635e48b (commit) via 3b1ef784fd53095213fa8b89806982567359dca4 (commit) via 2bd8eb8c0b468799109191e63e939ea7bd69f8a1 (commit) via 64bb74bdafa216d4163d6b717271a9f45ac0d287 (commit) via 48e95ad2b3ede2b6170b635074bf0ee1010dfb39 (commit) via eb63c1cc50847b88e598cdf0f775814a43a2799e (commit) via 0fafa9576e8963928c13c81524e64b624b794c98 (commit) via 4892497a19083cf328711f28376d16133a684353 (commit) via 4b7abde7b0449a3a3fe03b43533b8d0697f55e0d (commit) via 98f94c4bf39db60b0b686bccc84175e15214b348 (commit) via e7c9b863b3d2dd8579cb2c9f80f4a20933d04315 (commit) via a9cc0792a43d108e5ff61055354422a6c7218a74 (commit) via a5222b579b8202f130e0afceb570b6e700385efe (commit) via e3b2f792c0250d219dc56976f8305a05b6b04e36 (commit) via 24b7fdf4382dcef274092b4735093fc390815455 (commit) via dab118b6f7e9a22ed01413a2ce2fd60e4c4df97b (commit) via 3227ed655609e731f3d216706c524028f566f114 (commit) via eb1f39fe7d80893b1f7c804eb48ec61e89f17d78 (commit) via 31c08f39be64f739cac727ab5a13fc513d1a61aa (commit) via c40e8197c270b1600fa7b32056a2019cd83e6f3f (commit) via 8196f5b60241a6389ca3b76446de131a3dd2e891 (commit) via bb2341898113f37936832c8828bd515c3e3860c9 (commit) via 86a0f14d0aa13c7808b57bbb6092ac6805babf02 (commit) via 8af9a8407bc9f65fc34eecfe0fbd4beb6dacdfac (commit) via 36b26b861f375de5b2be3ff9de37288049f05a26 (commit) via 43bbdc520dd054acdf46088fbbee5d4a3b638d24 (commit) via b7551fec72372df4cb40384818da5419904e4c98 (commit) via 570212add2ec6b70474eb49b74259d7c73733c03 (commit) via adac4d98bb9acdeb76725c946e53ff0e2c0235df (commit) via 982a59744f634aee73dc11d4a30c93b4652a1e7e (commit) via 205abcf18950bf3ee8600c4a4e4945b096985f9e (commit) via 937dce4f2eef86c563bb93ded5c355c1446bf88c (commit) via 493036a920aba5cf470637b7aa2ca69f7f57b41c (commit) via a83afda7918cdb7ebc28db204ceb3e0f3d1cb0d3 (commit) via 0804c43bf1afa0cb9d851ceb89e29ec8096f272f (commit) via 5382ad2aa69b6ef8e479c5714052086eba8133b5 (commit) via 48f868a9555be385f156e9396079ad5d0ee388f6 (commit) via 76673bbf655592a62d21acfec860d5bf181bc848 (commit) via 5e523b608a330c2c10f20a8913b7bad85388d475 (commit) via 9df30eb78fc024448c39182a5d9fb0053c6ef137 (commit) via d8eec1b048fe7c7cac4a0bd3bb4f31203524ee79 (commit) via d9c8d1c70cac756d47586e2abf2dfbb9a1d96b59 (commit) via d90e82d3f1c0ed0cdd665899c754b655f661976d (commit) via 4893a9f9af8013fb81cdb81a4d49043719d0b851 (commit) via 6ba5edaede1a04db5e374d94e8fd8d4d1fbc3f0a (commit) via 47379c04442c805af95ba16b9932fbdb549a7594 (commit) via 9379a64c6dfab6046ba56b8cdb299c4da3d6c3f2 (commit) via 7ca75a4cee083ded7f3607bba5e841c430556d93 (commit) via 7fc6e6c0c0053e5ca4f4e09e8f4457a8125a167c (commit) via 32d2dda01c097be6a214499afa91d99bd198559e (commit) via c60ab801f3cdd4cb7519245a9084fa7c6d4f66a8 (commit) via 512a4335dae3fc27675cc6ba4ccfd219f20bfdba (commit) via 354656b442cb9583fe8f690e9aa3e58ff50b6dce (commit) via 4e5e9f1f5af2e526a87f38936aed0c4c100b5051 (commit) via b6be869f19994070ec522d19455ea7eb47965be4 (commit) via ded1979fa1b77ea6261df7a7f6f9177bde433f2d (commit) via 7750d926adf3740448ec2fada2e207a4b5bd5851 (commit) via 93fdbcc6de0d82323a67bc4c2d560f90a1f396cd (commit) via b93ae2c28f2e1d3d4e0d20c5a5d09c930c49fb88 (commit) via fb0cdfed79e5d55cf25a4e7866f0b084fde4ed2b (commit) via 5f32f9ddd61ebd873ebb825c6e32d82e8965d840 (commit) via e7598fb0b5c83fddca34d9f1adeb3c0989ce9ae5 (commit) via 7b7b1507d01b3e078790150d6b5f59ebaf0b45c3 (commit) via 2917af0a967bda993b8c1c5f194eea0b9881b6be (commit) via 7aa1dd601e40d0684efbdd53b6ce5109846fcc37 (commit) via 16b8d524e89e575230a46746bb117bc7f2a4f265 (commit) via 07456db2dc6fc59a952e0160cb03ba494a05e05d (commit) via 743637a8d2105df6ffc464a3cb4753cdc8c1401f (commit) via 49b1b0b3a51092d7612e496ae6bc8d7d8651425b (commit) via 96e073a29777bbe927f0bc7187f7032d3f51e68b (commit) via af6139bcb5845d4cdbc852b113ac8fabcee29097 (commit) via 337f9948d51d48f8b2a01694e07ea1bf4fa337af (commit) via 72d3bec792c614783d6333267852675f14f7bf94 (commit) via af3a78060fc18d1544b0d411d2d7584fcac9f3df (commit) via 05a35725d19f9b5a2c8e347d638fb00dff21962f (commit) via e2bad05338d5575bf485fbb509d496c5de012a64 (commit) via c7cf2d18de0ac03ce4c6276072bc89fd847e3c22 (commit) via c8c7de976a107c8e3362702f294f4f4d9c5ab7e4 (commit) via 770c277ccc182f504be0a316390d59c05a59e041 (commit) via 539d5da5c4b814322cfac07b825a2b222951dacd (commit) via 7c03ae91fd8a99576cd5f0b8e5311f990ae5739b (commit) via f68a3f9d61bf66640071ec2f32f7b2ed09215a87 (commit) via f27cc16d426708c9267dcb290d4a32f2a5dcb686 (commit) via d2742077b95cdc574c0b88284e5d04243de0ff9d (commit) via b227be8cd2108405793e117fa150808dd6120f29 (commit) via 71983d527ea86da0e8c8e2195715b9ca55b0de13 (commit) via 54f01c7d7bb8a0b505ac6fabef252d332152f29d (commit) via 6c441fd4b1a8d9be2a84b4ea9ba2a4e90857be3e (commit) via 7a5b50be940de2d6156e756482a2297014fb620b (commit) via 9d77dc83bdd86f3a46ff00102a43c46718dac00b (commit) via f04103398b284b9defb85c98d3079b0dfc43a15e (commit) via 407e58406b7a89b9c15a7e40c9b2bc26b866f31e (commit) via 7318b5b65a2831b6cc6e87b51b6dcedc5a946c78 (commit) via 4ad375c3b0e3f65416c02ca7b126b2e7fe375db1 (commit) via ba0895121b44b21d351ee69a07613f524f322617 (commit) via 9d694f56bbe28ba61eeeffd7472a4b7962a513c0 (commit) via 433418a8e9655fe19ab704129ee652b7316dc343 (commit) via 34a587849c9999f12d4199d744e7c72204369eab (commit) via 68e8152f3eb95395cd47e0d703ed709e4ddaef89 (commit) via 8f9a652774bbf1bdb469e0e7280a28983559b90d (commit) via ecf2fdf6122eb6c11b66d08ab2d7b4079a1df108 (commit) via 74d7c2d2c2b2161701c1f0258bbfc7feb753ac1e (commit) via a440907b78f430ff7428e48f6fb0532db5f00cd5 (commit) via c0a15de1e4609e942c037c340c5fed3c5bce839d (commit) via 2b6a416970f3eff764f4a053cdade46566ce7dc7 (commit) via f38b72a5833bfd9967308d6667c45c58a0ed10b8 (commit) via 2dd97b0b8e1f363542dddb403d515cce132b7f29 (commit) via 4b91c43003cdcbca09a72ce408d1e8cb93ad83e6 (commit) via 2fe884be6532bb86ed8e2f2aa3d278ebaee6a406 (commit) via 71afaacc80c6d94e1406249c61c338a4131d24a7 (commit) via 2a9e89de751b6a6600feee2bc3960affb73c6988 (commit) via 54e31b65d14dd1e228106eae0c60ab42802a97ed (commit) via 4a93beb0393a8abddeb606cbb29a99bc1d73b67e (commit) via 0bc32aa654271fd592d36fabf272e3fa0ca0a450 (commit) via 4fb38f574a303d53fb3e4560e76163e4e97687b3 (commit) via a76a36915c7d348582f905629fa0840a88b02edb (commit) via c4b8857789e3f79a2ae0f7abe108999bf323b01a (commit) via 20432237883a04677f30f1758979fa0a4b9111e3 (commit) via f8f802cda5f54c0c2b1acd51efc08aa7d4afad1b (commit) via af1f1f375d0f0fdaf885f72fdbcd873f2203d227 (commit) via 67b7854737f23f76b700a6fe76ce6060435f5cff (commit) via 811d7b71758917919a0c94b1289bd5608119ccc5 (commit) via 540c6ee0ef432dfad375d64afa2c67d410f826d5 (commit) via cd3720d5b63147fb97f3b7cdd056d3e8e6cc5586 (commit) via 3f88c12315556d6f5f928c7e6a5e56357899ece7 (commit) via 356e92c604ec6ab218302cfc1704f04ae171ddeb (commit) via 30ca72b32eba20793b2888be35992fdc5dae375b (commit) via b5fd0ae1ed4558b50cb7e3002e8f0c7042a4617d (commit) via 31b1c72ddc66512c3a9cef4e59b94bdafc713ad4 (commit) via 35146ef0c8f72526683f306a07d5cc70a070fe85 (commit) via bcce8cc7b41f869fa2b022f85622cd389082d0f5 (commit) via f679a9b1d6b652e06c24d543c7c5921753e3071b (commit) via d436992eb2a28e2e056e96e42072b13d89b44a0b (commit) via 5ce3b934571906c012567d898d83c652fad30567 (commit) via 17128fd0ad119c801a17e06da1fd8b351fb17f21 (commit) via b3042f6c1fcb708d8663f4ab51865fe6a1f8bec3 (commit) via 9ff13d64c4ea9b3539f9b162bc8c70f2a30f288e (commit) via 8828bdc7021714621ebef63e847c2998658b4863 (commit) via 8acb224e90a03175133f8b295229b6f0e096177d (commit) via 4bd4f3e82bc77c18ae38a8db94c0ad74747930b0 (commit) via e8a9e3744523671228fef385ce7e1e11f93283b0 (commit) via 3ab8032f1679c2a3526ccd458eb130c0d0f917bc (commit) via eab6c0c99e29e10a3ac409b8de7c0e39ef918358 (commit) via 15a68714919c64edc04d6e26679fabb490bdf9a2 (commit) via 0513782fe3bb2884d0f63fb11c69f06055332388 (commit) via 05fa29ba8bc2dbfaa9af7ed1263554c7cdc9214d (commit) via 4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432 (commit) via faf4c1fb6012941134046db14370f60748184b05 (commit) via 2c6f2f4ef5a50c36676308f6663c0d21edc6aa70 (commit) via a8bd2af7103bca7145f8c566ec46f27e2be8d182 (commit) via 61a00c3832332bc27b991d3e20702a7f900e5098 (commit) via 81a7e0cbe9851c2388e53950a6db3e75b1156ead (commit) via cdde777d9cf157460201c59c5cc05c7479c3f830 (commit) via 4b1b79582c5de530100b4ddb909163a6fb9b23c8 (commit) via 6951d2327b0f0b6999f66452d5c38d74136cdb12 (commit) via ec239402eac198af635f14970bf411e5690dd02e (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (6b9a2e3aba35ea890604356fcf888268667ab9c5) \ N -- N -- N (bfde01c854284a9dcf1ae1e11639566c79cf8019) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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/commit/?id=bfde01c854284a9dcf1... commit bfde01c854284a9dcf1ae1e11639566c79cf8019 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> Oops ' ' -> _ diff --git a/content/handlers/javascript/duktape/EventTarget.bnd b/content/handlers/javascript/duktape/EventTarget.bnd index 9f7c91a..fb20883 100644 --- a/content/handlers/javascript/duktape/EventTarget.bnd +++ b/content/handlers/javascript/duktape/EventTarget.bnd @@ -43,8 +43,8 @@ static void event_target_push_listeners(duk_context *ctx) { /* ... listeners type ??? */ duk_pop(ctx); duk_push_object(ctx); - duk dup(ctx, -2); - duk dup(ctx, -2); + duk_dup(ctx, -2); + duk_dup(ctx, -2); /* ... listeners type sublisteners type sublisteners */ duk_put_prop(ctx, -5); /* ... listeners type sublisteners */ commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=238d03fbe245b45e250... commit 238d03fbe245b45e25033796b502b1ee3eab8e31 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> More useful utilities for event listeners diff --git a/content/handlers/javascript/duktape/EventTarget.bnd b/content/handlers/javascript/duktape/EventTarget.bnd index a53e71d..9f7c91a 100644 --- a/content/handlers/javascript/duktape/EventTarget.bnd +++ b/content/handlers/javascript/duktape/EventTarget.bnd @@ -17,24 +17,69 @@ prologue EventTarget() #define EVENT_LISTENER_JS_MAGIC MAGIC(EVENT_LISTENER_JS_MAP) static void event_target_push_listeners(duk_context *ctx) { - /* ... (this=EventTarget) */ + /* ... type (this=EventTarget) */ duk_push_this(ctx); - /* ... this */ + /* ... type this */ duk_get_prop_string(ctx, -1, EVENT_LISTENER_JS_MAGIC); if (duk_is_null(ctx, -1)) { - /* ... this null */ + /* ... type this null */ duk_pop(ctx); duk_push_object(ctx); duk_dup(ctx, -1); - /* ... this listeners listeners */ + /* ... type this listeners listeners */ duk_put_prop_string(ctx, -3, EVENT_LISTENER_JS_MAGIC); - /* ... this listeners */ + /* ... type this listeners */ } - /* ... this listeners */ - duk_insert(ctx, -2); - /* ... listeners this */ + /* ... type this listeners */ + duk_insert(ctx, -3); + /* ... listeners type this */ duk_pop(ctx); - /* ... listeners */ + /* ... listeners type */ + duk_dup(ctx, -1); + /* ... listeners type type */ + duk_get_prop(ctx, -3); + /* ... listeners type ??? */ + if (duk_is_null(ctx, -1)) { + /* ... listeners type ??? */ + duk_pop(ctx); + duk_push_object(ctx); + duk dup(ctx, -2); + duk dup(ctx, -2); + /* ... listeners type sublisteners type sublisteners */ + duk_put_prop(ctx, -5); + /* ... listeners type sublisteners */ + } + duk_insert(ctx, -3); + /* ... sublisteners listeners type */ + duk_pop_2(ctx); + /* ... sublisteners */ +} + +typedef enum { + ELF_CAPTURE = 1 << 0, + ELF_PASSIVE = 1 << 1, + ELF_ONCE = 1 << 2, + ELF_NONE = 0 +} event_listener_flags; + +static event_listener_flags event_listener_pop_options(duk_context *ctx) +{ + event_listener_flags ret = ELF_NONE; + /* ... options */ + duk_get_prop_string(ctx, -1, "capture"); + if (duk_to_boolean(ctx, -1)) + ret |= ELF_CAPTURE; + duk_pop(ctx); + duk_get_prop_string(ctx, -1, "passive"); + if (duk_to_boolean(ctx, -1)) + ret |= ELF_PASSIVE; + duk_pop(ctx); + duk_get_prop_string(ctx, -1, "once"); + if (duk_to_boolean(ctx, -1)) + ret |= ELF_CAPTURE; + duk_pop_2(ctx); + /* ... */ + return ret; } %} @@ -47,6 +92,7 @@ init EventTarget() method EventTarget::addEventListener() %{ dom_exception exc; + event_listener_flags flags = ELF_NONE; /* Incoming stack is: type callback [options] */ if (duk_get_top(ctx) < 2) return 0; /* Bad arguments */ if (duk_get_top(ctx) > 3) return 0; /* Bad arguments */ @@ -64,8 +110,13 @@ method EventTarget::addEventListener() /* ... options */ } /* type callback options */ + flags = event_listener_pop_options(ctx); + /* type callback */ + duk_dup(ctx, -2); + /* type callback type */ event_target_push_listeners(ctx); - /* type callback options listeners */ + /* type callback typelisteners */ + return 0; %} commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ce43bc236847b51e7ca... commit ce43bc236847b51e7ca833ea76c237130c1d6209 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> Early bits for event targets, nowhere near ready yet diff --git a/content/handlers/javascript/duktape/EventTarget.bnd b/content/handlers/javascript/duktape/EventTarget.bnd new file mode 100644 index 0000000..a53e71d --- /dev/null +++ b/content/handlers/javascript/duktape/EventTarget.bnd @@ -0,0 +1,123 @@ +/* Event Target binding for browser using duktape and libdom + * + * Copyright 2016 Daniel Silverstone <dsilvers(a)digital-scurf.org> + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * Released under the terms of the MIT License, + * http://www.opensource.org/licenses/mit-license + */ + +class EventTarget { + private bool is_node; +}; + +prologue EventTarget() +%{ +#define EVENT_LISTENER_JS_MAGIC MAGIC(EVENT_LISTENER_JS_MAP) + +static void event_target_push_listeners(duk_context *ctx) { + /* ... (this=EventTarget) */ + duk_push_this(ctx); + /* ... this */ + duk_get_prop_string(ctx, -1, EVENT_LISTENER_JS_MAGIC); + if (duk_is_null(ctx, -1)) { + /* ... this null */ + duk_pop(ctx); + duk_push_object(ctx); + duk_dup(ctx, -1); + /* ... this listeners listeners */ + duk_put_prop_string(ctx, -3, EVENT_LISTENER_JS_MAGIC); + /* ... this listeners */ + } + /* ... this listeners */ + duk_insert(ctx, -2); + /* ... listeners this */ + duk_pop(ctx); + /* ... listeners */ +} + +%} + +init EventTarget() +%{ + priv->is_node = false; +%} + +method EventTarget::addEventListener() +%{ + dom_exception exc; + /* Incoming stack is: type callback [options] */ + if (duk_get_top(ctx) < 2) return 0; /* Bad arguments */ + if (duk_get_top(ctx) > 3) return 0; /* Bad arguments */ + if (duk_get_top(ctx) == 2) { + duk_push_object(ctx); + /* type callback options */ + } + if (duk_get_type(ctx, -1) != DUK_TYPE_OBJECT) { + /* legacy support, if not object, it's the capture value */ + duk_push_object(ctx); + /* ... capture options */ + duk_insert(ctx, -2); + /* ... options capture */ + duk_put_prop_string(ctx, -2, "capture"); + /* ... options */ + } + /* type callback options */ + event_target_push_listeners(ctx); + /* type callback options listeners */ + return 0; +%} + +method EventTarget::removeEventListener() +%{ + dom_exception exc; + return 0; +%} + + + +method EventTarget::dispatchEvent() +%{ + dom_exception exc; + if (!dukky_instanceof(ctx, 0, PROTO_NAME(EVENT))) return 0; + + duk_get_prop_string(ctx, 0, PRIVATE_MAGIC); + event_private_t *evpriv = duk_get_pointer(ctx, -1); + duk_pop(ctx); + + dom_event *evt = evpriv->evt; + + /* Dispatch event logic, see: + * https://dom.spec.whatwg.org/#dom-eventtarget-dispatchevent + */ + bool in_dispatch; + if (dom_event_in_dispatch(evt, &in_dispatch) != DOM_NO_ERR) return 0; + if (in_dispatch) { + /** \todo Raise InvalidStateException */ + return 0; + } + + bool is_initialised; + if (dom_event_is_initialised(evt, &is_initialised) != DOM_NO_ERR) return 0; + if (is_initialised == false) { + /** \todo Raise InvalidStateException */ + return 0; + } + + if (dom_event_set_is_trusted(evt, false) != DOM_NO_ERR) return 0; + + /** \todo work out how to dispatch against non-node things */ + if (priv->is_node == false) return 0; + + bool success; + /* Event prepared, dispatch against ourselves */ + exc = dom_event_target_dispatch_event( + ((node_private_t *)priv)->node, + evt, + &success); + if (exc != DOM_NO_ERR) return 0; /**< \todo raise correct exception */ + + duk_push_boolean(ctx, success); + return 1; +%} diff --git a/content/handlers/javascript/duktape/Node.bnd b/content/handlers/javascript/duktape/Node.bnd index f237c87..f14cfc1 100644 --- a/content/handlers/javascript/duktape/Node.bnd +++ b/content/handlers/javascript/duktape/Node.bnd @@ -16,6 +16,7 @@ init Node(struct dom_node *node) %{ priv->node = node; dom_node_ref(node); + priv->parent.is_node = true; %} fini Node() diff --git a/content/handlers/javascript/duktape/netsurf.bnd b/content/handlers/javascript/duktape/netsurf.bnd index 4aca475..2a56ccc 100644 --- a/content/handlers/javascript/duktape/netsurf.bnd +++ b/content/handlers/javascript/duktape/netsurf.bnd @@ -54,6 +54,7 @@ struct dom_html_br_element; }; +#include "EventTarget.bnd" #include "Console.bnd" #include "Window.bnd" #include "Document.bnd" ----------------------------------------------------------------------- Summary of changes: !NetSurf/Resources/nl/welcome.html,faf | 1 - .gitignore | 6 +- Docs/core-window-interface | 2 +- Docs/source-object-backing-store | 46 +- Makefile | 12 +- content/backing_store.h | 22 +- content/content.c | 4 +- content/fetch.c | 8 - content/fetch.h | 7 - content/fetchers/curl.c | 34 +- content/fetchers/data.c | 3 +- content/fetchers/file.c | 1 + content/fetchers/resource.c | 1 + content/fs_backing_store.c | 111 +- content/handlers/css/hints.h | 4 +- content/handlers/css/select.c | 1 + content/handlers/image/image_cache.c | 98 +- content/handlers/image/png.c | 1 + content/handlers/javascript/duktape/Makefile | 5 +- content/handlers/javascript/duktape/duk_config.h | 4 +- content/handlers/javascript/duktape/dukky.c | 7 +- content/handlers/javascript/duktape/duktape.c | 407 +++-- content/handlers/javascript/duktape/duktape.h | 23 +- content/hlcache.c | 11 +- content/llcache.c | 98 +- desktop/Makefile | 4 +- desktop/browser_history.c | 126 +- desktop/browser_private.h | 3 +- desktop/cookie_manager.c | 1 + desktop/font_haru.h | 1 - desktop/global_history.c | 1 + desktop/hotlist.c | 39 +- desktop/hotlist.h | 36 +- desktop/knockout.c | 2 +- desktop/netsurf.c | 5 +- desktop/options.h | 2 +- desktop/plot_style.c | 15 +- desktop/scrollbar.c | 6 +- desktop/searchweb.c | 12 +- desktop/system_colour.h | 2 +- desktop/textarea.h | 4 +- desktop/treeview.c | 173 ++- desktop/treeview.h | 22 + frontends/amiga/Makefile | 11 +- frontends/amiga/arexx.c | 30 +- frontends/amiga/bitmap.c | 93 +- frontends/amiga/bitmap.h | 10 +- frontends/amiga/clipboard.c | 19 +- frontends/amiga/cookies.c | 381 ++++- frontends/amiga/cookies.h | 11 +- frontends/amiga/corewindow.c | 1002 ++++++++++++ frontends/amiga/corewindow.h | 188 +++ frontends/amiga/dist/NetSurf.guide | 6 +- frontends/amiga/download.c | 33 +- frontends/amiga/download.h | 2 - frontends/amiga/dt_anim.c | 5 +- frontends/amiga/file.c | 15 +- frontends/amiga/file.h | 4 +- frontends/amiga/filetype.c | 5 +- frontends/amiga/font.c | 2 + frontends/amiga/font_bullet.c | 7 +- frontends/amiga/font_cache.c | 2 +- frontends/amiga/font_diskfont.c | 43 +- frontends/amiga/font_diskfont.h | 1 + frontends/amiga/font_scan.c | 10 +- frontends/amiga/gui.c | 1602 ++++++++++---------- frontends/amiga/gui.h | 71 +- frontends/amiga/gui_menu.c | 1123 ++++++++++++++ frontends/amiga/{menu.h => gui_menu.h} | 69 +- frontends/amiga/gui_options.c | 39 +- frontends/amiga/gui_options.h | 2 - frontends/amiga/history.c | 457 +++++- frontends/amiga/history.h | 16 +- frontends/amiga/history_local.c | 30 +- frontends/amiga/history_local.h | 12 +- frontends/amiga/hotlist.c | 528 ++++++- frontends/amiga/hotlist.h | 22 +- frontends/amiga/icon.c | 13 +- frontends/amiga/iff_dr2d.c | 29 +- frontends/amiga/launch.c | 30 +- frontends/amiga/login.c | 22 +- frontends/amiga/login.h | 4 +- frontends/amiga/memory.c | 169 +++ frontends/amiga/memory.h | 68 + frontends/amiga/menu.c | 1124 +++----------- frontends/amiga/menu.h | 153 +- frontends/amiga/misc.c | 52 - frontends/amiga/misc.h | 9 - frontends/amiga/object.c | 40 +- frontends/amiga/object.h | 1 + frontends/amiga/options.h | 5 +- frontends/amiga/os3support.c | 317 ++-- frontends/amiga/os3support.h | 1 - frontends/amiga/plotters.c | 40 +- frontends/amiga/print.c | 40 +- frontends/amiga/print.h | 10 +- frontends/amiga/schedule.c | 2 +- frontends/amiga/schedule.h | 1 + frontends/amiga/search.c | 22 +- frontends/amiga/search.h | 5 - frontends/amiga/sslcert.c | 361 ++++- frontends/amiga/sslcert.h | 22 +- frontends/amiga/theme.c | 16 +- frontends/amiga/tree.c | 1474 ------------------ frontends/amiga/tree.h | 48 - frontends/amiga/version.c | 12 +- frontends/atari/Makefile | 14 +- frontends/atari/bitmap.c | 2 +- frontends/atari/cookies.c | 1 + frontends/atari/deskmenu.c | 1 + frontends/atari/download.c | 2 +- frontends/atari/font.c | 2 +- frontends/atari/gemtk/guiwin.c | 94 +- frontends/atari/gemtk/objc.c | 2 + frontends/atari/gui.c | 14 +- frontends/atari/hotlist.c | 16 +- frontends/atari/hotlist.h | 1 - frontends/atari/misc.c | 1 - frontends/atari/plot/font_freetype.c | 7 +- frontends/atari/plot/font_internal.c | 4 +- frontends/atari/plot/fontplot.c | 2 +- frontends/atari/redrawslots.h | 4 +- frontends/atari/rootwin.c | 4 +- frontends/atari/settings.c | 7 +- frontends/atari/toolbar.c | 2 - frontends/atari/treeview.c | 23 +- frontends/beos/Makefile | 20 +- frontends/beos/cookies.cpp | 1 - frontends/beos/fetch_rsrc.cpp | 1 - frontends/beos/font.h | 2 +- frontends/beos/gui.cpp | 29 +- frontends/beos/scaffolding.cpp | 81 +- frontends/beos/scaffolding.h | 2 +- frontends/beos/window.cpp | 3 +- frontends/cocoa/BookmarksController.m | 2 +- frontends/cocoa/FormSelectMenu.m | 2 +- frontends/cocoa/Makefile | 11 +- frontends/cocoa/NetsurfApp.m | 2 +- frontends/cocoa/Tree.h | 2 +- frontends/cocoa/Tree.m | 2 +- desktop/tree.h => frontends/cocoa/desktop-tree.h | 0 desktop/tree.c => frontends/cocoa/desktop-tree.m | 16 +- frontends/cocoa/font.h | 2 +- frontends/cocoa/plotter.h | 2 +- frontends/cocoa/plotter.m | 1 - frontends/framebuffer/Makefile | 4 +- frontends/framebuffer/Makefile.defaults | 2 +- frontends/framebuffer/convert_image.c | 2 +- frontends/framebuffer/fbtk.h | 2 +- frontends/framebuffer/fbtk/user.c | 1 - frontends/framebuffer/font_freetype.c | 12 +- frontends/framebuffer/font_internal.c | 9 +- frontends/gtk/Makefile | 6 +- frontends/gtk/corewindow.c | 27 +- frontends/gtk/gui.c | 2 + frontends/gtk/hotlist.c | 13 +- frontends/gtk/layout_pango.c | 1 + frontends/gtk/plotters.c | 1 - frontends/gtk/toolbar.c | 1 - frontends/gtk/window.c | 3 +- frontends/monkey/layout.c | 2 +- frontends/riscos/Makefile | 17 +- frontends/riscos/configure/con_fonts.c | 2 +- frontends/riscos/cookies.c | 517 ++++--- frontends/riscos/cookies.h | 49 +- frontends/riscos/corewindow.c | 935 ++++++++++++ frontends/riscos/corewindow.h | 139 ++ frontends/riscos/dialog.c | 13 +- frontends/riscos/font.c | 1 + frontends/riscos/font.h | 5 +- frontends/riscos/global_history.c | 534 ++++--- frontends/riscos/global_history.h | 40 +- frontends/riscos/gui.c | 23 +- frontends/riscos/gui.h | 5 - frontends/riscos/gui/button_bar.h | 24 - frontends/riscos/gui/url_bar.c | 5 +- frontends/riscos/gui/url_bar.h | 1 + frontends/riscos/help.c | 8 +- frontends/riscos/hotlist.c | 860 ++++++----- frontends/riscos/hotlist.h | 59 +- frontends/riscos/iconbar.c | 11 +- frontends/riscos/image.h | 2 +- frontends/riscos/menus.c | 1 - frontends/riscos/plotters.c | 1 - frontends/riscos/print.c | 1 - frontends/riscos/save_draw.c | 1 - frontends/riscos/sslcert.c | 496 +++--- frontends/riscos/sslcert.h | 27 +- frontends/riscos/templates/de | 2 +- frontends/riscos/templates/en | 2 +- frontends/riscos/templates/fr | 2 +- frontends/riscos/templates/nl | 2 +- frontends/riscos/theme.c | 2 +- frontends/riscos/toolbar.c | 1 - frontends/riscos/treeview.c | 1277 ---------------- frontends/riscos/treeview.h | 55 - frontends/riscos/url_complete.h | 3 +- frontends/riscos/window.c | 21 +- frontends/windows/Makefile | 29 +- frontends/windows/about.c | 1 - frontends/windows/corewindow.c | 14 +- frontends/windows/drawable.c | 1 - frontends/windows/filetype.c | 1 - frontends/windows/font.c | 27 +- frontends/windows/font.h | 4 +- frontends/windows/gui.c | 1 - frontends/windows/hotlist.c | 15 +- frontends/windows/localhistory.c | 1 - frontends/windows/main.c | 2 + frontends/windows/plot.c | 1 - frontends/windows/pointers.c | 1 - frontends/windows/prefs.c | 1 - frontends/windows/res/installer.nsi | 67 +- frontends/windows/schedule.c | 1 - include/netsurf/clipboard.h | 2 +- include/netsurf/content.h | 2 +- include/netsurf/core_window.h | 24 +- .../amiga/rtg.h => include/netsurf/inttypes.h | 50 +- {desktop => include/netsurf}/plot_style.h | 166 +- include/netsurf/plotters.h | 2 +- desktop/gui_internal.h => include/netsurf/types.h | 24 +- render/box.c | 6 +- render/box_construct.c | 6 +- render/font.c | 1 + render/font.h | 4 +- render/form.c | 13 +- render/html.c | 1 + render/html.h | 5 +- render/html_css_fetcher.c | 10 +- render/imagemap.c | 6 +- render/search.c | 3 +- resources/FatMessages | 9 + test/Makefile | 11 +- test/llcache.c | 1 - utils/http/primitives.c | 2 +- utils/idna.c | 6 +- utils/messages.c | 25 + utils/messages.h | 5 + utils/nsoption.c | 2 +- test-netsurf => utils/test-netsurf | 0 utils/utils.h | 33 +- 241 files changed, 10165 insertions(+), 7349 deletions(-) mode change 100755 => 100644 frontends/amiga/cookies.c mode change 100755 => 100644 frontends/amiga/cookies.h create mode 100644 frontends/amiga/corewindow.c create mode 100644 frontends/amiga/corewindow.h create mode 100644 frontends/amiga/gui_menu.c copy frontends/amiga/{menu.h => gui_menu.h} (63%) mode change 100755 => 100644 mode change 100755 => 100644 frontends/amiga/history.c mode change 100755 => 100644 frontends/amiga/history.h mode change 100755 => 100644 frontends/amiga/hotlist.c mode change 100755 => 100644 frontends/amiga/hotlist.h create mode 100755 frontends/amiga/memory.c create mode 100644 frontends/amiga/memory.h mode change 100755 => 100644 frontends/amiga/menu.h delete mode 100644 frontends/amiga/tree.c delete mode 100755 frontends/amiga/tree.h rename desktop/tree.h => frontends/cocoa/desktop-tree.h (100%) rename desktop/tree.c => frontends/cocoa/desktop-tree.m (97%) create mode 100644 frontends/riscos/corewindow.c create mode 100644 frontends/riscos/corewindow.h delete mode 100644 frontends/riscos/treeview.c delete mode 100644 frontends/riscos/treeview.h copy frontends/amiga/rtg.h => include/netsurf/inttypes.h (51%) rename {desktop => include/netsurf}/plot_style.h (88%) copy desktop/gui_internal.h => include/netsurf/types.h (64%) rename test-netsurf => utils/test-netsurf (100%) diff --git a/!NetSurf/Resources/nl/welcome.html,faf b/!NetSurf/Resources/nl/welcome.html,faf index f35260b..aec47e7 100644 --- a/!NetSurf/Resources/nl/welcome.html,faf +++ b/!NetSurf/Resources/nl/welcome.html,faf @@ -3,7 +3,6 @@ <head> <title>Welkom bij NetSurf</title> <style type="text/css">html,body{margin:0;padding:0;}body{color:#000;background:#fff;font-family:sans-serif;margin:0 auto;}a:link{text-decoration:underline;color:#00f;}a:visited{text-decoration:underline;color:#60a;}a:hover{text-decoration:none;}a:active{text-decoration:underline;color:#f00;}.banner{margin:0;padding:0;background:#94adff;text-align:left;}.banner img{border:none;color:#000;height:86px;width:308px;display:block;}.onlycontent{margin:0 1em;}.nslinks{display:table;width:100%;margin:0;border-spacing:0;padding:0;background:#ccd8ff;font-size:88%;}.nslinks li{display:table-cell;text-align:center;padding:0.2em 0.3em 0.3em;vertical-align:middle;}.nslinks li+li{border-left:2px solid #b1c3ff;}.version{padding:0;margin:1.2em auto 0;width:90%;color:#444;font-size:160%;}.intro{width: 90%;margin:1em auto;color:#666;}.websearch{margin:1.5em auto;padding:1.2em 0.3em;background:#d8e2ff;border:2px solid #c5d3ff;width:80%;text-align:center;}input[type=text]{border:2px solid #b6c7ff;background:#f9faff;color:#000;margin:2px;}input[type=submit]{border:2px outset #cedaff;color:#000;background:#cedaff;margin:2px;}.links{display:table;width:80%;margin:0 auto 3em;font-size:94%;}.links p{display:table-cell;}.links ul{padding-left:0.8em;margin-top:-1em;}.links ul+ul{padding-left:1em;}.footer{font-style:italic;color:#666;text-align:right;}.footer p{margin-top:1.5em;padding-top:0.4em;border-top:2px solid #94adff;}</style> -<link rel="icon" type="image/png" href="http://www.netsurf-browser.org/webimages/favicon.png"> </head> <body> diff --git a/.gitignore b/.gitignore index b16d6f9..35de191 100644 --- a/.gitignore +++ b/.gitignore @@ -16,10 +16,6 @@ frontends/gtk/res/fr/Messages frontends/gtk/res/de/Messages frontends/gtk/res/nl/Messages frontends/gtk/res/it/Messages -test/nsoption -test/nsurl -test/urldbtest -test/llcache codedocs nsgtk nsfb @@ -34,4 +30,4 @@ NetSurf.dmg NetSurf core nsfb-* -build-* +build diff --git a/Docs/core-window-interface b/Docs/core-window-interface index 0267f37..3dfbcaf 100644 --- a/Docs/core-window-interface +++ b/Docs/core-window-interface @@ -259,7 +259,7 @@ frontends/example/corewindow.c #include "utils/utf8.h" #include "netsurf/keypress.h" #include "netsurf/mouse.h" -#include "desktop/plot_style.h" +#include "netsurf/plot_style.h" /* extremely likely there will be additional headers required in a real frontend */ #include "example/corewindow.h" diff --git a/Docs/source-object-backing-store b/Docs/source-object-backing-store index 5d4d304..0fb3614 100644 --- a/Docs/source-object-backing-store +++ b/Docs/source-object-backing-store @@ -5,30 +5,30 @@ Introduction ------------ The source object cache provides a system to extend the life of source -objects (html files, images etc.) after they are no longer immediately +objects (HTML files, images etc.) after they are no longer immediately being used. Only fetch types where we have well defined rules on caching are considered, in practice this limits us to HTTP(S). The section in RFC2616 [1] on caching specifies these rules. -To futher extend the objects lifetime they can be pushed into a +To further extend the objects lifetime they can be pushed into a backing store where the objects are available for reuse less quickly -than from RAM but faster than retriving from the network again. +than from RAM but faster than retrieving from the network again. The backing store implementation provides a key:value infrastructure -with a simple store, retrive and invalidate interface. +with a simple store, retrieve and invalidate interface. Generic filesystem backing store -------------------------------- Although the backing store interface is fully pluggable a generic implementation based on storing objects on the filesystem in a -heirachy of directories. +hierarchy of directories. -The option to alter the backing store format exists and is controled +The option to alter the backing store format exists and is controlled by a version field. It is implementation defined what happens if a -version mis-match occours. +version mis-match occurs. As the backing store only holds cache data one should not expect a great deal of effort to be expended converting formats (i.e. the cache @@ -37,23 +37,23 @@ may simply be discarded). Layout version 1.1 ------------------ -An object has an identifier value generated from the url (NetSurf -backing stores uses the url as the unique key). The value used is +An object has an identifier value generated from the URL (NetSurf +backing stores uses the URL as the unique key). The value used is obtained using nsurl_hash() which is currently a 32 bit FNV so is directly usable. This identifier is adequate to ensure the collision rate for the -hashed url values (a collision for every 2^16 urls added) is +hashed URL values (a collision for every 2^16 URLs added) is sufficiently low the overhead of returning the wrong object (which -backing stores are permitted to do) is not significat. +backing stores are permitted to do) is not significant. An entry list is maintained which contains all the metadata about a given identifier. This list is limited in length to constrain the -resources necessary to maintain it. It is made persistant to avoid the +resources necessary to maintain it. It is made persistent to avoid the overhead of reconstructing it at initialisation and to keep the data used to improve the eviction decisions. -Each object is stored and retrived directly into the filesystem using +Each object is stored and retrieved directly into the filesystem using a filename generated from a RFC4648 base32 encoding of an address value. The objects address is derived from the identifier by cropping it to a shorter length. @@ -63,7 +63,7 @@ uses storage directly proportional to the size of the address length. The cropping length is stored in the control file with the default values set at compile time. This allows existing backing stores to -continue operating with existing data independantly of new default +continue operating with existing data independently of new default setting. This setting gives some ability to tune the default cache index size to values suitable for a specific host operating system. @@ -88,7 +88,7 @@ Version 1.0 The version 1 layout was identical to the 1.1 except base64url encoding was used, this proved problematic as some systems filesystems -were case insensitive so upper and lower case letetrs collided. +were case insensitive so upper and lower case letters collided. There is no upgrade provision from the previous version simply delete the cache directory. @@ -112,7 +112,7 @@ Each control file table entry is 28 bytes and consists of - signed 64 bit value for last use time - 32bit full url hash allowing for index reconstruction and - addiitonal collision detection. Also the possibility of increasing + additional collision detection. Also the possibility of increasing the ADDRESS_LENGTH although this would require renaming all the existing files in the cache and is not currently implemented. @@ -134,8 +134,8 @@ Address to entry index An entry index is held in RAM that allows looking up the address to map to an entry in the control file. -The index is the only data structure whose size is directly depndant -on the length of the hash specificaly: +The index is the only data structure whose size is directly dependant +on the length of the hash specifically: (2 ^ (ADDRESS_BITS - 3)) * ENTRY_BITS) in bytes @@ -152,9 +152,9 @@ list is limited to 448kilobytes. The typical values for RISC OS would set ADDRESS_BITS to 18. This spreads the entries over 262144 hash values which uses 512 kilobytes for the index. Limiting the hash space like this reduces the -efectiveness of the cache. +effectiveness of the cache. -A small ADDRESS_LENGTH causes a collision (two urls with the same +A small ADDRESS_LENGTH causes a collision (two URLs with the same address) to happen roughly for every 2 ^ (ADDRESS_BITS / 2) = 2 ^ 9 = 512 objects stored. This roughly translates to a cache miss due to collision every ten pages navigated to. @@ -164,7 +164,7 @@ Larger systems In general ENTRY_BITS set to 16 as this limits the store to 65536 objects which given the average size of an object at 8 kilobytes -yeilds half a gigabyte of disc used which is judged to be sufficient. +yields half a gigabyte of disc used which is judged to be sufficient. For larger systems e.g. those using GTK frontend we would most likely select ADDRESS_BITS as 22 resulting in a collision every 2048 objects @@ -176,11 +176,11 @@ Typical values Example 1 ~~~~~~~~~ -For a store with 1034 objects genrated from a random navigation of +For a store with 1034 objects generated from a random navigation of pages linked from the about:welcome page. Metadata total size is 593608 bytes an average of 574 bytes. The -majority of the storage is used to hold the urls and headers. +majority of the storage is used to hold the URLs and headers. Data total size is 9180475 bytes a mean of 8879 bytes 1648726 in the largest 10 entries which if excluded gives 7355 bytes average size diff --git a/Makefile b/Makefile index f616c6d..5f2697f 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,6 @@ HOST := $(shell uname -s) # TODO: Ideally, we want the equivalent of s/[^A-Za-z0-9]/_/g here HOST := $(subst .,_,$(subst -,_,$(subst /,_,$(HOST)))) - ifeq ($(HOST),) HOST := riscos $(warning Build platform determination failed but that's a known problem for RISC OS so we're assuming a native RISC OS build.) @@ -74,7 +73,7 @@ ifeq ($(HOST),beos) TARGET := beos endif ifeq ($(TARGET),haiku) - TARGET := beos + override TARGET := beos endif endif @@ -298,9 +297,12 @@ else CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++) endif + else # All native targets - PKG_CONFIG := pkg-config + + # use native package config + PKG_CONFIG := pkg-config # gtk target processing ifeq ($(TARGET),gtk3) @@ -342,7 +344,7 @@ endif CC := $(CCACHE) $(CC) # Target paths -OBJROOT = build-$(HOST)-$(TARGET)$(SUBTARGET) +OBJROOT = build/$(HOST)-$(TARGET)$(SUBTARGET) DEPROOT := $(OBJROOT)/deps TOOLROOT := $(OBJROOT)/tools @@ -638,7 +640,7 @@ define split_messages $$(MESSAGES_TARGET)/$(1)/Messages.tmp: resources/FatMessages $$(VQ)echo "MSGSPLIT: Language: $(1) Filter: $$(MESSAGES_FILTER)" - $$(Q)mkdir -p $$(MESSAGES_TARGET)/$(1) + $$(Q)$$(MKDIR) -p $$(MESSAGES_TARGET)/$(1) $$(Q)$$(SPLIT_MESSAGES) -l $(1) -p $$(MESSAGES_FILTER) -f messages -o $$@ $$< $$(MESSAGES_TARGET)/$(1)/Messages: $$(MESSAGES_TARGET)/$(1)/Messages.tmp diff --git a/content/backing_store.h b/content/backing_store.h index 4e29511..3a1ae8f 100644 --- a/content/backing_store.h +++ b/content/backing_store.h @@ -38,7 +38,7 @@ enum backing_store_flags { * low level cache backing store operation table * * The low level cache (source objects) has the capability to make - * objects and their metadata (headers etc) persistant by writing to a + * objects and their metadata (headers etc) persistent by writing to a * backing store using these operations. */ struct gui_llcache_table { @@ -46,14 +46,14 @@ struct gui_llcache_table { * Initialise the backing store. * * @param parameters to configure backing store. - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ nserror (*initialise)(const struct llcache_store_parameters *parameters); /** * Finalise the backing store. * - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ nserror (*finalise)(void); @@ -72,16 +72,16 @@ struct gui_llcache_table { * been completely written on return. * * @param[in] url The url is used as the unique primary key for the data. - * @param[in] flags The flags to control how the obejct is stored. + * @param[in] flags The flags to control how the object is stored. * @param[in] data The objects data. * @param[in] datalen The length of the \a data. - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ nserror (*store)(struct nsurl *url, enum backing_store_flags flags, uint8_t *data, const size_t datalen); /** - * Retrive an object from the backing store. + * Retrieve an object from the backing store. * * The backing store will manage its own memory and the * allocations returned in \a data *must* not be altered. @@ -91,10 +91,10 @@ struct gui_llcache_table { * calling the release method. * * @param[in] url The url is used as the unique primary key for the data. - * @param[in] flags The flags to control how the object is retrived. - * @param[out] data The retrived objects data. + * @param[in] flags The flags to control how the object is retrieved. + * @param[out] data The retrieved objects data. * @param[out] datalen The length of the \a data retrieved. - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ nserror (*fetch)(struct nsurl *url, enum backing_store_flags flags, uint8_t **data, size_t *datalen); @@ -104,7 +104,7 @@ struct gui_llcache_table { * * @param url The url is used as the unique primary key to invalidate. * @param[in] flags The flags to control how the object data is released. - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ nserror (*release)(struct nsurl *url, enum backing_store_flags flags); @@ -117,7 +117,7 @@ struct gui_llcache_table { * If the entry had data allocated it will be released. * * @param url The url is used as the unique primary key to invalidate. - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ nserror (*invalidate)(struct nsurl *url); diff --git a/content/content.c b/content/content.c index f650af2..2eb035c 100644 --- a/content/content.c +++ b/content/content.c @@ -21,11 +21,11 @@ * Content handling implementation. */ -#include <inttypes.h> +#include <stdint.h> #include <stdlib.h> #include <nsutils/time.h> -#include "utils/utils.h" +#include "netsurf/inttypes.h" #include "utils/log.h" #include "utils/messages.h" #include "netsurf/browser_window.h" diff --git a/content/fetch.c b/content/fetch.c index 93c7de2..a1542eb 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -46,7 +46,6 @@ #include "utils/log.h" #include "utils/messages.h" #include "utils/nsurl.h" -#include "utils/utils.h" #include "utils/ring.h" #include "netsurf/misc.h" #include "desktop/gui_internal.h" @@ -643,13 +642,6 @@ long fetch_http_code(struct fetch *fetch) return fetch->http_code; } -/* exported interface documented in content/fetch.h */ -bool fetch_get_verifiable(struct fetch *fetch) -{ - assert(fetch); - - return fetch->verifiable; -} /* exported interface documented in content/fetch.h */ struct fetch_multipart_data * diff --git a/content/fetch.h b/content/fetch.h index 51e08cf..5521778 100644 --- a/content/fetch.h +++ b/content/fetch.h @@ -158,13 +158,6 @@ void fetch_change_callback(struct fetch *fetch, fetch_callback callback, void *p */ long fetch_http_code(struct fetch *fetch); -/** - * Determine if a fetch was verifiable - * - * \param fetch Fetch to consider - * \return Verifiable status of fetch - */ -bool fetch_get_verifiable(struct fetch *fetch); /** * Free a linked list of fetch_multipart_data. diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index 66970ef..7d0e40c 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -128,6 +128,28 @@ static char fetch_error_buffer[CURL_ERROR_SIZE]; static char fetch_proxy_userpwd[100]; +/* OpenSSL 1.0.x to 1.1.0 certificate reference counting changed + * LibreSSL declares its OpenSSL version as 2.1 but only supports the old way + */ +#if (defined(LIBRESSL_VERSION_NUMBER) || (OPENSSL_VERSION_NUMBER < 0x1010000fL)) +static int ns_X509_up_ref(X509 *cert) +{ + cert->references++; + return 1; +} + +static void ns_X509_free(X509 *cert) +{ + cert->references--; + if (cert->references == 0) { + X509_free(cert); + } +} +#else +#define ns_X509_up_ref X509_up_ref +#define ns_X509_free X509_free +#endif + /** * Initialise a cURL fetcher. */ @@ -438,7 +460,7 @@ fetch_curl_verify_callback(int verify_ok, X509_STORE_CTX *x509_ctx) */ if (!fetch->cert_data[depth].cert) { fetch->cert_data[depth].cert = X509_STORE_CTX_get_current_cert(x509_ctx); - fetch->cert_data[depth].cert->references++; + ns_X509_up_ref(fetch->cert_data[depth].cert); fetch->cert_data[depth].err = X509_STORE_CTX_get_error(x509_ctx); } @@ -815,10 +837,7 @@ static void fetch_curl_free(void *vf) } for (i = 0; i < MAX_CERTS && f->cert_data[i].cert; i++) { - f->cert_data[i].cert->references--; - if (f->cert_data[i].cert->references == 0) { - X509_free(f->cert_data[i].cert); - } + ns_X509_free(f->cert_data[i].cert); } free(f); @@ -986,10 +1005,7 @@ curl_start_cert_validate(struct curl_fetch_info *f, X509_get_pubkey(certs[depth].cert)); /* and clean up */ - certs[depth].cert->references--; - if (certs[depth].cert->references == 0) { - X509_free(certs[depth].cert); - } + ns_X509_free(certs[depth].cert); } msg.type = FETCH_CERT_ERR; diff --git a/content/fetchers/data.c b/content/fetchers/data.c index d82832a..cb99e6f 100644 --- a/content/fetchers/data.c +++ b/content/fetchers/data.c @@ -25,14 +25,15 @@ #include <string.h> #include <stdlib.h> #include <libwapcaplet/libwapcaplet.h> +#include <nsutils/base64.h> +#include "netsurf/inttypes.h" #include "utils/url.h" #include "utils/nsurl.h" #include "utils/corestrings.h" #include "utils/log.h" #include "utils/utils.h" #include "utils/ring.h" -#include "nsutils/base64.h" #include "content/fetch.h" #include "content/fetchers.h" diff --git a/content/fetchers/file.c b/content/fetchers/file.c index 6ffa638..4fa1a21 100644 --- a/content/fetchers/file.c +++ b/content/fetchers/file.c @@ -44,6 +44,7 @@ #endif #include <libwapcaplet/libwapcaplet.h> +#include "netsurf/inttypes.h" #include "utils/nsurl.h" #include "utils/dirent.h" #include "utils/corestrings.h" diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c index 21ad8c7..b8b4b19 100644 --- a/content/fetchers/resource.c +++ b/content/fetchers/resource.c @@ -29,6 +29,7 @@ #include <stdarg.h> #include <libwapcaplet/libwapcaplet.h> +#include "netsurf/inttypes.h" #include "utils/nsurl.h" #include "utils/corestrings.h" #include "utils/log.h" diff --git a/content/fs_backing_store.c b/content/fs_backing_store.c index 7d8ac4b..bcb97d2 100644 --- a/content/fs_backing_store.c +++ b/content/fs_backing_store.c @@ -27,9 +27,9 @@ * * \todo Implement mmap retrieval where supported. * - * \todo Implement static retrival for metadata objects as their heap + * \todo Implement static retrieval for metadata objects as their heap * lifetime is typically very short, though this may be obsoleted - * by a small object storage stratagy. + * by a small object storage strategy. * */ @@ -43,11 +43,11 @@ #include <stdlib.h> #include <nsutils/unistd.h> +#include "netsurf/inttypes.h" #include "utils/filepath.h" #include "utils/file.h" #include "utils/nsurl.h" #include "utils/log.h" -#include "utils/utils.h" #include "utils/messages.h" #include "desktop/gui_internal.h" #include "netsurf/misc.h" @@ -63,7 +63,7 @@ /** Backing store file format version */ #define CONTROL_VERSION 130 -/** Number of milliseconds after a update before control data maintinance is performed */ +/** Number of milliseconds after a update before control data maintenance is performed */ #define CONTROL_MAINT_TIME 10000 /** Get address from ident */ @@ -100,7 +100,7 @@ #define BLOCK_USE_MAP_SIZE (1 << (BLOCK_ENTRY_COUNT - 3)) /** - * The type used to store index values refering to store entries. Care + * The type used to store index values referring to store entries. Care * must be taken with this type as it is used to build address to * entry mapping so changing the size will have large impacts on * memory usage. @@ -109,7 +109,7 @@ typedef uint16_t entry_index_t; /** * The type used as a binary identifier for each entry derived from - * the url. A larger identifier will have fewer collisions but + * the URL. A larger identifier will have fewer collisions but * requires proportionately more storage. */ typedef uint32_t entry_ident_t; @@ -184,7 +184,7 @@ struct store_entry_element { * @note Order is important to avoid excessive structure packing overhead. */ struct store_entry { - int64_t last_used; /**< unix time the entry was last used */ + int64_t last_used; /**< UNIX time the entry was last used */ entry_ident_t ident; /**< entry identifier */ uint16_t use_count; /**< number of times this entry has been accessed */ uint8_t flags; /**< entry flags */ @@ -227,7 +227,7 @@ struct store_state { unsigned int entry_bits; /**< log2 number of bits in entry index. */ unsigned int last_entry; /**< index of last usable entry. */ - /** flag indicating if the entries have been made persistant + /** flag indicating if the entries have been made persistent * since they were last changed. */ bool entries_dirty; @@ -235,9 +235,9 @@ struct store_state { /** * URL identifier to entry index mapping. * - * This is an open coded index on the entries url field and - * provides a computationaly inexpensive way to go from the - * url to an entry. + * This is an open coded index on the entries URL field and + * provides a computationally inexpensive way to go from the + * URL to an entry. */ entry_index_t *addrmap; @@ -246,12 +246,12 @@ struct store_state { struct block_file blocks[ENTRY_ELEM_COUNT][BLOCK_FILE_COUNT]; /** flag indicating if the block file use maps have been made - * persistant since they were last changed. + * persistent since they were last changed. */ bool blocks_dirty; /** flag indicating if a block file has been opened for update - * since maintinance was previously done. + * since maintenance was previously done. */ bool blocks_opened; @@ -283,8 +283,8 @@ struct store_state *storestate; * * @param[in] state The store state to use. * @param[in, out] bse Pointer to the entry to be removed. - * @return NSERROR_OK and \a bse updated on succes or NSERROR_NOT_FOUND - * if no entry coresponds to the url. + * @return NSERROR_OK and \a bse updated on success or NSERROR_NOT_FOUND + * if no entry corresponds to the URL. */ static nserror remove_store_entry(struct store_state *state, struct store_entry **bse) @@ -460,7 +460,7 @@ store_fname(struct store_state *state, * @param state The store state to use. * @param bse The entry to invalidate. * @param elem_idx The element index to invalidate. - * @return NSERROR_OK on sucess or error code on failure. + * @return NSERROR_OK on success or error code on failure. */ static nserror invalidate_element(struct store_state *state, @@ -500,7 +500,7 @@ invalidate_element(struct store_state *state, * * @param state The store state to use. * @param bse The entry to invalidate. - * @return NSERROR_OK on sucess or error code on failure. + * @return NSERROR_OK on success or error code on failure. */ static nserror invalidate_entry(struct store_state *state, struct store_entry *bse) @@ -554,7 +554,7 @@ static int compar(const void *va, const void *vb) const struct store_entry *b = &BS_ENTRY(*(entry_ident_t *)vb, storestate); /* consider the allocation flags - if an entry has an - * allocation it is considered more valuble as it cannot be + * allocation it is considered more valuable as it cannot be * freed. */ if ((a->elem[ENTRY_ELEM_DATA].flags == ENTRY_ELEM_FLAG_NONE) && @@ -620,7 +620,7 @@ static nserror store_evict(struct store_state *state) return NSERROR_OK; } - LOG("Evicting entries to reduce %"PRIu64" by %zd", + LOG("Evicting entries to reduce %"PRIu64" by %"PRIsizet, state->total_alloc, state->hysteresis); /* allocate storage for the list */ @@ -658,7 +658,7 @@ static nserror store_evict(struct store_state *state) free(elist); - LOG("removed %zd in %d entries", removed, ent); + LOG("removed %"PRIsizet" in %d entries", removed, ent); return ret; } @@ -670,7 +670,7 @@ static nserror store_evict(struct store_state *state) * Serialise entry index out to storage. * * @param state The backing store state to serialise. - * @return NSERROR_OK on sucess or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror write_entries(struct store_state *state) { @@ -735,7 +735,7 @@ static nserror write_entries(struct store_state *state) * Serialise block file use map out to storage. * * \param state The backing store state to serialise. - * \return NSERROR_OK on sucess or error code on faliure. + * \return NSERROR_OK on success or error code on failure. */ static nserror write_blocks(struct store_state *state) { @@ -812,11 +812,11 @@ wr_err: * Ensures block files are of the correct extent * * block files have their extent set to their maximum size to ensure - * subsequent reads and writes do not need to extend teh file and are + * subsequent reads and writes do not need to extend the file and are * therefore faster. * * \param state The backing store state to set block extent for. - * \return NSERROR_OK on sucess or error code on faliure. + * \return NSERROR_OK on success or error code on failure. */ static nserror set_block_extents(struct store_state *state) { @@ -849,7 +849,7 @@ static nserror set_block_extents(struct store_state *state) } /** - * maintinance of control structures. + * maintenance of control structures. * * callback scheduled when control data has been update. Currently * this is for when the entries table is dirty and requires @@ -959,7 +959,7 @@ static block_index_t alloc_block(struct store_state *state, int elem_idx) * @param datalen The length of data in \a data * @param bse Pointer used to return value. * @return NSERROR_OK and \a bse updated on success or NSERROR_NOT_FOUND - * if no entry coresponds to the url. + * if no entry corresponds to the url. */ static nserror set_store_entry(struct store_state *state, @@ -1045,12 +1045,12 @@ set_store_entry(struct store_state *state, elem->size = datalen; state->total_alloc += elem->size; - /* if the elemnt will fit in a small block attempt to allocate one */ + /* if the element will fit in a small block attempt to allocate one */ if (elem->size <= (1U << log2_block_size[elem_idx])) { elem->block = alloc_block(state, elem_idx); } - /* ensure control maintinance scheduled. */ + /* ensure control maintenance scheduled. */ state->entries_dirty = true; guit->misc->schedule(CONTROL_MAINT_TIME, control_maintinance, state); @@ -1118,7 +1118,7 @@ store_open(struct store_state *state, * we also compute the total storage in use. * * @param state The backing store global state. - * @return NSERROR_OK on sucess or NSERROR_NOMEM if the map storage + * @return NSERROR_OK on success or NSERROR_NOMEM if the map storage * could not be allocated. */ static nserror @@ -1163,7 +1163,7 @@ build_entrymap(struct store_state *state) * Unlink entries file * * @param state The backing store state. - * @return NSERROR_OK on sucess or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror unlink_entries(struct store_state *state) @@ -1186,7 +1186,7 @@ unlink_entries(struct store_state *state) * Read description entries into memory. * * @param state The backing store state to put the loaded entries in. - * @return NSERROR_OK on sucess or error code on faliure. + * @return NSERROR_OK on success or error code on faliure. */ static nserror read_entries(struct store_state *state) @@ -1204,7 +1204,7 @@ read_entries(struct store_state *state) entries_size = (1 << state->entry_bits) * sizeof(struct store_entry); - LOG("Allocating %zd bytes for max of %d entries of %ld length elements %ld length", + LOG("Allocating %"PRIsizet" bytes for max of %d entries of %ld length elements %ld length", entries_size, 1 << state->entry_bits, sizeof(struct store_entry), sizeof(struct store_entry_element)); @@ -1236,7 +1236,7 @@ read_entries(struct store_state *state) * Read block file usage bitmaps. * * @param state The backing store state to put the loaded entries in. - * @return NSERROR_OK on sucess or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror read_blocks(struct store_state *state) @@ -1275,7 +1275,7 @@ read_blocks(struct store_state *state) } else { LOG("Initialising block use map to defaults"); - /* ensure block 0 (invalid sentinal) is skipped */ + /* ensure block 0 (invalid sentinel) is skipped */ state->blocks[ENTRY_ELEM_DATA][0].use_map[0] = 1; state->blocks[ENTRY_ELEM_META][0].use_map[0] = 1; } @@ -1293,7 +1293,7 @@ read_blocks(struct store_state *state) * Write the cache tag file. * * @param state The cache state. - * @return NSERROR_OK on sucess or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror write_cache_tag(struct store_state *state) @@ -1330,7 +1330,7 @@ write_cache_tag(struct store_state *state) * Write the control file for the current state. * * @param state The state to write to the control file. - * @return NSERROR_OK on sucess or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror write_control(struct store_state *state) @@ -1375,7 +1375,7 @@ write_control(struct store_state *state) * Read and parse the control file. * * @param state The state to read from the control file. - * @return NSERROR_OK on sucess or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror read_control(struct store_state *state) @@ -1461,7 +1461,7 @@ control_error: /* problem with the control file */ * Initialise the backing store. * * @param parameters to configure backing store. - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror initialise(const struct llcache_store_parameters *parameters) @@ -1560,13 +1560,13 @@ initialise(const struct llcache_store_parameters *parameters) LOG("FS backing store init successful"); - LOG("path:%s limit:%zd hyst:%zd addr:%d entries:%d", + LOG("path:%s limit:%"PRIsizet" hyst:%"PRIsizet" addr:%d entries:%d", newstate->path, newstate->limit, newstate->hysteresis, newstate->ident_bits, newstate->entry_bits); - LOG("Using %"PRIu64"/%zd", newstate->total_alloc, newstate->limit); + LOG("Using %"PRIu64"/%"PRIsizet, newstate->total_alloc, newstate->limit); return NSERROR_OK; } @@ -1605,7 +1605,7 @@ finalise(void) /* avoid division by zero */ if (op_count > 0) { - LOG("Cache total/hit/miss/fail (counts) %d/%zd/%zd/%d (100%%/%zd%%/%zd%%/%d%%)", + LOG("Cache total/hit/miss/fail (counts) %d/%"PRIsizet"/%"PRIsizet"/%d (100%%/%"PRIsizet"%%/%"PRIsizet"%%/%d%%)", op_count, storestate->hit_count, storestate->miss_count, @@ -1661,7 +1661,7 @@ static nserror store_write_block(struct store_state *state, bse->elem[elem_idx].size, offst); if (wr != (ssize_t)bse->elem[elem_idx].size) { - LOG("Write failed %zd of %d bytes from %p at 0x%jx block %d errno %d", + LOG("Write failed %"PRIssizet" of %d bytes from %p at 0x%jx block %d errno %d", wr, bse->elem[elem_idx].size, bse->elem[elem_idx].data, @@ -1671,7 +1671,7 @@ static nserror store_write_block(struct store_state *state, return NSERROR_SAVE_FAILED; } - LOG("Wrote %zd bytes from %p at 0x%jx block %d", + LOG("Wrote %"PRIssizet" bytes from %p at 0x%jx block %d", wr, bse->elem[elem_idx].data, (uintmax_t)offst, @@ -1708,7 +1708,7 @@ static nserror store_write_file(struct store_state *state, close(fd); if (wr != (ssize_t)bse->elem[elem_idx].size) { - LOG("Write failed %zd of %d bytes from %p errno %d", + LOG("Write failed %"PRIssizet" of %d bytes from %p errno %d", wr, bse->elem[elem_idx].size, bse->elem[elem_idx].data, @@ -1718,7 +1718,7 @@ static nserror store_write_file(struct store_state *state, return NSERROR_SAVE_FAILED; } - LOG("Wrote %zd bytes from %p", wr, bse->elem[elem_idx].data); + LOG("Wrote %"PRIssizet" bytes from %p", wr, bse->elem[elem_idx].data); return NSERROR_OK; } @@ -1732,7 +1732,7 @@ static nserror store_write_file(struct store_state *state, * @param bsflags The flags to control how the object is stored. * @param data The objects source data. * @param datalen The length of the \a data. - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror store(nsurl *url, @@ -1829,7 +1829,7 @@ static nserror store_read_block(struct store_state *state, bse->elem[elem_idx].size, offst); if (rd != (ssize_t)bse->elem[elem_idx].size) { - LOG("Failed reading %zd of %d bytes into %p from 0x%jx block %d errno %d", + LOG("Failed reading %"PRIssizet" of %d bytes into %p from 0x%jx block %d errno %d", rd, bse->elem[elem_idx].size, bse->elem[elem_idx].data, @@ -1839,7 +1839,7 @@ static nserror store_read_block(struct store_state *state, return NSERROR_SAVE_FAILED; } - LOG("Read %zd bytes into %p from 0x%jx block %d", + LOG("Read %"PRIssizet" bytes into %p from 0x%jx block %d", rd, bse->elem[elem_idx].data, (uintmax_t)offst, @@ -1878,7 +1878,8 @@ static nserror store_read_file(struct store_state *state, bse->elem[elem_idx].data + tot, bse->elem[elem_idx].size - tot); if (rd <= 0) { - LOG("read error returned %zd errno %d", rd, errno); + LOG("read error returned %"PRIssizet" errno %d", + rd, errno); ret = NSERROR_NOT_FOUND; break; } @@ -1887,19 +1888,19 @@ static nserror store_read_file(struct store_state *state, close(fd); - LOG("Read %zd bytes into %p", tot, bse->elem[elem_idx].data); + LOG("Read %"PRIsizet" bytes into %p", tot, bse->elem[elem_idx].data); return ret; } /** - * Retrive an object from the backing store. + * Retrieve an object from the backing store. * * @param[in] url The url is used as the unique primary key for the data. * @param[in] bsflags The flags to control how the object is retrieved. * @param[out] data_out The objects data. * @param[out] datalen_out The length of the \a data retrieved. - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror fetch(nsurl *url, @@ -1926,7 +1927,7 @@ fetch(nsurl *url, } storestate->hit_count++; - LOG("retriving cache data for url:%s", nsurl_access(url)); + LOG("retrieving cache data for url:%s", nsurl_access(url)); /* calculate the entry element index */ if ((bsflags & BACKING_STORE_META) != 0) { @@ -1984,7 +1985,7 @@ fetch(nsurl *url, * * @param[in] url The url is used as the unique primary key to invalidate. * @param[in] bsflags The flags to control how the object data is released. - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror release(nsurl *url, enum backing_store_flags bsflags) { @@ -2032,7 +2033,7 @@ static nserror release(nsurl *url, enum backing_store_flags bsflags) * be returned as a result to the fetch or meta operations. * * @param url The url is used as the unique primary key to invalidate. - * @return NSERROR_OK on success or error code on faliure. + * @return NSERROR_OK on success or error code on failure. */ static nserror invalidate(nsurl *url) diff --git a/content/handlers/css/hints.h b/content/handlers/css/hints.h index 2c18359..3d44d21 100644 --- a/content/handlers/css/hints.h +++ b/content/handlers/css/hints.h @@ -31,8 +31,8 @@ void css_hint_fini(void); * * \param[in] pw HTML document * \param[in] node DOM node - * \param[out] nhints number of hints retrived - * \param[out] hints retrived hints + * \param[out] nhints number of hints retrieved + * \param[out] hints retrieved hints * \return CSS_OK on success, * CSS_PROPERTY_NOT_SET if there is no hint for the requested property, * CSS_NOMEM on memory exhaustion. diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c index aaede77..daa3b40 100644 --- a/content/handlers/css/select.c +++ b/content/handlers/css/select.c @@ -24,6 +24,7 @@ #include "utils/corestrings.h" #include "utils/log.h" #include "utils/nsurl.h" +#include "netsurf/plot_style.h" #include "netsurf/url_db.h" #include "desktop/system_colour.h" diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c index 3eb27ac..02107f7 100644 --- a/content/handlers/image/image_cache.c +++ b/content/handlers/image/image_cache.c @@ -16,13 +16,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +/** + * \file + * Cache implementation for bitmap images decoded into frontend format. + */ + #include <assert.h> -#include <inttypes.h> #include <stdint.h> #include <stdbool.h> #include <string.h> #include <stdlib.h> +#include "netsurf/inttypes.h" #include "utils/utils.h" #include "utils/log.h" #include "netsurf/misc.h" @@ -34,22 +39,26 @@ #include "image/image_cache.h" #include "image/image.h" -/** Age of an entry within the cache +/** + * Age of an entry within the cache * * type deffed away so it can be readily changed later perhaps to a * wallclock time structure. */ typedef unsigned int cache_age; -/** Image cache entry +/** + * Image cache entry */ struct image_cache_entry_s { - struct image_cache_entry_s *next; /* next cache entry in list */ - struct image_cache_entry_s *prev; /* previous cache entry in list */ - - struct content *content; /** content is used as a key */ - struct bitmap *bitmap; /** associated bitmap entry */ - /** Conversion routine */ + struct image_cache_entry_s *next; /**< next cache entry in list */ + struct image_cache_entry_s *prev; /**< previous cache entry in list */ + + /** content is used as a key */ + struct content *content; + /** associated bitmap entry */ + struct bitmap *bitmap; + /** routine to convert content into bitmap */ image_cache_convert_fn *convert; /* Statistics for replacement algorithm */ @@ -62,7 +71,8 @@ struct image_cache_entry_s { int conversion_count; /**< Number of times image has been converted */ }; -/** Current state of the cache. +/** + * Current state of the cache. * * Global state of the cache. entries "age" is determined based on a * monotonically incrementing operation count. This avoids issues with @@ -90,12 +100,12 @@ struct image_cache_s { /** Maximum size of bitmaps allocated at any one time */ size_t max_bitmap_size; - /** The number of objects when maximum bitmap usage occoured */ + /** The number of objects when maximum bitmap usage occurred */ int max_bitmap_size_count; /** Maximum count of bitmaps allocated at any one time */ int max_bitmap_count; - /** The size of the bitmaps when the max count occoured */ + /** The size of the bitmaps when the max count occurred */ size_t max_bitmap_count_size; /** Bitmap was not available at plot time required conversion */ @@ -130,7 +140,11 @@ struct image_cache_s { static struct image_cache_s *image_cache = NULL; -/** Find the nth cache entry +/** + * Find a cache entry by index. + * + * \param entryn index of cache entry + * \return cache entry at index or NULL if not found. */ static struct image_cache_entry_s *image_cache__findn(int entryn) { @@ -144,7 +158,12 @@ static struct image_cache_entry_s *image_cache__findn(int entryn) return found; } -/** Find the cache entry for a content + +/** + * Find the cache entry for a content + * + * \param c The content to get an entry for + * \return The image cache entry or NULL if not found. */ static struct image_cache_entry_s *image_cache__find(const struct content *c) { @@ -157,6 +176,11 @@ static struct image_cache_entry_s *image_cache__find(const struct content *c) return found; } +/** + * Update the image cache statistics with an entry. + * + * \param centry The image cache entry to update the stats with. + */ static void image_cache_stats_bitmap_add(struct image_cache_entry_s *centry) { centry->bitmap_age = image_cache->current_age; @@ -223,11 +247,20 @@ static void image_cache__unlink(struct image_cache_entry_s *centry) } } +/** + * free bitmap from an image cache entry + * + * \param centry The image cache entry to free bitmap from. + */ static void image_cache__free_bitmap(struct image_cache_entry_s *centry) { if (centry->bitmap != NULL) { #ifdef IMAGE_CACHE_VERBOSE - LOG("Freeing bitmap %p size %d age %d redraw count %d", centry->bitmap, centry->bitmap_size, image_cache->current_age - centry->bitmap_age, centry->redraw_count); + LOG("Freeing bitmap %p size %d age %d redraw count %d", + centry->bitmap, + centry->bitmap_size, + image_cache->current_age - centry->bitmap_age, + centry->redraw_count); #endif guit->bitmap->destroy(centry->bitmap); centry->bitmap = NULL; @@ -240,7 +273,11 @@ static void image_cache__free_bitmap(struct image_cache_entry_s *centry) } -/* free cache entry */ +/** + * free image cache entry + * + * \param centry The image cache entry to free. + */ static void image_cache__free_entry(struct image_cache_entry_s *centry) { #ifdef IMAGE_CACHE_VERBOSE @@ -258,7 +295,11 @@ static void image_cache__free_entry(struct image_cache_entry_s *centry) free(centry); } -/** Cache cleaner */ +/** + * Image cache cleaner + * + * \param icache The image cache context. + */ static void image_cache__clean(struct image_cache_s *icache) { struct image_cache_entry_s *centry = icache->entries; @@ -277,7 +318,11 @@ static void image_cache__clean(struct image_cache_s *icache) } } -/** Cache background scheduled callback. */ +/** + * Cache background scheduled callback. + * + * \param p The image cache context. + */ static void image_cache__background_update(void *p) { struct image_cache_s *icache = p; @@ -377,7 +422,7 @@ image_cache_init(const struct image_cache_parameters *image_cache_parameters) image_cache__background_update, image_cache); - LOG("Image cache initilised with a limit of %" PRIsizet " hysteresis of %"PRIsizet, + LOG("Image cache initialised with a limit of %" PRIsizet " hysteresis of %"PRIsizet, image_cache->params.limit, image_cache->params.hysteresis); return NSERROR_OK; @@ -678,7 +723,7 @@ int image_cache_snentryf(char *string, size_t size, unsigned int entryn, case 'U': slen += snprintf(string + slen, size - slen, - "%s", nsurl_access(llcache_handle_get_url(centry->content->llcache))); + "%s", nsurl_access(llcache_handle_get_url(centry->content->llcache))); break; case 'o': @@ -690,20 +735,20 @@ int image_cache_snentryf(char *string, size_t size, unsigned int entryn, centry->content-> llcache), NSURL_HOST); - + slen += snprintf(string + slen, size - slen, "%s", - lwc_string_data( - origin)); + lwc_string_data( + origin)); lwc_string_unref(origin); } else { slen += snprintf(string + slen, size - slen, "%s", - "localhost"); + "localhost"); } break; - + case 's': if (centry->bitmap != NULL) { slen += snprintf(string + slen, @@ -774,6 +819,7 @@ bool image_cache_redraw(struct content *c, return image_bitmap_plot(centry->bitmap, data, clip, ctx); } +/* exported interface documented in image_cache.h */ void image_cache_destroy(struct content *content) { struct image_cache_entry_s *centry; @@ -787,11 +833,13 @@ void image_cache_destroy(struct content *content) } } +/* exported interface documented in image_cache.h */ void *image_cache_get_internal(const struct content *c, void *context) { return image_cache_get_bitmap(c); } +/* exported interface documented in image_cache.h */ content_type image_cache_content_type(void) { return CONTENT_IMAGE; diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c index 93185c1..0baf411 100644 --- a/content/handlers/image/png.c +++ b/content/handlers/image/png.c @@ -22,6 +22,7 @@ #include <stdlib.h> #include <png.h> +#include "netsurf/inttypes.h" #include "utils/utils.h" #include "utils/log.h" #include "utils/messages.h" diff --git a/content/handlers/javascript/duktape/Makefile b/content/handlers/javascript/duktape/Makefile index 89f83b1..fce79de 100644 --- a/content/handlers/javascript/duktape/Makefile +++ b/content/handlers/javascript/duktape/Makefile @@ -12,14 +12,13 @@ BINDINGS := $(wildcard content/handlers/javascript/duktape/*.bnd) GBFLAGS+=-D $(OBJROOT)/duktape/binding.h $(OBJROOT)/duktape/Makefile: content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS) - $(Q)mkdir -p $(OBJROOT)/duktape + $(Q)$(MKDIR) -p $(OBJROOT)/duktape $(VQ)echo " GENBIND: $<" $(Q)nsgenbind $(GBFLAGS) -I content/handlers/javascript/WebIDL $< $(OBJROOT)/duktape - $(VQ)echo " GENBIND: completed" # create unimplemented report for doxygen Docs/UnimplementedJavascript.txt: content/handlers/javascript/duktape/netsurf.bnd $(BINDINGS) - $(Q)mkdir -p $(OBJROOT)/duktape + $(Q)$(MKDIR) -p $(OBJROOT)/duktape $(VQ)echo "/** \page unimplemented Unimplemented javascript bindings" > $@ $(VQ)echo "This is a list of all the binding methods, getters and setters without an implementation in a binding." >> $@ $(VQ)echo "" >> $@ diff --git a/content/handlers/javascript/duktape/duk_config.h b/content/handlers/javascript/duktape/duk_config.h index c336603..f9c95ae 100644 --- a/content/handlers/javascript/duktape/duk_config.h +++ b/content/handlers/javascript/duktape/duk_config.h @@ -1,8 +1,8 @@ /* * duk_config.h configuration header generated by genconfig.py. * - * Git commit: 2cc76e9ff1f64869e1146ad7317d8cbe33bbd27e - * Git describe: v1.5.1 + * Git commit: 17e3d86cf8b4788bd0d37658f833ab440ce43a1c + * Git describe: v1.6.0 * Git branch: HEAD * * Supported platforms: diff --git a/content/handlers/javascript/duktape/dukky.c b/content/handlers/javascript/duktape/dukky.c index 7dd3bd7..1282ad9 100644 --- a/content/handlers/javascript/duktape/dukky.c +++ b/content/handlers/javascript/duktape/dukky.c @@ -23,16 +23,15 @@ * Duktapeish implementation of javascript engine functions. */ -#include <inttypes.h> - +#include <stdint.h> #include <nsutils/time.h> -#include "content/content.h" - +#include "netsurf/inttypes.h" #include "utils/utils.h" #include "utils/nsoption.h" #include "utils/log.h" #include "utils/corestrings.h" +#include "content/content.h" #include "javascript/js.h" #include "javascript/content.h" diff --git a/content/handlers/javascript/duktape/duktape.c b/content/handlers/javascript/duktape/duktape.c index e1867c0..b64383b 100644 --- a/content/handlers/javascript/duktape/duktape.c +++ b/content/handlers/javascript/duktape/duktape.c @@ -1,9 +1,9 @@ /* Omit from static analysis. */ #ifndef __clang_analyzer__ /* - * Single source autogenerated distributable for Duktape 1.5.1. + * Single source autogenerated distributable for Duktape 1.6.0. * - * Git commit 2cc76e9ff1f64869e1146ad7317d8cbe33bbd27e (v1.5.1). + * Git commit 17e3d86cf8b4788bd0d37658f833ab440ce43a1c (v1.6.0). * Git branch HEAD. * * See Duktape AUTHORS.rst and LICENSE.txt for copyright and @@ -1631,9 +1631,9 @@ DUK_INTERNAL_DECL const duk_c_function duk_bi_native_functions[149]; #endif /* !DUK_SINGLE_FILE */ #if defined(DUK_USE_BUILTIN_INITJS) #if !defined(DUK_SINGLE_FILE) -DUK_INTERNAL_DECL const duk_uint8_t duk_initjs_data[187]; +DUK_INTERNAL_DECL const duk_uint8_t duk_initjs_data[204]; #endif /* !DUK_SINGLE_FILE */ -#define DUK_BUILTIN_INITJS_DATA_LENGTH 187 +#define DUK_BUILTIN_INITJS_DATA_LENGTH 204 #endif /* DUK_USE_BUILTIN_INITJS */ #define DUK_BIDX_GLOBAL 0 #define DUK_BIDX_GLOBAL_ENV 1 @@ -9221,7 +9221,7 @@ DUK_INTERNAL const duk_c_function duk_bi_native_functions[149] = { duk_bi_typedarray_set, }; #if defined(DUK_USE_BUILTIN_INITJS) -DUK_INTERNAL const duk_uint8_t duk_initjs_data[187] = { +DUK_INTERNAL const duk_uint8_t duk_initjs_data[204] = { 40,102,117,110,99,116,105,111,110,40,100,44,97,41,123,102,117,110,99,116, 105,111,110,32,98,40,97,44,98,44,99,41,123,79,98,106,101,99,116,46,100,101, 102,105,110,101,80,114,111,112,101,114,116,121,40,97,44,98,44,123,118,97, @@ -9229,8 +9229,9 @@ DUK_INTERNAL const duk_uint8_t duk_initjs_data[187] = { 109,101,114,97,98,108,101,58,33,49,44,99,111,110,102,105,103,117,114,97,98, 108,101,58,33,48,125,41,125,98,40,97,46,76,111,103,103,101,114,44,34,99, 108,111,103,34,44,110,101,119,32,97,46,76,111,103,103,101,114,40,34,67,34, -41,41,59,98,40,97,44,34,109,111,100,76,111,97,100,101,100,34,44,123,125,41, -125,41,40,116,104,105,115,44,68,117,107,116,97,112,101,41,59,10,0, +41,41,59,98,40,97,44,34,109,111,100,76,111,97,100,101,100,34,44,79,98,106, +101,99,116,46,99,114,101,97,116,101,40,110,117,108,108,41,41,125,41,40,116, +104,105,115,44,68,117,107,116,97,112,101,41,59,10,0, }; #endif /* DUK_USE_BUILTIN_INITJS */ #if defined(DUK_USE_DOUBLE_LE) @@ -9354,7 +9355,7 @@ DUK_INTERNAL const duk_uint8_t duk_builtins_data[3833] = { 88,119,100,223,181,68,16,94,91,250,238,200,160,80,0,152,31,61,59,148,10,0, 21,4,231,199,151,69,2,128,5,192,250,97,220,160,80,0,192,127,255,128,20,23, 134,30,92,242,164,34,19,207,167,45,59,179,233,205,229,37,129,127,255,0,0, -191,255,128,0,63,255,197,131,246,203,203,158,157,251,160,0,0,0,0,64,65,98, +191,255,128,0,63,255,197,131,246,203,203,158,157,251,160,0,0,0,0,0,90,98, 32,3,166,156,30,53,32,249,165,131,76,223,159,62,94,70,172,114,16,176,144, 60,56,250,19,18,5,159,25,89,32,121,180,238,42,30,129,229,221,140,164,122,7, 147,46,50,129,232,62,61,251,120,97,199,208,156,129,83,127,0,50,250,69,3, @@ -9534,7 +9535,7 @@ DUK_INTERNAL const duk_uint8_t duk_builtins_data[3833] = { 88,119,100,223,181,68,16,94,91,250,238,200,160,80,0,152,31,61,59,148,10,0, 21,4,231,199,151,69,2,128,5,192,250,97,220,160,80,0,192,127,255,128,20,23, 134,30,92,242,164,34,19,207,167,45,59,179,233,205,229,37,129,127,255,0,0, -191,255,128,0,63,255,197,131,246,203,203,158,157,251,160,32,98,65,64,0,0,0, +191,255,128,0,63,255,197,131,246,203,203,158,157,251,160,32,98,90,0,0,0,0, 0,3,166,156,30,53,32,249,165,131,76,223,159,62,94,70,172,114,16,176,144,60, 56,250,19,18,5,159,25,89,32,121,180,238,42,30,129,229,221,140,164,122,7, 147,46,50,129,232,62,61,251,120,97,199,208,156,129,83,127,0,50,250,69,3, @@ -9714,7 +9715,7 @@ DUK_INTERNAL const duk_uint8_t duk_builtins_data[3833] = { 88,119,100,223,181,68,16,94,91,250,238,200,160,80,0,152,31,61,59,148,10,0, 21,4,231,199,151,69,2,128,5,192,250,97,220,160,80,0,192,127,255,128,20,23, 134,30,92,242,164,34,19,207,167,45,59,179,233,205,229,37,129,127,255,0,0, -191,255,128,0,63,255,197,131,246,203,203,158,157,251,160,64,65,98,32,0,0,0, +191,255,128,0,63,255,197,131,246,203,203,158,157,251,160,0,90,98,32,0,0,0, 0,3,166,156,30,53,32,249,165,131,76,223,159,62,94,70,172,114,16,176,144,60, 56,250,19,18,5,159,25,89,32,121,180,238,42,30,129,229,221,140,164,122,7, 147,46,50,129,232,62,61,251,120,97,199,208,156,129,83,127,0,50,250,69,3, @@ -14047,6 +14048,15 @@ DUK_EXTERNAL void duk_debugger_pause(duk_context *ctx) { /* include removed: duk_internal.h */ +typedef struct duk_internal_thread_state duk_internal_thread_state; + +struct duk_internal_thread_state { + duk_ljstate lj; + duk_bool_t handling_error; + duk_hthread *curr_thread; + duk_int_t call_recursion_depth; +}; + DUK_EXTERNAL duk_context *duk_create_heap(duk_alloc_function alloc_func, duk_realloc_function realloc_func, @@ -14112,6 +14122,57 @@ DUK_EXTERNAL void duk_destroy_heap(duk_context *ctx) { duk_heap_free(heap); } +DUK_EXTERNAL void duk_suspend(duk_context *ctx, duk_thread_state *state) { + duk_hthread *thr = (duk_hthread *) ctx; + duk_internal_thread_state *snapshot = (duk_internal_thread_state *) (void *) state; + duk_heap *heap; + duk_ljstate *lj; + + DUK_ASSERT_CTX_VALID(ctx); + DUK_ASSERT(thr != NULL); + DUK_ASSERT(thr->heap != NULL); + DUK_ASSERT(state != NULL); /* unvalidated */ + + heap = thr->heap; + lj = &heap->lj; + + duk_push_tval(ctx, &lj->value1); + duk_push_tval(ctx, &lj->value2); + + DUK_MEMCPY((void *) &snapshot->lj, (const void *) lj, sizeof(duk_ljstate)); + snapshot->handling_error = heap->handling_error; + snapshot->curr_thread = heap->curr_thread; + snapshot->call_recursion_depth = heap->call_recursion_depth; + + lj->jmpbuf_ptr = NULL; + lj->type = DUK_LJ_TYPE_UNKNOWN; + DUK_TVAL_SET_UNDEFINED(&lj->value1); + DUK_TVAL_SET_UNDEFINED(&lj->value2); + heap->handling_error = 0; + heap->curr_thread = NULL; + heap->call_recursion_depth = 0; +} + +DUK_EXTERNAL void duk_resume(duk_context *ctx, const duk_thread_state *state) { + duk_hthread *thr = (duk_hthread *) ctx; + const duk_internal_thread_state *snapshot = (const duk_internal_thread_state *) (const void *) state; + duk_heap *heap; + + DUK_ASSERT_CTX_VALID(ctx); + DUK_ASSERT(thr != NULL); + DUK_ASSERT(thr->heap != NULL); + DUK_ASSERT(state != NULL); /* unvalidated */ + + heap = thr->heap; + + DUK_MEMCPY((void *) &heap->lj, (const void *) &snapshot->lj, sizeof(duk_ljstate)); + heap->handling_error = snapshot->handling_error; + heap->curr_thread = snapshot->curr_thread; + heap->call_recursion_depth = snapshot->call_recursion_depth; + + duk_pop_2(ctx); +} + /* XXX: better place for this */ DUK_EXTERNAL void duk_set_global_object(duk_context *ctx) { duk_hthread *thr = (duk_hthread *) ctx; @@ -14417,7 +14478,7 @@ DUK_INTERNAL duk_bool_t duk_get_prop_stridx_boolean(duk_context *ctx, duk_idx_t return rc; } -DUK_EXTERNAL duk_bool_t duk_put_prop(duk_context *ctx, duk_idx_t obj_index) { +DUK_LOCAL duk_bool_t duk__put_prop_shared(duk_context *ctx, duk_idx_t obj_idx, duk_idx_t idx_key) { duk_hthread *thr = (duk_hthread *) ctx; duk_tval *tv_obj; duk_tval *tv_key; @@ -14425,16 +14486,19 @@ DUK_EXTERNAL duk_bool_t duk_put_prop(duk_context *ctx, duk_idx_t obj_index) { duk_small_int_t throw_flag; duk_bool_t rc; - DUK_ASSERT_CTX_VALID(ctx); - /* Note: copying tv_obj and tv_key to locals to shield against a valstack * resize is not necessary for a property put right now (putprop protects * against it internally). */ - tv_obj = duk_require_tval(ctx, obj_index); - tv_key = duk_require_tval(ctx, -2); - tv_val = duk_require_tval(ctx, -1); + /* Key and value indices are either (-2, -1) or (-1, -2). Given idx_key, + * idx_val is always (idx_key ^ 0x01). + */ + DUK_ASSERT((idx_key == -2 && (idx_key ^ 1) == -1) || + (idx_key == -1 && (idx_key ^ 1) == -2)); + tv_obj = duk_require_tval(ctx, obj_idx); + tv_key = duk_require_tval(ctx, idx_key); + tv_val = duk_require_tval(ctx, idx_key ^ 1); throw_flag = duk_is_strict_call(ctx); rc = duk_hobject_putprop(thr, tv_obj, tv_key, tv_val, throw_flag); @@ -14444,26 +14508,33 @@ DUK_EXTERNAL duk_bool_t duk_put_prop(duk_context *ctx, duk_idx_t obj_index) { return rc; /* 1 if property found, 0 otherwise */ } -DUK_EXTERNAL duk_bool_t duk_put_prop_string(duk_context *ctx, duk_idx_t obj_index, const char *key) { +DUK_EXTERNAL duk_bool_t duk_put_prop(duk_context *ctx, duk_idx_t obj_idx) { + DUK_ASSERT_CTX_VALID(ctx); + return duk__put_prop_shared(ctx, obj_idx, -2); +} + +DUK_EXTERNAL duk_bool_t duk_put_prop_string(duk_context *ctx, duk_idx_t obj_idx, const char *key) { DUK_ASSERT_CTX_VALID(ctx); DUK_ASSERT(key != NULL); - obj_index = duk_require_normalize_index(ctx, obj_index); - duk_push_string(ctx, key); - duk_swap_top(ctx, -2); /* [val key] -> [key val] */ - return duk_put_prop(ctx, obj_index); + /* Careful here and with other duk_put_prop_xxx() helpers: the + * target object and the property value may be in the same value + * stack slot (unusual, but still conceptually clear). + */ + obj_idx = duk_normalize_index(ctx, obj_idx); + (void) duk_push_string(ctx, key); + return duk__put_prop_shared(ctx, obj_idx, -1); } -DUK_EXTERNAL duk_bool_t duk_put_prop_index(duk_context *ctx, duk_idx_t obj_index, duk_uarridx_t arr_index) { +DUK_EXTERNAL duk_bool_t duk_put_prop_index(duk_context *ctx, duk_idx_t obj_idx, duk_uarridx_t arr_idx) { DUK_ASSERT_CTX_VALID(ctx); - obj_index = duk_require_normalize_index(ctx, obj_index); - duk_push_uarridx(ctx, arr_index); - duk_swap_top(ctx, -2); /* [val key] -> [key val] */ - return duk_put_prop(ctx, obj_index); + obj_idx = duk_require_normalize_index(ctx, obj_idx); + duk_push_uarridx(ctx, arr_idx); + return duk__put_prop_shared(ctx, obj_idx, -1); } -DUK_INTERNAL duk_bool_t duk_put_prop_stridx(duk_context *ctx, duk_idx_t obj_index, duk_small_int_t stridx) { +DUK_INTERNAL duk_bool_t duk_put_prop_stridx(duk_context *ctx, duk_idx_t obj_idx, duk_small_int_t stridx) { duk_hthread *thr = (duk_hthread *) ctx; DUK_ASSERT_CTX_VALID(ctx); @@ -14471,10 +14542,9 @@ DUK_INTERNAL duk_bool_t duk_put_prop_stridx(duk_context *ctx, duk_idx_t obj_inde DUK_ASSERT(stridx < DUK_HEAP_NUM_STRINGS); DUK_UNREF(thr); - obj_index = duk_require_normalize_index(ctx, obj_index); + obj_idx = duk_require_normalize_index(ctx, obj_idx); duk_push_hstring(ctx, DUK_HTHREAD_GET_STRING(thr, stridx)); - duk_swap_top(ctx, -2); /* [val key] -> [key val] */ - return duk_put_prop(ctx, obj_index); + return duk__put_prop_shared(ctx, obj_idx, -1); } DUK_EXTERNAL duk_bool_t duk_del_prop(duk_context *ctx, duk_idx_t obj_index) { @@ -31391,12 +31461,17 @@ DUK_LOCAL duk_bool_t duk__json_stringify_fast_value(duk_json_enc_ctx *js_ctx, du * standard JSON (and no JX/JC support here now). */ DUK_D(DUK_DPRINT("gap in array, no conflicting inherited property, remain on fast path")); +#if defined(DUK_USE_JX) + DUK__EMIT_STRIDX(js_ctx, js_ctx->stridx_custom_undefined); +#else DUK__EMIT_STRIDX(js_ctx, DUK_STRIDX_LC_NULL); +#endif } else { if (duk__json_stringify_fast_value(js_ctx, tv_val) == 0) { DUK__EMIT_STRIDX(js_ctx, DUK_STRIDX_LC_NULL); } } + DUK__EMIT_1(js_ctx, DUK_ASC_COMMA); emitted = 1; } @@ -31729,6 +31804,7 @@ void duk_bi_json_stringify_helper(duk_context *ctx, * combinations properly. */ #if defined(DUK_USE_JX) || defined(DUK_USE_JC) + js_ctx->stridx_custom_undefined = DUK_STRIDX_LC_NULL; /* standard JSON; array gaps */ #if defined(DUK_USE_JX) if (flags & DUK_JSON_FLAG_EXT_CUSTOM) { js_ctx->stridx_custom_undefined = DUK_STRIDX_LC_UNDEFINED; @@ -33931,7 +34007,7 @@ DUK_INTERNAL duk_ret_t duk_bi_string_constructor_from_char_code(duk_context *ctx cp = (duk_ucodepoint_t) duk_to_uint32(ctx, i); DUK_BW_WRITE_ENSURE_XUTF8(thr, bw, cp); #else - cp = (duk_ucodepoint_t) duk_to_uint32(ctx, i); + cp = (duk_ucodepoint_t) duk_to_uint16(ctx, i); DUK_BW_WRITE_ENSURE_CESU8(thr, bw, cp); #endif } @@ -42036,18 +42112,23 @@ DUK_LOCAL void duk__mark_hobject(duk_heap *heap, duk_hobject *h) { duk__mark_heaphdr(heap, (duk_heaphdr *) DUK_HCOMPILEDFUNCTION_GET_DATA(heap, f)); - tv = DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(heap, f); - tv_end = DUK_HCOMPILEDFUNCTION_GET_CONSTS_END(heap, f); - while (tv < tv_end) { - duk__mark_tval(heap, tv); - tv++; - } + if (DUK_HCOMPILEDFUNCTION_GET_DATA(heap, f) != NULL) { + tv = DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(heap, f); + tv_end = DUK_HCOMPILEDFUNCTION_GET_CONSTS_END(heap, f); + while (tv < tv_end) { + duk__mark_tval(heap, tv); + tv++; + } - fn = DUK_HCOMPILEDFUNCTION_GET_FUNCS_BASE(heap, f); - fn_end = DUK_HCOMPILEDFUNCTION_GET_FUNCS_END(heap, f); - while (fn < fn_end) { - duk__mark_heaphdr(heap, (duk_heaphdr *) *fn); - fn++; + fn = DUK_HCOMPILEDFUNCTION_GET_FUNCS_BASE(heap, f); + fn_end = DUK_HCOMPILEDFUNCTION_GET_FUNCS_END(heap, f); + while (fn < fn_end) { + duk__mark_heaphdr(heap, (duk_heaphdr *) *fn); + fn++; + } + } else { + /* May happen in some out-of-memory corner cases. */ + DUK_D(DUK_DPRINT("duk_hcompiledfunction 'data' is NULL, skipping marking")); } } else if (DUK_HOBJECT_IS_NATIVEFUNCTION(h)) { duk_hnativefunction *f = (duk_hnativefunction *) h; @@ -43927,20 +44008,23 @@ DUK_LOCAL void duk__refcount_finalize_hobject(duk_hthread *thr, duk_hobject *h) duk_tval *tv, *tv_end; duk_hobject **funcs, **funcs_end; - DUK_ASSERT(DUK_HCOMPILEDFUNCTION_GET_DATA(thr->heap, f) != NULL); /* compiled functions must be created 'atomically' */ - - tv = DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(thr->heap, f); - tv_end = DUK_HCOMPILEDFUNCTION_GET_CONSTS_END(thr->heap, f); - while (tv < tv_end) { - duk_tval_decref(thr, tv); - tv++; - } + if (DUK_HCOMPILEDFUNCTION_GET_DATA(thr->heap, f) != NULL) { + tv = DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(thr->heap, f); + tv_end = DUK_HCOMPILEDFUNCTION_GET_CONSTS_END(thr->heap, f); + while (tv < tv_end) { + duk_tval_decref(thr, tv); + tv++; + } - funcs = DUK_HCOMPILEDFUNCTION_GET_FUNCS_BASE(thr->heap, f); - funcs_end = DUK_HCOMPILEDFUNCTION_GET_FUNCS_END(thr->heap, f); - while (funcs < funcs_end) { - duk_heaphdr_decref(thr, (duk_heaphdr *) *funcs); - funcs++; + funcs = DUK_HCOMPILEDFUNCTION_GET_FUNCS_BASE(thr->heap, f); + funcs_end = DUK_HCOMPILEDFUNCTION_GET_FUNCS_END(thr->heap, f); + while (funcs < funcs_end) { + duk_heaphdr_decref(thr, (duk_heaphdr *) *funcs); + funcs++; + } + } else { + /* May happen in some out-of-memory corner cases. */ + DUK_D(DUK_DPRINT("duk_hcompiledfunction 'data' is NULL, skipping decref")); } duk_heaphdr_decref(thr, (duk_heaphdr *) DUK_HCOMPILEDFUNCTION_GET_DATA(thr->heap, f)); @@ -46870,8 +46954,13 @@ DUK_INTERNAL duk_bool_t duk_hobject_prototype_chain_contains(duk_hthread *thr, d duk_uint_t sanity; DUK_ASSERT(thr != NULL); - DUK_ASSERT(h != NULL); - /* allow 'p' to be NULL; then the result is always false */ + + /* False if the object is NULL or the prototype 'p' is NULL. + * In particular, false if both are NULL (don't compare equal). + */ + if (h == NULL || p == NULL) { + return 0; + } sanity = DUK_HOBJECT_PROTOTYPE_CHAIN_SANITY; do { @@ -51358,8 +51447,17 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o DUK_TVAL_SET_UNUSED_UPDREF(thr, tv); /* side effects */ goto success; } else { + duk_hobject *h_get = NULL; + duk_hobject *h_set = NULL; + duk_tval tv_tmp; + DUK_ASSERT(desc.a_idx < 0); + /* Set property slot to an empty state. Careful not to invoke + * any side effects while using desc.e_idx so that it doesn't + * get invalidated by a finalizer mutating our object. + */ + /* remove hash entry (no decref) */ #if defined(DUK_USE_HOBJECT_HASH_PART) if (desc.h_idx >= 0) { @@ -51380,21 +51478,17 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o DUK_DDD(DUK_DDDPRINT("before removing value, e_idx %ld, key %p, key at slot %p", (long) desc.e_idx, (void *) key, (void *) DUK_HOBJECT_E_GET_KEY(thr->heap, obj, desc.e_idx))); DUK_DDD(DUK_DDDPRINT("removing value at e_idx %ld", (long) desc.e_idx)); + DUK_MEMSET((void *) &tv_tmp, 0, sizeof(tv_tmp)); + DUK_TVAL_SET_UNDEFINED(&tv_tmp); if (DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, obj, desc.e_idx)) { - duk_hobject *tmp; - - tmp = DUK_HOBJECT_E_GET_VALUE_GETTER(thr->heap, obj, desc.e_idx); + h_get = DUK_HOBJECT_E_GET_VALUE_GETTER(thr->heap, obj, desc.e_idx); + h_set = DUK_HOBJECT_E_GET_VALUE_SETTER(thr->heap, obj, desc.e_idx); DUK_HOBJECT_E_SET_VALUE_GETTER(thr->heap, obj, desc.e_idx, NULL); - DUK_UNREF(tmp); - DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects */ - - tmp = DUK_HOBJECT_E_GET_VALUE_SETTER(thr->heap, obj, desc.e_idx); DUK_HOBJECT_E_SET_VALUE_SETTER(thr->heap, obj, desc.e_idx, NULL); - DUK_UNREF(tmp); - DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects */ } else { tv = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, desc.e_idx); - DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv); /* side effects */ + DUK_TVAL_SET_TVAL(&tv_tmp, tv); + DUK_TVAL_SET_UNDEFINED(tv); } #if 0 /* Not strictly necessary because if key == NULL, flag MUST be ignored. */ @@ -51407,7 +51501,14 @@ DUK_INTERNAL duk_bool_t duk_hobject_delprop_raw(duk_hthread *thr, duk_hobject *o DUK_DDD(DUK_DDDPRINT("removing key at e_idx %ld", (long) desc.e_idx)); DUK_ASSERT(key == DUK_HOBJECT_E_GET_KEY(thr->heap, obj, desc.e_idx)); DUK_HOBJECT_E_SET_KEY(thr->heap, obj, desc.e_idx, NULL); - DUK_HSTRING_DECREF(thr, key); /* side effects */ + + /* Do decrefs only with safe pointers to avoid side effects + * disturbing e_idx. + */ + DUK_TVAL_DECREF(thr, &tv_tmp); + DUK_HOBJECT_DECREF_ALLOWNULL(thr, h_get); + DUK_HOBJECT_DECREF_ALLOWNULL(thr, h_set); + DUK_HSTRING_DECREF(thr, key); goto success; } @@ -52581,6 +52682,7 @@ void duk_hobject_define_property_helper(duk_context *ctx, } else { duk_bool_t rc; duk_tval *tv1; + duk_tval tv_tmp; /* curr is data, desc is accessor */ if (!(curr.flags & DUK_PROPDESC_FLAG_CONFIGURABLE) && !force_flag) { @@ -52600,9 +52702,12 @@ void duk_hobject_define_property_helper(duk_context *ctx, DUK_ASSERT(!DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, obj, curr.e_idx)); + /* Avoid side effects that might disturb curr.e_idx until + * we're done editing the slot. + */ tv1 = DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, curr.e_idx); - /* XXX: just decref */ - DUK_TVAL_SET_UNDEFINED_UPDREF(thr, tv1); /* side effects */ + DUK_TVAL_SET_TVAL(&tv_tmp, tv1); + DUK_TVAL_SET_UNDEFINED(tv1); DUK_HOBJECT_E_SET_VALUE_GETTER(thr->heap, obj, curr.e_idx, NULL); DUK_HOBJECT_E_SET_VALUE_SETTER(thr->heap, obj, curr.e_idx, NULL); @@ -52612,6 +52717,8 @@ void duk_hobject_define_property_helper(duk_context *ctx, DUK_DDD(DUK_DDDPRINT("flags after data->accessor conversion: 0x%02lx", (unsigned long) DUK_HOBJECT_E_GET_FLAGS(thr->heap, obj, curr.e_idx))); + DUK_TVAL_DECREF(thr, &tv_tmp); /* side effects */ + /* re-lookup to update curr.flags * XXX: would be faster to update directly */ @@ -52627,7 +52734,8 @@ void duk_hobject_define_property_helper(duk_context *ctx, if (curr.flags & DUK_PROPDESC_FLAG_ACCESSOR) { duk_bool_t rc; - duk_hobject *tmp; + duk_hobject *h_get; + duk_hobject *h_set; /* curr is accessor, desc is data */ if (!(curr.flags & DUK_PROPDESC_FLAG_CONFIGURABLE) && !force_flag) { @@ -52639,15 +52747,14 @@ void duk_hobject_define_property_helper(duk_context *ctx, DUK_DDD(DUK_DDDPRINT("convert property to data property")); + /* Avoid side effects that might disturb curr.e_idx until + * we're done editing the slot. + */ DUK_ASSERT(DUK_HOBJECT_E_SLOT_IS_ACCESSOR(thr->heap, obj, curr.e_idx)); - tmp = DUK_HOBJECT_E_GET_VALUE_GETTER(thr->heap, obj, curr.e_idx); - DUK_UNREF(tmp); + h_get = DUK_HOBJECT_E_GET_VALUE_GETTER(thr->heap, obj, curr.e_idx); DUK_HOBJECT_E_SET_VALUE_GETTER(thr->heap, obj, curr.e_idx, NULL); - DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects */ - tmp = DUK_HOBJECT_E_GET_VALUE_SETTER(thr->heap, obj, curr.e_idx); - DUK_UNREF(tmp); + h_set = DUK_HOBJECT_E_GET_VALUE_SETTER(thr->heap, obj, curr.e_idx); DUK_HOBJECT_E_SET_VALUE_SETTER(thr->heap, obj, curr.e_idx, NULL); - DUK_HOBJECT_DECREF_ALLOWNULL(thr, tmp); /* side effects */ DUK_TVAL_SET_UNDEFINED(DUK_HOBJECT_E_GET_VALUE_TVAL_PTR(thr->heap, obj, curr.e_idx)); DUK_HOBJECT_E_SLOT_CLEAR_WRITABLE(thr->heap, obj, curr.e_idx); @@ -52656,6 +52763,9 @@ void duk_hobject_define_property_helper(duk_context *ctx, DUK_DDD(DUK_DDDPRINT("flags after accessor->data conversion: 0x%02lx", (unsigned long) DUK_HOBJECT_E_GET_FLAGS(thr->heap, obj, curr.e_idx))); + DUK_HOBJECT_DECREF_ALLOWNULL(thr, h_get); /* side effects */ + DUK_HOBJECT_DECREF_ALLOWNULL(thr, h_set); /* side effects */ + /* re-lookup to update curr.flags * XXX: would be faster to update directly */ @@ -59766,6 +59876,7 @@ DUK_LOCAL void duk__ivalue_toplain_raw(duk_compiler_ctx *comp_ctx, duk_ivalue *x } case DUK_IVAL_NONE: default: { + DUK_D(DUK_DPRINT("invalid ivalue type: %ld", (long) x->t)); break; } } @@ -61735,13 +61846,24 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i * left-hand-side values (e.g. as in "f() = 1") must NOT cause a * SyntaxError, but rather a run-time ReferenceError. * - * Assignment expression value is conceptually the LHS/RHS value - * copied into a fresh temporary so that it won't change even if - * LHS/RHS values change (e.g. when they're identifiers). Doing this - * concretely produces inefficient bytecode, so we try to avoid the - * extra temporary for some known-to-be-safe cases. Currently the - * only safe case we detect is a "top level assignment", for example - * "x = y + z;", where the assignment expression value is ignored. + * When evaluating X <op>= Y, the LHS (X) is conceptually evaluated + * to a temporary first. The RHS is then evaluated. Finally, the + * <op> is applied to the initial value of RHS (not the value after + * RHS evaluation), and written to X. Doing so concretely generates + * inefficient code so we'd like to avoid the temporary when possible. + * See: https://github.com/svaarala/duktape/pull/992. + * + * The expression value (final LHS value, written to RHS) is + * conceptually copied into a fresh temporary so that it won't + * change even if the LHS/RHS values change in outer expressions. + * For example, it'd be generally incorrect for the expression value + * to be the RHS register binding, unless there's a guarantee that it + * won't change during further expression evaluation. Using the + * temporary concretely produces inefficient bytecode, so we try to + * avoid the extra temporary for some known-to-be-safe cases. + * Currently the only safe case we detect is a "top level assignment", + * for example "x = y + z;", where the assignment expression value is + * ignored. * See: test-dev-assign-expr.js and test-bug-assign-mutate-gh381.js. */ @@ -61761,7 +61883,9 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i * is a reg-bound identifier. The RHS ('res') is right associative * so it has consumed all other assignment level operations; the * only relevant lower binding power construct is comma operator - * which will ignore the expression value provided here. + * which will ignore the expression value provided here. Usually + * the top level assignment expression value is ignored, but it + * is relevant for e.g. eval code. */ toplevel_assign = (comp_ctx->curr_func.nud_count == 1 && /* one token before */ comp_ctx->curr_func.led_count == 1); /* one operator (= assign) */ @@ -61777,23 +61901,17 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i DUK_ASSERT(left->x1.t == DUK_ISPEC_VALUE); /* LHS is already side effect free */ - /* Keep the RHS as an unresolved ivalue for now, so it - * can be a plain value or a unary/binary operation here. - * We resolve it before finishing but doing it later allows - * better bytecode in some cases. - */ - duk__expr(comp_ctx, res, args_rbp /*rbp_flags*/); - h_varname = duk_get_hstring(ctx, left->x1.valstack_idx); DUK_ASSERT(h_varname != NULL); if (duk__hstring_is_eval_or_arguments_in_strict_mode(comp_ctx, h_varname)) { - /* E5 Section 11.13.1 (and others for other assignments), step 4 */ + /* E5 Section 11.13.1 (and others for other assignments), step 4. */ goto syntax_error_lvalue; } duk_dup(ctx, left->x1.valstack_idx); (void) duk__lookup_lhs(comp_ctx, &reg_varbind, &rc_varname); if (args_op == DUK_OP_NONE) { + duk__expr(comp_ctx, res, args_rbp /*rbp_flags*/); if (toplevel_assign) { /* Any 'res' will do. */ DUK_DDD(DUK_DDDPRINT("plain assignment, toplevel assign, use as is")); @@ -61807,42 +61925,98 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i } } } else { - duk__ivalue_toregconst(comp_ctx, res); - DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST); + /* For X <op>= Y we need to evaluate the pre-op + * value of X before evaluating the RHS: the RHS + * can change X, but when we do <op> we must use + * the pre-op value. + */ + duk_reg_t reg_temp; + + reg_temp = DUK__ALLOCTEMP(comp_ctx); if (reg_varbind >= 0) { duk_reg_t reg_res; + duk_reg_t reg_src; + duk_int_t pc_temp_load; + duk_int_t pc_before_rhs; + duk_int_t pc_after_rhs; if (toplevel_assign) { /* 'reg_varbind' is the operation result and can also * become the expression value for top level assignments * such as: "var x; x += y;". */ + DUK_DD(DUK_DDPRINT("<op>= expression is top level, write directly to reg_varbind")); reg_res = reg_varbind; } else { /* Not safe to use 'reg_varbind' as assignment expression * value, so go through a temp. */ - reg_res = DUK__ALLOCTEMP(comp_ctx); + DUK_DD(DUK_DDPRINT("<op>= expression is not top level, write to reg_temp")); + reg_res = reg_temp; /* reg_res should be smallest possible */ + reg_temp = DUK__ALLOCTEMP(comp_ctx); + } + + /* Try to optimize X <op>= Y for reg-bound + * variables. Detect side-effect free RHS + * narrowly by seeing whether it emits code. + * If not, rewind the code emitter and overwrite + * the unnecessary temp reg load. + */ + + pc_temp_load = duk__get_current_pc(comp_ctx); + duk__emit_a_bc(comp_ctx, + DUK_OP_LDREG, + (duk_regconst_t) reg_temp, + reg_varbind); + + pc_before_rhs = duk__get_current_pc(comp_ctx); + duk__expr_toregconst(comp_ctx, res, args_rbp /*rbp_flags*/); + DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST); + pc_after_rhs = duk__get_current_pc(comp_ctx); + + DUK_DD(DUK_DDPRINT("pc_temp_load=%ld, pc_before_rhs=%ld, pc_after_rhs=%ld", + (long) pc_temp_load, (long) pc_before_rhs, + (long) pc_after_rhs)); + + if (pc_after_rhs == pc_before_rhs) { + /* Note: if the reg_temp load generated shuffling + * instructions, we may need to rewind more than + * one instruction, so use explicit PC computation. + */ + DUK_DD(DUK_DDPRINT("rhs is side effect free, rewind and avoid unnecessary temp for reg-based <op>=")); + DUK_BW_ADD_PTR(comp_ctx->thr, &comp_ctx->curr_func.bw_code, (pc_temp_load - pc_before_rhs) * sizeof(duk_compiler_instr)); + reg_src = reg_varbind; + } else { + DUK_DD(DUK_DDPRINT("rhs evaluation emitted code, not sure if rhs is side effect free; use temp reg for LHS")); + reg_src = reg_temp; } duk__emit_a_b_c(comp_ctx, args_op, (duk_regconst_t) reg_res, - (duk_regconst_t) reg_varbind, + (duk_regconst_t) reg_src, res->x1.regconst); + res->x1.regconst = (duk_regconst_t) reg_res; + + /* Ensure compact use of temps. */ + if (DUK__ISTEMP(comp_ctx, reg_res)) { + DUK__SETTEMP(comp_ctx, reg_res + 1); + } } else { /* When LHS is not register bound, always go through a * temporary. No optimization for top level assignment. */ - duk_reg_t reg_temp; - reg_temp = DUK__ALLOCTEMP(comp_ctx); duk__emit_a_bc(comp_ctx, DUK_OP_GETVAR, (duk_regconst_t) reg_temp, rc_varname); + + duk__expr_toregconst(comp_ctx, res, args_rbp /*rbp_flags*/); + DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST); + duk__emit_a_b_c(comp_ctx, args_op, (duk_regconst_t) reg_temp, @@ -61928,10 +62102,10 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i DUK__IVAL_FLAG_REQUIRE_TEMP | DUK__IVAL_FLAG_ALLOW_CONST /*flags*/); /* Evaluate RHS only when LHS is safe. */ - duk__expr_toregconst(comp_ctx, res, args_rbp /*rbp_flags*/); - DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST); if (args_op == DUK_OP_NONE) { + duk__expr_toregconst(comp_ctx, res, args_rbp /*rbp_flags*/); + DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST); rc_res = res->x1.regconst; } else { reg_temp = DUK__ALLOCTEMP(comp_ctx); @@ -61940,6 +62114,10 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i (duk_regconst_t) reg_temp, (duk_regconst_t) reg_obj, rc_key); + + duk__expr_toregconst(comp_ctx, res, args_rbp /*rbp_flags*/); + DUK_ASSERT(res->t == DUK_IVAL_PLAIN && res->x1.t == DUK_ISPEC_REGCONST); + duk__emit_a_b_c(comp_ctx, args_op, (duk_regconst_t) reg_temp, @@ -61971,17 +62149,18 @@ DUK_LOCAL void duk__expr_led(duk_compiler_ctx *comp_ctx, duk_ivalue *left, duk_i duk_regconst_t rc_res; - /* first evaluate LHS fully to ensure all side effects are out */ + /* First evaluate LHS fully to ensure all side effects are out. */ duk__ivalue_toplain_ignore(comp_ctx, left); - /* then evaluate RHS fully (its value becomes the expression value too) */ + /* Then evaluate RHS fully (its value becomes the expression value too). + * Technically we'd need the side effect safety check here too, but because + * we always throw using INVLHS the result doesn't matter. + */ rc_res = duk__expr_toregconst(comp_ctx, res, args_rbp /*rbp_flags*/); duk__emit_extraop_only(comp_ctx, DUK_EXTRAOP_INVLHS); - /* XXX: this value is irrelevant because of INVLHS? */ - res->t = DUK_IVAL_PLAIN; res->x1.t = DUK_ISPEC_REGCONST; res->x1.regconst = rc_res; @@ -71183,7 +71362,12 @@ DUK_LOCAL void duk__inc_data_inner_refcounts(duk_hthread *thr, duk_hcompiledfunc duk_tval *tv, *tv_end; duk_hobject **funcs, **funcs_end; - DUK_ASSERT(DUK_HCOMPILEDFUNCTION_GET_DATA(thr->heap, f) != NULL); /* compiled functions must be created 'atomically' */ + /* If function creation fails due to out-of-memory, the data buffer + * pointer may be NULL in some cases. That's actually possible for + * GC code, but shouldn't be possible here because the incomplete + * function will be unwound from the value stack and never instantiated. + */ + DUK_ASSERT(DUK_HCOMPILEDFUNCTION_GET_DATA(thr->heap, f) != NULL); DUK_UNREF(thr); tv = DUK_HCOMPILEDFUNCTION_GET_CONSTS_BASE(thr->heap, f); @@ -78997,6 +79181,7 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_ duk_hobject *h_regexp; duk_hstring *h_bytecode; duk_hstring *h_input; + duk_uint8_t *p_buf; const duk_uint8_t *pc; const duk_uint8_t *sp; duk_small_int_t match = 0; @@ -79067,17 +79252,21 @@ DUK_LOCAL void duk__regexp_match_helper(duk_hthread *thr, duk_small_int_t force_ DUK_ASSERT(re_ctx.nsaved >= 2); DUK_ASSERT((re_ctx.nsaved % 2) == 0); - duk_push_fixed_buffer(ctx, sizeof(duk_uint8_t *) * re_ctx.nsaved); + p_buf = (duk_uint8_t *) duk_push_fixed_buffer(ctx, sizeof(duk_uint8_t *) * re_ctx.nsaved); + DUK_UNREF(p_buf); re_ctx.saved = (const duk_uint8_t **) duk_get_buffer(ctx, -1, NULL); DUK_ASSERT(re_ctx.saved != NULL); /* [ ... re_obj input bc saved_buf ] */ - /* buffer is automatically zeroed */ -#ifdef DUK_USE_EXPLICIT_NULL_INIT +#if defined(DUK_USE_EXPLICIT_NULL_INIT) for (i = 0; i < re_ctx.nsaved; i++) { re_ctx.saved[i] = (duk_uint8_t *) NULL; } +#elif defined(DUK_USE_ZERO_BUFFER_DATA) + /* buffer is automatically zeroed */ +#else + DUK_MEMZERO((void *) p_buf, sizeof(duk_uint8_t *) * re_ctx.nsaved); #endif DUK_DDD(DUK_DDDPRINT("regexp ctx initialized, flags=0x%08lx, nsaved=%ld, recursion_limit=%ld, steps_limit=%ld", diff --git a/content/handlers/javascript/duktape/duktape.h b/content/handlers/javascript/duktape/duktape.h index 2cb9a50..eb47a70 100644 --- a/content/handlers/javascript/duktape/duktape.h +++ b/content/handlers/javascript/duktape/duktape.h @@ -1,12 +1,12 @@ /* - * Duktape public API for Duktape 1.5.1. + * Duktape public API for Duktape 1.6.0. * * See the API reference for documentation on call semantics. * The exposed API is inside the DUK_API_PUBLIC_H_INCLUDED * include guard. Other parts of the header are Duktape * internal and related to platform/compiler/feature detection. * - * Git commit 2cc76e9ff1f64869e1146ad7317d8cbe33bbd27e (v1.5.1). + * Git commit 17e3d86cf8b4788bd0d37658f833ab440ce43a1c (v1.6.0). * Git branch HEAD. * * See Duktape AUTHORS.rst and LICENSE.txt for copyright and @@ -163,6 +163,7 @@ extern "C" { * in Duktape web documentation. */ +struct duk_thread_state; struct duk_memory_functions; struct duk_function_list_entry; struct duk_number_list_entry; @@ -170,6 +171,7 @@ struct duk_number_list_entry; /* duk_context is now defined in duk_config.h because it may also be * referenced there by prototypes. */ +typedef struct duk_thread_state duk_thread_state; typedef struct duk_memory_functions duk_memory_functions; typedef struct duk_function_list_entry duk_function_list_entry; typedef struct duk_number_list_entry duk_number_list_entry; @@ -190,6 +192,14 @@ typedef void (*duk_debug_write_flush_function) (void *udata); typedef duk_idx_t (*duk_debug_request_function) (duk_context *ctx, void *udata, duk_idx_t nvalues); typedef void (*duk_debug_detached_function) (void *udata); +struct duk_thread_state { + /* XXX: Enough space to hold internal suspend/resume structure. + * This is rather awkward and to be fixed when the internal + * structure is visible for the public API header. + */ + char data[128]; +}; + struct duk_memory_functions { duk_alloc_function alloc_func; duk_realloc_function realloc_func; @@ -218,15 +228,15 @@ struct duk_number_list_entry { * have 99 for patch level (e.g. 0.10.99 would be a development version * after 0.10.0 but before the next official release). */ -#define DUK_VERSION 10501L +#define DUK_VERSION 10600L /* Git commit, describe, and branch for Duktape build. Useful for * non-official snapshot builds so that application code can easily log * which Duktape snapshot was used. Not available in the Ecmascript * environment. */ -#define DUK_GIT_COMMIT "2cc76e9ff1f64869e1146ad7317d8cbe33bbd27e" -#define DUK_GIT_DESCRIBE "v1.5.1" +#define DUK_GIT_COMMIT "17e3d86cf8b4788bd0d37658f833ab440ce43a1c" +#define DUK_GIT_DESCRIBE "v1.6.0" #define DUK_GIT_BRANCH "HEAD" /* Duktape debug protocol version used by this build. */ @@ -397,6 +407,9 @@ duk_context *duk_create_heap(duk_alloc_function alloc_func, duk_fatal_function fatal_handler); DUK_EXTERNAL_DECL void duk_destroy_heap(duk_context *ctx); +DUK_EXTERNAL_DECL void duk_suspend(duk_context *ctx, duk_thread_state *state); +DUK_EXTERNAL_DECL void duk_resume(duk_context *ctx, const duk_thread_state *state); + #define duk_create_heap_default() \ duk_create_heap(NULL, NULL, NULL, NULL, NULL) diff --git a/content/hlcache.c b/content/hlcache.c index 042e189..95edd21 100644 --- a/content/hlcache.c +++ b/content/hlcache.c @@ -16,8 +16,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/** \file - * High-level resource cache (implementation) +/** + * \file + * High-level resource cache implementation. */ #include <assert.h> @@ -86,7 +87,7 @@ struct hlcache_s { /** Ring of retrieval contexts */ hlcache_retrieval_ctx *retrieval_ctx_ring; - /* statsistics */ + /* statistics */ unsigned int hit_count; unsigned int miss_count; }; @@ -665,12 +666,12 @@ nserror hlcache_handle_retrieve(nsurl *url, uint32_t flags, hlcache_llcache_callback, ctx, &ctx->llcache); if (error != NSERROR_OK) { - /* error retriving handle so free context and return error */ + /* error retrieving handle so free context and return error */ free((char *) ctx->child.charset); free(ctx->handle); free(ctx); } else { - /* successfuly started fetch so add new context to list */ + /* successfully started fetch so add new context to list */ RING_INSERT(hlcache->retrieval_ctx_ring, ctx); *result = ctx->handle; diff --git a/content/llcache.c b/content/llcache.c index e338c1f..eb30053 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -22,7 +22,7 @@ * Low-level resource cache implementation * * This is the implementation of the low level cache. This cache - * stores source objects in memory and may use a persistant backing + * stores source objects in memory and may use a persistent backing * store to extend their lifetime. * * \todo fix writeout conditions and ordering. @@ -35,12 +35,10 @@ #include <stdint.h> #include <string.h> #include <strings.h> -#include <inttypes.h> - #include <nsutils/time.h> +#include "netsurf/inttypes.h" #include "utils/config.h" - #include "utils/corestrings.h" #include "utils/log.h" #include "utils/messages.h" @@ -201,8 +199,8 @@ struct llcache_object { llcache_header *headers; /**< Fetch headers */ size_t num_headers; /**< Number of fetch headers */ - /* Instrumentation. These elemnts are strictly for information - * to improve the cache performance and to provide performace + /* Instrumentation. These elements are strictly for information + * to improve the cache performance and to provide performance * metrics. The values are non-authorative and must not be used to * determine object lifetime etc. */ @@ -268,7 +266,7 @@ struct llcache_s { uint64_t total_written; /** - * Total nuber of miliseconds taken to write to backing store. + * Total number of milliseconds taken to write to backing store. */ uint64_t total_elapsed; @@ -804,7 +802,7 @@ static nserror llcache_fetch_process_header(llcache_object *object, * * sets up headers and attempts to start an actual fetch from the * fetchers system updating the llcache object with the new fetch on - * sucessful start. + * successful start. * * \pre The fetch parameters in object->fetch must be populated * @@ -876,7 +874,7 @@ static nserror llcache_object_refetch(llcache_object *object) /* Reset fetch state */ object->fetch.state = LLCACHE_FETCH_INIT; - LLCACHE_LOG("Refetching %p", object); + LLCACHE_LOG("Re-fetching %p", object); /* Kick off fetch */ res = fetch_start(object->url, @@ -1173,27 +1171,27 @@ llcache_object_remove_from_list(llcache_object *object, llcache_object **list) } /** - * Retrieve source data for an object from persistant store if necessary. + * Retrieve source data for an object from persistent store if necessary. * - * If an objects source data has been placed in the persistant store - * and the in memory copy released this will attempt to retrive the + * If an objects source data has been placed in the persistent store + * and the in memory copy released this will attempt to retrieve the * source data. * * \param object the object to operate on. - * \return apropriate error code. + * \return appropriate error code. */ static nserror llcache_persist_retrieve(llcache_object *object) { /* ensure the source data is present if necessary */ if ((object->source_data != NULL) || (object->store_state != LLCACHE_STATE_DISC)) { - /* source data does not require retriving from - * persistant store. + /* source data does not require retrieving from + * persistent store. */ return NSERROR_OK; } - /* Source data for the object may be in the persiatant store */ + /* Source data for the object may be in the persistent store */ return guit->llcache->fetch(object->url, BACKING_STORE_NONE, &object->source_data, @@ -1205,7 +1203,7 @@ static nserror llcache_persist_retrieve(llcache_object *object) * * The metadata includes object headers. * - * \param object The cache object to serialise teh metadata of. + * \param object The cache object to serialise the metadata of. * \param data_out Where the serialised buffer will be placed. * \param datasize_out The size of the serialised data. * \return NSERROR_OK on success with \a data_out and \a datasize_out @@ -1347,15 +1345,15 @@ operror: /** * Deserialisation of an objects metadata. * - * Attempt to retrive and deserialise the metadata for an object from + * Attempt to retrieve and deserialise the metadata for an object from * the backing store. * - * This must only update object if it is sucessful otherwise difficult + * This must only update object if it is successful otherwise difficult * to debug crashes happen later by using bad leftover object state. * * \param object The object to retrieve the metadata for. - * \return NSERROR_OK if the metatdata was retrived and deserialised - * or error code if url is not in persistant storage or in + * \return NSERROR_OK if the metatdata was retrieved and deserialised + * or error code if URL is not in persistent storage or in * event of deserialisation error. */ static nserror @@ -1376,7 +1374,7 @@ llcache_process_metadata(llcache_object *object) size_t num_headers; size_t hloop; - LOG("Retriving metadata"); + LOG("Retrieving metadata"); /* attempt to retrieve object metadata from the backing store */ res = guit->llcache->fetch(object->url, @@ -1387,7 +1385,7 @@ llcache_process_metadata(llcache_object *object) return res; } - LOG("Processing retrived data"); + LOG("Processing retrieved data"); /* metadata line 1 is the url the metadata referrs to */ line = 1; @@ -1405,7 +1403,7 @@ llcache_process_metadata(llcache_object *object) if (nsurl_compare(object->url, metadataurl, NSURL_COMPLETE) != true) { /* backing store returned the wrong object for the - * request. This may occour if the backing store had + * request. This may occur if the backing store had * a collision in its storage method. We cope with this * by simply skipping caching of this object. */ @@ -1511,14 +1509,14 @@ format_error: } /** - * Attempt to retrieve an object from persistant storage. + * Attempt to retrieve an object from persistent storage. * - * \param object The object to populate from persistant store. + * \param object The object to populate from persistent store. * \param flags Fetch flags. * \param referer The referring url. * \param post Post data for fetch. * \param redirect_count how many times this fetch has been redirected. - * \return NSERROR_OK if the object was sucessfully retrived from the + * \return NSERROR_OK if the object was successfully retrieved from the * cache else appropriate error code. */ static nserror @@ -1572,7 +1570,7 @@ llcache_object_fetch_persistant(llcache_object *object, * \param referer Referring URL, or NULL if none * \param post POST data, or NULL for a GET request * \param redirect_count Number of redirects followed so far - * \param result Pointer to location to recieve retrieved object + * \param result Pointer to location to receive retrieved object * \return NSERROR_OK on success, appropriate error otherwise */ static nserror @@ -1602,7 +1600,7 @@ llcache_object_retrieve_from_cache(nsurl *url, } /* No viable object found in cache create one and attempt to - * pull from persistant store. + * pull from persistent store. */ if (newest == NULL) { LLCACHE_LOG("No viable object found in llcache"); @@ -1611,12 +1609,12 @@ llcache_object_retrieve_from_cache(nsurl *url, if (error != NSERROR_OK) return error; - /* attempt to retrieve object from persistant store */ + /* attempt to retrieve object from persistent store */ error = llcache_object_fetch_persistant(obj, flags, referer, post, redirect_count); if (error == NSERROR_OK) { - LLCACHE_LOG("retrived object from persistant store"); + LLCACHE_LOG("retrieved object from persistent store"); - /* set newest object from persistant store which + /* set newest object from persistent store which * will cause the normal object handling to be used. */ newest = obj; @@ -1625,7 +1623,7 @@ llcache_object_retrieve_from_cache(nsurl *url, llcache_object_add_to_list(obj, &llcache->cached_objects); } - /* else no object found and unretrivable from cache, + /* else no object found and irretrievable from cache, * fall through with newest unset to start fetch */ } @@ -1641,19 +1639,19 @@ llcache_object_retrieve_from_cache(nsurl *url, /* ensure the source data is present */ error = llcache_persist_retrieve(newest); if (error == NSERROR_OK) { - /* source data was sucessfully retrived from - * persistant store + /* source data was successfully retrieved from + * persistent store */ *result = newest; return NSERROR_OK; } - /* retrival of source data from persistant store + /* retrieval of source data from persistent store * failed, destroy cache object and fall though to * cache miss to re-fetch */ - LLCACHE_LOG("Persistant retrival failed for %p", newest); + LLCACHE_LOG("Persistent retrieval failed for %p", newest); llcache_object_remove_from_list(newest, &llcache->cached_objects); llcache_object_destroy(newest); @@ -1704,9 +1702,9 @@ llcache_object_retrieve_from_cache(nsurl *url, return NSERROR_OK; } - LLCACHE_LOG("Persistant retrival failed for %p", newest); + LLCACHE_LOG("Persistent retrieval failed for %p", newest); - /* retrival of source data from persistant store + /* retrieval of source data from persistent store * failed, destroy cache object and fall though to * cache miss to re-retch */ @@ -1743,7 +1741,7 @@ llcache_object_retrieve_from_cache(nsurl *url, * \param referer Referring URL, or NULL if none * \param post POST data, or NULL for a GET request * \param redirect_count Number of redirects followed so far - * \param result Pointer to location to recieve retrieved object + * \param result Pointer to location to receive retrieved object * \return NSERROR_OK on success, appropriate error otherwise */ static nserror @@ -2372,7 +2370,7 @@ build_candidate_list(struct llcache_object ***lst_out, int *lst_len_out) /* cacehable objects with no pending fetches, not * already on disc and with sufficient lifetime to - * make disc cache worthwile + * make disc cache worthwhile */ if ((object->candidate_count == 0) && (object->fetch.fetch == NULL) && @@ -2526,20 +2524,20 @@ static void llcache_persist(void *p) ret = build_candidate_list(&lst, &lst_count); if (ret != NSERROR_OK) { - LLCACHE_LOG("Unable to construct candidate list for persisatnt writeout"); + LLCACHE_LOG("Unable to construct candidate list for persistent writeout"); return; } write_limit = (llcache->maximum_bandwidth * llcache->time_quantum) / 1000; - /* obtained a candidate list, make each object persistant in turn */ + /* obtained a candidate list, make each object persistent in turn */ for (idx = 0; idx < lst_count; idx++) { ret = write_backing_store(lst[idx], &written, &elapsed); if (ret != NSERROR_OK) { continue; } - /* sucessfully wrote object to backing store */ + /* successfully wrote object to backing store */ total_written += written; total_elapsed += elapsed; total_bandwidth = (total_written * 1000) / total_elapsed; @@ -3138,7 +3136,7 @@ llcache_object_snapshot(llcache_object *object, llcache_object **snapshot) /** * total ram usage of object * - * \param object The object to caclulate the total RAM usage of. + * \param object The object to calculate the total RAM usage of. * \return The total RAM usage in bytes. */ static inline uint32_t @@ -3253,7 +3251,7 @@ void llcache_clean(bool purge) } /* if the cache limit is exceeded try to make some objects - * persistant so their RAM can be reclaimed in the next + * persistent so their RAM can be reclaimed in the next * step */ if (limit < llcache_size) { @@ -3261,7 +3259,7 @@ void llcache_clean(bool purge) } /* Source data of fresh cacheable objects with no users, no - * pending fetches and pushed to persistant store while the + * pending fetches and pushed to persistent store while the * cache exceeds the configured size. */ for (object = llcache->cached_objects; @@ -3286,8 +3284,8 @@ void llcache_clean(bool purge) } /* Fresh cacheable objects with no users, no pending fetches - * and pushed to persistant store while the cache exceeds - * the configured size. Efectively just the llcache object metadata. + * and pushed to persistent store while the cache exceeds + * the configured size. Effectively just the llcache object metadata. */ for (object = llcache->cached_objects; ((limit < llcache_size) && (object != NULL)); @@ -3317,7 +3315,7 @@ void llcache_clean(bool purge) /* Fresh cacheable objects with no users or pending fetches * while the cache exceeds the configured size. These are the - * most valuble objects as replacing them is a full network + * most valuable objects as replacing them is a full network * fetch */ for (object = llcache->cached_objects; diff --git a/desktop/Makefile b/desktop/Makefile index f7f660d..2dcd616 100644 --- a/desktop/Makefile +++ b/desktop/Makefile @@ -2,8 +2,8 @@ S_DESKTOP := cookie_manager.c knockout.c hotlist.c mouse.c \ plot_style.c print.c search.c searchweb.c scrollbar.c \ - sslcert_viewer.c textarea.c tree.c version.c \ - system_colour.c global_history.c treeview.c + sslcert_viewer.c textarea.c version.c system_colour.c \ + global_history.c treeview.c S_DESKTOP := $(addprefix desktop/,$(S_DESKTOP)) diff --git a/desktop/browser_history.c b/desktop/browser_history.c index 5cd98cd..d21c5bc 100644 --- a/desktop/browser_history.c +++ b/desktop/browser_history.c @@ -37,6 +37,7 @@ #include "content/urldb.h" #include "netsurf/bitmap.h" +#include "desktop/system_colour.h" #include "desktop/gui_internal.h" #include "desktop/browser_history.h" #include "desktop/browser_private.h" @@ -235,6 +236,45 @@ static void browser_window_history__layout(struct history *history) history->height += BOTTOM_MARGIN / 2; } +/** plot style for drawing lines between nodes */ +static plot_style_t pstyle_line = { + .stroke_type = PLOT_OP_TYPE_SOLID, + .stroke_width = 2, +}; + +/** plot style for drawing background */ +static plot_style_t pstyle_bg = { + .fill_type = PLOT_OP_TYPE_SOLID, +}; + +/** plot style for drawing rectangle round unselected nodes */ +static plot_style_t pstyle_rect = { + .stroke_type = PLOT_OP_TYPE_SOLID, + .stroke_width = 1, +}; + +/** plot style for drawing rectangle round selected nodes */ +static plot_style_t pstyle_rect_sel = { + .stroke_type = PLOT_OP_TYPE_SOLID, + .stroke_width = 3, +}; + +/** plot style for font on unselected nodes */ +static plot_font_style_t pfstyle_node = { + .family = PLOT_FONT_FAMILY_SANS_SERIF, + .size = 8 * FONT_SIZE_SCALE, + .weight = 400, + .flags = FONTF_NONE, +}; + +/** plot style for font on unselected nodes */ +static plot_font_style_t pfstyle_node_sel = { + .family = PLOT_FONT_FAMILY_SANS_SERIF, + .size = 8 * FONT_SIZE_SCALE, + .weight = 900, + .flags = FONTF_NONE, +}; + /** * Recursively redraw a history_entry. * @@ -260,19 +300,25 @@ browser_window_history__redraw_entry(struct history *history, size_t char_offset; int actual_x; struct history_entry *child; - colour c = entry == history->current ? - HISTORY_COLOUR_SELECTED : HISTORY_COLOUR_FOREGROUND; int tailsize = 5; int xoffset = x - x0; int yoffset = y - y0; - plot_style_t pstyle_history_rect = { - .stroke_type = PLOT_OP_TYPE_SOLID, - .stroke_colour = c, - .stroke_width = entry == history->current ? 3 : 1, - }; - plot_font_style_t fstyle = *plot_style_font; + + plot_style_t *pstyle; + plot_font_style_t *pfstyle; + nserror res; + /* setup plot styles */ + if (entry == history->current) { + pstyle = &pstyle_rect_sel; + pfstyle = &pfstyle_node_sel; + } else { + pstyle = &pstyle_rect; + pfstyle = &pfstyle_node; + } + + /* setup clip area */ if (clip) { struct rect rect; rect.x0 = x0 + xoffset; @@ -289,14 +335,16 @@ browser_window_history__redraw_entry(struct history *history, plot->bitmap(entry->x + xoffset, entry->y + yoffset, WIDTH, HEIGHT, - entry->bitmap, 0xffffff, 0); + entry->bitmap, + 0xffffff, + 0); } if (!plot->rectangle(entry->x - 1 + xoffset, - entry->y - 1 + yoffset, - entry->x + xoffset + WIDTH, - entry->y + yoffset + HEIGHT, - &pstyle_history_rect)) { + entry->y - 1 + yoffset, + entry->x + xoffset + WIDTH, + entry->y + yoffset + HEIGHT, + pstyle)) { return false; } @@ -307,36 +355,42 @@ browser_window_history__redraw_entry(struct history *history, return false; } - fstyle.background = HISTORY_COLOUR_BACKGROUND; - fstyle.foreground = c; - fstyle.weight = entry == history->current ? 900 : 400; - if (!plot->text(entry->x + xoffset, entry->y + HEIGHT + 12 + yoffset, - entry->page.title, char_offset, &fstyle)) + if (!plot->text(entry->x + xoffset, + entry->y + HEIGHT + 12 + yoffset, + entry->page.title, + char_offset, + pfstyle)) { return false; + } + /* for each child node draw a line and recurse redraw into it */ for (child = entry->forward; child; child = child->next) { if (!plot->line(entry->x + WIDTH + xoffset, entry->y + HEIGHT / 2 + yoffset, - entry->x + WIDTH + tailsize + xoffset, - entry->y + HEIGHT / 2 + yoffset, - plot_style_stroke_history)) + entry->x + WIDTH + tailsize + xoffset, + entry->y + HEIGHT / 2 + yoffset, + &pstyle_line)) { return false; + } if (!plot->line(entry->x + WIDTH + tailsize + xoffset, - entry->y + HEIGHT / 2 + yoffset, - child->x - tailsize +xoffset, - child->y + HEIGHT / 2 + yoffset, - plot_style_stroke_history)) + entry->y + HEIGHT / 2 + yoffset, + child->x - tailsize +xoffset, + child->y + HEIGHT / 2 + yoffset, + &pstyle_line)) { return false; + } if (!plot->line(child->x - tailsize + xoffset, - child->y + HEIGHT / 2 + yoffset, - child->x + xoffset, child->y + + child->y + HEIGHT / 2 + yoffset, + child->x + xoffset, child->y + HEIGHT / 2 + yoffset, - plot_style_stroke_history)) + &pstyle_line)) { return false; + } if (!browser_window_history__redraw_entry(history, child, - x0, y0, x1, y1, x, y, clip, ctx)) + x0, y0, x1, y1, x, y, clip, ctx)) { return false; + } } return true; @@ -415,6 +469,17 @@ nserror browser_window_history_create(struct browser_window *bw) { struct history *history; + pstyle_bg.fill_colour = ns_system_colour_char("Window"); + pfstyle_node.background = pstyle_bg.fill_colour; + pfstyle_node_sel.background = pstyle_bg.fill_colour; + + pstyle_line.stroke_colour = ns_system_colour_char("GrayText"); + pstyle_rect.stroke_colour = pstyle_line.stroke_colour; + pfstyle_node.foreground = pstyle_line.stroke_colour; + + pstyle_rect_sel.stroke_colour = ns_system_colour_char("Highlight"); + pfstyle_node_sel.foreground = pstyle_rect_sel.stroke_colour; + bw->history = NULL; history = calloc(1, sizeof *history); @@ -426,6 +491,7 @@ nserror browser_window_history_create(struct browser_window *bw) history->height = BOTTOM_MARGIN / 2; bw->history = history; + return NSERROR_OK; } @@ -709,6 +775,7 @@ bool browser_window_history_redraw(struct browser_window *bw, if (!history->start) return true; + return browser_window_history__redraw_entry(history, history->start, 0, 0, 0, 0, 0, 0, false, ctx); } @@ -726,6 +793,7 @@ bool browser_window_history_redraw_rectangle(struct browser_window *bw, if (!history->start) return true; + return browser_window_history__redraw_entry(history, history->start, x0, y0, x1, y1, x, y, true, ctx); } diff --git a/desktop/browser_private.h b/desktop/browser_private.h index 64c698b..072a894 100644 --- a/desktop/browser_private.h +++ b/desktop/browser_private.h @@ -26,9 +26,10 @@ #include <libwapcaplet/libwapcaplet.h> +#include "netsurf/types.h" #include "netsurf/browser_window.h" + #include "desktop/frame_types.h" -#include "desktop/plot_style.h" struct box; struct hlcache_handle; diff --git a/desktop/cookie_manager.c b/desktop/cookie_manager.c index 6134fa5..5429f68 100644 --- a/desktop/cookie_manager.c +++ b/desktop/cookie_manager.c @@ -843,6 +843,7 @@ nserror cookie_manager_fini(void) /* Destroy the cookie manager treeview */ err = treeview_destroy(cm_ctx.tree); + cm_ctx.tree = NULL; /* Free cookie manager treeview entry fields */ for (i = 0; i < COOKIE_M_N_FIELDS; i++) diff --git a/desktop/font_haru.h b/desktop/font_haru.h index 479f7de..988b9ba 100644 --- a/desktop/font_haru.h +++ b/desktop/font_haru.h @@ -26,7 +26,6 @@ #include <hpdf.h> -#include "desktop/plot_style.h" #include "desktop/font.h" bool haru_nsfont_apply_style(const plot_font_style_t *fstyle, diff --git a/desktop/global_history.c b/desktop/global_history.c index b6f4882..a19349f 100644 --- a/desktop/global_history.c +++ b/desktop/global_history.c @@ -803,6 +803,7 @@ nserror global_history_fini(void) /* Destroy the global history treeview */ err = treeview_destroy(gh_ctx.tree); + gh_ctx.tree = NULL; /* Free global history treeview entry fields */ for (i = 0; i < N_FIELDS; i++) diff --git a/desktop/hotlist.c b/desktop/hotlist.c index e344b3b..78473c7 100644 --- a/desktop/hotlist.c +++ b/desktop/hotlist.c @@ -1227,8 +1227,7 @@ static nserror hotlist_populate(const char *path) /* Exported interface, documented in hotlist.h */ -nserror hotlist_init(struct core_window_callback_table *cw_t, - void *core_window_handle, const char *path) +nserror hotlist_init(const char *path) { nserror err; @@ -1252,8 +1251,7 @@ nserror hotlist_init(struct core_window_callback_table *cw_t, /* Create the hotlist treeview */ err = treeview_create(&hl_ctx.tree, &hl_tree_cb_t, - HL_N_FIELDS, hl_ctx.fields, - cw_t, core_window_handle, + HL_N_FIELDS, hl_ctx.fields, NULL, NULL, TREEVIEW_NO_FLAGS); if (err != NSERROR_OK) { hl_ctx.tree = NULL; @@ -1271,10 +1269,41 @@ nserror hotlist_init(struct core_window_callback_table *cw_t, * the treeview is built. */ hl_ctx.built = true; + LOG("Loaded hotlist"); + + return NSERROR_OK; +} + + +/* Exported interface, documented in hotlist.h */ +nserror hotlist_manager_init(struct core_window_callback_table *cw_t, + void *core_window_handle) +{ + nserror err; + + /* Create the hotlist treeview */ + err = treeview_cw_attach(hl_ctx.tree, cw_t, core_window_handle); + if (err != NSERROR_OK) { + return err; + } + /* Inform client of window height */ treeview_get_height(hl_ctx.tree); - LOG("Loaded hotlist"); + return NSERROR_OK; +} + + +/* Exported interface, documented in hotlist.h */ +nserror hotlist_manager_fini(void) +{ + nserror err; + + /* Create the hotlist treeview */ + err = treeview_cw_detach(hl_ctx.tree); + if (err != NSERROR_OK) { + return err; + } return NSERROR_OK; } diff --git a/desktop/hotlist.h b/desktop/hotlist.h index 31aa030..c77ac92 100644 --- a/desktop/hotlist.h +++ b/desktop/hotlist.h @@ -33,18 +33,44 @@ struct rect; /** * Initialise the hotlist. * - * This opens the hotlist file, generating the hotlist data, and creates a + * This opens the hotlist file, construct the hostlist, and creates a * treeview. If there's no hotlist file, it generates a default hotlist. * - * This must be called before any other hotlist_* function. + * This must be called before any other hotlist_* function. It must + * be called before URLs can be added to the hotlist, and before the + * hotlist can be queried to ask if URLs are present in the hotlist. + * + * \param path The path to hotlist file to load + * \return NSERROR_OK on success, appropriate error otherwise + */ +nserror hotlist_init(const char *path); + +/** + * Initialise the hotlist manager. + * + * This connects the underlying hotlist treeview to a corewindow for display. + * + * The provided core window handle must be valid until hotlist_fini is called. * * \param cw_t Callback table for core_window containing the treeview * \param core_window_handle The handle in which the treeview is shown - * \param path The path to hotlist file to load * \return NSERROR_OK on success, appropriate error otherwise */ -nserror hotlist_init(struct core_window_callback_table *cw_t, - void *core_window_handle, const char *path); +nserror hotlist_manager_init(struct core_window_callback_table *cw_t, + void *core_window_handle); + + +/** + * Finalise the hotlist manager. + * + * This simply disconnects the underlying treeview from its corewindow, + * allowing destruction of a GUI hotlist window, without finalising the + * hotlist module. + * + * \param path The path to save hotlist to + * \return NSERROR_OK on success, appropriate error otherwise + */ +nserror hotlist_manager_fini(void); /** * Finalise the hotlist. diff --git a/desktop/knockout.c b/desktop/knockout.c index b930ef6..bcfc272 100644 --- a/desktop/knockout.c +++ b/desktop/knockout.c @@ -71,10 +71,10 @@ #include "utils/errors.h" #include "netsurf/bitmap.h" #include "content/content.h" +#include "netsurf/plotters.h" #include "desktop/gui_internal.h" #include "desktop/knockout.h" -#include "netsurf/plotters.h" /* Define to enable knockout debug */ #undef KNOCKOUT_DEBUG diff --git a/desktop/netsurf.c b/desktop/netsurf.c index d129ef7..0f597aa 100644 --- a/desktop/netsurf.c +++ b/desktop/netsurf.c @@ -25,12 +25,12 @@ #include <stdlib.h> #include <libwapcaplet/libwapcaplet.h> +#include "netsurf/inttypes.h" #include "utils/config.h" #include "utils/nsoption.h" #include "utils/corestrings.h" #include "utils/log.h" #include "utils/utf8.h" -#include "utils/utils.h" #include "utils/messages.h" #include "content/content_factory.h" #include "content/fetchers.h" @@ -279,6 +279,9 @@ void netsurf_exit(void) LOG("Destroying System colours"); ns_system_colour_finalize(); + LOG("Destroying Messages"); + messages_destroy(); + corestrings_fini(); LOG("Remaining lwc strings:"); lwc_iterate_strings(netsurf_lwc_iterator, NULL); diff --git a/desktop/options.h b/desktop/options.h index 437d104..d91898c 100644 --- a/desktop/options.h +++ b/desktop/options.h @@ -30,7 +30,7 @@ #ifndef _NETSURF_DESKTOP_OPTIONS_H_ #define _NETSURF_DESKTOP_OPTIONS_H_ -#include "desktop/plot_style.h" +#include "netsurf/types.h" /* defines for system colour table */ #define NSOPTION_SYS_COLOUR_START NSOPTION_sys_colour_ActiveBorder diff --git a/desktop/plot_style.c b/desktop/plot_style.c index f9ba4bc..1f0ac39 100644 --- a/desktop/plot_style.c +++ b/desktop/plot_style.c @@ -16,14 +16,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/** - * \file desktop/plot_style.c +/** + * \file * \brief Plotter global styles. * * These plot styles are globaly available and used in many places. */ -#include "netsurf/plotters.h" +#include "netsurf/plot_style.h" static plot_style_t plot_style_fill_white_static = { .fill_type = PLOT_OP_TYPE_SOLID, @@ -152,15 +152,6 @@ static plot_style_t plot_style_stroke_lightwbasec_static = { }; plot_style_t *plot_style_stroke_lightwbasec = &plot_style_stroke_lightwbasec_static; -/* history styles */ - -/** stroke style for history core. */ -static plot_style_t plot_style_stroke_history_static = { - .stroke_type = PLOT_OP_TYPE_SOLID, - .stroke_colour = HISTORY_COLOUR_LINES, - .stroke_width = 2, -}; -plot_style_t *plot_style_stroke_history = &plot_style_stroke_history_static; /* Generic font style */ static const plot_font_style_t plot_style_font_static = { diff --git a/desktop/scrollbar.c b/desktop/scrollbar.c index b9e963a..9a4d70f 100644 --- a/desktop/scrollbar.c +++ b/desktop/scrollbar.c @@ -29,14 +29,12 @@ #include "utils/messages.h" #include "utils/utils.h" #include "utils/nsoption.h" - #include "netsurf/browser_window.h" -#include "desktop/system_colour.h" #include "netsurf/mouse.h" -#include "desktop/scrollbar.h" #include "netsurf/plotters.h" -#include "desktop/plot_style.h" +#include "desktop/system_colour.h" +#include "desktop/scrollbar.h" struct scrollbar { bool horizontal; /* Horizontal scrollbar if true, else vertical diff --git a/desktop/searchweb.c b/desktop/searchweb.c index 593591c..29a998e 100644 --- a/desktop/searchweb.c +++ b/desktop/searchweb.c @@ -60,7 +60,7 @@ static const char *default_search_icon_url = "resource:icons/search.png"; /** * Read providers file. * - * Allocates stoage of sufficient size for the providers file and + * Allocates storage of sufficient size for the providers file and * reads the entire file in. * * \param fname The filename to read. @@ -132,7 +132,7 @@ read_providers(const char *fname, * \param providers_size The size of the provider data. * \param providers_out The resulting provider array. * \param providers_count The number of providers in the output array. - * \return NSERROR_OK on success or error code on faliure. + * \return NSERROR_OK on success or error code on failure. */ static nserror parse_providers(char *providersd, @@ -224,7 +224,7 @@ parse_providers(char *providersd, * \param provider The provider to use. * \param term The term being searched for. * \param url_out The resulting url. - * \return NSERROR_OK on sucess or appropriate error code. + * \return NSERROR_OK on success or appropriate error code. */ static nserror make_search_nsurl(struct search_provider *provider, @@ -289,7 +289,7 @@ search_web_ico_callback(hlcache_handle *ico, switch (event->type) { case CONTENT_MSG_DONE: - LOG("icon '%s' retrived", nsurl_access(hlcache_handle_get_url(ico))); + LOG("icon '%s' retrieved", nsurl_access(hlcache_handle_get_url(ico))); guit->search_web->provider_update(provider->name, content_get_bitmap(ico)); break; @@ -399,7 +399,7 @@ nserror search_web_select_provider(int selection) guit->search_web->provider_update(provider->name, ico_bitmap); - /* if the providers icon has not been retrived get it now */ + /* if the providers icon has not been retrieved get it now */ if (provider->ico_handle == NULL) { nsurl *icon_nsurl; nserror ret; @@ -438,7 +438,7 @@ default_ico_callback(hlcache_handle *ico, switch (event->type) { case CONTENT_MSG_DONE: - LOG("default icon '%s' retrived", nsurl_access(hlcache_handle_get_url(ico))); + LOG("default icon '%s' retrieved", nsurl_access(hlcache_handle_get_url(ico))); /* only set to default icon if providers icon has no handle */ if (ctx->providers[search_web_ctx.current].ico_handle == NULL) { diff --git a/desktop/system_colour.h b/desktop/system_colour.h index b5d4baa..8e82818 100644 --- a/desktop/system_colour.h +++ b/desktop/system_colour.h @@ -26,7 +26,7 @@ #include <libcss/libcss.h> #include "utils/errors.h" -#include "desktop/plot_style.h" +#include "netsurf/types.h" /** css callback to obtain named system colours. */ css_error ns_system_colour(void *pw, lwc_string *name, css_color *color); diff --git a/desktop/textarea.h b/desktop/textarea.h index 74652f3..65e2594 100644 --- a/desktop/textarea.h +++ b/desktop/textarea.h @@ -27,9 +27,7 @@ #include <stdint.h> #include <stdbool.h> -#include "utils/utils.h" - -#include "desktop/plot_style.h" +#include "netsurf/plot_style.h" #include "netsurf/mouse.h" struct textarea; diff --git a/desktop/treeview.c b/desktop/treeview.c index 387b34e..4d8fbaa 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -22,6 +22,7 @@ * Treeview handling implementation. */ +#include "utils/utils.h" #include "utils/log.h" #include "utils/nsurl.h" #include "utils/nsoption.h" @@ -219,6 +220,72 @@ static struct treeview_resource treeview_res[TREE_RES_LAST] = { }; /**< Treeview content resources */ +/** + * Corewindow callback wrapper: Request a redraw of the window + * + * \param[in] cw the core window object + * \param[in] r rectangle to redraw + */ +static inline void treeview__cw_redraw_request( + const struct treeview *tree, + const struct rect *r) +{ + if (tree->cw_t != NULL) { + tree->cw_t->redraw_request(tree->cw_h, r); + } +} + + +/** + * Corewindow callback wrapper: Update the limits of the window + * + * \param[in] cw the core window object + * \param[in] width the width in px, or negative if don't care + * \param[in] height the height in px, or negative if don't care + */ +static inline void treeview__cw_update_size( + const struct treeview *tree, + int width, int height) +{ + if (tree->cw_t != NULL) { + tree->cw_t->update_size(tree->cw_h, width, height); + } +} + + +/** + * Corewindow callback wrapper: Get window viewport dimensions + * + * \param[in] cw the core window object + * \param[out] width to be set to viewport width in px + * \param[out] height to be set to viewport height in px + */ +static inline void treeview__cw_get_window_dimensions( + const struct treeview *tree, + int *width, int *height) +{ + if (tree->cw_t != NULL) { + tree->cw_t->get_window_dimensions(tree->cw_h, width, height); + } +} + + +/** + * Corewindow callback wrapper: Inform corewindow owner of drag status + * + * \param[in] cw the core window object + * \param[in] ds the current drag status + */ +static inline void treeview__cw_drag_status( + const struct treeview *tree, + core_window_drag_status ds) +{ + if (tree->cw_t != NULL) { + tree->cw_t->drag_status(tree->cw_h, ds); + } +} + + /* Helper function to access the given field of a node * * \param tree Treeview that node belongs to @@ -605,7 +672,7 @@ nserror treeview_create_node_folder(treeview *tree, if (n->parent->flags & TV_NFLAGS_EXPANDED) { /* Inform front end of change in dimensions */ if (!(flags & TREE_OPTION_SUPPRESS_RESIZE)) - tree->cw_t->update_size(tree->cw_h, -1, + treeview__cw_update_size(tree, -1, tree->root->height); /* Redraw */ @@ -615,7 +682,7 @@ nserror treeview_create_node_folder(treeview *tree, r.y0 = treeview_node_y(tree, n); r.x1 = REDRAW_MAX; r.y1 = tree->root->height; - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); } } @@ -665,7 +732,7 @@ nserror treeview_update_node_folder(treeview *tree, r.y0 = treeview_node_y(tree, folder); r.x1 = REDRAW_MAX; r.y1 = r.y0 + tree_g.line_height; - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); } return NSERROR_OK; @@ -736,7 +803,7 @@ nserror treeview_update_node_entry(treeview *tree, r.y0 = treeview_node_y(tree, entry); r.x1 = REDRAW_MAX; r.y1 = r.y0 + entry->height; - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); } return NSERROR_OK; @@ -811,7 +878,7 @@ nserror treeview_create_node_entry(treeview *tree, if (n->parent->flags & TV_NFLAGS_EXPANDED) { /* Inform front end of change in dimensions */ if (!(flags & TREE_OPTION_SUPPRESS_RESIZE)) - tree->cw_t->update_size(tree->cw_h, -1, + treeview__cw_update_size(tree, -1, tree->root->height); /* Redraw */ @@ -821,7 +888,7 @@ nserror treeview_create_node_entry(treeview *tree, r.y0 = treeview_node_y(tree, n); r.x1 = REDRAW_MAX; r.y1 = tree->root->height; - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); } } @@ -942,7 +1009,7 @@ static void treeview_edit_cancel(treeview *tree, bool redraw) r.y0 = tree->edit.y; r.x1 = tree->edit.x + tree->edit.w; r.y1 = tree->edit.y + tree->edit.h; - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); } } @@ -1110,7 +1177,7 @@ static nserror treeview_delete_node_internal(treeview *tree, treeview_node *n, if (tree->root != NULL && p != NULL && p->flags & TV_NFLAGS_EXPANDED && nd.h_reduction > 0 && !(flags & TREE_OPTION_SUPPRESS_RESIZE)) { - tree->cw_t->update_size(tree->cw_h, -1, + treeview__cw_update_size(tree, -1, tree->root->height); } @@ -1253,7 +1320,7 @@ nserror treeview_delete_node(treeview *tree, treeview_node *n, if (tree->root->height != h) { r.y0 = 0; if (!(flags & TREE_OPTION_SUPPRESS_RESIZE)) { - tree->cw_t->update_size(tree->cw_h, -1, + treeview__cw_update_size(tree, -1, tree->root->height); } } @@ -1263,7 +1330,7 @@ nserror treeview_delete_node(treeview *tree, treeview_node *n, if (visible && !(flags & TREE_OPTION_SUPPRESS_REDRAW)) { r.x0 = 0; r.x1 = REDRAW_MAX; - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); } return NSERROR_OK; @@ -1280,8 +1347,7 @@ nserror treeview_create(treeview **tree, nserror error; int i; - assert(cw_t != NULL); - assert(cw != NULL); + assert((cw_t == NULL && cw == NULL) || (cw_t != NULL && cw != NULL)); assert(callbacks != NULL); assert(fields != NULL); @@ -1357,6 +1423,35 @@ nserror treeview_create(treeview **tree, /* Exported interface, documented in treeview.h */ +nserror treeview_cw_attach(treeview *tree, + const struct core_window_callback_table *cw_t, + struct core_window *cw) +{ + assert(cw_t != NULL); + assert(cw != NULL); + + if (tree->cw_t != NULL || tree->cw_h != NULL) { + LOG("Treeview already attached."); + return NSERROR_UNKNOWN; + } + tree->cw_t = cw_t; + tree->cw_h = cw; + + return NSERROR_OK; +} + + +/* Exported interface, documented in treeview.h */ +nserror treeview_cw_detach(treeview *tree) +{ + tree->cw_t = NULL; + tree->cw_h = NULL; + + return NSERROR_OK; +} + + +/* Exported interface, documented in treeview.h */ nserror treeview_destroy(treeview *tree) { int f; @@ -1469,7 +1564,7 @@ static nserror treeview_node_expand_internal(treeview *tree, /* Inform front end of change in dimensions */ if (additional_height != 0) - tree->cw_t->update_size(tree->cw_h, -1, tree->root->height); + treeview__cw_update_size(tree, -1, tree->root->height); return NSERROR_OK; } @@ -1491,7 +1586,7 @@ nserror treeview_node_expand(treeview *tree, treeview_node *node) r.y1 = tree->root->height; /* Redraw */ - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); return NSERROR_OK; } @@ -1563,7 +1658,7 @@ static nserror treeview_node_contract_internal(treeview *tree, node->flags |= TV_NFLAGS_SELECTED; /* Inform front end of change in dimensions */ - tree->cw_t->update_size(tree->cw_h, -1, tree->root->height); + treeview__cw_update_size(tree, -1, tree->root->height); return NSERROR_OK; } @@ -1587,7 +1682,7 @@ nserror treeview_node_contract(treeview *tree, treeview_node *node) return err; /* Redraw */ - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); return NSERROR_OK; } @@ -1630,10 +1725,10 @@ nserror treeview_contract(treeview *tree, bool all) } /* Inform front end of change in dimensions */ - tree->cw_t->update_size(tree->cw_h, -1, tree->root->height); + treeview__cw_update_size(tree, -1, tree->root->height); /* Redraw */ - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); return NSERROR_OK; } @@ -1687,7 +1782,7 @@ nserror treeview_expand(treeview *tree, bool only_folders) r.y1 = tree->root->height; /* Redraw */ - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); return NSERROR_OK; } @@ -2474,7 +2569,7 @@ static nserror treeview_move_selection(treeview *tree, struct rect *rect) /* Tell window, if height has changed */ if (height != tree->root->height) - tree->cw_t->update_size(tree->cw_h, -1, tree->root->height); + treeview__cw_update_size(tree, -1, tree->root->height); /* TODO: Deal with redraw area properly */ rect->x0 = 0; @@ -2782,7 +2877,7 @@ bool treeview_keypress(treeview *tree, uint32_t key) /* Inform front end of change in dimensions */ if (tree->root->height != h) { r.y0 = 0; - tree->cw_t->update_size(tree->cw_h, -1, + treeview__cw_update_size(tree, -1, tree->root->height); } } @@ -2806,7 +2901,7 @@ bool treeview_keypress(treeview *tree, uint32_t key) } if (redraw) { - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); } return true; @@ -2963,7 +3058,7 @@ static void treeview_textarea_callback(void *data, struct textarea_msg *msg) /* Textarea drag started */ tree->drag.type = TV_DRAG_TEXTAREA; } - tree->cw_t->drag_status(tree->cw_h, tree->drag.type); + treeview__cw_drag_status(tree, tree->drag.type); break; case TEXTAREA_MSG_REDRAW_REQUEST: @@ -2974,7 +3069,7 @@ static void treeview_textarea_callback(void *data, struct textarea_msg *msg) r->y1 += tree->edit.y; /* Redraw the textarea */ - tree->cw_t->redraw_request(tree->cw_h, r); + treeview__cw_redraw_request(tree, r); break; default: @@ -3044,7 +3139,7 @@ static bool treeview_edit_node_at_point(treeview *tree, treeview_node *n, } /* Get window width/height */ - tree->cw_t->get_window_dimensions(tree->cw_h, &width, &height); + treeview__cw_get_window_dimensions(tree, &width, &height); /* Anow textarea width/height */ field_x = n->inset + tree_g.step_width + tree_g.icon_step - 3; @@ -3147,7 +3242,7 @@ void treeview_edit_selection(treeview *tree) rect.y0 = y; rect.x1 = REDRAW_MAX; rect.y1 = y + tree_g.line_height; - tree->cw_t->redraw_request(tree->cw_h, &rect); + treeview__cw_redraw_request(tree, &rect); } @@ -3266,7 +3361,7 @@ static nserror treeview_node_mouse_action_cb(treeview_node *node, void *ctx, ma->tree->drag.selected == false && ma->tree->drag.part == TV_NODE_PART_NONE) { ma->tree->drag.type = TV_DRAG_SELECTION; - ma->tree->cw_t->drag_status(ma->tree->cw_h, + treeview__cw_drag_status(ma->tree, CORE_WINDOW_DRAG_SELECTION); } else if (!(ma->tree->flags & TREEVIEW_NO_MOVES) && @@ -3274,13 +3369,13 @@ static nserror treeview_node_mouse_action_cb(treeview_node *node, void *ctx, (ma->tree->drag.selected == true || ma->tree->drag.part == TV_NODE_PART_ON_NODE)) { ma->tree->drag.type = TV_DRAG_MOVE; - ma->tree->cw_t->drag_status(ma->tree->cw_h, + treeview__cw_drag_status(ma->tree, CORE_WINDOW_DRAG_MOVE); redraw |= treeview_propagate_selection(ma->tree, &r); } else if (ma->mouse & BROWSER_MOUSE_DRAG_2) { ma->tree->drag.type = TV_DRAG_SELECTION; - ma->tree->cw_t->drag_status(ma->tree->cw_h, + treeview__cw_drag_status(ma->tree, CORE_WINDOW_DRAG_SELECTION); } @@ -3407,7 +3502,7 @@ static nserror treeview_node_mouse_action_cb(treeview_node *node, void *ctx, } if (redraw) { - ma->tree->cw_t->redraw_request(ma->tree->cw_h, &r); + treeview__cw_redraw_request(ma->tree, &r); } *end = true; /* Reached line with click; stop walking tree */ @@ -3456,8 +3551,7 @@ void treeview_mouse_action(treeview *tree, tree->drag.type = TV_DRAG_NONE; tree->drag.start_node = NULL; - tree->cw_t->drag_status(tree->cw_h, - CORE_WINDOW_DRAG_NONE); + treeview__cw_drag_status(tree, CORE_WINDOW_DRAG_NONE); return; case TV_DRAG_MOVE: treeview_move_selection(tree, &r); @@ -3467,9 +3561,8 @@ void treeview_mouse_action(treeview *tree, tree->move.target = NULL; tree->move.target_pos = TV_TARGET_NONE; - tree->cw_t->drag_status(tree->cw_h, - CORE_WINDOW_DRAG_NONE); - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_drag_status(tree, CORE_WINDOW_DRAG_NONE); + treeview__cw_redraw_request(tree, &r); return; default: /* No drag to end */ @@ -3506,11 +3599,11 @@ void treeview_mouse_action(treeview *tree, tree->drag.selected == false && tree->drag.part == TV_NODE_PART_NONE) { tree->drag.type = TV_DRAG_SELECTION; - tree->cw_t->drag_status(tree->cw_h, + treeview__cw_drag_status(tree, CORE_WINDOW_DRAG_SELECTION); } else if (mouse & BROWSER_MOUSE_DRAG_2) { tree->drag.type = TV_DRAG_SELECTION; - tree->cw_t->drag_status(tree->cw_h, + treeview__cw_drag_status(tree, CORE_WINDOW_DRAG_SELECTION); } @@ -3544,7 +3637,7 @@ void treeview_mouse_action(treeview *tree, } if (redraw) { - tree->cw_t->redraw_request(tree->cw_h, &r); + treeview__cw_redraw_request(tree, &r); } } else { @@ -3569,7 +3662,7 @@ int treeview_get_height(treeview *tree) assert(tree != NULL); assert(tree->root != NULL); - tree->cw_t->update_size(tree->cw_h, -1, tree->root->height); + treeview__cw_update_size(tree, -1, tree->root->height); return tree->root->height; } @@ -3670,6 +3763,8 @@ static void treeview_init_resources(void) for (i = 0; i < TREE_RES_LAST; i++) { nsurl *url; + treeview_res[i].ready = false; + treeview_res[i].height = 0; if (nsurl_create(treeview_res[i].url, &url) == NSERROR_OK) { hlcache_handle_retrieve(url, 0, NULL, NULL, treeview_res_cb, diff --git a/desktop/treeview.h b/desktop/treeview.h index abe0e56..518f045 100644 --- a/desktop/treeview.h +++ b/desktop/treeview.h @@ -150,6 +150,28 @@ nserror treeview_create(treeview **tree, struct core_window *cw, treeview_flags flags); /** + * Attach a treeview to a corewindow. + * + * Treeview must be detached. + * + * \param tree Treeview object + * \param cw_t Callback table for core_window containing the treeview + * \param cw The core_window in which the treeview is shown + * \return NSERROR_OK on success, appropriate error otherwise + */ +nserror treeview_cw_attach(treeview *tree, + const struct core_window_callback_table *cw_t, + struct core_window *cw); + +/** + * Detach a treeview from a corewindow + * + * \param tree Treeview object + * \return NSERROR_OK on success, appropriate error otherwise + */ +nserror treeview_cw_detach(treeview *tree); + +/** * Destroy a treeview object * * \param tree Treeview object to destroy diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index a2c1b13..f57b4ef 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -36,8 +36,8 @@ MESSAGES_FILTER=ami # ---------------------------------------------------------------------------- # sources purely for the Amiga build -S_FRONTEND := gui.c tree.c history.c hotlist.c schedule.c file.c \ - misc.c bitmap.c font.c filetype.c utf8.c login.c \ +S_FRONTEND := gui.c history.c hotlist.c schedule.c file.c \ + misc.c bitmap.c font.c filetype.c utf8.c login.c memory.c \ plotters.c object.c menu.c save_pdf.c arexx.c version.c \ cookies.c ctxmenu.c clipboard.c help.c font_scan.c \ launch.c search.c history_local.c download.c iff_dr2d.c \ @@ -45,7 +45,8 @@ S_FRONTEND := gui.c tree.c history.c hotlist.c schedule.c file.c \ datatypes.c dt_picture.c dt_anim.c dt_sound.c plugin_hack.c \ stringview/stringview.c stringview/urlhistory.c rtg.c \ agclass/amigaguide_class.c os3support.c font_diskfont.c \ - selectmenu.c hash/xxhash.c font_cache.c font_bullet.c nsoption.c + selectmenu.c hash/xxhash.c font_cache.c font_bullet.c \ + nsoption.c corewindow.c gui_menu.c # This is the final source build list # Note this is deliberately *not* expanded here as common and image @@ -75,9 +76,9 @@ AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga netsurf.lha: $(EXETARGET) $(VQ)echo Creating netsurf.lha $(Q)rm -rf $(AMIGA_INSTALL_TARGET_DIR) - $(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf + $(Q)$(MKDIR) -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf $(Q)cp -p $(EXETARGET) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf - $(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources + $(Q)$(MKDIR) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources $(Q)cp -rp $(AMIGA_RESOURCES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources $(Q)cp -rp $(AMIGA_DISTRIBUTION_FILES) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf $(Q)cat resources/SearchEngines $(AMIGA_PKG_DIR)/SearchEngines >$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/SearchEngines diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c index 062f00b..7bb2f58 100644 --- a/frontends/amiga/arexx.c +++ b/frontends/amiga/arexx.c @@ -40,11 +40,14 @@ #include "amiga/gui.h" #include "amiga/download.h" #include "amiga/hotlist.h" -#include "amiga/tree.h" #include "amiga/libs.h" #include "amiga/misc.h" #include "amiga/theme.h" +#ifndef __amigaos4__ +#include "amiga/memory.h" +#endif + extern const char * const verarexx; extern const char * const wt_revid; @@ -65,7 +68,8 @@ enum RX_WINDOWS, RX_ACTIVE, RX_CLOSE, - RX_HOTLIST + RX_HOTLIST, + RX_SLABSTATS }; static Object *arexx_obj = NULL; @@ -93,6 +97,7 @@ RXHOOKF(rx_windows); RXHOOKF(rx_active); RXHOOKF(rx_close); RXHOOKF(rx_hotlist); +RXHOOKF(rx_slabstats); STATIC struct ARexxCmd Commands[] = { @@ -112,6 +117,7 @@ STATIC struct ARexxCmd Commands[] = {"ACTIVE", RX_ACTIVE, rx_active, "T=TAB/S", 0, NULL, 0, 0, NULL }, {"CLOSE", RX_CLOSE, rx_close, "W=WINDOW/K/N,T=TAB/K/N", 0, NULL, 0, 0, NULL }, {"HOTLIST", RX_HOTLIST, rx_hotlist, "A=ACTION/A", 0, NULL, 0, 0, NULL }, + {"SLABSTATS", RX_SLABSTATS, rx_slabstats, "FILE", 0, NULL, 0, 0, NULL }, { NULL, 0, NULL, NULL, 0, NULL, 0, 0, NULL } }; @@ -271,7 +277,7 @@ RXHOOKF(rx_open) { if(!gw) return; - dln = ami_misc_allocvec_clear(sizeof(struct dlnode), 0); + dln = calloc(1, sizeof(struct dlnode)); dln->filename = strdup((char *)cmd->ac_ArgList[3]); dln->node.ln_Name = strdup((char *)cmd->ac_ArgList[0]); dln->node.ln_Type = NT_USER; @@ -658,9 +664,23 @@ RXHOOKF(rx_hotlist) cmd->ac_RC = 0; if(strcasecmp((char *)cmd->ac_ArgList[0], "OPEN") == 0) { - ami_tree_open(hotlist_window, AMI_TREE_HOTLIST); + ami_hotlist_present(); } else if(strcasecmp((char *)cmd->ac_ArgList[0], "CLOSE") == 0) { - ami_tree_close(hotlist_window); + ami_hotlist_close(); + } +} + +RXHOOKF(rx_slabstats) +{ +#ifndef __amigaos4__ + BPTR fh = 0; + + if(cmd->ac_ArgList[0] != NULL) { + fh = Open((char *)cmd->ac_ArgList[0], MODE_NEWFILE); } + ami_memory_slab_dump(fh); + + if(fh != 0) Close(fh); +#endif } diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 8c691ed..5fc772b 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -40,6 +40,7 @@ #endif #ifdef __amigaos4__ +#include <exec/extmem.h> #include <sys/param.h> #endif #include "assert.h" @@ -54,8 +55,10 @@ #include "amiga/gui.h" #include "amiga/bitmap.h" #include "amiga/plotters.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/rtg.h" +#include "amiga/schedule.h" // disable use of "triangle mode" for scaling #ifdef AMI_NS_TRIANGLE_SCALING @@ -66,6 +69,8 @@ struct bitmap { int width; int height; UBYTE *pixdata; + struct ExtMemIFace *iextmem; + uint32 size; bool opaque; int native; struct BitMap *nativebm; @@ -107,12 +112,30 @@ void *amiga_bitmap_create(int width, int height, unsigned int state) { struct bitmap *bitmap; - if(pool_bitmap == NULL) pool_bitmap = ami_misc_itempool_create(sizeof(struct bitmap)); + if(pool_bitmap == NULL) pool_bitmap = ami_memory_itempool_create(sizeof(struct bitmap)); - bitmap = ami_misc_itempool_alloc(pool_bitmap, sizeof(struct bitmap)); + bitmap = ami_memory_itempool_alloc(pool_bitmap, sizeof(struct bitmap)); if(bitmap == NULL) return NULL; - bitmap->pixdata = ami_misc_allocvec_clear(width*height*4, 0xff); + bitmap->size = width * height * 4; + +#ifdef __amigaos4__ + if(nsoption_bool(use_extmem) == true) { + uint64 size64 = bitmap->size; + bitmap->iextmem = AllocSysObjectTags(ASOT_EXTMEM, + ASOEXTMEM_Size, &size64, + ASOEXTMEM_AllocationPolicy, EXTMEMPOLICY_IMMEDIATE, + TAG_END); + + bitmap->pixdata = NULL; + UBYTE *pixdata = amiga_bitmap_get_buffer(bitmap); + memset(pixdata, 0xff, bitmap->size); + } else +#endif + { + bitmap->pixdata = ami_memory_clear_alloc(bitmap->size, 0xff); + } + bitmap->width = width; bitmap->height = height; @@ -132,11 +155,36 @@ void *amiga_bitmap_create(int width, int height, unsigned int state) return bitmap; } +static void amiga_bitmap_unmap_buffer(void *p) +{ +#ifdef __amigaos4__ + struct bitmap *bm = p; + + if((nsoption_bool(use_extmem) == true) && (bm->pixdata != NULL)) { + LOG("Unmapping ExtMem object %p for bitmap %p", bm->iextmem, bm); + bm->iextmem->Unmap(bm->pixdata, bm->size); + bm->pixdata = NULL; + } +#endif +} /* exported function documented in amiga/bitmap.h */ unsigned char *amiga_bitmap_get_buffer(void *bitmap) { struct bitmap *bm = bitmap; + +#ifdef __amigaos4__ + if(nsoption_bool(use_extmem) == true) { + if(bm->pixdata == NULL) { + LOG("Mapping ExtMem object %p for bitmap %p", bm->iextmem, bm); + bm->pixdata = bm->iextmem->Map(NULL, bm->size, 0LL, 0); + } + + /* unmap the buffer after one second */ + ami_schedule(1000, amiga_bitmap_unmap_buffer, bm); + } +#endif + return bm->pixdata; } @@ -168,8 +216,19 @@ void amiga_bitmap_destroy(void *bitmap) } if(bm->native_mask) FreeRaster(bm->native_mask, bm->width, bm->height); - if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); - FreeVec(bm->pixdata); + +#ifdef __amigaos4__ + if(nsoption_bool(use_extmem) == true) { + ami_schedule(-1, amiga_bitmap_unmap_buffer, bm); + amiga_bitmap_unmap_buffer(bm); + FreeSysObject(ASOT_EXTMEM, bm->iextmem); + bm->iextmem = NULL; + } else +#endif + { + if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); + ami_memory_clear_free(bm->pixdata); + } if(bm->url) nsurl_unref(bm->url); if(bm->title) free(bm->title); @@ -181,7 +240,7 @@ void amiga_bitmap_destroy(void *bitmap) bm->url = NULL; bm->title = NULL; - ami_misc_itempool_free(pool_bitmap, bm, sizeof(struct bitmap)); + ami_memory_itempool_free(pool_bitmap, bm, sizeof(struct bitmap)); bm = NULL; } } @@ -217,9 +276,12 @@ void amiga_bitmap_modified(void *bitmap) { struct bitmap *bm = bitmap; - if((bm->nativebm)) // && (bm->native == AMI_NSBM_TRUECOLOUR)) - ami_rtg_freebitmap(bm->nativebm); - +#ifdef __amigaos4__ + /* unmap the buffer after 0.5s - we might need it imminently */ + ami_schedule(500, amiga_bitmap_unmap_buffer, bm); +#endif + + if(bm->nativebm) ami_rtg_freebitmap(bm->nativebm); if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); if(bm->native_mask) FreeRaster(bm->native_mask, bm->width, bm->height); bm->nativebm = NULL; @@ -654,13 +716,15 @@ struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap, void ami_bitmap_fini(void) { - if(pool_bitmap) ami_misc_itempool_delete(pool_bitmap); + if(pool_bitmap) ami_memory_itempool_delete(pool_bitmap); pool_bitmap = NULL; } static nserror bitmap_render(struct bitmap *bitmap, struct hlcache_handle *content) { #ifdef __amigaos4__ + LOG("Entering bitmap_render"); + struct redraw_context ctx = { .interactive = false, .background_images = true, @@ -729,14 +793,15 @@ void ami_bitmap_set_title(struct bitmap *bm, const char *title) bm->title = strdup(title); } -ULONG *ami_bitmap_get_icondata(struct bitmap *bm) +void ami_bitmap_set_icondata(struct bitmap *bm, ULONG *icondata) { - return bm->icondata; + bm->icondata = icondata; } -void ami_bitmap_set_icondata(struct bitmap *bm, ULONG *icondata) +void ami_bitmap_free_icondata(struct bitmap *bm) { - bm->icondata = icondata; + if(bm->icondata) free(bm->icondata); + bm->icondata = NULL; } bool ami_bitmap_is_nativebm(struct bitmap *bm, struct BitMap *nbm) diff --git a/frontends/amiga/bitmap.h b/frontends/amiga/bitmap.h index 771ded4..a32d740 100755 --- a/frontends/amiga/bitmap.h +++ b/frontends/amiga/bitmap.h @@ -63,24 +63,24 @@ void ami_bitmap_set_url(struct bitmap *bm, struct nsurl *url); void ami_bitmap_set_title(struct bitmap *bm, const char *title); /** - * Get an icondata pointer + * Set an icondata pointer * * \param bm a bitmap, as returned by bitmap_create() - * \return pointer to the icondata area + * \param icondata a pointer to memory * * This function probably shouldn't be here! */ -ULONG *ami_bitmap_get_icondata(struct bitmap *bm); +void ami_bitmap_set_icondata(struct bitmap *bm, ULONG *icondata); /** - * Set an icondata pointer + * Free an icondata pointer * * \param bm a bitmap, as returned by bitmap_create() * \param icondata a pointer to memory * * This function probably shouldn't be here! */ -void ami_bitmap_set_icondata(struct bitmap *bm, ULONG *icondata); +void ami_bitmap_free_icondata(struct bitmap *bm); /** * Test if a BitMap is owned by a bitmap. diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c index 2dce068..27b8015 100644 --- a/frontends/amiga/clipboard.c +++ b/frontends/amiga/clipboard.c @@ -44,8 +44,7 @@ #include "amiga/gui.h" #include "amiga/iff_cset.h" #include "amiga/iff_dr2d.h" -#include "amiga/menu.h" -#include "amiga/misc.h" +#include "amiga/gui_menu.h" #include "amiga/utf8.h" #define ID_UTF8 MAKE_ID('U','T','F','8') @@ -90,11 +89,11 @@ void gui_start_selection(struct gui_window *g) if(!g->shared->win) return; if(nsoption_bool(kiosk_mode) == true) return; - OnMenu(g->shared->win, AMI_MENU_CLEAR); - OnMenu(g->shared->win, AMI_MENU_COPY); + ami_gui_menu_set_disabled(g->shared->win, g->shared->imenu, M_COPY, false); + ami_gui_menu_set_disabled(g->shared->win, g->shared->imenu, M_CLEAR, false); if (browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_CUT) - OnMenu(g->shared->win, AMI_MENU_CUT); + ami_gui_menu_set_disabled(g->shared->win, g->shared->imenu, M_CUT, false); } static char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codeset, size_t *text_length) @@ -114,10 +113,10 @@ static char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codese case 0: if(ci_new) { - ci_next->ci_Next = ami_misc_allocvec_clear(sizeof(struct CollectionItem), 0); + ci_next->ci_Next = calloc(1, sizeof(struct CollectionItem)); ci_next = ci_next->ci_Next; } else { - ci_new = ami_misc_allocvec_clear(sizeof(struct CollectionItem), 0); + ci_new = calloc(1, sizeof(struct CollectionItem)); ci_next = ci_new; } @@ -128,10 +127,10 @@ static char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codese default: if(ci_new) { - ci_next->ci_Next = ami_misc_allocvec_clear(sizeof(struct CollectionItem), 0); + ci_next->ci_Next = calloc(1, sizeof(struct CollectionItem)); ci_next = ci_next->ci_Next; } else { - ci_new = ami_misc_allocvec_clear(sizeof(struct CollectionItem), 0); + ci_new = calloc(1, sizeof(struct CollectionItem)); ci_next = ci_new; } @@ -166,7 +165,7 @@ static char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codese if(ci_new) { free(ci_curr->ci_Data); - FreeVec(ci_curr); + free(ci_curr); } } while ((ci_curr = ci_next)); diff --git a/frontends/amiga/cookies.c b/frontends/amiga/cookies.c old mode 100755 new mode 100644 index 15f6dce..877805c --- a/frontends/amiga/cookies.c +++ b/frontends/amiga/cookies.c @@ -1,5 +1,5 @@ /* - * Copyright 2008, 2009 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -16,26 +16,383 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <proto/exec.h> +/** + * \file + * Implementation of Amiga cookie viewer using core windows. + */ + +#include <stdint.h> +#include <stdlib.h> +#include <stdbool.h> + +#include <proto/intuition.h> + +#include <classes/window.h> +#include <gadgets/layout.h> +#include <gadgets/space.h> + +#include <reaction/reaction_macros.h> #include "desktop/cookie_manager.h" -#include "netsurf/mouse.h" -#include "netsurf/window.h" +#include "netsurf/keypress.h" +#include "netsurf/plotters.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/nsoption.h" #include "amiga/cookies.h" -#include "amiga/tree.h" +#include "amiga/corewindow.h" +#include "amiga/libs.h" +#include "amiga/menu.h" +#include "amiga/utf8.h" + +enum { + /* Project menu */ + AMI_COOKIE_M_PROJECT = 0, + AMI_COOKIE_M_EXPAND, + AMI_COOKIE_M_EXPAND_ALL, + AMI_COOKIE_M_EXPAND_DOMAINS, + AMI_COOKIE_M_EXPAND_COOKIES, + AMI_COOKIE_M_COLLAPSE, + AMI_COOKIE_M_COLLAPSE_ALL, + AMI_COOKIE_M_COLLAPSE_DOMAINS, + AMI_COOKIE_M_COLLAPSE_COOKIES, + AMI_COOKIE_M_BAR_P1, + AMI_COOKIE_M_SNAPSHOT, + AMI_COOKIE_M_BAR_P2, + AMI_COOKIE_M_CLOSE, + /* Edit menu */ + AMI_COOKIE_M_EDIT, + AMI_COOKIE_M_SELECTALL, + AMI_COOKIE_M_CLEAR, + AMI_COOKIE_M_BAR_E1, + AMI_COOKIE_M_DELETE, + AMI_COOKIE_M_LAST +}; + +/** + * Amiga cookie viewer window context + */ +struct ami_cookie_window { + /** Amiga core window context */ + struct ami_corewindow core; + + struct ami_menu_data *menu_data[AMI_COOKIE_M_LAST + 1]; + struct Menu *imenu; /* Intuition menu */ +}; + +static struct ami_cookie_window *cookie_window = NULL; + + +static void +ami_cookies_menu_free(struct ami_cookie_window *cookie_win) +{ + SetAttrs(cookie_win->core.objects[GID_CW_WIN], + WINDOW_MenuStrip, NULL, + TAG_DONE); + + ami_menu_free_menu(cookie_win->menu_data, AMI_COOKIE_M_LAST, cookie_win->imenu); +} + +/** + * destroy a previously created cookie view + */ +static void +ami_cookies_destroy(struct ami_corewindow *ami_cw) +{ + nserror res; + + if(cookie_window == NULL) + return; + + res = cookie_manager_fini(); + if (res == NSERROR_OK) { + ami_cookies_menu_free(cookie_window); + res = ami_corewindow_fini(&cookie_window->core); /* closes the window for us, frees cookie_win */ + cookie_window = NULL; + } +} + + +/** + * callback for mouse action for cookie viewer on core window + * + * \param ami_cw The Amiga core window structure. + * \param mouse_state netsurf mouse state on event + * \param x location of event + * \param y location of event + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_cookies_mouse(struct ami_corewindow *ami_cw, + browser_mouse_state mouse_state, + int x, int y) +{ + cookie_manager_mouse_action(mouse_state, x, y); + + return NSERROR_OK; +} + +/** + * callback for keypress for cookies viewer on core window + * + * \param example_cw The Amiga core window structure. + * \param nskey The netsurf key code + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_cookies_key(struct ami_corewindow *ami_cw, uint32_t nskey) +{ + if (cookie_manager_keypress(nskey)) { + return NSERROR_OK; + } + return NSERROR_NOT_IMPLEMENTED; +} + +/** + * callback on draw event for cookies viewer on core window + * + * \param ami_cw The Amiga core window structure. + * \param r The rectangle of the window that needs updating. + * \param ctx The drawing context + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_cookies_draw(struct ami_corewindow *ami_cw, int x, int y, struct rect *r, struct redraw_context *ctx) +{ + cookie_manager_redraw(x, y, r, ctx); + + return NSERROR_OK; +} + +/** + * menu stuff + */ + + /* menu hook functions */ + +HOOKF(void, ami_cookies_menu_item_project_expand_all, APTR, window, struct IntuiMessage *) +{ + cookie_manager_expand(false); +} + +HOOKF(void, ami_cookies_menu_item_project_expand_domains, APTR, window, struct IntuiMessage *) +{ + cookie_manager_expand(true); +} + +HOOKF(void, ami_cookies_menu_item_project_expand_cookies, APTR, window, struct IntuiMessage *) +{ + cookie_manager_expand(false); +} + +HOOKF(void, ami_cookies_menu_item_project_collapse_all, APTR, window, struct IntuiMessage *) +{ + cookie_manager_contract(true); +} + +HOOKF(void, ami_cookies_menu_item_project_collapse_domains, APTR, window, struct IntuiMessage *) +{ + cookie_manager_contract(true); +} + +HOOKF(void, ami_cookies_menu_item_project_collapse_cookies, APTR, window, struct IntuiMessage *) +{ + cookie_manager_contract(false); +} + +HOOKF(void, ami_cookies_menu_item_project_snapshot, APTR, window, struct IntuiMessage *) +{ + struct ami_corewindow *ami_cw; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&ami_cw); + + nsoption_set_int(cookies_window_ypos, ami_cw->win->TopEdge); + nsoption_set_int(cookies_window_xpos, ami_cw->win->LeftEdge); + nsoption_set_int(cookies_window_xsize, ami_cw->win->Width); + nsoption_set_int(cookies_window_ysize, ami_cw->win->Height); +} + +HOOKF(void, ami_cookies_menu_item_project_close, APTR, window, struct IntuiMessage *) +{ + struct ami_corewindow *ami_cw; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&ami_cw); + + ami_cw->close_window = true; +} + +HOOKF(void, ami_cookies_menu_item_edit_select_all, APTR, window, struct IntuiMessage *) +{ + cookie_manager_keypress(NS_KEY_SELECT_ALL); +} + +HOOKF(void, ami_cookies_menu_item_edit_clear, APTR, window, struct IntuiMessage *) +{ + cookie_manager_keypress(NS_KEY_CLEAR_SELECTION); +} + +HOOKF(void, ami_cookies_menu_item_edit_delete, APTR, window, struct IntuiMessage *) +{ + cookie_manager_keypress(NS_KEY_DELETE_LEFT); +} -struct treeview_window *cookies_window; -void ami_cookies_initialise(void) +/* menu setup */ + +static void ami_cookies_menulabs(struct ami_menu_data **md) +{ + ami_menu_alloc_item(md, AMI_COOKIE_M_PROJECT, NM_TITLE, "Tree", NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_EXPAND, NM_ITEM, "Expand", NULL, "TBImages:list_folderunfold", NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_EXPAND_ALL, NM_SUB, "All", "+", NULL, + ami_cookies_menu_item_project_expand_all, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_EXPAND_DOMAINS, NM_SUB, "Domains", NULL, NULL, + ami_cookies_menu_item_project_expand_domains, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_EXPAND_COOKIES, NM_SUB, "Cookies", NULL, NULL, + ami_cookies_menu_item_project_expand_cookies, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_COLLAPSE, NM_ITEM, "Collapse", NULL, "TBImages:list_folderfold", NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_COLLAPSE_ALL, NM_SUB, "All", "-", NULL, + ami_cookies_menu_item_project_collapse_all, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_COLLAPSE_DOMAINS, NM_SUB, "Domains", NULL, NULL, + ami_cookies_menu_item_project_collapse_domains, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_COLLAPSE_COOKIES, NM_SUB, "Cookies", NULL, NULL, + ami_cookies_menu_item_project_collapse_cookies, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_BAR_P1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_SNAPSHOT, NM_ITEM, "SnapshotWindow", NULL, "TBImages:list_hold", + ami_cookies_menu_item_project_snapshot, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_BAR_P2, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_CLOSE, NM_ITEM, "CloseWindow", "K", "TBImages:list_cancel", + ami_cookies_menu_item_project_close, NULL, 0); + + ami_menu_alloc_item(md, AMI_COOKIE_M_EDIT, NM_TITLE, "Edit", NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_SELECTALL, NM_ITEM, "SelectAllNS", "A", NSA_SPACE, + ami_cookies_menu_item_edit_select_all, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_CLEAR, NM_ITEM, "ClearNS", NULL, NSA_SPACE, + ami_cookies_menu_item_edit_clear, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_BAR_E1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_COOKIE_M_DELETE, NM_ITEM, "TreeDelete", "Del", "TBImages:list_delete", + ami_cookies_menu_item_edit_delete, NULL, 0); + + ami_menu_alloc_item(md, AMI_COOKIE_M_LAST, NM_END, NULL, NULL, NULL, NULL, NULL, 0); +} + +static struct Menu * +ami_cookies_menu_create(struct ami_cookie_window *cookie_win) { - cookies_window = ami_tree_create(TREE_COOKIES, NULL); + ami_cookies_menulabs(cookie_win->menu_data); + cookie_win->imenu = ami_menu_layout(cookie_win->menu_data, AMI_COOKIE_M_LAST); + if(cookie_win->imenu == NULL) return NULL; + + return cookie_win->imenu; +} + + +static nserror +ami_cookies_create_window(struct ami_cookie_window *cookie_win) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)&cookie_win->core; + ULONG refresh_mode = WA_SmartRefresh; + + if(nsoption_bool(window_simple_refresh) == true) { + refresh_mode = WA_SimpleRefresh; + } - if(!cookies_window) return; + ami_cw->objects[GID_CW_WIN] = WindowObj, + WA_ScreenTitle, ami_gui_get_screen_title(), + WA_Title, ami_cw->wintitle, + WA_Activate, TRUE, + WA_DepthGadget, TRUE, + WA_DragBar, TRUE, + WA_CloseGadget, TRUE, + WA_SizeGadget, TRUE, + WA_SizeBRight, TRUE, + WA_Top, nsoption_int(cookies_window_ypos), + WA_Left, nsoption_int(cookies_window_xpos), + WA_Width, nsoption_int(cookies_window_xsize), + WA_Height, nsoption_int(cookies_window_ysize), + WA_PubScreen, scrn, + WA_ReportMouse, TRUE, + refresh_mode, TRUE, + WA_IDCMP, IDCMP_MOUSEMOVE | IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE | + IDCMP_RAWKEY | IDCMP_GADGETUP | IDCMP_IDCMPUPDATE | + IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, + WINDOW_IDCMPHook, &ami_cw->idcmp_hook, + WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE | + IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, + WINDOW_SharedPort, sport, + WINDOW_HorizProp, 1, + WINDOW_VertProp, 1, + WINDOW_UserData, cookie_win, + WINDOW_MenuStrip, ami_cookies_menu_create(cookie_win), + WINDOW_MenuUserData, WGUD_HOOK, + WINDOW_IconifyGadget, FALSE, + WINDOW_Position, WPOS_CENTERSCREEN, + WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj, + LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj, + GA_ID, GID_CW_DRAW, + SPACE_Transparent, TRUE, + SPACE_BevelStyle, BVS_DISPLAY, + GA_RelVerify, TRUE, + SpaceEnd, + EndGroup, + EndWindow; + + if(ami_cw->objects[GID_CW_WIN] == NULL) { + return NSERROR_NOMEM; + } + + return NSERROR_OK; } -void ami_cookies_free() +/* exported interface documented in amiga/cookies.h */ +nserror ami_cookies_present(void) { - ami_tree_destroy(cookies_window); - cookies_window = NULL; + struct ami_cookie_window *ncwin; + nserror res; + + if(cookie_window != NULL) { + //windowtofront() + return NSERROR_OK; + } + + ncwin = calloc(1, sizeof(struct ami_cookie_window)); + if (ncwin == NULL) { + return NSERROR_NOMEM; + } + + ncwin->core.wintitle = ami_utf8_easy((char *)messages_get("Cookies")); + + res = ami_cookies_create_window(ncwin); + if (res != NSERROR_OK) { + LOG("SSL UI builder init failed"); + ami_utf8_free(ncwin->core.wintitle); + free(ncwin); + return res; + } + + /* initialise Amiga core window */ + ncwin->core.draw = ami_cookies_draw; + ncwin->core.key = ami_cookies_key; + ncwin->core.mouse = ami_cookies_mouse; + ncwin->core.close = ami_cookies_destroy; + ncwin->core.event = NULL; + + res = ami_corewindow_init(&ncwin->core); + if (res != NSERROR_OK) { + ami_utf8_free(ncwin->core.wintitle); + DisposeObject(ncwin->core.objects[GID_CW_WIN]); + free(ncwin); + return res; + } + + res = cookie_manager_init(ncwin->core.cb_table, (struct core_window *)ncwin); + if (res != NSERROR_OK) { + ami_utf8_free(ncwin->core.wintitle); + DisposeObject(ncwin->core.objects[GID_CW_WIN]); + free(ncwin); + return res; + } + + cookie_window = ncwin; + + return NSERROR_OK; } + diff --git a/frontends/amiga/cookies.h b/frontends/amiga/cookies.h old mode 100755 new mode 100644 index 85e553c..6858e4c --- a/frontends/amiga/cookies.h +++ b/frontends/amiga/cookies.h @@ -1,5 +1,5 @@ /* - * Copyright 2008, 2009 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -18,11 +18,8 @@ #ifndef AMIGA_COOKIES_H #define AMIGA_COOKIES_H -#include "desktop/tree.h" -#include "amiga/tree.h" -void ami_cookies_initialise(void); -void ami_cookies_free(void); - -extern struct treeview_window *cookies_window; +/** Open the cookie viewer */ +nserror ami_cookies_present(void); #endif + diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c new file mode 100644 index 0000000..0ed16d1 --- /dev/null +++ b/frontends/amiga/corewindow.c @@ -0,0 +1,1002 @@ +/* + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * + * 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/>. + */ + +/** + * \file + * Amiga core window interface. + * + * Provides interface for core renderers to the Amiga Intuition drawable area. + * + * This module is an object that must be encapsulated. Client users + * should embed a struct ami_corewindow at the beginning of their + * context for this display surface, fill in relevant data and then + * call ami_corewindow_init() + * + * The Amiga core window structure requires the callback for draw, key and + * mouse operations. + */ + +#include "amiga/os3support.h" + +#include <assert.h> +#include <stdlib.h> +#include <string.h> +#include <math.h> + +#include "utils/log.h" +#include "utils/utils.h" +#include "utils/messages.h" +#include "utils/utf8.h" +#include "netsurf/keypress.h" +#include "netsurf/mouse.h" +#include "netsurf/plot_style.h" + +#include <proto/exec.h> +#include <proto/intuition.h> +#include <proto/layout.h> +#include <proto/utility.h> + +#include <classes/window.h> +#include <gadgets/layout.h> +#include <gadgets/scroller.h> +#include <gadgets/space.h> +#include <intuition/icclass.h> +#include <reaction/reaction_macros.h> + +#include "amiga/corewindow.h" +#include "amiga/drag.h" +#include "amiga/memory.h" +#include "amiga/misc.h" +#include "amiga/object.h" +#include "amiga/schedule.h" +#include "amiga/utf8.h" + +static void +ami_cw_scroller_top(struct ami_corewindow *ami_cw, ULONG *restrict x, ULONG *restrict y) +{ + ULONG xs = 0; + ULONG ys = 0; + + if(ami_cw->scroll_x_visible == true) { + GetAttr(SCROLLER_Top, ami_cw->objects[GID_CW_HSCROLL], (ULONG *)&xs); + } + + if(ami_cw->scroll_y_visible == true) { + GetAttr(SCROLLER_Top, ami_cw->objects[GID_CW_VSCROLL], (ULONG *)&ys); + } + + *x = xs; + *y = ys; +} + +static void +ami_cw_window_size(struct ami_corewindow *ami_cw, int *width, int *height) +{ + struct IBox *bbox; + + if(ami_gui_get_space_box((Object *)ami_cw->objects[GID_CW_DRAW], &bbox) != NSERROR_OK) { + amiga_warn_user("NoMemory", ""); + return; + } + + *width = bbox->Width; + *height = bbox->Height; + + ami_gui_free_space_box(bbox); +} + + +/** + * Convert co-ordinates relative to space.gadget + * into document co-ordinates + * + * @param ami_cw core window + * @param x co-ordinate, will be updated to new x co-ordinate + * @param y co-ordinate, will be updated to new y co-ordinate + */ +static void +ami_cw_coord_amiga_to_ns(struct ami_corewindow *ami_cw, int *restrict x, int *restrict y) +{ + ULONG xs = 0; + ULONG ys = 0; + + ami_cw_scroller_top(ami_cw, &xs, &ys); + + *x = *x + xs; + *y = *y + ys; +} + +/** + * check if mouse has moved since position was stored + * @param ami_cw corewindow + * @param x current x position + * @param y current y position + * @param click true to check since last click, false since last drag (press) + * @return true if it has, false otherwise + */ +static bool +ami_cw_mouse_moved(struct ami_corewindow *ami_cw, int x, int y, bool click) +{ + int mx, my; + + if(click == true) { + mx = ami_cw->mouse_x_click; + my = ami_cw->mouse_y_click; + } else { + mx = ami_cw->drag_x_start; + my = ami_cw->drag_y_start; + } + + if(abs(x - mx) > 5) return true; + if(abs(y - my) > 5) return true; + return false; +} + +/* get current mouse position in the draw area, adjusted for scroll. + * @return true if the mouse was in the draw area and co-ordinates updated + */ +static bool +ami_cw_mouse_pos(struct ami_corewindow *ami_cw, int *restrict x, int *restrict y) +{ + int16 xm, ym; + ULONG xs, ys; + struct IBox *bbox; + + xm = ami_cw->win->MouseX; + ym = ami_cw->win->MouseY; + + if(ami_gui_get_space_box((Object *)ami_cw->objects[GID_CW_DRAW], &bbox) != NSERROR_OK) { + amiga_warn_user("NoMemory", ""); + return false; + } + + xm -= bbox->Left; + ym -= bbox->Top; + + if((xm < 0) || (ym < 0) || (xm > bbox->Width) || (ym > bbox->Height)) + return false; + + ami_gui_free_space_box(bbox); + ami_cw_scroller_top(ami_cw, &xs, &ys); + + xm += xs; + ym += ys; + *x = xm; + *y = ym; + + return true; +} + +/* handle keypress */ +static void +ami_cw_key(struct ami_corewindow *ami_cw, int nskey) +{ + ami_cw->key(ami_cw, nskey); + + switch(nskey) { + case NS_KEY_COPY_SELECTION: + /* if we've copied a selection we need to clear it - style guide rules */ + ami_cw->key(ami_cw, NS_KEY_CLEAR_SELECTION); + break; + + /* we may need to deal with scroll-related keys here */ + } +} + + +/** + * Redraw functions + * + * This is slightly over-engineered as it was taken from the main browser/old tree redraws + * and supports deferred drawing of rectangles and tiling + */ + +/** + * Redraw an area of a core window + * + * \param g a struct ami_corewindow + * \param r rect (in document co-ordinates) + */ + +static void +ami_cw_redraw_rect(struct ami_corewindow *ami_cw, struct rect *r) +{ + struct IBox *bbox; + ULONG pos_x, pos_y; + struct rect draw_rect; + int tile_size_x = ami_cw->gg.width; + int tile_size_y = ami_cw->gg.height; + int tile_x, tile_y, tile_w, tile_h; + int x = r->x0; + int y = r->y0; + int width = r->x1 - r->x0; + int height = r->y1 - r->y0; + + struct redraw_context ctx = { + .interactive = true, + .background_images = true, + .plot = &amiplot + }; + + if(ami_gui_get_space_box((Object *)ami_cw->objects[GID_CW_DRAW], &bbox) != NSERROR_OK) { + amiga_warn_user("NoMemory", ""); + return; + } + + ami_cw_scroller_top(ami_cw, &pos_x, &pos_y); + + glob = &ami_cw->gg; + + if(x - pos_x + width > bbox->Width) width = bbox->Width - (x - pos_x); + if(y - pos_y + height > bbox->Height) height = bbox->Height - (y - pos_y); + + if(x < pos_x) { + width -= pos_x - x; + x = pos_x; + } + + if(y < pos_y) { + height -= pos_y - y; + y = pos_y; + } + + for(tile_y = y; tile_y < (y + height); tile_y += tile_size_y) { + tile_h = tile_size_y; + if(((y + height) - tile_y) < tile_size_y) + tile_h = (y + height) - tile_y; + + for(tile_x = x; tile_x < (x + width); tile_x += tile_size_x) { + tile_w = tile_size_x; + if(((x + width) - tile_x) < tile_size_x) + tile_w = (x + width) - tile_x; + + draw_rect.x0 = tile_x; // was - + draw_rect.y0 = tile_y; // was - + draw_rect.x1 = tile_x + tile_w; + draw_rect.y1 = tile_y + tile_h; + + ami_cw->draw(ami_cw, -tile_x, -tile_y, &draw_rect, &ctx); + +#ifdef __amigaos4__ + BltBitMapTags(BLITA_SrcType, BLITT_BITMAP, + BLITA_Source, ami_cw->gg.bm, + BLITA_SrcX, 0, + BLITA_SrcY, 0, + BLITA_DestType, BLITT_RASTPORT, + BLITA_Dest, ami_cw->win->RPort, + BLITA_DestX, bbox->Left + tile_x - pos_x, + BLITA_DestY, bbox->Top + tile_y - pos_y, + BLITA_Width, tile_w, + BLITA_Height, tile_h, + TAG_DONE); +#else + BltBitMapRastPort(ami_cw->gg.bm, 0, 0, + ami_cw->win->RPort, bbox->Left + tile_x - pos_x, bbox->Top + tile_y - pos_y, + tile_w, tile_h, 0xC0); +#endif + } + } + + ami_gui_free_space_box(bbox); + ami_clearclipreg(glob); + ami_gui_set_default_gg(); +} + + +/** + * Draw the deferred rectangles + * + * @param draw set to false to just delete the queue + */ +static void ami_cw_redraw_queue(struct ami_corewindow *ami_cw, bool draw) +{ + struct nsObject *node; + struct nsObject *nnode; + struct rect *rect; + + if(IsMinListEmpty(ami_cw->deferred_rects)) return; + + if(draw == false) { + LOG("Ignoring deferred box redraw queue"); + } // else should probably show busy pointer + + node = (struct nsObject *)GetHead((struct List *)ami_cw->deferred_rects); + + do { + if(draw == true) { + rect = (struct rect *)node->objstruct; + ami_cw_redraw_rect(ami_cw, rect); + } + nnode = (struct nsObject *)GetSucc((struct Node *)node); + ami_memory_itempool_free(ami_cw->deferred_rects_pool, node->objstruct, sizeof(struct rect)); + DelObjectNoFree(node); + } while((node = nnode)); +} + +static void +ami_cw_redraw_cb(void *p) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)p; + + ami_cw_redraw_queue(ami_cw, true); +} + +/** + * Queue a redraw of a rectangle + * + * @param ami_cw the core window to redraw + * @param r the rectangle (in doc coords) to redraw, or NULL for full window + */ + +static void +ami_cw_redraw(struct ami_corewindow *ami_cw, const struct rect *restrict r) +{ + struct nsObject *nsobj; + struct rect *restrict deferred_rect; + struct rect new_rect; + + if(r == NULL) { + struct IBox *bbox; + if(ami_gui_get_space_box((Object *)ami_cw->objects[GID_CW_DRAW], &bbox) != NSERROR_OK) { + amiga_warn_user("NoMemory", ""); + return; + } + + new_rect.x0 = 0; + new_rect.y0 = 0; + ami_cw_coord_amiga_to_ns(ami_cw, &new_rect.x0, &new_rect.y0); + new_rect.x1 = new_rect.x0 + bbox->Width; + new_rect.y1 = new_rect.y0 + bbox->Height; + + ami_gui_free_space_box(bbox); + + r = &new_rect; + } + + if(ami_gui_window_update_box_deferred_check(ami_cw->deferred_rects, r, + ami_cw->deferred_rects_pool)) { + deferred_rect = ami_memory_itempool_alloc(ami_cw->deferred_rects_pool, sizeof(struct rect)); + CopyMem(r, deferred_rect, sizeof(struct rect)); + nsobj = AddObject(ami_cw->deferred_rects, AMINS_RECT); + nsobj->objstruct = deferred_rect; + } else { + LOG("Ignoring duplicate or subset of queued box redraw"); + } + ami_schedule(1, ami_cw_redraw_cb, ami_cw); +} + +static void ami_cw_simplerefresh(struct ami_corewindow *ami_cw) +{ + struct rect r; + struct RegionRectangle *regrect; + + BeginRefresh(ami_cw->win); + + r.x0 = ami_cw->win->RPort->Layer->DamageList->bounds.MinX; + r.x1 = ami_cw->win->RPort->Layer->DamageList->bounds.MaxX; + r.y0 = ami_cw->win->RPort->Layer->DamageList->bounds.MinY; + r.y1 = ami_cw->win->RPort->Layer->DamageList->bounds.MaxY; + + ami_cw_coord_amiga_to_ns(ami_cw, &r.x0, &r.y0); + ami_cw_coord_amiga_to_ns(ami_cw, &r.y0, &r.y1); + + regrect = ami_cw->win->RPort->Layer->DamageList->RegionRectangle; + + ami_cw_redraw(ami_cw, &r); /* queue redraw */ + + while(regrect) { + r.x0 = regrect->bounds.MinX; + r.x1 = regrect->bounds.MaxX; + r.y0 = regrect->bounds.MinY; + r.y1 = regrect->bounds.MaxY; + ami_cw_coord_amiga_to_ns(ami_cw, &r.x0, &r.y0); + ami_cw_coord_amiga_to_ns(ami_cw, &r.y0, &r.y1); + + regrect = regrect->Next; + + ami_cw_redraw(ami_cw, &r); /* queue redraw */ + } + + EndRefresh(ami_cw->win, TRUE); +} + +static void +ami_cw_toggle_scrollbar(struct ami_corewindow *ami_cw, bool vert, bool visible) +{ + Object *scroller; + Object *layout; + ULONG tag; + + if(vert == true) { + if(visible == ami_cw->scroll_y_visible) { + return; + } else { + scroller = ami_cw->objects[GID_CW_VSCROLL]; + layout = ami_cw->objects[GID_CW_VSCROLLLAYOUT]; + tag = WINDOW_VertProp; + ami_cw->scroll_y_visible = visible; + } + } else { + if(visible == ami_cw->scroll_x_visible) { + return; + } else { + scroller = ami_cw->objects[GID_CW_HSCROLL]; + layout = ami_cw->objects[GID_CW_HSCROLLLAYOUT]; + tag = WINDOW_HorizProp; + ami_cw->scroll_x_visible = visible; + } + } + + if(visible == true) { + if(ami_cw->in_border_scroll == true) { + SetAttrs(ami_cw->objects[GID_CW_WIN], + tag, 1, + TAG_DONE); + } else { +#ifdef __amigaos4__ + IDoMethod(layout, LM_ADDCHILD, ami_cw->win, scroller, NULL); +#else + SetAttrs(layout, LAYOUT_AddChild, scroller, TAG_DONE); +#endif + } + } else { + if(ami_cw->in_border_scroll == true) { + SetAttrs(ami_cw->objects[GID_CW_WIN], + tag, -1, + TAG_DONE); + } else { +#ifdef __amigaos4__ + IDoMethod(layout, LM_REMOVECHILD, ami_cw->win, scroller); +#else + SetAttrs(layout, LAYOUT_RemoveChild, scroller, TAG_DONE); +#endif + } + } + + if(ami_cw->in_border_scroll == false) { + FlushLayoutDomainCache((struct Gadget *)ami_cw->objects[GID_CW_WIN]); + RethinkLayout((struct Gadget *)ami_cw->objects[GID_CW_WIN], + ami_cw->win, NULL, TRUE); + } + + /* probably need to redraw here */ + ami_cw_redraw(ami_cw, NULL); +} + +static void +ami_cw_close(void *w) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)w; + + ami_cw->close(ami_cw); +} + +HOOKF(void, ami_cw_idcmp_hook, Object *, object, struct IntuiMessage *) +{ + struct ami_corewindow *ami_cw = hook->h_Data; + struct IntuiWheelData *wheel; + ULONG gid = GetTagData( GA_ID, 0, msg->IAddress ); + + switch(msg->Class) + { + case IDCMP_IDCMPUPDATE: + switch(gid) + { + case GID_CW_HSCROLL: + case GID_CW_VSCROLL: + ami_cw_redraw(ami_cw, NULL); + break; + } + break; +#ifdef __amigaos4__ + case IDCMP_EXTENDEDMOUSE: + if(msg->Code == IMSGCODE_INTUIWHEELDATA) + { + wheel = (struct IntuiWheelData *)msg->IAddress; + + //ami_tree_scroll(twin, (wheel->WheelX * 20), (wheel->WheelY * 20)); + } + break; +#endif + + case IDCMP_SIZEVERIFY: + break; + + case IDCMP_REFRESHWINDOW: + ami_cw_simplerefresh(ami_cw); + break; + + default: + LOG("IDCMP hook unhandled event: %ld", msg->Class); + break; + } +} + +/** + * Drag start + */ +static void +ami_cw_drag_start(struct ami_corewindow *ami_cw, int x, int y) +{ + if(ami_cw->dragging == true) return; + + ami_cw->dragging = true; + ami_cw->drag_x_start = x; + ami_cw->drag_y_start = y; + + switch(ami_cw->drag_status) { + case CORE_WINDOW_DRAG_SELECTION: + break; + + case CORE_WINDOW_DRAG_MOVE: + ami_drag_icon_show(ami_cw->win, "project"); + break; + + default: + break; + } +} + +/** + * Drag progress + */ +static void +ami_cw_drag_progress(struct ami_corewindow *ami_cw, int x, int y) +{ + if(ami_cw->dragging == false) return; + + switch(ami_cw->drag_status) { + case CORE_WINDOW_DRAG_SELECTION: + break; + + case CORE_WINDOW_DRAG_MOVE: + ami_drag_icon_move(); + break; + + default: + break; + } +} + +/** + * Drag end + */ +static void +ami_cw_drag_end(struct ami_corewindow *ami_cw, int x, int y) +{ + if(ami_cw->dragging == false) return; + + switch(ami_cw->drag_status) { + case CORE_WINDOW_DRAG_SELECTION: + break; + + case CORE_WINDOW_DRAG_MOVE: + ami_drag_icon_close(ami_cw->win); + if((ami_cw != ami_window_at_pointer(AMINS_COREWINDOW)) && (ami_cw->drag_end != NULL)) { + ami_cw->drag_end(ami_cw, scrn->MouseX, scrn->MouseY); + } + break; + + default: + break; + } + + ami_cw->drag_status = CORE_WINDOW_DRAG_NONE; + ami_cw->dragging = false; +} + +/** + * User has resized window + */ + +static void +ami_cw_newsize(struct ami_corewindow *ami_cw) +{ + int win_w, win_h; + ami_cw_window_size(ami_cw, &win_w, &win_h); + + if(ami_cw->objects[GID_CW_HSCROLL] != NULL) { + RefreshSetGadgetAttrs((struct Gadget *)ami_cw->objects[GID_CW_HSCROLL], ami_cw->win, NULL, + SCROLLER_Visible, win_w, + TAG_DONE); + } + + if(ami_cw->objects[GID_CW_VSCROLL] != NULL) { + RefreshSetGadgetAttrs((struct Gadget *)ami_cw->objects[GID_CW_VSCROLL], ami_cw->win, NULL, + SCROLLER_Visible, win_h, + TAG_DONE); + } + + ami_cw_redraw(ami_cw, NULL); +} + +/** + * Main event loop for our core window + * + * \return TRUE if window destroyed + */ +static BOOL +ami_cw_event(void *w) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)w; + + ULONG result; + ULONG storage; + uint16 code; + struct InputEvent *ie; + int nskey; + int key_state = 0; + struct timeval curtime; + int x = 0, y = 0; + + while((result = RA_HandleInput(ami_cw->objects[GID_CW_WIN], &code)) != WMHI_LASTMSG) { + if(ami_cw->close_window == true) { + ami_cw_close(ami_cw); + return TRUE; + } + + switch(result & WMHI_CLASSMASK) { + case WMHI_MOUSEMOVE: + if(ami_cw_mouse_pos(ami_cw, &x, &y) == true) { + if(ami_cw_mouse_moved(ami_cw, x, y, false)) { + if(ami_cw->mouse_state & BROWSER_MOUSE_PRESS_1) { + /* Start button 1 drag */ + ami_cw->mouse(ami_cw, BROWSER_MOUSE_DRAG_1, x, y); + /* Replace PRESS with HOLDING and declare drag in progress */ + ami_cw->mouse_state = BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_ON; + } else if(ami_cw->mouse_state & BROWSER_MOUSE_PRESS_2) { + /* Start button 2 drag */ + ami_cw->mouse(ami_cw, BROWSER_MOUSE_DRAG_2, x, y); + /* Replace PRESS with HOLDING and declare drag in progress */ + ami_cw->mouse_state = BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_ON; + } + key_state = ami_gui_get_quals(ami_cw->objects[GID_CW_WIN]); + ami_cw->mouse(ami_cw, ami_cw->mouse_state | key_state, x, y); + if(ami_cw->mouse_state & BROWSER_MOUSE_DRAG_ON) { + ami_cw_drag_start(ami_cw, x, y); + } + } else { + key_state = ami_gui_get_quals(ami_cw->objects[GID_CW_WIN]); + ami_cw->mouse(ami_cw, ami_cw->mouse_state | key_state, x, y); + } + } + ami_cw_drag_progress(ami_cw, x, y); + break; + + case WMHI_MOUSEBUTTONS: + if(ami_cw_mouse_pos(ami_cw, &x, &y) == true) { + key_state = ami_gui_get_quals(ami_cw->objects[GID_CW_WIN]); + switch(code) { + case SELECTDOWN: + ami_cw->mouse_state = BROWSER_MOUSE_PRESS_1; + ami_cw->drag_x_start = x; + ami_cw->drag_y_start = y; + break; + + case MIDDLEDOWN: + ami_cw->mouse_state = BROWSER_MOUSE_PRESS_2; + ami_cw->drag_x_start = x; + ami_cw->drag_y_start = y; + break; + + case SELECTUP: + if(ami_cw->mouse_state & BROWSER_MOUSE_PRESS_1) { + CurrentTime((ULONG *)&curtime.tv_sec, (ULONG *)&curtime.tv_usec); + + ami_cw->mouse_state = BROWSER_MOUSE_CLICK_1; + + if(ami_cw->lastclick.tv_sec) { + if((ami_cw_mouse_moved(ami_cw, x, y, true) == false) && + (DoubleClick(ami_cw->lastclick.tv_sec, + ami_cw->lastclick.tv_usec, + curtime.tv_sec, curtime.tv_usec))) + ami_cw->mouse_state |= BROWSER_MOUSE_DOUBLE_CLICK; + } + + ami_cw->mouse_x_click = x; + ami_cw->mouse_y_click = y; + + if(ami_cw->mouse_state & BROWSER_MOUSE_DOUBLE_CLICK) { + ami_cw->lastclick.tv_sec = 0; + ami_cw->lastclick.tv_usec = 0; + } else { + ami_cw->lastclick.tv_sec = curtime.tv_sec; + ami_cw->lastclick.tv_usec = curtime.tv_usec; + } + } + + ami_cw->mouse(ami_cw, ami_cw->mouse_state | key_state, x, y); + ami_cw->mouse_state = BROWSER_MOUSE_HOVER; + break; + + case MIDDLEUP: + if(ami_cw->mouse_state & BROWSER_MOUSE_PRESS_2) + ami_cw->mouse_state = BROWSER_MOUSE_CLICK_2; + + ami_cw->mouse(ami_cw, ami_cw->mouse_state | key_state, x, y); + ami_cw->mouse_state = BROWSER_MOUSE_HOVER; + break; + } + + if(ami_cw->mouse_state == BROWSER_MOUSE_HOVER) { + ami_cw_drag_end(ami_cw, x, y); + } + + ami_cw->mouse(ami_cw, ami_cw->mouse_state | key_state, x, y); + } else { + /* event is happening away from our corewindow area */ + switch(code) { + case SELECTUP: + case MIDDLEUP: + ami_cw->mouse_state = BROWSER_MOUSE_HOVER; + break; + + default: + break; + } + + if(ami_cw->mouse_state == BROWSER_MOUSE_HOVER) { + ami_cw_drag_end(ami_cw, x, y); + ami_cw->mouse(ami_cw, ami_cw->mouse_state | key_state, + ami_cw->drag_x_start, ami_cw->drag_y_start); // placate core + } + } + break; + + case WMHI_RAWKEY: + storage = result & WMHI_GADGETMASK; + + GetAttr(WINDOW_InputEvent, ami_cw->objects[GID_CW_WIN], (ULONG *)&ie); + nskey = ami_key_to_nskey(storage, ie); + + ami_cw_key(ami_cw, nskey); + break; + + case WMHI_NEWSIZE: + ami_cw_newsize(ami_cw); + break; + + case WMHI_CLOSEWINDOW: + ami_cw_close(ami_cw); + return TRUE; + break; + + default: + /* pass the event to the window owner */ + if(ami_cw->event != NULL) + if(ami_cw->event(ami_cw, result) == TRUE) { + return TRUE; + } + break; + } + }; + + return FALSE; +} + +static const struct ami_win_event_table ami_cw_table = { + ami_cw_event, + ami_cw_close, +}; + +/** + * callback from core to request a redraw + */ +static void +ami_cw_redraw_request(struct core_window *cw, const struct rect *r) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)cw; + + ami_cw_redraw(ami_cw, r); +} + + +static void +ami_cw_get_window_dimensions(struct core_window *cw, int *width, int *height) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)cw; + + ami_cw_window_size(ami_cw, width, height); +} + + +static void +ami_cw_update_size(struct core_window *cw, int width, int height) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)cw; + int win_w, win_h; + + ami_cw_window_size(ami_cw, &win_w, &win_h); + + if(width == -1) { + ami_cw_toggle_scrollbar(ami_cw, false, false); + } else { + ami_cw_toggle_scrollbar(ami_cw, false, true); + RefreshSetGadgetAttrs((struct Gadget *)ami_cw->objects[GID_CW_HSCROLL], ami_cw->win, NULL, + SCROLLER_Total, (ULONG)width, + SCROLLER_Visible, win_w, + TAG_DONE); + } + + if(height == -1) { + ami_cw_toggle_scrollbar(ami_cw, true, false); + } else { + ami_cw_toggle_scrollbar(ami_cw, true, true); + RefreshSetGadgetAttrs((struct Gadget *)ami_cw->objects[GID_CW_VSCROLL], ami_cw->win, NULL, + SCROLLER_Total, height, + SCROLLER_Visible, win_h, + TAG_DONE); + } +} + + +static void +ami_cw_scroll_visible(struct core_window *cw, const struct rect *r) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)cw; + + int scrollsetx; + int scrollsety; + int win_w = 0, win_h = 0; + ULONG win_x0, win_y0; + int win_x1, win_y1; + + ami_cw_window_size(ami_cw, &win_w, &win_h); + + ami_cw_scroller_top(ami_cw, &win_x0, &win_y0); + + win_x1 = win_x0 + win_w; + win_y1 = win_y0 + win_h; + + if(r->y1 > win_y1) scrollsety = r->y1 - win_h; + if(r->y0 < win_y0) scrollsety = r->y0; + if(r->x1 > win_x1) scrollsetx = r->x1 - win_w; + if(r->x0 < win_x0) scrollsetx = r->x0; + + if(ami_cw->scroll_y_visible == true) { + RefreshSetGadgetAttrs((APTR)ami_cw->objects[GID_CW_VSCROLL], ami_cw->win, NULL, + SCROLLER_Top, scrollsety, + TAG_DONE); + } + + if(ami_cw->scroll_x_visible == true) { + RefreshSetGadgetAttrs((APTR)ami_cw->objects[GID_CW_HSCROLL], ami_cw->win, NULL, + SCROLLER_Top, scrollsetx, + TAG_DONE); + } + + /* probably need to redraw here */ + ami_cw_redraw(ami_cw, NULL); +} + + +static void +ami_cw_drag_status(struct core_window *cw, core_window_drag_status ds) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)cw; + ami_cw->drag_status = ds; +} + + +struct core_window_callback_table ami_cw_cb_table = { + .redraw_request = ami_cw_redraw_request, + .update_size = ami_cw_update_size, + .scroll_visible = ami_cw_scroll_visible, + .get_window_dimensions = ami_cw_get_window_dimensions, + .drag_status = ami_cw_drag_status +}; + +/* exported function documented example/corewindow.h */ +nserror ami_corewindow_init(struct ami_corewindow *ami_cw) +{ + /* setup the core window callback table */ + ami_cw->cb_table = &ami_cw_cb_table; + + /* clear some vars */ + ami_cw->mouse_state = BROWSER_MOUSE_HOVER; + ami_cw->lastclick.tv_sec = 0; + ami_cw->lastclick.tv_usec = 0; + ami_cw->scroll_x_visible = true; + ami_cw->scroll_y_visible = true; + ami_cw->in_border_scroll = false; + ami_cw->dragging = false; + + /* allocate drawing area etc */ + ami_init_layers(&ami_cw->gg, 100, 100, false); // force tiles to save memory + ami_cw->gg.shared_pens = ami_AllocMinList(); + + ami_cw->deferred_rects = NewObjList(); + ami_cw->deferred_rects_pool = ami_memory_itempool_create(sizeof(struct rect)); + + /* add the core window to our window list so we process events */ + ami_gui_win_list_add(ami_cw, AMINS_COREWINDOW, &ami_cw_table); + + /* set up the IDCMP hook for event processing (extended mouse, scrollbars) */ + ami_cw->idcmp_hook.h_Entry = (void *)ami_cw_idcmp_hook; + ami_cw->idcmp_hook.h_Data = ami_cw; + + /* open the window */ + ami_cw->win = (struct Window *)RA_OpenWindow(ami_cw->objects[GID_CW_WIN]); + + /* attach the scrollbars for event processing _if they are in the window border_ */ + if(ami_cw->objects[GID_CW_HSCROLL] == NULL) { + GetAttr(WINDOW_HorizObject, ami_cw->objects[GID_CW_WIN], + (ULONG *)&ami_cw->objects[GID_CW_HSCROLL]); + + RefreshSetGadgetAttrs((APTR)ami_cw->objects[GID_CW_HSCROLL], ami_cw->win, NULL, + GA_ID, GID_CW_HSCROLL, + ICA_TARGET, ICTARGET_IDCMP, + TAG_DONE); + + ami_cw->in_border_scroll = true; + } + + if(ami_cw->objects[GID_CW_VSCROLL] == NULL) { + GetAttr(WINDOW_VertObject, ami_cw->objects[GID_CW_WIN], + (ULONG *)&ami_cw->objects[GID_CW_VSCROLL]); + + RefreshSetGadgetAttrs((APTR)ami_cw->objects[GID_CW_VSCROLL], ami_cw->win, NULL, + GA_ID, GID_CW_VSCROLL, + ICA_TARGET, ICTARGET_IDCMP, + TAG_DONE); + + ami_cw->in_border_scroll = true; + } + + return NSERROR_OK; +} + +/* exported interface documented in example/corewindow.h */ +nserror ami_corewindow_fini(struct ami_corewindow *ami_cw) +{ + /* remove any pending redraws */ + ami_schedule(-1, ami_cw_redraw_cb, ami_cw); + FreeObjList(ami_cw->deferred_rects); + ami_memory_itempool_delete(ami_cw->deferred_rects_pool); + + /* destroy the window */ + ami_cw->win = NULL; + DisposeObject(ami_cw->objects[GID_CW_WIN]); + +#if 0 + /* ensure our scrollbars are destroyed */ + /* it appears these are disposed anyway, + * even if the gadgets are no longer attached to the window */ + if(ami_cw->in_border_scroll == false) { + if(ami_cw->scroll_x_visible == false) { + DisposeObject(ami_cw->objects[GID_CW_HSCROLL]); + } + if(ami_cw->scroll_y_visible == false) { + DisposeObject(ami_cw->objects[GID_CW_VSCROLL]); + } + } +#endif + + /* release off-screen bitmap stuff */ + ami_plot_release_pens(ami_cw->gg.shared_pens); + ami_free_layers(&ami_cw->gg); + + /* free the window title */ + ami_utf8_free(ami_cw->wintitle); + + /* remove the core window from our window list */ + ami_gui_win_list_remove(ami_cw); + + return NSERROR_OK; +} + diff --git a/frontends/amiga/corewindow.h b/frontends/amiga/corewindow.h new file mode 100644 index 0000000..cfcd7fc --- /dev/null +++ b/frontends/amiga/corewindow.h @@ -0,0 +1,188 @@ +/* + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * + * 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 AMIGA_COREWINDOW_H +#define AMIGA_COREWINDOW_H + +#include "netsurf/core_window.h" + +#include "amiga/gui.h" /* need to know the size of ami_generic_window :( */ +#include "amiga/plotters.h" + +/** + * BOOPSI objects + */ + +enum { + GID_CW_WIN = 0, /* window object */ + GID_CW_MAIN, /* root layout object */ + GID_CW_DRAW, /* drawing area (space.gadget) */ + GID_CW_HSCROLL, /* horizontal scroller */ + GID_CW_VSCROLL, /* vertical scroller */ + GID_CW_HSCROLLLAYOUT, /* horizontal scroller container*/ + GID_CW_VSCROLLLAYOUT, /* vertical scroller container */ + GID_CW_LAST +}; + +/** + * Amiga core window state + */ +struct ami_corewindow { + /* + * Any variables common to any frontend window would go here. + * e.g. drawing area handles, toolkit pointers or other state + */ + struct ami_generic_window w; + struct Window *win; + Object *objects[GID_CW_LAST]; + + struct Hook idcmp_hook; + struct timeval lastclick; + + int mouse_x_click; + int mouse_y_click; + int mouse_state; + + bool dragging; + int drag_x_start; + int drag_y_start; + + bool close_window; // set to true to close the window during event loop + + APTR deferred_rects_pool; + struct MinList *deferred_rects; + + /** keep track of the scrollbar type we're using */ + bool in_border_scroll; + bool scroll_x_visible; + bool scroll_y_visible; + + /** window title, must be allocated wth ami_utf8 function */ + char *wintitle; + + /** stuff for our off-screen render bitmap */ + struct gui_globals gg; + struct MinList *shared_pens; + + /** drag status set by core */ + core_window_drag_status drag_status; + + /** table of callbacks for core window operations */ + struct core_window_callback_table *cb_table; + + /** + * callback to draw on drawable area of Amiga core window + * + * \param ami_cw The Amiga core window structure. + * \param x Plot origin (X) + * \param r Plot origin (Y) + * \param r The rectangle of the window that needs updating. + * \param ctx Redraw context + * \return NSERROR_OK on success otherwise apropriate error code + */ + nserror (*draw)(struct ami_corewindow *ami_cw, int x, int y, struct rect *r, + struct redraw_context *ctx); + + /** + * callback for keypress on Amiga core window + * + * \param ami_cw The Amiga core window structure. + * \param nskey The netsurf key code. + * \return NSERROR_OK if key processed, + * NSERROR_NOT_IMPLEMENTED if key not processed + * otherwise apropriate error code + */ + nserror (*key)(struct ami_corewindow *ami_cw, uint32_t nskey); + + /** + * callback for mouse event on Amiga core window + * + * \param ami_cw The Amiga core window structure. + * \param mouse_state mouse state + * \param x location of event + * \param y location of event + * \return NSERROR_OK on sucess otherwise apropriate error code. + */ + nserror (*mouse)(struct ami_corewindow *ami_cw, browser_mouse_state mouse_state, int x, int y); + + /** + * callback for unknown events on Amiga core window + * eg. buttons in the ssl cert window + * (result & WMHI_CLASSMASK) gives the class of event (eg. WMHI_GADGETUP) + * (result & WMHI_GADGETMASK) gives the gadget ID (eg. GID_SSLCERT_ACCEPT) + * + * \param ami_cw The Amiga core window structure. + * \param result event as returned by RA_HandleInput() + * \return TRUE if window closed during event processing + */ + BOOL (*event)(struct ami_corewindow *ami_cw, ULONG result); + + /** + * callback for drag end on Amiga core window + * ie. a drag *from* this window to a different window + * + * \param ami_cw The Amiga core window structure. + * \param x mouse x position **in screen co-ordinates** + * \param y mouse y position **in screen co-ordinates** + * \return NSERROR_OK on success otherwise apropriate error code + */ + nserror (*drag_end)(struct ami_corewindow *ami_cw, int x, int y); + + /** + * callback for icon drop on Amiga core window + * ie. a drag has ended *above* this window + * \todo this may not be very flexible but serves our current purposes + * + * \param ami_cw The Amiga core window structure. + * \param url url of dropped icon + * \param title title of dropped icon + * \param x mouse x position **in screen co-ordinates** + * \param y mouse y position **in screen co-ordinates** + * \return NSERROR_OK on success otherwise apropriate error code + */ + nserror (*icon_drop)(struct ami_corewindow *ami_cw, struct nsurl *url, const char *title, int x, int y); + + /** + * callback to close an Amiga core window + * + * \param ami_cw The Amiga core window structure. + */ + void (*close)(struct ami_corewindow *ami_cw); + +}; + +/** + * initialise elements of Amiga core window. + * + * As a pre-requisite the draw, key and mouse callbacks must be defined + * + * \param example_cw An Amiga core window structure to initialise + * \return NSERROR_OK on successful initialisation otherwise error code. + */ +nserror ami_corewindow_init(struct ami_corewindow *ami_cw); + +/** + * finalise elements of Amiga core window. + * + * \param ami_cw An Amiga core window structure to finialise + * \return NSERROR_OK on successful finalisation otherwise error code. + */ +nserror ami_corewindow_fini(struct ami_corewindow *ami_cw); + +#endif + diff --git a/frontends/amiga/dist/NetSurf.guide b/frontends/amiga/dist/NetSurf.guide index dd2f46d..512a264 100755 --- a/frontends/amiga/dist/NetSurf.guide +++ b/frontends/amiga/dist/NetSurf.guide @@ -145,7 +145,7 @@ There are a couple of Amiga-specific options which can only be changed directly @{b}web_search_width@{ub} Defaults to 0. Larger values will increase the size of the web search gadget next to the URL bar. @{b}mask_alpha@{ub} Threshold to use when determining which alpha values to convert to full transparency (0 - 255, where 255 will convert even opaque pixels to transparent). Defaults to 0. This is only used in palette-mapped modes where alpha blending is not currently supported. @{b}tab_new_session{ub} If NetSurf is already running, this will cause any passed URLs to open in a new tab rather than a new window. - +@{b}use_extmem@{ub} Defaults to 1 (enabled). Setting to 0 will prevent NetSurf using Extended Memory to store uncompressed images - this may have a performance benefit and no disadvantage for <2GB configurations. OS4.1FEU1 only. @{b}url_file@{ub} Path to URL database file @{b}hotlist_file@{ub} Path to Hotlist file @{b}arexx_dir@{ub} Path to ARexx scripts dir @@ -285,11 +285,11 @@ Items from the hotlist can be added to the Hotlist menu as follows: Select Hotlist => Show hotlist... -Items in the "Hotlist menu" folder node, up to a maximum (currently) of 40 items, will be added to the Hotlist menu, within the limits of the Intuition menu system. +Items in the "Hotlist menu" folder node, up to a maximum (currently) of 200 items, will be added to the Hotlist menu, within the limits of the Intuition menu system. Items in folders within the Menu folder node will be converted to subitems in the menu. -Folders more than one level down in the heirarchy will become menu items with no action. Items deeper will not be included in the menu at all (until we switch to using menuclass). +When using a version of AmigaOS older than OS4.1FE, folders more than one level down in the heirarchy will become menu items with no action. Items deeper will not be included in the menu at all. Folders with no items in them will show up disabled in the menu. If they are named "--" they will be displayed as separator bars. diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c index 93536f4..47485e0 100644 --- a/frontends/amiga/download.c +++ b/frontends/amiga/download.c @@ -69,7 +69,7 @@ #include "amiga/utf8.h" struct gui_download_window { - struct nsObject *node; + struct ami_generic_window w; struct Window *win; Object *objects[GID_LAST]; BPTR fh; @@ -89,6 +89,14 @@ enum { AMINS_DLOAD_ABORT, }; +static void ami_download_window_abort(void *w); +static BOOL ami_download_window_event(void *w); + +static const struct ami_win_event_table ami_download_table = { + ami_download_window_event, + ami_download_window_abort, +}; + static int downloads_in_progress = 0; static struct gui_download_window *gui_download_window_create(download_context *ctx, @@ -100,7 +108,7 @@ static struct gui_download_window *gui_download_window_create(download_context * char *dl_filename = ami_utf8_easy(download_context_get_filename(ctx)); APTR va[3]; - dw = ami_misc_allocvec_clear(sizeof(struct gui_download_window), 0); + dw = calloc(1, sizeof(struct gui_download_window)); if(gui && (!IsListEmpty(&gui->dllist)) && (dw->dln = (struct dlnode *)FindName(&gui->dllist,url))) { @@ -122,13 +130,13 @@ static struct gui_download_window *gui_download_window_create(download_context * AddPart((STRPTR)&dw->fname,savereq->fr_File,1024); if(!ami_download_check_overwrite(dw->fname, gui->shared->win, total_size)) { - FreeVec(dw); + free(dw); return NULL; } } else { - FreeVec(dw); + free(dw); return NULL; } } @@ -145,7 +153,7 @@ static struct gui_download_window *gui_download_window_create(download_context * if(!(dw->fh = FOpen((STRPTR)&dw->fname,MODE_NEWFILE,0))) { - FreeVec(dw); + free(dw); return NULL; } @@ -190,8 +198,7 @@ static struct gui_download_window *gui_download_window_create(download_context * dw->win = (struct Window *)RA_OpenWindow(dw->objects[OID_MAIN]); dw->ctx = ctx; - dw->node = AddObject(window_list,AMINS_DLWINDOW); - dw->node->objstruct = dw; + ami_gui_win_list_add(dw, AMINS_DLWINDOW, &ami_download_table); downloads_in_progress++; @@ -260,7 +267,7 @@ static void gui_download_window_done(struct gui_download_window *dw) free(dln->filename); Remove((struct Node *)dln); - FreeVec(dln); + free(dln); } FClose(dw->fh); @@ -269,7 +276,7 @@ static void gui_download_window_done(struct gui_download_window *dw) downloads_in_progress--; DisposeObject(dw->objects[OID_MAIN]); - DelObject(dw->node); + ami_gui_win_list_remove(dw); if(queuedl) { nsurl *url; if (nsurl_create(dln2->node.ln_Name, &url) != NSERROR_OK) { @@ -296,16 +303,18 @@ static void gui_download_window_error(struct gui_download_window *dw, gui_download_window_done(dw); } -void ami_download_window_abort(struct gui_download_window *dw) +static void ami_download_window_abort(void *w) { + struct gui_download_window *dw = (struct gui_download_window *)dw; download_context_abort(dw->ctx); dw->result = AMINS_DLOAD_ABORT; gui_download_window_done(dw); } -BOOL ami_download_window_event(struct gui_download_window *dw) +static BOOL ami_download_window_event(void *w) { /* return TRUE if window destroyed */ + struct gui_download_window *dw = (struct gui_download_window *)w; ULONG result; uint16 code; @@ -343,7 +352,7 @@ void ami_free_download_list(struct List *dllist) free(node->node.ln_Name); free(node->filename); Remove((struct Node *)node); - FreeVec((struct Node *)node); + free((struct Node *)node); }while((node=nnode)); } diff --git a/frontends/amiga/download.h b/frontends/amiga/download.h index 51981ed..b60b4f0 100755 --- a/frontends/amiga/download.h +++ b/frontends/amiga/download.h @@ -34,8 +34,6 @@ struct dlnode char *filename; }; -void ami_download_window_abort(struct gui_download_window *dw); -BOOL ami_download_window_event(struct gui_download_window *dw); void ami_free_download_list(struct List *dllist); BOOL ami_download_check_overwrite(const char *file, struct Window *win, ULONG size); diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c index 1946788..a486334 100644 --- a/frontends/amiga/dt_anim.c +++ b/frontends/amiga/dt_anim.c @@ -46,7 +46,6 @@ #include "amiga/bitmap.h" #include "amiga/filetype.h" #include "amiga/datatypes.h" -#include "amiga/misc.h" #include "amiga/plotters.h" typedef struct amiga_dt_anim_content { @@ -216,7 +215,7 @@ bool amiga_dt_anim_convert(struct content *c) #else #warning FIXME: Need to use a different blitter function for OS3! #endif - FreeVec(clut); + free(clut); adt_frame.MethodID = ADTM_UNLOADFRAME; IDoMethodA(plugin->dto, (Msg)&adt_frame); @@ -344,7 +343,7 @@ content_type amiga_dt_anim_content_type(void) static APTR ami_colormap_to_clut(struct ColorMap *cmap) { int i; - UBYTE *clut = ami_misc_allocvec_clear(256 * 4, 0); /* NB: Was not MEMF_PRIVATE */ + UBYTE *clut = calloc(1, 256 * 4); ULONG colr[256 * 4]; if(!clut) return NULL; diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c index 1bba30e..0fd4378 100644 --- a/frontends/amiga/file.c +++ b/frontends/amiga/file.c @@ -46,6 +46,9 @@ static struct Hook aslhookfunc; +struct FileRequester *filereq; +struct FileRequester *savereq; + HOOKF(ULONG, ami_file_asl_mime_hook, struct FileRequester *, fr, struct AnchorPathOld *) { char fname[1024]; @@ -89,7 +92,7 @@ void ami_file_open(struct gui_window_2 *gwin) ASLFR_FilterFunc, &aslhookfunc, TAG_DONE)) { - if((temp = AllocVecTagList(1024, NULL))) + if((temp = malloc(1024))) { strlcpy(temp, filereq->fr_Drawer, 1024); AddPart(temp, filereq->fr_File, 1024); @@ -107,7 +110,7 @@ void ami_file_open(struct gui_window_2 *gwin) nsurl_unref(url); } - FreeVec(temp); + free(temp); } } } @@ -212,7 +215,7 @@ void ami_file_save(int type, char *fname, struct Window *win, void ami_file_save_req(int type, struct gui_window_2 *gwin, struct hlcache_handle *object) { - char *fname = AllocVecTagList(1024, NULL); + char *fname = malloc(1024); char *initial_fname = NULL; char *fname_with_ext = NULL; bool strip_ext = true; @@ -223,7 +226,7 @@ void ami_file_save_req(int type, struct gui_window_2 *gwin, } if(initial_fname != NULL) { - fname_with_ext = AllocVecTagList(strlen(initial_fname) + 5, NULL); /* 5 = .ext\0 */ + fname_with_ext = malloc(strlen(initial_fname) + 5); /* 5 = .ext\0 */ strcpy(fname_with_ext, initial_fname); @@ -260,8 +263,8 @@ void ami_file_save_req(int type, struct gui_window_2 *gwin, ami_file_save(type, fname, gwin->win, object, gwin->gw->favicon, gwin->gw->bw); } - if(fname) FreeVec(fname); - if(fname_with_ext) FreeVec(fname_with_ext); + if(fname) free(fname); + if(fname_with_ext) free(fname_with_ext); } void ami_file_req_init(void) diff --git a/frontends/amiga/file.h b/frontends/amiga/file.h index 29a76c4..9120fff 100644 --- a/frontends/amiga/file.h +++ b/frontends/amiga/file.h @@ -21,8 +21,8 @@ struct hlcache_object; struct selection; struct gui_window_2; -struct FileRequester *filereq; -struct FileRequester *savereq; +extern struct FileRequester *filereq; +extern struct FileRequester *savereq; enum { AMINS_SAVE_SOURCE, diff --git a/frontends/amiga/filetype.c b/frontends/amiga/filetype.c index 61e4929..a0449d8 100644 --- a/frontends/amiga/filetype.c +++ b/frontends/amiga/filetype.c @@ -31,7 +31,6 @@ #include "utils/utils.h" #include "amiga/filetype.h" -#include "amiga/misc.h" #include "amiga/object.h" /** @@ -217,7 +216,7 @@ nserror ami_mime_init(const char *mimefile) { if ((node = AddObject(ami_mime_list, AMINS_MIME))) { ObjectCallback(node, ami_mime_entry_free); - mimeentry = ami_misc_allocvec_clear(sizeof(struct ami_mime_entry), 0); + mimeentry = calloc(1, sizeof(struct ami_mime_entry)); node->objstruct = mimeentry; if(rarray[AMI_MIME_MIMETYPE]) @@ -361,7 +360,7 @@ static APTR ami_mime_guess_add_datatype(struct DataType *dt, lwc_string **lwc_mi node = AddObject(ami_mime_list, AMINS_MIME); if(node == NULL) return NULL; - mimeentry = ami_misc_allocvec_clear(sizeof(struct ami_mime_entry), 0); + mimeentry = calloc(1, sizeof(struct ami_mime_entry)); if(mimeentry == NULL) return NULL; node->objstruct = mimeentry; diff --git a/frontends/amiga/font.c b/frontends/amiga/font.c index d3b9c32..22a0f4a 100644 --- a/frontends/amiga/font.c +++ b/frontends/amiga/font.c @@ -115,6 +115,8 @@ void ami_font_fini(void) { if(nsoption_bool(bitmap_fonts) == false) { ami_font_bullet_fini(); + } else { + ami_font_diskfont_fini(); } } diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c index 48e49f3..fd41c29 100644 --- a/frontends/amiga/font_bullet.c +++ b/frontends/amiga/font_bullet.c @@ -41,6 +41,7 @@ #include "utils/utf8.h" #include "utils/utils.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/font.h" #include "amiga/font_bullet.h" @@ -362,7 +363,7 @@ static struct ami_font_cache_node *ami_font_open(const char *font, bool critical { LOG("Requested font not found: %s", font); if(critical == true) amiga_warn_user("CompError", font); - FreeVec(nodedata); + free(nodedata); return NULL; } @@ -600,7 +601,7 @@ static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPo TAG_DONE); #else /* On OS3 the glyph needs to be in chip RAM */ - void *chip_glyph = AllocVec(glyph->glm_BMModulo * glyph->glm_BMRows, MEMF_CHIP); + void *chip_glyph = ami_memory_chip_alloc(glyph->glm_BMModulo * glyph->glm_BMRows); if(chip_glyph != NULL) { CopyMem(glyphbm, chip_glyph, glyph->glm_BMModulo * glyph->glm_BMRows); @@ -611,7 +612,7 @@ static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPo y - glyph->glm_Y0 + glyph->glm_BlackTop, glyph->glm_BlackWidth, glyph->glm_BlackHeight); - FreeVec(chip_glyph); + ami_memory_chip_free(chip_glyph); } #endif } diff --git a/frontends/amiga/font_cache.c b/frontends/amiga/font_cache.c index 08c2fe1..3d83309 100644 --- a/frontends/amiga/font_cache.c +++ b/frontends/amiga/font_cache.c @@ -158,7 +158,7 @@ struct ami_font_cache_node *ami_font_cache_alloc_entry(const char *font) uint32 hash = XXH32(font, strlen(font), 0); nodedata = (struct ami_font_cache_node *)InsertSkipNode(ami_font_cache_list, (APTR)hash, sizeof(struct ami_font_cache_node)); #else - nodedata = AllocVecTagList(sizeof(struct ami_font_cache_node), NULL); + nodedata = malloc(sizeof(struct ami_font_cache_node)); #endif GetSysTime(&nodedata->lastused); diff --git a/frontends/amiga/font_diskfont.c b/frontends/amiga/font_diskfont.c index 313e992..8593f81 100644 --- a/frontends/amiga/font_diskfont.c +++ b/frontends/amiga/font_diskfont.c @@ -39,6 +39,9 @@ #define MAX_FONT_NAME_SIZE 33 +static plot_font_style_t *prev_fstyle = NULL; +static struct TextFont *prev_font = NULL; + static struct TextFont *ami_font_bm_open(struct RastPort *rp, const plot_font_style_t *fstyle) { struct TextFont *bmfont = NULL; @@ -46,6 +49,15 @@ static struct TextFont *ami_font_bm_open(struct RastPort *rp, const plot_font_st char *fontname; char font[MAX_FONT_NAME_SIZE]; + if((prev_fstyle != NULL) && (prev_font != NULL) && + (fstyle->family == prev_fstyle->family) && + (fstyle->size == prev_fstyle->size) && + (fstyle->flags == prev_fstyle->flags) && + (fstyle->weight == prev_fstyle->weight)) { + LOG("(using current font)"); + return prev_font; + } + if(rp == NULL) return NULL; tattr.ta_Flags = 0; @@ -87,16 +99,19 @@ static struct TextFont *ami_font_bm_open(struct RastPort *rp, const plot_font_st tattr.ta_Name = font; tattr.ta_YSize = fstyle->size / FONT_SIZE_SCALE; LOG("font: %s/%d", tattr.ta_Name, tattr.ta_YSize); + + if(prev_font != NULL) CloseFont(prev_font); + if((bmfont = OpenDiskFont(&tattr))) { SetRPAttrs(rp, RPTAG_Font, bmfont, TAG_DONE); } - return bmfont; -} + if(prev_fstyle != NULL) { + memcpy(prev_fstyle, fstyle, sizeof(plot_font_style_t)); + prev_font = bmfont; + } -static void ami_font_bm_close(struct TextFont *bmfont) -{ - CloseFont(bmfont); + return bmfont; } static size_t ami_font_bm_convert_local_to_utf8_offset(const char *utf8string, size_t length, UWORD offset) @@ -125,15 +140,12 @@ static nserror amiga_bm_nsfont_width(const plot_font_style_t *fstyle, if(bmfont == NULL) return NSERROR_INVALID; if(utf8_to_local_encoding(string, length, &localtext) != NSERROR_OK) { - ami_font_bm_close(bmfont); return NSERROR_INVALID; } *width = TextLength(glob->rp, localtext, (UWORD)strlen(localtext)); free(localtext); - ami_font_bm_close(bmfont); - return NSERROR_OK; } @@ -164,7 +176,6 @@ static nserror amiga_bm_nsfont_position_in_string(const plot_font_style_t *fstyl if(bmfont == NULL) return NSERROR_INVALID; if(utf8_to_local_encoding(string, length, &localtext) != NSERROR_OK) { - ami_font_bm_close(bmfont); return NSERROR_INVALID; } @@ -174,7 +185,6 @@ static nserror amiga_bm_nsfont_position_in_string(const plot_font_style_t *fstyl *actual_x = extent.te_Extent.MaxX; free(localtext); - ami_font_bm_close(bmfont); return NSERROR_OK; } @@ -218,7 +228,6 @@ static nserror amiga_bm_nsfont_split(const plot_font_style_t *fstyle, if(bmfont == NULL) return NSERROR_INVALID; if(utf8_to_local_encoding(string, length, &localtext) != NSERROR_OK) { - ami_font_bm_close(bmfont); return NSERROR_INVALID; } @@ -252,7 +261,6 @@ static nserror amiga_bm_nsfont_split(const plot_font_style_t *fstyle, } free(localtext); - ami_font_bm_close(bmfont); return NSERROR_OK; } @@ -273,8 +281,6 @@ static ULONG amiga_bm_nsfont_text(struct RastPort *rp, const char *string, ULONG free(localtext); } - ami_font_bm_close(bmfont); - return 0; } @@ -289,5 +295,14 @@ void ami_font_diskfont_init(void) { /* Set up table */ ami_nsfont = &ami_font_diskfont_table; + + /* Alloc space to hold currently open font - doesn't matter if this fails */ + prev_fstyle = calloc(1, sizeof(plot_font_style_t)); +} + +void ami_font_diskfont_fini(void) +{ + if(prev_font != NULL) CloseFont(prev_font); + if(prev_fstyle != NULL) free(prev_fstyle); } diff --git a/frontends/amiga/font_diskfont.h b/frontends/amiga/font_diskfont.h index de19e94..1c891d2 100644 --- a/frontends/amiga/font_diskfont.h +++ b/frontends/amiga/font_diskfont.h @@ -19,5 +19,6 @@ #ifndef AMIGA_FONT_DISKFONT_H #define AMIGA_FONT_DISKFONT_H void ami_font_diskfont_init(void); +void ami_font_diskfont_fini(void); #endif diff --git a/frontends/amiga/font_scan.c b/frontends/amiga/font_scan.c index c1c1732..932179e 100644 --- a/frontends/amiga/font_scan.c +++ b/frontends/amiga/font_scan.c @@ -99,7 +99,7 @@ const char *ami_font_scan_lookup(const uint16 *code, lwc_string **glypharray) static struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts) { struct ami_font_scan_window *fsw = - AllocVecTagList(sizeof(struct ami_font_scan_window), NULL); + malloc(sizeof(struct ami_font_scan_window)); if(fsw == NULL) return NULL; @@ -201,7 +201,7 @@ static void ami_font_scan_gui_close(struct ami_font_scan_window *fsw) if(fsw) { DisposeObject(fsw->objects[FS_OID_MAIN]); ami_utf8_free(fsw->title); - FreeVec(fsw); + free(fsw); } } @@ -317,10 +317,10 @@ static ULONG ami_font_scan_list(struct MinList *list) struct nsObject *node; do { - if((afh = (struct AvailFontsHeader *)AllocVecTagList(afSize, NULL))) { + if((afh = (struct AvailFontsHeader *)malloc(afSize))) { if(((afShortage = AvailFonts((STRPTR)afh, afSize, AFF_DISK | AFF_OTAG | AFF_SCALED)))) { - FreeVec(afh); + free(afh); afSize += afShortage; } } else { @@ -350,7 +350,7 @@ static ULONG ami_font_scan_list(struct MinList *list) } } } - FreeVec(afh); + free(afh); } else { return 0; } diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 459e768..b2a489e 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2015 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2008-2016 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -116,7 +116,6 @@ #include "desktop/save_complete.h" #include "desktop/scrollbar.h" #include "desktop/searchweb.h" -#include "desktop/tree.h" /* NetSurf Amiga platform includes */ #include "amiga/gui.h" @@ -140,6 +139,7 @@ #include "amiga/launch.h" #include "amiga/libs.h" #include "amiga/login.h" +#include "amiga/memory.h" #include "amiga/menu.h" #include "amiga/misc.h" #include "amiga/nsoption.h" @@ -150,7 +150,6 @@ #include "amiga/search.h" #include "amiga/selectmenu.h" #include "amiga/theme.h" -#include "amiga/tree.h" #include "amiga/utf8.h" #include "amiga/sslcert.h" @@ -216,7 +215,6 @@ static bool cli_force = false; #define USERS_DIR "PROGDIR:Users" static char *users_dir = NULL; -static char *current_user = NULL; static char *current_user_dir; static char *current_user_faviconcache; @@ -244,7 +242,7 @@ static bool gui_window_get_scroll(struct gui_window *g, int *restrict sx, int *r static void gui_window_set_scroll(struct gui_window *g, int sx, int sy); static void gui_window_remove_caret(struct gui_window *g); static void gui_window_place_caret(struct gui_window *g, int x, int y, int height, const struct rect *clip); - +static void gui_window_update_box(struct gui_window *g, const struct rect *restrict rect); /* accessors for default options - user option is updated if it is set as per default */ @@ -284,6 +282,7 @@ STRPTR ami_locale_langs(int *codeset) acceptlangs = ASPrintf("%s", remapped); } } + if(remapped != NULL) free(remapped); } else { @@ -353,8 +352,7 @@ static bool ami_gui_check_resource(char *fullpath, const char *file) netsurf_mkpath(&fullpath, &fullpath_len, 2, fullpath, remapped); lock = Lock(fullpath, ACCESS_READ); - if(lock) - { + if(lock) { UnLock(lock); found = true; } @@ -370,7 +368,7 @@ bool ami_locate_resource(char *fullpath, const char *file) struct Locale *locale; int i; bool found = false; - char *remapped; + char *remapped = NULL; size_t fullpath_len = 1024; /* Check NetSurf user data area first */ @@ -396,11 +394,12 @@ bool ami_locate_resource(char *fullpath, const char *file) strcpy(fullpath, "PROGDIR:Resources/"); if(locale->loc_PrefLanguages[i]) { - ami_gui_map_filename(&remapped, "PROGDIR:Resources", - locale->loc_PrefLanguages[i], "LangNames"); - netsurf_mkpath(&fullpath, &fullpath_len, 2, fullpath, remapped); - - found = ami_gui_check_resource(fullpath, file); + if(ami_gui_map_filename(&remapped, "PROGDIR:Resources", + locale->loc_PrefLanguages[i], "LangNames") == true) { + netsurf_mkpath(&fullpath, &fullpath_len, 2, fullpath, remapped); + found = ami_gui_check_resource(fullpath, file); + free(remapped); + } } else { continue; } @@ -428,7 +427,17 @@ bool ami_locate_resource(char *fullpath, const char *file) return found; } -static bool ami_open_resources(void) +static void ami_gui_resources_free(void) +{ + ami_schedule_free(); + ami_object_fini(); + + FreeSysObject(ASOT_PORT, appport); + FreeSysObject(ASOT_PORT, sport); + FreeSysObject(ASOT_PORT, schedulermsgport); +} + +static bool ami_gui_resources_open(void) { urlStringClass = MakeStringClass(); @@ -444,6 +453,13 @@ static bool ami_open_resources(void) ASO_NoTrack, FALSE, TAG_DONE))) return false; + if(ami_schedule_create(schedulermsgport) != NSERROR_OK) { + ami_misc_fatal_error("Failed to initialise scheduler"); + return false; + } + + ami_object_init(); + return true; } @@ -518,6 +534,28 @@ STRPTR ami_gui_get_screen_title(void) static void ami_set_screen_defaults(struct Screen *screen) { + /* various window size/position defaults */ + int width = screen->Width / 2; + int height = screen->Height / 2; + int top = (screen->Height / 2) - (height / 2); + int left = (screen->Width / 2) - (width / 2); + + nsoption_default_set_int(cookies_window_ypos, top); + nsoption_default_set_int(cookies_window_xpos, left); + nsoption_default_set_int(cookies_window_xsize, width); + nsoption_default_set_int(cookies_window_ysize, height); + + nsoption_default_set_int(history_window_ypos, top); + nsoption_default_set_int(history_window_xpos, left); + nsoption_default_set_int(history_window_xsize, width); + nsoption_default_set_int(history_window_ysize, height); + + nsoption_default_set_int(hotlist_window_ypos, top); + nsoption_default_set_int(hotlist_window_xpos, left); + nsoption_default_set_int(hotlist_window_xsize, width); + nsoption_default_set_int(hotlist_window_ysize, height); + + nsoption_default_set_int(window_x, 0); nsoption_default_set_int(window_y, screen->BarHeight + 1); nsoption_default_set_int(window_width, screen->Width); @@ -598,6 +636,11 @@ static nserror ami_set_options(struct nsoption_s *defaults) /* Some OS-specific overrides */ #ifdef __amigaos4__ + if(!LIB_IS_AT_LEAST((struct Library *)SysBase, 53, 89)) { + /* Disable ExtMem usage pre-OS4.1FEU1 */ + nsoption_set_bool(use_extmem, false); + } + if(codeset == 0) codeset = 4; /* ISO-8859-1 */ const char *encname = (const char *)ObtainCharsetInfo(DFCS_NUMBER, codeset, DFCS_MIMENAME); @@ -904,11 +947,12 @@ static struct RDArgs *ami_gui_commandline(int *restrict argc, char ** argv, return NULL; } -static void ami_gui_read_tooltypes(struct WBArg *wbarg) +static char *ami_gui_read_tooltypes(struct WBArg *wbarg) { struct DiskObject *dobj; STRPTR *toolarray; char *s; + char *current_user = NULL; if((*wbarg->wa_Name) && (dobj = GetDiskObject(wbarg->wa_Name))) { toolarray = (STRPTR *)dobj->do_ToolTypes; @@ -918,13 +962,16 @@ static void ami_gui_read_tooltypes(struct WBArg *wbarg) FreeDiskObject(dobj); } + return current_user; } -static void ami_gui_read_all_tooltypes(int argc, char **argv) +static STRPTR ami_gui_read_all_tooltypes(int argc, char **argv) { struct WBStartup *WBenchMsg; struct WBArg *wbarg; char i = 0; + char *current_user = NULL; + char *cur_user = NULL; if(argc == 0) { /* Started from WB */ WBenchMsg = (struct WBStartup *)argv; @@ -933,11 +980,17 @@ static void ami_gui_read_all_tooltypes(int argc, char **argv) if((wbarg->wa_Lock) && (*wbarg->wa_Name)) olddir = SetCurrentDir(wbarg->wa_Lock); - ami_gui_read_tooltypes(wbarg); + cur_user = ami_gui_read_tooltypes(wbarg); + if(cur_user != NULL) { + if(current_user != NULL) FreeVec(current_user); + current_user = cur_user; + } if(olddir !=-1) SetCurrentDir(olddir); } } + + return current_user; } void ami_gui_set_default_gg(void) @@ -969,9 +1022,7 @@ static void gui_init2(int argc, char** argv) } /**/ - ami_hotlist_initialise(nsoption_charp(hotlist_file)); - ami_cookies_initialise(); - ami_global_history_initialise(); + hotlist_init(nsoption_charp(hotlist_file)); search_web_select_provider(nsoption_int(search_provider)); if (notalreadyrunning && @@ -1155,16 +1206,12 @@ static void ami_update_buttons(struct gui_window_2 *gwin) if(!browser_window_reload_available(gwin->gw->bw)) reload=TRUE; - if(nsoption_bool(kiosk_mode) == false) - { - if(gwin->tabs <= 1) - { + if(nsoption_bool(kiosk_mode) == false) { + if(gwin->tabs <= 1) { tabclose=TRUE; - OffMenu(gwin->win,AMI_MENU_CLOSETAB); - } - else - { - OnMenu(gwin->win,AMI_MENU_CLOSETAB); + ami_gui_menu_set_disabled(gwin->win, gwin->imenu, M_CLOSETAB, true); + } else { + ami_gui_menu_set_disabled(gwin->win, gwin->imenu, M_CLOSETAB, false); } } @@ -1310,8 +1357,9 @@ int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie) break; default: if((chars = MapRawKey(ie,buffer,20,NULL)) > 0) { - utf8_from_local_encoding(buffer, chars, &utf8); + if(utf8_from_local_encoding(buffer, chars, &utf8) != NSERROR_OK) return 0; nskey = utf8_to_ucs4(utf8, utf8_char_byte_length(utf8)); + free(utf8); if(ie->ie_Qualifier & IEQUALIFIER_RCOMMAND) { switch(nskey) { @@ -1342,27 +1390,34 @@ int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie) return nskey; } -static void ami_update_quals(struct gui_window_2 *gwin) +int ami_gui_get_quals(Object *win_obj) { uint32 quals = 0; + int key_state = 0; #ifdef __amigaos4__ - GetAttr(WINDOW_Qualifier,gwin->objects[OID_MAIN],(uint32 *)&quals); + GetAttr(WINDOW_Qualifier, win_obj, (uint32 *)&quals); #else #warning qualifier needs fixing for OS3 #endif - gwin->key_state = 0; if(quals & NSA_QUAL_SHIFT) { - gwin->key_state |= BROWSER_MOUSE_MOD_1; + key_state |= BROWSER_MOUSE_MOD_1; } if(quals & IEQUALIFIER_CONTROL) { - gwin->key_state |= BROWSER_MOUSE_MOD_2; + key_state |= BROWSER_MOUSE_MOD_2; } if(quals & NSA_QUAL_ALT) { - gwin->key_state |= BROWSER_MOUSE_MOD_3; + key_state |= BROWSER_MOUSE_MOD_3; } + + return key_state; +} + +static void ami_update_quals(struct gui_window_2 *gwin) +{ + gwin->key_state = ami_gui_get_quals(gwin->objects[OID_MAIN]); } /* exported interface documented in amiga/gui.h */ @@ -1370,7 +1425,7 @@ nserror ami_gui_get_space_box(Object *obj, struct IBox **bbox) { #ifdef __amigaos4__ if(LIB_IS_AT_LEAST((struct Library *)SpaceBase, 53, 6)) { - *bbox = AllocVecTagList(sizeof(struct IBox), NULL); + *bbox = malloc(sizeof(struct IBox)); if(*bbox == NULL) return NSERROR_NOMEM; GetAttr(SPACE_RenderBox, obj, (ULONG *)*bbox); } else @@ -1387,7 +1442,7 @@ void ami_gui_free_space_box(struct IBox *bbox) { #ifdef __amigaos4__ if(LIB_IS_AT_LEAST((struct Library *)SpaceBase, 53, 6)) { - FreeVec(bbox); + free(bbox); } #endif } @@ -1515,7 +1570,7 @@ static struct IBox *ami_ns_rect_to_ibox(struct gui_window_2 *gwin, const struct { struct IBox *bbox, *ibox; - ibox = AllocVecTagList(sizeof(struct IBox), NULL); + ibox = malloc(sizeof(struct IBox)); if(ibox == NULL) return NULL; if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { @@ -1536,7 +1591,7 @@ static struct IBox *ami_ns_rect_to_ibox(struct gui_window_2 *gwin, const struct (ibox->Top > (bbox->Top + bbox->Height)) || (ibox->Width < 0) || (ibox->Height < 0)) { - FreeVec(ibox); + free(ibox); ami_gui_free_space_box(bbox); return NULL; } @@ -1582,7 +1637,7 @@ static void ami_gui_menu_update_all(void) if(node->Type == AMINS_WINDOW) { - ami_menu_update_checked(gwin); + ami_gui_menu_update_checked(gwin); } } while((node = nnode)); } @@ -1648,7 +1703,7 @@ static bool ami_gui_hscroll_remove(struct gui_window_2 *gwin) IDoMethod(gwin->objects[GID_HSCROLLLAYOUT], LM_REMOVECHILD, gwin->win, gwin->objects[GID_HSCROLL]); #else - SetAttrs(gwin->objects[GID_HSCROLLLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_HSCROLL]); + SetAttrs(gwin->objects[GID_HSCROLLLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_HSCROLL], TAG_DONE); #endif gwin->objects[GID_HSCROLL] = NULL; @@ -1693,7 +1748,7 @@ static bool ami_gui_vscroll_remove(struct gui_window_2 *gwin) IDoMethod(gwin->objects[GID_VSCROLLLAYOUT], LM_REMOVECHILD, gwin->win, gwin->objects[GID_VSCROLL]); #else - SetAttrs(gwin->objects[GID_VSCROLLLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_VSCROLL]); + SetAttrs(gwin->objects[GID_VSCROLLLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_VSCROLL], TAG_DONE); #endif gwin->objects[GID_VSCROLL] = NULL; @@ -1874,679 +1929,642 @@ static void ami_set_border_gadget_size(struct gui_window_2 *gwin) #endif } -static void ami_handle_msg(void) +static BOOL ami_handle_msg(void) { - ULONG result,storage = 0,x,y,xs,ys,width=800,height=600; - uint16 code; - struct IBox *bbox; + struct ami_generic_window *w = NULL; struct nsObject *node; struct nsObject *nnode; - struct gui_window_2 *gwin = NULL; - struct InputEvent *ie; - struct Node *tabnode; - int nskey; - struct timeval curtime; - static int drag_x_move = 0, drag_y_move = 0; - char *utf8 = NULL; - nsurl *url; + BOOL win_closed = FALSE; - if(IsMinListEmpty(window_list)) - { + if(IsMinListEmpty(window_list)) { /* no windows in list, so NetSurf should not be running */ ami_try_quit(); - return; + return FALSE; } node = (struct nsObject *)GetHead((struct List *)window_list); - do - { + do { nnode=(struct nsObject *)GetSucc((struct Node *)node); - gwin = node->objstruct; + w = node->objstruct; + if(w == NULL) continue; - if(node->Type == AMINS_TVWINDOW) { - if(ami_tree_event((struct treeview_window *)gwin)) { - ami_try_quit(); - break; - } else { - node = nnode; - continue; - } - } else if(node->Type == AMINS_FINDWINDOW) { - if(ami_search_event()) { - ami_try_quit(); - break; - } else { - node = nnode; - continue; - } - } else if(node->Type == AMINS_HISTORYWINDOW) { - if(ami_history_event((struct history_window *)gwin)) { - ami_try_quit(); - break; - } else { - node = nnode; - continue; - } - } else if(node->Type == AMINS_PRINTWINDOW) { - if(ami_print_event((struct ami_print_window *)gwin)) { - ami_try_quit(); - break; - } else { - node = nnode; - continue; - } - } else if(node->Type == AMINS_GUIOPTSWINDOW) { - if(ami_gui_opts_event()) { - /* last window possibly closed, so exit with conditions ;) */ - if(scrn) ami_try_quit(); - break; - } else { - node = nnode; - continue; - } - } else if(node->Type == AMINS_DLWINDOW) { - if(ami_download_window_event((struct gui_download_window *)gwin)) { - ami_try_quit(); - break; - } else { - node = nnode; - continue; - } - } else if(node->Type == AMINS_LOGINWINDOW) { - if(ami_401login_event((struct gui_login_window *)gwin)) { - ami_try_quit(); - break; + if(w->tbl->event != NULL) { + if((win_closed = w->tbl->event(w))) { + if((node->Type != AMINS_GUIOPTSWINDOW) || + ((node->Type == AMINS_GUIOPTSWINDOW) && (scrn != NULL))) { + ami_try_quit(); + break; + } } else { node = nnode; continue; } } + } while((node = nnode)); - if((gwin == NULL) || (gwin->objects[OID_MAIN] == NULL)) continue; + if(ami_gui_menu_quit_selected() == true) { + ami_quit_netsurf(); + } + + if(ami_gui_menu_get_check_toggled() == true) { + ami_gui_menu_update_all(); + } - while((result = RA_HandleInput(gwin->objects[OID_MAIN], &code)) != WMHI_LASTMSG) { - switch(result & WMHI_CLASSMASK) // class - { - case WMHI_MOUSEMOVE: - ami_gui_trap_mouse(gwin); /* re-assert mouse area */ + return win_closed; +} - drag_x_move = 0; - drag_y_move = 0; +static BOOL ami_gui_event(void *w) +{ + struct gui_window_2 *gwin = (struct gui_window_2 *)w; + ULONG result, storage = 0, x, y, xs, ys, width = 800, height = 600; + uint16 code; + struct IBox *bbox; + struct InputEvent *ie; + struct Node *tabnode; + int nskey; + struct timeval curtime; + static int drag_x_move = 0, drag_y_move = 0; + char *utf8 = NULL; + nsurl *url; + BOOL win_closed = FALSE; - if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { - amiga_warn_user("NoMemory", ""); - break; - } + while((result = RA_HandleInput(gwin->objects[OID_MAIN], &code)) != WMHI_LASTMSG) { + switch(result & WMHI_CLASSMASK) // class + { + case WMHI_MOUSEMOVE: + ami_gui_trap_mouse(gwin); /* re-assert mouse area */ - x = (ULONG)((gwin->win->MouseX - bbox->Left) / gwin->gw->scale); - y = (ULONG)((gwin->win->MouseY - bbox->Top) / gwin->gw->scale); + drag_x_move = 0; + drag_y_move = 0; - ami_get_hscroll_pos(gwin, (ULONG *)&xs); - ami_get_vscroll_pos(gwin, (ULONG *)&ys); + if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { + amiga_warn_user("NoMemory", ""); + break; + } - x += xs; - y += ys; + x = (ULONG)((gwin->win->MouseX - bbox->Left) / gwin->gw->scale); + y = (ULONG)((gwin->win->MouseY - bbox->Top) / gwin->gw->scale); - width=bbox->Width; - height=bbox->Height; + ami_get_hscroll_pos(gwin, (ULONG *)&xs); + ami_get_vscroll_pos(gwin, (ULONG *)&ys); - if(gwin->mouse_state & BROWSER_MOUSE_DRAG_ON) - { - if(ami_drag_icon_move() == TRUE) { - if((gwin->win->MouseX < bbox->Left) && - ((gwin->win->MouseX - bbox->Left) > -AMI_DRAG_THRESHOLD)) - drag_x_move = gwin->win->MouseX - bbox->Left; - if((gwin->win->MouseX > (bbox->Left + bbox->Width)) && - ((gwin->win->MouseX - (bbox->Left + bbox->Width)) < AMI_DRAG_THRESHOLD)) - drag_x_move = gwin->win->MouseX - (bbox->Left + bbox->Width); - if((gwin->win->MouseY < bbox->Top) && - ((gwin->win->MouseY - bbox->Top) > -AMI_DRAG_THRESHOLD)) - drag_y_move = gwin->win->MouseY - bbox->Top; - if((gwin->win->MouseY > (bbox->Top + bbox->Height)) && - ((gwin->win->MouseY - (bbox->Top + bbox->Height)) < AMI_DRAG_THRESHOLD)) - drag_y_move = gwin->win->MouseY - (bbox->Top + bbox->Height); - } + x += xs; + y += ys; + + width=bbox->Width; + height=bbox->Height; + + if(gwin->mouse_state & BROWSER_MOUSE_DRAG_ON) + { + if(ami_drag_icon_move() == TRUE) { + if((gwin->win->MouseX < bbox->Left) && + ((gwin->win->MouseX - bbox->Left) > -AMI_DRAG_THRESHOLD)) + drag_x_move = gwin->win->MouseX - bbox->Left; + if((gwin->win->MouseX > (bbox->Left + bbox->Width)) && + ((gwin->win->MouseX - (bbox->Left + bbox->Width)) < AMI_DRAG_THRESHOLD)) + drag_x_move = gwin->win->MouseX - (bbox->Left + bbox->Width); + if((gwin->win->MouseY < bbox->Top) && + ((gwin->win->MouseY - bbox->Top) > -AMI_DRAG_THRESHOLD)) + drag_y_move = gwin->win->MouseY - bbox->Top; + if((gwin->win->MouseY > (bbox->Top + bbox->Height)) && + ((gwin->win->MouseY - (bbox->Top + bbox->Height)) < AMI_DRAG_THRESHOLD)) + drag_y_move = gwin->win->MouseY - (bbox->Top + bbox->Height); } + } - ami_gui_free_space_box(bbox); + ami_gui_free_space_box(bbox); - if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys)) - { - ami_update_quals(gwin); + if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys)) + { + ami_update_quals(gwin); - if(gwin->mouse_state & BROWSER_MOUSE_PRESS_1) - { - browser_window_mouse_track(gwin->gw->bw,BROWSER_MOUSE_DRAG_1 | gwin->key_state,x,y); - gwin->mouse_state = BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_ON; - } - else if(gwin->mouse_state & BROWSER_MOUSE_PRESS_2) - { - browser_window_mouse_track(gwin->gw->bw,BROWSER_MOUSE_DRAG_2 | gwin->key_state,x,y); - gwin->mouse_state = BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_ON; - } - else - { - browser_window_mouse_track(gwin->gw->bw,gwin->mouse_state | gwin->key_state,x,y); - } - } else { - if(!gwin->mouse_state) ami_set_pointer(gwin, GUI_POINTER_DEFAULT, true); + if(gwin->mouse_state & BROWSER_MOUSE_PRESS_1) + { + browser_window_mouse_track(gwin->gw->bw,BROWSER_MOUSE_DRAG_1 | gwin->key_state,x,y); + gwin->mouse_state = BROWSER_MOUSE_HOLDING_1 | BROWSER_MOUSE_DRAG_ON; } - break; - - case WMHI_MOUSEBUTTONS: - if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { - amiga_warn_user("NoMemory", ""); - return; + else if(gwin->mouse_state & BROWSER_MOUSE_PRESS_2) + { + browser_window_mouse_track(gwin->gw->bw,BROWSER_MOUSE_DRAG_2 | gwin->key_state,x,y); + gwin->mouse_state = BROWSER_MOUSE_HOLDING_2 | BROWSER_MOUSE_DRAG_ON; + } + else + { + browser_window_mouse_track(gwin->gw->bw,gwin->mouse_state | gwin->key_state,x,y); } + } else { + if(!gwin->mouse_state) ami_set_pointer(gwin, GUI_POINTER_DEFAULT, true); + } + break; - x = (ULONG)((gwin->win->MouseX - bbox->Left) / gwin->gw->scale); - y = (ULONG)((gwin->win->MouseY - bbox->Top) / gwin->gw->scale); + case WMHI_MOUSEBUTTONS: + if(ami_gui_get_space_box((Object *)gwin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { + amiga_warn_user("NoMemory", ""); + return FALSE; + } - ami_get_hscroll_pos(gwin, (ULONG *)&xs); - ami_get_vscroll_pos(gwin, (ULONG *)&ys); + x = (ULONG)((gwin->win->MouseX - bbox->Left) / gwin->gw->scale); + y = (ULONG)((gwin->win->MouseY - bbox->Top) / gwin->gw->scale); - x += xs; - y += ys; + ami_get_hscroll_pos(gwin, (ULONG *)&xs); + ami_get_vscroll_pos(gwin, (ULONG *)&ys); - width=bbox->Width; - height=bbox->Height; + x += xs; + y += ys; - ami_gui_free_space_box(bbox); + width=bbox->Width; + height=bbox->Height; - ami_update_quals(gwin); + ami_gui_free_space_box(bbox); + + ami_update_quals(gwin); - if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys)) + if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys)) + { + //code = code>>16; + switch(code) { - //code = code>>16; - switch(code) - { - case SELECTDOWN: - browser_window_mouse_click(gwin->gw->bw,BROWSER_MOUSE_PRESS_1 | gwin->key_state,x,y); - gwin->mouse_state=BROWSER_MOUSE_PRESS_1; - break; - case MIDDLEDOWN: - browser_window_mouse_click(gwin->gw->bw,BROWSER_MOUSE_PRESS_2 | gwin->key_state,x,y); - gwin->mouse_state=BROWSER_MOUSE_PRESS_2; - break; - } + case SELECTDOWN: + browser_window_mouse_click(gwin->gw->bw,BROWSER_MOUSE_PRESS_1 | gwin->key_state,x,y); + gwin->mouse_state=BROWSER_MOUSE_PRESS_1; + break; + case MIDDLEDOWN: + browser_window_mouse_click(gwin->gw->bw,BROWSER_MOUSE_PRESS_2 | gwin->key_state,x,y); + gwin->mouse_state=BROWSER_MOUSE_PRESS_2; + break; } + } - if(x<xs) x=xs; - if(y<ys) y=ys; - if(x>=width+xs) x=width+xs-1; - if(y>=height+ys) y=height+ys-1; + if(x<xs) x=xs; + if(y<ys) y=ys; + if(x>=width+xs) x=width+xs-1; + if(y>=height+ys) y=height+ys-1; - switch(code) - { - case SELECTUP: - if(gwin->mouse_state & BROWSER_MOUSE_PRESS_1) - { - CurrentTime((ULONG *)&curtime.tv_sec, (ULONG *)&curtime.tv_usec); + switch(code) + { + case SELECTUP: + if(gwin->mouse_state & BROWSER_MOUSE_PRESS_1) + { + CurrentTime((ULONG *)&curtime.tv_sec, (ULONG *)&curtime.tv_usec); - gwin->mouse_state = BROWSER_MOUSE_CLICK_1; + gwin->mouse_state = BROWSER_MOUSE_CLICK_1; - if(gwin->lastclick.tv_sec) - { - if(DoubleClick(gwin->lastclick.tv_sec, - gwin->lastclick.tv_usec, - curtime.tv_sec, curtime.tv_usec)) { - if(gwin->prev_mouse_state & BROWSER_MOUSE_DOUBLE_CLICK) { - gwin->mouse_state |= BROWSER_MOUSE_TRIPLE_CLICK; - } else { - gwin->mouse_state |= BROWSER_MOUSE_DOUBLE_CLICK; - } + if(gwin->lastclick.tv_sec) + { + if(DoubleClick(gwin->lastclick.tv_sec, + gwin->lastclick.tv_usec, + curtime.tv_sec, curtime.tv_usec)) { + if(gwin->prev_mouse_state & BROWSER_MOUSE_DOUBLE_CLICK) { + gwin->mouse_state |= BROWSER_MOUSE_TRIPLE_CLICK; + } else { + gwin->mouse_state |= BROWSER_MOUSE_DOUBLE_CLICK; } } + } - browser_window_mouse_click(gwin->gw->bw, - gwin->mouse_state | gwin->key_state,x,y); + browser_window_mouse_click(gwin->gw->bw, + gwin->mouse_state | gwin->key_state,x,y); - if(gwin->mouse_state & BROWSER_MOUSE_TRIPLE_CLICK) - { - gwin->lastclick.tv_sec = 0; - gwin->lastclick.tv_usec = 0; - } - else - { - gwin->lastclick.tv_sec = curtime.tv_sec; - gwin->lastclick.tv_usec = curtime.tv_usec; - } + if(gwin->mouse_state & BROWSER_MOUSE_TRIPLE_CLICK) + { + gwin->lastclick.tv_sec = 0; + gwin->lastclick.tv_usec = 0; } else { - browser_window_mouse_track(gwin->gw->bw, 0, x, y); + gwin->lastclick.tv_sec = curtime.tv_sec; + gwin->lastclick.tv_usec = curtime.tv_usec; } - gwin->prev_mouse_state = gwin->mouse_state; - gwin->mouse_state=0; - break; + } + else + { + browser_window_mouse_track(gwin->gw->bw, 0, x, y); + } + gwin->prev_mouse_state = gwin->mouse_state; + gwin->mouse_state=0; + break; - case MIDDLEUP: - if(gwin->mouse_state & BROWSER_MOUSE_PRESS_2) - { - CurrentTime((ULONG *)&curtime.tv_sec, (ULONG *)&curtime.tv_usec); + case MIDDLEUP: + if(gwin->mouse_state & BROWSER_MOUSE_PRESS_2) + { + CurrentTime((ULONG *)&curtime.tv_sec, (ULONG *)&curtime.tv_usec); - gwin->mouse_state = BROWSER_MOUSE_CLICK_2; + gwin->mouse_state = BROWSER_MOUSE_CLICK_2; - if(gwin->lastclick.tv_sec) - { - if(DoubleClick(gwin->lastclick.tv_sec, - gwin->lastclick.tv_usec, - curtime.tv_sec, curtime.tv_usec)) { - if(gwin->prev_mouse_state & BROWSER_MOUSE_DOUBLE_CLICK) { - gwin->mouse_state |= BROWSER_MOUSE_TRIPLE_CLICK; - } else { - gwin->mouse_state |= BROWSER_MOUSE_DOUBLE_CLICK; - } + if(gwin->lastclick.tv_sec) + { + if(DoubleClick(gwin->lastclick.tv_sec, + gwin->lastclick.tv_usec, + curtime.tv_sec, curtime.tv_usec)) { + if(gwin->prev_mouse_state & BROWSER_MOUSE_DOUBLE_CLICK) { + gwin->mouse_state |= BROWSER_MOUSE_TRIPLE_CLICK; + } else { + gwin->mouse_state |= BROWSER_MOUSE_DOUBLE_CLICK; } } + } - browser_window_mouse_click(gwin->gw->bw, - gwin->mouse_state | gwin->key_state,x,y); + browser_window_mouse_click(gwin->gw->bw, + gwin->mouse_state | gwin->key_state,x,y); - if(gwin->mouse_state & BROWSER_MOUSE_TRIPLE_CLICK) - { - gwin->lastclick.tv_sec = 0; - gwin->lastclick.tv_usec = 0; - } - else - { - gwin->lastclick.tv_sec = curtime.tv_sec; - gwin->lastclick.tv_usec = curtime.tv_usec; - } + if(gwin->mouse_state & BROWSER_MOUSE_TRIPLE_CLICK) + { + gwin->lastclick.tv_sec = 0; + gwin->lastclick.tv_usec = 0; } else { - browser_window_mouse_track(gwin->gw->bw, 0, x, y); + gwin->lastclick.tv_sec = curtime.tv_sec; + gwin->lastclick.tv_usec = curtime.tv_usec; } - gwin->prev_mouse_state = gwin->mouse_state; - gwin->mouse_state=0; - break; + } + else + { + browser_window_mouse_track(gwin->gw->bw, 0, x, y); + } + gwin->prev_mouse_state = gwin->mouse_state; + gwin->mouse_state=0; + break; #ifdef __amigaos4__ - case SIDEUP: - ami_gui_history(gwin, true); - break; + case SIDEUP: + ami_gui_history(gwin, true); + break; - case EXTRAUP: - ami_gui_history(gwin, false); - break; + case EXTRAUP: + ami_gui_history(gwin, false); + break; #endif + } + + if(ami_drag_has_data() && !gwin->mouse_state) + ami_drag_save(gwin->win); + break; + + case WMHI_GADGETUP: + switch(result & WMHI_GADGETMASK) + { + case GID_TABS: + if(gwin->objects[GID_TABS] == NULL) break; + if(ClickTabBase->lib_Version >= 53) { + GetAttrs(gwin->objects[GID_TABS], + CLICKTAB_NodeClosed, &tabnode, TAG_DONE); + } else { + tabnode = NULL; + } + + if(tabnode) { + struct gui_window *closedgw; + + GetClickTabNodeAttrs(tabnode, + TNA_UserData, &closedgw, + TAG_DONE); + + browser_window_destroy(closedgw->bw); + } else { + ami_switch_tab(gwin, true); + } + break; + + case GID_CLOSETAB: + browser_window_destroy(gwin->gw->bw); + break; + + case GID_ADDTAB: + ami_gui_new_blank_tab(gwin); + break; + + case GID_URL: + { + nserror ret; + nsurl *url; + GetAttr(STRINGA_TextVal, + (Object *)gwin->objects[GID_URL], + (ULONG *)&storage); + utf8 = ami_to_utf8_easy((const char *)storage); + + ret = search_web_omni(utf8, SEARCH_WEB_OMNI_NONE, &url); + ami_utf8_free(utf8); + if (ret == NSERROR_OK) { + browser_window_navigate(gwin->gw->bw, + url, + NULL, + BW_NAVIGATE_HISTORY, + NULL, + NULL, + NULL); + nsurl_unref(url); + } + if (ret != NSERROR_OK) { + amiga_warn_user(messages_get_errorcode(ret), 0); + } } + break; - if(ami_drag_has_data() && !gwin->mouse_state) - ami_drag_save(gwin->win); - break; + case GID_TOOLBARLAYOUT: + /* Need fixing: never gets here */ + search_web_select_provider(-1); + break; - case WMHI_GADGETUP: - switch(result & WMHI_GADGETMASK) + case GID_SEARCH_ICON: + GetAttr(CHOOSER_Selected, gwin->objects[GID_SEARCH_ICON], (ULONG *)&storage); + search_web_select_provider(storage); + break; + + case GID_SEARCHSTRING: { - case GID_TABS: - if(gwin->objects[GID_TABS] == NULL) break; - if(ClickTabBase->lib_Version >= 53) { - GetAttrs(gwin->objects[GID_TABS], - CLICKTAB_NodeClosed, &tabnode, TAG_DONE); - } else { - tabnode = NULL; - } + nserror ret; + nsurl *url; + + GetAttr(STRINGA_TextVal, + (Object *)gwin->objects[GID_SEARCHSTRING], + (ULONG *)&storage); + + utf8 = ami_to_utf8_easy((const char *)storage); - if(tabnode) { - struct gui_window *closedgw; + ret = search_web_omni(utf8, SEARCH_WEB_OMNI_SEARCHONLY, &url); + ami_utf8_free(utf8); + if (ret == NSERROR_OK) { + browser_window_navigate(gwin->gw->bw, + url, + NULL, + BW_NAVIGATE_HISTORY, + NULL, + NULL, + NULL); + nsurl_unref(url); + } + if (ret != NSERROR_OK) { + amiga_warn_user(messages_get_errorcode(ret), 0); + } - GetClickTabNodeAttrs(tabnode, - TNA_UserData, &closedgw, - TAG_DONE); + } + break; - browser_window_destroy(closedgw->bw); + case GID_HOME: + { + if (nsurl_create(nsoption_charp(homepage_url), &url) != NSERROR_OK) { + amiga_warn_user("NoMemory", 0); } else { - ami_switch_tab(gwin, true); + browser_window_navigate(gwin->gw->bw, + url, + NULL, + BW_NAVIGATE_HISTORY, + NULL, + NULL, + NULL); + nsurl_unref(url); } - break; + } + break; - case GID_CLOSETAB: - browser_window_destroy(gwin->gw->bw); - break; + case GID_STOP: + if(browser_window_stop_available(gwin->gw->bw)) + browser_window_stop(gwin->gw->bw); + break; - case GID_ADDTAB: - ami_gui_new_blank_tab(gwin); - break; + case GID_RELOAD: + ami_update_quals(gwin); - case GID_URL: + if(browser_window_reload_available(gwin->gw->bw)) { - nserror ret; - nsurl *url; - GetAttr(STRINGA_TextVal, - (Object *)gwin->objects[GID_URL], - (ULONG *)&storage); - utf8 = ami_to_utf8_easy((const char *)storage); - - ret = search_web_omni(utf8, SEARCH_WEB_OMNI_NONE, &url); - ami_utf8_free(utf8); - if (ret == NSERROR_OK) { - browser_window_navigate(gwin->gw->bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); - nsurl_unref(url); + if(gwin->key_state & BROWSER_MOUSE_MOD_1) + { + browser_window_reload(gwin->gw->bw, true); } - if (ret != NSERROR_OK) { - amiga_warn_user(messages_get_errorcode(ret), 0); + else + { + browser_window_reload(gwin->gw->bw, false); } } - break; + break; - case GID_TOOLBARLAYOUT: - /* Need fixing: never gets here */ - search_web_select_provider(-1); - break; + case GID_BACK: + ami_gui_history(gwin, true); + break; - case GID_SEARCH_ICON: - GetAttr(CHOOSER_Selected, gwin->objects[GID_SEARCH_ICON], (ULONG *)&storage); - search_web_select_provider(storage); - break; + case GID_FORWARD: + ami_gui_history(gwin, false); + break; - case GID_SEARCHSTRING: - { - nserror ret; - nsurl *url; + case GID_FAVE: + GetAttr(STRINGA_TextVal, + (Object *)gwin->objects[GID_URL], + (ULONG *)&storage); + if(nsurl_create((const char *)storage, &url) == NSERROR_OK) { + if(hotlist_has_url(url)) { + hotlist_remove_url(url); + } else { + hotlist_add_url(url); + } + nsurl_unref(url); + } + ami_gui_update_hotlist_button(gwin); + break; - GetAttr(STRINGA_TextVal, - (Object *)gwin->objects[GID_SEARCHSTRING], - (ULONG *)&storage); + case GID_HOTLIST: + default: +// printf("GADGET: %ld\n",(result & WMHI_GADGETMASK)); + break; + } + break; - utf8 = ami_to_utf8_easy((const char *)storage); + case WMHI_RAWKEY: + ami_update_quals(gwin); + + storage = result & WMHI_GADGETMASK; + if(storage >= IECODE_UP_PREFIX) break; - ret = search_web_omni(utf8, SEARCH_WEB_OMNI_SEARCHONLY, &url); - ami_utf8_free(utf8); - if (ret == NSERROR_OK) { - browser_window_navigate(gwin->gw->bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - if (ret != NSERROR_OK) { - amiga_warn_user(messages_get_errorcode(ret), 0); - } + GetAttr(WINDOW_InputEvent,gwin->objects[OID_MAIN],(ULONG *)&ie); - } - break; + nskey = ami_key_to_nskey(storage, ie); - case GID_HOME: - { - if (nsurl_create(nsoption_charp(homepage_url), &url) != NSERROR_OK) { - amiga_warn_user("NoMemory", 0); - } else { - browser_window_navigate(gwin->gw->bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - } + if((ie->ie_Qualifier & IEQUALIFIER_RCOMMAND) && + ((31 < nskey) && (nskey < 127))) { + /* NB: Some keypresses are converted to generic keypresses above + * rather than being "menu-emulated" here. */ + switch(nskey) + { + /* The following aren't available from the menu at the moment */ + + case 'r': // reload + if(browser_window_reload_available(gwin->gw->bw)) + browser_window_reload(gwin->gw->bw, false); break; - case GID_STOP: - if(browser_window_stop_available(gwin->gw->bw)) - browser_window_stop(gwin->gw->bw); + case 'u': // open url + if((nsoption_bool(kiosk_mode) == false)) + ActivateLayoutGadget((struct Gadget *)gwin->objects[GID_MAIN], + gwin->win, NULL, (uint32)gwin->objects[GID_URL]); break; + } + } + else + { + if(!browser_window_key_press(gwin->gw->bw, nskey)) + { + switch(nskey) + { + case NS_KEY_UP: + ami_gui_scroll_internal(gwin, 0, -NSA_KBD_SCROLL_PX); + break; - case GID_RELOAD: - ami_update_quals(gwin); + case NS_KEY_DOWN: + ami_gui_scroll_internal(gwin, 0, +NSA_KBD_SCROLL_PX); + break; - if(browser_window_reload_available(gwin->gw->bw)) - { - if(gwin->key_state & BROWSER_MOUSE_MOD_1) - { - browser_window_reload(gwin->gw->bw, true); - } - else - { - browser_window_reload(gwin->gw->bw, false); - } - } - break; + case NS_KEY_LEFT: + ami_gui_scroll_internal(gwin, -NSA_KBD_SCROLL_PX, 0); + break; - case GID_BACK: - ami_gui_history(gwin, true); - break; + case NS_KEY_RIGHT: + ami_gui_scroll_internal(gwin, +NSA_KBD_SCROLL_PX, 0); + break; - case GID_FORWARD: - ami_gui_history(gwin, false); - break; + case NS_KEY_PAGE_UP: + ami_gui_scroll_internal(gwin, 0, SCROLL_PAGE_UP); + break; - case GID_FAVE: - GetAttr(STRINGA_TextVal, - (Object *)gwin->objects[GID_URL], - (ULONG *)&storage); - if(nsurl_create((const char *)storage, &url) == NSERROR_OK) { - if(hotlist_has_url(url)) { - hotlist_remove_url(url); - } else { - hotlist_add_url(url); - } - nsurl_unref(url); - } - ami_gui_update_hotlist_button(gwin); - break; + case NS_KEY_PAGE_DOWN: + case ' ': + ami_gui_scroll_internal(gwin, 0, SCROLL_PAGE_DOWN); + break; - case GID_HOTLIST: - default: -// printf("GADGET: %ld\n",(result & WMHI_GADGETMASK)); - break; - } - break; + case NS_KEY_LINE_START: // page left + ami_gui_scroll_internal(gwin, SCROLL_PAGE_UP, 0); + break; - case WMHI_RAWKEY: - ami_update_quals(gwin); - - storage = result & WMHI_GADGETMASK; - if(storage >= IECODE_UP_PREFIX) break; + case NS_KEY_LINE_END: // page right + ami_gui_scroll_internal(gwin, SCROLL_PAGE_DOWN, 0); + break; + + case NS_KEY_TEXT_START: // home + ami_gui_scroll_internal(gwin, SCROLL_TOP, SCROLL_TOP); + break; + + case NS_KEY_TEXT_END: // end + ami_gui_scroll_internal(gwin, SCROLL_BOTTOM, SCROLL_BOTTOM); + break; - GetAttr(WINDOW_InputEvent,gwin->objects[OID_MAIN],(ULONG *)&ie); + case NS_KEY_WORD_RIGHT: // alt+right + ami_change_tab(gwin, 1); + break; - nskey = ami_key_to_nskey(storage, ie); + case NS_KEY_WORD_LEFT: // alt+left + ami_change_tab(gwin, -1); + break; - if((ie->ie_Qualifier & IEQUALIFIER_RCOMMAND) && - ((31 < nskey) && (nskey < 127))) { - /* NB: Some keypresses are converted to generic keypresses above - * rather than being "menu-emulated" here. */ - switch(nskey) - { - /* The following aren't available from the menu at the moment */ + case NS_KEY_DELETE_LEFT: // backspace + ami_gui_history(gwin, true); + break; - case 'r': // reload + /* RawKeys. NB: These are passthrus in ami_key_to_nskey() */ + case RAWKEY_F5: // reload if(browser_window_reload_available(gwin->gw->bw)) - browser_window_reload(gwin->gw->bw, false); + browser_window_reload(gwin->gw->bw,false); break; - case 'u': // open url - if((nsoption_bool(kiosk_mode) == false)) - ActivateLayoutGadget((struct Gadget *)gwin->objects[GID_MAIN], - gwin->win, NULL, (uint32)gwin->objects[GID_URL]); + case RAWKEY_F8: // scale 100% + ami_gui_set_scale(gwin->gw, 1.0); break; - } - } - else - { - if(!browser_window_key_press(gwin->gw->bw, nskey)) - { - switch(nskey) - { - case NS_KEY_UP: - ami_gui_scroll_internal(gwin, 0, -NSA_KBD_SCROLL_PX); - break; - - case NS_KEY_DOWN: - ami_gui_scroll_internal(gwin, 0, +NSA_KBD_SCROLL_PX); - break; - - case NS_KEY_LEFT: - ami_gui_scroll_internal(gwin, -NSA_KBD_SCROLL_PX, 0); - break; - - case NS_KEY_RIGHT: - ami_gui_scroll_internal(gwin, +NSA_KBD_SCROLL_PX, 0); - break; - - case NS_KEY_PAGE_UP: - ami_gui_scroll_internal(gwin, 0, SCROLL_PAGE_UP); - break; - - case NS_KEY_PAGE_DOWN: - case ' ': - ami_gui_scroll_internal(gwin, 0, SCROLL_PAGE_DOWN); - break; - - case NS_KEY_LINE_START: // page left - ami_gui_scroll_internal(gwin, SCROLL_PAGE_UP, 0); - break; - - case NS_KEY_LINE_END: // page right - ami_gui_scroll_internal(gwin, SCROLL_PAGE_DOWN, 0); - break; - - case NS_KEY_TEXT_START: // home - ami_gui_scroll_internal(gwin, SCROLL_TOP, SCROLL_TOP); - break; - - case NS_KEY_TEXT_END: // end - ami_gui_scroll_internal(gwin, SCROLL_BOTTOM, SCROLL_BOTTOM); - break; - - case NS_KEY_WORD_RIGHT: // alt+right - ami_change_tab(gwin, 1); - break; - - case NS_KEY_WORD_LEFT: // alt+left - ami_change_tab(gwin, -1); - break; - - case NS_KEY_DELETE_LEFT: // backspace - ami_gui_history(gwin, true); - break; - - /* RawKeys. NB: These are passthrus in ami_key_to_nskey() */ - case RAWKEY_F5: // reload - if(browser_window_reload_available(gwin->gw->bw)) - browser_window_reload(gwin->gw->bw,false); - break; - - case RAWKEY_F8: // scale 100% - ami_gui_set_scale(gwin->gw, 1.0); - break; - - case RAWKEY_F9: // decrease scale - ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1); - break; - - case RAWKEY_F10: // increase scale - ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1); - break; - - case RAWKEY_HELP: // help - ami_help_open(AMI_HELP_GUI, scrn); - break; - } - } else if(nskey == NS_KEY_COPY_SELECTION) { - /* if we've copied a selection we need to clear it - style guide rules */ - browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); - } - } - break; - case WMHI_NEWSIZE: - ami_set_border_gadget_size(gwin); - ami_throbber_redraw_schedule(0, gwin->gw); - ami_schedule(0, ami_gui_refresh_favicon, gwin); - browser_window_schedule_reformat(gwin->gw->bw); - break; + case RAWKEY_F9: // decrease scale + ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1); + break; - case WMHI_CLOSEWINDOW: - ami_gui_close_window(gwin); - break; -#ifdef __amigaos4__ - case WMHI_ICONIFY: - { - struct bitmap *bm; - - bm = urldb_get_thumbnail(browser_window_get_url(gwin->gw->bw)); - if(!bm) bm = content_get_bitmap(browser_window_get_content(gwin->gw->bw)); - gwin->dobj = amiga_icon_from_bitmap(bm); - amiga_icon_superimpose_favicon_internal(gwin->gw->favicon, - gwin->dobj); - HideWindow(gwin->win); - gwin->appicon = AddAppIcon((ULONG)gwin->objects[OID_MAIN], - (ULONG)gwin, gwin->win->Title, appport, - 0, gwin->dobj, NULL); - - cur_gw = NULL; + case RAWKEY_F10: // increase scale + ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1); + break; + + case RAWKEY_HELP: // help + ami_help_open(AMI_HELP_GUI, scrn); + break; + } + } else if(nskey == NS_KEY_COPY_SELECTION) { + /* if we've copied a selection we need to clear it - style guide rules */ + browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); + } } - break; -#endif - case WMHI_INACTIVE: - gwin->gw->c_h_temp = gwin->gw->c_h; - gui_window_remove_caret(gwin->gw); - break; - - case WMHI_ACTIVE: - if(gwin->gw->bw) cur_gw = gwin->gw; - if(gwin->gw->c_h_temp) - gwin->gw->c_h = gwin->gw->c_h_temp; - break; - - case WMHI_INTUITICK: - break; + break; - default: - //printf("class: %ld\n",(result & WMHI_CLASSMASK)); - break; - } + case WMHI_NEWSIZE: + ami_set_border_gadget_size(gwin); + ami_throbber_redraw_schedule(0, gwin->gw); + ami_schedule(0, ami_gui_refresh_favicon, gwin); + browser_window_schedule_reformat(gwin->gw->bw); + break; - if(win_destroyed) + case WMHI_CLOSEWINDOW: + ami_gui_close_window(gwin); + win_closed = TRUE; + break; +#ifdef __amigaos4__ + case WMHI_ICONIFY: { - /* we can't be sure what state our window_list is in, so let's - jump out of the function and start again */ - - win_destroyed = false; - return; + struct bitmap *bm; + + bm = urldb_get_thumbnail(browser_window_get_url(gwin->gw->bw)); + if(!bm) bm = content_get_bitmap(browser_window_get_content(gwin->gw->bw)); + gwin->dobj = amiga_icon_from_bitmap(bm); + amiga_icon_superimpose_favicon_internal(gwin->gw->favicon, + gwin->dobj); + HideWindow(gwin->win); + gwin->appicon = AddAppIcon((ULONG)gwin->objects[OID_MAIN], + (ULONG)gwin, gwin->win->Title, appport, + 0, gwin->dobj, NULL); + + cur_gw = NULL; } + break; +#endif + case WMHI_INACTIVE: + gwin->gw->c_h_temp = gwin->gw->c_h; + gui_window_remove_caret(gwin->gw); + break; - if(drag_x_move || drag_y_move) - { - gui_window_get_scroll(gwin->gw, - &gwin->gw->scrollx, &gwin->gw->scrolly); + case WMHI_ACTIVE: + if(gwin->gw->bw) cur_gw = gwin->gw; + if(gwin->gw->c_h_temp) + gwin->gw->c_h = gwin->gw->c_h_temp; + break; - gui_window_set_scroll(gwin->gw, - gwin->gw->scrollx + drag_x_move, - gwin->gw->scrolly + drag_y_move); - } + case WMHI_INTUITICK: + break; -// ReplyMsg((struct Message *)message); + default: + //printf("class: %ld\n",(result & WMHI_CLASSMASK)); + break; } - if(gwin->closed == true) { - ami_gui_close_window(gwin); + if(win_destroyed) + { + /* we can't be sure what state our window_list is in, so let's + jump out of the function and start again */ + + win_destroyed = false; + return TRUE; } - } while((node = nnode)); + if(drag_x_move || drag_y_move) + { + gui_window_get_scroll(gwin->gw, + &gwin->gw->scrollx, &gwin->gw->scrolly); - if(ami_menu_quit_selected() == true){ - ami_quit_netsurf(); + gui_window_set_scroll(gwin->gw, + gwin->gw->scrollx + drag_x_move, + gwin->gw->scrolly + drag_y_move); + } + +// ReplyMsg((struct Message *)message); } - - if(ami_menu_get_check_toggled() == true) { - ami_gui_menu_update_all(); + + if(gwin->closed == true) { + win_closed = TRUE; + ami_gui_close_window(gwin); } + + return win_closed; } static void ami_gui_appicon_remove(struct gui_window_2 *gwin) @@ -2584,7 +2602,7 @@ static void ami_handle_appmsg(void) { if((appwinargs = &appmsg->am_ArgList[i])) { - if((filename = AllocVecTagList(1024, NULL))) + if((filename = malloc(1024))) { if(appwinargs->wa_Lock) { @@ -2665,7 +2683,7 @@ static void ami_handle_appmsg(void) } } } - FreeVec(filename); + free(filename); } } } @@ -2800,7 +2818,7 @@ void ami_get_msg(void) } if(signal & winsignal) - ami_handle_msg(); + while(ami_handle_msg()); if(signal & appsig) ami_handle_appmsg(); @@ -2885,7 +2903,7 @@ void ami_switch_tab(struct gui_window_2 *gwin, bool redraw) ami_plot_release_pens(gwin->shared_pens); ami_update_buttons(gwin); - ami_menu_update_disabled(gwin->gw, browser_window_get_content(gwin->gw->bw)); + ami_gui_menu_update_disabled(gwin->gw, browser_window_get_content(gwin->gw->bw)); if(redraw) { @@ -2911,34 +2929,24 @@ void ami_quit_netsurf(void) { struct nsObject *node; struct nsObject *nnode; - struct gui_window_2 *gwin; + struct ami_generic_window *w; + + /* Disable the multiple tabs open warning */ + nsoption_set_bool(tab_close_warn, false); if(!IsMinListEmpty(window_list)) { node = (struct nsObject *)GetHead((struct List *)window_list); do { nnode=(struct nsObject *)GetSucc((struct Node *)node); - gwin = node->objstruct; - - switch(node->Type) { - case AMINS_TVWINDOW: - ami_tree_close((struct treeview_window *)gwin); - break; - - case AMINS_WINDOW: - /* This also closes windows that are attached to the - * gui_window, such as local history and find. */ - ShowWindow(gwin->win, WINDOW_BACKMOST); - ami_gui_close_window(gwin); - break; + w = node->objstruct; - case AMINS_GUIOPTSWINDOW: - ami_gui_opts_close(); - break; - - case AMINS_DLWINDOW: - ami_download_window_abort((struct gui_download_window *)gwin); - break; + if(w->tbl->close != NULL) { + if(node->Type == AMINS_WINDOW) { + struct gui_window_2 *gwin = (struct gui_window_2 *)w; + ShowWindow(gwin->win, WINDOW_BACKMOST); // do we need this?? + } + w->tbl->close(w); } } while((node = nnode)); @@ -2972,7 +2980,6 @@ void ami_quit_netsurf_delayed(void) free(utf8gadgets); #endif if(res == -1) { /* Requester timed out */ - nsoption_set_bool(tab_close_warn, false); ami_quit_netsurf(); } } @@ -3034,9 +3041,7 @@ static void gui_quit(void) urldb_save(nsoption_charp(url_file)); urldb_save_cookies(nsoption_charp(cookie_file)); - ami_hotlist_free(nsoption_charp(hotlist_file)); - ami_cookies_free(); - ami_global_history_free(); + hotlist_fini(nsoption_charp(hotlist_file)); #ifdef __amigaos4__ if(IApplication && ami_appid) UnregisterApplication(ami_appid, NULL); @@ -3060,6 +3065,13 @@ static void gui_quit(void) FreeStringClass(urlStringClass); FreeObjList(window_list); + + ami_clipboard_free(); + ami_gui_resources_free(); + + LOG("Closing screen"); + ami_gui_close_screen(scrn, locked_screen, FALSE); + if(nsscreentitle) FreeVec(nsscreentitle); } char *ami_gui_get_cache_favicon_name(nsurl *url, bool only_if_avail) @@ -3173,7 +3185,7 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, return true; } -static int ami_gui_hotlist_scan(struct tree *tree, struct List *speed_button_list, struct gui_window_2 *gwin) +static int ami_gui_hotlist_scan(struct List *speed_button_list, struct gui_window_2 *gwin) { struct ami_gui_tb_userdata userdata; userdata.gw = gwin; @@ -3195,7 +3207,7 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin) NewList(&gwin->hotlist_toolbar_list); - if(ami_gui_hotlist_scan(ami_tree_get_tree(hotlist_window), &gwin->hotlist_toolbar_list, gwin) > 0) { + if(ami_gui_hotlist_scan(&gwin->hotlist_toolbar_list, gwin) > 0) { gwin->objects[GID_HOTLIST] = SpeedBarObj, GA_ID, GID_HOTLIST, @@ -3266,8 +3278,10 @@ static void ami_gui_hotlist_toolbar_remove(struct gui_window_2 *gwin) IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_REMOVECHILD, gwin->win, gwin->objects[GID_HOTLISTSEPBAR]); #else - SetAttrs(gwin->objects[GID_HOTLISTLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_HOTLIST]); - SetAttrs(gwin->objects[GID_HOTLISTLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_HOTLISTSEPBAR]); + SetAttrs(gwin->objects[GID_HOTLISTLAYOUT], + LAYOUT_RemoveChild, gwin->objects[GID_HOTLIST], TAG_DONE); + SetAttrs(gwin->objects[GID_HOTLISTLAYOUT], + LAYOUT_RemoveChild, gwin->objects[GID_HOTLISTSEPBAR], TAG_DONE); #endif FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]); @@ -3292,7 +3306,7 @@ static void ami_gui_hotlist_toolbar_update(struct gui_window_2 *gwin) ami_gui_hotlist_toolbar_free(gwin, &gwin->hotlist_toolbar_list); - if(ami_gui_hotlist_scan(ami_tree_get_tree(hotlist_window), &gwin->hotlist_toolbar_list, gwin) > 0) { + if(ami_gui_hotlist_scan(&gwin->hotlist_toolbar_list, gwin) > 0) { SetGadgetAttrs((struct Gadget *)gwin->objects[GID_HOTLIST], gwin->win, NULL, SPEEDBAR_Buttons, &gwin->hotlist_toolbar_list, @@ -3313,16 +3327,16 @@ void ami_gui_hotlist_update_all(void) if(IsMinListEmpty(window_list)) return; + ami_gui_menu_refresh_hotlist(); + node = (struct nsObject *)GetHead((struct List *)window_list); do { nnode=(struct nsObject *)GetSucc((struct Node *)node); gwin = node->objstruct; - if(node->Type == AMINS_WINDOW) - { + if(node->Type == AMINS_WINDOW) { ami_gui_hotlist_toolbar_update(gwin); - ami_menu_refresh(gwin); } } while((node = nnode)); } @@ -3651,8 +3665,9 @@ static void ami_refresh_window(struct gui_window_2 *gwin) /* simplerefresh only */ struct IBox *bbox; - int x0, x1, y0, y1, sx, sy; + int sx, sy; struct RegionRectangle *regrect; + struct rect r; sx = gwin->gw->scrollx; sy = gwin->gw->scrolly; @@ -3666,33 +3681,33 @@ static void ami_refresh_window(struct gui_window_2 *gwin) BeginRefresh(gwin->win); - x0 = ((gwin->win->RPort->Layer->DamageList->bounds.MinX - bbox->Left) / + r.x0 = ((gwin->win->RPort->Layer->DamageList->bounds.MinX - bbox->Left) / browser_window_get_scale(gwin->gw->bw)) + sx - 1; - x1 = ((gwin->win->RPort->Layer->DamageList->bounds.MaxX - bbox->Left) / + r.x1 = ((gwin->win->RPort->Layer->DamageList->bounds.MaxX - bbox->Left) / browser_window_get_scale(gwin->gw->bw)) + sx + 2; - y0 = ((gwin->win->RPort->Layer->DamageList->bounds.MinY - bbox->Top) / + r.y0 = ((gwin->win->RPort->Layer->DamageList->bounds.MinY - bbox->Top) / browser_window_get_scale(gwin->gw->bw)) + sy - 1; - y1 = ((gwin->win->RPort->Layer->DamageList->bounds.MaxY - bbox->Top) / + r.y1 = ((gwin->win->RPort->Layer->DamageList->bounds.MaxY - bbox->Top) / browser_window_get_scale(gwin->gw->bw)) + sy + 2; regrect = gwin->win->RPort->Layer->DamageList->RegionRectangle; - ami_do_redraw_limits(gwin->gw, gwin->gw->bw, false, x0, y0, x1, y1); + gui_window_update_box(gwin->gw, &r); while(regrect) { - x0 = ((regrect->bounds.MinX - bbox->Left) / + r.x0 = ((regrect->bounds.MinX - bbox->Left) / browser_window_get_scale(gwin->gw->bw)) + sx - 1; - x1 = ((regrect->bounds.MaxX - bbox->Left) / + r.x1 = ((regrect->bounds.MaxX - bbox->Left) / browser_window_get_scale(gwin->gw->bw)) + sx + 2; - y0 = ((regrect->bounds.MinY - bbox->Top) / + r.y0 = ((regrect->bounds.MinY - bbox->Top) / browser_window_get_scale(gwin->gw->bw)) + sy - 1; - y1 = ((regrect->bounds.MaxY - bbox->Top) / + r.y1 = ((regrect->bounds.MaxY - bbox->Top) / browser_window_get_scale(gwin->gw->bw)) + sy + 2; regrect = regrect->Next; - ami_do_redraw_limits(gwin->gw, gwin->gw->bw, false, x0, y0, x1, y1); + gui_window_update_box(gwin->gw, &r); } EndRefresh(gwin->win, TRUE); @@ -3766,12 +3781,43 @@ HOOKF(void, ami_scroller_hook, Object *, object, struct IntuiMessage *) break; default: - LOG("IDCMP hook unhandled event: %ld\n", msg->Class); + LOG("IDCMP hook unhandled event: %ld", msg->Class); break; } // ReplyMsg((struct Message *)msg); } +/* exported function documented in gui.h */ +nserror ami_gui_win_list_add(void *win, int type, const struct ami_win_event_table *table) +{ + struct nsObject *node = AddObject(window_list, type); + if(node == NULL) return NSERROR_NOMEM; + node->objstruct = win; + + struct ami_generic_window *w = (struct ami_generic_window *)win; + w->tbl = table; + w->node = node; + + return NSERROR_OK; +} + +/* exported function documented in gui.h */ +void ami_gui_win_list_remove(void *win) +{ + struct ami_generic_window *w = (struct ami_generic_window *)win; + + if(w->node->Type == AMINS_TVWINDOW) { + DelObjectNoFree(w->node); + } else { + DelObject(w->node); + } +} + +static const struct ami_win_event_table ami_gui_table = { + ami_gui_event, + ami_gui_close_window, +}; + static struct gui_window * gui_window_create(struct browser_window *bw, struct gui_window *existing, @@ -3818,7 +3864,7 @@ gui_window_create(struct browser_window *bw, if(curh > (scrn->Height - cury)) curh = scrn->Height - cury; - g = ami_misc_allocvec_clear(sizeof(struct gui_window), 0); + g = calloc(1, sizeof(struct gui_window)); if(!g) { @@ -3828,7 +3874,7 @@ gui_window_create(struct browser_window *bw, NewList(&g->dllist); g->deferred_rects = NewObjList(); - g->deferred_rects_pool = ami_misc_itempool_create(sizeof(struct rect)); + g->deferred_rects_pool = ami_memory_itempool_create(sizeof(struct rect)); g->bw = bw; g->scale = browser_window_get_scale(bw); @@ -3892,7 +3938,7 @@ gui_window_create(struct browser_window *bw, return g; } - g->shared = ami_misc_allocvec_clear(sizeof(struct gui_window_2), 0); + g->shared = calloc(1, sizeof(struct gui_window_2)); if(!g->shared) { @@ -3939,7 +3985,7 @@ gui_window_create(struct browser_window *bw, iconifygadget = TRUE; LOG("Creating menu"); - struct Menu *menu = ami_menu_create(g->shared); + struct Menu *menu = ami_gui_menu_create(g->shared); NewList(&g->shared->tab_list); g->tab_node = AllocClickTabNode(TNA_Text,messages_get("NetSurf"), @@ -3955,7 +4001,7 @@ gui_window_create(struct browser_window *bw, g->shared->tabs=1; g->shared->next_tab=1; - g->shared->svbuffer = ami_misc_allocvec_clear(2000, 0); + g->shared->svbuffer = calloc(1, 2000); g->shared->helphints[GID_BACK] = translate_escape_chars(messages_get("HelpToolbarBack")); @@ -4347,8 +4393,8 @@ gui_window_create(struct browser_window *bw, if(!g->shared->win) { amiga_warn_user("NoMemory",""); - FreeVec(g->shared); - FreeVec(g); + free(g->shared); + free(g); return NULL; } @@ -4411,8 +4457,7 @@ gui_window_create(struct browser_window *bw, g->shared->appwin = AddAppWindowA((ULONG)g->shared->objects[OID_MAIN], (ULONG)g->shared, g->shared->win, appport, NULL); - g->shared->node = AddObject(window_list,AMINS_WINDOW); - g->shared->node->objstruct = g->shared; + ami_gui_win_list_add(g->shared, AMINS_WINDOW, &ami_gui_table); ami_gui_set_default_gg(); @@ -4460,8 +4505,9 @@ static void ami_gui_close_tabs(struct gui_window_2 *gwin, bool other_tabs) } } -void ami_gui_close_window(struct gui_window_2 *gwin) +void ami_gui_close_window(void *w) { + struct gui_window_2 *gwin = (struct gui_window_2 *)w; ami_gui_close_tabs(gwin, false); } @@ -4491,7 +4537,7 @@ static void gui_window_destroy(struct gui_window *g) ami_free_download_list(&g->dllist); FreeObjList(g->deferred_rects); - ami_misc_itempool_delete(g->deferred_rects_pool); + ami_memory_itempool_delete(g->deferred_rects_pool); gui_window_stop_throbber(g); cur_gw = NULL; @@ -4526,14 +4572,13 @@ static void gui_window_destroy(struct gui_window *g) if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show) == false)) ami_toggletabbar(g->shared, false); - ami_utf8_free(g->tabtitle); - - FreeVec(g); + if(g->tabtitle) free(g->tabtitle); + free(g); return; } ami_plot_release_pens(g->shared->shared_pens); - FreeVec(g->shared->shared_pens); + free(g->shared->shared_pens); ami_schedule_redraw_remove(g->shared); ami_schedule(-1, ami_gui_refresh_favicon, g->shared); @@ -4558,22 +4603,22 @@ static void gui_window_destroy(struct gui_window *g) DisposeObject((Object *)g->shared->history_ctxmenu[AMI_CTXMENU_HISTORY_BACK]); DisposeObject((Object *)g->shared->history_ctxmenu[AMI_CTXMENU_HISTORY_FORWARD]); ami_ctxmenu_release_hook(g->shared->ctxmenu_hook); - ami_free_menulabs(g->shared); - ami_menu_free(g->shared); + ami_gui_menu_free(g->shared); free(g->shared->wintitle); ami_utf8_free(g->shared->status); - FreeVec(g->shared->svbuffer); + free(g->shared->svbuffer); for(gid = 0; gid < GID_LAST; gid++) free(g->shared->helphints[gid]); - DelObject(g->shared->node); + ami_gui_win_list_remove(g->shared); if(g->tab_node) { Remove(g->tab_node); FreeClickTabNode(g->tab_node); } - FreeVec(g); // g->shared should be freed by DelObject() + if(g->tabtitle) free(g->tabtitle); + free(g); // g->shared should be freed by DelObject() if(IsMinListEmpty(window_list)) { @@ -4594,8 +4639,7 @@ static void gui_window_set_title(struct gui_window *g, const char *restrict titl utf8title = ami_utf8_easy((char *)title); - if(g->tab_node) // && (g->shared->tabs > 1)) - { + if(g->tab_node) { node = g->tab_node; if((g->tabtitle == NULL) || (strcmp(utf8title, g->tabtitle))) @@ -4605,7 +4649,7 @@ static void gui_window_set_title(struct gui_window *g, const char *restrict titl CLICKTAB_Labels, ~0, TAG_DONE); - if(g->tabtitle) ami_utf8_free(g->tabtitle); + if(g->tabtitle) free(g->tabtitle); g->tabtitle = strdup(utf8title); SetClickTabNodeAttrs(node, TNA_Text, g->tabtitle, @@ -4704,14 +4748,14 @@ static void ami_gui_window_update_box_deferred(struct gui_window *g, bool draw) rect->x0, rect->y0, rect->x1, rect->y1); } nnode=(struct nsObject *)GetSucc((struct Node *)node); - ami_misc_itempool_free(g->deferred_rects_pool, node->objstruct, sizeof(struct rect)); + ami_memory_itempool_free(g->deferred_rects_pool, node->objstruct, sizeof(struct rect)); DelObjectNoFree(node); } while((node = nnode)); if(draw == true) ami_reset_pointer(g->shared); } -static bool ami_gui_window_update_box_deferred_check(struct MinList *deferred_rects, +bool ami_gui_window_update_box_deferred_check(struct MinList *deferred_rects, const struct rect *restrict new_rect, APTR mempool) { struct nsObject *node; @@ -4738,7 +4782,7 @@ static bool ami_gui_window_update_box_deferred_check(struct MinList *deferred_re (new_rect->x1 >= rect->x1) && (new_rect->y1 >= rect->y1)) { LOG("Removing queued redraw that is a subset of new box redraw"); - ami_misc_itempool_free(mempool, node->objstruct, sizeof(struct rect)); + ami_memory_itempool_free(mempool, node->objstruct, sizeof(struct rect)); DelObjectNoFree(node); /* Don't return - we might find more */ } @@ -4755,7 +4799,7 @@ static void gui_window_update_box(struct gui_window *g, const struct rect *restr if(ami_gui_window_update_box_deferred_check(g->deferred_rects, rect, g->deferred_rects_pool)) { - deferred_rect = ami_misc_itempool_alloc(g->deferred_rects_pool, sizeof(struct rect)); + deferred_rect = ami_memory_itempool_alloc(g->deferred_rects_pool, sizeof(struct rect)); CopyMem(rect, deferred_rect, sizeof(struct rect)); nsobj = AddObject(g->deferred_rects, AMINS_RECT); nsobj->objstruct = deferred_rect; @@ -5213,7 +5257,7 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh g->c_h = height; if((nsoption_bool(kiosk_mode) == false)) - OnMenu(g->shared->win, AMI_MENU_PASTE); + ami_gui_menu_set_disabled(g->shared->win, g->shared->imenu, M_PASTE, false); } static void gui_window_remove_caret(struct gui_window *g) @@ -5222,7 +5266,7 @@ static void gui_window_remove_caret(struct gui_window *g) if(g->c_h == 0) return; if((nsoption_bool(kiosk_mode) == false)) - OffMenu(g->shared->win, AMI_MENU_PASTE); + ami_gui_menu_set_disabled(g->shared->win, g->shared->imenu, M_PASTE, true); ami_do_redraw_limits(g, g->bw, false, g->c_x, g->c_y, g->c_x + g->c_w + 1, g->c_y + g->c_h + 1); @@ -5246,7 +5290,7 @@ static void gui_window_new_content(struct gui_window *g) g->shared->oldv = 0; g->favicon = NULL; ami_plot_release_pens(g->shared->shared_pens); - ami_menu_update_disabled(g, c); + ami_gui_menu_update_disabled(g, c); ami_gui_update_hotlist_button(g->shared); ami_gui_scroller_update(g->shared); } @@ -5265,7 +5309,7 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type, if(g->shared->ptr_lock) { - FreeVec(g->shared->ptr_lock); + free(g->shared->ptr_lock); g->shared->ptr_lock = NULL; } } @@ -5346,9 +5390,24 @@ Object *ami_gui_splash_open(void) LayoutEnd, EndWindow; + if(win_obj == NULL) { + LOG("Splash window object not created"); + return NULL; + } + LOG("Attempting to open splash window..."); win = RA_OpenWindow(win_obj); + if(win == NULL) { + LOG("Splash window did not open"); + return NULL; + } + + if(bm_obj == NULL) { + LOG("BitMap object not created"); + return NULL; + } + GetAttrs(bm_obj, IA_Top, &top, IA_Left, &left, TAG_DONE); @@ -5436,6 +5495,84 @@ uint32 ami_gui_get_app_id(void) return ami_appid; } +/* Get current user directory for user-specific NetSurf data + * Returns NULL on error + */ +static char *ami_gui_get_user_dir(STRPTR current_user) +{ + BPTR lock = 0; + char temp[1024]; + int32 user = 0; + + if(current_user == NULL) { + user = GetVar("user", temp, 1024, GVF_GLOBAL_ONLY); + current_user = ASPrintf("%s", (user == -1) ? "Default" : temp); + } + LOG("User: %s", current_user); + + if(users_dir == NULL) { + users_dir = ASPrintf("%s", USERS_DIR); + if(users_dir == NULL) { + ami_misc_fatal_error("Failed to allocate memory"); + FreeVec(current_user); + return NULL; + } + } + + if(LIB_IS_AT_LEAST((struct Library *)DOSBase, 51, 96)) { +#ifdef __amigaos4__ + struct InfoData *infodata = AllocDosObject(DOS_INFODATA, 0); + if(infodata == NULL) { + ami_misc_fatal_error("Failed to allocate memory"); + FreeVec(current_user); + return NULL; + } + GetDiskInfoTags(GDI_StringNameInput, users_dir, + GDI_InfoData, infodata, + TAG_DONE); + if(infodata->id_DiskState == ID_DISKSTATE_WRITE_PROTECTED) { + FreeDosObject(DOS_INFODATA, infodata); + ami_misc_fatal_error("User directory MUST be on a writeable volume"); + FreeVec(current_user); + return NULL; + } + FreeDosObject(DOS_INFODATA, infodata); +#else +#warning FIXME for OS3 and older OS4 +#endif + } else { +//TODO: check volume write status using old API + } + + int len = strlen(current_user); + len += strlen(users_dir); + len += 2; /* for poss path sep and NULL term */ + + current_user_dir = malloc(len); + if(current_user_dir == NULL) { + ami_misc_fatal_error("Failed to allocate memory"); + FreeVec(current_user); + return NULL; + } + + strlcpy(current_user_dir, users_dir, len); + AddPart(current_user_dir, current_user, len); + FreeVec(users_dir); + FreeVec(current_user); + + LOG("User dir: %s", current_user_dir); + + if((lock = CreateDirTree(current_user_dir))) + UnLock(lock); + + ami_nsoption_set_location(current_user_dir); + + current_user_faviconcache = ASPrintf("%s/IconCache", current_user_dir); + if((lock = CreateDirTree(current_user_faviconcache))) UnLock(lock); + + return current_user_dir; +} + static struct gui_window_table amiga_window_table = { .create = gui_window_create, .destroy = gui_window_destroy, @@ -5487,7 +5624,7 @@ static struct gui_misc_table amiga_misc_table = { .quit = gui_quit, .launch_url = gui_launch_url, - .cert_verify = gui_cert_verify, + .cert_verify = ami_cert_verify, .login = gui_401login_open, }; @@ -5499,8 +5636,8 @@ int main(int argc, char** argv) char script[1024]; char temp[1024]; STRPTR current_user_cache = NULL; + STRPTR current_user = NULL; BPTR lock = 0; - int32 user = 0; nserror ret; int nargc = 0; char *nargv = NULL; @@ -5542,99 +5679,29 @@ int main(int argc, char** argv) /* Open splash window */ Object *splash_window = ami_gui_splash_open(); - ami_object_init(); +#ifndef __amigaos4__ + /* OS3 low memory handler */ + struct Interupt *memhandler = ami_memory_init(); +#endif - if (ami_open_resources() == false) { /* alloc message ports */ + if (ami_gui_resources_open() == false) { /* alloc msgports, objects and other miscelleny */ ami_misc_fatal_error("Unable to allocate resources"); ami_gui_splash_close(splash_window); ami_libs_close(); return RETURN_FAIL; } - if(ami_schedule_create(schedulermsgport) != NSERROR_OK) { - ami_misc_fatal_error("Failed to initialise scheduler"); - ami_gui_splash_close(splash_window); - ami_libs_close(); - return RETURN_FAIL; - } - - ami_gui_read_all_tooltypes(argc, argv); + current_user = ami_gui_read_all_tooltypes(argc, argv); struct RDArgs *args = ami_gui_commandline(&argc, argv, &nargc, &nargv); - if(current_user == NULL) { - user = GetVar("user", temp, 1024, GVF_GLOBAL_ONLY); - current_user = ASPrintf("%s", (user == -1) ? "Default" : temp); - } - LOG("User: %s", current_user); - - if(users_dir == NULL) { - users_dir = ASPrintf("%s", USERS_DIR); - if(users_dir == NULL) { - ami_misc_fatal_error("Failed to allocate memory"); - ami_schedule_free(); - ami_gui_splash_close(splash_window); - ami_libs_close(); - return RETURN_FAIL; - } - } - - if(LIB_IS_AT_LEAST((struct Library *)DOSBase, 51, 96)) { -#ifdef __amigaos4__ - struct InfoData *infodata = AllocDosObject(DOS_INFODATA, 0); - if(infodata == NULL) { - ami_misc_fatal_error("Failed to allocate memory"); - ami_schedule_free(); - ami_gui_splash_close(splash_window); - ami_libs_close(); - return RETURN_FAIL; - } - GetDiskInfoTags(GDI_StringNameInput, users_dir, - GDI_InfoData, infodata, - TAG_DONE); - if(infodata->id_DiskState == ID_DISKSTATE_WRITE_PROTECTED) { - FreeDosObject(DOS_INFODATA, infodata); - ami_misc_fatal_error("User directory MUST be on a writeable volume"); - ami_schedule_free(); - ami_gui_splash_close(splash_window); - ami_libs_close(); - return RETURN_FAIL; - } - FreeDosObject(DOS_INFODATA, infodata); -#else -#warning FIXME for OS3 and older OS4 -#endif - } else { -//TODO: check volume write status using old API - } - - int len = strlen(current_user); - len += strlen(users_dir); - len += 2; /* for poss path sep and NULL term */ - - current_user_dir = AllocVecTagList(len, NULL); + current_user_dir = ami_gui_get_user_dir(current_user); if(current_user_dir == NULL) { - ami_misc_fatal_error("Failed to allocate memory"); - ami_schedule_free(); + ami_gui_resources_free(); ami_gui_splash_close(splash_window); ami_libs_close(); return RETURN_FAIL; } - strlcpy(current_user_dir, users_dir, len); - AddPart(current_user_dir, current_user, len); - FreeVec(users_dir); - LOG("User dir: %s", current_user_dir); - - if((lock = CreateDirTree(current_user_dir))) - UnLock(lock); - - ami_nsoption_set_location(current_user_dir); - current_user_cache = ASPrintf("%s/Cache", current_user_dir); - current_user_faviconcache = ASPrintf("%s/IconCache", current_user_dir); - - if((lock = CreateDirTree(current_user_cache))) UnLock(lock); - if((lock = CreateDirTree(current_user_faviconcache))) UnLock(lock); - ami_mime_init("PROGDIR:Resources/mimetypes"); sprintf(temp, "%s/mimetypes.user", current_user_dir); ami_mime_init(temp); @@ -5652,7 +5719,7 @@ int main(int argc, char** argv) ret = nsoption_init(ami_set_options, &nsoptions, &nsoptions_default); if (ret != NSERROR_OK) { ami_misc_fatal_error("Options failed to initialise"); - ami_schedule_free(); + ami_gui_resources_free(); ami_gui_splash_close(splash_window); ami_libs_close(); return RETURN_FAIL; @@ -5665,7 +5732,9 @@ int main(int argc, char** argv) if (ami_locate_resource(messages, "Messages") == false) { ami_misc_fatal_error("Cannot open Messages file"); - ami_schedule_free(); + ami_nsoption_free(); + nsoption_finalise(nsoptions, nsoptions_default); + ami_gui_resources_free(); ami_gui_splash_close(splash_window); ami_libs_close(); return RETURN_FAIL; @@ -5673,16 +5742,23 @@ int main(int argc, char** argv) ret = messages_add_from_file(messages); + current_user_cache = ASPrintf("%s/Cache", current_user_dir); + if((lock = CreateDirTree(current_user_cache))) UnLock(lock); + ret = netsurf_init(current_user_cache); + + if(current_user_cache != NULL) FreeVec(current_user_cache); + if (ret != NSERROR_OK) { ami_misc_fatal_error("NetSurf failed to initialise"); - ami_schedule_free(); + ami_nsoption_free(); + nsoption_finalise(nsoptions, nsoptions_default); + ami_gui_resources_free(); ami_gui_splash_close(splash_window); ami_libs_close(); return RETURN_FAIL; } - if(current_user_cache != NULL) FreeVec(current_user_cache); ret = amiga_icon_init(); search_web_init(nsoption_charp(search_engines_file)); @@ -5727,25 +5803,17 @@ int main(int argc, char** argv) netsurf_exit(); + nsoption_finalise(nsoptions, nsoptions_default); ami_nsoption_free(); - FreeVec(current_user_dir); + free(current_user_dir); FreeVec(current_user_faviconcache); - FreeVec(current_user); - - ami_clipboard_free(); - ami_schedule_free(); - FreeSysObject(ASOT_PORT, appport); - FreeSysObject(ASOT_PORT, sport); - FreeSysObject(ASOT_PORT, schedulermsgport); +#ifndef __amigaos4__ + /* OS3 low memory handler */ + ami_memory_fini(memhandler); +#endif - ami_object_fini(); ami_bitmap_fini(); - - LOG("Closing screen"); - ami_gui_close_screen(scrn, locked_screen, FALSE); - if(nsscreentitle) FreeVec(nsscreentitle); - ami_libs_close(); return RETURN_OK; diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h index 6d5188e..07ff922 100644 --- a/frontends/amiga/gui.h +++ b/frontends/amiga/gui.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2015 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2008-2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -28,7 +28,7 @@ #include "netsurf/window.h" #include "netsurf/mouse.h" -#include "amiga/menu.h" +#include "amiga/gui_menu.h" #include "amiga/object.h" #include "amiga/os3support.h" @@ -91,8 +91,29 @@ struct history_window; #define AMI_GUI_TOOLBAR_MAX 20 -struct gui_window_2 { +struct ami_win_event_table { + /* callback to handle events when using a shared msgport + * + * @param pointer to our window structure (must start with ami_generic_window) + * @return TRUE if window was destroyed during event processing + */ + BOOL (*event)(void *w); + + /* callback for explicit window closure + * some windows are implicitly closed by the browser and should set this to NULL + */ + void (*close)(void *w); +}; + +struct ami_generic_window { struct nsObject *node; + const struct ami_win_event_table *tbl; +}; + +struct ami_menu_data; + +struct gui_window_2 { + struct ami_generic_window w; struct Window *win; Object *restrict objects[GID_LAST]; struct gui_window *gw; /* currently-displayed gui_window */ @@ -113,13 +134,7 @@ struct gui_window_2 { int temp; bool redraw_scroll; bool new_content; - char *restrict menulab[AMI_MENU_AREXX_MAX + 1]; - Object *restrict menuobj[AMI_MENU_AREXX_MAX + 1]; - char menukey[AMI_MENU_AREXX_MAX + 1]; - char *restrict menuicon[AMI_MENU_AREXX_MAX + 1]; - struct Hook menu_hook[AMI_MENU_AREXX_MAX + 1]; - UBYTE *menutype; - struct NewMenu *menu; + struct ami_menu_data *menu_data[AMI_MENU_AREXX_MAX + 1]; /* only for GadTools menus */ ULONG hotlist_items; Object *restrict hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX]; struct List hotlist_toolbar_list; @@ -144,7 +159,6 @@ struct gui_window_2 { struct MinList *shared_pens; gui_pointer_shape mouse_pointer; struct Menu *imenu; /* Intuition menu */ - struct VisualInfo *vi; /* For GadTools menu */ bool closed; /* Window has been closed (via menu) */ }; @@ -171,16 +185,20 @@ struct gui_window float scale; }; -extern struct MinList *window_list; +extern struct MinList *window_list; /**\todo stop arexx.c poking about in here */ extern struct Screen *scrn; extern struct MsgPort *sport; extern struct gui_window *cur_gw; +/* The return value for these functions must be deallocated using FreeVec() */ +STRPTR ami_locale_langs(int *codeset); +char *ami_gui_get_cache_favicon_name(struct nsurl *url, bool only_if_avail); + +/* Functions lacking documentation */ void ami_get_msg(void); void ami_try_quit(void); void ami_quit_netsurf(void); void ami_schedule_redraw(struct gui_window_2 *gwin, bool full_redraw); -STRPTR ami_locale_langs(int *codeset); int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie); bool ami_text_box_at_point(struct gui_window_2 *gwin, ULONG *restrict x, ULONG *restrict y); bool ami_mouse_to_ns_coords(struct gui_window_2 *gwin, int *restrict x, int *restrict y, @@ -192,7 +210,6 @@ void ami_gui_tabs_toggle_all(void); bool ami_locate_resource(char *fullpath, const char *file); void ami_gui_update_hotlist_button(struct gui_window_2 *gwin); nserror ami_gui_new_blank_tab(struct gui_window_2 *gwin); -char *ami_gui_get_cache_favicon_name(struct nsurl *url, bool only_if_avail); int ami_gui_count_windows(int window, int *tabs); void ami_gui_set_scale(struct gui_window *gw, float scale); @@ -200,9 +217,9 @@ void ami_gui_set_scale(struct gui_window *gw, float scale); /** * Close a window and all tabs attached to it. * - * @param gwin gui_window_2 to act upon. + * @param w gui_window_2 to act upon. */ -void ami_gui_close_window(struct gui_window_2 *gwin); +void ami_gui_close_window(void *w); /** * Close all tabs in a window except the active one. @@ -250,5 +267,27 @@ void ami_gui_set_default_gg(void); * Switch to the most-recently-opened tab */ void ami_gui_switch_to_new_tab(struct gui_window_2 *gwin); + +/** + * Add a window to the NetSurf window list (to enable event processing) + */ +nserror ami_gui_win_list_add(void *win, int type, const struct ami_win_event_table *table); + +/** + * Remove a window from the NetSurf window list + */ +void ami_gui_win_list_remove(void *win); + +/** + * Get which qualifier keys are being pressed + */ +int ami_gui_get_quals(Object *win_obj); + +/** + * Check rect is not already queued for redraw + */ +bool ami_gui_window_update_box_deferred_check(struct MinList *deferred_rects, + const struct rect *restrict new_rect, APTR mempool); + #endif diff --git a/frontends/amiga/gui_menu.c b/frontends/amiga/gui_menu.c new file mode 100644 index 0000000..6b9b207 --- /dev/null +++ b/frontends/amiga/gui_menu.c @@ -0,0 +1,1123 @@ +/* + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * + * 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 "amiga/os3support.h" + +#include <string.h> +#include <stdlib.h> + +#include <proto/dos.h> +#include <proto/asl.h> +#include <proto/exec.h> +#include <proto/gadtools.h> +#include <proto/intuition.h> +#include <proto/utility.h> +#ifdef __amigaos4__ +#include <dos/anchorpath.h> +#include <dos/obsolete.h> /* Needed for ExAll() */ +#endif + +#include <libraries/gadtools.h> +#ifdef __amigaos4__ +#include <intuition/menuclass.h> +#endif + +#include <classes/window.h> +#include <proto/label.h> +#include <images/label.h> +#include <proto/bitmap.h> +#include <images/bitmap.h> + +#include <reaction/reaction_macros.h> + +#include "utils/nsoption.h" +#include "utils/messages.h" +#include "utils/log.h" +#include "utils/utils.h" +#include "utils/nsurl.h" +#include "netsurf/browser_window.h" +#include "netsurf/mouse.h" +#include "netsurf/window.h" +#include "netsurf/content.h" +#include "netsurf/keypress.h" +#include "desktop/hotlist.h" +#include "desktop/version.h" + +#include "amiga/arexx.h" +#include "amiga/bitmap.h" +#include "amiga/clipboard.h" +#include "amiga/cookies.h" +#include "amiga/file.h" +#include "amiga/filetype.h" +#include "amiga/gui.h" +#include "amiga/gui_menu.h" +#include "amiga/gui_options.h" +#include "amiga/history.h" +#include "amiga/history_local.h" +#include "amiga/hotlist.h" +#include "amiga/libs.h" +#include "amiga/menu.h" +#include "amiga/misc.h" +#include "amiga/nsoption.h" +#include "amiga/print.h" +#include "amiga/search.h" +#include "amiga/theme.h" +#include "amiga/utf8.h" +#include "amiga/schedule.h" + +#ifdef __amigaos4__ +static struct Menu *restrict gui_menu = NULL; +static int gui_menu_count = 0; +struct ami_menu_data *gui_menu_data[AMI_MENU_AREXX_MAX + 1]; +#endif + +static bool ami_menu_check_toggled = false; +static bool menu_quit = false; + +const char * const netsurf_version; +const char * const verdate; + +static nserror ami_menu_scan(struct ami_menu_data **md); +void ami_menu_arexx_scan(struct ami_menu_data **md); + +/* + * The below functions are called automatically by window.class when menu items are selected. + */ + +HOOKF(void, ami_menu_item_project_newwin, APTR, window, struct IntuiMessage *) +{ + nsurl *url; + nserror error; + + error = nsurl_create(nsoption_charp(homepage_url), &url); + if (error == NSERROR_OK) { + error = browser_window_create(BW_CREATE_HISTORY, + url, + NULL, + NULL, + NULL); + nsurl_unref(url); + } + if (error != NSERROR_OK) { + amiga_warn_user(messages_get_errorcode(error), 0); + } +} + +HOOKF(void, ami_menu_item_project_newtab, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + ami_gui_new_blank_tab(gwin); +} + +HOOKF(void, ami_menu_item_project_open, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_file_open(gwin); +} + +HOOKF(void, ami_menu_item_project_save, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + ULONG type = (ULONG)hook->h_Data; + + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_file_save_req(type, gwin, browser_window_get_content(gwin->gw->bw)); +} + +HOOKF(void, ami_menu_item_project_closetab, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_destroy(gwin->gw->bw); +} + +HOOKF(void, ami_menu_item_project_closewin, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + gwin->closed = true; +} + +HOOKF(void, ami_menu_item_project_print, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_set_pointer(gwin, GUI_POINTER_WAIT, false); + ami_print_ui(browser_window_get_content(gwin->gw->bw)); + ami_reset_pointer(gwin); +} + +HOOKF(void, ami_menu_item_project_about, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + char *temp, *temp2; + int sel; + nsurl *url = NULL; + nserror error = NSERROR_OK; + + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_set_pointer(gwin, GUI_POINTER_WAIT, false); + + temp = ASPrintf("%s|%s|%s", messages_get("OK"), + messages_get("HelpCredits"), + messages_get("HelpLicence")); + + temp2 = ami_utf8_easy(temp); + FreeVec(temp); +#ifdef __amigaos4__ + sel = TimedDosRequesterTags(TDR_ImageType,TDRIMAGE_INFO, + TDR_TitleString, messages_get("NetSurf"), + TDR_Window, gwin->win, + TDR_GadgetString, temp2, + TDR_FormatString,"NetSurf %s\nBuild date %s\n\nhttp://www.netsurf-browser.org", + TDR_Arg1,netsurf_version, + TDR_Arg2,verdate, + TAG_DONE); +#else + struct EasyStruct about_req = { + sizeof(struct EasyStruct), + 0, + "NetSurf", + "NetSurf %s\nBuild date %s\n\nhttp://www.netsurf-browser.org", + temp2, + }; + + sel = EasyRequest(gwin->win, &about_req, NULL, netsurf_version, verdate); +#endif + free(temp2); + + if(sel == 2) { + error = nsurl_create("about:credits", &url); + } else if(sel == 0) { + error = nsurl_create("about:licence", &url); + } + + if(url) { + if (error == NSERROR_OK) { + error = browser_window_create(BW_CREATE_HISTORY, + url, + NULL, + NULL, + NULL); + nsurl_unref(url); + } + if (error != NSERROR_OK) { + amiga_warn_user(messages_get_errorcode(error), 0); + } + } + + ami_reset_pointer(gwin); +} + +HOOKF(void, ami_menu_item_project_quit, APTR, window, struct IntuiMessage *) +{ + menu_quit = true; +} + +HOOKF(void, ami_menu_item_edit_cut, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, NS_KEY_CUT_SELECTION); +} + +HOOKF(void, ami_menu_item_edit_copy, APTR, window, struct IntuiMessage *) +{ + struct bitmap *bm; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + if(browser_window_can_select(gwin->gw->bw)) { + browser_window_key_press(gwin->gw->bw, NS_KEY_COPY_SELECTION); + browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); + } + else if((bm = content_get_bitmap(browser_window_get_content(gwin->gw->bw)))) { + /** @todo It should be checked that the lifetime of + * the objects containing the values returned (and the + * constness cast away) is safe. + */ + ami_bitmap_set_url(bm, browser_window_get_url(gwin->gw->bw)); + ami_bitmap_set_title(bm, browser_window_get_title(gwin->gw->bw)); + ami_easy_clipboard_bitmap(bm); + } +#ifdef WITH_NS_SVG + else if(ami_mime_compare(browser_window_get_content(gwin->gw->bw), "svg") == true) { + ami_easy_clipboard_svg(browser_window_get_content(gwin->gw->bw)); + } +#endif +} + +HOOKF(void, ami_menu_item_edit_paste, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, NS_KEY_PASTE); +} + +HOOKF(void, ami_menu_item_edit_selectall, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, NS_KEY_SELECT_ALL); + gui_start_selection(gwin->gw); +} + +HOOKF(void, ami_menu_item_edit_clearsel, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); +} + +HOOKF(void, ami_menu_item_edit_undo, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, NS_KEY_UNDO); +} + +HOOKF(void, ami_menu_item_edit_redo, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, NS_KEY_REDO); +} + +HOOKF(void, ami_menu_item_browser_find, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_search_open(gwin->gw); +} + +HOOKF(void, ami_menu_item_browser_localhistory, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_history_open(gwin->gw); +} + +HOOKF(void, ami_menu_item_browser_globalhistory, APTR, window, struct IntuiMessage *) +{ + ami_history_global_present(); +} + +HOOKF(void, ami_menu_item_browser_cookies, APTR, window, struct IntuiMessage *) +{ + ami_cookies_present(); +} + +HOOKF(void, ami_menu_item_browser_foreimg, APTR, window, struct IntuiMessage *) +{ + struct Menu *menustrip; + bool checked = false; + + GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); + checked = ami_menu_get_selected(menustrip, msg); + + nsoption_set_bool(foreground_images, checked); + ami_gui_menu_set_check_toggled(); +} + +HOOKF(void, ami_menu_item_browser_backimg, APTR, window, struct IntuiMessage *) +{ + struct Menu *menustrip; + bool checked = false; + + GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); + checked = ami_menu_get_selected(menustrip, msg); + + nsoption_set_bool(background_images, checked); + ami_gui_menu_set_check_toggled(); +} + +HOOKF(void, ami_menu_item_browser_enablejs, APTR, window, struct IntuiMessage *) +{ + struct Menu *menustrip; + bool checked = false; + + GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); + checked = ami_menu_get_selected(menustrip, msg); + + nsoption_set_bool(enable_javascript, checked); + ami_gui_menu_set_check_toggled(); +} + +HOOKF(void, ami_menu_item_browser_scale_decrease, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1); +} + +HOOKF(void, ami_menu_item_browser_scale_normal, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_gui_set_scale(gwin->gw, 1.0); +} + +HOOKF(void, ami_menu_item_browser_scale_increase, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1); +} + +HOOKF(void, ami_menu_item_browser_redraw, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_schedule_redraw(gwin, true); + gwin->new_content = true; +} + +HOOKF(void, ami_menu_item_hotlist_add, APTR, window, struct IntuiMessage *) +{ + struct browser_window *bw; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + bw = gwin->gw->bw; + + if (bw == NULL || browser_window_has_content(bw) == false) + return; + + hotlist_add_url(browser_window_get_url(bw)); + ami_gui_update_hotlist_button(gwin); +} + +HOOKF(void, ami_menu_item_hotlist_show, APTR, window, struct IntuiMessage *) +{ + ami_hotlist_present(); +} + +HOOKF(void, ami_menu_item_hotlist_entries, APTR, window, struct IntuiMessage *) +{ + nsurl *url = hook->h_Data; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + if(url == NULL) return; + + browser_window_navigate(gwin->gw->bw, + url, + NULL, + BW_NAVIGATE_HISTORY, + NULL, + NULL, + NULL); +} + +HOOKF(void, ami_menu_item_settings_edit, APTR, window, struct IntuiMessage *) +{ + ami_gui_opts_open(); +} + +HOOKF(void, ami_menu_item_settings_snapshot, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + nsoption_set_int(window_x, gwin->win->LeftEdge); + nsoption_set_int(window_y, gwin->win->TopEdge); + nsoption_set_int(window_width, gwin->win->Width); + nsoption_set_int(window_height, gwin->win->Height); +} + +HOOKF(void, ami_menu_item_settings_save, APTR, window, struct IntuiMessage *) +{ + ami_nsoption_write(); +} + +HOOKF(void, ami_menu_item_arexx_execute, APTR, window, struct IntuiMessage *) +{ + char *temp; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + if(AslRequestTags(filereq, + ASLFR_Window, gwin->win, + ASLFR_SleepWindow, TRUE, + ASLFR_TitleText, messages_get("NetSurf"), + ASLFR_Screen, scrn, + ASLFR_DoSaveMode, FALSE, + ASLFR_InitialDrawer, nsoption_charp(arexx_dir), + ASLFR_InitialPattern, "#?.nsrx", + TAG_DONE)) { + if((temp = malloc(1024))) { + strlcpy(temp, filereq->fr_Drawer, 1024); + AddPart(temp, filereq->fr_File, 1024); + ami_arexx_execute(temp); + free(temp); + } + } +} + +HOOKF(void, ami_menu_item_arexx_entries, APTR, window, struct IntuiMessage *) +{ + char *script = hook->h_Data; + char *temp; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + if(script) { + if((temp = malloc(1024))) { + BPTR lock; + if((lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))) { + DevNameFromLock(lock, temp, 1024, DN_FULLPATH); + AddPart(temp, script, 1024); + ami_arexx_execute(temp); + free(temp); + UnLock(lock); + } + } + } +} + +/* normal GUI-specific menu functions */ + +ULONG ami_gui_menu_number(int item) +{ + /* horrible, horrible, horrible */ + ULONG menu_num; + + switch(item) { + case M_SAVETXT: + menu_num = FULLMENUNUM(0,4,1); + break; + + case M_SAVECOMP: + menu_num = FULLMENUNUM(0,4,2); + break; + + case M_SAVEIFF: + menu_num = FULLMENUNUM(0,4,3); + break; +#ifdef WITH_PDF_EXPORT + case M_SAVEPDF: + menu_num = FULLMENUNUM(0,4,4); + break; +#endif + case M_CLOSETAB: + menu_num = FULLMENUNUM(0,8,0); + break; + + case M_CUT: + menu_num = FULLMENUNUM(1,0,0); + break; + + case M_COPY: + menu_num = FULLMENUNUM(1,1,0); + break; + + case M_PASTE: + menu_num = FULLMENUNUM(1,2,0); + break; + + case M_SELALL: + menu_num = FULLMENUNUM(1,4,0); + break; + + case M_CLEAR: + menu_num = FULLMENUNUM(1,5,0); + break; + + case M_UNDO: + menu_num = FULLMENUNUM(1,8,0); + break; + + case M_REDO: + menu_num = FULLMENUNUM(1,9,0); + break; + + case M_FIND: + menu_num = FULLMENUNUM(2,0,0); + break; + + case M_IMGFORE: + menu_num = FULLMENUNUM(2,8,0); + break; + + case M_IMGBACK: + menu_num = FULLMENUNUM(2,8,1); + break; + + case M_JS: + menu_num = FULLMENUNUM(2,9,0); + break; + + default: + LOG("WARNING: Unrecognised menu item %d", item); + menu_num = 0; + break; + } + + return menu_num; +} + +#ifdef __amigaos4__ +static void ami_gui_menu_set_checked_mc(struct Menu *menu, int item, bool check) +{ + ULONG check_state = MS_CHECKED; + + if(check == false) { + check_state = 0; + } + + if(menu == NULL) { + menu = gui_menu; + } + + IDoMethod((Object *)menu, MM_SETSTATE, 0, item, MS_CHECKED, check_state); +} +#endif + +static void ami_gui_menu_set_checked_gt(struct Menu *menu, int item, bool check) +{ + if(menu == NULL) { + return; + } + + if(check == true) { + if((ItemAddress(menu, ami_gui_menu_number(item))->Flags & CHECKED) == 0) + ItemAddress(menu, ami_gui_menu_number(item))->Flags ^= CHECKED; + } else { + if(ItemAddress(menu, ami_gui_menu_number(item))->Flags & CHECKED) + ItemAddress(menu, ami_gui_menu_number(item))->Flags ^= CHECKED; + } +} + +void ami_gui_menu_set_checked(struct Menu *menu, int item, bool check) +{ + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { +#ifdef __amigaos4__ + return ami_gui_menu_set_checked_mc(menu, item, check); +#endif + } else { + return ami_gui_menu_set_checked_gt(menu, item, check); + } +} + +#ifdef __amigaos4__ +static void ami_gui_menu_set_disabled_mc(struct Window *win, struct Menu *menu, int item, bool disable) +{ + ULONG disable_state = MS_DISABLED; + + if(disable == false) { + disable_state = 0; + } + + IDoMethod((Object *)menu, MM_SETSTATE, 0, item, MS_DISABLED, disable_state); +} +#endif + +static void ami_gui_menu_set_disabled_gt(struct Window *win, struct Menu *menu, int item, bool disable) +{ + ULONG menu_num = ami_gui_menu_number(item); + + if(disable == false) { + OnMenu(win, menu_num); + } else { + OffMenu(win, menu_num); + } +} + +void ami_gui_menu_set_disabled(struct Window *win, struct Menu *menu, int item, bool disable) +{ + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { +#ifdef __amigaos4__ + return ami_gui_menu_set_disabled_mc(win, menu, item, disable); +#endif + } else { + return ami_gui_menu_set_disabled_gt(win, menu, item, disable); + } +} + + +void ami_gui_menu_update_checked(struct gui_window_2 *gwin) +{ + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { + /* Irrelevant when using MenuClass */ + return; + } + + struct Menu *menustrip; + + GetAttr(WINDOW_MenuStrip, gwin->objects[OID_MAIN], (ULONG *)&menustrip); + if(!menustrip) return; + if(nsoption_bool(enable_javascript) == true) { + if((ItemAddress(menustrip, ami_gui_menu_number(M_JS))->Flags & CHECKED) == 0) + ItemAddress(menustrip, ami_gui_menu_number(M_JS))->Flags ^= CHECKED; + } else { + if(ItemAddress(menustrip, ami_gui_menu_number(M_JS))->Flags & CHECKED) + ItemAddress(menustrip, ami_gui_menu_number(M_JS))->Flags ^= CHECKED; + } + if(nsoption_bool(foreground_images) == true) { + if((ItemAddress(menustrip, ami_gui_menu_number(M_IMGFORE))->Flags & CHECKED) == 0) + ItemAddress(menustrip, ami_gui_menu_number(M_IMGFORE))->Flags ^= CHECKED; + } else { + if(ItemAddress(menustrip, ami_gui_menu_number(M_IMGFORE))->Flags & CHECKED) + ItemAddress(menustrip, ami_gui_menu_number(M_IMGFORE))->Flags ^= CHECKED; + } + + if(nsoption_bool(background_images) == true) { + if((ItemAddress(menustrip, ami_gui_menu_number(M_IMGBACK))->Flags & CHECKED) == 0) + ItemAddress(menustrip, ami_gui_menu_number(M_IMGBACK))->Flags ^= CHECKED; + } else { + if(ItemAddress(menustrip, ami_gui_menu_number(M_IMGBACK))->Flags & CHECKED) + ItemAddress(menustrip, ami_gui_menu_number(M_IMGBACK))->Flags ^= CHECKED; + } + + ResetMenuStrip(gwin->win, menustrip); +} + +void ami_gui_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c) +{ + struct Window *win = g->shared->win; + + if(nsoption_bool(kiosk_mode) == true) return; + + if(content_get_type(c) <= CONTENT_CSS) + { + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVETXT, false); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVECOMP, false); +#ifdef WITH_PDF_EXPORT + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVEPDF, false); +#endif +#if 0 + if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_COPY) { + OnMenu(win,AMI_MENU_COPY); + OnMenu(win,AMI_MENU_CLEAR); + } else { + OffMenu(win,AMI_MENU_COPY); + OffMenu(win,AMI_MENU_CLEAR); + } + + if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_CUT) + OnMenu(win,AMI_MENU_CUT); + else + OffMenu(win,AMI_MENU_CUT); + + if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_PASTE) + OnMenu(win,AMI_MENU_PASTE); + else + OffMenu(win,AMI_MENU_PASTE); +#else + ami_gui_menu_set_disabled(win, g->shared->imenu, M_CUT, false); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_COPY, false); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_PASTE, false); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_CLEAR, false); +#endif + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SELALL, false); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_FIND, false); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVEIFF, true); + } + else + { + ami_gui_menu_set_disabled(win, g->shared->imenu, M_CUT, true); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_PASTE, true); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_CLEAR, true); + + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVETXT, true); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVECOMP, true); +#ifdef WITH_PDF_EXPORT + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVEPDF, true); +#endif + + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SELALL, true); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_FIND, true); + +#ifdef WITH_NS_SVG + if(content_get_bitmap(c) || (ami_mime_compare(c, "svg") == true)) +#else + if(content_get_bitmap(c)) +#endif + { + ami_gui_menu_set_disabled(win, g->shared->imenu, M_COPY, false); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVEIFF, false); + } + else + { + ami_gui_menu_set_disabled(win, g->shared->imenu, M_COPY, true); + ami_gui_menu_set_disabled(win, g->shared->imenu, M_SAVEIFF, true); + } + } +} + +void ami_gui_menu_set_check_toggled(void) +{ + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { + /* Irrelevant when using MenuClass */ + return; + } + + ami_menu_check_toggled = true; +} + +bool ami_gui_menu_get_check_toggled(void) +{ + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { + /* Irrelevant when using MenuClass */ + return false; + } + + bool check_toggled = ami_menu_check_toggled; + ami_menu_check_toggled = false; + return check_toggled; +} + +void ami_menu_arexx_scan(struct ami_menu_data **md) +{ + /**\todo Rewrite this to not use ExAll() **/ + int item = AMI_MENU_AREXX; + BPTR lock = 0; + UBYTE *buffer; + struct ExAllControl *ctrl; + char matchpatt[16]; + LONG cont; + struct ExAllData *ead; + char *menu_lab; + + if((lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))) { + if((buffer = malloc(1024))) { + if((ctrl = AllocDosObject(DOS_EXALLCONTROL,NULL))) { + ctrl->eac_LastKey = 0; + + if(ParsePatternNoCase("#?.nsrx",(char *)&matchpatt,16) != -1) { + ctrl->eac_MatchString = (char *)&matchpatt; + } + + do { + cont = ExAll(lock,(struct ExAllData *)buffer,1024,ED_COMMENT,ctrl); + if((!cont) && (IoErr() != ERROR_NO_MORE_ENTRIES)) break; + if(!ctrl->eac_Entries) continue; + + for(ead = (struct ExAllData *)buffer; ead; ead = ead->ed_Next) { + if(item >= AMI_MENU_AREXX_MAX) continue; + if(EAD_IS_FILE(ead)) { + if(ead->ed_Comment[0] != '\0') + menu_lab = ead->ed_Comment; + else + menu_lab = ead->ed_Name; + + ami_menu_alloc_item(md, item, NM_ITEM, menu_lab, NULL, NSA_SPACE, + ami_menu_item_arexx_entries, (void *)strdup(ead->ed_Name), 0); + + item++; + } + } + } while(cont); + FreeDosObject(DOS_EXALLCONTROL,ctrl); + } + free(buffer); + } + UnLock(lock); + } + + ami_menu_alloc_item(md, item, NM_END, NULL, NULL, NULL, NULL, NULL, 0); +} + +static bool ami_menu_hotlist_add(void *userdata, int level, int item, const char *title, nsurl *url, bool is_folder) +{ + UBYTE type; + STRPTR icon; + UWORD flags = 0; + struct ami_menu_data **md = (struct ami_menu_data **)userdata; + + if(item >= AMI_MENU_HOTLIST_MAX) return false; + + switch(level) { + case 1: + type = NM_ITEM; + break; + case 2: + type = NM_SUB; + break; + default: + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { + type = NM_SUB + (level - 2); + } else { + /* entries not at level 1 or 2 are not able to be added */ + return false; + } + break; + } + + if(is_folder == true) { + icon = ASPrintf("icons/directory.png"); + } else { + icon = ami_gui_get_cache_favicon_name(url, true); + if (icon == NULL) icon = ASPrintf("icons/content.png"); + } + + if(!LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { + if((is_folder == true) && (type == NM_SUB)) { + flags = NM_ITEMDISABLED; + } + } + + ami_menu_alloc_item(md, item, type, title, + NULL, icon, ami_menu_item_hotlist_entries, (void *)url, flags); + + if(icon) FreeVec(icon); + + return true; +} + +static nserror ami_menu_scan(struct ami_menu_data **md) +{ + ami_menu_alloc_item(md, M_HLADD, NM_ITEM, "HotlistAdd", "B", "TBImages:list_favouriteadd", + ami_menu_item_hotlist_add, NULL, 0); + ami_menu_alloc_item(md, M_HLSHOW, NM_ITEM,"HotlistShowNS", "H", "TBImages:list_favourite", + ami_menu_item_hotlist_show, NULL, 0); + ami_menu_alloc_item(md, M_BAR_H1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + + return ami_hotlist_scan((void *)md, AMI_MENU_HOTLIST, messages_get("HotlistMenu"), ami_menu_hotlist_add); +} + +static void ami_init_menulabs(struct ami_menu_data **md) +{ + UWORD js_flags = CHECKIT | MENUTOGGLE; + if(nsoption_bool(enable_javascript) == true) + js_flags |= CHECKED; + + UWORD imgfore_flags = CHECKIT | MENUTOGGLE; + if(nsoption_bool(foreground_images) == true) + imgfore_flags |= CHECKED; + + UWORD imgback_flags = CHECKIT | MENUTOGGLE; + if(nsoption_bool(background_images) == true) + imgback_flags |= CHECKED; + + ami_menu_alloc_item(md, M_PROJECT, NM_TITLE, "Project", NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_NEWWIN, NM_ITEM, "NewWindowNS", "N", "TBImages:list_app", + ami_menu_item_project_newwin, NULL, 0); + ami_menu_alloc_item(md, M_NEWTAB, NM_ITEM, "NewTab", "T", "TBImages:list_tab", + ami_menu_item_project_newtab, NULL, 0); + ami_menu_alloc_item(md, M_BAR_P1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_OPEN, NM_ITEM, "OpenFile", "O", "TBImages:list_folder_misc", + ami_menu_item_project_open, NULL, 0); + ami_menu_alloc_item(md, M_SAVEAS, NM_ITEM, "SaveAsNS", NULL, "TBImages:list_saveas", NULL, NULL, 0); + ami_menu_alloc_item(md, M_SAVESRC, NM_SUB, "Source", "S", NULL, + ami_menu_item_project_save, (void *)AMINS_SAVE_SOURCE, 0); + ami_menu_alloc_item(md, M_SAVETXT, NM_SUB, "TextNS", NULL, NULL, + ami_menu_item_project_save, (void *)AMINS_SAVE_TEXT, 0); + ami_menu_alloc_item(md, M_SAVECOMP, NM_SUB, "SaveCompNS", NULL, NULL, + ami_menu_item_project_save, (void *)AMINS_SAVE_COMPLETE, 0); +#ifdef WITH_PDF_EXPORT + ami_menu_alloc_item(md, M_SAVEPDF, NM_SUB, "PDFNS", NULL, NULL, + ami_menu_item_project_save, (void *)AMINS_SAVE_PDF, 0); +#endif + ami_menu_alloc_item(md, M_SAVEIFF, NM_SUB, "IFF", NULL, NULL, + ami_menu_item_project_save, (void *)AMINS_SAVE_IFF, 0); + ami_menu_alloc_item(md, M_BAR_P2, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_PRINT, NM_ITEM, "PrintNS", "P", "TBImages:list_print", + ami_menu_item_project_print, NULL, NM_ITEMDISABLED); + ami_menu_alloc_item(md, M_BAR_P3, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_CLOSETAB, NM_ITEM, "CloseTab", "K", "TBImages:list_remove", + ami_menu_item_project_closetab, NULL, 0); + ami_menu_alloc_item(md, M_CLOSEWIN, NM_ITEM, "CloseWindow", NULL, "TBImages:list_cancel", + ami_menu_item_project_closewin, NULL, 0); + ami_menu_alloc_item(md, M_BAR_P4, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_ABOUT, NM_ITEM, "About", "?", "TBImages:list_info", + ami_menu_item_project_about, NULL, 0); + ami_menu_alloc_item(md, M_BAR_P5, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_QUIT, NM_ITEM, "Quit", "Q", "TBImages:list_warning", + ami_menu_item_project_quit, NULL, 0); + + ami_menu_alloc_item(md, M_EDIT, NM_TITLE, "Edit", NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_CUT, NM_ITEM, "CutNS", "X", "TBImages:list_cut", + ami_menu_item_edit_cut, NULL, 0); + ami_menu_alloc_item(md, M_COPY, NM_ITEM, "CopyNS", "C", "TBImages:list_copy", + ami_menu_item_edit_copy, NULL, 0); + ami_menu_alloc_item(md, M_PASTE, NM_ITEM, "PasteNS", "V", "TBImages:list_paste", + ami_menu_item_edit_paste, NULL, 0); + ami_menu_alloc_item(md, M_BAR_E1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_SELALL, NM_ITEM, "SelectAllNS", "A", NSA_SPACE, + ami_menu_item_edit_selectall, NULL, 0); + ami_menu_alloc_item(md, M_CLEAR, NM_ITEM, "ClearNS", NULL, NSA_SPACE, + ami_menu_item_edit_clearsel, NULL, 0); + ami_menu_alloc_item(md, M_BAR_E2, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_UNDO, NM_ITEM, "Undo", "Z", "TBImages:list_undo", + ami_menu_item_edit_undo, NULL, 0); + ami_menu_alloc_item(md, M_REDO, NM_ITEM, "Redo", "Y", "TBImages:list_redo", + ami_menu_item_edit_redo, NULL, 0); + + ami_menu_alloc_item(md, M_BROWSER, NM_TITLE, "Browser", NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_FIND, NM_ITEM, "FindTextNS", "F", "TBImages:list_search", + ami_menu_item_browser_find, NULL, 0); + ami_menu_alloc_item(md, M_BAR_B1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_HISTLOCL, NM_ITEM, "HistLocalNS", NULL, "TBImages:list_history", + ami_menu_item_browser_localhistory, NULL, 0); + ami_menu_alloc_item(md, M_HISTGLBL, NM_ITEM, "HistGlobalNS", NULL, "TBImages:list_history", + ami_menu_item_browser_globalhistory, NULL, 0); + ami_menu_alloc_item(md, M_BAR_B2, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_COOKIES, NM_ITEM, "ShowCookiesNS",NULL, "TBImages:list_internet", + ami_menu_item_browser_cookies, NULL, 0); + ami_menu_alloc_item(md, M_BAR_B3, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_SCALE, NM_ITEM, "ScaleNS", NULL, "TBImages:list_preview", NULL, NULL, 0); + ami_menu_alloc_item(md, M_SCALEDEC, NM_SUB, "ScaleDec", "-", "TBImages:list_zoom_out", + ami_menu_item_browser_scale_decrease, NULL, 0); + ami_menu_alloc_item(md, M_SCALENRM, NM_SUB, "ScaleNorm", "=", "TBImages:list_zoom_100", + ami_menu_item_browser_scale_normal, NULL, 0); + ami_menu_alloc_item(md, M_SCALEINC, NM_SUB, "ScaleInc", "+", "TBImages:list_zoom_in", + ami_menu_item_browser_scale_increase, NULL, 0); + ami_menu_alloc_item(md, M_IMAGES, NM_ITEM, "Images", NULL, "TBImages:list_image", NULL, NULL, 0); + ami_menu_alloc_item(md, M_IMGFORE, NM_SUB, "ForeImg", NULL, NULL, + ami_menu_item_browser_foreimg, NULL, imgfore_flags); + ami_menu_alloc_item(md, M_IMGBACK, NM_SUB, "BackImg", NULL, NULL, + ami_menu_item_browser_backimg, NULL, imgback_flags); + ami_menu_alloc_item(md, M_JS, NM_ITEM, "EnableJS", NULL, NULL, + ami_menu_item_browser_enablejs, NULL, js_flags); + ami_menu_alloc_item(md, M_BAR_B4, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_REDRAW, NM_ITEM, "Redraw", NULL, "TBImages:list_wand", + ami_menu_item_browser_redraw, NULL, 0); + + ami_menu_alloc_item(md, M_HOTLIST, NM_TITLE, "Hotlist", NULL, NULL, NULL, NULL, 0); + /* see ami_menu_scan for the rest of this menu */ + + ami_menu_alloc_item(md, M_PREFS, NM_TITLE, "Settings", NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_PREDIT, NM_ITEM, "SettingsEdit", NULL, "TBImages:list_prefs", + ami_menu_item_settings_edit, NULL, 0); + ami_menu_alloc_item(md, M_BAR_S1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_SNAPSHOT, NM_ITEM, "SnapshotWindow",NULL, "TBImages:list_hold", + ami_menu_item_settings_snapshot, NULL, 0); + ami_menu_alloc_item(md, M_PRSAVE, NM_ITEM, "SettingsSave", NULL, "TBImages:list_use", + ami_menu_item_settings_save, NULL, 0); + + ami_menu_alloc_item(md, M_AREXX, NM_TITLE, "ARexx", NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, M_AREXXEX, NM_ITEM, "ARexxExecute", "E", "TBImages:list_arexx", + ami_menu_item_arexx_execute, NULL, 0); + ami_menu_alloc_item(md, M_BAR_A1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_MENU_AREXX_MAX, NM_END, NULL, NULL, NULL, NULL, NULL, 0); +} + +struct Menu *ami_gui_menu_create(struct gui_window_2 *gwin) +{ + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { +#ifdef __amigaos4__ + if(gui_menu != NULL) { + gwin->imenu = gui_menu; + gui_menu_count++; + return gwin->imenu; + } + ami_init_menulabs(gui_menu_data); + ami_menu_scan(gui_menu_data); + ami_menu_arexx_scan(gui_menu_data); + gwin->imenu = ami_menu_layout(gui_menu_data, AMI_MENU_AREXX_MAX); + + gui_menu = gwin->imenu; + gui_menu_count++; +#endif + } else { + ami_init_menulabs(gwin->menu_data); + ami_menu_scan(gwin->menu_data); + ami_menu_arexx_scan(gwin->menu_data); + gwin->imenu = ami_menu_layout(gwin->menu_data, AMI_MENU_AREXX_MAX); + } + + return gwin->imenu; +} + +static void ami_free_menulabs(struct ami_menu_data **md) +{ + int i; + + for(i=0;i<=AMI_MENU_AREXX_MAX;i++) { + if(md[i] == NULL) continue; + if(md[i]->menulab && + (md[i]->menulab != NM_BARLABEL) && + (md[i]->menulab != ML_SEPARATOR)) { + if(md[i]->menutype & MENU_IMAGE) { + if(md[i]->menuobj) DisposeObject(md[i]->menuobj); + } + + ami_utf8_free(md[i]->menulab); + + if(i >= AMI_MENU_AREXX) { + if(md[i]->menu_hook.h_Data) free(md[i]->menu_hook.h_Data); + md[i]->menu_hook.h_Data = NULL; + } + } + + if(md[i]->menukey != NULL) free(md[i]->menukey); + + md[i]->menulab = NULL; + md[i]->menuobj = NULL; + md[i]->menukey = NULL; + md[i]->menutype = 0; + free(md[i]); + md[i] = NULL; + } +} + +void ami_gui_menu_free(struct gui_window_2 *gwin) +{ + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { +#ifdef __amigaos4__ + gui_menu_count--; + + SetAttrs(gwin->objects[OID_MAIN], WINDOW_MenuStrip, NULL, TAG_DONE); + + if(gui_menu_count == 0) { + ami_free_menulabs(gui_menu_data); + // if we detach our menu from the window we need to do this manually + DisposeObject((Object *)gui_menu); + gui_menu = NULL; + } +#endif + } else { + ami_free_menulabs(gwin->menu_data); + FreeMenus(gwin->imenu); + } +} + +bool ami_gui_menu_quit_selected(void) +{ + return menu_quit; +} + +void ami_gui_menu_refresh_hotlist(void) +{ +#ifdef __amigaos4__ + ami_menu_refresh(gui_menu, gui_menu_data, M_HOTLIST, AMI_MENU_HOTLIST_MAX, ami_menu_scan); +#endif +} + diff --git a/frontends/amiga/menu.h b/frontends/amiga/gui_menu.h old mode 100755 new mode 100644 similarity index 63% copy from frontends/amiga/menu.h copy to frontends/amiga/gui_menu.h index ac74f38..16fc720 --- a/frontends/amiga/menu.h +++ b/frontends/amiga/gui_menu.h @@ -1,5 +1,5 @@ /* - * Copyright 2008,2009,2013 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2008-2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -16,17 +16,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef AMIGA_MENU_H -#define AMIGA_MENU_H - -#include <exec/types.h> -#include <intuition/intuition.h> -#include <libraries/gadtools.h> - -struct hlcache_handle; +#ifndef AMIGA_GUI_MENU_H +#define AMIGA_GUI_MENU_H /** Maximum number of hotlist items (somewhat arbitrary value) */ -#define AMI_HOTLIST_ITEMS 60 +#define AMI_HOTLIST_ITEMS 200 /** Maximum number of ARexx menu items (somewhat arbitrary value) */ #define AMI_MENU_AREXX_ITEMS 20 @@ -111,39 +105,21 @@ enum { * only used for freeing the UTF-8 converted menu labels */ #define AMI_MENU_MAX AMI_MENU_AREXX -/* The Intuition menu numbers of some menus we might need to modify */ -#define AMI_MENU_SAVEAS_TEXT FULLMENUNUM(0,4,1) -#define AMI_MENU_SAVEAS_COMPLETE FULLMENUNUM(0,4,2) -#define AMI_MENU_SAVEAS_IFF FULLMENUNUM(0,4,3) -#define AMI_MENU_SAVEAS_PDF FULLMENUNUM(0,4,4) -#define AMI_MENU_CLOSETAB FULLMENUNUM(0,8,0) -#define AMI_MENU_CUT FULLMENUNUM(1,0,0) -#define AMI_MENU_COPY FULLMENUNUM(1,1,0) -#define AMI_MENU_PASTE FULLMENUNUM(1,2,0) -#define AMI_MENU_SELECTALL FULLMENUNUM(1,4,0) -#define AMI_MENU_CLEAR FULLMENUNUM(1,5,0) -#define AMI_MENU_UNDO FULLMENUNUM(1,8,0) -#define AMI_MENU_REDO FULLMENUNUM(1,9,0) -#define AMI_MENU_FIND FULLMENUNUM(2,0,0) -#define AMI_MENU_FOREIMG FULLMENUNUM(2,8,0) -#define AMI_MENU_BACKIMG FULLMENUNUM(2,8,1) -#define AMI_MENU_JS FULLMENUNUM(2,9,0) - struct gui_window; struct gui_window_2; +struct hlcache_handle; + +ULONG ami_gui_menu_number(int item); +struct Menu *ami_gui_menu_create(struct gui_window_2 *gwin); +void ami_gui_menu_free(struct gui_window_2 *gwin); -void ami_free_menulabs(struct gui_window_2 *gwin); -struct Menu *ami_menu_create(struct gui_window_2 *gwin); -void ami_menu_refresh(struct gui_window_2 *gwin); -void ami_menu_update_checked(struct gui_window_2 *gwin); -void ami_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c); -void ami_menu_free_glyphs(void); -void ami_menu_free(struct gui_window_2 *gwin); +void ami_gui_menu_update_checked(struct gui_window_2 *gwin); +void ami_gui_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c); /** * Sets that an item linked to a toggle menu item has been changed. */ -void ami_menu_set_check_toggled(void); +void ami_gui_menu_set_check_toggled(void); /** * Gets if the menu needs updating because an item linked @@ -152,13 +128,30 @@ void ami_menu_set_check_toggled(void); * * \return true if the menus need refreshing */ -bool ami_menu_get_check_toggled(void); +bool ami_gui_menu_get_check_toggled(void); + +/** + * Set checked state of a menu item + * almost generic, but not quite + */ +void ami_gui_menu_set_checked(struct Menu *menu, int item, bool check); + +/** + * Set disabled state of a menu item + * almost generic, but not quite + */ +void ami_gui_menu_set_disabled(struct Window *win, struct Menu *menu, int item, bool disable); + +/** + * Refresh the Hotlist menu + */ +void ami_gui_menu_refresh_hotlist(void); /** * Gets if NetSurf has been quit from the menu * * \return true if NetSurf has been quit */ -bool ami_menu_quit_selected(void); +bool ami_gui_menu_quit_selected(void); #endif diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c index 2b1b7c9..78dea58 100755 --- a/frontends/amiga/gui_options.c +++ b/frontends/amiga/gui_options.c @@ -70,10 +70,10 @@ #include "amiga/font.h" #include "amiga/font_bullet.h" #include "amiga/gui.h" +#include "amiga/gui_menu.h" #include "amiga/gui_options.h" #include "amiga/help.h" #include "amiga/libs.h" -#include "amiga/misc.h" #include "amiga/nsoption.h" #include "amiga/object.h" #include "amiga/selectmenu.h" @@ -221,7 +221,7 @@ enum { }; struct ami_gui_opts_window { - struct nsObject *node; + struct ami_generic_window w; struct Window *win; Object *objects[GID_OPTS_LAST]; #ifndef __amigaos4__ @@ -234,6 +234,14 @@ struct ami_gui_opts_window { #endif }; +static BOOL ami_gui_opts_event(void *w); +static void ami_gui_opts_close(void *w); + +static const struct ami_win_event_table ami_guiopts_table = { + ami_gui_opts_event, + ami_gui_opts_close, +}; + static struct ami_gui_opts_window *gow = NULL; static CONST_STRPTR tabs[OPTS_MAX_TABS]; @@ -636,7 +644,7 @@ void ami_gui_opts_open(void) if(!gow) { - gow = ami_misc_allocvec_clear(sizeof(struct ami_gui_opts_window), 0); + gow = calloc(1, sizeof(struct ami_gui_opts_window)); if(gow == NULL) return; ami_gui_opts_setup(gow); @@ -1668,8 +1676,7 @@ void ami_gui_opts_open(void) EndWindow; gow->win = (struct Window *)RA_OpenWindow(gow->objects[OID_MAIN]); - gow->node = AddObject(window_list,AMINS_GUIOPTSWINDOW); - gow->node->objstruct = gow; + ami_gui_win_list_add(gow, AMINS_GUIOPTSWINDOW, &ami_guiopts_table); } ami_utf8_free(homepage_url_lc); } @@ -1720,7 +1727,9 @@ static void ami_gui_opts_use(bool save) } else { nsoption_set_bool(enable_javascript, false); } - + + ami_gui_menu_set_checked(NULL, M_JS, nsoption_bool(enable_javascript)); + GetAttr(GA_Selected,gow->objects[GID_OPTS_DONOTTRACK],(ULONG *)&data); if (data) { nsoption_set_bool(do_not_track, true); @@ -2060,19 +2069,19 @@ static void ami_gui_opts_use(bool save) ami_font_savescanner(); /* just in case it has changed and been used only */ } - ami_menu_set_check_toggled(); + ami_gui_menu_set_check_toggled(); ami_update_pointer(gow->win, GUI_POINTER_DEFAULT); } -void ami_gui_opts_close(void) +static void ami_gui_opts_close(void *w) { DisposeObject(gow->objects[OID_MAIN]); ami_gui_opts_free(gow); - DelObject(gow->node); + ami_gui_win_list_remove(gow); gow = NULL; } -BOOL ami_gui_opts_event(void) +static BOOL ami_gui_opts_event(void *w) { /* return TRUE if window destroyed */ ULONG result,data = 0; @@ -2084,7 +2093,7 @@ BOOL ami_gui_opts_event(void) switch(result & WMHI_CLASSMASK) // class { case WMHI_CLOSEWINDOW: - ami_gui_opts_close(); + ami_gui_opts_close(gow); return TRUE; break; @@ -2103,7 +2112,7 @@ BOOL ami_gui_opts_event(void) { case GID_OPTS_SAVE: ami_gui_opts_use(true); - ami_gui_opts_close(); + ami_gui_opts_close(gow); return TRUE; break; @@ -2112,7 +2121,7 @@ BOOL ami_gui_opts_event(void) // fall through case GID_OPTS_CANCEL: - ami_gui_opts_close(); + ami_gui_opts_close(gow); return TRUE; break; @@ -2284,7 +2293,7 @@ struct List *ami_gui_opts_websearch(void) const char *name; int iter; - list = AllocVecTagList(sizeof(struct List), NULL); + list = malloc(sizeof(struct List)); NewList(list); if (nsoption_charp(search_engines_file) == NULL) return list; @@ -2314,6 +2323,6 @@ void ami_gui_opts_websearch_free(struct List *websearchlist) FreeChooserNode(node); } while((node = nnode)); - FreeVec(websearchlist); + free(websearchlist); } diff --git a/frontends/amiga/gui_options.h b/frontends/amiga/gui_options.h index abb0b11..7de35cc 100755 --- a/frontends/amiga/gui_options.h +++ b/frontends/amiga/gui_options.h @@ -20,8 +20,6 @@ #define AMIGA_GUI_OPTIONS_H /* Prefs GUI control */ void ami_gui_opts_open(void); -BOOL ami_gui_opts_event(void); -void ami_gui_opts_close(void); /* Web search list */ struct List *ami_gui_opts_websearch(void); diff --git a/frontends/amiga/history.c b/frontends/amiga/history.c old mode 100755 new mode 100644 index 2287c70..12c306a --- a/frontends/amiga/history.c +++ b/frontends/amiga/history.c @@ -1,5 +1,5 @@ /* - * Copyright 2008, 2009 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -16,28 +16,457 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +/** + * \file + * Implementation of Amiga global history viewer using core windows. + */ + +#include <stdint.h> +#include <stdlib.h> #include <stdbool.h> -#include <proto/exec.h> +#include <string.h> + +#include <proto/asl.h> +#include <proto/dos.h> +#include <proto/intuition.h> + +#include <classes/window.h> +#include <gadgets/layout.h> +#include <gadgets/space.h> -#include "utils/errors.h" -#include "netsurf/mouse.h" -#include "netsurf/window.h" +#include <reaction/reaction_macros.h> +#include "desktop/global_history.h" +#include "netsurf/browser_window.h" +#include "netsurf/keypress.h" +#include "netsurf/plotters.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/nsoption.h" + +#include "amiga/corewindow.h" +#include "amiga/drag.h" +#include "amiga/file.h" #include "amiga/history.h" -#include "amiga/tree.h" -#include "amiga/tree.h" +#include "amiga/libs.h" +#include "amiga/menu.h" +#include "amiga/theme.h" +#include "amiga/utf8.h" + +enum { + /* Project menu */ + AMI_HISTORY_M_PROJECT = 0, + AMI_HISTORY_M_EXPORT, + AMI_HISTORY_M_BAR_P1, + AMI_HISTORY_M_EXPAND, + AMI_HISTORY_M_EXPAND_ALL, + AMI_HISTORY_M_EXPAND_FOLDERS, + AMI_HISTORY_M_EXPAND_LINKS, + AMI_HISTORY_M_COLLAPSE, + AMI_HISTORY_M_COLLAPSE_ALL, + AMI_HISTORY_M_COLLAPSE_FOLDERS, + AMI_HISTORY_M_COLLAPSE_LINKS, + AMI_HISTORY_M_BAR_P2, + AMI_HISTORY_M_SNAPSHOT, + AMI_HISTORY_M_BAR_P3, + AMI_HISTORY_M_CLOSE, + /* Edit menu */ + AMI_HISTORY_M_EDIT, + AMI_HISTORY_M_SELECTALL, + AMI_HISTORY_M_CLEAR, + AMI_HISTORY_M_BAR_E1, + AMI_HISTORY_M_DELETE, + AMI_HISTORY_M_LAST +}; + +/** + * Amiga history viewer window context + */ +struct ami_history_global_window { + /** Amiga core window context */ + struct ami_corewindow core; + + struct ami_menu_data *menu_data[AMI_HISTORY_M_LAST + 1]; + struct Menu *imenu; /* Intuition menu */ +}; -struct treeview_window *global_history_window = NULL; +static struct ami_history_global_window *history_window = NULL; -void ami_global_history_initialise(void) + +static void +ami_history_global_menu_free(struct ami_history_global_window *history_win) +{ + SetAttrs(history_win->core.objects[GID_CW_WIN], + WINDOW_MenuStrip, NULL, + TAG_DONE); + + ami_menu_free_menu(history_win->menu_data, AMI_HISTORY_M_LAST, history_win->imenu); +} + +/** + * destroy a previously created history view + */ +static void +ami_history_global_destroy(struct ami_corewindow *ami_cw) { - global_history_window = ami_tree_create(TREE_HISTORY, NULL); + nserror res; - if(!global_history_window) return; + if(history_window == NULL) + return; + + res = global_history_fini(); + if (res == NSERROR_OK) { + ami_history_global_menu_free(history_window); + res = ami_corewindow_fini(&history_window->core); /* closes the window for us, frees history_win */ + history_window = NULL; + } } -void ami_global_history_free() + +/** + * callback for mouse action for history viewer on core window + * + * \param ami_cw The Amiga core window structure. + * \param mouse_state netsurf mouse state on event + * \param x location of event + * \param y location of event + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_history_global_mouse(struct ami_corewindow *ami_cw, + browser_mouse_state mouse_state, + int x, int y) { - ami_tree_destroy(global_history_window); - global_history_window = NULL; + global_history_mouse_action(mouse_state, x, y); + + return NSERROR_OK; } + +/** + * callback for keypress for history viewer on core window + * + * \param ami_cw The Amiga core window structure. + * \param nskey The netsurf key code + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_history_global_key(struct ami_corewindow *ami_cw, uint32_t nskey) +{ + if (global_history_keypress(nskey)) { + return NSERROR_OK; + } + return NSERROR_NOT_IMPLEMENTED; +} + +/** + * callback on draw event for history viewer on core window + * + * \param ami_cw The Amiga core window structure. + * \param r The rectangle of the window that needs updating. + * \param ctx The drawing context + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_history_global_draw(struct ami_corewindow *ami_cw, int x, int y, struct rect *r, struct redraw_context *ctx) +{ + global_history_redraw(x, y, r, ctx); + + return NSERROR_OK; +} + +/** + * callback on drag end for history viewer + * + * \param ami_cw The Amiga core window structure. + * \param x mouse x co-ordinate + * \param y mouse y co-ordinate + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_history_global_drag_end(struct ami_corewindow *ami_cw, int x, int y) +{ + struct nsurl *url = NULL; + const char *title = NULL; + bool ok = false; + struct gui_window_2 *gwin; + struct ami_corewindow *cw; + + if(global_history_has_selection()) { + ok = global_history_get_selection(&url, &title); + } + + if((ok == false) || (url == NULL)) { + DisplayBeep(scrn); + } else if(url) { + if((gwin = ami_window_at_pointer(AMINS_WINDOW))) { + browser_window_navigate(gwin->gw->bw, + url, + NULL, + BW_NAVIGATE_HISTORY, + NULL, + NULL, + NULL); + } else if((cw = (struct ami_corewindow *)ami_window_at_pointer(AMINS_COREWINDOW)) && + (ami_cw->icon_drop != NULL)) { + cw->icon_drop(cw, url, title, x, y); + } + } + return NSERROR_OK; +} + +/** + * menu stuff + */ + + /* menu hook functions */ +HOOKF(void, ami_history_global_menu_item_project_export, APTR, window, struct IntuiMessage *) +{ + char fname[1024]; + struct ami_corewindow *ami_cw; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&ami_cw); + + if(AslRequestTags(savereq, + ASLFR_Window, ami_cw->win, + ASLFR_SleepWindow, TRUE, + ASLFR_TitleText, messages_get("NetSurf"), + ASLFR_Screen, scrn, + ASLFR_InitialFile, "history.html", + TAG_DONE)) { + strlcpy(fname, savereq->fr_Drawer, 1024); + AddPart(fname, savereq->fr_File, 1024); + ami_update_pointer(ami_cw->win, GUI_POINTER_WAIT); + global_history_export(fname, NULL); + ami_update_pointer(ami_cw->win, GUI_POINTER_DEFAULT); + } +} + +HOOKF(void, ami_history_global_menu_item_project_expand_all, APTR, window, struct IntuiMessage *) +{ + global_history_expand(false); +} + +HOOKF(void, ami_history_global_menu_item_project_expand_folders, APTR, window, struct IntuiMessage *) +{ + global_history_expand(true); +} + +HOOKF(void, ami_history_global_menu_item_project_expand_links, APTR, window, struct IntuiMessage *) +{ + global_history_expand(false); +} + +HOOKF(void, ami_history_global_menu_item_project_collapse_all, APTR, window, struct IntuiMessage *) +{ + global_history_contract(true); +} + +HOOKF(void, ami_history_global_menu_item_project_collapse_folders, APTR, window, struct IntuiMessage *) +{ + global_history_contract(true); +} + +HOOKF(void, ami_history_global_menu_item_project_collapse_links, APTR, window, struct IntuiMessage *) +{ + global_history_contract(false); +} + +HOOKF(void, ami_history_global_menu_item_project_snapshot, APTR, window, struct IntuiMessage *) +{ + struct ami_corewindow *ami_cw; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&ami_cw); + + nsoption_set_int(history_window_ypos, ami_cw->win->TopEdge); + nsoption_set_int(history_window_xpos, ami_cw->win->LeftEdge); + nsoption_set_int(history_window_xsize, ami_cw->win->Width); + nsoption_set_int(history_window_ysize, ami_cw->win->Height); +} + +HOOKF(void, ami_history_global_menu_item_project_close, APTR, window, struct IntuiMessage *) +{ + struct ami_corewindow *ami_cw; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&ami_cw); + + ami_cw->close_window = true; +} + +HOOKF(void, ami_history_global_menu_item_edit_select_all, APTR, window, struct IntuiMessage *) +{ + global_history_keypress(NS_KEY_SELECT_ALL); +} + +HOOKF(void, ami_history_global_menu_item_edit_clear, APTR, window, struct IntuiMessage *) +{ + global_history_keypress(NS_KEY_CLEAR_SELECTION); +} + +HOOKF(void, ami_history_global_menu_item_edit_delete, APTR, window, struct IntuiMessage *) +{ + global_history_keypress(NS_KEY_DELETE_LEFT); +} + + +/* menu setup */ + +static void ami_history_global_menulabs(struct ami_menu_data **md) +{ + ami_menu_alloc_item(md, AMI_HISTORY_M_PROJECT, NM_TITLE, "Tree", NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_EXPORT, NM_ITEM, "TreeExport", "S", "TBImages:list_save", + ami_history_global_menu_item_project_export, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_BAR_P1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_EXPAND, NM_ITEM, "Expand", NULL, "TBImages:list_folderunfold", NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_EXPAND_ALL, NM_SUB, "All", "+", NULL, + ami_history_global_menu_item_project_expand_all, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_EXPAND_FOLDERS, NM_SUB, "Folders", NULL, NULL, + ami_history_global_menu_item_project_expand_folders, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_EXPAND_LINKS, NM_SUB, "Links", NULL, NULL, + ami_history_global_menu_item_project_expand_links, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_COLLAPSE, NM_ITEM, "Collapse", NULL, "TBImages:list_folderfold", NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_COLLAPSE_ALL, NM_SUB, "All", "-", NULL, + ami_history_global_menu_item_project_collapse_all, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_COLLAPSE_FOLDERS, NM_SUB, "Folders", NULL, NULL, + ami_history_global_menu_item_project_collapse_folders, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_COLLAPSE_LINKS, NM_SUB, "Links", NULL, NULL, + ami_history_global_menu_item_project_collapse_links, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_BAR_P2, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_SNAPSHOT, NM_ITEM, "SnapshotWindow", NULL, "TBImages:list_hold", + ami_history_global_menu_item_project_snapshot, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_BAR_P3, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_CLOSE, NM_ITEM, "CloseWindow", "K", "TBImages:list_cancel", + ami_history_global_menu_item_project_close, NULL, 0); + + ami_menu_alloc_item(md, AMI_HISTORY_M_EDIT, NM_TITLE, "Edit", NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_SELECTALL, NM_ITEM, "SelectAllNS", "A", NSA_SPACE, + ami_history_global_menu_item_edit_select_all, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_CLEAR, NM_ITEM, "ClearNS", NULL, NSA_SPACE, + ami_history_global_menu_item_edit_clear, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_BAR_E1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HISTORY_M_DELETE, NM_ITEM, "TreeDelete", "Del", "TBImages:list_delete", + ami_history_global_menu_item_edit_delete, NULL, 0); + + ami_menu_alloc_item(md, AMI_HISTORY_M_LAST, NM_END, NULL, NULL, NULL, NULL, NULL, 0); +} + +static struct Menu * +ami_history_global_menu_create(struct ami_history_global_window *history_win) +{ + ami_history_global_menulabs(history_win->menu_data); + history_win->imenu = ami_menu_layout(history_win->menu_data, AMI_HISTORY_M_LAST); + if(history_win->imenu == NULL) return NULL; + + return history_win->imenu; +} + + +static nserror +ami_history_global_create_window(struct ami_history_global_window *history_win) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)&history_win->core; + ULONG refresh_mode = WA_SmartRefresh; + + if(nsoption_bool(window_simple_refresh) == true) { + refresh_mode = WA_SimpleRefresh; + } + + ami_cw->objects[GID_CW_WIN] = WindowObj, + WA_ScreenTitle, ami_gui_get_screen_title(), + WA_Title, ami_cw->wintitle, + WA_Activate, TRUE, + WA_DepthGadget, TRUE, + WA_DragBar, TRUE, + WA_CloseGadget, TRUE, + WA_SizeGadget, TRUE, + WA_SizeBRight, TRUE, + WA_Top, nsoption_int(history_window_ypos), + WA_Left, nsoption_int(history_window_xpos), + WA_Width, nsoption_int(history_window_xsize), + WA_Height, nsoption_int(history_window_ysize), + WA_PubScreen, scrn, + WA_ReportMouse, TRUE, + refresh_mode, TRUE, + WA_IDCMP, IDCMP_MOUSEMOVE | IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE | + IDCMP_RAWKEY | IDCMP_GADGETUP | IDCMP_IDCMPUPDATE | + IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, + WINDOW_IDCMPHook, &ami_cw->idcmp_hook, + WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE | + IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, + WINDOW_SharedPort, sport, + WINDOW_HorizProp, 1, + WINDOW_VertProp, 1, + WINDOW_UserData, history_win, + WINDOW_MenuStrip, ami_history_global_menu_create(history_win), + WINDOW_MenuUserData, WGUD_HOOK, + WINDOW_IconifyGadget, FALSE, + WINDOW_Position, WPOS_CENTERSCREEN, + WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj, + LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj, + GA_ID, GID_CW_DRAW, + SPACE_Transparent, TRUE, + SPACE_BevelStyle, BVS_DISPLAY, + GA_RelVerify, TRUE, + SpaceEnd, + EndGroup, + EndWindow; + + if(ami_cw->objects[GID_CW_WIN] == NULL) { + return NSERROR_NOMEM; + } + + return NSERROR_OK; +} + +/* exported interface documented in amiga/cookies.h */ +nserror ami_history_global_present(void) +{ + struct ami_history_global_window *ncwin; + nserror res; + + if(history_window != NULL) { + //windowtofront() + return NSERROR_OK; + } + + ncwin = calloc(1, sizeof(struct ami_history_global_window)); + if (ncwin == NULL) { + return NSERROR_NOMEM; + } + + ncwin->core.wintitle = ami_utf8_easy((char *)messages_get("GlobalHistory")); + + res = ami_history_global_create_window(ncwin); + if (res != NSERROR_OK) { + LOG("SSL UI builder init failed"); + ami_utf8_free(ncwin->core.wintitle); + free(ncwin); + return res; + } + + /* initialise Amiga core window */ + ncwin->core.draw = ami_history_global_draw; + ncwin->core.key = ami_history_global_key; + ncwin->core.mouse = ami_history_global_mouse; + ncwin->core.close = ami_history_global_destroy; + ncwin->core.event = NULL; + ncwin->core.drag_end = ami_history_global_drag_end; + ncwin->core.icon_drop = NULL; + + res = ami_corewindow_init(&ncwin->core); + if (res != NSERROR_OK) { + ami_utf8_free(ncwin->core.wintitle); + DisposeObject(ncwin->core.objects[GID_CW_WIN]); + free(ncwin); + return res; + } + + res = global_history_init(ncwin->core.cb_table, (struct core_window *)ncwin); + if (res != NSERROR_OK) { + ami_utf8_free(ncwin->core.wintitle); + DisposeObject(ncwin->core.objects[GID_CW_WIN]); + free(ncwin); + return res; + } + + history_window = ncwin; + + return NSERROR_OK; +} + diff --git a/frontends/amiga/history.h b/frontends/amiga/history.h old mode 100755 new mode 100644 index d20cfe0..67ab670 --- a/frontends/amiga/history.h +++ b/frontends/amiga/history.h @@ -1,5 +1,5 @@ /* - * Copyright 2008,2009 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -16,14 +16,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef AMIGA_HISTORY_H -#define AMIGA_HISTORY_H -#include "desktop/tree.h" +#ifndef AMIGA_HISTORY_GLOBAL_H +#define AMIGA_HISTORY_GLOBAL_H -#define GLOBAL_HISTORY_RECENT_URLS 16 - -void ami_global_history_initialise(void); -void ami_global_history_free(void); - -extern struct treeview_window *global_history_window; +/** Open the global history viewer */ +nserror ami_history_global_present(void); #endif + diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c index c87b563..3d1c6f3 100755 --- a/frontends/amiga/history_local.c +++ b/frontends/amiga/history_local.c @@ -57,9 +57,25 @@ #include "amiga/gui.h" #include "amiga/history_local.h" +struct history_window { + struct ami_generic_window w; + struct Window *win; + Object *objects[GID_LAST]; + struct gui_window *gw; + struct Hook scrollerhook; + struct gui_globals *gg; +}; + static void ami_history_update_extent(struct history_window *hw); HOOKF(void, ami_history_scroller_hook, Object *, object, struct IntuiMessage *); +static BOOL ami_history_event(void *w); + +static const struct ami_win_event_table ami_localhistory_table = { + ami_history_event, + NULL, /* we don't explicitly close the local history window on quit */ +}; + /** * Redraw history window. */ @@ -116,8 +132,8 @@ void ami_history_open(struct gui_window *gw) if(!gw->hw) { - gw->hw = ami_misc_allocvec_clear(sizeof(struct history_window), 0); - gw->hw->gg = ami_misc_allocvec_clear(sizeof(struct gui_globals), 0); + gw->hw = calloc(1, sizeof(struct history_window)); + gw->hw->gg = calloc(1, sizeof(struct gui_globals)); ami_init_layers(gw->hw->gg, scrn->Width, scrn->Height, false); @@ -159,8 +175,7 @@ void ami_history_open(struct gui_window *gw) EndWindow; gw->hw->win = (struct Window *)RA_OpenWindow(gw->hw->objects[OID_MAIN]); - gw->hw->node = AddObject(window_list,AMINS_HISTORYWINDOW); - gw->hw->node->objstruct = gw->hw; + ami_gui_win_list_add(gw->hw, AMINS_HISTORYWINDOW, &ami_localhistory_table); GetAttr(WINDOW_HorizObject,gw->hw->objects[OID_MAIN],(ULONG *)&gw->hw->objects[OID_HSCROLL]); GetAttr(WINDOW_VertObject,gw->hw->objects[OID_MAIN],(ULONG *)&gw->hw->objects[OID_VSCROLL]); @@ -226,15 +241,16 @@ static bool ami_history_click(struct history_window *hw, uint16 code) void ami_history_close(struct history_window *hw) { ami_free_layers(hw->gg); - FreeVec(hw->gg); + free(hw->gg); hw->gw->hw = NULL; DisposeObject(hw->objects[OID_MAIN]); - DelObject(hw->node); + ami_gui_win_list_remove(hw); } -BOOL ami_history_event(struct history_window *hw) +static BOOL ami_history_event(void *w) { /* return TRUE if window destroyed */ + struct history_window *hw = (struct history_window *)w; ULONG result = 0; uint16 code; const char *url; diff --git a/frontends/amiga/history_local.h b/frontends/amiga/history_local.h index 284da34..97aea05 100755 --- a/frontends/amiga/history_local.h +++ b/frontends/amiga/history_local.h @@ -24,15 +24,7 @@ struct gui_window; struct gui_globals; - -struct history_window { - struct nsObject *node; - struct Window *win; - Object *objects[GID_LAST]; - struct gui_window *gw; - struct Hook scrollerhook; - struct gui_globals *gg; -}; +struct history_window; /** * Open history window. @@ -42,7 +34,5 @@ struct history_window { void ami_history_open(struct gui_window *gw); void ami_history_close(struct history_window *hw); -BOOL ami_history_event(struct history_window *hw); - #endif diff --git a/frontends/amiga/hotlist.c b/frontends/amiga/hotlist.c old mode 100755 new mode 100644 index fc2342d..008e45a --- a/frontends/amiga/hotlist.c +++ b/frontends/amiga/hotlist.c @@ -1,5 +1,5 @@ /* - * Copyright 2008, 2009 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2008, 2009, 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -16,16 +16,85 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +/** + * \file + * Implementation of Amiga hotlist viewer using core windows. + */ + +#include <stdint.h> +#include <stdlib.h> +#include <stdbool.h> #include <string.h> -#include <proto/exec.h> -#include "utils/nsurl.h" +#include <proto/asl.h> +#include <proto/dos.h> +#include <proto/intuition.h> + +#include <classes/window.h> +#include <gadgets/layout.h> +#include <gadgets/space.h> + +#include <reaction/reaction_macros.h> + #include "desktop/hotlist.h" -#include "netsurf/mouse.h" -#include "netsurf/window.h" +#include "netsurf/browser_window.h" +#include "netsurf/keypress.h" +#include "netsurf/plotters.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/nsoption.h" +#include "amiga/corewindow.h" +#include "amiga/drag.h" +#include "amiga/file.h" #include "amiga/hotlist.h" -#include "amiga/tree.h" +#include "amiga/libs.h" +#include "amiga/menu.h" +#include "amiga/theme.h" +#include "amiga/utf8.h" + +enum { + /* Project menu */ + AMI_HOTLIST_M_PROJECT = 0, + AMI_HOTLIST_M_EXPORT, + AMI_HOTLIST_M_BAR_P1, + AMI_HOTLIST_M_EXPAND, + AMI_HOTLIST_M_EXPAND_ALL, + AMI_HOTLIST_M_EXPAND_FOLDERS, + AMI_HOTLIST_M_EXPAND_LINKS, + AMI_HOTLIST_M_COLLAPSE, + AMI_HOTLIST_M_COLLAPSE_ALL, + AMI_HOTLIST_M_COLLAPSE_FOLDERS, + AMI_HOTLIST_M_COLLAPSE_LINKS, + AMI_HOTLIST_M_BAR_P2, + AMI_HOTLIST_M_SNAPSHOT, + AMI_HOTLIST_M_BAR_P3, + AMI_HOTLIST_M_CLOSE, + /* Edit menu */ + AMI_HOTLIST_M_EDIT, + AMI_HOTLIST_M_NEWFOLDER, + AMI_HOTLIST_M_NEWLINK, + AMI_HOTLIST_M_EDIT_EDIT, + AMI_HOTLIST_M_BAR_E1, + AMI_HOTLIST_M_SELECTALL, + AMI_HOTLIST_M_CLEAR, + AMI_HOTLIST_M_BAR_E2, + AMI_HOTLIST_M_DELETE, + AMI_HOTLIST_M_LAST +}; + +/** + * Amiga hotlist viewer window context + */ +struct ami_hotlist_window { + /** Amiga core window context */ + struct ami_corewindow core; + + struct ami_menu_data *menu_data[AMI_HOTLIST_M_LAST + 1]; + struct Menu *imenu; /* Intuition menu */ +}; + +static struct ami_hotlist_window *hotlist_window = NULL; struct ami_hotlist_ctx { void *userdata; @@ -37,22 +106,7 @@ struct ami_hotlist_ctx { bool (*cb)(void *userdata, int level, int item, const char *title, nsurl *url, bool folder); }; -struct treeview_window *hotlist_window = NULL; - -void ami_hotlist_initialise(const char *hotlist_file) -{ - tree_hotlist_path = hotlist_file; - hotlist_window = ami_tree_create(TREE_HOTLIST, NULL); - if(!hotlist_window) return; -} - -void ami_hotlist_free(const char *hotlist_file) -{ - ami_tree_destroy(hotlist_window); - hotlist_window = NULL; -} - - +/** hotlist scanner */ static nserror ami_hotlist_folder_enter_cb(void *ctx, const char *title) { struct ami_hotlist_ctx *menu_ctx = (struct ami_hotlist_ctx *)ctx; @@ -118,3 +172,433 @@ nserror ami_hotlist_scan(void *userdata, int first_item, const char *folder, return error; } + + +/** + * callback for mouse action for hotlist viewer on core window + * + * \param ami_cw The Amiga core window structure. + * \param mouse_state netsurf mouse state on event + * \param x location of event + * \param y location of event + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_hotlist_mouse(struct ami_corewindow *ami_cw, + browser_mouse_state mouse_state, + int x, int y) +{ + hotlist_mouse_action(mouse_state, x, y); + + return NSERROR_OK; +} + +/** + * callback for keypress for hotlist viewer on core window + * + * \param ami_cw The Amiga core window structure. + * \param nskey The netsurf key code + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_hotlist_key(struct ami_corewindow *ami_cw, uint32_t nskey) +{ + if (hotlist_keypress(nskey)) { + return NSERROR_OK; + } + return NSERROR_NOT_IMPLEMENTED; +} + +/** + * callback on draw event for hotlist viewer on core window + * + * \param ami_cw The Amiga core window structure. + * \param r The rectangle of the window that needs updating. + * \param ctx The drawing context + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_hotlist_draw(struct ami_corewindow *ami_cw, int x, int y, struct rect *r, struct redraw_context *ctx) +{ + hotlist_redraw(x, y, r, ctx); + + return NSERROR_OK; +} + +/** + * callback for drag end on Amiga core window + * ie. a drag *from* this window has ended + * + * \param ami_cw The Amiga core window structure. + * \param x mouse x co-ordinate + * \param y mouse y co-ordinate + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_hotlist_drag_end(struct ami_corewindow *ami_cw, int x, int y) +{ + nsurl *url = NULL; + const char *title = NULL; + bool ok = false; + struct gui_window_2 *gwin; + struct ami_corewindow *cw; + + if(hotlist_has_selection()) { + ok = hotlist_get_selection(&url, &title); + } + + if((ok == false) || (url == NULL)) { + DisplayBeep(scrn); + } else if(url) { + if((gwin = ami_window_at_pointer(AMINS_WINDOW))) { + browser_window_navigate(gwin->gw->bw, + url, + NULL, + BW_NAVIGATE_HISTORY, + NULL, + NULL, + NULL); + } else if((cw = (struct ami_corewindow *)ami_window_at_pointer(AMINS_COREWINDOW)) && + (ami_cw->icon_drop != NULL)) { + cw->icon_drop(cw, url, title, x, y); + } + } + return NSERROR_OK; +} + +/** + * callback for icon drop on Amiga core window + * ie. a drag has ended *above* this window + * \todo this may not be very flexible but serves our current purposes + * + * \param ami_cw The Amiga core window structure. + * \param url url of dropped icon + * \param title title of dropped icon + * \param x mouse x co-ordinate + * \param y mouse y co-ordinate + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_hotlist_icon_drop(struct ami_corewindow *ami_cw, struct nsurl *url, const char *title, int x, int y) +{ + hotlist_add_entry(url, title, true, y); + return NSERROR_OK; +} + +/** + * menu stuff + */ + +static void +ami_hotlist_menu_free(struct ami_hotlist_window *hotlist_win) +{ + SetAttrs(hotlist_win->core.objects[GID_CW_WIN], + WINDOW_MenuStrip, NULL, + TAG_DONE); + + ami_menu_free_menu(hotlist_win->menu_data, AMI_HOTLIST_M_LAST, hotlist_win->imenu); +} + + /* menu hook functions */ +HOOKF(void, ami_hotlist_menu_item_project_export, APTR, window, struct IntuiMessage *) +{ + char fname[1024]; + struct ami_corewindow *ami_cw; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&ami_cw); + + if(AslRequestTags(savereq, + ASLFR_Window, ami_cw->win, + ASLFR_SleepWindow, TRUE, + ASLFR_TitleText, messages_get("NetSurf"), + ASLFR_Screen, scrn, + ASLFR_InitialFile, "hotlist.html", + TAG_DONE)) { + strlcpy(fname, savereq->fr_Drawer, 1024); + AddPart(fname, savereq->fr_File, 1024); + ami_update_pointer(ami_cw->win, GUI_POINTER_WAIT); + hotlist_export(fname, NULL); + ami_update_pointer(ami_cw->win, GUI_POINTER_DEFAULT); + } +} + +HOOKF(void, ami_hotlist_menu_item_project_expand_all, APTR, window, struct IntuiMessage *) +{ + hotlist_expand(false); +} + +HOOKF(void, ami_hotlist_menu_item_project_expand_folders, APTR, window, struct IntuiMessage *) +{ + hotlist_expand(true); +} + +HOOKF(void, ami_hotlist_menu_item_project_expand_links, APTR, window, struct IntuiMessage *) +{ + hotlist_expand(false); +} + +HOOKF(void, ami_hotlist_menu_item_project_collapse_all, APTR, window, struct IntuiMessage *) +{ + hotlist_contract(true); +} + +HOOKF(void, ami_hotlist_menu_item_project_collapse_folders, APTR, window, struct IntuiMessage *) +{ + hotlist_contract(true); +} + +HOOKF(void, ami_hotlist_menu_item_project_collapse_links, APTR, window, struct IntuiMessage *) +{ + hotlist_contract(false); +} + +HOOKF(void, ami_hotlist_menu_item_project_snapshot, APTR, window, struct IntuiMessage *) +{ + struct ami_corewindow *ami_cw; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&ami_cw); + + nsoption_set_int(hotlist_window_ypos, ami_cw->win->TopEdge); + nsoption_set_int(hotlist_window_xpos, ami_cw->win->LeftEdge); + nsoption_set_int(hotlist_window_xsize, ami_cw->win->Width); + nsoption_set_int(hotlist_window_ysize, ami_cw->win->Height); +} + +HOOKF(void, ami_hotlist_menu_item_project_close, APTR, window, struct IntuiMessage *) +{ + struct ami_corewindow *ami_cw; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&ami_cw); + + ami_cw->close_window = true; +} + +HOOKF(void, ami_hotlist_menu_item_edit_newfolder, APTR, window, struct IntuiMessage *) +{ + hotlist_add_folder(NULL, false, 0); +} + +HOOKF(void, ami_hotlist_menu_item_edit_newlink, APTR, window, struct IntuiMessage *) +{ + hotlist_add_entry(NULL, NULL, false, 0); +} + +HOOKF(void, ami_hotlist_menu_item_edit_edit, APTR, window, struct IntuiMessage *) +{ + hotlist_edit_selection(); +} + +HOOKF(void, ami_hotlist_menu_item_edit_select_all, APTR, window, struct IntuiMessage *) +{ + hotlist_keypress(NS_KEY_SELECT_ALL); +} + +HOOKF(void, ami_hotlist_menu_item_edit_clear, APTR, window, struct IntuiMessage *) +{ + hotlist_keypress(NS_KEY_CLEAR_SELECTION); +} + +HOOKF(void, ami_hotlist_menu_item_edit_delete, APTR, window, struct IntuiMessage *) +{ + hotlist_keypress(NS_KEY_DELETE_LEFT); +} + + +/* menu setup */ + +static void ami_hotlist_menulabs(struct ami_menu_data **md) +{ + ami_menu_alloc_item(md, AMI_HOTLIST_M_PROJECT, NM_TITLE, "Tree", NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPORT, NM_ITEM, "TreeExport", "S", "TBImages:list_save", + ami_hotlist_menu_item_project_export, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_P1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND, NM_ITEM, "Expand", NULL, "TBImages:list_folderunfold", NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND_ALL, NM_SUB, "All", "+", NULL, + ami_hotlist_menu_item_project_expand_all, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND_FOLDERS, NM_SUB, "Folders", NULL, NULL, + ami_hotlist_menu_item_project_expand_folders, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_EXPAND_LINKS, NM_SUB, "Links", NULL, NULL, + ami_hotlist_menu_item_project_expand_links, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE, NM_ITEM, "Collapse", NULL, "TBImages:list_folderfold", NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE_ALL, NM_SUB, "All", "-", NULL, + ami_hotlist_menu_item_project_collapse_all, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE_FOLDERS, NM_SUB, "Folders", NULL, NULL, + ami_hotlist_menu_item_project_collapse_folders, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_COLLAPSE_LINKS, NM_SUB, "Links", NULL, NULL, + ami_hotlist_menu_item_project_collapse_links, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_P2, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_SNAPSHOT, NM_ITEM, "SnapshotWindow", NULL, "TBImages:list_hold", + ami_hotlist_menu_item_project_snapshot, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_P3, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_CLOSE, NM_ITEM, "CloseWindow", "K", "TBImages:list_cancel", + ami_hotlist_menu_item_project_close, NULL, 0); + + ami_menu_alloc_item(md, AMI_HOTLIST_M_EDIT, NM_TITLE, "Edit", NULL, NULL, NULL, NULL, 0); + + ami_menu_alloc_item(md, AMI_HOTLIST_M_NEWFOLDER, NM_ITEM, "TreeNewFolder", "N", "TBImages:list_drawer", + ami_hotlist_menu_item_edit_newfolder, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_NEWLINK, NM_ITEM, "TreeNewLink", NULL, "TBImages:list_favouriteadd", + ami_hotlist_menu_item_edit_newlink, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_EDIT_EDIT, NM_ITEM, "TreeEdit", "E", "TBImages:list_edit", + ami_hotlist_menu_item_edit_edit, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_E1, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_SELECTALL, NM_ITEM, "SelectAllNS", "A", NSA_SPACE, + ami_hotlist_menu_item_edit_select_all, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_CLEAR, NM_ITEM, "ClearNS", NULL, NSA_SPACE, + ami_hotlist_menu_item_edit_clear, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_BAR_E2, NM_ITEM, NM_BARLABEL, NULL, NULL, NULL, NULL, 0); + ami_menu_alloc_item(md, AMI_HOTLIST_M_DELETE, NM_ITEM, "TreeDelete", "Del", "TBImages:list_delete", + ami_hotlist_menu_item_edit_delete, NULL, 0); + + ami_menu_alloc_item(md, AMI_HOTLIST_M_LAST, NM_END, NULL, NULL, NULL, NULL, NULL, 0); +} + +static struct Menu * +ami_hotlist_menu_create(struct ami_hotlist_window *hotlist_win) +{ + ami_hotlist_menulabs(hotlist_win->menu_data); + hotlist_win->imenu = ami_menu_layout(hotlist_win->menu_data, AMI_HOTLIST_M_LAST); + if(hotlist_win->imenu == NULL) return NULL; + + return hotlist_win->imenu; +} + + +static nserror +ami_hotlist_create_window(struct ami_hotlist_window *hotlist_win) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)&hotlist_win->core; + ULONG refresh_mode = WA_SmartRefresh; + + if(nsoption_bool(window_simple_refresh) == true) { + refresh_mode = WA_SimpleRefresh; + } + + ami_cw->objects[GID_CW_WIN] = WindowObj, + WA_ScreenTitle, ami_gui_get_screen_title(), + WA_Title, ami_cw->wintitle, + WA_Activate, TRUE, + WA_DepthGadget, TRUE, + WA_DragBar, TRUE, + WA_CloseGadget, TRUE, + WA_SizeGadget, TRUE, + WA_SizeBRight, TRUE, + WA_Top, nsoption_int(hotlist_window_ypos), + WA_Left, nsoption_int(hotlist_window_xpos), + WA_Width, nsoption_int(hotlist_window_xsize), + WA_Height, nsoption_int(hotlist_window_ysize), + WA_PubScreen, scrn, + WA_ReportMouse, TRUE, + refresh_mode, TRUE, + WA_IDCMP, IDCMP_MOUSEMOVE | IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE | + IDCMP_RAWKEY | IDCMP_GADGETUP | IDCMP_IDCMPUPDATE | + IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, + WINDOW_IDCMPHook, &ami_cw->idcmp_hook, + WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE | + IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, + WINDOW_SharedPort, sport, + WINDOW_HorizProp, 1, + WINDOW_VertProp, 1, + WINDOW_UserData, hotlist_win, + WINDOW_MenuStrip, ami_hotlist_menu_create(hotlist_win), + WINDOW_MenuUserData, WGUD_HOOK, + WINDOW_IconifyGadget, FALSE, + WINDOW_Position, WPOS_CENTERSCREEN, + WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj, + LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj, + GA_ID, GID_CW_DRAW, + SPACE_Transparent, TRUE, + SPACE_BevelStyle, BVS_DISPLAY, + GA_RelVerify, TRUE, + SpaceEnd, + EndGroup, + EndWindow; + + if(ami_cw->objects[GID_CW_WIN] == NULL) { + return NSERROR_NOMEM; + } + + return NSERROR_OK; +} + +/** + * destroy a previously created hotlist view + */ +static void +ami_hotlist_destroy(struct ami_corewindow *ami_cw) +{ + nserror res; + + if(hotlist_window == NULL) + return; + + res = hotlist_manager_fini(); + if (res == NSERROR_OK) { + ami_hotlist_menu_free(hotlist_window); + res = ami_corewindow_fini(&hotlist_window->core); /* closes the window for us, frees hotlist_win */ + hotlist_window = NULL; + } + + ami_gui_hotlist_update_all(); +} + + +/* exported interface documented in amiga/hotlist.h */ +nserror ami_hotlist_present(void) +{ + struct ami_hotlist_window *ncwin; + nserror res; + + if(hotlist_window != NULL) { + //windowtofront() + return NSERROR_OK; + } + + ncwin = calloc(1, sizeof(struct ami_hotlist_window)); + if (ncwin == NULL) { + return NSERROR_NOMEM; + } + + ncwin->core.wintitle = ami_utf8_easy((char *)messages_get("Hotlist")); + + res = ami_hotlist_create_window(ncwin); + if (res != NSERROR_OK) { + LOG("SSL UI builder init failed"); + ami_utf8_free(ncwin->core.wintitle); + free(ncwin); + return res; + } + + /* initialise Amiga core window */ + ncwin->core.draw = ami_hotlist_draw; + ncwin->core.key = ami_hotlist_key; + ncwin->core.mouse = ami_hotlist_mouse; + ncwin->core.close = ami_hotlist_destroy; + ncwin->core.event = NULL; + ncwin->core.drag_end = ami_hotlist_drag_end; + ncwin->core.icon_drop = ami_hotlist_icon_drop; + + res = ami_corewindow_init(&ncwin->core); + if (res != NSERROR_OK) { + ami_utf8_free(ncwin->core.wintitle); + DisposeObject(ncwin->core.objects[GID_CW_WIN]); + free(ncwin); + return res; + } + + res = hotlist_manager_init(ncwin->core.cb_table, (struct core_window *)ncwin); + if (res != NSERROR_OK) { + ami_utf8_free(ncwin->core.wintitle); + DisposeObject(ncwin->core.objects[GID_CW_WIN]); + free(ncwin); + return res; + } + + hotlist_window = ncwin; + + return NSERROR_OK; +} + +/* exported interface documented in amiga/hotlist.h */ +void ami_hotlist_close(void) +{ + ami_hotlist_destroy((struct ami_corewindow *)hotlist_window); +} + diff --git a/frontends/amiga/hotlist.h b/frontends/amiga/hotlist.h old mode 100755 new mode 100644 index 113a2d1..588a72d --- a/frontends/amiga/hotlist.h +++ b/frontends/amiga/hotlist.h @@ -1,5 +1,5 @@ /* - * Copyright 2008, 2009 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -19,16 +19,18 @@ #ifndef AMIGA_HOTLIST_H #define AMIGA_HOTLIST_H -struct nsurl; -struct treeview_window; +#include "utils/nsurl.h" -extern struct treeview_window *hotlist_window; - -void ami_hotlist_initialise(const char *hotlist_file); - -void ami_hotlist_free(const char *hotlist_file); - -nserror ami_hotlist_scan(void *userdata, int first_item, const char *folder, bool (*cb_add_item)(void *userdata, int level, int item, const char *title, struct nsurl *url, bool folder)); +/** Open the hotlist viewer */ +nserror ami_hotlist_present(void); +/** Close the hotlist viewer + * normally this shouldn't be used; only exists for ARexx use + */ +void ami_hotlist_close(void); +/** Scan the hotlist */ +nserror ami_hotlist_scan(void *userdata, int first_item, const char *folder, + bool (*cb_add_item)(void *userdata, int level, int item, const char *title, nsurl *url, bool folder)); #endif + diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c index 7b73360..3f597a1 100644 --- a/frontends/amiga/icon.c +++ b/frontends/amiga/icon.c @@ -49,7 +49,6 @@ #include "amiga/os3support.h" #include "amiga/bitmap.h" #include "amiga/icon.h" -#include "amiga/misc.h" #define THUMBNAIL_WIDTH 100 /* Icon sizes for thumbnails, usually the same as */ #define THUMBNAIL_HEIGHT 86 /* WIDTH/HEIGHT in desktop/thumbnail.c */ @@ -239,7 +238,7 @@ bool amiga_icon_convert(struct content *c) if(dobj) FreeDiskObject(dobj); if(format==IDFMT_PALETTEMAPPED) - FreeVec(imagebufptr); + free(imagebufptr); return true; } @@ -326,7 +325,7 @@ static ULONG *amiga_icon_convertcolouricon32(UBYTE *icondata, ULONG width, ULONG if (alpha==0) alpha=0xff; - argbicon = (ULONG *)AllocVecTagList(width*height*4, NULL); + argbicon = (ULONG *)malloc(width * height * 4); if (!argbicon) return(NULL); cmap=GetColorMap(pals1); @@ -485,8 +484,8 @@ void amiga_icon_superimpose_favicon(char *path, struct hlcache_handle *icon, cha if(format == IDFMT_PALETTEMAPPED) { /* Free the 32-bit data we created */ - FreeVec(icondata1); - FreeVec(icondata2); + free(icondata1); + free(icondata2); } } @@ -501,7 +500,7 @@ struct DiskObject *amiga_icon_from_bitmap(struct bitmap *bm) { bitmap = ami_bitmap_get_native(bm, THUMBNAIL_WIDTH, THUMBNAIL_HEIGHT, NULL); - icondata = AllocVecTagList(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT, NULL); + icondata = malloc(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT); ami_bitmap_set_icondata(bm, icondata); if(bitmap) { @@ -543,6 +542,6 @@ void amiga_icon_free(struct DiskObject *dobj) struct bitmap *bm = dobj->do_Gadget.UserData; FreeDiskObject(dobj); - if(bm) FreeVec(ami_bitmap_get_icondata(bm)); + if(bm) ami_bitmap_free_icondata(bm); } diff --git a/frontends/amiga/iff_dr2d.c b/frontends/amiga/iff_dr2d.c index aea7738..a4c5855 100644 --- a/frontends/amiga/iff_dr2d.c +++ b/frontends/amiga/iff_dr2d.c @@ -19,22 +19,21 @@ #ifdef WITH_NS_SVG #include <stdio.h> -#include <inttypes.h> +#include <stdlib.h> #include <svgtiny.h> #include <proto/exec.h> #include <string.h> #include <proto/dos.h> +#include "netsurf/inttypes.h" #ifndef AMIGA_DR2D_STANDALONE #include "utils/nsurl.h" #include "netsurf/content.h" #include "amiga/os3support.h" #include "amiga/iff_dr2d.h" -#include "amiga/misc.h" #else #include "os3support.h" #include "iff_dr2d.h" -#include "misc.h" #endif static struct ColorRegister cm[1000]; @@ -171,7 +170,7 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char *buffer, } for (unsigned int i = 0; i != diagram->shape_count; i++) { - attr = ami_misc_allocvec_clear(sizeof(struct attr_struct), 0); + attr = calloc(1, sizeof(struct attr_struct)); if (diagram->shape[i].fill == svgtiny_TRANSPARENT) attr->FillType = FT_NONE; else @@ -193,7 +192,7 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char *buffer, WriteChunkBytes(iffh,attr,14); PopChunk(iffh); } - FreeVec(attr); + free(attr); if (diagram->shape[i].path) { union { @@ -272,30 +271,30 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char *buffer, PopChunk(iffh); } } else if (diagram->shape[i].text) { - stxt = ami_misc_allocvec_clear(sizeof(struct stxt_struct), 0); + stxt = calloc(1, sizeof(struct stxt_struct)); stxt->BaseX = diagram->shape[i].text_x; stxt->BaseY = diagram->shape[i].text_y; stxt->NumChars = strlen(diagram->shape[i].text); if(!fons_written) { - fons = ami_misc_allocvec_clear(sizeof(struct fons_struct), 0); - if(!(PushChunk(iffh,0,ID_FONS,IFFSIZE_UNKNOWN))) + fons = calloc(1, sizeof(struct fons_struct)); + if(!(PushChunk(iffh, 0, ID_FONS, IFFSIZE_UNKNOWN))) { WriteChunkBytes(iffh, fons, sizeof(struct fons_struct)); WriteChunkBytes(iffh, "Topaz\0", 6); PopChunk(iffh); } - FreeVec(fons); + free(fons); fons_written = TRUE; } - if(!(PushChunk(iffh,0,ID_STXT,IFFSIZE_UNKNOWN))) + if(!(PushChunk(iffh, 0, ID_STXT, IFFSIZE_UNKNOWN))) { - WriteChunkBytes(iffh,stxt,26); - WriteChunkBytes(iffh,diagram->shape[i].text,strlen(diagram->shape[i].text)); + WriteChunkBytes(iffh, stxt, 26); + WriteChunkBytes(iffh, diagram->shape[i].text, strlen(diagram->shape[i].text)); PopChunk(iffh); } - FreeVec(stxt); + free(stxt); } } @@ -380,7 +379,7 @@ int main(int argc, char **argv) { size = GetFileSize(fh); - buffer = AllocVecTagList((uint32_t)size, NULL); + buffer = malloc((uint32_t)size); Read(fh,buffer,(uint32_t)size); Close(fh); @@ -404,7 +403,7 @@ int main(int argc, char **argv) ami_svg_to_dr2d(iffh,buffer,size,(char *)rarray[A_SVG]); - FreeVec(buffer); + free(buffer); if(iffh) CloseIFF(iffh); if(iffh->iff_Stream) Close((BPTR)iffh->iff_Stream); if(iffh) FreeIFF(iffh); diff --git a/frontends/amiga/launch.c b/frontends/amiga/launch.c index 8020dd6..10c32ae 100755 --- a/frontends/amiga/launch.c +++ b/frontends/amiga/launch.c @@ -50,10 +50,10 @@ static struct ami_protocol *ami_openurl_add_protocol(const char *url) { nsurl *ns_url; struct ami_protocol *ami_p = - (struct ami_protocol *)AllocVecTagList(sizeof(struct ami_protocol), NULL); + (struct ami_protocol *)malloc(sizeof(struct ami_protocol)); if (nsurl_create(url, &ns_url) != NSERROR_OK) { - FreeVec(ami_p); + free(ami_p); return NULL; } @@ -61,7 +61,7 @@ static struct ami_protocol *ami_openurl_add_protocol(const char *url) nsurl_unref(ns_url); if (ami_p->protocol == NULL) { - FreeVec(ami_p); + free(ami_p); return NULL; } @@ -74,20 +74,20 @@ static void ami_openurl_free_list(struct MinList *list) struct ami_protocol *node; struct ami_protocol *nnode; - if(IsMinListEmpty(list)) return; - node = (struct ami_protocol *)GetHead((struct List *)list); - - do - { - nnode=(struct ami_protocol *)GetSucc((struct Node *)node); + if(IsMinListEmpty(list) == NULL) { + node = (struct ami_protocol *)GetHead((struct List *)list); - Remove((struct Node *)node); - if (node->protocol) lwc_string_unref(node->protocol); - FreeVec(node); - node = NULL; - }while((node=nnode)); + do + { + nnode=(struct ami_protocol *)GetSucc((struct Node *)node); - FreeVec(list); + Remove((struct Node *)node); + if (node->protocol) lwc_string_unref(node->protocol); + free(node); + node = NULL; + }while((node=nnode)); + } + free(list); } static BOOL ami_openurl_check_list(struct MinList *list, nsurl *url) diff --git a/frontends/amiga/login.c b/frontends/amiga/login.c index 3b338bf..85324b0 100755 --- a/frontends/amiga/login.c +++ b/frontends/amiga/login.c @@ -46,12 +46,11 @@ #include "amiga/gui.h" #include "amiga/libs.h" -#include "amiga/misc.h" #include "amiga/object.h" #include "amiga/login.h" struct gui_login_window { - struct nsObject *node; + struct ami_generic_window w; struct Window *win; Object *objects[GID_LAST]; nserror (*cb)(bool proceed, void *pw); @@ -63,11 +62,19 @@ struct gui_login_window { char pwd[256]; }; +static BOOL ami_401login_event(void *w); + +static const struct ami_win_event_table ami_login_table = { + ami_401login_event, + NULL, /* we don't explicitly close the login window at all. + @todo check if this prevents us from quitting NetSurf */ +}; + void gui_401login_open(nsurl *url, const char *realm, nserror (*cb)(bool proceed, void *pw), void *cbpw) { const char *auth; - struct gui_login_window *lw = ami_misc_allocvec_clear(sizeof(struct gui_login_window), 0); + struct gui_login_window *lw = calloc(1, sizeof(struct gui_login_window)); lwc_string *host = nsurl_get_component(url, NSURL_HOST); assert(host != NULL); @@ -169,9 +176,7 @@ void gui_401login_open(nsurl *url, const char *realm, EndWindow; lw->win = (struct Window *)RA_OpenWindow(lw->objects[OID_MAIN]); - - lw->node = AddObject(window_list,AMINS_LOGINWINDOW); - lw->node->objstruct = lw; + ami_gui_win_list_add(lw, AMINS_LOGINWINDOW, &ami_login_table); } static void ami_401login_close(struct gui_login_window *lw) @@ -183,7 +188,7 @@ static void ami_401login_close(struct gui_login_window *lw) DisposeObject(lw->objects[OID_MAIN]); lwc_string_unref(lw->host); nsurl_unref(lw->url); - DelObject(lw->node); + ami_gui_win_list_remove(lw); } static void ami_401login_login(struct gui_login_window *lw) @@ -207,9 +212,10 @@ static void ami_401login_login(struct gui_login_window *lw) ami_401login_close(lw); } -BOOL ami_401login_event(struct gui_login_window *lw) +static BOOL ami_401login_event(void *w) { /* return TRUE if window destroyed */ + struct gui_login_window *lw = (struct gui_login_window *)w; ULONG result; uint16 code; diff --git a/frontends/amiga/login.h b/frontends/amiga/login.h index e3f7790..058fa59 100755 --- a/frontends/amiga/login.h +++ b/frontends/amiga/login.h @@ -23,9 +23,7 @@ struct gui_login_window; -BOOL ami_401login_event(struct gui_login_window *lw); - void gui_401login_open(nsurl *url, const char *realm, nserror (*cb)(bool proceed, void *pw), void *cbpw); - #endif + diff --git a/frontends/amiga/memory.c b/frontends/amiga/memory.c new file mode 100755 index 0000000..d371d25 --- /dev/null +++ b/frontends/amiga/memory.c @@ -0,0 +1,169 @@ +/* + * Copyright 2016 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * + * 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 __amigaos4__ +#include <proto/dos.h> +#include <proto/exec.h> +#include <exec/interrupts.h> +#include <stdlib.h> +#include "amiga/memory.h" +#include "amiga/os3support.h" +#include "amiga/schedule.h" +#include "content/llcache.h" +#include "utils/log.h" + +ULONG __slab_max_size = 2048; /* Enable clib2's slab allocator */ + +enum { + PURGE_NONE = 0, + PURGE_STEP1, + PURGE_STEP2, + PURGE_DONE_STEP1, + PURGE_DONE_STEP2 +}; +static int low_mem_status = PURGE_NONE; + +/* Special clear (ie. non-zero) */ +void *ami_memory_clear_alloc(size_t size, UBYTE value) +{ + void *mem = malloc(size); + if (mem) memset(mem, value, size); + return mem; +} + +/* clib2 slab allocator stats */ +static int ami_memory_slab_usage_cb(const struct __slab_usage_information * sui) +{ + if(sui->sui_slab_index <= 1) { + LOG("clib2 slab usage:"); + LOG(" The size of all slabs, in bytes: %ld", sui->sui_slab_size); + LOG(" Number of allocations which are not managed by slabs: %ld", + sui->sui_num_single_allocations); + LOG(" Total number of bytes allocated for memory not managed by slabs: %ld", + sui->sui_total_single_allocation_size); + LOG(" Number of slabs currently in play: %ld", sui->sui_num_slabs); + LOG(" Number of currently unused slabs: %ld", sui->sui_num_empty_slabs); + LOG(" Number of slabs in use which are completely filled with data: %ld", + sui->sui_num_full_slabs); + LOG(" Total number of bytes allocated for all slabs: %ld", + sui->sui_total_slab_allocation_size); + } + LOG("Slab %d", sui->sui_slab_index); + LOG(" Memory chunk size managed by this slab: %ld", sui->sui_chunk_size); + LOG(" Number of memory chunks that fit in this slab: %ld", sui->sui_num_chunks); + LOG(" Number of memory chunks used in this slab: %ld", sui->sui_num_chunks_used); + + return 0; +} + +static int ami_memory_slab_alloc_cb(const struct __slab_allocation_information *sai) +{ + if(sai->sai_allocation_index <= 1) { + LOG("clib2 allocation usage:"); + LOG(" Number of allocations which are not managed by slabs: %ld", + sai->sai_num_single_allocations); + LOG(" Total number of bytes allocated for memory not managed by slabs: %ld", + sai->sai_total_single_allocation_size); + } + LOG("Alloc %d", sai->sai_allocation_index); + LOG(" Size of this allocation, as requested: %ld", sai->sai_allocation_size); + LOG(" Total size of this allocation, including management data: %ld", + sai->sai_total_allocation_size); + + return 0; +} + +static int ami_memory_slab_stats_cb(void *user_data, const char *line, size_t line_length) +{ + BPTR fh = (BPTR)user_data; + long err = FPuts(fh, line); + + if(err != 0) { + return -1; + } else { + return 0; + } +} + +void ami_memory_slab_dump(BPTR fh) +{ + __get_slab_usage(ami_memory_slab_usage_cb); + __get_slab_allocations(ami_memory_slab_alloc_cb); + __get_slab_stats(fh, ami_memory_slab_stats_cb); +} + +/* Low memory handler */ +static void ami_memory_low_mem_handler(void *p) +{ + if(low_mem_status == PURGE_STEP1) { + LOG("Purging llcache"); + llcache_clean(true); + low_mem_status = PURGE_DONE_STEP1; + } + + if(low_mem_status == PURGE_STEP2) { + LOG("Purging unused slabs"); + __free_unused_slabs(); + low_mem_status = PURGE_DONE_STEP2; + } +} + +static ASM ULONG ami_memory_handler(REG(a0, struct MemHandlerData *mhd), REG(a1, void *userdata), REG(a6, struct ExecBase *execbase)) +{ + if(low_mem_status == PURGE_DONE_STEP2) { + low_mem_status = PURGE_NONE; + return MEM_ALL_DONE; + } + + if(low_mem_status == PURGE_DONE_STEP1) { + low_mem_status = PURGE_STEP2; + } + + if(low_mem_status == PURGE_NONE) { + low_mem_status = PURGE_STEP1; + } + + ami_schedule(1, ami_memory_low_mem_handler, NULL); + + return MEM_TRY_AGAIN; +} + +struct Interrupt *ami_memory_init(void) +{ + struct Interrupt *memhandler = malloc(sizeof(struct Interrupt)); + if(memhandler == NULL) return NULL; // we're screwed + + memhandler->is_Node.ln_Pri = -127; // low down as will be slow + memhandler->is_Node.ln_Name = "NetSurf low memory handler"; + memhandler->is_Data = NULL; + memhandler->is_Code = (APTR)&ami_memory_handler; + AddMemHandler(memhandler); + + return memhandler; +} + +void ami_memory_fini(struct Interrupt *memhandler) +{ + if(memhandler != NULL) { + RemMemHandler(memhandler); + free(memhandler); + } +} + +#endif + diff --git a/frontends/amiga/memory.h b/frontends/amiga/memory.h new file mode 100644 index 0000000..a9a882e --- /dev/null +++ b/frontends/amiga/memory.h @@ -0,0 +1,68 @@ +/* + * Copyright 2016 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * + * 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 AMIGA_MEMORY_H +#define AMIGA_MEMORY_H + +#include <exec/types.h> + +/* Alloc/free chip memory */ +#ifdef __amigaos4__ +#define ami_memory_chip_alloc(s) malloc(s) +#define ami_memory_chip_free(p) free(p) +#else +#define ami_memory_chip_alloc(s) AllocVec(s, MEMF_CHIP) +#define ami_memory_chip_free(p) FreeVec(p) +#endif + +/* Alloc/free a block cleared to non-zero */ +#ifdef __amigaos4__ +#define ami_memory_clear_alloc(s,v) AllocVecTags(s, AVT_ClearWithValue, v, TAG_DONE) +#define ami_memory_clear_free(p) FreeVec(p) +#else +void *ami_memory_clear_alloc(size_t size, UBYTE value); +#define ami_memory_clear_free(p) free(p) +#endif + +/* Itempool cross-compatibility */ +#ifdef __amigaos4__ +#define ami_memory_itempool_create(s) AllocSysObjectTags(ASOT_ITEMPOOL, \ + ASOITEM_MFlags, MEMF_PRIVATE, \ + ASOITEM_ItemSize, s, \ + ASOITEM_GCPolicy, ITEMGC_AFTERCOUNT, \ + ASOITEM_GCParameter, 100, \ + TAG_DONE) +#define ami_memory_itempool_delete(p) FreeSysObject(ASOT_ITEMPOOL, p) +#define ami_memory_itempool_alloc(p,s) ItemPoolAlloc(p) +#define ami_memory_itempool_free(p,i,s) ItemPoolFree(p,i) +#else +#define ami_memory_itempool_create(s) ((APTR)1) +#define ami_memory_itempool_delete(p) ((void)0) +#define ami_memory_itempool_alloc(p,s) malloc(s) +#define ami_memory_itempool_free(p,i,s) free(i) +#endif + +/* clib2 slab allocator */ +#ifndef __amigaos4__ +void ami_memory_slab_dump(BPTR fh); +struct Interrupt *ami_memory_init(void); +void ami_memory_fini(struct Interrupt *memhandler); +#endif + +#endif //AMIGA_MEMORY_H + diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c index 0fd730e..249ca07 100644 --- a/frontends/amiga/menu.c +++ b/frontends/amiga/menu.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-9,2013 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2008-9, 2013, 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -21,18 +21,14 @@ #include <string.h> #include <stdlib.h> -#include <proto/dos.h> -#include <proto/asl.h> -#include <proto/exec.h> #include <proto/gadtools.h> +#include <proto/graphics.h> #include <proto/intuition.h> -#include <proto/utility.h> -#ifdef __amigaos4__ -#include <dos/anchorpath.h> -#include <dos/obsolete.h> /* Needed for ExAll() */ -#endif #include <libraries/gadtools.h> +#ifdef __amigaos4__ +#include <intuition/menuclass.h> +#endif #include <classes/window.h> #include <proto/label.h> @@ -42,43 +38,13 @@ #include <reaction/reaction_macros.h> -#include "utils/nsoption.h" -#include "utils/messages.h" #include "utils/log.h" -#include "utils/utils.h" -#include "utils/nsurl.h" -#include "netsurf/browser_window.h" -#include "netsurf/mouse.h" -#include "netsurf/window.h" -#include "netsurf/content.h" -#include "netsurf/keypress.h" -#include "desktop/hotlist.h" -#include "desktop/version.h" - -#include "amiga/arexx.h" -#include "amiga/bitmap.h" -#include "amiga/clipboard.h" -#include "amiga/cookies.h" -#include "amiga/file.h" -#include "amiga/filetype.h" +#include "utils/messages.h" + #include "amiga/gui.h" -#include "amiga/gui_options.h" -#include "amiga/history.h" -#include "amiga/history_local.h" -#include "amiga/hotlist.h" #include "amiga/libs.h" #include "amiga/menu.h" -#include "amiga/misc.h" -#include "amiga/nsoption.h" -#include "amiga/print.h" -#include "amiga/search.h" -#include "amiga/theme.h" -#include "amiga/tree.h" #include "amiga/utf8.h" -#include "amiga/schedule.h" - -#define NSA_SPACE "blankspace.png" -#define NSA_MAX_HOTLIST_MENU_LEN 100 enum { NSA_GLYPH_SUBMENU, @@ -88,670 +54,106 @@ enum { NSA_GLYPH_MAX }; -static bool menu_quit = false; -static bool ami_menu_check_toggled = false; +#define NSA_MAX_HOTLIST_MENU_LEN 100 + static Object *restrict menu_glyph[NSA_GLYPH_MAX]; static int menu_glyph_width[NSA_GLYPH_MAX]; static bool menu_glyphs_loaded = false; -const char * const netsurf_version; -const char * const verdate; - -static nserror ami_menu_scan(struct tree *tree, struct gui_window_2 *gwin); -void ami_menu_arexx_scan(struct gui_window_2 *gwin); - -void ami_menu_set_check_toggled(void) -{ - ami_menu_check_toggled = true; -} - -bool ami_menu_get_check_toggled(void) -{ - bool check_toggled = ami_menu_check_toggled; - ami_menu_check_toggled = false; - return check_toggled; -} - -bool ami_menu_quit_selected(void) -{ - return menu_quit; -} - -/* - * The below functions are called automatically by window.class when menu items are selected. - */ - -HOOKF(void, ami_menu_item_project_newwin, APTR, window, struct IntuiMessage *) -{ - nsurl *url; - nserror error; - - error = nsurl_create(nsoption_charp(homepage_url), &url); - if (error == NSERROR_OK) { - error = browser_window_create(BW_CREATE_HISTORY, - url, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - if (error != NSERROR_OK) { - amiga_warn_user(messages_get_errorcode(error), 0); - } -} - -HOOKF(void, ami_menu_item_project_newtab, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - ami_gui_new_blank_tab(gwin); -} - -HOOKF(void, ami_menu_item_project_open, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_file_open(gwin); -} - -HOOKF(void, ami_menu_item_project_save, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - ULONG type = (ULONG)hook->h_Data; - - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_file_save_req(type, gwin, browser_window_get_content(gwin->gw->bw)); -} - -HOOKF(void, ami_menu_item_project_closetab, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_destroy(gwin->gw->bw); -} - -HOOKF(void, ami_menu_item_project_closewin, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - gwin->closed = true; -} - -HOOKF(void, ami_menu_item_project_print, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_set_pointer(gwin, GUI_POINTER_WAIT, false); - ami_print_ui(browser_window_get_content(gwin->gw->bw)); - ami_reset_pointer(gwin); -} - -HOOKF(void, ami_menu_item_project_about, APTR, window, struct IntuiMessage *) +bool ami_menu_get_selected(struct Menu *menu, struct IntuiMessage *msg) { - struct gui_window_2 *gwin; - char *temp, *temp2; - int sel; - nsurl *url = NULL; - nserror error = NSERROR_OK; - - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_set_pointer(gwin, GUI_POINTER_WAIT, false); - - temp = ASPrintf("%s|%s|%s", messages_get("OK"), - messages_get("HelpCredits"), - messages_get("HelpLicence")); + bool checked = false; - temp2 = ami_utf8_easy(temp); - FreeVec(temp); + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { #ifdef __amigaos4__ - sel = TimedDosRequesterTags(TDR_ImageType,TDRIMAGE_INFO, - TDR_TitleString, messages_get("NetSurf"), - TDR_Window, gwin->win, - TDR_GadgetString, temp2, - TDR_FormatString,"NetSurf %s\nBuild date %s\n\nhttp://www.netsurf-browser.org", - TDR_Arg1,netsurf_version, - TDR_Arg2,verdate, - TAG_DONE); -#else - struct EasyStruct about_req = { - sizeof(struct EasyStruct), - 0, - "NetSurf", - "NetSurf %s\nBuild date %s\n\nhttp://www.netsurf-browser.org", - temp2, - }; - - sel = EasyRequest(gwin->win, &about_req, NULL, netsurf_version, verdate); -#endif - free(temp2); - - if(sel == 2) { - error = nsurl_create("about:credits", &url); - } else if(sel == 0) { - error = nsurl_create("about:licence", &url); - } - - if(url) { - if (error == NSERROR_OK) { - error = browser_window_create(BW_CREATE_HISTORY, - url, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - if (error != NSERROR_OK) { - amiga_warn_user(messages_get_errorcode(error), 0); - } - } - - ami_reset_pointer(gwin); -} - -HOOKF(void, ami_menu_item_project_quit, APTR, window, struct IntuiMessage *) -{ - menu_quit = true; -} - -HOOKF(void, ami_menu_item_edit_cut, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, NS_KEY_CUT_SELECTION); -} - -HOOKF(void, ami_menu_item_edit_copy, APTR, window, struct IntuiMessage *) -{ - struct bitmap *bm; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + ULONG state; + struct ExtIntuiMessage *emsg = (struct ExtIntuiMessage *)msg; - if(browser_window_can_select(gwin->gw->bw)) { - browser_window_key_press(gwin->gw->bw, NS_KEY_COPY_SELECTION); - browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); - } - else if((bm = content_get_bitmap(browser_window_get_content(gwin->gw->bw)))) { - /** @todo It should be checked that the lifetime of - * the objects containing the values returned (and the - * constness cast away) is safe. - */ - ami_bitmap_set_url(bm, browser_window_get_url(gwin->gw->bw)); - ami_bitmap_set_title(bm, browser_window_get_title(gwin->gw->bw)); - ami_easy_clipboard_bitmap(bm); - } -#ifdef WITH_NS_SVG - else if(ami_mime_compare(browser_window_get_content(gwin->gw->bw), "svg") == true) { - ami_easy_clipboard_svg(browser_window_get_content(gwin->gw->bw)); + state = IDoMethod((Object *)menu, MM_GETSTATE, 0, emsg->eim_LongCode, MS_CHECKED); + if(state & MS_CHECKED) checked = true; +#endif + } else { + if(ItemAddress(menu, msg->Code)->Flags & CHECKED) checked = true; } -#endif -} - -HOOKF(void, ami_menu_item_edit_paste, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, NS_KEY_PASTE); -} - -HOOKF(void, ami_menu_item_edit_selectall, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, NS_KEY_SELECT_ALL); - gui_start_selection(gwin->gw); -} - -HOOKF(void, ami_menu_item_edit_clearsel, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); -} - -HOOKF(void, ami_menu_item_edit_undo, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, NS_KEY_UNDO); -} - -HOOKF(void, ami_menu_item_edit_redo, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, NS_KEY_REDO); -} - -HOOKF(void, ami_menu_item_browser_find, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_search_open(gwin->gw); -} - -HOOKF(void, ami_menu_item_browser_localhistory, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_history_open(gwin->gw); -} - -HOOKF(void, ami_menu_item_browser_globalhistory, APTR, window, struct IntuiMessage *) -{ - ami_tree_open(global_history_window,AMI_TREE_HISTORY); -} - -HOOKF(void, ami_menu_item_browser_cookies, APTR, window, struct IntuiMessage *) -{ - ami_tree_open(cookies_window,AMI_TREE_COOKIES); -} - -HOOKF(void, ami_menu_item_browser_foreimg, APTR, window, struct IntuiMessage *) -{ - struct Menu *menustrip; - bool checked = false; - - GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); - if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; - - nsoption_set_bool(foreground_images, checked); - ami_menu_set_check_toggled(); -} - -HOOKF(void, ami_menu_item_browser_backimg, APTR, window, struct IntuiMessage *) -{ - struct Menu *menustrip; - bool checked = false; - - GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); - if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; - - nsoption_set_bool(background_images, checked); - ami_menu_set_check_toggled(); -} - -HOOKF(void, ami_menu_item_browser_enablejs, APTR, window, struct IntuiMessage *) -{ - struct Menu *menustrip; - bool checked = false; - - GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); - if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; - - nsoption_set_bool(enable_javascript, checked); - ami_menu_set_check_toggled(); -} - -HOOKF(void, ami_menu_item_browser_scale_decrease, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1); -} - -HOOKF(void, ami_menu_item_browser_scale_normal, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_gui_set_scale(gwin->gw, 1.0); -} - -HOOKF(void, ami_menu_item_browser_scale_increase, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1); -} - -HOOKF(void, ami_menu_item_browser_redraw, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_schedule_redraw(gwin, true); - gwin->new_content = true; -} - -HOOKF(void, ami_menu_item_hotlist_add, APTR, window, struct IntuiMessage *) -{ - struct browser_window *bw; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - bw = gwin->gw->bw; - - if (bw == NULL || browser_window_has_content(bw) == false) - return; - - hotlist_add_url(browser_window_get_url(bw)); - ami_gui_update_hotlist_button(gwin); -} - -HOOKF(void, ami_menu_item_hotlist_show, APTR, window, struct IntuiMessage *) -{ - ami_tree_open(hotlist_window, AMI_TREE_HOTLIST); -} - -HOOKF(void, ami_menu_item_hotlist_entries, APTR, window, struct IntuiMessage *) -{ - nsurl *url = hook->h_Data; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - if(url == NULL) return; - - browser_window_navigate(gwin->gw->bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); -} -HOOKF(void, ami_menu_item_settings_edit, APTR, window, struct IntuiMessage *) -{ - ami_gui_opts_open(); -} - -HOOKF(void, ami_menu_item_settings_snapshot, APTR, window, struct IntuiMessage *) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - nsoption_set_int(window_x, gwin->win->LeftEdge); - nsoption_set_int(window_y, gwin->win->TopEdge); - nsoption_set_int(window_width, gwin->win->Width); - nsoption_set_int(window_height, gwin->win->Height); -} - -HOOKF(void, ami_menu_item_settings_save, APTR, window, struct IntuiMessage *) -{ - ami_nsoption_write(); + return checked; } -HOOKF(void, ami_menu_item_arexx_execute, APTR, window, struct IntuiMessage *) -{ - char *temp; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - if(AslRequestTags(filereq, - ASLFR_Window, gwin->win, - ASLFR_SleepWindow, TRUE, - ASLFR_TitleText, messages_get("NetSurf"), - ASLFR_Screen, scrn, - ASLFR_DoSaveMode, FALSE, - ASLFR_InitialDrawer, nsoption_charp(arexx_dir), - ASLFR_InitialPattern, "#?.nsrx", - TAG_DONE)) { - if((temp = AllocVecTagList(1024, NULL))) { - strlcpy(temp, filereq->fr_Drawer, 1024); - AddPart(temp, filereq->fr_File, 1024); - ami_arexx_execute(temp); - FreeVec(temp); +/* menu creation code */ +void ami_menu_free_lab_item(struct ami_menu_data **md, int i) +{ + if(md[i] == NULL) return; + if(md[i]->menulab && + (md[i]->menulab != NM_BARLABEL) && + (md[i]->menulab != ML_SEPARATOR)) { + if(md[i]->menutype & MENU_IMAGE) { + if(md[i]->menuobj) DisposeObject(md[i]->menuobj); } - } -} -HOOKF(void, ami_menu_item_arexx_entries, APTR, window, struct IntuiMessage *) -{ - char *script = hook->h_Data; - char *temp; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - if(script) { - if((temp = AllocVecTagList(1024, NULL))) { - BPTR lock; - if((lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))) { - DevNameFromLock(lock, temp, 1024, DN_FULLPATH); - AddPart(temp, script, 1024); - ami_arexx_execute(temp); - FreeVec(temp); - UnLock(lock); - } - } + ami_utf8_free(md[i]->menulab); } -} + if(md[i]->menukey != NULL) free(md[i]->menukey); -/* menu creation code */ + md[i]->menulab = NULL; + md[i]->menuobj = NULL; + md[i]->menukey = NULL; + md[i]->menutype = 0; + free(md[i]); + md[i] = NULL; +} -void ami_free_menulabs(struct gui_window_2 *gwin) +static void ami_menu_free_labs(struct ami_menu_data **md, int max) { int i; - for(i=0;i<AMI_MENU_AREXX_MAX;i++) { - if(gwin->menulab[i] && (gwin->menulab[i] != NM_BARLABEL)) { - if(gwin->menutype[i] & MENU_IMAGE) { - if(gwin->menuobj[i]) DisposeObject(gwin->menuobj[i]); - } - - ami_utf8_free(gwin->menulab[i]); - - if(i >= AMI_MENU_AREXX) { - if(gwin->menu_hook[i].h_Data) free(gwin->menu_hook[i].h_Data); - gwin->menu_hook[i].h_Data = NULL; - } - } - - gwin->menulab[i] = NULL; - gwin->menuobj[i] = NULL; - gwin->menukey[i] = 0; + for(i = 0; i <= max; i++) { + ami_menu_free_lab_item(md, i); } - - FreeVec(gwin->menutype); - gwin->menutype = NULL; } -static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type, - const char *restrict label, char key, const char *restrict icon, - void *restrict func, void *restrict hookdata) +void ami_menu_alloc_item(struct ami_menu_data **md, int num, UBYTE type, + const char *restrict label, const char *restrict key, const char *restrict icon, + void *restrict func, void *restrict hookdata, UWORD flags) { - char menu_icon[1024]; - - gwin->menutype[num] = type; + md[num] = calloc(1, sizeof(struct ami_menu_data)); + md[num]->menutype = type; + md[num]->flags = flags; + + if(type == NM_END) return; if((label == NM_BARLABEL) || (strcmp(label, "--") == 0)) { - gwin->menulab[num] = NM_BARLABEL; - } else { - if((num >= AMI_MENU_HOTLIST) && (num <= AMI_MENU_HOTLIST_MAX)) { - utf8_from_local_encoding(label, - (strlen(label) < NSA_MAX_HOTLIST_MENU_LEN) ? strlen(label) : NSA_MAX_HOTLIST_MENU_LEN, - (char **)&gwin->menulab[num]); - } else if((num >= AMI_MENU_AREXX) && (num < AMI_MENU_AREXX_MAX)) { - gwin->menulab[num] = strdup(label); + md[num]->menulab = NM_BARLABEL; + icon = NULL; + } else { /* horrid non-generic stuff */ + if((num >= AMI_MENU_AREXX) && (num < AMI_MENU_AREXX_MAX)) { + md[num]->menulab = strdup(label); } else { - gwin->menulab[num] = ami_utf8_easy(messages_get(label)); + md[num]->menulab = ami_utf8_easy(messages_get(label)); } } - gwin->menuicon[num] = NULL; - if(key) gwin->menukey[num] = key; - if(func) gwin->menu_hook[num].h_Entry = (HOOKFUNC)func; - if(hookdata) gwin->menu_hook[num].h_Data = hookdata; + md[num]->menuicon = NULL; + if(key) md[num]->menukey = strdup(key); + if(func) md[num]->menu_hook.h_Entry = (HOOKFUNC)func; + if(hookdata) md[num]->menu_hook.h_Data = hookdata; #ifdef __amigaos4__ + char menu_icon[1024]; + if(LIB_IS_AT_LEAST((struct Library *)GadToolsBase, 53, 7)) { if(icon) { if(ami_locate_resource(menu_icon, icon) == true) { - gwin->menuicon[num] = (char *)strdup(menu_icon); + md[num]->menuicon = (char *)strdup(menu_icon); } else { /* If the requested icon can't be found, put blank space in instead */ - gwin->menuicon[num] = (char *)strdup(NSA_SPACE); + md[num]->menuicon = (char *)strdup(NSA_SPACE); } } } #endif } -static void ami_init_menulabs(struct gui_window_2 *gwin) -{ - int i; - - gwin->menutype = ami_misc_allocvec_clear(sizeof(UBYTE) * (AMI_MENU_AREXX_MAX + 1), 0); - - for(i=0;i <= AMI_MENU_AREXX_MAX;i++) - { - gwin->menutype[i] = NM_IGNORE; - gwin->menulab[i] = NULL; - gwin->menuobj[i] = NULL; - gwin->menuicon[i] = NULL; - } - - ami_menu_alloc_item(gwin, M_PROJECT, NM_TITLE, "Project", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_NEWWIN, NM_ITEM, "NewWindowNS", 'N', "TBImages:list_app", - ami_menu_item_project_newwin, NULL); - ami_menu_alloc_item(gwin, M_NEWTAB, NM_ITEM, "NewTab", 'T', "TBImages:list_tab", - ami_menu_item_project_newtab, NULL); - ami_menu_alloc_item(gwin, M_BAR_P1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_OPEN, NM_ITEM, "OpenFile", 'O', "TBImages:list_folder_misc", - ami_menu_item_project_open, NULL); - ami_menu_alloc_item(gwin, M_SAVEAS, NM_ITEM, "SaveAsNS", 0, "TBImages:list_saveas", NULL, NULL); - ami_menu_alloc_item(gwin, M_SAVESRC, NM_SUB, "Source", 'S', NULL, - ami_menu_item_project_save, (void *)AMINS_SAVE_SOURCE); - ami_menu_alloc_item(gwin, M_SAVETXT, NM_SUB, "TextNS", 0, NULL, - ami_menu_item_project_save, (void *)AMINS_SAVE_TEXT); - ami_menu_alloc_item(gwin, M_SAVECOMP, NM_SUB, "SaveCompNS", 0, NULL, - ami_menu_item_project_save, (void *)AMINS_SAVE_COMPLETE); -#ifdef WITH_PDF_EXPORT - ami_menu_alloc_item(gwin, M_SAVEPDF, NM_SUB, "PDFNS", 0, NULL, - ami_menu_item_project_save, (void *)AMINS_SAVE_PDF); -#endif - ami_menu_alloc_item(gwin, M_SAVEIFF, NM_SUB, "IFF", 0, NULL, - ami_menu_item_project_save, (void *)AMINS_SAVE_IFF); - ami_menu_alloc_item(gwin, M_BAR_P2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_PRINT, NM_ITEM, "PrintNS", 'P', "TBImages:list_print", - ami_menu_item_project_print, NULL); - ami_menu_alloc_item(gwin, M_BAR_P3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_CLOSETAB, NM_ITEM, "CloseTab", 'K', "TBImages:list_remove", - ami_menu_item_project_closetab, NULL); - ami_menu_alloc_item(gwin, M_CLOSEWIN, NM_ITEM, "CloseWindow", 0, "TBImages:list_cancel", - ami_menu_item_project_closewin, NULL); - ami_menu_alloc_item(gwin, M_BAR_P4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_ABOUT, NM_ITEM, "About", '?', "TBImages:list_info", - ami_menu_item_project_about, NULL); - ami_menu_alloc_item(gwin, M_BAR_P5, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_QUIT, NM_ITEM, "Quit", 'Q', "TBImages:list_warning", - ami_menu_item_project_quit, NULL); - - ami_menu_alloc_item(gwin, M_EDIT, NM_TITLE, "Edit", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_CUT, NM_ITEM, "CutNS", 'X', "TBImages:list_cut", - ami_menu_item_edit_cut, NULL); - ami_menu_alloc_item(gwin, M_COPY, NM_ITEM, "CopyNS", 'C', "TBImages:list_copy", - ami_menu_item_edit_copy, NULL); - ami_menu_alloc_item(gwin, M_PASTE, NM_ITEM, "PasteNS", 'V', "TBImages:list_paste", - ami_menu_item_edit_paste, NULL); - ami_menu_alloc_item(gwin, M_BAR_E1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_SELALL, NM_ITEM, "SelectAllNS", 'A', NSA_SPACE, - ami_menu_item_edit_selectall, NULL); - ami_menu_alloc_item(gwin, M_CLEAR, NM_ITEM, "ClearNS", 0, NSA_SPACE, - ami_menu_item_edit_clearsel, NULL); - ami_menu_alloc_item(gwin, M_BAR_E2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_UNDO, NM_ITEM, "Undo", 'Z', "TBImages:list_undo", - ami_menu_item_edit_undo, NULL); - ami_menu_alloc_item(gwin, M_REDO, NM_ITEM, "Redo", 'Y', "TBImages:list_redo", - ami_menu_item_edit_redo, NULL); - - ami_menu_alloc_item(gwin, M_BROWSER, NM_TITLE, "Browser", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_FIND, NM_ITEM, "FindTextNS", 'F', "TBImages:list_search", - ami_menu_item_browser_find, NULL); - ami_menu_alloc_item(gwin, M_BAR_B1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_HISTLOCL, NM_ITEM, "HistLocalNS", 0, "TBImages:list_history", - ami_menu_item_browser_localhistory, NULL); - ami_menu_alloc_item(gwin, M_HISTGLBL, NM_ITEM, "HistGlobalNS", 0, "TBImages:list_history", - ami_menu_item_browser_globalhistory, NULL); - ami_menu_alloc_item(gwin, M_BAR_B2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_COOKIES, NM_ITEM, "ShowCookiesNS", 0, "TBImages:list_internet", - ami_menu_item_browser_cookies, NULL); - ami_menu_alloc_item(gwin, M_BAR_B3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_SCALE, NM_ITEM, "ScaleNS", 0, "TBImages:list_preview", NULL, NULL); - ami_menu_alloc_item(gwin, M_SCALEDEC, NM_SUB, "ScaleDec", '-', "TBImages:list_zoom_out", - ami_menu_item_browser_scale_decrease, NULL); - ami_menu_alloc_item(gwin, M_SCALENRM, NM_SUB, "ScaleNorm", '=', "TBImages:list_zoom_100", - ami_menu_item_browser_scale_normal, NULL); - ami_menu_alloc_item(gwin, M_SCALEINC, NM_SUB, "ScaleInc", '+', "TBImages:list_zoom_in", - ami_menu_item_browser_scale_increase, NULL); - ami_menu_alloc_item(gwin, M_IMAGES, NM_ITEM, "Images", 0, "TBImages:list_image", NULL, NULL); - ami_menu_alloc_item(gwin, M_IMGFORE, NM_SUB, "ForeImg", 0, NULL, - ami_menu_item_browser_foreimg, NULL); - ami_menu_alloc_item(gwin, M_IMGBACK, NM_SUB, "BackImg", 0, NULL, - ami_menu_item_browser_backimg, NULL); - ami_menu_alloc_item(gwin, M_JS, NM_ITEM, "EnableJS", 0, NULL, - ami_menu_item_browser_enablejs, NULL); - ami_menu_alloc_item(gwin, M_BAR_B4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_REDRAW, NM_ITEM, "Redraw", 0, "TBImages:list_wand", - ami_menu_item_browser_redraw, NULL); - - ami_menu_alloc_item(gwin, M_HOTLIST, NM_TITLE, "Hotlist", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_HLADD, NM_ITEM, "HotlistAdd", 'B', "TBImages:list_favouriteadd", - ami_menu_item_hotlist_add, NULL); - ami_menu_alloc_item(gwin, M_HLSHOW, NM_ITEM,"HotlistShowNS",'H', "TBImages:list_favourite", - ami_menu_item_hotlist_show, NULL); - ami_menu_alloc_item(gwin, M_BAR_H1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - - ami_menu_alloc_item(gwin, M_PREFS, NM_TITLE, "Settings", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_PREDIT, NM_ITEM, "SettingsEdit", 0, "TBImages:list_prefs", - ami_menu_item_settings_edit, NULL); - ami_menu_alloc_item(gwin, M_BAR_S1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_SNAPSHOT, NM_ITEM, "SnapshotWindow",0, "TBImages:list_hold", - ami_menu_item_settings_snapshot, NULL); - ami_menu_alloc_item(gwin, M_PRSAVE, NM_ITEM, "SettingsSave", 0, "TBImages:list_use", - ami_menu_item_settings_save, NULL); - - ami_menu_alloc_item(gwin, M_AREXX, NM_TITLE, "ARexx", 0, NULL, NULL, NULL); - ami_menu_alloc_item(gwin, M_AREXXEX, NM_ITEM, "ARexxExecute",'E', "TBImages:list_arexx", - ami_menu_item_arexx_execute, NULL); - ami_menu_alloc_item(gwin, M_BAR_A1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL); - gwin->menutype[AMI_MENU_AREXX_MAX] = NM_END; -} - -/* Menu refresh for hotlist */ -void ami_menu_refresh(struct gui_window_2 *gwin) -{ - return; /**\todo fix this after migrating to menuclass */ - - struct Menu *menu; - - LOG("Clearing MenuStrip"); - SetAttrs(gwin->objects[OID_MAIN], - WINDOW_MenuStrip, NULL, - TAG_DONE); - - LOG("Freeing menu"); - ami_menu_free(gwin); - - LOG("Freeing menu labels"); - ami_free_menulabs(gwin); - - LOG("Creating new menu"); - menu = ami_menu_create(gwin); - - LOG("Attaching MenuStrip %p to %p", menu, gwin->objects[OID_MAIN]); - SetAttrs(gwin->objects[OID_MAIN], - WINDOW_MenuStrip, menu, - TAG_DONE); -} - static void ami_menu_load_glyphs(struct DrawInfo *dri) { #ifdef __amigaos4__ @@ -794,16 +196,16 @@ void ami_menu_free_glyphs(void) #endif } -static int ami_menu_calc_item_width(struct gui_window_2 *gwin, int j, struct RastPort *rp) +static int ami_menu_calc_item_width(struct ami_menu_data **md, int j, struct RastPort *rp) { int space_width = TextLength(rp, " ", 1); int item_size; - item_size = TextLength(rp, gwin->menulab[j], strlen(gwin->menulab[j])); + item_size = TextLength(rp, md[j]->menulab, strlen(md[j]->menulab)); item_size += space_width; - if(gwin->menukey[j]) { - item_size += TextLength(rp, &gwin->menukey[j], 1); + if(md[j]->menukey) { + item_size += TextLength(rp, md[j]->menukey, 1); item_size += menu_glyph_width[NSA_GLYPH_AMIGAKEY]; /**TODO: take account of the size of other imagery too */ @@ -813,19 +215,87 @@ static int ami_menu_calc_item_width(struct gui_window_2 *gwin, int j, struct Ras item_size += menu_glyph_width[NSA_GLYPH_AMIGAKEY]; } - if(gwin->menuicon[j]) { + if(md[j]->menuicon) { item_size += 16; } return item_size; } +#ifdef __amigaos4__ +static int ami_menu_layout_mc_recursive(Object *menu_parent, struct ami_menu_data **md, int level, int i, int max) +{ + int j; + Object *menu_item = menu_parent; + + for(j = i; j < max; j++) { + /* skip empty entries */ + if(md[j] == NULL) continue; + if(md[j]->menutype == NM_IGNORE) continue; + + if(md[j]->menutype == level) { + if(md[j]->menulab == NM_BARLABEL) + md[j]->menulab = ML_SEPARATOR; + + if(level == NM_TITLE) { + menu_item = NewObject(NULL, "menuclass", + MA_Type, T_MENU, + MA_ID, j, + MA_Label, md[j]->menulab, + TAG_DONE); + } else { + menu_item = NewObject(NULL, "menuclass", + MA_Type, T_ITEM, + MA_ID, j, + MA_Label, md[j]->menulab, + MA_Image, + BitMapObj, + IA_Scalable, TRUE, + BITMAP_Screen, scrn, + BITMAP_SourceFile, md[j]->menuicon, + BITMAP_Masking, TRUE, + BitMapEnd, + MA_Key, md[j]->menukey, + MA_UserData, &md[j]->menu_hook, /* NB: Intentionally UserData */ + MA_Disabled, (md[j]->flags & NM_ITEMDISABLED), + MA_Selected, (md[j]->flags & CHECKED), + MA_Toggle, (md[j]->flags & MENUTOGGLE), + TAG_DONE); + } + + //LOG("Adding item %p ID %d (%s) to parent %p", menu_item, j, md[j]->menulab, menu_parent); + IDoMethod(menu_parent, OM_ADDMEMBER, menu_item); + continue; + } else if (md[j]->menutype > level) { + j = ami_menu_layout_mc_recursive(menu_item, md, md[j]->menutype, j, max); + } else { + break; + } + } + return (j - 1); +} + +static struct Menu *ami_menu_layout_mc(struct ami_menu_data **md, int max) +{ + Object *menu_root = NewObject(NULL, "menuclass", + MA_Type, T_ROOT, + MA_EmbeddedKey, FALSE, + TAG_DONE); + + ami_menu_layout_mc_recursive(menu_root, md, NM_TITLE, 0, max); + + return (struct Menu *)menu_root; +} +#endif -static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) +static struct Menu *ami_menu_layout_gt(struct ami_menu_data **md, int max) { int i, j; int txtlen = 0; int left_posn = 0; + struct NewMenu *nm; + struct Menu *imenu = NULL; + struct VisualInfo *vi; struct RastPort *rp = &scrn->RastPort; struct DrawInfo *dri = GetScreenDrawInfo(scrn); int space_width = TextLength(rp, " ", 1); @@ -833,34 +303,41 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) if(menu_glyphs_loaded == false) ami_menu_load_glyphs(dri); - for(i=0; i < AMI_MENU_AREXX_MAX; i++) - { - if(gwin->menutype[i] == NM_TITLE) { + nm = calloc(1, sizeof(struct NewMenu) * (max + 1)); + if(nm == NULL) return NULL; + + for(i = 0; i < max; i++) { + if(md[i] == NULL) { + nm[i].nm_Type = NM_IGNORE; + continue; + } + + if(md[i]->menutype == NM_TITLE) { j = i + 1; txtlen = 0; do { - if(gwin->menulab[j] != NM_BARLABEL) { - if(gwin->menutype[j] == NM_ITEM) { - int item_size = ami_menu_calc_item_width(gwin, j, rp); + if(md[j]->menulab != NM_BARLABEL) { + if(md[j]->menutype == NM_ITEM) { + int item_size = ami_menu_calc_item_width(md, j, rp); if(item_size > txtlen) { txtlen = item_size; } } } j++; - } while((gwin->menutype[j] != NM_TITLE) && (gwin->menutype[j] != 0)); + } while((j <= max) && (md[j] != NULL) && (md[j]->menutype != NM_TITLE) && (md[j]->menutype != 0)); } #ifdef __amigaos4__ if(LIB_IS_AT_LEAST((struct Library *)GadToolsBase, 53, 7)) { /* GadTools 53.7+ only. For now we will only create the menu using label.image if there's a bitmap associated with the item. */ - if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] != NM_BARLABEL)) { + if((md[i]->menuicon != NULL) && (md[i]->menulab != NM_BARLABEL)) { int icon_width = 0; Object *restrict submenuarrow = NULL; Object *restrict icon = BitMapObj, IA_Scalable, TRUE, BITMAP_Screen, scrn, - BITMAP_SourceFile, gwin->menuicon[i], + BITMAP_SourceFile, md[i]->menuicon, BITMAP_Masking, TRUE, BitMapEnd; @@ -872,15 +349,15 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) GetAttr(IA_Width, icon, (ULONG *)&icon_width); - if(gwin->menutype[i] != NM_SUB) { + if(md[i]->menutype != NM_SUB) { left_posn = txtlen; } left_posn = left_posn - - TextLength(rp, gwin->menulab[i], strlen(gwin->menulab[i])) - + TextLength(rp, md[i]->menulab, strlen(md[i]->menulab)) - icon_width - space_width; - if((gwin->menutype[i] == NM_ITEM) && (gwin->menutype[i+1] == NM_SUB)) { + if((md[i]->menutype == NM_ITEM) && md[i+1] && (md[i+1]->menutype == NM_SUB)) { left_posn -= menu_glyph_width[NSA_GLYPH_SUBMENU]; submenuarrow = NewObject(NULL, "sysiclass", @@ -890,278 +367,105 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin) TAG_DONE); } - gwin->menuobj[i] = LabelObj, + md[i]->menuobj = LabelObj, LABEL_MenuMode, TRUE, LABEL_DrawInfo, dri, LABEL_DisposeImage, TRUE, LABEL_Image, icon, LABEL_Text, " ", - LABEL_Text, gwin->menulab[i], + LABEL_Text, md[i]->menulab, LABEL_DisposeImage, TRUE, LABEL_Image, submenuarrow, LabelEnd; - if(gwin->menuobj[i]) gwin->menutype[i] |= MENU_IMAGE; + if(md[i]->menuobj) md[i]->menutype |= MENU_IMAGE; } } #endif - gwin->menu[i].nm_Type = gwin->menutype[i]; + nm[i].nm_Type = md[i]->menutype; - if(gwin->menuobj[i]) - gwin->menu[i].nm_Label = (void *)gwin->menuobj[i]; + if(md[i]->menuobj) + nm[i].nm_Label = (void *)md[i]->menuobj; else - gwin->menu[i].nm_Label = gwin->menulab[i]; + nm[i].nm_Label = md[i]->menulab; - if(gwin->menukey[i]) gwin->menu[i].nm_CommKey = &gwin->menukey[i]; - gwin->menu[i].nm_Flags = 0; - if(gwin->menu_hook[i].h_Entry) gwin->menu[i].nm_UserData = &gwin->menu_hook[i]; + if((md[i]->menukey) && (strlen(md[i]->menukey) > 1)) { + nm[i].nm_CommKey = md[i]->menukey; + } + nm[i].nm_Flags = md[i]->flags; + if(md[i]->menu_hook.h_Entry) nm[i].nm_UserData = &md[i]->menu_hook; - if(gwin->menuicon[i]) { - free(gwin->menuicon[i]); - gwin->menuicon[i] = NULL; + if(md[i]->menuicon) { + free(md[i]->menuicon); + md[i]->menuicon = NULL; } } FreeScreenDrawInfo(scrn, dri); - - return gwin; -} - -void ami_menu_free(struct gui_window_2 *gwin) -{ - FreeMenus(gwin->imenu); - FreeVisualInfo(gwin->vi); -} -struct Menu *ami_menu_create(struct gui_window_2 *gwin) -{ - gwin->menu = ami_misc_allocvec_clear(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1), 0); - ami_init_menulabs(gwin); - ami_menu_scan(ami_tree_get_tree(hotlist_window), gwin); - ami_menu_arexx_scan(gwin); - gwin = ami_menu_layout(gwin); - - gwin->menu[M_JS].nm_Flags = CHECKIT | MENUTOGGLE; - if(nsoption_bool(enable_javascript) == true) - gwin->menu[M_JS].nm_Flags |= CHECKED; - - gwin->menu[M_PRINT].nm_Flags = NM_ITEMDISABLED; - - gwin->menu[M_IMGFORE].nm_Flags = CHECKIT | MENUTOGGLE; - if(nsoption_bool(foreground_images) == true) - gwin->menu[M_IMGFORE].nm_Flags |= CHECKED; - gwin->menu[M_IMGBACK].nm_Flags = CHECKIT | MENUTOGGLE; - if(nsoption_bool(background_images) == true) - gwin->menu[M_IMGBACK].nm_Flags |= CHECKED; - - gwin->vi = GetVisualInfo(scrn, TAG_DONE); - gwin->imenu = CreateMenus(gwin->menu, TAG_DONE); - LayoutMenus(gwin->imenu, gwin->vi, + vi = GetVisualInfo(scrn, TAG_DONE); + imenu = CreateMenus(nm, TAG_DONE); + LayoutMenus(imenu, vi, GTMN_NewLookMenus, TRUE, TAG_DONE); - FreeVec(gwin->menu); /**\todo this should be local to this function */ - gwin->menu = NULL; - - return gwin->imenu; + free(nm); + FreeVisualInfo(vi); /* Not using GadTools after layout so shouldn't need this */ + + return imenu; } -void ami_menu_arexx_scan(struct gui_window_2 *gwin) +struct Menu *ami_menu_layout(struct ami_menu_data **md, int max) { - /**\todo Rewrite this to not use ExAll() **/ - int item = AMI_MENU_AREXX; - BPTR lock = 0; - UBYTE *buffer; - struct ExAllControl *ctrl; - char matchpatt[16]; - LONG cont; - struct ExAllData *ead; - char *menu_lab; - - if((lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))) { - if((buffer = AllocVecTagList(1024, NULL))) { - if((ctrl = AllocDosObject(DOS_EXALLCONTROL,NULL))) { - ctrl->eac_LastKey = 0; - - if(ParsePatternNoCase("#?.nsrx",(char *)&matchpatt,16) != -1) { - ctrl->eac_MatchString = (char *)&matchpatt; - } - - do { - cont = ExAll(lock,(struct ExAllData *)buffer,1024,ED_COMMENT,ctrl); - if((!cont) && (IoErr() != ERROR_NO_MORE_ENTRIES)) break; - if(!ctrl->eac_Entries) continue; - - for(ead = (struct ExAllData *)buffer; ead; ead = ead->ed_Next) { - if(item >= AMI_MENU_AREXX_MAX) continue; - if(EAD_IS_FILE(ead)) { - gwin->menu[item].nm_Type = NM_ITEM; - if(ead->ed_Comment[0] != '\0') - menu_lab = ead->ed_Comment; - else - menu_lab = ead->ed_Name; - - ami_menu_alloc_item(gwin, item, NM_ITEM, menu_lab, 0, NSA_SPACE, - ami_menu_item_arexx_entries, (void *)strdup(ead->ed_Name)); - - item++; - } - } - } while(cont); - FreeDosObject(DOS_EXALLCONTROL,ctrl); - } - FreeVec(buffer); - } - UnLock(lock); + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { +#ifdef __amigaos4__ + return ami_menu_layout_mc(md, max); +#endif + } else { + return ami_menu_layout_gt(md, max); } - - gwin->menu[item].nm_Type = NM_END; - gwin->menu[item].nm_Label = NULL; } -static bool ami_menu_hotlist_add(void *userdata, int level, int item, const char *title, nsurl *url, bool is_folder) +void ami_menu_free_menu(struct ami_menu_data **md, int max, struct Menu *imenu) { - UBYTE type; - STRPTR icon; - struct gui_window_2 *gw = (struct gui_window_2 *)userdata; - - if(item >= AMI_MENU_HOTLIST_MAX) return false; - - switch(level) { - case 1: - type = NM_ITEM; - break; - case 2: - type = NM_SUB; - break; - default: - /* entries not at level 1 or 2 are not able to be added - * \todo construct menus using menuclass instead! */ - return false; - break; - } - - if(is_folder == true) { - icon = ASPrintf("icons/directory.png"); + ami_menu_free_labs(md, max); + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { + DisposeObject((Object *)imenu); // if we detach our menu from the window we need to do this manually } else { - icon = ami_gui_get_cache_favicon_name(url, true); - if (icon == NULL) icon = ASPrintf("icons/content.png"); + FreeMenus(imenu); } - - ami_menu_alloc_item(gw, item, type, title, - 0, icon, ami_menu_item_hotlist_entries, (void *)url); - if((is_folder == true) && (type == NM_SUB)) - gw->menu[item].nm_Flags = NM_ITEMDISABLED; - - if(icon) FreeVec(icon); - - return true; -} - -static nserror ami_menu_scan(struct tree *tree, struct gui_window_2 *gwin) -{ - return ami_hotlist_scan((void *)gwin, AMI_MENU_HOTLIST, messages_get("HotlistMenu"), ami_menu_hotlist_add); } -void ami_menu_update_checked(struct gui_window_2 *gwin) +void ami_menu_refresh(struct Menu *menu, struct ami_menu_data **md, int menu_item, int max, + nserror (*cb)(struct ami_menu_data **md)) { - struct Menu *menustrip; - - GetAttr(WINDOW_MenuStrip, gwin->objects[OID_MAIN], (ULONG *)&menustrip); - if(!menustrip) return; - if(nsoption_bool(enable_javascript) == true) { - if((ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED) == 0) - ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED; - } else { - if(ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED) - ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED; - } - if(nsoption_bool(foreground_images) == true) { - if((ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags & CHECKED) == 0) - ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags ^= CHECKED; - } else { - if(ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags & CHECKED) - ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags ^= CHECKED; - } - - if(nsoption_bool(background_images) == true) { - if((ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags & CHECKED) == 0) - ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags ^= CHECKED; - } else { - if(ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags & CHECKED) - ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags ^= CHECKED; - } +#ifdef __amigaos4__ + Object *restrict obj; + Object *restrict menu_item_obj; + int i; - ResetMenuStrip(gwin->win, menustrip); -} + if(menu == NULL) return; -void ami_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c) -{ - struct Window *win = g->shared->win; + if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) { + /* find the address of the menu */ + menu_item_obj = (Object *)IDoMethod((Object *)menu, MM_FINDID, 0, menu_item); - if(nsoption_bool(kiosk_mode) == true) return; + /* remove all children */ + while((obj = (Object *)IDoMethod(menu_item_obj, MM_NEXTCHILD, 0, NULL)) != NULL) { + IDoMethod(menu_item_obj, OM_REMMEMBER, obj); + DisposeObject(obj); + } - if(content_get_type(c) <= CONTENT_CSS) - { - OnMenu(win,AMI_MENU_SAVEAS_TEXT); - OnMenu(win,AMI_MENU_SAVEAS_COMPLETE); -#ifdef WITH_PDF_EXPORT - OnMenu(win,AMI_MENU_SAVEAS_PDF); -#endif -#if 0 - if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_COPY) { - OnMenu(win,AMI_MENU_COPY); - OnMenu(win,AMI_MENU_CLEAR); - } else { - OffMenu(win,AMI_MENU_COPY); - OffMenu(win,AMI_MENU_CLEAR); + /* free associated data */ + for(i = (menu_item + 1); i <= max; i++) { + if(md[i] == NULL) continue; + ami_menu_free_lab_item(md, i); } - if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_CUT) - OnMenu(win,AMI_MENU_CUT); - else - OffMenu(win,AMI_MENU_CUT); - - if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_PASTE) - OnMenu(win,AMI_MENU_PASTE); - else - OffMenu(win,AMI_MENU_PASTE); -#else - OnMenu(win,AMI_MENU_CUT); - OnMenu(win,AMI_MENU_COPY); - OnMenu(win,AMI_MENU_PASTE); - OnMenu(win,AMI_MENU_CLEAR); -#endif - OnMenu(win,AMI_MENU_SELECTALL); - OnMenu(win,AMI_MENU_FIND); - OffMenu(win,AMI_MENU_SAVEAS_IFF); - } - else - { - OffMenu(win,AMI_MENU_CUT); - OffMenu(win,AMI_MENU_PASTE); - OffMenu(win,AMI_MENU_CLEAR); - - OffMenu(win,AMI_MENU_SAVEAS_TEXT); - OffMenu(win,AMI_MENU_SAVEAS_COMPLETE); -#ifdef WITH_PDF_EXPORT - OffMenu(win,AMI_MENU_SAVEAS_PDF); -#endif - OffMenu(win,AMI_MENU_SELECTALL); - OffMenu(win,AMI_MENU_FIND); + /* get current data */ + cb(md); -#ifdef WITH_NS_SVG - if(content_get_bitmap(c) || (ami_mime_compare(c, "svg") == true)) -#else - if(content_get_bitmap(c)) -#endif - { - OnMenu(win,AMI_MENU_COPY); - OnMenu(win,AMI_MENU_SAVEAS_IFF); - } - else - { - OffMenu(win,AMI_MENU_COPY); - OffMenu(win,AMI_MENU_SAVEAS_IFF); - } + /* re-add items to menu */ + ami_menu_layout_mc_recursive(menu_item_obj, md, NM_ITEM, (menu_item + 1), max); } +#endif } diff --git a/frontends/amiga/menu.h b/frontends/amiga/menu.h old mode 100755 new mode 100644 index ac74f38..358faa4 --- a/frontends/amiga/menu.h +++ b/frontends/amiga/menu.h @@ -1,5 +1,5 @@ /* - * Copyright 2008,2009,2013 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -23,142 +23,37 @@ #include <intuition/intuition.h> #include <libraries/gadtools.h> -struct hlcache_handle; - -/** Maximum number of hotlist items (somewhat arbitrary value) */ -#define AMI_HOTLIST_ITEMS 60 - -/** Maximum number of ARexx menu items (somewhat arbitrary value) */ -#define AMI_MENU_AREXX_ITEMS 20 - -/** enum menu structure, has to be here as we need it below. */ -enum { - /* Project menu */ - M_PROJECT = 0, - M_NEWWIN, - M_NEWTAB, - M_BAR_P1, - M_OPEN, - M_SAVEAS, - M_SAVESRC, - M_SAVETXT, - M_SAVECOMP, - M_SAVEIFF, -#ifdef WITH_PDF_EXPORT - M_SAVEPDF, -#endif - M_BAR_P2, - M_PRINT, - M_BAR_P3, - M_CLOSETAB, - M_CLOSEWIN, - M_BAR_P4, - M_ABOUT, - M_BAR_P5, - M_QUIT, - /* Edit menu */ - M_EDIT, - M_CUT, - M_COPY, - M_PASTE, - M_BAR_E1, - M_SELALL, - M_CLEAR, - M_BAR_E2, - M_UNDO, - M_REDO, - /* Browser menu */ - M_BROWSER, - M_FIND, - M_BAR_B1, - M_HISTLOCL, - M_HISTGLBL, - M_BAR_B2, - M_COOKIES, - M_BAR_B3, - M_SCALE, - M_SCALEDEC, - M_SCALENRM, - M_SCALEINC, - M_IMAGES, - M_IMGFORE, - M_IMGBACK, - M_JS, - M_BAR_B4, - M_REDRAW, - /* Hotlist menu */ - M_HOTLIST, - M_HLADD, - M_HLSHOW, - M_BAR_H1, // 47 - AMI_MENU_HOTLIST, /* Where the hotlist entries start */ - AMI_MENU_HOTLIST_MAX = AMI_MENU_HOTLIST + AMI_HOTLIST_ITEMS, - /* Settings menu */ - M_PREFS, - M_PREDIT, - M_BAR_S1, - M_SNAPSHOT, - M_PRSAVE, - /* ARexx menu */ - M_AREXX, - M_AREXXEX, - M_BAR_A1, - AMI_MENU_AREXX, - AMI_MENU_AREXX_MAX = AMI_MENU_AREXX + AMI_MENU_AREXX_ITEMS +struct ami_menu_data { + char *restrict menulab; + Object *restrict menuobj; + char *restrict menukey; + char *restrict menuicon; + struct Hook menu_hook; + UBYTE menutype; + UWORD flags; }; -/* We can get away with AMI_MENU_MAX falling short as it is - * only used for freeing the UTF-8 converted menu labels */ -#define AMI_MENU_MAX AMI_MENU_AREXX - -/* The Intuition menu numbers of some menus we might need to modify */ -#define AMI_MENU_SAVEAS_TEXT FULLMENUNUM(0,4,1) -#define AMI_MENU_SAVEAS_COMPLETE FULLMENUNUM(0,4,2) -#define AMI_MENU_SAVEAS_IFF FULLMENUNUM(0,4,3) -#define AMI_MENU_SAVEAS_PDF FULLMENUNUM(0,4,4) -#define AMI_MENU_CLOSETAB FULLMENUNUM(0,8,0) -#define AMI_MENU_CUT FULLMENUNUM(1,0,0) -#define AMI_MENU_COPY FULLMENUNUM(1,1,0) -#define AMI_MENU_PASTE FULLMENUNUM(1,2,0) -#define AMI_MENU_SELECTALL FULLMENUNUM(1,4,0) -#define AMI_MENU_CLEAR FULLMENUNUM(1,5,0) -#define AMI_MENU_UNDO FULLMENUNUM(1,8,0) -#define AMI_MENU_REDO FULLMENUNUM(1,9,0) -#define AMI_MENU_FIND FULLMENUNUM(2,0,0) -#define AMI_MENU_FOREIMG FULLMENUNUM(2,8,0) -#define AMI_MENU_BACKIMG FULLMENUNUM(2,8,1) -#define AMI_MENU_JS FULLMENUNUM(2,9,0) - -struct gui_window; -struct gui_window_2; +/** empty space */ +#define NSA_SPACE "blankspace.png" -void ami_free_menulabs(struct gui_window_2 *gwin); -struct Menu *ami_menu_create(struct gui_window_2 *gwin); -void ami_menu_refresh(struct gui_window_2 *gwin); -void ami_menu_update_checked(struct gui_window_2 *gwin); -void ami_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c); +/* cleanup */ void ami_menu_free_glyphs(void); -void ami_menu_free(struct gui_window_2 *gwin); -/** - * Sets that an item linked to a toggle menu item has been changed. - */ -void ami_menu_set_check_toggled(void); +/* generic menu alloc/free/layout */ +void ami_menu_alloc_item(struct ami_menu_data **md, int num, UBYTE type, + const char *restrict label, const char *restrict key, const char *restrict icon, + void *restrict func, void *restrict hookdata, UWORD flags); +struct Menu *ami_menu_layout(struct ami_menu_data **md, int max); +void ami_menu_free_menu(struct ami_menu_data **md, int max, struct Menu *imenu); +void ami_menu_free_lab_item(struct ami_menu_data **md, int i); -/** - * Gets if the menu needs updating because an item linked - * to a toggle menu item has been changed. - * NB: This also *clears* the state - * - * \return true if the menus need refreshing - */ -bool ami_menu_get_check_toggled(void); +/* refresh a menu's children */ +void ami_menu_refresh(struct Menu *menu, struct ami_menu_data **md, int menu_item, int max, + nserror (*cb)(struct ami_menu_data **md)); /** - * Gets if NetSurf has been quit from the menu - * - * \return true if NetSurf has been quit + * Get the selected state of a menu item */ -bool ami_menu_quit_selected(void); +bool ami_menu_get_selected(struct Menu *menu, struct IntuiMessage *msg); #endif diff --git a/frontends/amiga/misc.c b/frontends/amiga/misc.c index c09b283..5ca4f90 100755 --- a/frontends/amiga/misc.c +++ b/frontends/amiga/misc.c @@ -42,58 +42,6 @@ #include "amiga/misc.h" #include "amiga/utf8.h" -void *ami_misc_allocvec_clear(int size, UBYTE value) -{ -#ifdef __amigaos4__ - return AllocVecTags(size, AVT_ClearWithValue, value, TAG_DONE); -#else - void *mem = AllocVec(size, MEMF_ANY); - if (mem) memset(mem, value, size); - return mem; -#endif -} - -APTR ami_misc_itempool_create(int size) -{ -#ifdef __amigaos4__ - return AllocSysObjectTags(ASOT_ITEMPOOL, - ASOITEM_MFlags, MEMF_PRIVATE, - ASOITEM_ItemSize, size, - ASOITEM_GCPolicy, ITEMGC_AFTERCOUNT, - ASOITEM_GCParameter, 100, - TAG_DONE); -#else - return CreatePool(MEMF_ANY, 20 * size, size); -#endif -} - -void ami_misc_itempool_delete(APTR pool) -{ -#ifdef __amigaos4__ - FreeSysObject(ASOT_ITEMPOOL, pool); -#else - DeletePool(pool); -#endif -} - -APTR ami_misc_itempool_alloc(APTR pool, int size) -{ -#ifdef __amigaos4__ - return ItemPoolAlloc(pool); -#else - return AllocPooled(pool, size); -#endif -} - -void ami_misc_itempool_free(APTR restrict pool, APTR restrict item, int size) -{ -#ifdef __amigaos4__ - ItemPoolFree(pool, item); -#else - FreePooled(pool, item, size); -#endif -} - static LONG ami_misc_req(const char *message, uint32 type) { LONG ret = 0; diff --git a/frontends/amiga/misc.h b/frontends/amiga/misc.h index c7ae5af..a749794 100644 --- a/frontends/amiga/misc.h +++ b/frontends/amiga/misc.h @@ -35,15 +35,6 @@ struct Window; * faliure displaying the message to the user. */ nserror amiga_warn_user(const char *warning, const char *detail); - -void *ami_misc_allocvec_clear(int size, UBYTE value); - -/* Itempool cross-compatibility */ -APTR ami_misc_itempool_create(int size); -void ami_misc_itempool_delete(APTR pool); -APTR ami_misc_itempool_alloc(APTR pool, int size); -void ami_misc_itempool_free(APTR pool, APTR item, int size); - char *translate_escape_chars(const char *s); void ami_misc_fatal_error(const char *message); int32 amiga_warn_user_multi(const char *body, diff --git a/frontends/amiga/object.c b/frontends/amiga/object.c index 6459d63..37fc724 100755 --- a/frontends/amiga/object.c +++ b/frontends/amiga/object.c @@ -26,7 +26,7 @@ #include <exec/lists.h> #include <exec/nodes.h> -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/object.h" #ifdef __amigaos4__ @@ -41,7 +41,7 @@ static APTR pool_nsobj = NULL; bool ami_object_init(void) { - pool_nsobj = ami_misc_itempool_create(sizeof(struct nsObject)); + pool_nsobj = ami_memory_itempool_create(sizeof(struct nsObject)); if(pool_nsobj == NULL) return false; else return true; @@ -49,7 +49,7 @@ bool ami_object_init(void) void ami_object_fini(void) { - ami_misc_itempool_delete(pool_nsobj); + ami_memory_itempool_delete(pool_nsobj); } /* Slightly abstract MinList initialisation */ @@ -62,7 +62,7 @@ static void ami_NewMinList(struct MinList *list) /* Allocate and initialise a new MinList */ struct MinList *ami_AllocMinList(void) { - struct MinList *objlist = (struct MinList *)AllocVecTagList(sizeof(struct nsList), NULL); + struct MinList *objlist = (struct MinList *)malloc(sizeof(struct nsList)); if(objlist == NULL) return NULL; ami_NewMinList(objlist); return objlist; @@ -78,7 +78,7 @@ struct nsObject *AddObject(struct MinList *objlist, ULONG otype) { struct nsObject *dtzo; - dtzo = (struct nsObject *)ami_misc_itempool_alloc(pool_nsobj, sizeof(struct nsObject)); + dtzo = (struct nsObject *)ami_memory_itempool_alloc(pool_nsobj, sizeof(struct nsObject)); if(dtzo == NULL) return NULL; memset(dtzo, 0, sizeof(struct nsObject)); @@ -98,9 +98,9 @@ static void DelObjectInternal(struct nsObject *dtzo, BOOL free_obj) { Remove((struct Node *)dtzo); if(dtzo->callback != NULL) dtzo->callback(dtzo->objstruct); - if(dtzo->objstruct && free_obj) FreeVec(dtzo->objstruct); + if(dtzo->objstruct && free_obj) free(dtzo->objstruct); if(dtzo->dtz_Node.ln_Name) free(dtzo->dtz_Node.ln_Name); - ami_misc_itempool_free(pool_nsobj, dtzo, sizeof(struct nsObject)); + ami_memory_itempool_free(pool_nsobj, dtzo, sizeof(struct nsObject)); dtzo = NULL; } @@ -119,18 +119,18 @@ void FreeObjList(struct MinList *objlist) struct nsObject *node; struct nsObject *nnode; - if(IsMinListEmpty((struct MinList *)objlist)) return; - node = (struct nsObject *)GetHead((struct List *)objlist); - - do { - nnode=(struct nsObject *)GetSucc((struct Node *)node); - if(node->Type == AMINS_RECT) { - DelObjectNoFree(node); - } else { - DelObject(node); - } - } while((node=nnode)); - - FreeVec(objlist); + if(IsMinListEmpty((struct MinList *)objlist) == FALSE) { + node = (struct nsObject *)GetHead((struct List *)objlist); + + do { + nnode = (struct nsObject *)GetSucc((struct Node *)node); + if(node->Type == AMINS_RECT) { + DelObjectNoFree(node); + } else { + DelObject(node); + } + } while((node = nnode)); + } + free(objlist); } diff --git a/frontends/amiga/object.h b/frontends/amiga/object.h index be96504..70bb550 100755 --- a/frontends/amiga/object.h +++ b/frontends/amiga/object.h @@ -33,6 +33,7 @@ enum AMINS_HISTORYWINDOW, AMINS_GUIOPTSWINDOW, AMINS_PRINTWINDOW, + AMINS_COREWINDOW, AMINS_FONT, AMINS_MIME, AMINS_RECT diff --git a/frontends/amiga/options.h b/frontends/amiga/options.h index 3aa8451..b5b2b3b 100644 --- a/frontends/amiga/options.h +++ b/frontends/amiga/options.h @@ -89,8 +89,11 @@ NSOPTION_INTEGER(monitor_aspect_x, 0) NSOPTION_INTEGER(monitor_aspect_y, 0) NSOPTION_BOOL(accept_lang_locale, true) NSOPTION_STRING(local_charset, "ISO-8859-1") +#ifdef __amigaos4__ +/* Options relevant for OS4 only */ +NSOPTION_BOOL(use_extmem, true) +#else /* Options relevant for OS3 only */ -#ifndef __amigaos4__ NSOPTION_BOOL(friend_bitmap, false) #endif diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c index 6722ca8..c082602 100644 --- a/frontends/amiga/os3support.c +++ b/frontends/amiga/os3support.c @@ -46,7 +46,154 @@ #define FAILURE (FALSE) #define NO ! -ULONG __slab_max_size = 8192; /* Enable clib2's slab allocator */ +/* Utility */ +struct FormatContext +{ + STRPTR Index; + LONG Size; + BOOL Overflow; +}; + +STATIC VOID ASM +StuffChar( + REG(a3, struct FormatContext * Context), + REG(d0, UBYTE Char)) +{ + /* Is there still room? */ + if(Context->Size > 0) + { + (*Context->Index) = Char; + + Context->Index++; + Context->Size--; + + /* Is there only a single character left? */ + if(Context->Size == 1) + { + /* Provide null-termination. */ + (*Context->Index) = '\0'; + + /* Don't store any further characters. */ + Context->Size = 0; + } + } + else + { + Context->Overflow = TRUE; + } +} + +BOOL +VSPrintfN( + LONG MaxLen, + STRPTR Buffer, + const STRPTR FormatString, + const va_list VarArgs) +{ + BOOL result = FAILURE; + + /* format a text, but place only up to MaxLen + * characters in the output buffer (including + * the terminating NUL) + */ + + if (Buffer == NULL || FormatString == NULL) return(result); + + if(MaxLen > 1) + { + struct FormatContext Context; + + Context.Index = Buffer; + Context.Size = MaxLen; + Context.Overflow = FALSE; + + RawDoFmt(FormatString,(APTR)VarArgs,(VOID (*)())StuffChar,(APTR)&Context); + + if(NO Context.Overflow) + result = SUCCESS; + } + + return(result); +} + +BOOL +SPrintfN( + LONG MaxLen, + STRPTR Buffer, + const STRPTR FormatString, + ...) +{ + va_list VarArgs; + BOOL result = FAILURE; + + /* format a text, varargs version */ + + if (Buffer == NULL && FormatString == NULL) return result; + + va_start(VarArgs,FormatString); + result = VSPrintfN(MaxLen,Buffer,FormatString,VarArgs); + va_end(VarArgs); + + return(result); +} + +char *ASPrintf(const char *fmt, ...) +{ + int r; + va_list ap; + static char buffer[2048]; + char *rbuf; + + va_start(ap, fmt); + r = VSPrintfN(2048, buffer, (const STRPTR)fmt, ap); + va_end(ap); + + r = strlen(buffer); + rbuf = AllocVec(r+1, MEMF_CLEAR); + if (rbuf != NULL) + { + strncpy(rbuf, buffer, r); + } + return rbuf; +} + +/* C */ +char *strlwr(char *str) +{ + size_t i; + size_t len = strlen(str); + + for(i=0; i<len; i++) + str[i] = tolower((unsigned char)str[i]); + + return str; +} + +char *strsep(char **s1, const char *s2) +{ + char *const p1 = *s1; + + if (p1 != NULL) { + *s1 = strpbrk(p1, s2); + if (*s1 != NULL) { + *(*s1)++ = '\0'; + } + } + return p1; +} + +int scandir(const char *dir, struct dirent ***namelist, + int (*filter)(const struct dirent *), + int (*compar)(const struct dirent **, const struct dirent **)) +{ + /*\todo stub function, needs writing, preferably into clib2 */ + return 0; +} + +long long int strtoll(const char *nptr, char **endptr, int base) +{ + return (long long int)strtol(nptr, endptr, base); +} /* Diskfont */ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG flags) @@ -101,7 +248,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl } size = GetFileSize(fh); - buffer = (UBYTE *)AllocVec(size, MEMF_ANY); + buffer = (UBYTE *)malloc(size); if(buffer == NULL) { LOG("Unable to allocate memory"); Close(fh); @@ -116,7 +263,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl struct TagItem *tag = (struct TagItem *)buffer; if((tag->ti_Tag != OT_FileIdent) || (tag->ti_Data != (ULONG)size)) { LOG("Invalid OTAG file"); - FreeVec(buffer); + free(buffer); FreeVec(otagpath); return NULL; } @@ -134,7 +281,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl fname = ASPrintf("%s.library", ti->ti_Data); } else { LOG("Cannot find OT_Engine tag"); - FreeVec(buffer); + free(buffer); FreeVec(otagpath); return NULL; } @@ -143,7 +290,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl if(BulletBase == NULL) { LOG("Unable to open font engine %s", fname); - FreeVec(buffer); + free(buffer); FreeVec(fname); FreeVec(otagpath); } @@ -157,7 +304,7 @@ struct OutlineFont *OpenOutlineFont(STRPTR fileName, struct List *list, ULONG fl OT_OTagList, (ULONG)buffer, TAG_DONE); - of = AllocVec(sizeof(struct OutlineFont), MEMF_CLEAR); + of = calloc(1, sizeof(struct OutlineFont)); if(of == NULL) return NULL; of->BulletBase = BulletBase; @@ -176,8 +323,8 @@ void CloseOutlineFont(struct OutlineFont *of, struct List *list) CloseLibrary((struct Library *)BulletBase); FreeVec(of->OTagPath); - FreeVec(of->olf_OTagList); - FreeVec(of); + free(of->olf_OTagList); + free(of); } @@ -185,13 +332,13 @@ void CloseOutlineFont(struct OutlineFont *of, struct List *list) int64 GetFileSize(BPTR fh) { int32 size = 0; - struct FileInfoBlock *fib = AllocVec(sizeof(struct FileInfoBlock), MEMF_ANY); + struct FileInfoBlock *fib = malloc(sizeof(struct FileInfoBlock)); if(fib == NULL) return 0; ExamineFH(fh, fib); size = fib->fib_Size; - FreeVec(fib); + free(fib); return (int64)size; } @@ -282,155 +429,5 @@ APTR NewObject(struct IClass * classPtr, CONST_STRPTR classID, ULONG tagList, .. { return NewObjectA(classPtr, classID, (const struct TagItem *) &tagList); } - -/* Utility */ -struct FormatContext -{ - STRPTR Index; - LONG Size; - BOOL Overflow; -}; - -STATIC VOID ASM -StuffChar( - REG(a3, struct FormatContext * Context), - REG(d0, UBYTE Char)) -{ - /* Is there still room? */ - if(Context->Size > 0) - { - (*Context->Index) = Char; - - Context->Index++; - Context->Size--; - - /* Is there only a single character left? */ - if(Context->Size == 1) - { - /* Provide null-termination. */ - (*Context->Index) = '\0'; - - /* Don't store any further characters. */ - Context->Size = 0; - } - } - else - { - Context->Overflow = TRUE; - } -} - -BOOL -VSPrintfN( - LONG MaxLen, - STRPTR Buffer, - const STRPTR FormatString, - const va_list VarArgs) -{ - BOOL result = FAILURE; - - /* format a text, but place only up to MaxLen - * characters in the output buffer (including - * the terminating NUL) - */ - - if (Buffer == NULL || FormatString == NULL) return(result); - - if(MaxLen > 1) - { - struct FormatContext Context; - - Context.Index = Buffer; - Context.Size = MaxLen; - Context.Overflow = FALSE; - - RawDoFmt(FormatString,(APTR)VarArgs,(VOID (*)())StuffChar,(APTR)&Context); - - if(NO Context.Overflow) - result = SUCCESS; - } - - return(result); -} - -BOOL -SPrintfN( - LONG MaxLen, - STRPTR Buffer, - const STRPTR FormatString, - ...) -{ - va_list VarArgs; - BOOL result = FAILURE; - - /* format a text, varargs version */ - - if (Buffer == NULL && FormatString == NULL) return result; - - va_start(VarArgs,FormatString); - result = VSPrintfN(MaxLen,Buffer,FormatString,VarArgs); - va_end(VarArgs); - - return(result); -} - -char *ASPrintf(const char *fmt, ...) -{ - int r; - va_list ap; - static char buffer[2048]; - char *rbuf; - - va_start(ap, fmt); - r = VSPrintfN(2048, buffer, (const STRPTR)fmt, ap); - va_end(ap); - - r = strlen(buffer); - rbuf = AllocVec(r+1, MEMF_CLEAR); - if (rbuf != NULL) - { - strncpy(rbuf, buffer, r); - } - return rbuf; -} - -/* C */ -char *strlwr(char *str) -{ - size_t i; - size_t len = strlen(str); - - for(i=0; i<len; i++) - str[i] = tolower((unsigned char)str[i]); - - return str; -} - -char *strsep(char **s1, const char *s2) -{ - char *const p1 = *s1; - - if (p1 != NULL) { - *s1 = strpbrk(p1, s2); - if (*s1 != NULL) { - *(*s1)++ = '\0'; - } - } - return p1; -} - -int scandir(const char *dir, struct dirent ***namelist, - int (*filter)(const struct dirent *), - int (*compar)(const struct dirent **, const struct dirent **)) -{ - /*\todo stub function, needs writing, preferably into clib2 */ - return 0; -} - -long long int strtoll(const char *nptr, char **endptr, int base) -{ - return (long long int)strtol(nptr, endptr, base); -} - #endif diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h index 94d1d58..856439b 100644 --- a/frontends/amiga/os3support.h +++ b/frontends/amiga/os3support.h @@ -152,7 +152,6 @@ #define DevNameFromLock(A,B,C,D) NameFromLock(A,B,C) /* Exec */ -#define AllocVecTagList(SZ,TAG) AllocVec(SZ,MEMF_ANY) /* AllocVecTagList with no tags */ #define FindIName FindName /* Intuition */ diff --git a/frontends/amiga/plotters.c b/frontends/amiga/plotters.c index 1917171..6bae634 100644 --- a/frontends/amiga/plotters.c +++ b/frontends/amiga/plotters.c @@ -33,6 +33,7 @@ #include <math.h> #include <assert.h> +#include <stdlib.h> #include "utils/nsoption.h" #include "utils/utils.h" @@ -45,6 +46,7 @@ #include "amiga/bitmap.h" #include "amiga/font.h" #include "amiga/gui.h" +#include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/rtg.h" #include "amiga/utf8.h" @@ -145,14 +147,10 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height, bool for gg->height = height; gg->layerinfo = NewLayerInfo(); - gg->areabuf = AllocVecTagList(AREA_SIZE, NULL); + gg->areabuf = malloc(AREA_SIZE); -#ifdef __amigaos4__ - gg->tmprasbuf = AllocVecTagList(width * height, NULL); -#else /* OS3/AGA requires this to be in chip mem. RTG would probably rather it wasn't. */ - gg->tmprasbuf = AllocVec(width * height, MEMF_CHIP); -#endif + gg->tmprasbuf = ami_memory_chip_alloc(width * height); if(gg->palette_mapped == true) { gg->bm = AllocBitMap(width, height, depth, 0, friend); @@ -171,7 +169,7 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height, bool for if(!gg->bm) amiga_warn_user("NoMemory",""); - gg->rp = AllocVecTagList(sizeof(struct RastPort), NULL); + gg->rp = malloc(sizeof(struct RastPort)); if(!gg->rp) amiga_warn_user("NoMemory",""); InitRastPort(gg->rp); @@ -184,18 +182,18 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height, bool for InstallLayerHook(gg->rp->Layer,LAYERS_NOBACKFILL); - gg->rp->AreaInfo = AllocVecTagList(sizeof(struct AreaInfo), NULL); + gg->rp->AreaInfo = malloc(sizeof(struct AreaInfo)); if((!gg->areabuf) || (!gg->rp->AreaInfo)) amiga_warn_user("NoMemory",""); - InitArea(gg->rp->AreaInfo,gg->areabuf, AREA_SIZE/5); + InitArea(gg->rp->AreaInfo, gg->areabuf, AREA_SIZE/5); - gg->rp->TmpRas = AllocVecTagList(sizeof(struct TmpRas), NULL); + gg->rp->TmpRas = malloc(sizeof(struct TmpRas)); if((!gg->tmprasbuf) || (!gg->rp->TmpRas)) amiga_warn_user("NoMemory",""); InitTmpRas(gg->rp->TmpRas, gg->tmprasbuf, width*height); if((gg->palette_mapped == true) && (pool_pens == NULL)) { - pool_pens = ami_misc_itempool_create(sizeof(struct ami_plot_pen)); + pool_pens = ami_memory_itempool_create(sizeof(struct ami_plot_pen)); } gg->apen = 0x00000000; @@ -212,19 +210,19 @@ void ami_free_layers(struct gui_globals *gg) init_layers_count--; if((init_layers_count == 0) && (pool_pens != NULL)) { - ami_misc_itempool_delete(pool_pens); + ami_memory_itempool_delete(pool_pens); pool_pens = NULL; } if(gg->rp) { DeleteLayer(0,gg->rp->Layer); - FreeVec(gg->rp->TmpRas); - FreeVec(gg->rp->AreaInfo); - FreeVec(gg->rp); + free(gg->rp->TmpRas); + free(gg->rp->AreaInfo); + free(gg->rp); } - FreeVec(gg->tmprasbuf); - FreeVec(gg->areabuf); + ami_memory_chip_free(gg->tmprasbuf); + free(gg->areabuf); DisposeLayerInfo(gg->layerinfo); if(gg->palette_mapped == false) { if(gg->bm) ami_rtg_freebitmap(gg->bm); @@ -258,7 +256,7 @@ static ULONG ami_plot_obtain_pen(struct MinList *shared_pens, ULONG colr) if(pen == -1) LOG("WARNING: Cannot allocate pen for ABGR:%lx", colr); if((shared_pens != NULL) && (pool_pens != NULL)) { - if((node = (struct ami_plot_pen *)ami_misc_itempool_alloc(pool_pens, sizeof(struct ami_plot_pen)))) { + if((node = (struct ami_plot_pen *)ami_memory_itempool_alloc(pool_pens, sizeof(struct ami_plot_pen)))) { node->pen = pen; AddTail((struct List *)shared_pens, (struct Node *)node); } @@ -282,7 +280,7 @@ void ami_plot_release_pens(struct MinList *shared_pens) nnode = (struct ami_plot_pen *)GetSucc((struct Node *)node); ReleasePen(scrn->ViewPort.ColorMap, node->pen); Remove((struct Node *)node); - ami_misc_itempool_free(pool_pens, node, sizeof(struct ami_plot_pen)); + ami_memory_itempool_free(pool_pens, node, sizeof(struct ami_plot_pen)); } while((node = nnode)); glob->apen = 0x00000000; @@ -712,7 +710,7 @@ static bool ami_bitmap_tile(int x, int y, int width, int height, bfbm.offsetx = ox; bfbm.offsety = oy; bfbm.mask = ami_bitmap_get_mask(bitmap, width, height, tbm); - bfh = ami_misc_allocvec_clear(sizeof(struct Hook), 0); /* NB: Was not MEMF_PRIVATE */ + bfh = calloc(1, sizeof(struct Hook)); bfh->h_Entry = (HOOKFUNC)ami_bitmap_tile_hook; bfh->h_SubEntry = 0; bfh->h_Data = &bfbm; @@ -726,7 +724,7 @@ static bool ami_bitmap_tile(int x, int y, int width, int height, if(amiga_bitmap_get_opaque(bitmap)) DeleteBackFillHook(bfh); else #endif - FreeVec(bfh); + free(bfh); if((ami_bitmap_is_nativebm(bitmap, tbm) == false)) { /**\todo is this logic logical? */ diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c index 6926647..5fab0f9 100644 --- a/frontends/amiga/print.c +++ b/frontends/amiga/print.c @@ -96,6 +96,14 @@ struct ami_printer_info struct Window *win; }; +struct ami_print_window { + struct ami_generic_window w; + struct Window *win; + Object *objects[OID_LAST]; + Object *gadgets[GID_LAST]; + struct hlcache_handle *c; +}; + enum { PGID_MAIN=0, @@ -119,6 +127,13 @@ static struct ami_printer_info ami_print_info; static CONST_STRPTR gadlab[PGID_LAST]; static STRPTR printers[11]; +static BOOL ami_print_event(void *w); + +static const struct ami_win_event_table ami_print_table = { + ami_print_event, + NULL, /* we don't explicitly close the print window on quit (or at all???) */ +}; + static void ami_print_ui_setup(void) { gadlab[PGID_PRINTER] = (char *)ami_utf8_easy((char *)messages_get("Printer")); @@ -133,11 +148,11 @@ static void ami_print_ui_free(void) int i; for(i = 0; i < PGID_LAST; i++) { - if(gadlab[i]) FreeVec((APTR)gadlab[i]); + if(gadlab[i]) free((APTR)gadlab[i]); } for(i = 0; i < 10; i++) { - if(printers[i]) FreeVec(printers[i]); + if(printers[i]) free(printers[i]); } } @@ -227,21 +242,21 @@ void ami_print_ui(struct hlcache_handle *c) char filename[30]; int i; - struct ami_print_window *pw = ami_misc_allocvec_clear(sizeof(struct ami_print_window), 0); + struct ami_print_window *pw = calloc(1, sizeof(struct ami_print_window)); pw->c = c; - printers[0] = ami_misc_allocvec_clear(50, 0); + printers[0] = calloc(1, 50); ami_print_readunit("ENV:Sys/printer.prefs", printers[0], 50, 0); strcpy(filename,"ENV:Sys/printerN.prefs"); for (i = 1; i < 10; i++) { filename[15] = '0' + i; - printers[i] = AllocVecTagList(50, NULL); + printers[i] = malloc(50); if(!ami_print_readunit(filename, printers[i], 50, i)) { - FreeVec(printers[i]); + free(printers[i]); printers[i] = NULL; break; } @@ -325,22 +340,21 @@ void ami_print_ui(struct hlcache_handle *c) EndWindow; pw->win = (struct Window *)RA_OpenWindow(pw->objects[OID_MAIN]); - - pw->node = AddObject(window_list, AMINS_PRINTWINDOW); - pw->node->objstruct = pw; + ami_gui_win_list_add(pw, AMINS_PRINTWINDOW, &ami_print_table); } static void ami_print_close(struct ami_print_window *pw) { DisposeObject(pw->objects[OID_MAIN]); - DelObject(pw->node); + ami_gui_win_list_remove(pw); ami_print_ui_free(); } -BOOL ami_print_event(struct ami_print_window *pw) +static BOOL ami_print_event(void *w) { /* return TRUE if window destroyed */ + struct ami_print_window *pw = (struct ami_print_window *)w; ULONG result; uint16 code; struct hlcache_handle *c; @@ -482,7 +496,7 @@ struct MsgPort *ami_print_get_msgport(void) bool ami_print_begin(struct print_settings *ps) { - ami_print_info.gg = ami_misc_allocvec_clear(sizeof(struct gui_globals), 0); + ami_print_info.gg = calloc(1, sizeof(struct gui_globals)); if(!ami_print_info.gg) return false; ami_init_layers(ami_print_info.gg, @@ -509,7 +523,7 @@ bool ami_print_next_page(void) void ami_print_end(void) { ami_free_layers(ami_print_info.gg); - FreeVec(ami_print_info.gg); + free(ami_print_info.gg); DisposeObject(ami_print_info.objects[OID_MAIN]); ami_gui_set_default_gg(); diff --git a/frontends/amiga/print.h b/frontends/amiga/print.h index bdd409b..0d6b4f5 100755 --- a/frontends/amiga/print.h +++ b/frontends/amiga/print.h @@ -21,18 +21,10 @@ #include <proto/exec.h> struct content; - -struct ami_print_window { - struct nsObject *node; - struct Window *win; - Object *objects[OID_LAST]; - Object *gadgets[GID_LAST]; - struct hlcache_handle *c; -}; +struct ami_print_window; void ami_print(struct hlcache_handle *c, int copies); void ami_print_ui(struct hlcache_handle *c); -BOOL ami_print_event(struct ami_print_window *pw); bool ami_print_cont(void); struct MsgPort *ami_print_init(void); void ami_print_free(void); diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c index 707d7bb..bfafe9c 100644 --- a/frontends/amiga/schedule.c +++ b/frontends/amiga/schedule.c @@ -30,7 +30,7 @@ #include "utils/errors.h" #include "utils/log.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/schedule.h" struct nscallback diff --git a/frontends/amiga/schedule.h b/frontends/amiga/schedule.h index fb648ea..199e6db 100755 --- a/frontends/amiga/schedule.h +++ b/frontends/amiga/schedule.h @@ -19,6 +19,7 @@ #ifndef AMIGA_SCHEDULE_H #define AMIGA_SCHEDULE_H #include "amiga/os3support.h" +#include "utils/errors.h" /** * Schedule a callback. diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c index 429545e..99ee5b4 100755 --- a/frontends/amiga/search.c +++ b/frontends/amiga/search.c @@ -27,6 +27,7 @@ #include "utils/config.h" #include <ctype.h> #include <string.h> +#include <stdlib.h> #include <proto/intuition.h> #include <proto/exec.h> @@ -56,7 +57,7 @@ #include "amiga/libs.h" #include "amiga/gui.h" -#include "amiga/misc.h" +#include "amiga/memory.h" #include "amiga/search.h" #include "amiga/object.h" #include "amiga/theme.h" @@ -68,7 +69,7 @@ static bool search_insert; struct find_window { - struct nsObject *node; + struct ami_generic_window w; struct Window *win; Object *objects[GID_LAST]; struct gui_window *gwin; @@ -83,6 +84,7 @@ static void ami_search_set_hourglass(bool active, void *p); static void ami_search_add_recent(const char *string, void *p); static void ami_search_set_forward_state(bool active, void *p); static void ami_search_set_back_state(bool active, void *p); +static BOOL ami_search_event(void *w); static struct gui_search_table search_table = { ami_search_set_status, @@ -92,6 +94,11 @@ static struct gui_search_table search_table = { ami_search_set_back_state, }; +static const struct ami_win_event_table ami_search_table = { + ami_search_event, + NULL, /* we don't explicitly close the search window on quit */ +}; + struct gui_search_table *amiga_search_table = &search_table; struct gui_window *ami_search_get_gwin(struct find_window *fw) @@ -122,7 +129,7 @@ void ami_search_open(struct gui_window *gwin) return; } - fwin = ami_misc_allocvec_clear(sizeof(struct find_window), 0); + fwin = calloc(1, sizeof(struct find_window)); fwin->objects[OID_MAIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), @@ -183,8 +190,7 @@ void ami_search_open(struct gui_window *gwin) fwin->win = (struct Window *)RA_OpenWindow(fwin->objects[OID_MAIN]); fwin->gwin = gwin; - fwin->node = AddObject(window_list,AMINS_FINDWINDOW); - fwin->node->objstruct = fwin; + ami_gui_win_list_add(fwin, AMINS_FINDWINDOW, &ami_search_table); gwin->shared->searchwin = fwin; ActivateLayoutGadget((struct Gadget *)fwin->objects[GID_MAIN], fwin->win, @@ -196,11 +202,11 @@ void ami_search_close(void) browser_window_search_clear(fwin->gwin->bw); fwin->gwin->shared->searchwin = NULL; DisposeObject(fwin->objects[OID_MAIN]); - DelObject(fwin->node); - fwin=NULL; + ami_gui_win_list_remove(fwin); + fwin = NULL; } -BOOL ami_search_event(void) +static BOOL ami_search_event(void *w) { /* return TRUE if window destroyed */ ULONG result; diff --git a/frontends/amiga/search.h b/frontends/amiga/search.h index c0c6f01..f30352c 100755 --- a/frontends/amiga/search.h +++ b/frontends/amiga/search.h @@ -32,11 +32,6 @@ struct gui_search_table *amiga_search_table; void ami_search_open(struct gui_window *gwin); /** - * Process search events - */ -BOOL ami_search_event(void); - -/** * Close search */ void ami_search_close(void); diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c index 83798f2..5929f7e 100644 --- a/frontends/amiga/sslcert.c +++ b/frontends/amiga/sslcert.c @@ -1,5 +1,5 @@ /* - * Copyright 2009 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -16,39 +16,358 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <proto/exec.h> +/** + * \file + * Implementation of Amiga certificate viewing using core windows. + */ + +#include <stdint.h> +#include <stdlib.h> + +#include <proto/intuition.h> + +#include <classes/window.h> +#include <gadgets/button.h> +#include <gadgets/layout.h> +#include <gadgets/scroller.h> +#include <gadgets/space.h> +#include <images/label.h> + +#include <intuition/icclass.h> +#include <reaction/reaction_macros.h> -#include "utils/nsurl.h" -#include "content/llcache.h" -#include "netsurf/mouse.h" -#include "netsurf/window.h" +#include "utils/log.h" +#include "netsurf/keypress.h" +#include "netsurf/plotters.h" #include "desktop/sslcert_viewer.h" +#include "utils/messages.h" +#include "utils/nsoption.h" -#include "amiga/tree.h" +#include "amiga/corewindow.h" +#include "amiga/libs.h" #include "amiga/sslcert.h" +#include "amiga/utf8.h" + + +/** + * Amiga certificate viewing window context + */ +enum { + GID_SSLCERT_ACCEPT = GID_CW_LAST, + GID_SSLCERT_REJECT, + GID_SSLCERT_LAST +}; + +#define GID_SSLCERT_SIZE GID_SSLCERT_LAST - GID_CW_LAST + +struct ami_crtvrfy_window { + /** Amiga core window context */ + struct ami_corewindow core; -nserror gui_cert_verify(nsurl *url, - const struct ssl_cert_info *certs, unsigned long num, - nserror (*cb)(bool proceed, void *pw), void *cbpw) + /** Amiga GUI stuff */ + Object *sslcert_objects[GID_SSLCERT_LAST]; // technically wasting a few bytes here + + char *sslerr; + char *sslaccept; + char *sslreject; + + /** SSL certificate viewer context data */ + struct sslcert_session_data *ssl_data; +}; + +/** + * destroy a previously created certificate view + */ +static nserror +ami_crtvrfy_destroy(struct ami_crtvrfy_window *crtvrfy_win) +{ + nserror res; + + res = sslcert_viewer_fini(crtvrfy_win->ssl_data); + if (res == NSERROR_OK) { + ami_utf8_free(crtvrfy_win->sslerr); + ami_utf8_free(crtvrfy_win->sslaccept); + ami_utf8_free(crtvrfy_win->sslreject); + res = ami_corewindow_fini(&crtvrfy_win->core); /* closes the window for us */ + } + return res; +} + +static void +ami_crtvrfy_accept(struct ami_corewindow *ami_cw) { - struct sslcert_session_data *data; - struct treeview_window *ssl_window; + struct ami_crtvrfy_window *crtvrfy_win; + /* technically degenerate container of */ + crtvrfy_win = (struct ami_crtvrfy_window *)ami_cw; - sslcert_viewer_create_session_data(num, url, cb, cbpw, - certs, &data); - ssl_current_session = data; + sslcert_viewer_accept(crtvrfy_win->ssl_data); - ssl_window = ami_tree_create(TREE_SSLCERT, data); - if (!ssl_window) { - return NSERROR_INIT_FAILED; + ami_crtvrfy_destroy(crtvrfy_win); +} + +static void +ami_crtvrfy_reject(struct ami_corewindow *ami_cw) +{ + struct ami_crtvrfy_window *crtvrfy_win; + /* technically degenerate container of */ + crtvrfy_win = (struct ami_crtvrfy_window *)ami_cw; + + sslcert_viewer_reject(crtvrfy_win->ssl_data); + + ami_crtvrfy_destroy(crtvrfy_win); +} + +/** + * callback for unknown events on Amiga core window + * eg. buttons in the ssl cert window + * (result & WMHI_CLASSMASK) gives the class of event (eg. WMHI_GADGETUP) + * (result & WMHI_GADGETMASK) gives the gadget ID (eg. GID_SSLCERT_ACCEPT) + * + * \param ami_cw The Amiga core window structure. + * \param result event as returned by RA_HandleInput() + * \return TRUE if window closed during event processing + */ +static BOOL +ami_crtvrfy_event(struct ami_corewindow *ami_cw, ULONG result) +{ + if((result & WMHI_CLASSMASK) == WMHI_GADGETUP) { + switch(result & WMHI_GADGETMASK) { + case GID_SSLCERT_ACCEPT: + ami_crtvrfy_accept(ami_cw); + return TRUE; + break; + + case GID_SSLCERT_REJECT: + ami_crtvrfy_reject(ami_cw); + return TRUE; + break; + } } + return FALSE; +} + +/** + * callback for mouse action for certificate verify on core window + * + * \param ami_cw The Amiga core window structure. + * \param mouse_state netsurf mouse state on event + * \param x location of event + * \param y location of event + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_crtvrfy_mouse(struct ami_corewindow *ami_cw, + browser_mouse_state mouse_state, + int x, int y) +{ + struct ami_crtvrfy_window *crtvrfy_win; + /* technically degenerate container of */ + crtvrfy_win = (struct ami_crtvrfy_window *)ami_cw; - ami_tree_open(ssl_window, AMI_TREE_SSLCERT); + sslcert_viewer_mouse_action(crtvrfy_win->ssl_data, mouse_state, x, y); return NSERROR_OK; } -void ami_ssl_free(struct treeview_window *twin) +/** + * callback for keypress for certificate verify on core window + * + * \param example_cw The Amiga core window structure. + * \param nskey The netsurf key code + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_crtvrfy_key(struct ami_corewindow *ami_cw, uint32_t nskey) { - ami_tree_destroy(twin); + struct ami_crtvrfy_window *crtvrfy_win; + + /* technically degenerate container of */ + crtvrfy_win = (struct ami_crtvrfy_window *)ami_cw; + + if (sslcert_viewer_keypress(crtvrfy_win->ssl_data, nskey)) { + return NSERROR_OK; + } + return NSERROR_NOT_IMPLEMENTED; +} + +/** + * callback on draw event for certificate verify on core window + * + * \param ami_cw The Amiga core window structure. + * \param r The rectangle of the window that needs updating. + * \param ctx The drawing context + * \return NSERROR_OK on success otherwise apropriate error code + */ +static nserror +ami_crtvrfy_draw(struct ami_corewindow *ami_cw, int x, int y, struct rect *r, struct redraw_context *ctx) +{ + struct ami_crtvrfy_window *crtvrfy_win; + + /* technically degenerate container of */ + crtvrfy_win = (struct ami_crtvrfy_window *)ami_cw; + + sslcert_viewer_redraw(crtvrfy_win->ssl_data, x, y, r, ctx); + + return NSERROR_OK; +} + +static nserror +ami_crtvrfy_create_window(struct ami_crtvrfy_window *crtvrfy_win) +{ + struct ami_corewindow *ami_cw = (struct ami_corewindow *)&crtvrfy_win->core; + ULONG refresh_mode = WA_SmartRefresh; + + if(nsoption_bool(window_simple_refresh) == true) { + refresh_mode = WA_SimpleRefresh; + } + + ami_cw->objects[GID_CW_WIN] = WindowObj, + WA_ScreenTitle, ami_gui_get_screen_title(), + WA_Title, ami_cw->wintitle, + WA_Activate, TRUE, + WA_DepthGadget, TRUE, + WA_DragBar, TRUE, + WA_CloseGadget, FALSE, + WA_SizeGadget, TRUE, + WA_SizeBBottom, TRUE, + WA_Height, scrn->Height / 2, + WA_PubScreen, scrn, + WA_ReportMouse, TRUE, + refresh_mode, TRUE, + WA_IDCMP, IDCMP_MOUSEMOVE | IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE | + IDCMP_RAWKEY | IDCMP_GADGETUP | IDCMP_IDCMPUPDATE | + IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, + WINDOW_IDCMPHook, &ami_cw->idcmp_hook, + WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE | + IDCMP_SIZEVERIFY | IDCMP_REFRESHWINDOW, + WINDOW_SharedPort, sport, + WINDOW_UserData, crtvrfy_win, + /* WINDOW_NewMenu, twin->menu, -> No menu for SSL Cert */ + WINDOW_IconifyGadget, FALSE, + WINDOW_Position, WPOS_CENTERSCREEN, + WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj, + LAYOUT_AddImage, LabelObj, + LABEL_Text, crtvrfy_win->sslerr, + LabelEnd, + LAYOUT_AddChild, ami_cw->objects[GID_CW_HSCROLLLAYOUT] = LayoutVObj, + LAYOUT_AddChild, ami_cw->objects[GID_CW_VSCROLLLAYOUT] = LayoutHObj, + LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj, + GA_ID, GID_CW_DRAW, + SPACE_Transparent, TRUE, + SPACE_BevelStyle, BVS_DISPLAY, + GA_RelVerify, TRUE, + SpaceEnd, + LAYOUT_AddChild, ami_cw->objects[GID_CW_VSCROLL] = ScrollerObj, + GA_ID, GID_CW_VSCROLL, + GA_RelVerify, TRUE, + ICA_TARGET, ICTARGET_IDCMP, + ScrollerEnd, + LayoutEnd, + LAYOUT_AddChild, ami_cw->objects[GID_CW_HSCROLL] = ScrollerObj, + GA_ID, GID_CW_HSCROLL, + GA_RelVerify, TRUE, + ICA_TARGET, ICTARGET_IDCMP, + SCROLLER_Orientation, SORIENT_HORIZ, + ScrollerEnd, + LayoutEnd, + LAYOUT_AddChild, LayoutHObj, + LAYOUT_AddChild, crtvrfy_win->sslcert_objects[GID_SSLCERT_ACCEPT] = ButtonObj, + GA_ID, GID_SSLCERT_ACCEPT, + GA_Text, crtvrfy_win->sslaccept, + GA_RelVerify, TRUE, + ButtonEnd, + LAYOUT_AddChild, crtvrfy_win->sslcert_objects[GID_SSLCERT_REJECT] = ButtonObj, + GA_ID, GID_SSLCERT_REJECT, + GA_Text, crtvrfy_win->sslreject, + GA_RelVerify, TRUE, + ButtonEnd, + EndGroup, + CHILD_WeightedHeight, 0, + EndGroup, + EndWindow; + + if(ami_cw->objects[GID_CW_WIN] == NULL) { + return NSERROR_NOMEM; + } + + return NSERROR_OK; } + +/* exported interface documented in amiga/ssl_cert.h */ +nserror ami_cert_verify(struct nsurl *url, + const struct ssl_cert_info *certs, + unsigned long num, + nserror (*cb)(bool proceed, void *pw), + void *cbpw) +{ + struct ami_crtvrfy_window *ncwin; + nserror res; + + ncwin = calloc(1, sizeof(struct ami_crtvrfy_window)); + if (ncwin == NULL) { + return NSERROR_NOMEM; + } + + ncwin->core.wintitle = ami_utf8_easy((char *)messages_get("SSLCerts")); + ncwin->sslerr = ami_utf8_easy((char *)messages_get("SSLError")); + ncwin->sslaccept = ami_utf8_easy((char *)messages_get("SSL_Certificate_Accept")); + ncwin->sslreject = ami_utf8_easy((char *)messages_get("SSL_Certificate_Reject")); + + res = ami_crtvrfy_create_window(ncwin); + if (res != NSERROR_OK) { + LOG("SSL UI builder init failed"); + ami_utf8_free(ncwin->core.wintitle); + ami_utf8_free(ncwin->sslerr); + ami_utf8_free(ncwin->sslaccept); + ami_utf8_free(ncwin->sslreject); + free(ncwin); + return res; + } + + /* initialise Amiga core window */ + ncwin->core.draw = ami_crtvrfy_draw; + ncwin->core.key = ami_crtvrfy_key; + ncwin->core.mouse = ami_crtvrfy_mouse; + ncwin->core.close = ami_crtvrfy_reject; + ncwin->core.event = ami_crtvrfy_event; + + res = ami_corewindow_init(&ncwin->core); + if (res != NSERROR_OK) { + ami_utf8_free(ncwin->core.wintitle); + ami_utf8_free(ncwin->sslerr); + ami_utf8_free(ncwin->sslaccept); + ami_utf8_free(ncwin->sslreject); + DisposeObject(ncwin->core.objects[GID_CW_WIN]); + free(ncwin); + return res; + } + + /* initialise certificate viewing interface */ + res = sslcert_viewer_create_session_data(num, url, cb, cbpw, certs, + &ncwin->ssl_data); + if (res != NSERROR_OK) { + ami_utf8_free(ncwin->core.wintitle); + ami_utf8_free(ncwin->sslerr); + ami_utf8_free(ncwin->sslaccept); + ami_utf8_free(ncwin->sslreject); + DisposeObject(ncwin->core.objects[GID_CW_WIN]); + free(ncwin); + return res; + } + + res = sslcert_viewer_init(ncwin->core.cb_table, + (struct core_window *)ncwin, + ncwin->ssl_data); + if (res != NSERROR_OK) { + ami_utf8_free(ncwin->core.wintitle); + ami_utf8_free(ncwin->sslerr); + ami_utf8_free(ncwin->sslaccept); + ami_utf8_free(ncwin->sslreject); + DisposeObject(ncwin->core.objects[GID_CW_WIN]); + free(ncwin); + return res; + } + + return NSERROR_OK; +} + diff --git a/frontends/amiga/sslcert.h b/frontends/amiga/sslcert.h index 86ce9c4..392989f 100644 --- a/frontends/amiga/sslcert.h +++ b/frontends/amiga/sslcert.h @@ -1,5 +1,5 @@ /* - * Copyright 2009 Chris Young <chris(a)unsatisfactorysoftware.co.uk> + * Copyright 2017 Chris Young <chris(a)unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -18,11 +18,21 @@ #ifndef AMIGA_SSLCERT_H #define AMIGA_SSLCERT_H +struct nsurl; +struct ssl_cert_info; -nserror gui_cert_verify(nsurl *url, +/** + * Prompt the user to verify a certificate with issues. + * + * \param url The URL being verified. + * \param certs The certificate to be verified + * \param num The number of certificates to be verified. + * \param cb Callback upon user decision. + * \param cbpw Context pointer passed to cb + * \return NSERROR_OK or error code if prompt creation failed. + */ +nserror ami_cert_verify(struct nsurl *url, const struct ssl_cert_info *certs, unsigned long num, - nserror (*cb)(bool proceed, void *pw), void *cbpw); - -void ami_ssl_free(struct treeview_window *twin); - + nserror (*cb)(bool proceed, void *pw), void *cbpw); #endif + diff --git a/frontends/amiga/theme.c b/frontends/amiga/theme.c index 4042d1d..496fc54 100644 --- a/frontends/amiga/theme.c +++ b/frontends/amiga/theme.c @@ -363,13 +363,13 @@ void ami_init_mouse_pointers(void) if((ptrfile = Open(ptrfname,MODE_OLDFILE))) { int mx,my; - UBYTE *pprefsbuf = AllocVecTagList(1061, NULL); - Read(ptrfile,pprefsbuf,1061); + UBYTE *pprefsbuf = malloc(1061); + Read(ptrfile, pprefsbuf, 1061); - mouseptrbm[i]=AllocVecTagList(sizeof(struct BitMap), NULL); - InitBitMap(mouseptrbm[i],2,32,32); - mouseptrbm[i]->Planes[0] = AllocRaster(32,32); - mouseptrbm[i]->Planes[1] = AllocRaster(32,32); + mouseptrbm[i] = malloc(sizeof(struct BitMap)); + InitBitMap(mouseptrbm[i], 2, 32, 32); + mouseptrbm[i]->Planes[0] = AllocRaster(32, 32); + mouseptrbm[i]->Planes[1] = AllocRaster(32, 32); mouseptr.BitMap = mouseptrbm[i]; for(my=0;my<32;my++) @@ -393,7 +393,7 @@ void ami_init_mouse_pointers(void) POINTERA_YResolution,POINTERYRESN_SCREENRESASPECT, TAG_DONE); - FreeVec(pprefsbuf); + free(pprefsbuf); Close(ptrfile); } @@ -414,7 +414,7 @@ void ami_mouse_pointers_free(void) { FreeRaster(mouseptrbm[i]->Planes[0],32,32); FreeRaster(mouseptrbm[i]->Planes[1],32,32); - FreeVec(mouseptrbm[i]); + free(mouseptrbm[i]); } } } diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c deleted file mode 100644 index 8328194..0000000 --- a/frontends/amiga/tree.c +++ /dev/null @@ -1,1474 +0,0 @@ -/* - * Copyright 2008 - 2013 Chris Young <chris(a)unsatisfactorysoftware.co.uk> - * - * 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 "amiga/os3support.h" - -#include <stdlib.h> -#include <proto/window.h> -#include <proto/layout.h> -#include <proto/space.h> -#include <proto/label.h> -#include <proto/scroller.h> -#include <proto/exec.h> -#include <proto/intuition.h> -#include <proto/button.h> -#include <proto/bitmap.h> -#include <proto/graphics.h> -#include <proto/asl.h> -#include <proto/utility.h> -#include <proto/dos.h> - -#include <libraries/gadtools.h> -#include <gadgets/button.h> -#include <classes/window.h> -#include <gadgets/space.h> -#include <images/label.h> -#include <images/bitmap.h> -#include <gadgets/layout.h> -#include <gadgets/scroller.h> -#include <reaction/reaction_macros.h> -#include <intuition/icclass.h> -#ifdef __amigaos4__ -#include <graphics/blitattr.h> -#endif - -#include <assert.h> -#include <string.h> - -#include "utils/nsoption.h" -#include "utils/utils.h" -#include "utils/messages.h" -#include "netsurf/browser_window.h" -#include "netsurf/window.h" -#include "netsurf/keypress.h" -#include "content/llcache.h" -#include "desktop/cookie_manager.h" -#include "desktop/global_history.h" -#include "desktop/hotlist.h" -#include "desktop/sslcert_viewer.h" - -#include "amiga/gui.h" -#include "amiga/tree.h" -#include "amiga/file.h" -#include "amiga/libs.h" -#include "amiga/misc.h" -#include "amiga/utf8.h" -#include "amiga/sslcert.h" -#include "amiga/drag.h" /* drag icon stuff */ -#include "amiga/theme.h" /* pointers */ -#include "amiga/filetype.h" -#include "amiga/schedule.h" -#include "amiga/plotters.h" - -#define AMI_TREE_MENU_ITEMS 26 -#define AMI_TREE_MENU_NEWDIR FULLMENUNUM(1,0,0) -#define AMI_TREE_MENU_NEWURL FULLMENUNUM(1,1,0) -#define AMI_TREE_MENU_EDIT FULLMENUNUM(1,3,0) -#define AMI_TREE_MENU_DELETE FULLMENUNUM(1,5,0) -#define AMI_TREE_MENU_CLEAR FULLMENUNUM(1,8,0) - -enum { - GID_OPEN = GID_LAST, - GID_TREE_LAST -}; - - -struct treeview_window { - struct nsObject *node; - struct Window *win; - Object *objects[GID_TREE_LAST]; - int type; - struct NewMenu *menu; - char *menu_name[AMI_TREE_MENU_ITEMS]; - struct tree *tree; - struct Hook scrollerhook; - uint32 key_state; - uint32 mouse_state; - int drag_x; - int drag_y; - struct timeval lastclick; - int max_width; - int max_height; - struct gui_globals globals; - struct sslcert_session_data *ssl_data; - char *wintitle; - char *sslerr; - char *sslaccept; - char *sslreject; - struct MinList *shared_pens; -}; - -struct ami_tree_redraw_req { - int x; - int y; - int width; - int height; - struct treeview_window *twin; -}; - -#if 0 -void ami_tree_draw(struct treeview_window *twin); -static void ami_tree_resized(struct tree *tree, int width, - int height, void *data); -static void ami_tree_scroll_visible(int y, int height, void *data); -static void ami_tree_get_window_dimensions(int *width, int *height, void *data); -#endif - -void ami_tree_destroy(struct treeview_window *twin) -{ - tree_delete(twin->tree); - FreeVec(twin->shared_pens); - FreeVec(twin); -} - -struct tree *ami_tree_get_tree(struct treeview_window *twin) -{ - return twin->tree; -} - -static void ami_tree_resized(struct tree *tree, int width, int height, void *data) -{ - struct treeview_window *twin = data; - struct IBox *bbox; - - twin->max_height = height; - twin->max_width = width; - - if(twin->win) - { - if(ami_gui_get_space_box(twin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { - amiga_warn_user("NoMemory", ""); - return; - } - - if(height == -1) { - SetAttrs((APTR)twin->objects[OID_MAIN], - WINDOW_VertProp, -1, - TAG_DONE); - } else { - RefreshSetGadgetAttrs((APTR)twin->objects[OID_VSCROLL], twin->win, NULL, - SCROLLER_Total, height, - SCROLLER_Visible, bbox->Height, - TAG_DONE); - } - - if(width == -1) { - SetAttrs((APTR)twin->objects[OID_MAIN], - WINDOW_HorizProp, -1, - TAG_DONE); - } else { - RefreshSetGadgetAttrs((APTR)twin->objects[OID_HSCROLL], twin->win, NULL, - SCROLLER_Total, width, - SCROLLER_Visible, bbox->Width, - TAG_DONE); - } - ami_gui_free_space_box(bbox); - } -} - -/** - * Retrieves the dimensions of the window with the tree - * - * \param data user data assigned to the tree on tree creation - * \param width will be updated to window width if not NULL - * \param height will be updated to window height if not NULL - */ -static void ami_tree_get_window_dimensions(int *width, int *height, void *data) -{ - struct treeview_window *twin = data; - struct IBox *bbox; - - if(ami_gui_get_space_box(twin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { - amiga_warn_user("NoMemory", ""); - return; - } - - if(width) *width = bbox->Width; - if(height) *height = bbox->Height; - - ami_gui_free_space_box(bbox); -} - -static void ami_tree_redraw_req_dr(void *p) -{ - struct ami_tree_redraw_req *atrr_data = (struct ami_tree_redraw_req *)p; - int x = atrr_data->x; - int y = atrr_data->y; - int width = atrr_data->width; - int height = atrr_data->height; - struct treeview_window *twin = atrr_data->twin; - struct IBox *bbox; - int pos_x, pos_y; - struct RastPort *temprp; - struct redraw_context ctx = { - .interactive = true, - .background_images = true, - .plot = &amiplot - }; - - if(!twin->win) return; - - ami_update_pointer(twin->win, GUI_POINTER_WAIT); - - glob = &twin->globals; - temprp = glob->rp; - glob->rp = twin->win->RPort; - - GetAttr(SCROLLER_Top, twin->objects[OID_HSCROLL], (ULONG *)&pos_x); - GetAttr(SCROLLER_Top, twin->objects[OID_VSCROLL], (ULONG *)&pos_y); - - if(ami_gui_get_space_box(twin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { - amiga_warn_user("NoMemory", ""); - return; - } - - x += bbox->Left; - y += bbox->Top; - - if(x - pos_x + width > bbox->Width) width = bbox->Width - (x - pos_x); - if(y - pos_y + height > bbox->Height) height = bbox->Height - (y - pos_y); - - if(x < pos_x) { - width -= pos_x - x; - x = pos_x; - } - - if(y < pos_y) { - height -= pos_y - y; - y = pos_y; - } - - tree_draw(twin->tree, bbox->Left - pos_x, bbox->Top - pos_y, - atrr_data->x, atrr_data->y, - atrr_data->width, atrr_data->height, &ctx); - - FreeVec(atrr_data); - ami_gui_free_space_box(bbox); - ami_update_pointer(twin->win, GUI_POINTER_DEFAULT); - ami_clearclipreg(glob); - glob->rp = temprp; - ami_gui_set_default_gg(); -} - -static void ami_tree_redraw_req(void *p) -{ - struct ami_tree_redraw_req *atrr_data = (struct ami_tree_redraw_req *)p; - int x = atrr_data->x; - int y = atrr_data->y; - int width = atrr_data->width; - int height = atrr_data->height; - struct treeview_window *twin = atrr_data->twin; - struct IBox *bbox; - int pos_x, pos_y; - int tile_x, tile_y, tile_w, tile_h; - struct redraw_context ctx = { - .interactive = true, - .background_images = true, - .plot = &amiplot - }; - - if(!twin->win) return; - - ami_update_pointer(twin->win, GUI_POINTER_WAIT); - - glob = &twin->globals; - - GetAttr(SCROLLER_Top, twin->objects[OID_HSCROLL], (ULONG *)&pos_x); - GetAttr(SCROLLER_Top, twin->objects[OID_VSCROLL], (ULONG *)&pos_y); - - if(ami_gui_get_space_box(twin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { - amiga_warn_user("NoMemory", ""); - return; - } - - if(x - pos_x + width > bbox->Width) width = bbox->Width - (x - pos_x); - if(y - pos_y + height > bbox->Height) height = bbox->Height - (y - pos_y); - - if(x < pos_x) { - width -= pos_x - x; - x = pos_x; - } - - if(y < pos_y) { - height -= pos_y - y; - y = pos_y; - } - - for(tile_y = y; tile_y < (y + height); tile_y += nsoption_int(redraw_tile_size_y)) { - tile_h = nsoption_int(redraw_tile_size_y); - if(((y + height) - tile_y) < nsoption_int(redraw_tile_size_y)) - tile_h = (y + height) - tile_y; - - for(tile_x = x; tile_x < (x + width); tile_x += nsoption_int(redraw_tile_size_x)) { - tile_w = nsoption_int(redraw_tile_size_x); - if(((x + width) - tile_x) < nsoption_int(redraw_tile_size_x)) - tile_w = (x + width) - tile_x; - - tree_draw(twin->tree, - tile_x, - tile_y, - tile_x, tile_y, tile_w, tile_h, &ctx); -#ifdef __amigaos4__ - BltBitMapTags(BLITA_SrcType, BLITT_BITMAP, - BLITA_Source, twin->globals.bm, - BLITA_SrcX, 0, - BLITA_SrcY, 0, - BLITA_DestType, BLITT_RASTPORT, - BLITA_Dest, twin->win->RPort, - BLITA_DestX, bbox->Left + tile_x - pos_x, - BLITA_DestY, bbox->Top + tile_y - pos_y, - BLITA_Width, tile_w, - BLITA_Height, tile_h, - TAG_DONE); -#else - BltBitMapRastPort(twin->globals.bm, 0, 0, - twin->win->RPort, bbox->Left + tile_x - pos_x, bbox->Top + tile_y - pos_y, - tile_w, tile_h, 0xC0); -#endif - } - } - - FreeVec(atrr_data); - ami_gui_free_space_box(bbox); - ami_update_pointer(twin->win, GUI_POINTER_DEFAULT); - ami_clearclipreg(glob); - ami_gui_set_default_gg(); -} - -static void ami_tree_redraw_request(int x, int y, int width, int height, void *data) -{ - struct ami_tree_redraw_req *atrr_data = AllocVecTagList(sizeof(struct ami_tree_redraw_req), NULL); - - atrr_data->x = x; - atrr_data->y = y; - atrr_data->width = width; - atrr_data->height = height; - atrr_data->twin = (struct treeview_window *)data; - - /** /todo Queue these requests properly like the main browser code does - **/ - - if(nsoption_bool(direct_render) == false) - ami_schedule(0, ami_tree_redraw_req, atrr_data); - else - ami_schedule(0, ami_tree_redraw_req_dr, atrr_data); -} - -static void ami_tree_draw(struct treeview_window *twin) -{ - struct IBox *bbox; - int x, y; - - if(!twin) return; - - GetAttr(SCROLLER_Top, twin->objects[OID_HSCROLL], (ULONG *)&x); - GetAttr(SCROLLER_Top, twin->objects[OID_VSCROLL], (ULONG *)&y); - - if(ami_gui_get_space_box(twin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { - amiga_warn_user("NoMemory", ""); - return; - } - - ami_tree_redraw_request(x, y, bbox->Width, bbox->Height, twin); - - ami_gui_free_space_box(bbox); -} - -/** - * Scrolls the tree to make an element visible - * - * \param y Y coordinate of the element - * \param height height of the element - * \param data user data assigned to the tree on tree creation - */ -static void ami_tree_scroll_visible(int y, int height, void *data) -{ - int sy, scrollset; - struct IBox *bbox; - struct treeview_window *twin = data; - - GetAttr(SCROLLER_Top, twin->objects[OID_VSCROLL], (ULONG *)&sy); - if(ami_gui_get_space_box(twin->objects[GID_BROWSER], &bbox) != NSERROR_OK) { - amiga_warn_user("NoMemory", ""); - return; - } - - if((y > sy) && ((y + height) < (sy + bbox->Height))) { - ami_gui_free_space_box(bbox); - return; - } - - if((y <= sy) || (height > bbox->Height)) scrollset = (ULONG)y; - else scrollset = sy + (y + height) - (sy + bbox->Height); - - RefreshSetGadgetAttrs((APTR)twin->objects[OID_VSCROLL], twin->win, NULL, - SCROLLER_Top, scrollset, - TAG_DONE); - - ami_gui_free_space_box(bbox); - ami_tree_draw(twin); -} - -static void ami_tree_scroll(struct treeview_window *twin, int sx, int sy) -{ - int x, y; - - if(!twin) return; - - GetAttr(SCROLLER_Top, twin->objects[OID_HSCROLL], (ULONG *)&x); - GetAttr(SCROLLER_Top, twin->objects[OID_VSCROLL], (ULONG *)&y); - - x += sx; - y += sy; - - if(y < 0) y = 0; - if(x < 0) x = 0; - - RefreshSetGadgetAttrs((APTR)twin->objects[OID_VSCROLL], twin->win, NULL, - SCROLLER_Top, y, - TAG_DONE); - - RefreshSetGadgetAttrs((APTR)twin->objects[OID_HSCROLL], twin->win, NULL, - SCROLLER_Top, x, - TAG_DONE); - - ami_tree_draw(twin); -} - -static void ami_tree_drag_icon_show(struct treeview_window *twin) -{ - const char *type = "project"; - nsurl *url = NULL; - const char *title = NULL; - - if((twin->type == AMI_TREE_COOKIES) || - (twin->type == AMI_TREE_SSLCERT)) return; /* No permissable drag operations */ - - if((tree_drag_status(twin->tree) == TREE_SELECT_DRAG) || - (tree_drag_status(twin->tree) == TREE_TEXTAREA_DRAG)) - return; - - if((twin->type == AMI_TREE_HOTLIST) && (hotlist_has_selection())) { - hotlist_get_selection(&url, &title); - } else if((twin->type == AMI_TREE_HISTORY) && (global_history_has_selection())) { - global_history_get_selection(&url, &title); - } - - if(title && (url == NULL)) - { - ami_drag_icon_show(twin->win, "drawer"); - } - else - { - ami_drag_icon_show(twin->win, type); - } -} - -static void ami_tree_drag_end(struct treeview_window *twin, int x, int y) -{ - struct gui_window_2 *gwin; - struct treeview_window *tw; - BOOL drag; - nsurl *url = NULL; - const char *title = NULL; - bool ok = false; - - if((drag = ami_drag_in_progress())) ami_drag_icon_close(twin->win); - - if(drag && (twin != ami_window_at_pointer(AMINS_TVWINDOW))) - { - if((twin->type == AMI_TREE_HOTLIST) && (hotlist_has_selection())) { - ok = hotlist_get_selection(&url, &title); - } else if((twin->type == AMI_TREE_HISTORY) && (global_history_has_selection())) { - ok = global_history_get_selection(&url, &title); - } - - if((ok == false) || (url == NULL)) { - DisplayBeep(scrn); - } else if(url) { - if((gwin = ami_window_at_pointer(AMINS_WINDOW))) { - browser_window_navigate(gwin->gw->bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); - } else if((tw = ami_window_at_pointer(AMINS_TVWINDOW)) && - (tw != twin) && (tw->type == AMI_TREE_HOTLIST)) { - hotlist_add_entry(url, title, true, y); - } - } - tree_mouse_action(twin->tree, twin->mouse_state | twin->key_state, - twin->drag_x, twin->drag_y); /* Keep the tree happy */ - tree_drag_end(twin->tree, twin->mouse_state, - twin->drag_x, twin->drag_y, - twin->drag_x, twin->drag_y); /* Keep the tree happier */ - } else { - if(tree_drag_status(twin->tree) == TREE_UNKNOWN_DRAG) - DisplayBeep(scrn); - - tree_drag_end(twin->tree, twin->mouse_state, - twin->drag_x, twin->drag_y, x, y); - } -} - -HOOKF(void, ami_tree_scroller_hook, Object *, object, struct IntuiMessage *) -{ - ULONG gid; - struct treeview_window *twin = hook->h_Data; - struct IntuiWheelData *wheel; - - switch(msg->Class) - { - case IDCMP_IDCMPUPDATE: - gid = GetTagData( GA_ID, 0, msg->IAddress ); - - switch( gid ) - { - case OID_HSCROLL: - case OID_VSCROLL: - ami_tree_draw(twin); - break; - } - break; -#ifdef __amigaos4__ - case IDCMP_EXTENDEDMOUSE: - if(msg->Code == IMSGCODE_INTUIWHEELDATA) - { - wheel = (struct IntuiWheelData *)msg->IAddress; - - ami_tree_scroll(twin, (wheel->WheelX * 20), (wheel->WheelY * 20)); - } - break; -#endif - } -} - -static void ami_tree_menu(struct treeview_window *twin) -{ - if(twin->menu) return; - - if((twin->menu = ami_misc_allocvec_clear(sizeof(struct NewMenu) * AMI_TREE_MENU_ITEMS, 0))) { - twin->menu[0].nm_Type = NM_TITLE; - twin->menu_name[0] = ami_utf8_easy((char *)messages_get("Tree")); - twin->menu[0].nm_Label = twin->menu_name[0]; - - twin->menu[1].nm_Type = NM_ITEM; - twin->menu_name[1] = ami_utf8_easy((char *)messages_get("TreeExport")); - twin->menu[1].nm_Label = twin->menu_name[1]; - if(twin->type == AMI_TREE_COOKIES) - twin->menu[1].nm_Flags = NM_ITEMDISABLED; - twin->menu[1].nm_CommKey = "S"; - - twin->menu[2].nm_Type = NM_ITEM; - twin->menu[2].nm_Label = NM_BARLABEL; - - twin->menu[3].nm_Type = NM_ITEM; - twin->menu_name[3] = ami_utf8_easy((char *)messages_get("Expand")); - twin->menu[3].nm_Label = twin->menu_name[3]; - - twin->menu[4].nm_Type = NM_SUB; - twin->menu_name[4] = ami_utf8_easy((char *)messages_get("All")); - twin->menu[4].nm_Label = twin->menu_name[4]; - twin->menu[4].nm_CommKey = "+"; - - if(twin->type == AMI_TREE_COOKIES) - { - twin->menu_name[5] = ami_utf8_easy((char *)messages_get("Domains")); - twin->menu_name[6] = ami_utf8_easy((char *)messages_get("Cookies")); - } - else - { - twin->menu_name[5] = ami_utf8_easy((char *)messages_get("Folders")); - twin->menu_name[6] = ami_utf8_easy((char *)messages_get("Links")); - } - - twin->menu[5].nm_Type = NM_SUB; - twin->menu[5].nm_Label = twin->menu_name[5]; // tree-specific title - - twin->menu[6].nm_Type = NM_SUB; - twin->menu[6].nm_Label = twin->menu_name[6]; // tree-specific title - - twin->menu[7].nm_Type = NM_ITEM; - twin->menu_name[7] = ami_utf8_easy((char *)messages_get("Collapse")); - twin->menu[7].nm_Label = twin->menu_name[7]; - - twin->menu[8].nm_Type = NM_SUB; - twin->menu[8].nm_Label = twin->menu_name[4]; - twin->menu[8].nm_CommKey = "-"; - - twin->menu[9].nm_Type = NM_SUB; - twin->menu[9].nm_Label = twin->menu_name[5]; // tree-specific title - - twin->menu[10].nm_Type = NM_SUB; - twin->menu[10].nm_Label = twin->menu_name[6]; // tree-specific title - - twin->menu[11].nm_Type = NM_ITEM; - twin->menu[11].nm_Label = NM_BARLABEL; - - twin->menu[12].nm_Type = NM_ITEM; - twin->menu_name[12] = ami_utf8_easy((char *)messages_get("SnapshotWindow")); - twin->menu[12].nm_Label = twin->menu_name[12]; - - twin->menu[13].nm_Type = NM_ITEM; - twin->menu[13].nm_Label = NM_BARLABEL; - - twin->menu[14].nm_Type = NM_ITEM; - twin->menu_name[14] = ami_utf8_easy((char *)messages_get("CloseWindow")); - twin->menu[14].nm_Label = twin->menu_name[14]; - twin->menu[14].nm_CommKey = "K"; - - twin->menu[15].nm_Type = NM_TITLE; - twin->menu_name[15] = ami_utf8_easy((char *)messages_get("Edit")); - twin->menu[15].nm_Label = twin->menu_name[15]; - - twin->menu[16].nm_Type = NM_ITEM; - twin->menu_name[16] = ami_utf8_easy((char *)messages_get("TreeNewFolder")); - twin->menu[16].nm_Label = twin->menu_name[16]; - twin->menu[16].nm_CommKey = "N"; - - twin->menu[17].nm_Type = NM_ITEM; - twin->menu_name[17] = ami_utf8_easy((char *)messages_get("TreeNewLink")); - twin->menu[17].nm_Label = twin->menu_name[17]; - - twin->menu[18].nm_Type = NM_ITEM; - twin->menu[18].nm_Label = NM_BARLABEL; - - twin->menu[19].nm_Type = NM_ITEM; - twin->menu_name[19] = ami_utf8_easy((char *)messages_get("TreeEdit")); - twin->menu[19].nm_Label = twin->menu_name[19]; - twin->menu[19].nm_CommKey = "E"; - - twin->menu[20].nm_Type = NM_ITEM; - twin->menu[20].nm_Label = NM_BARLABEL; - - twin->menu[21].nm_Type = NM_ITEM; - twin->menu_name[21] = ami_utf8_easy((char *)messages_get("TreeDelete")); - twin->menu[21].nm_Label = twin->menu_name[21]; - twin->menu[21].nm_CommKey = "D"; - - twin->menu[22].nm_Type = NM_ITEM; - twin->menu[22].nm_Label = NM_BARLABEL; - - twin->menu[23].nm_Type = NM_ITEM; - twin->menu_name[23] = ami_utf8_easy((char *)messages_get("SelectAllNS")); - twin->menu[23].nm_Label = twin->menu_name[23]; - twin->menu[23].nm_CommKey = "A"; - - twin->menu[24].nm_Type = NM_ITEM; - twin->menu_name[24] = ami_utf8_easy((char *)messages_get("ClearNS")); - twin->menu[24].nm_Label = twin->menu_name[24]; - - twin->menu

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits February 2017